Update to cryptsetup 2.1.0.

.gitignore

@@ -1 +1 @@
-/cryptsetup-2.0.6.tar.xz
+/cryptsetup-2.1.0.tar.xz

cryptsetup-2.0.6.tar.sign

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlwE+GIACgkQ2bBXe9k+
-mPxm1w//b2cl85MwZsmuHfVPNAVuuyYeS+L4VGQ1+nn+HFuvwaRJwJ+CR1ldXCou
-5DuJ33H5EeDU5OBJvhzBYXGPeS3omzzOoAp6659zLYzbuuviCs0M3Tzthx1KGaoQ
-4bj5dvEpDrtRmQp2ieUNbqcMV1wHy9Xgt6MeKwmtsE4Crda/3aqroKdEpXh1gJbn
-k5V3be8nJLiFjUm2YBc94p5GysTNJRRJiNOBNWmqk+lXgZ3P8YylhjO71f9eOpSc
-Vei6zlniNNrilPi2Vn3Hs/uE0EEGNB/tXt8UVv9Gsh+VQFilOJ6Z2KbL9kYJOv+J
-M8jHExEz33M3fM+4wuJD6qcYjAdoPZiLsnUD1HzSRQwO5GA6xkdd8x94SIuJ0p/O
-On5Nk980sc8DnZwAlfuDfHaxgpEKY6+BGkzoTn5WbbNpgPw/4poZyJubMEjVdFdw
-vP82I4juMuoBZi77wWnxxwjAfidqjwxQze53M2SeIrPJCKG54xfFa4XXNB5VQpuU
-yiRGXhNcLgbvzMw0W/iStIw8JW3tUnl6tNLhw+YWQ3Z9rUi7DrVd1OwXOp3j8p+Z
-MB43Ce1PtNkJbaSEwUVWSIoN2ZevrL7xLa/WaxAmZZAitkgAACKr4Q1XDpDF+lIe
-7FcGl1Ehf/9lvFlYtg99V1NJ2Rp97UOxC6OG1SbmhaMPToZd6NA=
-=BxP3
------END PGP SIGNATURE-----

cryptsetup-2.1.0.tar.sign

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlxdkp0ACgkQ2bBXe9k+
+mPx0JxAAu+yx54yDHQO1QOZvINKVSrLwZ/nGAy+JDQsOsM/+zOlXictxD/yybzZv
+GFuWdn5POnZDfwjp9b9UvudOUbxTLWNimyavV58iG0ICgFbxC6wpCVn0NxC+lPtt
+3uThWXTgJzcDpGbi9oi7FWEoihG7DJHMsGVUeUnhcZC+NSdXl6/ZTb5i68/rNNzc
+YHwM7OSWczn39Bdr0+/gs3jxnO01OP1weNgFZ6ChcENkSp8n+TQJEVwa+yiuO+rP
+BcBws0zjBYTKcpm/ZtuPGczwOaEBwk/jyamgfoobIeCzIyyUdMrCxwE/3oYMJxqS
+faijxMd21RZ3yqnkwvhTO1CbGWHAlVCqjAzyX8okhgjVi8gQpWvD67WRSC7FX+vD
+72m9yZ5qTO0lNPTtze6xo88UvWskIZtSg1rPtP39vyBnAAgZflKFRu8r+IgXn612
+VRJLlit+mCmKOgi5ochkxlJgrMY6FmWbVMlq1sxFy1dk3wRQTh5DYzT5IGnhdXi8
+osY2swVKnVJhkThomVUJ8pXIwWGKZNGMzTU7Eofi9zSHwTMm0y6EdFNlXogrzmY3
+vEHOb3zEqPujWegBeqsHhuHgPQewgts+7bIPEbvEPsSwSqMvX8BPsyLv7c6bat9x
+GhXTLwGeJ2RcNmF5bH7GMe7b+XLVaeBzNjLE3Ty0iFWgzT3Uwd0=
+=gOH9
+-----END PGP SIGNATURE-----

cryptsetup.spec

@@ -1,39 +1,12 @@
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-%if 0%{?fedora}
-%if 0%{?fedora} >= 29
-Obsoletes: python2-cryptsetup
-Obsoletes: cryptsetup-python3
-%global python2_enable 0
-%global python3_enable 0
-%else
-%global python2_enable 1
-%global python3_enable 1
-%endif
-%else
-%global python3_enable 0
-%if 0%{?rhel} == 7
-%global python2_enable 1
-%else
-%global python2_enable 0
-%endif
-%endif
-
 Summary: A utility for setting up encrypted disks
 Name: cryptsetup
