diff options
| -rw-r--r-- | package/cryptsetup/Makefile | 8 | ||||
| -rw-r--r-- | package/cryptsetup/patches/patch-lib_libdevmapper_c | 10 | ||||
| -rw-r--r-- | package/cryptsetup/patches/patch-ltmain_sh | 11 |
3 files changed, 3 insertions, 26 deletions
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index b48737cf5..e782cafea 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -4,20 +4,18 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= cryptsetup -PKG_VERSION:= 1.6.3 +PKG_VERSION:= 1.6.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= a7aeb549a543eeac433eadfb6bc67837 +PKG_MD5SUM:= 179c0781de59838a4e39f61b2df5ea48 PKG_DESCR:= utility used to conveniently setup disk encryption PKG_SECTION:= app/crypto PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt PKG_BUILDDEP:= libgcrypt popt e2fsprogs lvm PKG_URL:= http://cryptsetup.googlecode.com/ -PKG_SITES:= http://cryptsetup.googlecode.com/files/ +PKG_SITES:= https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/cryptsetup/patches/patch-lib_libdevmapper_c b/package/cryptsetup/patches/patch-lib_libdevmapper_c deleted file mode 100644 index 731f8bc4d..000000000 --- a/package/cryptsetup/patches/patch-lib_libdevmapper_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index b9250d32f..000000000 --- a/package/cryptsetup/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- 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=*| \ -- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" |