mbroz pushed to cryptsetup (f22). "Update to cryptsetup 1.6.7. (..more)"

[notifications at fedoraproject.org]

>From 25fc1ca9947b97c1658c2233b1ba29a43bee4ba8 Mon Sep 17 00:00:00 2001
From: Milan Broz <gmazyland at gmail.com>
Date: Mon, 23 Mar 2015 19:17:13 +0100
Subject: Update to cryptsetup 1.6.7. Remove no longer needed fipscheck library
 dependence. Change URL to new homepage.


diff --git a/.gitignore b/.gitignore
index e9128c6..780dd44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/cryptsetup-1.6.6.tar.xz
+/cryptsetup-1.6.7.tar.xz
diff --git a/cryptsetup-1.6.6.tar.sign b/cryptsetup-1.6.6.tar.sign
deleted file mode 100644
index 15d0dad..0000000
--- a/cryptsetup-1.6.6.tar.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABCAAGBQJT7zIAAAoJENmwV3vZPpj8pr4P/01AhigA8Eb7Cq9eF/WnMG3G
-hg8qcmfITYZBZA4bsucnLIhaxDfQ4tt2ESsaNsH1aK05FnJYbXjD/PDdHofDh4tO
-s/goqowY2Tp4V2aBCCQd9tbnfl5T1gqv1vUxzRg9laObHps1E/uuZ3OSC8WDsZoI
-uJSGv4WycV/XInfxoAniLdUxrhvCu04Ea6gEtLoVUGOgJWU3/kFjSCmcN3dbApJs
-Pu67DJPArZW/0sP2G8nn9yOCSbDeSNrNCRgOiz4xscAPtdB+xCcb5NbbqhMb//4B
-BHw6aNeYhS4zVp5Fk974OHkoL20eHBK9wnSQCMnQLpBPN5HqOD1b4tyvAFqhlqU3
-asryxg26zfvSSj31H6a/2EMwnJSxFEut/CA5eTDbXYHmztxDDIUah22HHl/062QV
-Kpq27icixgmqal0cdRW9045cxdP+Yw+GCnyd4bP6CDuSt9n2aS1MatKtR8h76t6V
-LlbJIC2TIIBTpafjWcfCgk2skuFeK/2D9c+5YqaU8HQ+EDcgs63d5WCO1ODAlYbz
-qIjzWAc2u2GqUEstAWafg2Hi35cGlDAWEFUQO80rSsZJpFuZIP+KMMOU+P/DmzMm
-SecVM3/FJbFPAbQZ2rLmRXZmnGWnQqDME1PrrWMTAxIXZVYEpgOLWLeiPCOhwSKG
-lzsftYJ4VhmI9Mib76RA
-=2I3V
------END PGP SIGNATURE-----
diff --git a/cryptsetup-1.6.7.tar.sign b/cryptsetup-1.6.7.tar.sign
new file mode 100644
index 0000000..f032fbd
--- /dev/null
+++ b/cryptsetup-1.6.7.tar.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIbBAABCAAGBQJVEE3fAAoJENmwV3vZPpj8ql4P9ijvmO15ur4wpcGFkNYyzfuA
+Y17yaTT6Nde8cGLUCpw7rPBoxL/b4ZArJnNk9UP73MyycxfVijaX5XxxoQbpL8n0
+cn1vdXTFzqXGBTJkjO0uQor1szQbvaz7xbk7LeBgG+j/zZGRa/0AKs42qvTaWzHu
+G50AqksMGFV1ih+d4wYdD+AqcUf6h+1HQRjq/DqEurg1EHQ+iMqem1htvrzTq8+V
+ym3xHM+JxJ04syzPb92VntSmyfX6ztmh+61cflQiOrIbTw+MFeGmYMOTufkWmQFi
+gFC+7mXTjO1YkmN+RFYZ52WY3shk3BLhAXT/pFlGFjwfHqrvFgfj+Iu9STVs2du2
+LLa+xF5yxaKyHHKkw2wn7edeepzfwSp0+lmDy8B0SGXh5wGNreNSX3IMAdJeJztM
+7EyJa5JUSMfKWPHzy1gGYZRN/NQGGqG3c1+Sw5hy/ukFtLC4DSu5OtJNOt2c8MNw
++XPXh+Ssy+ma9e0E+pnmRYQ/nY2BWuN/gFB5Gvr08d4hifP9+LzI+bgQx4gNjB5Y
+9py0moXVOxn/TICXSFgjDmvYgw7BZRVtaHFfkiKA5DrBeS07MROKzL59ykiuU7HW
+HvCs3icShV+oSt79bMa7E+QhKRsBicS30QyLecttHkxbLxSg55qFpMa7m8+6VG2Y
+LsfZNLwWJmf8jU9YUY0=
+=jDZw
+-----END PGP SIGNATURE-----
diff --git a/cryptsetup.spec b/cryptsetup.spec
index ce63686..e7ccbe9 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -2,20 +2,18 @@
 
 Summary: A utility for setting up encrypted disks
 Name: cryptsetup
