summaryrefslogtreecommitdiff
path: root/package/cryptsetup
diff options
context:
space:
mode:
Diffstat (limited to 'package/cryptsetup')
-rw-r--r--package/cryptsetup/Makefile6
-rw-r--r--package/cryptsetup/patches/patch-lib_setup_c17
2 files changed, 3 insertions, 20 deletions
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index f4efcccf5..3daa946da 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -4,16 +4,16 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= cryptsetup
-PKG_VERSION:= 1.0.7
+PKG_VERSION:= 1.1.3
PKG_RELEASE:= 1
-PKG_MD5SUM:= 5eea2a77391a8a1a651b31cbaef59e22
+PKG_MD5SUM:= 318a64470861ea5b92a52f2014f1e7c1
PKG_DESCR:= LUKS cryptsetup tools
PKG_SECTION:= crypto
PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt \
kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc \
kmod-crypto-sha256 kmod-blk-dev-dm
PKG_BUILDDEP+= libgcrypt popt e2fsprogs lvm
-PKG_URL:= http://cryptsetup.googlecode.com
+PKG_URL:= http://cryptsetup.googlecode.com/
PKG_SITES:= http://cryptsetup.googlecode.com/files/
PKG_TARGET_DEPENDS:= !foxboard
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;