diff --git a/packages/security/libgcrypt/package.mk b/packages/security/libgcrypt/package.mk index e3c4a03291..47fb1d1694 100644 --- a/packages/security/libgcrypt/package.mk +++ b/packages/security/libgcrypt/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libgcrypt" -PKG_VERSION="1.10.3" -PKG_SHA256="8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa" +PKG_VERSION="1.11.0" +PKG_SHA256="09120c9867ce7f2081d6aaa1775386b98c2f2f246135761aae47d81f58685b9c" PKG_LICENSE="GPLv2" PKG_SITE="https://www.gnupg.org/" PKG_URL="https://www.gnupg.org/ftp/gcrypt/libgcrypt/${PKG_NAME}-${PKG_VERSION}.tar.bz2" diff --git a/packages/security/libgcrypt/patches/libgcrypt-01-dont_replace_parts_of_path-0.1.patch b/packages/security/libgcrypt/patches/libgcrypt-01-dont_replace_parts_of_path-0.1.patch index a2c86e4da6..eeffb96351 100644 --- a/packages/security/libgcrypt/patches/libgcrypt-01-dont_replace_parts_of_path-0.1.patch +++ b/packages/security/libgcrypt/patches/libgcrypt-01-dont_replace_parts_of_path-0.1.patch @@ -1,24 +1,25 @@ -diff -Naur libgcrypt-1.4.6/cipher/Makefile.am libgcrypt-1.4.6.patch/cipher/Makefile.am ---- libgcrypt-1.4.6/cipher/Makefile.am 2009-12-11 16:31:38.000000000 +0100 -+++ libgcrypt-1.4.6.patch/cipher/Makefile.am 2011-05-08 03:21:56.463021968 +0200 -@@ -153,7 +153,7 @@ +diff -Naur libgcrypt-1.11.0/cipher/Makefile.am libgcrypt-1.11.0.patch/cipher/Makefile.am +--- libgcrypt-1.11.0/cipher/Makefile.am 2009-12-11 16:31:38.000000000 +0100 ++++ libgcrypt-1.11.0.patch/cipher/Makefile.am 2011-05-08 03:21:56.463021968 +0200 +@@ -169,7 +169,7 @@ if ENABLE_O_FLAG_MUNGING --o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]*\)/-O1/' -e 's/-Ofast/-O1/g' -+o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]\)/-O1/' -e 's/-Ofast/-O1/g' +-o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g' ++o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g' else o_flag_munging = cat endif -diff -Naur libgcrypt-1.4.6/cipher/Makefile.in libgcrypt-1.4.6.patch/cipher/Makefile.in ---- libgcrypt-1.4.6/cipher/Makefile.in 2010-07-13 17:42:20.000000000 +0200 -+++ libgcrypt-1.4.6.patch/cipher/Makefile.in 2011-05-08 03:22:12.059208971 +0200 -@@ -602,7 +602,7 @@ - blake2b-amd64-avx2.S blake2s-amd64-avx.S +diff -Naur libgcrypt-1.11.0/cipher/Makefile.in libgcrypt-1.11.0.patch/cipher/Makefile.in +--- libgcrypt-1.11.0/cipher/Makefile.in 2010-07-13 17:42:20.000000000 +0200 ++++ libgcrypt-1.11.0.patch/cipher/Makefile.in 2011-05-08 03:22:12.059208971 +0200 +@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g' +@@ -643,7 +643,7 @@ + blake2s-amd64-avx.S blake2s-amd64-avx512.S @ENABLE_O_FLAG_MUNGING_FALSE@o_flag_munging = cat --@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]*\)/-O1/' -e 's/-Ofast/-O1/g' -+@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]\)/-O1/' -e 's/-Ofast/-O1/g' +-@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g' ++@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g' @ENABLE_INSTRUMENTATION_MUNGING_FALSE@instrumentation_munging = cat # We need to disable instrumentation for these modules as they use cc as