osc copypac from project:security package:cryptsetup revision:79

OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=81

bootcrypto_filestousr.diff

@@ -1,15 +0,0 @@
-Index: boot.crypto-0_201110101134/Makefile
-===================================================================
---- boot.crypto-0_201110101134.orig/Makefile.orig
-+++ boot.crypto-0_201110101134/Makefile
-@@ -1,8 +1,8 @@
- initscriptdir=/etc/init.d
--pkglibdir=/lib/cryptsetup
-+pkglibdir=/usr/lib/cryptsetup
- mandir=/usr/share/man
- sysconfdir=/etc
--initrdscriptsdir=/lib/mkinitrd/scripts
-+initrdscriptsdir=/usr/lib/mkinitrd/scripts
- sbindir=/usr/sbin
- 
- ASCIIDOC=asciidoc

cryptsetup.changes

@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Sat Feb  4 15:21:14 UTC 2012 - rschweikert@suse.com
-
-- place everything in /usr tree (UsrMerge project)
-
 -------------------------------------------------------------------
 Fri Dec 16 13:06:18 UTC 2011 - jengelh@medozas.de
 

cryptsetup.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cryptsetup
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,24 +20,20 @@
 %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
+BuildRequires:  device-mapper-devel e2fsprogs-devel libgcrypt-devel popt-devel
-BuildRequires:  e2fsprogs-devel
+BuildRequires:  libselinux-devel pkgconfig
-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_201110101134
-Version:        1.4.1
-Release:        0
-#Release:        %{?beta:0.}<CI_CNT>.<B_CNT>%{?beta:.}%{?beta}
-Summary:        Set Up dm-crypt Based Encrypted Block Devices
 License:        GPL-2.0+
 Group:          System/Base
+Version:        1.4.1
+Release:        2
+#Release:        %{?beta:0.}<CI_CNT>.<B_CNT>%{?beta:.}%{?beta}
+Summary:        Set Up dm-crypt Based Encrypted Block Devices
 Source:         http://cryptsetup.googlecode.com/files/cryptsetup-%{ver}.tar.bz2
 Source1:        http://cryptsetup.googlecode.com/files/cryptsetup-%{ver}.tar.bz2.asc
 Source2:        baselibs.conf
@@ -54,7 +50,6 @@ Patch13:        hashalot-timeout.diff
 Patch14:        hashalot-manpage.diff
 Patch15:        bug-476290_hashalot-hashlen.diff
 Patch16:        hashalot-glibc210.diff
-Patch17:        bootcrypto_filestousr.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       aaa_base:/etc/init.d/boot.crypto
 Obsoletes:      util-linux-crypto <= 2.12r
@@ -71,6 +66,7 @@ includes support for automatically setting up encrypted volumes at boot
 time via the config file /etc/crypttab.
 
 %package -n libcryptsetup4
+License:        GPL-2.0+
 Summary:        Set Up dm-crypt Based Encrypted Block Devices
 Group:          System/Base
 
@@ -82,6 +78,7 @@ includes support for automatically setting up encrypted volumes at boot
 time via the config file /etc/crypttab.
 
 %package -n libcryptsetup-devel
+License:        GPL-2.0+
 Summary:        Set Up dm-crypt Based Encrypted Block Devices
 Group:          Development/Libraries/C and C++
 # cryptsetup-devel last used 11.1
@@ -110,7 +107,7 @@ pushd ../hashalot-%haver
 %patch16 -p1
 popd
 pushd ../boot.crypto-%bcver
-%patch17 -p1
+#patch20 -p1
 popd
 
 %build
@@ -119,6 +116,8 @@ popd
 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-selinux
 make %{?_smp_mflags}
@@ -127,33 +126,31 @@ make %{?_smp_mflags}
 pushd ../hashalot-%haver
 autoreconf -f -i
 %{?suse_update_config:%{suse_update_config}}
-%configure
+%configure --sbindir=/sbin
 make %{?_smp_mflags}
 popd
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%_libdir/*.la
+# 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
+# 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/%{_sbindir}/{rmd160,sha256,sha384,sha512}
+rm -f $RPM_BUILD_ROOT/sbin/{rmd160,sha256,sha384,sha512}
-##
+#
-## boot.crypto
+# boot.crypto
-make -C ../boot.crypto-* install DESTDIR=$RPM_BUILD_ROOT
+make -C ../boot.crypto-* install DESTDIR=$RPM_BUILD_ROOT
-ln -s /etc/init.d/boot.crypto $RPM_BUILD_ROOT/%{_sbindir}/rccrypto
+ln -s /etc/init.d/boot.crypto $RPM_BUILD_ROOT/sbin/rccrypto
 #
-#UsrMerge
-mkdir -p $RPM_BUILD_ROOT/{lib,sbin}
-ln -sf %{_sbindir}/{cryptsetup,hashalot} $RPM_BUILD_ROOT/sbin
-ln -sf /etc/init.d/boot.crypto $RPM_BUILD_ROOT/sbin/rccrypto
-pushd $RPM_BUILD_ROOT/usr/lib
-  ln -s mkinitdir ../../lib
-  ln -s cryptsetup ../../lib
-popd
-#EndUserMerge
 %find_lang %name --all-name
 
 %pre
@@ -202,32 +199,25 @@ fi
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/cryptotab
 /etc/init.d/boot.crypto
 /etc/init.d/boot.crypto-early
-%_sbindir/convert_cryptotab
+%dir /lib/mkinitrd
-%_sbindir/cryptsetup
+%dir /lib/mkinitrd/scripts
-%_sbindir/hashalot
+/lib/mkinitrd/scripts/setup-luks.sh
-%_sbindir/rccrypto
+/lib/mkinitrd/scripts/boot-luks.sh
-%dir /usr/lib/mkinitrd
+/lib/mkinitrd/scripts/setup-luks2.sh
-%dir /usr/lib/mkinitrd/scripts
+/lib/mkinitrd/scripts/setup-luks_final.sh
-/usr/lib/mkinitrd/scripts/setup-luks.sh
+/usr/sbin/convert_cryptotab
-/usr/lib/mkinitrd/scripts/boot-luks.sh
+/sbin/cryptsetup
-/usr/lib/mkinitrd/scripts/setup-luks2.sh
+/sbin/hashalot
-/usr/lib/mkinitrd/scripts/setup-luks_final.sh
+/sbin/rccrypto
-/usr/lib/cryptsetup
 %_mandir/man1/hashalot.1.gz
 %_mandir/man8/cryptsetup.8.gz
 %_mandir/man5/crypttab.5.gz
 %_mandir/man5/cryptotab.5.gz
-#UsrMerge
-/sbin/cryptsetup
-/sbin/hashalot
-/sbin/rccrypto
 /lib/cryptsetup
-/lib/mkinitdir
-#EndUserMerge
 
 %files -n libcryptsetup4
 %defattr(-,root,root)
-%_libdir/libcryptsetup.so.4*
+/%_lib/libcryptsetup.so.4*
 
 %files -n libcryptsetup-devel
 %defattr(-,root,root)