summaryrefslogtreecommitdiff
path: root/package/cryptsetup
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-08-22 23:49:52 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-08-22 23:49:52 +0200
commit54893039866e0978bd6563e2b7361f7736341163 (patch)
treef757d7250af9964234530e8d7f480951ab63c7aa /package/cryptsetup
parent2c84de509054d770081084ca223f55b67ef945db (diff)
parentba0c06d2bb46e087f1782eb76573e0bef735c062 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/cryptsetup')
-rw-r--r--package/cryptsetup/Makefile17
-rw-r--r--package/cryptsetup/patches/patch-lib_libdevmapper_c14
-rw-r--r--package/cryptsetup/patches/patch-lib_setup_c17
-rw-r--r--package/cryptsetup/patches/patch-lib_utils_c16
4 files changed, 32 insertions, 32 deletions
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index a7a93d139..76fdc98e4 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= cryptsetup
-PKG_VERSION:= 1.0.6
+PKG_VERSION:= 1.0.7
PKG_RELEASE:= 1
-PKG_MD5SUM:= 00d452eb7a76e39f5749545d48934a10
+PKG_MD5SUM:= 5eea2a77391a8a1a651b31cbaef59e22
PKG_DESCR:= LUKS cryptsetup tools
PKG_SECTION:= crypto
PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt
@@ -24,6 +24,19 @@ CONFIGURE_ARGS+= --disable-static
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
+# hackish way to although build the static libraries for cryptinit
+pre-configure:
+ (cd ${WRKBUILD}; \
+ env ${CONFIGURE_ENV} \
+ ./configure --enable-static \
+ --build=${GNU_HOST_NAME} \
+ --host=${GNU_TARGET_NAME} \
+ --target=${GNU_TARGET_NAME} \
+ );
+ $(MAKE) -C $(WRKBUILD) CC="$(TARGET_CC)"
+ $(MAKE) -C $(WRKBUILD) CC="$(TARGET_CC)" DESTDIR='${WRKINST}' install
+ $(MAKE) -C $(WRKBUILD) CC="$(TARGET_CC)" clean
+
post-install:
${INSTALL_DIR} ${IDIR_CRYPTSETUP}/usr/sbin ${IDIR_CRYPTSETUP}/usr/lib
${CP} ${WRKINST}/usr/lib/libcryptsetup.so.* \
diff --git a/package/cryptsetup/patches/patch-lib_libdevmapper_c b/package/cryptsetup/patches/patch-lib_libdevmapper_c
deleted file mode 100644
index 052241c92..000000000
--- a/package/cryptsetup/patches/patch-lib_libdevmapper_c
+++ /dev/null
@@ -1,14 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- cryptsetup-1.0.6.orig/lib/libdevmapper.c 2007-10-25 09:11:19.000000000 +0200
-+++ cryptsetup-1.0.6/lib/libdevmapper.c 2009-01-04 17:02:57.000000000 +0100
-@@ -192,7 +192,9 @@ static int dm_create_device(int reload,
- options->flags |= CRYPT_FLAG_READONLY;
-
- /* run udevsettle to avoid a race in libdevmapper causing busy dm devices */
-- run_udevsettle();
-+ /* do not run on mdev based systems
-+ run_udevsettle();
-+ */
-
- r = 0;
-
diff --git a/package/cryptsetup/patches/patch-lib_setup_c b/package/cryptsetup/patches/patch-lib_setup_c
new file mode 100644
index 000000000..97b356f68
--- /dev/null
+++ b/package/cryptsetup/patches/patch-lib_setup_c
@@ -0,0 +1,17 @@
+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;
diff --git a/package/cryptsetup/patches/patch-lib_utils_c b/package/cryptsetup/patches/patch-lib_utils_c
deleted file mode 100644
index 665620528..000000000
--- a/package/cryptsetup/patches/patch-lib_utils_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
-
-* prevent segfault with uClibc
- http://www.spinics.net/lists/dm-crypt/msg01187.html
-
---- cryptsetup-1.0.6.orig/lib/utils.c 2007-12-01 17:29:27.000000000 +0100
-+++ cryptsetup-1.0.6/lib/utils.c 2008-12-25 14:18:46.523091272 +0100
-@@ -27,6 +27,8 @@ static char *error=NULL;
- void set_error_va(const char *fmt, va_list va)
- {
-
-+ if(!fmt) return;
-+
- if(error) {
- free(error);
- error=NULL;