diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-08 12:58:54 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-08 12:58:54 +0100 |
| commit | f3e1c3cf993b0ba54afa0ff9552ffefd39828b23 (patch) | |
| tree | 1f5d52b7dff4a5c60e17c8f0fd7f7412c946a0ee /package/cryptsetup | |
| parent | d77656116191a166ed0477cf16830480a2406fc5 (diff) | |
| parent | d93c019f2cfdf53be59f02600cc25c547ba24edc (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/cryptsetup')
| -rw-r--r-- | package/cryptsetup/Makefile | 6 | ||||
| -rw-r--r-- | package/cryptsetup/patches/patch-lib_libdevmapper_c | 10 | ||||
| -rw-r--r-- | package/cryptsetup/patches/patch-ltmain_sh | 6 |
3 files changed, 16 insertions, 6 deletions
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index c98e2e8ac..bf71f5a43 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cryptsetup -PKG_VERSION:= 1.3.1 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 1f5b5a9d538e8a3c191fb7dd85b9b013 +PKG_VERSION:= 1.6.3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a7aeb549a543eeac433eadfb6bc67837 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 new file mode 100644 index 000000000..731f8bc4d --- /dev/null +++ b/package/cryptsetup/patches/patch-lib_libdevmapper_c @@ -0,0 +1,10 @@ +--- cryptsetup-1.6.3.orig/lib/libdevmapper.c 2013-11-14 08:31:44.000000000 +0100 ++++ cryptsetup-1.6.3/lib/libdevmapper.c 2014-01-08 10:15:32.000000000 +0100 +@@ -29,6 +29,7 @@ + #include <linux/fs.h> + #include <uuid/uuid.h> + #include <sys/utsname.h> ++#include <sys/stat.h> + + #include "internal.h" + diff --git a/package/cryptsetup/patches/patch-ltmain_sh b/package/cryptsetup/patches/patch-ltmain_sh index 18ec3a2e4..b9250d32f 100644 --- a/package/cryptsetup/patches/patch-ltmain_sh +++ b/package/cryptsetup/patches/patch-ltmain_sh @@ -1,6 +1,6 @@ ---- cryptsetup-1.3.1.orig/ltmain.sh 2011-04-18 13:06:09.000000000 +0200 -+++ cryptsetup-1.3.1/ltmain.sh 2011-07-18 13:28:01.000000000 +0200 -@@ -5840,7 +5840,7 @@ func_mode_link () +--- cryptsetup-1.6.3.orig/ltmain.sh 2013-12-08 18:15:38.000000000 +0100 ++++ cryptsetup-1.6.3/ltmain.sh 2014-01-08 01:18:38.000000000 +0100 +@@ -5853,7 +5853,7 @@ func_mode_link () # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ |