packages: cryptsetup-luks/cryptsetup-luks-diet.patch, cryptsetup-luks/crypt...

[arekm]

Author: arekm                        Date: Mon May 30 16:02:31 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; don't drag libs like udev when not needed; use crypto backend kernel

---- Files affected:
packages/cryptsetup-luks:
   cryptsetup-luks-diet.patch (1.5 -> 1.6) , cryptsetup-luks.spec (1.53 -> 1.54) , cryptsetup-luks-dont-drag-more-libs.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cryptsetup-luks/cryptsetup-luks-diet.patch
diff -u packages/cryptsetup-luks/cryptsetup-luks-diet.patch:1.5 packages/cryptsetup-luks/cryptsetup-luks-diet.patch:1.6
--- packages/cryptsetup-luks/cryptsetup-luks-diet.patch:1.5	Sat Jan  1 12:18:49 2011
+++ packages/cryptsetup-luks/cryptsetup-luks-diet.patch	Mon May 30 18:02:22 2011
@@ -48,3 +48,4 @@
  #define div_round_up(a,b) ({           \
  	typeof(a) __a = (a);          \
  	typeof(b) __b = (b);          \
+

================================================================
Index: packages/cryptsetup-luks/cryptsetup-luks.spec
diff -u packages/cryptsetup-luks/cryptsetup-luks.spec:1.53 packages/cryptsetup-luks/cryptsetup-luks.spec:1.54
--- packages/cryptsetup-luks/cryptsetup-luks.spec:1.53	Sat May 28 07:41:31 2011
+++ packages/cryptsetup-luks/cryptsetup-luks.spec	Mon May 30 18:02:22 2011
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	LUKS dla dm-crypta zaimplementowany w cryptsetup
 Name:		cryptsetup-luks
 Version:	1.3.1
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Base
 #Source0Download: http://code.google.com/p/cryptsetup/downloads/list
@@ -22,6 +22,7 @@
 Source5:	%{name}-initramfs-README
 Patch0:		%{name}-diet.patch
 Patch1:		%{name}-pl.po-update.patch
+Patch2:		%{name}-dont-drag-more-libs.patch
 URL:		http://code.google.com/p/cryptsetup/
 BuildRequires:	autoconf >= 2.67
 BuildRequires:	automake
@@ -144,6 +145,7 @@
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 cp -a %{SOURCE5} README.initramfs
 
@@ -162,7 +164,7 @@
 %configure \
 %if %{with dietlibc}
 %configure \
-	CC="diet ${CC#ccache } %{rpmcflags} %{rpmldflags} -Os" \
+	CC="diet ${CC#ccache } %{rpmcppflags} %{rpmcflags} %{rpmldflags} -Os" \
 	LIBS="-lcompat" \
 	ac_cv_lib_popt_poptConfigFileToString=yes \
 	ac_cv_lib_sepol_sepol_bool_set=no \
@@ -174,6 +176,8 @@
 	--disable-shared \
 	--enable-static \
 	--enable-static-cryptsetup \
+	--with-crypto_backend=kernel \
+	--disable-udev \
 	--disable-nls
 
 %{__make} -C lib
@@ -182,7 +186,7 @@
 # we have to do it by hand cause libtool "know better" and forces
 # static libs from /usr/lib
 CC="%{__cc}"
-diet ${CC#ccache } %{rpmcflags} %{rpmldflags} -Os -I. -I./lib -static \
+diet ${CC#ccache } %{rpmcppflags} %{rpmcflags} %{rpmldflags} -Os -I. -I./lib -static \
 	-o cryptsetup-initrd src/cryptsetup.c ./lib/.libs/libcryptsetup.a \
 	-lpopt -lgcrypt -lgpg-error -ldevmapper -luuid -lcompat
 %else
@@ -194,6 +198,7 @@
 %endif
 
 %configure \
+	--enable-udev \
 	--enable-static
 %{__make}
 
@@ -266,6 +271,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2011/05/30 16:02:22  arekm
+- rel 2; don't drag libs like udev when not needed; use crypto backend kernel
+
 Revision 1.53  2011/05/28 05:41:31  qboosh
 - updated to 1.3.1
 - updated pl.po-update patch

================================================================
Index: packages/cryptsetup-luks/cryptsetup-luks-dont-drag-more-libs.patch
diff -u /dev/null packages/cryptsetup-luks/cryptsetup-luks-dont-drag-more-libs.patch:1.1
--- /dev/null	Mon May 30 18:02:31 2011
+++ packages/cryptsetup-luks/cryptsetup-luks-dont-drag-more-libs.patch	Mon May 30 18:02:22 2011
@@ -0,0 +1,22 @@
+--- cryptsetup-1.3.1/configure.in~	2011-05-30 15:48:40.361712101 +0200
++++ cryptsetup-1.3.1/configure.in	2011-05-30 15:52:03.021018901 +0200
+@@ -157,7 +157,7 @@
+ 	[disable udev support]),[], enable_udev=yes)
+ 
+ dnl Try to use pkg-config for devmapper, but fallback to old detection
+-PKG_CHECK_MODULES([DEVMAPPER], [devmapper >= 1.02.03],, [
++PKG_CHECK_MODULES([DEVMAPPER], [devmapper-always-use-fallback-so-only-required-libs-will-go-in >= 1.02.03],, [
+ 	AC_CHECK_LIB(devmapper, dm_task_set_name,,
+ 		[AC_MSG_ERROR([You need the device-mapper library.])])
+ 	AC_CHECK_LIB(devmapper, dm_task_set_message,,
+--- cryptsetup-1.3.1/configure.in~	2011-05-30 16:04:32.645465788 +0200
++++ cryptsetup-1.3.1/configure.in	2011-05-30 16:06:09.913262079 +0200
+@@ -208,7 +208,7 @@
+ 
+ 	dnl Try to detect needed device-mapper static libraries, try pkg-config first.
+ 	LIBS="$saved_LIBS -static"
+-	PKG_CHECK_MODULES([DEVMAPPER_STATIC], [devmapper >= 1.02.27],,[
++	PKG_CHECK_MODULES([DEVMAPPER_STATIC], [devmapper-without-tons-of-deps >= 1.02.27],,[
+ 		DEVMAPPER_STATIC_LIBS=$DEVMAPPER_LIBS
+ 		if test "x$enable_selinux" != xno; then
+ 			AC_CHECK_LIB(sepol, sepol_bool_set)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cryptsetup-luks/cryptsetup-luks-diet.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cryptsetup-luks/cryptsetup-luks.spec?r1=1.53&r2=1.54&f=u