diff --git a/baselibs.conf b/baselibs.conf index bf131f3..7819b67 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libcryptsetup1 +libcryptsetup4 diff --git a/cryptsetup-1.3.1.tar.bz2 b/cryptsetup-1.3.1.tar.bz2 deleted file mode 100644 index 99ab836..0000000 --- a/cryptsetup-1.3.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ceb18a0c91fa1546077b41b93463dd2ec9d7f83e6fd93757fb84cc608206a6a -size 597201 diff --git a/cryptsetup-1.3.1.tar.bz2.asc b/cryptsetup-1.3.1.tar.bz2.asc deleted file mode 100644 index 0cb87cc..0000000 --- a/cryptsetup-1.3.1.tar.bz2.asc +++ /dev/null @@ -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----- diff --git a/cryptsetup-1.4.1.tar.bz2 b/cryptsetup-1.4.1.tar.bz2 new file mode 100644 index 0000000..8e58da3 --- /dev/null +++ b/cryptsetup-1.4.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb +size 772971 diff --git a/cryptsetup-1.4.1.tar.bz2.asc b/cryptsetup-1.4.1.tar.bz2.asc new file mode 100644 index 0000000..d0588ea --- /dev/null +++ b/cryptsetup-1.4.1.tar.bz2.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAk66cjgACgkQf1Jlc7shgi8zmQCeI8JsH4Dma49+YoQLfZdzHoIH +OHgAn2z9CBsNJizgHJe+46OcaIPL/gQi +=E/yV +-----END PGP SIGNATURE----- diff --git a/cryptsetup.changes b/cryptsetup.changes index 4ec3b97..734fb74 100644 --- a/cryptsetup.changes +++ b/cryptsetup.changes @@ -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 diff --git a/cryptsetup.spec b/cryptsetup.spec index eea3761..2830a4b 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -20,7 +20,7 @@ %define ver %version%{?beta:-%beta} 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: libselinux-devel pkgconfig BuildRequires: libtool @@ -30,7 +30,7 @@ BuildRequires: libtool %define bcver 0_201110101134 License: GPL-2.0+ Group: System/Base -Version: 1.3.1 +Version: 1.4.1 Release: 2 #Release: %{?beta:0.}.%{?beta:.}%{?beta} 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 time via the config file /etc/crypttab. -%package -n libcryptsetup1 +%package -n libcryptsetup4 License: GPL-2.0+ Summary: Set Up dm-crypt Based Encrypted Block Devices Group: System/Base -%description -n libcryptsetup1 +%description -n libcryptsetup4 cryptsetup is used to conveniently set up dm-crypt based device-mapper targets. It allows to set up targets to read cryptoloop compatible 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 Provides: 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 %description -n libcryptsetup-devel @@ -135,7 +135,7 @@ make install DESTDIR=$RPM_BUILD_ROOT # move devel stuff to %%{libdir} rm -f $RPM_BUILD_ROOT/%{_lib}/libcryptsetup.so 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 # 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 @@ -189,9 +189,9 @@ fi [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup %{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 %defattr(-,root,root) @@ -215,9 +215,9 @@ fi %_mandir/man5/cryptotab.5.gz /lib/cryptsetup -%files -n libcryptsetup1 +%files -n libcryptsetup4 %defattr(-,root,root) -/%_lib/libcryptsetup.so.1* +/%_lib/libcryptsetup.so.4* %files -n libcryptsetup-devel %defattr(-,root,root)