From 6e66c7950af8e9163a0ffb8d20c1daa0ad012d75 Mon Sep 17 00:00:00 2001
From: Milan Broz <gmazyland@gmail.com>
Date: Jun 29 2014 12:45:08 +0000
Subject: Update to cryptsetup 1.6.5.

Add cryptsetup-python3 subpackage.

---

diff --git a/.gitignore b/.gitignore
index 0951472..7ec8220 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/cryptsetup-1.6.4.tar.xz
+/cryptsetup-1.6.5.tar.xz
diff --git a/cryptsetup-1.6.4.tar.sign b/cryptsetup-1.6.4.tar.sign
deleted file mode 100644
index 5c5d310..0000000
--- a/cryptsetup-1.6.4.tar.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABCAAGBQJTD0ctAAoJENmwV3vZPpj8WAkQAKo2flibcxZAR7lW6NfW2SUo
-VysNEylCPRQbPbDOrWRGQMrjNlQWz0YU504P+GwVFOrALW7K2v71oVa+8AE3dukh
-0aogPTzso6HlNFnnjbd2IkCAbhgejn6gshhd2rF64YxLx5QOnX744aS5HgEb3QC4
-rkSGIih/rJz0GEsNb4gpuTceO9BnBINbmbV4172CbyOWvndkgArazkB5f1Qi5d2r
-SUQVZQIzGmW+qVmsGElS4AtCsYz59qfeL6+REVHEY0YV9M1MkWF3ZCsflW6t0Qgb
-MUzNb3MEYYh2NaQoF4Ul1ZbHNgnx6as9B/uCIuV6LPQiJvl7PkBlN56vO6FI2nE5
-x2yXed8Y2OJBGstHsGtMoP8DP96U0IKcEPpSwttKVwl6+qCqu3Wns27eAvrkKnD/
-8/PGrk1F9H+iB4JLez/WyrWEveQQKugkJPf8HUSNW4J5/Q/joD0/2sKfIBTYbEG1
-Hf0jvcfhnsMf4cr06K1VeOVkr596/EEQRyEKAEQHdRdSDXvZeprjA+yBai6v6V+W
-OCm4DK3D6o9jhCLeotFSlOsMfA9gxWJ9uKrEnR7ITh7PmTf8PiZbX+VkexuwP8vT
-PaDjBCRZ2mm1nIfYxohcEMNz/WgRdFKx4vmb13OyY1tEcQYjIk/EoP7EZrGNS1tJ
-5X1fSnePI1PuO+WuyaHy
-=jEBe
------END PGP SIGNATURE-----
diff --git a/cryptsetup-1.6.5.tar.sign b/cryptsetup-1.6.5.tar.sign
new file mode 100644
index 0000000..3d58c07
--- /dev/null
+++ b/cryptsetup-1.6.5.tar.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABCAAGBQJTsAB+AAoJENmwV3vZPpj8bh0P/3MhINlKtwNZUIpBmutuioiN
+TSZBXnC08oriTWll3LaUtT18q4gfdNZ0nmetew9AcdAHtaYEiSgdiuVkx4TVmXNV
+I7oAE1GCopYt7KCBBS06ql3RylrqEdpt0dscb0WDvvbtc5G0WFh9rDflsPXZpaEt
+heqpLG6mNUHnkfl9SOc3h0X9/H6G6bITvn1nJdNvfoZFJdqVI28d059Ax4dsx9ag
+x/smj/TyvfxpJ897g0Ta+j8PPXLm3vanZZW/eBYujJd/ks6dGY9oeqyU3xZ/Uiwx
+D6qDSbrkD8kzXoj7YyyMWkK3QtL3vhBSJoRC9Icf8hCg3jHS2FZ5ZYS6hzYvJQp7
+qsiOBxAyMgl1u0hYYldv0WRyi3Dv+C7HQdVHZicLdK30KqN3DKyJEPTnVt4+1nj2
+xNyZKM0kkHHMK+Cws2p17Y/ESH8TocJzaYdOehA5avRix7F9Ygg1g9BUGMGo3GDb
+DsrTes35A9GGnQ6M+/YIFmzfaG92SLDUHzxCBtZ6I1GPAsxK41qSJ5CMbfxN0w3/
+SGa3Xybi2ZTyDJf5pSJdnnRsU51dayG3ensXPwc56/thkLGiapIVziWWVTA9TsaS
+4B9emIPFkpkyX3mrfMsW3ap+lkkZ/KuqSeTkQep+Y24a/yaRX4YBjJCvAuu3DaZc
+tGJBiO00fS647Vw/KP5w
+=E6bJ
+-----END PGP SIGNATURE-----
diff --git a/cryptsetup.spec b/cryptsetup.spec
index b1f83ff..b52b723 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -1,13 +1,16 @@
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Summary: A utility for setting up encrypted disks
 Name: cryptsetup
