Update to cryptsetup 1.6.4.
This commit is contained in:
Milan Broz
parent
aec00a0326
commit
6b63724e67
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
/cryptsetup-1.6.3.tar.bz2
|
/cryptsetup-1.6.4.tar.xz
|
||||||
|
|||||||
@ -1,17 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
Version: GnuPG v1.4.15 (GNU/Linux)
|
|
||||||
|
|
||||||
iQIcBAABCAAGBQJSq3HPAAoJENmwV3vZPpj8LakP/A/pql88cfCp5wYdK64Wz57I
|
|
||||||
GLvWaf8xXR+y1swdDyaTx92ntOi1lYk8UK8qXRrjuNf4+xbNsGm/aEKBuUq2NqzR
|
|
||||||
jMbyA68OUTaz8KN103Znt533r5lzm0L7CZXFonFDcriTbWTxSPegHpyy22JdWaZi
|
|
||||||
f18Fer6IpJbGBBlJBagDecr1xT+fbwUsKrTtkD4RVWie7aMgIJJVZrRchOykrF04
|
|
||||||
hMxQs4oYtwLspOHPgpIsoTKPvx56CUadC3vvDYLSs2duVFZKmvW0XjI6EG7zn+de
|
|
||||||
bGF8u9Wsdrl9T+dIIup+U2Az+hZhkc52USYrww/D0+p7SM9N7/6y+TRVNy7vbNr1
|
|
||||||
e0eXrdGdsAxD9HCF4oy5482fet5mltKLCN//yfg3LMOdqMWBypXV2gq8ZL36xi/l
|
|
||||||
E5zzujicoOQ/MUR1eRzZYj6PrXa5WxEwWEXpKVYz6b8g4C+PEQiv6Q3bLesYOxht
|
|
||||||
fy5jMZnWzHcTefKcIgd+I8ef7cmSq4qyX7XkFhndM++ugPFU+bPb5Oqa6Tg4Ju/N
|
|
||||||
QBBSp7uuoAsmdin8aFAd/F3wAgJS4uytsdJfaB7wOTFO9g0CQA/WnzHsc6VW6DYE
|
|
||||||
8wF1cL4k6ypRBTFES8cxQNQV+CNanb/1M8sOotCYAbP11fHtTvp0CJzrSHn4Cuwo
|
|
||||||
rz5bOCCIROqx/HgD0zCE
|
|
||||||
=uOtC
|
|
||||||
-----END PGP SIGNATURE-----
|
|
||||||
17
cryptsetup-1.6.4.tar.sign
Normal file
17
cryptsetup-1.6.4.tar.sign
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
-----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-----
|
||||||
@ -1,7 +1,7 @@
|
|||||||
Summary: A utility for setting up encrypted disks
|
Summary: A utility for setting up encrypted disks
|
||||||
Name: cryptsetup
|
Name: cryptsetup
|
||||||
Version: 1.6.3
|
Version: 1.6.4
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2+ and LGPLv2+
|
License: GPLv2+ and LGPLv2+
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
URL: http://cryptsetup.googlecode.com/
|
URL: http://cryptsetup.googlecode.com/
|
||||||
@ -16,12 +16,13 @@ Requires: fipscheck-lib%{_isa} >= 1.3.0
|
|||||||
Requires: libpwquality >= 1.2.0
|
Requires: libpwquality >= 1.2.0
|
||||||
|
|
||||||
%define upstream_version %{version}
|
%define upstream_version %{version}
|
||||||
Source0: http://cryptsetup.googlecode.com/files/cryptsetup-%{upstream_version}.tar.bz2
|
Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/cryptsetup-%{upstream_version}.tar.xz
|
||||||
|
|
||||||
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
|
# Unpatched PBKDF2 in gcrypt is slow, disable it and use internal one.
|
||||||
%define configure_cipher --enable-gcrypt-pbkdf2
|
%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7
|
||||||
|
%define configure_pbkdf2 --enable-gcrypt-pbkdf2
|
||||||
%else
|
%else
|
||||||
%define configure_cipher --with-luks1-cipher=aes --with-luks1-mode=cbc-essiv:sha256 --with-luks1-keybits=256
|
%define configure_pbkdf2 --disable-gcrypt-pbkdf2
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -47,9 +48,9 @@ Summary: Cryptsetup shared library
|
|||||||
Provides: cryptsetup-luks-libs = %{version}-%{release}
|
Provides: cryptsetup-luks-libs = %{version}-%{release}
|
||||||
Obsoletes: cryptsetup-luks-libs < 1.4.0
|
Obsoletes: cryptsetup-luks-libs < 1.4.0
|
||||||
Requires: fipscheck-lib%{_isa} >= 1.3.0
|
Requires: fipscheck-lib%{_isa} >= 1.3.0
|
||||||
# Need support for empty password in gcrypt PBKDF2
|
# Need support for empty password in gcrypt PBKDF2 and fixed gcrypt PBKDF2
|
||||||
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
|
%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7
|
||||||
Requires: libgcrypt >= 1.5.0-9
|
Requires: libgcrypt >= 1.5.3-3
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description libs
|
%description libs
|
||||||
@ -90,7 +91,7 @@ chmod -x python/pycryptsetup-test.py
|
|||||||
chmod -x misc/dracut_90reencrypt/*
|
chmod -x misc/dracut_90reencrypt/*
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --enable-python --enable-fips --enable-cryptsetup-reencrypt --enable-pwquality %{?configure_cipher}
|
%configure --enable-python --enable-fips --enable-cryptsetup-reencrypt --enable-pwquality %{?configure_pbkdf2}
|
||||||
# remove rpath
|
# remove rpath
|
||||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
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
|
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||||
@ -148,6 +149,9 @@ install -d %{buildroot}/%{_libdir}/fipscheck
|
|||||||
%clean
|
%clean
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 27 2014 Milan Broz <gmazyland@gmail.com> - 1.6.4-1
|
||||||
|
- Update to cryptsetup 1.6.4.
|
||||||
|
|
||||||
* Tue Jan 07 2014 Ondrej Kozina <okozina@redhat.com> - 1.6.3-2
|
* Tue Jan 07 2014 Ondrej Kozina <okozina@redhat.com> - 1.6.3-2
|
||||||
- remove useless hmac checksum
|
- remove useless hmac checksum
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user