diff --git a/packages/security/libgcrypt/meta b/packages/security/libgcrypt/meta index 5223cb59e5..8fcecb7133 100644 --- a/packages/security/libgcrypt/meta +++ b/packages/security/libgcrypt/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libgcrypt" -PKG_VERSION="1.5.0" +PKG_VERSION="1.5.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/security/libgcrypt/patches/libgcrypt-1.5.0-01-dont_replace_parts_of_path-0.1.patch b/packages/security/libgcrypt/patches/libgcrypt-01-dont_replace_parts_of_path-0.1.patch similarity index 68% rename from packages/security/libgcrypt/patches/libgcrypt-1.5.0-01-dont_replace_parts_of_path-0.1.patch rename to packages/security/libgcrypt/patches/libgcrypt-01-dont_replace_parts_of_path-0.1.patch index db465f2f41..cbb9089ae1 100644 --- a/packages/security/libgcrypt/patches/libgcrypt-1.5.0-01-dont_replace_parts_of_path-0.1.patch +++ b/packages/security/libgcrypt/patches/libgcrypt-01-dont_replace_parts_of_path-0.1.patch @@ -5,8 +5,8 @@ diff -Naur libgcrypt-1.4.6/cipher/Makefile.am libgcrypt-1.4.6.patch/cipher/Makef camellia.c camellia.h camellia-glue.c if ENABLE_O_FLAG_MUNGING --o_flag_munging = sed -e 's/-O[2-9s]*/-O1/g' -+o_flag_munging = sed -e 's/-O[2-9s]/-O1/g' +-o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g' ++o_flag_munging = sed -e 's/-O\([2-9s][2-9s]\)/-O1/' -e 's/-Ofast/-O1/g' else o_flag_munging = cat endif @@ -17,8 +17,8 @@ diff -Naur libgcrypt-1.4.6/cipher/Makefile.in libgcrypt-1.4.6.patch/cipher/Makef camellia.c camellia.h camellia-glue.c @ENABLE_O_FLAG_MUNGING_FALSE@o_flag_munging = cat --@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O[2-9s]*/-O1/g' -+@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O[2-9s]/-O1/g' +-@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g' ++@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([2-9s][2-9s]\)/-O1/' -e 's/-Ofast/-O1/g' all: all-am .SUFFIXES: diff --git a/packages/security/libgcrypt/patches/libgcrypt-1.5.0-automake_1.13.patch b/packages/security/libgcrypt/patches/libgcrypt-1.5.0-automake_1.13.patch deleted file mode 100644 index 6a2dc90136..0000000000 --- a/packages/security/libgcrypt/patches/libgcrypt-1.5.0-automake_1.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libgcrypt-1.5.0-old/configure.ac libgcrypt-1.5.0-new/configure.ac ---- libgcrypt-1.5.0-old/configure.ac 2011-06-29 01:53:22.000000000 -0700 -+++ libgcrypt-1.5.0-new/configure.ac 2013-01-03 21:04:51.000000000 -0800 -@@ -59,7 +59,7 @@ - - AC_CONFIG_SRCDIR([src/libgcrypt.vers]) - AM_INIT_AUTOMAKE([]) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_LIBOBJ_DIR([compat]) - AC_CANONICAL_HOST