Re: [OE-core] [PATCH 2/3] gnutls: update to 3.4.1
On 6/23/15 9:28 AM, Burton, Ross wrote: On 23 June 2015 at 02:37, Armin Kuster akuster...@gmail.com mailto:akuster...@gmail.com wrote: +PACKAGECONFIG[openssl_compat] = --enable-openssl-compatibility,, Also add --disable-openssl-compatibility (and remove the redundant trailing commas). you are slipping. those where in a previous set ; ) +PACKAGECONFIG[libind] = --with-idn,--without-idn, libidn The flag name has a typo. Says you. ; ) I get these in .. (looks like 3.4.2 is out now)... the next round. kind regards, Armin Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] gnutls: update to 3.4.1
On 23 June 2015 at 02:37, Armin Kuster akuster...@gmail.com wrote: +PACKAGECONFIG[openssl_compat] = --enable-openssl-compatibility,, Also add --disable-openssl-compatibility (and remove the redundant trailing commas). +PACKAGECONFIG[libind] = --with-idn,--without-idn, libidn The flag name has a typo. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] gnutls: update to 3.4.1
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 V2: Fix some build depends seen on some systems. WARNING: QA Issue: gnutls-openssl rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-xx rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-dev rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-bin rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls rdepends on libidn, but it isn't a build dependency? [build-deps] Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-support/gnutls/gnutls.inc | 4 ++- .../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, 24 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..f57a788 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc @@ -34,9 +34,11 @@ 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,, +PACKAGECONFIG[libind] = --with-idn,--without-idn, libidn 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..000 --- 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 000..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 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org
Re: [OE-core] [PATCH 2/3] gnutls: update to 3.4.1
On 18 June 2015 at 16:57, akuster808 akuster...@gmail.com wrote: I could not reproduce these warnings but found a configure option to build without libidn so I added that in my last submit. It would be a simple: $ bitbake libidn $ bitbake gnutls -ccleansstate $ bitbake gnutls Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] gnutls: update to 3.4.1
On 18 June 2015 at 05:50, Armin Kuster akuster...@gmail.com wrote: +PACKAGECONFIG[openssl_compat] = --enable-openssl-compatibility,, +PACKAGECONFIG[libind] = ,--without-idn, libidn For clarity always pass both enable and disable options, in case upstream changes their default behaviour. The autoconf macros AC_ARG_WITH and _ENABLE always support both their enable/disable and with/without forms. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] gnutls: update to 3.4.1
Ross, I could not reproduce these warnings but found a configure option to build without libidn so I added that in my last submit. Thanks again, kind regards, Armin On 06/15/2015 03:13 AM, Burton, Ross wrote: So this happens: WARNING: QA Issue: gnutls-openssl rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-xx rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-dev rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-bin rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls rdepends on libidn, but it isn't a build dependency? [build-deps] Ross On 14 June 2015 at 06:37, Armin Kuster akuster...@gmail.com mailto:akuster...@gmail.com wrote: 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 mailto: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 http://gnutls_3.3.14.bb | 8 -- meta/recipes-support/gnutls/gnutls_3.4.1.bb http://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 http://gnutls_3.3.14.bb create mode 100644 meta/recipes-support/gnutls/gnutls_3.4.1.bb http://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 mailto:liezhi.y...@windriver.com configure.ac http://configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac http://configure.ac b/configure.ac http://configure.ac -index c6818a0..1c4582d 100644 a/configure.ac http://configure.ac -+++ b/configure.ac http://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 http://configure.ac +=== +--- gnutls-3.4.1.orig/configure.ac http://configure.ac gnutls-3.4.1/configure.ac http://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 http://gnutls_3.3.14.bb b/meta/recipes-support/gnutls/gnutls_3.3.14.bb http://gnutls_3.3.14.bb deleted file mode 100644 index f41d183..000 --- a/meta/recipes-support/gnutls/gnutls_3.3.14.bb http://gnutls_3.3.14.bb +++ /dev/null @@ -1,8 +0,0 @@ -require gnutls.inc - -SRC_URI += file://correct_rpl_gettimeofday_signature.patch \ -
Re: [OE-core] [PATCH 2/3] gnutls: update to 3.4.1
So this happens: WARNING: QA Issue: gnutls-openssl rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-xx rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-dev rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-bin rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls rdepends on libidn, but it isn't a build dependency? [build-deps] Ross On 14 June 2015 at 06:37, Armin Kuster akuster...@gmail.com wrote: 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..000 --- 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 000..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
Re: [OE-core] [PATCH 2/3] gnutls: update to 3.4.1
On 06/15/2015 03:13 AM, Burton, Ross wrote: So this happens: WARNING: QA Issue: gnutls-openssl rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-xx rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-dev rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-bin rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls rdepends on libidn, but it isn't a build dependency? [build-deps] Well that is a bummer. I have not seen those otherwise I would have not submitted the request. Thanks for the feedback. - armin Ross On 14 June 2015 at 06:37, Armin Kuster akuster...@gmail.com mailto:akuster...@gmail.com wrote: 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 mailto: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 http://gnutls_3.3.14.bb | 8 -- meta/recipes-support/gnutls/gnutls_3.4.1.bb http://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 http://gnutls_3.3.14.bb create mode 100644 meta/recipes-support/gnutls/gnutls_3.4.1.bb http://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 mailto:liezhi.y...@windriver.com configure.ac http://configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac http://configure.ac b/configure.ac http://configure.ac -index c6818a0..1c4582d 100644 a/configure.ac http://configure.ac -+++ b/configure.ac http://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 http://configure.ac +=== +--- gnutls-3.4.1.orig/configure.ac http://configure.ac gnutls-3.4.1/configure.ac http://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 http://gnutls_3.3.14.bb b/meta/recipes-support/gnutls/gnutls_3.3.14.bb http://gnutls_3.3.14.bb deleted file mode 100644 index f41d183..000 --- a/meta/recipes-support/gnutls/gnutls_3.3.14.bb http://gnutls_3.3.14.bb +++ /dev/null @@ -1,8 +0,0 @@ -require gnutls.inc - -SRC_URI += file://correct_rpl_gettimeofday_signature.patch \ -
[OE-core] [PATCH 2/3] gnutls: update to 3.4.1
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..000 --- 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 000..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
[OE-core] [PATCH 2/3] gnutls: update to 3.4.1
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..000 --- 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 000..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
[OE-core] [PATCH 2/3] gnutls: update to 3.4.1
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..000 --- 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 000..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 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core