-Version: 1.6.6
+Version: 1.6.7
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
-URL: http://cryptsetup.googlecode.com/
+URL: https://gitlab.com/cryptsetup/cryptsetup
 BuildRequires: libgcrypt-devel, popt-devel, device-mapper-devel
 BuildRequires: libgpg-error-devel, libuuid-devel, libsepol-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
 Requires: cryptsetup-libs = %{version}-%{release}
-Requires: fipscheck-lib%{_isa} >= 1.3.0
 Requires: libpwquality >= 1.2.0
 
 %define upstream_version %{version}
@@ -43,7 +41,6 @@ Group: System Environment/Libraries
 Summary: Cryptsetup shared library
 Provides: cryptsetup-luks-libs = %{version}-%{release}
 Obsoletes: cryptsetup-luks-libs < 1.4.0
-Requires: fipscheck-lib%{_isa} >= 1.3.0
 # Need support for fixed gcrypt PBKDF2 and fixed Whirlpool hash.
 Requires: libgcrypt >= 1.6.1
 
@@ -110,17 +107,8 @@ make %{?_smp_mflags}
 popd
 
 %install
-# Generate HMAC checksums (FIPS)
-%define __spec_install_post \
-  %{?__debug_package:%{__debug_install_post}} \
-  %{__arch_install_post} \
-  %{__os_install_post} \
-  fipshmac -d %{buildroot}/%{_libdir}/fipscheck %{buildroot}/%{_libdir}/libcryptsetup.so.* \
-%{nil}
-
 make install DESTDIR=%{buildroot}
 rm -rf %{buildroot}/%{_libdir}/*.la
-install -d %{buildroot}/%{_libdir}/fipscheck
 
 pushd %{py3dir}
 make install DESTDIR=%{buildroot}
@@ -162,7 +150,6 @@ popd
 %{!?_licensedir:%global license %%doc}
 %license COPYING COPYING.LGPL
 %{_libdir}/libcryptsetup.so.*
-%{_libdir}/fipscheck/libcryptsetup.so.*.hmac
 
 %files python
 %{!?_licensedir:%global license %%doc}
@@ -181,6 +168,11 @@ popd
 %clean
 
 %changelog
+* Mon Mar 23 2015 Milan Broz <gmazyland at gmail.com> - 1.6.7-1
+- Update to cryptsetup 1.6.7.
+- Remove no longer needed fipscheck library dependence.
+- Change URL to new homepage.
+
 * Sat Aug 16 2014 Milan Broz <gmazyland at gmail.com> - 1.6.6-1
 - Update to cryptsetup 1.6.6.
 
diff --git a/sources b/sources
index fecf4b5..66bf23e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-179c0781de59838a4e39f61b2df5ea48  cryptsetup-1.6.6.tar.xz
+918406eb5d2e2f5a7348c432ea9b1473  cryptsetup-1.6.7.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cryptsetup.git/commit/?h=f22&id=25fc1ca9947b97c1658c2233b1ba29a43bee4ba8