diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-08-22 15:15:19 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-08-22 15:15:19 +0200 |
| commit | acd5d0f4a9b1ed64975968126680f5247691ddba (patch) | |
| tree | b27d225ba08384000dc7ad799eea3bc3e0dd9d32 | |
| parent | 2a1d8eeb81808d8cc922d355b54c6f053e545ce5 (diff) | |
update to latest upstream
- add passphrase patch, already in svn upstream, thx phil
| -rw-r--r-- | package/cryptsetup/Makefile | 4 | ||||
| -rw-r--r-- | package/cryptsetup/patches/patch-lib_libdevmapper_c | 14 | ||||
| -rw-r--r-- | package/cryptsetup/patches/patch-lib_utils_c | 16 |
3 files changed, 2 insertions, 32 deletions
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index a7a93d139..f609c9a4a 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 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_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; |