Hello community, here is the log from the commit of package cryptsetup for openSUSE:Factory checked in at 2012-12-21 14:32:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cryptsetup (Old) and /work/SRC/openSUSE:Factory/.cryptsetup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cryptsetup", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/cryptsetup/cryptsetup.changes 2012-11-03 08:18:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cryptsetup.new/cryptsetup.changes 2012-12-21 14:32:59.000000000 +0100 @@ -1,0 +2,24 @@ +Thu Dec 13 10:46:43 UTC 2012 - [email protected] + +- version 1.5.1: + * Added keyslot checker + * Add crypt_keyslot_area() API call. + * Optimize seek to keyfile-offset (Issue #135, thx to dreisner). + * Fix luksHeaderBackup for very old v1.0 unaligned LUKS headers. + * Allocate loop device late (only when real block device needed). + * Rework underlying device/file access functions. + * Create hash image if doesn't exist in veritysetup format. + * Provide better error message if running as non-root user (device-mapper, loop). + +------------------------------------------------------------------- +Wed Dec 12 16:00:29 UTC 2012 - [email protected] + +- split off hashalot and boot.crypto +- move to /usr + +------------------------------------------------------------------- +Tue Nov 20 18:41:11 CET 2012 - [email protected] + +- Verify GPG signature. + +------------------------------------------------------------------- Old: ---- boot.crypto-0_201206151440.tar.bz2 bug-476290_hashalot-hashlen.diff cryptsetup-1.5.0.tar.bz2 cryptsetup-1.5.0.tar.bz2.asc cryptsetup-mktar hashalot-0.3.tar.bz2 hashalot-ctrl-d.diff hashalot-fixes.diff hashalot-glibc210.diff hashalot-libgcrypt.diff hashalot-manpage.diff hashalot-timeout.diff New: ---- cryptsetup-1.5.1.tar.bz2 cryptsetup-1.5.1.tar.bz2.asc cryptsetup.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cryptsetup.spec ++++++ --- /var/tmp/diff_new_pack.ty6ACN/_old 2012-12-21 14:33:01.000000000 +0100 +++ /var/tmp/diff_new_pack.ty6ACN/_new 2012-12-21 14:33:01.000000000 +0100 @@ -23,16 +23,13 @@ Url: http://code.google.com/p/cryptsetup/ BuildRequires: device-mapper-devel BuildRequires: e2fsprogs-devel +BuildRequires: gpg-offline BuildRequires: libgcrypt-devel BuildRequires: libselinux-devel BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: popt-devel -# hashalot version -%define haver 0.3 -# boot.crypto version -%define bcver 0_201206151440 -Version: 1.5.0 +Version: 1.5.1 Release: 0 #Release: %{?beta:0.}<CI_CNT>.<B_CNT>%{?beta:.}%{?beta} Summary: Set Up dm-crypt Based Encrypted Block Devices @@ -41,26 +38,8 @@ Source: http://cryptsetup.googlecode.com/files/cryptsetup-%{ver}.tar.bz2 Source1: http://cryptsetup.googlecode.com/files/cryptsetup-%{ver}.tar.bz2.asc Source2: baselibs.conf -Source10: hashalot-%haver.tar.bz2 -# git://gitorious.org/opensuse/boot_crypto.git -Source20: boot.crypto-%{bcver}.tar.bz2 -# use this to create the tarball from svn -Source99: cryptsetup-mktar -#Patch0: cryptsetup-svn131-noascii.diff -Patch10: hashalot-fixes.diff -Patch11: hashalot-libgcrypt.diff -Patch12: hashalot-ctrl-d.diff -Patch13: hashalot-timeout.diff -Patch14: hashalot-manpage.diff -Patch15: bug-476290_hashalot-hashlen.diff -Patch16: hashalot-glibc210.diff +Source3: %{name}.keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: aaa_base:/etc/init.d/boot.crypto -Obsoletes: util-linux-crypto <= 2.12r -# we need losetup -Requires: util-linux -PreReq: %fillup_prereq %insserv_prereq -PreReq: coreutils diffutils %description cryptsetup is used to conveniently set up dm-crypt based device-mapper @@ -101,20 +80,8 @@ time via the config file /etc/crypttab. %prep -%setup -n %name-%ver -q -b 10 -b 20 -#patch0 -p1 -pushd ../hashalot-%haver -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -popd -pushd ../boot.crypto-%bcver -#patch20 -p1 -popd +%gpg_verify %{S:1} +%setup -n %name-%ver -q %build # cryptsetup build @@ -122,61 +89,24 @@ autoreconf -f -i test -e po/Makevars || cp po/Makevars.template po/Makevars %configure \ - --libdir=/%_lib \ - --bindir=/sbin --sbindir=/sbin \ --disable-static --enable-shared \ --enable-cryptsetup-reencrypt \ --enable-selinux make %{?_smp_mflags} -# -# hashalot build -pushd ../hashalot-%haver -autoreconf -f -i -%{?suse_update_config:%{suse_update_config}} -%configure --sbindir=/sbin -make %{?_smp_mflags} -popd %install 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.4 $RPM_BUILD_ROOT%{_libdir}/libcryptsetup.so -mv $RPM_BUILD_ROOT/%_lib/pkgconfig $RPM_BUILD_ROOT/%_libdir +install -d -m 755 $RPM_BUILD_ROOT/sbin +ln -s ..%{_sbindir}/cryptsetup $RPM_BUILD_ROOT/sbin # 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 -# -# hashalot install -pushd ../hashalot-%haver -make install DESTDIR=$RPM_BUILD_ROOT -popd -# remove unwanted symlinks -rm -f $RPM_BUILD_ROOT/sbin/{rmd160,sha256,sha384,sha512} -# -# boot.crypto -make -C ../boot.crypto-* install DESTDIR=$RPM_BUILD_ROOT -ln -s /etc/init.d/boot.crypto $RPM_BUILD_ROOT/sbin/rccrypto +rm -f $RPM_BUILD_ROOT/%_libdir/*.la # %find_lang %name --all-name -# systemd is now providing cryptsetup manpage -rm -f $RPM_BUILD_ROOT%_mandir/man5/crypttab.5* - %pre -# hack to catch update case from aaa_base/util-linux-crypto -if [ -f /etc/init.d/boot.d/S??boot.crypto ]; then - touch /var/run/cryptsetup.boot.crypto.enabled -fi %post -[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup -%{fillup_and_insserv boot.crypto} -if [ -e /var/run/cryptsetup.boot.crypto.enabled ]; then - rm -f /var/run/cryptsetup.boot.crypto.enabled - %{fillup_and_insserv -fY boot.crypto} -fi -%{fillup_and_insserv boot.crypto-early} +test -n "$FIRST_ARG" || FIRST_ARG="$1" # # convert noauto to nofail and turn on fsck (bnc#724113) # @@ -195,42 +125,25 @@ fi fi -%postun -[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup -%{insserv_cleanup} - %post -n libcryptsetup4 -p /sbin/ldconfig %postun -n libcryptsetup4 -p /sbin/ldconfig %files -f %name.lang %defattr(-,root,root) -%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab -%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/cryptotab -/etc/init.d/boot.crypto -/etc/init.d/boot.crypto-early -%dir /lib/mkinitrd -%dir /lib/mkinitrd/scripts -/lib/mkinitrd/scripts/setup-luks.sh -/lib/mkinitrd/scripts/boot-luks.sh -/lib/mkinitrd/scripts/setup-luks2.sh -/lib/mkinitrd/scripts/setup-luks_final.sh -/usr/sbin/convert_cryptotab +#ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab +#ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/cryptotab /sbin/cryptsetup -/sbin/veritysetup -/sbin/hashalot -/sbin/rccrypto -/sbin/cryptsetup-reencrypt -%_mandir/man1/hashalot.1.gz +%{_sbindir}/cryptsetup +%{_sbindir}/veritysetup +%{_sbindir}/cryptsetup-reencrypt %_mandir/man8/cryptsetup.8.gz %_mandir/man8/cryptsetup-reencrypt.8.gz %_mandir/man8/veritysetup.8.gz -%_mandir/man5/cryptotab.5.gz -/lib/cryptsetup %files -n libcryptsetup4 %defattr(-,root,root) -/%_lib/libcryptsetup.so.4* +/%{_libdir}/libcryptsetup.so.4* %files -n libcryptsetup-devel %defattr(-,root,root) ++++++ cryptsetup-1.5.0.tar.bz2 -> cryptsetup-1.5.1.tar.bz2 ++++++ ++++ 31598 lines of diff (skipped) ++++++ cryptsetup.keyring ++++++ pub 4096R/D93E98FC 2012-04-01 [expires: 2022-03-30] uid Milan Broz <[email protected]> sub 4096R/4BBD6F43 2012-04-01 [expires: 2022-03-30] -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2.0.19 (GNU/Linux) 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 dgr42jrtvzRmJp4= =E79s -----END PGP PUBLIC KEY BLOCK----- -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
