From 0d1e810867256667ba24e21c9965e78b2175b6d4 Mon Sep 17 00:00:00 2001
From: Milan Broz <gmazyland@gmail.com>
Date: Jan 21 2018 12:29:49 +0000
Subject: Update to cryptsetup 2.0.1.


---

diff --git a/.gitignore b/.gitignore
index be5cef5..64d406b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/cryptsetup-2.0.0.tar.xz
+/cryptsetup-2.0.1.tar.xz
diff --git a/cryptsetup-2.0.0-rc1.tar.sign b/cryptsetup-2.0.0-rc1.tar.sign
deleted file mode 100644
index ca325f4..0000000
--- a/cryptsetup-2.0.0-rc1.tar.sign
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAln5lawACgkQ2bBXe9k+
-mPz8iBAAprrjsO4tsOeQJBlMjfg1sTrCnhUjjWjc5qJUpN+dHhqfJgi4NUdQP6Qx
-f/S2xTa+fskq2DtskXHVSnwiTaholT0KOVpm8L+Zov+7llQuiOf9e0Qk0bjFKQP8
-UjmEvsPzzkHg8r71N8T/GoPKkWZiGcY/KdIDMgAVxPb9whF0rV2wFJ26ZtDEvxRr
-8GIrxmb3YzQjwp+JHklhSreUHmwnEV3s0VNlauOYlaf99oZXyFZ6INbeRpYCjdXJ
-JPHYXOhIYv1uVldEsS8GNa+iEZEUCNBQhwkFkS94XLpaY/MDIIXBsL1DRFhFJqjz
-7LVLzJf6/S+KEdYZTZFesCcx28puzk4oKyXcwLXbUgHgCn60/UJqYaUc2/tc8NTY
-2pue6GcoZp0rbbe9gvPJ5P/0bkM/4IGNXEpfYWbCAUb9vHochg/3FOumE61xoX37
-fYwMctDjTW2xhNlzQlwmMcGJyhUVC4+Epcb3yrHeiw+DqsM5kdjzrvZEkYTquSxv
-xnRsteCIsNCwYRrA30epvkiXaeEUlf3dR9CwSWRhp06KsieGIxgvSvoGXh6dWgnF
-/eMd1yBRR0Fjt49CkUFxUeCMbPWnNUEjp/7TS/nKvpRieBgyncvgxZVA+FVZ6N+d
-cg9uMuQ8rApwOpTFBHU5j2A70i72C+7G5+SHCYSqUvKZTqwPhhw=
-=fFiV
------END PGP SIGNATURE-----
diff --git a/cryptsetup-2.0.1.tar.sign b/cryptsetup-2.0.1.tar.sign
new file mode 100644
index 0000000..8d79043
--- /dev/null
+++ b/cryptsetup-2.0.1.tar.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAlpkfDAACgkQ2bBXe9k+
+mPxsUA//dMQaPwqITtohSntd+xGobT4uvlL/7B7MzD+61wSSh0gEk5wkpGkF4laL
+7ai9JL9j2t0djBtCykFgke6VoWupZze9cSlOm/CV227wdBSwdOFo/Y5MlEWNozoT
+JS1il/TM/egsxAt6GN7jUYPJ/TtcaFaLIZWXEb+xAT91Ep5FAL4Kpeu5Jd6m2hA0
+tWy3JtPeICp7z2gNvrb5bid3CzHTE6y5fgK5hoLtHQASCOvDUrEtCCuB+6USqtS1
+3dZ4uhm1p+MuEgSo5K4OZfbc0lT56qtIdnrqD+HveRJUbeqyBhaj71SSJgmfE+Em
+AS07LlZwqwozKopK4/e97Nq8PHAidj6NNbWBXs8cWidzAQCAo3y0yTfAVQsj0mJh
+PRNUOrL9Ev2klNo63swIe121aPitX2ybeIWMNGbdg8NYm8jhYfVUp2jAsP12V2rZ
+daFu46t3ZZQwYHKp7jgR83ghj7J7qynqWT+Z3BUoNg+vvD5d5ZWJTvxEOgSvzkle
+HjkJoW0bZoCvzzArVAlMCl5u+JpEGZQe0XCQyzfU1Glkur1EVKdpMvF8OusjtyZb
+t6va9N9zDgX3b6BiA9HMB2EWwfXNDICNPEf5dOHPECsLx/tT2+BCtFIlKE7ne2r+
+iwIepRcMYL9kPSu5nTnCpImTWvPNBqJe8vfCaXMZi91H6ZQGwCE=
+=WOMG
+-----END PGP SIGNATURE-----
diff --git a/cryptsetup.spec b/cryptsetup.spec
index b7a57da..0011784 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -2,8 +2,8 @@
 
 Summary: A utility for setting up encrypted disks
 Name: cryptsetup
-Version: 2.0.0
-Release: 3%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
 URL: https://gitlab.com/cryptsetup/cryptsetup
@@ -17,7 +17,6 @@ Requires: cryptsetup-libs = %{version}-%{release}
 Requires: libpwquality >= 1.2.0
 
 %global upstream_version %{version}
-%global luks2_locking_dir /run/cryptsetup
 Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-%{upstream_version}.tar.xz
 
 %description
@@ -109,16 +108,14 @@ chmod -x misc/dracut_90reencrypt/*
 cp -a . %{py3dir}
 
 %build
-# remove --with-luks2-lock-path after upstream cryptsetup release > 2.0.0
-%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 --with-luks2-lock-path=%{luks2_locking_dir} %{?configure_pbkdf2}
+%configure --enable-python --enable-fips --enable-pwquality --enable-libargon2 %{?configure_pbkdf2}
 # remove rpath
 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}
-# remove --with-luks2-lock-path after upstream cryptsetup release > 2.0.0
-%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 --with-luks2-lock-path=%{luks2_locking_dir} %{?configure_pbkdf2}
+%configure --enable-python --with-python_version=3 --enable-fips --enable-pwquality --enable-libargon2 %{?configure_pbkdf2}
 make %{?_smp_mflags}
 popd
 
@@ -173,7 +170,7 @@ popd
 %license COPYING COPYING.LGPL
 %{_libdir}/libcryptsetup.so.*
 %{_tmpfilesdir}/cryptsetup.conf
-%ghost %dir %{luks2_locking_dir}
+%ghost %dir /run/cryptsetup
 
 %files -n python2-cryptsetup
 %{!?_licensedir:%global license %%doc}
@@ -192,6 +189,9 @@ popd
 %clean
 
 %changelog
+* Sun Jan 21 2018 Milan Broz <gmazyland@gmail.com> - 2.0.1-1
+- Update to cryptsetup 2.0.1.
+
 * Thu Jan 04 2018 Ondrej Kozina <okozina@redhat.com> - 2.0.0-3
 - Override locking path to /run/cryptsetup (going to be new default)
 - Claim ownership of the locking directory
diff --git a/sources b/sources
index 8c32b71..33b824a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cryptsetup-2.0.0.tar.xz) = 195e9c0b6429d21ec0cc7c5faddfde85cb71eee09d348fa50df6779693a2dc05fce04bada4c835150964e08b2e8af30e4194155e0f6366b24c7812f48477a249
+SHA512 (cryptsetup-2.0.1.tar.xz) = b0c16de67169aefe861e0d6692dfa7ff1d7cf34990611c71edb82606ebf39a529511b36f7c452da591bdc39c4125a4355b7444d268680458219f2cad63e0f74b