This version supports the nettle 3.x and higher and requires that version. this include a security fix: GNUTLS-SA-2015-2 no CVE assigned to date.
enable openssl compat via PACKAGECONFIG as iputils needs gnutls/openssl.h for migration info: http://www.gnutls.org/manual/gnutls.html#Upgrading-from-previous-versions Signed-off-by: Armin Kuster <akuster...@gmail.com> --- meta/recipes-support/gnutls/gnutls.inc | 3 ++- .../gnutls/configure.ac-fix-sed-command.patch | 29 ++++++++++------------ meta/recipes-support/gnutls/gnutls_3.3.14.bb | 8 ------ meta/recipes-support/gnutls/gnutls_3.4.1.bb | 8 ++++++ 4 files changed, 23 insertions(+), 25 deletions(-) delete mode 100644 meta/recipes-support/gnutls/gnutls_3.3.14.bb create mode 100644 meta/recipes-support/gnutls/gnutls_3.4.1.bb diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index e9b138a..6928cb9 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc @@ -34,9 +34,10 @@ do_configure_prepend() { done } -PACKAGECONFIG ??= "zlib" +PACKAGECONFIG ??= "zlib openssl_compat" PACKAGECONFIG[tpm] = "--with-tpm, --without-tpm, trousers" PACKAGECONFIG[zlib] = "--with-zlib, --without-zlib, zlib" +PACKAGECONFIG[openssl_compat] = "--enable-openssl-compatibility,," PACKAGES =+ "${PN}-openssl ${PN}-xx" diff --git a/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch b/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch index 44a9934..342143f 100644 --- a/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch +++ b/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch @@ -13,19 +13,16 @@ Signed-off-by: Robert Yang <liezhi.y...@windriver.com> configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index c6818a0..1c4582d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then - dnl replace libopts-generated files with distributed backups, if present - missing_baks= - for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do -- nam=`echo $i|sed 's/.bak//g'` -+ nam=`echo $i|sed 's/\.bak$//'` - if test -f $i;then - cp -f $i $nam - else --- -2.0.1 - +Index: gnutls-3.4.1/configure.ac +=================================================================== +--- gnutls-3.4.1.orig/configure.ac ++++ gnutls-3.4.1/configure.ac +@@ -530,7 +530,7 @@ if test "$enable_tools" != "no" || test + dnl replace libopts-generated files with distributed backups, if present + missing_baks= + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do +- nam=`echo $i|sed 's/.bak//g'` ++ nam=`echo $i|sed 's/\.bak$//'` + if test -f $i;then + cp -f $i $nam + else diff --git a/meta/recipes-support/gnutls/gnutls_3.3.14.bb b/meta/recipes-support/gnutls/gnutls_3.3.14.bb deleted file mode 100644 index f41d183..0000000 --- a/meta/recipes-support/gnutls/gnutls_3.3.14.bb +++ /dev/null @@ -1,8 +0,0 @@ -require gnutls.inc - -SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ - file://configure.ac-fix-sed-command.patch \ - file://use-pkg-config-to-locate-zlib.patch \ - " -SRC_URI[md5sum] = "7f4465f8c564cf9cb8f5cb38b909f7ca" -SRC_URI[sha256sum] = "0dfa0030faad8909c1e904105198232d6bc0123cae8cf4933b2bac85ee7cec52" diff --git a/meta/recipes-support/gnutls/gnutls_3.4.1.bb b/meta/recipes-support/gnutls/gnutls_3.4.1.bb new file mode 100644 index 0000000..1b64813 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls_3.4.1.bb @@ -0,0 +1,8 @@ +require gnutls.inc + +SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ + file://configure.ac-fix-sed-command.patch \ + file://use-pkg-config-to-locate-zlib.patch \ + " +SRC_URI[md5sum] = "2d04f34fa25b45f9dcb9104c0394e12e" +SRC_URI[sha256sum] = "e9b5f58becf34756464216056cd5abbf04315eda80a374d02699dee83f80b12e" -- 2.3.5 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core