diff options
Diffstat (limited to 'package/cryptsetup/patches')
| -rw-r--r-- | package/cryptsetup/patches/patch-configure_in | 31 | ||||
| -rw-r--r-- | package/cryptsetup/patches/patch-lib_setup_c | 17 |
2 files changed, 31 insertions, 17 deletions
diff --git a/package/cryptsetup/patches/patch-configure_in b/package/cryptsetup/patches/patch-configure_in new file mode 100644 index 000000000..2b4c32ad9 --- /dev/null +++ b/package/cryptsetup/patches/patch-configure_in @@ -0,0 +1,31 @@ +--- cryptsetup-1.1.0.orig/configure.in 2010-01-17 11:26:31.000000000 +0100 ++++ cryptsetup-1.1.0/configure.in 2010-02-05 17:05:34.911823330 +0100 +@@ -80,7 +80,7 @@ LIBS=$saved_LIBS + if test "x$enable_selinux" != xno; then + AC_CHECK_LIB(sepol, sepol_bool_set) + AC_CHECK_LIB(selinux, is_selinux_enabled) +- if test x$enable_static = xyes; then ++ if test x$enable_static_cryptsetup = xyes; then + SELINUX_STATIC_LIBS=$LIBS + # Check if we need -pthread with --enable-static and selinux + saved_LIBS2=$LIBS +@@ -91,7 +91,7 @@ if test "x$enable_selinux" != xno; then + fi + fi + +-if test x$enable_static = xyes; then ++if test x$enable_static_cryptsetup = xyes; then + saved_LIBS2=$LIBS + LIBS="$LIBS -static" + # Check if it there is still not some missing dependency like static selinux libs +@@ -135,8 +135,8 @@ CS_NUM_WITH([luks1-keybits],[key length + + dnl ========================================================================== + +-AM_CONDITIONAL(STATIC_CRYPTSETUP, test x$enable_static = xyes) +-AM_CONDITIONAL(DYNAMIC_CRYPTSETUP, test x$enable_static = xno) ++AM_CONDITIONAL(STATIC_CRYPTSETUP, test x$enable_static_cryptsetup = xyes) ++AM_CONDITIONAL(DYNAMIC_CRYPTSETUP, test x$enable_static_cryptsetup = xno) + + dnl ========================================================================== + diff --git a/package/cryptsetup/patches/patch-lib_setup_c b/package/cryptsetup/patches/patch-lib_setup_c deleted file mode 100644 index 97b356f68..000000000 --- a/package/cryptsetup/patches/patch-lib_setup_c +++ /dev/null @@ -1,17 +0,0 @@ -already added in svn upstream ---- cryptsetup-1.0.7.orig/lib/setup.c 2009-07-22 13:12:44.000000000 +0200 -+++ cryptsetup-1.0.7/lib/setup.c 2009-08-22 15:10:32.000000000 +0200 -@@ -542,7 +542,12 @@ static int __crypt_luks_open(int arg, st - start: - mk=NULL; - -- if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags)) -+ if(options->passphrase) { -+ passwordLen = strlen(options->passphrase); -+ password = safe_alloc(passwordLen + 1); -+ strncpy(password, options->passphrase, passwordLen + 1); -+ tries = 0; -+ } else if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags)) - tries--; - else - tries = 0; |