-Version: 2.0.6
+Version: 2.1.0
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: https://gitlab.com/cryptsetup/cryptsetup
 BuildRequires: openssl-devel, popt-devel, device-mapper-devel
 BuildRequires: libuuid-devel, gcc, json-c-devel, libargon2-devel
 BuildRequires: libpwquality-devel, libblkid-devel
-%if %{python2_enable}
-BuildRequires: python2-devel
-%endif
-%if %{python3_enable}
-BuildRequires: python3-devel
-%endif
 Provides: cryptsetup-luks = %{version}-%{release}
 Obsoletes: cryptsetup-luks < 1.4.0
 Requires: cryptsetup-libs = %{version}-%{release}
@@ -90,69 +63,19 @@ Requires: cryptsetup-libs = %{version}-%{release}
 This package contains cryptsetup-reencrypt utility which
 can be used for offline reencryption of disk in situ.
 
-%if %{python2_enable}
-%package -n python2-cryptsetup
-Summary: Python bindings for libcryptsetup
-Requires: %{name}-libs = %{version}-%{release}
-%{?python_provide:%python_provide python2-cryptsetup}
-# Remove before F30
-Provides: %{name}-python = %{version}-%{release}
-Provides: %{name}-python%{?_isa} = %{version}-%{release}
-Obsoletes: %{name}-python < %{version}-%{release}
-Obsoletes: python-cryptsetup < 1.4.0
-
-%description -n python2-cryptsetup
-This package provides Python bindings for libcryptsetup, a library
-for setting up disk encryption using dm-crypt kernel module.
-%endif
-
-%if %{python3_enable}
-%package python3
-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.
-%endif
-
 %prep
 %setup -q -n cryptsetup-%{upstream_version}
 %patch0 -p1
-chmod -x python/pycryptsetup-test.py
 chmod -x misc/dracut_90reencrypt/*
 
-# copy the whole directory for the python3 build
-%if %{python3_enable}
-cp -a . %{py3dir}
-%endif
-
 %build
-%if %{python2_enable} || %{python3_enable}
+%configure --enable-fips --enable-pwquality --enable-libargon2
-%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 --with-crypto_backend=openssl --with-default-luks-format=LUKS2
-%else
-%configure --enable-fips --enable-pwquality --enable-libargon2 --with-crypto_backend=openssl --with-default-luks-format=LUKS2
-%endif
 make %{?_smp_mflags}
 
-%if %{python3_enable}
-pushd %{py3dir}
-%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 --with-crypto_backend=openssl --with-default-luks-format=LUKS2
-make %{?_smp_mflags}
-popd
-%endif
-
 %install
 make install DESTDIR=%{buildroot}
 rm -rf %{buildroot}/%{_libdir}/*.la
 
-%if %{python3_enable}
-pushd %{py3dir}
-make install DESTDIR=%{buildroot}
-rm -rf %{buildroot}/%{_libdir}/*.la
-popd
-%endif
 %find_lang cryptsetup
 
 %ldconfig_scriptlets -n cryptsetup-libs
@@ -196,25 +119,12 @@ popd
 %{_tmpfilesdir}/cryptsetup.conf
 %ghost %dir /run/cryptsetup
 
-%if %{python2_enable}
-%files -n python2-cryptsetup
-%{!?_licensedir:%global license %%doc}
-%license COPYING.LGPL
-%doc python/pycryptsetup-test.py
-%exclude %{python_sitearch}/pycryptsetup.la
-%{python2_sitearch}/pycryptsetup.so
-%endif
-
-%if %{python3_enable}
-%files python3
-%{!?_licensedir:%global license %%doc}
-%license COPYING.LGPL
-%doc python/pycryptsetup-test.py
-%exclude %{python3_sitearch}/pycryptsetup.la
-%{python3_sitearch}/pycryptsetup.so
-%endif
-
 %changelog
+* Fri Feb 08 2019 Ondrej Kozina <okozina@redhat.com> - 2.1.0-1
+- Update to cryptsetup 2.1.0.
+- Drop python specific bits from spec file (python was removed
+  from upstream project)
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (cryptsetup-2.0.6.tar.xz) = 1fdb9068fe2b5825cef65323a9b788b5e043c1000e614e47e2b21ab3969e416653580aba639755ba936718ad612b986768029df5e07f3fa191db2bf29d2501ef
+SHA512 (cryptsetup-2.1.0.tar.xz) = f1b68e4d9d0ca2361fe9bdd51c60630dd4ab7a689b7be7756edf4dee12929d2356dd0658c9b940ffe27c033ef289efaf49daf21d250d37fdfa15394b5d821928