SHA256
1
0
forked from pool/cryptsetup

Accepting request 96862 from home:jengelh:branches:security

Update to new upstream release 1.4.1; trim support, amongst it

OBS-URL: https://build.opensuse.org/request/show/96862
OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=78
This commit is contained in:
Cristian Rodríguez 2011-12-18 20:29:05 +00:00 committed by Git OBS Bridge
parent 6b18da047e
commit a97c0c5911
7 changed files with 32 additions and 21 deletions

View File

@ -1 +1 @@
libcryptsetup1 libcryptsetup4

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ceb18a0c91fa1546077b41b93463dd2ec9d7f83e6fd93757fb84cc608206a6a
size 597201

View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAk3byrQACgkQf1Jlc7shgi9NpQCgj6SLnft/s7jc2BA/q+oJ+W2l
FboAn3dYw0gs4LZekhgq5JYnv/osT4lb
=Uw6K
-----END PGP SIGNATURE-----

3
cryptsetup-1.4.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb
size 772971

View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAk66cjgACgkQf1Jlc7shgi8zmQCeI8JsH4Dma49+YoQLfZdzHoIH
OHgAn2z9CBsNJizgHJe+46OcaIPL/gQi
=E/yV
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Dec 16 13:06:18 UTC 2011 - jengelh@medozas.de
- Update to new upstream release 1.4.1
* support for trim/discard
* The on-disk LUKS header can now be detached (e.g. placed on
separate device or in file)
* Support key-slot option for luksOpen (use only explicit keyslot)
* API: Removal of deprecated API from libcryptsetup (all functions
using struct crypt_options)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 27 15:53:20 UTC 2011 - lnussel@suse.de Thu Oct 27 15:53:20 UTC 2011 - lnussel@suse.de

View File

@ -20,7 +20,7 @@
%define ver %version%{?beta:-%beta} %define ver %version%{?beta:-%beta}
Name: cryptsetup Name: cryptsetup
Url: http://code.google.com/p/cryptsetup/ URL: http://code.google.com/p/cryptsetup/
BuildRequires: device-mapper-devel e2fsprogs-devel libgcrypt-devel popt-devel BuildRequires: device-mapper-devel e2fsprogs-devel libgcrypt-devel popt-devel
BuildRequires: libselinux-devel pkgconfig BuildRequires: libselinux-devel pkgconfig
BuildRequires: libtool BuildRequires: libtool
@ -30,7 +30,7 @@ BuildRequires: libtool
%define bcver 0_201110101134 %define bcver 0_201110101134
License: GPL-2.0+ License: GPL-2.0+
Group: System/Base Group: System/Base
Version: 1.3.1 Version: 1.4.1
Release: 2 Release: 2
#Release: %{?beta:0.}<CI_CNT>.<B_CNT>%{?beta:.}%{?beta} #Release: %{?beta:0.}<CI_CNT>.<B_CNT>%{?beta:.}%{?beta}
Summary: Set Up dm-crypt Based Encrypted Block Devices Summary: Set Up dm-crypt Based Encrypted Block Devices
@ -65,12 +65,12 @@ volumes as well as LUKS formatted ones. The package additionally
includes support for automatically setting up encrypted volumes at boot includes support for automatically setting up encrypted volumes at boot
time via the config file /etc/crypttab. time via the config file /etc/crypttab.
%package -n libcryptsetup1 %package -n libcryptsetup4
License: GPL-2.0+ License: GPL-2.0+
Summary: Set Up dm-crypt Based Encrypted Block Devices Summary: Set Up dm-crypt Based Encrypted Block Devices
Group: System/Base Group: System/Base
%description -n libcryptsetup1 %description -n libcryptsetup4
cryptsetup is used to conveniently set up dm-crypt based device-mapper cryptsetup is used to conveniently set up dm-crypt based device-mapper
targets. It allows to set up targets to read cryptoloop compatible targets. It allows to set up targets to read cryptoloop compatible
volumes as well as LUKS formatted ones. The package additionally volumes as well as LUKS formatted ones. The package additionally
@ -84,7 +84,7 @@ Group: Development/Libraries/C and C++
# cryptsetup-devel last used 11.1 # cryptsetup-devel last used 11.1
Provides: cryptsetup-devel = %{version} Provides: cryptsetup-devel = %{version}
Obsoletes: cryptsetup-devel < %{version} Obsoletes: cryptsetup-devel < %{version}
Requires: libcryptsetup1 = %{version} Requires: libcryptsetup4 = %{version}
Requires: device-mapper-devel libgcrypt-devel libgpg-error-devel e2fsprogs-devel glibc-devel Requires: device-mapper-devel libgcrypt-devel libgpg-error-devel e2fsprogs-devel glibc-devel
%description -n libcryptsetup-devel %description -n libcryptsetup-devel
@ -135,7 +135,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
# move devel stuff to %%{libdir} # move devel stuff to %%{libdir}
rm -f $RPM_BUILD_ROOT/%{_lib}/libcryptsetup.so rm -f $RPM_BUILD_ROOT/%{_lib}/libcryptsetup.so
mkdir -p $RPM_BUILD_ROOT%{_libdir} mkdir -p $RPM_BUILD_ROOT%{_libdir}
ln -s /%{_lib}/libcryptsetup.so.1 $RPM_BUILD_ROOT%{_libdir}/libcryptsetup.so ln -s /%{_lib}/libcryptsetup.so.4 $RPM_BUILD_ROOT%{_libdir}/libcryptsetup.so
mv $RPM_BUILD_ROOT/%_lib/pkgconfig $RPM_BUILD_ROOT/%_libdir mv $RPM_BUILD_ROOT/%_lib/pkgconfig $RPM_BUILD_ROOT/%_libdir
# don't want this file in /lib (FHS compat check), and can't move it to /usr/lib # don't want this file in /lib (FHS compat check), and can't move it to /usr/lib
rm -f $RPM_BUILD_ROOT/%_lib/*.la rm -f $RPM_BUILD_ROOT/%_lib/*.la
@ -189,9 +189,9 @@ fi
[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
%{insserv_cleanup} %{insserv_cleanup}
%post -n libcryptsetup1 -p /sbin/ldconfig %post -n libcryptsetup4 -p /sbin/ldconfig
%postun -n libcryptsetup1 -p /sbin/ldconfig %postun -n libcryptsetup4 -p /sbin/ldconfig
%files -f %name.lang %files -f %name.lang
%defattr(-,root,root) %defattr(-,root,root)
@ -215,9 +215,9 @@ fi
%_mandir/man5/cryptotab.5.gz %_mandir/man5/cryptotab.5.gz
/lib/cryptsetup /lib/cryptsetup
%files -n libcryptsetup1 %files -n libcryptsetup4
%defattr(-,root,root) %defattr(-,root,root)
/%_lib/libcryptsetup.so.1* /%_lib/libcryptsetup.so.4*
%files -n libcryptsetup-devel %files -n libcryptsetup-devel
%defattr(-,root,root) %defattr(-,root,root)