From: Gustavo Zacarias Date: Wed, 29 Oct 2014 16:01:35 +0000 (-0300) Subject: cryptsetup: bump to version 1.6.6 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=40c341da78f3315fa31e4ea56b470753bf915a31;p=buildroot.git cryptsetup: bump to version 1.6.6 Drop upstream patch, add hash file, switch to kernel.org mirror. Signed-off-by: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- diff --git a/package/cryptsetup/0001-mkdir.patch b/package/cryptsetup/0001-mkdir.patch new file mode 100644 index 0000000000..d4d70521ad --- /dev/null +++ b/package/cryptsetup/0001-mkdir.patch @@ -0,0 +1,18 @@ +$(mkdir_p) is obsolete for newer automake, use $(MKDIR_P) instead. +Upstream should really gettextize with a newer version before packing up. + +[base on a similar patch from Gustavo Zacarias for Linux-PAM-1.1.7] +Signed-off-by: Axel Lin + +diff -Nura cryptsetup-1.6.3.ori/po/Makefile.in.in cryptsetup-1.6.3/po/Makefile.in.in +--- cryptsetup-1.6.3.ori/po/Makefile.in.in 2013-12-30 11:53:22.731942516 +0800 ++++ cryptsetup-1.6.3/po/Makefile.in.in 2014-01-09 09:46:13.594071188 +0800 +@@ -31,7 +31,7 @@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + mkinstalldirs = $(SHELL) @install_sh@ -d +-mkdir_p = @mkdir_p@ ++mkdir_p = @MKDIR_P@ + + GMSGFMT_ = @GMSGFMT@ + GMSGFMT_no = @GMSGFMT@ diff --git a/package/cryptsetup/cryptsetup-0001-link-against-lrt-for-clock_gettime.patch b/package/cryptsetup/cryptsetup-0001-link-against-lrt-for-clock_gettime.patch deleted file mode 100644 index ae9a522641..0000000000 --- a/package/cryptsetup/cryptsetup-0001-link-against-lrt-for-clock_gettime.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 715186bee512f25715e6d1c58ce03cc32e0efae3 Mon Sep 17 00:00:00 2001 -From: Axel Lin -Date: Mon, 30 Dec 2013 18:10:03 +0800 -Subject: [PATCH] Link against -lrt for clock_gettime - -Fix undefined reference to `clock_gettime' error. -This is required since commit f3e398afc549 "Rewrite cipher benchmark loop.". - -Below is the build error report: -http://autobuild.buildroot.net/results/9ca/9cad1cf49ee6b5c58d8260ee33beef2e6c1ada4d/build-end.log - -Signed-off-by: Axel Lin ---- - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 1c456be..aa4c10f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -49,7 +49,8 @@ AC_CHECK_LIB(uuid, uuid_clear, ,[AC_MSG_ERROR([You need the uuid library.])]) - AC_SUBST(UUID_LIBS, $LIBS) - LIBS=$saved_LIBS - --AC_CHECK_FUNCS([posix_memalign]) -+AC_SEARCH_LIBS([clock_gettime],[rt posix4]) -+AC_CHECK_FUNCS([posix_memalign clock_gettime]) - - if test "x$enable_largefile" = "xno" ; then - AC_MSG_ERROR([Building with --disable-largefile is not supported, it can cause data corruption.]) --- -1.8.1.2 - diff --git a/package/cryptsetup/cryptsetup-0002-mkdir.patch b/package/cryptsetup/cryptsetup-0002-mkdir.patch deleted file mode 100644 index d4d70521ad..0000000000 --- a/package/cryptsetup/cryptsetup-0002-mkdir.patch +++ /dev/null @@ -1,18 +0,0 @@ -$(mkdir_p) is obsolete for newer automake, use $(MKDIR_P) instead. -Upstream should really gettextize with a newer version before packing up. - -[base on a similar patch from Gustavo Zacarias for Linux-PAM-1.1.7] -Signed-off-by: Axel Lin - -diff -Nura cryptsetup-1.6.3.ori/po/Makefile.in.in cryptsetup-1.6.3/po/Makefile.in.in ---- cryptsetup-1.6.3.ori/po/Makefile.in.in 2013-12-30 11:53:22.731942516 +0800 -+++ cryptsetup-1.6.3/po/Makefile.in.in 2014-01-09 09:46:13.594071188 +0800 -@@ -31,7 +31,7 @@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - mkinstalldirs = $(SHELL) @install_sh@ -d --mkdir_p = @mkdir_p@ -+mkdir_p = @MKDIR_P@ - - GMSGFMT_ = @GMSGFMT@ - GMSGFMT_no = @GMSGFMT@ diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash new file mode 100644 index 0000000000..f288082c90 --- /dev/null +++ b/package/cryptsetup/cryptsetup.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/sha256sums.asc +sha256 2d2ce28e4e1137dd599d87884b62ef6dbf14fd7848b2a2bf7d61cf125fbd8e6f cryptsetup-1.6.6.tar.xz diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index e365d432de..f43bbca9ae 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -4,9 +4,10 @@ # ################################################################################ -CRYPTSETUP_VERSION = 1.6.3 -CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.bz2 -CRYPTSETUP_SITE = http://cryptsetup.googlecode.com/files +CRYPTSETUP_VERSION_MAJOR = 1.6 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).6 +CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz +CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config CRYPTSETUP_DEPENDENCIES = lvm2 popt e2fsprogs libgcrypt host-pkgconf \ $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)