diff options
author | Arkadiusz MiĆkiewicz | 2011-05-30 16:02:22 (GMT) |
---|---|---|
committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
commit | 04af2f1113be51b2b181123ceac14b3b1e210cef (patch) | |
tree | 0a1942f052e351155a9d6b667820018cd54d1cff | |
parent | 4039109cc5b8c1aae9cf4483e50aebc48d7bf3ae (diff) | |
download | cryptsetup-04af2f1113be51b2b181123ceac14b3b1e210cef.zip cryptsetup-04af2f1113be51b2b181123ceac14b3b1e210cef.tar.gz |
- rel 2; don't drag libs like udev when not needed; use crypto backend kernel
Changed files:
cryptsetup.spec -> 1.54
diet.patch -> 1.6
dont-drag-more-libs.patch -> 1.1
-rw-r--r-- | cryptsetup.spec | 11 | ||||
-rw-r--r-- | diet.patch | 1 | ||||
-rw-r--r-- | dont-drag-more-libs.patch | 22 |
3 files changed, 31 insertions, 3 deletions
diff --git a/cryptsetup.spec b/cryptsetup.spec index 7972d63..5b2cd91 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -8,7 +8,7 @@ Summary: LUKS for dm-crypt implemented in cryptsetup 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 @@ -21,6 +21,7 @@ Source4: %{name}-initramfs-passdev-hook 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 @@ -143,6 +144,7 @@ initramfs-tools. %setup -q -n %{realname}-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 cp -a %{SOURCE5} README.initramfs @@ -161,7 +163,7 @@ CC="%{__cc}" %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 \ @@ -173,6 +175,8 @@ CC="%{__cc}" --disable-shared \ --enable-static \ --enable-static-cryptsetup \ + --with-crypto_backend=kernel \ + --disable-udev \ --disable-nls %{__make} -C lib @@ -181,7 +185,7 @@ CC="%{__cc}" # 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 @@ -193,6 +197,7 @@ mv src/cryptsetup cryptsetup-initrd %endif %configure \ + --enable-udev \ --enable-static %{__make} @@ -48,3 +48,4 @@ #define div_round_up(a,b) ({ \ typeof(a) __a = (a); \ typeof(b) __b = (b); \ + diff --git a/dont-drag-more-libs.patch b/dont-drag-more-libs.patch new file mode 100644 index 0000000..820c597 --- /dev/null +++ b/dont-drag-more-libs.patch @@ -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) |