-Version: 1.6.4
-Release: 3%{?dist}
+Version: 1.6.5
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
 URL: http://cryptsetup.googlecode.com/
 BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel
 BuildRequires: libgpg-error-devel, libuuid-devel, libsepol-devel
-BuildRequires: libselinux-devel, python-devel, libpwquality-devel
+BuildRequires: libselinux-devel, python-devel, python3-devel
+BuildRequires: libpwquality-devel
 BuildRequires: fipscheck-devel >= 1.3.0
 Provides: cryptsetup-luks = %{version}-%{release}
 Obsoletes: cryptsetup-luks < 1.4.0
@@ -76,11 +79,24 @@ Obsoletes: python-cryptsetup < 1.4.0
 This package provides Python bindings for libcryptsetup, a library
 for setting up disk encryption using dm-crypt kernel module.
 
+%package python3
+Group: System Environment/Libraries
+Summary: Python3 bindings for libcryptsetup
+Requires: %{name}-libs = %{version}-%{release}
+Provides: python3-cryptsetup = %{version}-%{release}
+
+%description python3
+This package provides Python bindings for libcryptsetup, a library
+for setting up disk encryption using dm-crypt kernel module.
+
 %prep
 %setup -q -n cryptsetup-%{upstream_version}
 chmod -x python/pycryptsetup-test.py
 chmod -x misc/dracut_90reencrypt/*
 
+# copy the whole directory for the python3 build
+cp -a . %{py3dir}
+
 %build
 %configure --enable-python --enable-fips --enable-cryptsetup-reencrypt --enable-pwquality %{?configure_pbkdf2}
 # remove rpath
@@ -88,6 +104,11 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
+pushd %{py3dir}
+%configure --enable-python --with-python_version=3
+make %{?_smp_mflags}
+popd
+
 %install
 # Generate HMAC checksums (FIPS)
 %define __spec_install_post \
@@ -100,6 +121,11 @@ make %{?_smp_mflags}
 make install DESTDIR=%{buildroot}
 rm -rf %{buildroot}/%{_libdir}/*.la
 install -d %{buildroot}/%{_libdir}/fipscheck
+
+pushd %{py3dir}
+make install DESTDIR=%{buildroot}
+rm -rf %{buildroot}/%{_libdir}/*.la
+popd
 %find_lang cryptsetup
 
 %post -n cryptsetup-libs -p /sbin/ldconfig
@@ -137,9 +163,18 @@ install -d %{buildroot}/%{_libdir}/fipscheck
 %exclude %{python_sitearch}/pycryptsetup.la
 %{python_sitearch}/pycryptsetup.so
 
+%files python3
+%doc COPYING.LGPL python/pycryptsetup-test.py
+%exclude %{python3_sitearch}/pycryptsetup.la
+%{python3_sitearch}/pycryptsetup.so
+
 %clean
 
 %changelog
+* Sun Jun 29 2014 Milan Broz <gmazyland@gmail.com> - 1.6.5-1
+- Update to cryptsetup 1.6.5.
+- Add cryptsetup-python3 subpackage.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index a86b5b8..dc1d9b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f68ce7b7f4be08449f3c8b114ed5accb  cryptsetup-1.6.4.tar.xz
+128a5f63284ca3a26b4d4ffe821fa235  cryptsetup-1.6.5.tar.xz