* [PATCH 1/5] gnutls: update to 3.6.1
2017-11-21 20:01 [PATCH 0/5][V2] Master package updates Armin Kuster
@ 2017-11-21 20:01 ` Armin Kuster
2017-11-21 20:01 ` [PATCH 2/5] nettle: update to 3.4 and cleanup Armin Kuster
` (4 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Armin Kuster @ 2017-11-21 20:01 UTC (permalink / raw)
To: akuster, openembedded-core
zlib configure.ac support removed in 3.6.1
drop patch
v2: actually remove patch
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-support/gnutls/gnutls.inc | 3 +-
.../gnutls/use-pkg-config-to-locate-zlib.patch | 75 ----------------------
.../gnutls/{gnutls_3.5.16.bb => gnutls_3.6.1.bb} | 5 +-
3 files changed, 3 insertions(+), 80 deletions(-)
delete mode 100644 meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch
rename meta/recipes-support/gnutls/{gnutls_3.5.16.bb => gnutls_3.6.1.bb} (45%)
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index 29b5dd6..7bcb913 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -21,7 +21,7 @@ SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz"
inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc
-PACKAGECONFIG ??= "libidn zlib"
+PACKAGECONFIG ??= "libidn"
# You must also have CONFIG_SECCOMP enabled in the kernel for
# seccomp to work.
@@ -32,7 +32,6 @@ PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn"
PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1"
PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit"
PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers"
-PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
EXTRA_OECONF = " \
--enable-doc \
diff --git a/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch b/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch
deleted file mode 100644
index ae141a5..0000000
--- a/meta/recipes-support/gnutls/gnutls/use-pkg-config-to-locate-zlib.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 18081068a97c00015aabc5fa321664951458ea0d Mon Sep 17 00:00:00 2001
-From: Fan Xin <fan.xin@jp.fujitsu.com>
-Date: Fri, 9 Jun 2017 15:20:31 +0900
-Subject: [PATCH] From cee80af1fe93f5b76765afeebfcc3b902768f5d6 Mon Sep 17
- 00:00:00 2001 From: Andre McCurdy <armccurdy@gmail.com> Date: Tue, 26 May
- 2015 21:41:24 -0700 Subject: [PATCH] use pkg-config to locate zlib
-
-AC_LIB_HAVE_LINKFLAGS can sometimes find host libs and is therefore not
-robust when cross-compiling. Remove it for zlib and use PKG_CHECK_MODULES
-instead.
-
-Removing AC_LIB_HAVE_LINKFLAGS for zlib also removes the --with-libz-prefix
-configure option. If zlib support is enabled, then failure to find zlib via
-pkg-config is now treated as a fatal error.
-
-Change based on ChromeOS gnutls 2.12.23 cross-compile fixes patch:
-
- https://chromium-review.googlesource.com/#/c/271661/
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
-
-Rebase on gnutls 3.5.13
-
-Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
----
- configure.ac | 25 +++++++++----------------
- 1 file changed, 9 insertions(+), 16 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c65268e..f6a18aa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -735,28 +735,21 @@ AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],
- AC_MSG_CHECKING([whether to include zlib compression support])
- if test x$ac_zlib != xno; then
- AC_MSG_RESULT(yes)
-- AC_LIB_HAVE_LINKFLAGS(z,, [#include <zlib.h>], [compress (0, 0, 0, 0);])
-- if test x$ac_cv_libz != xyes; then
-- AC_MSG_WARN(
--***
--*** ZLIB was not found. You will not be able to use ZLIB compression.)
-- fi
- else
- AC_MSG_RESULT(no)
- fi
-
--PKG_CHECK_EXISTS(zlib, ZLIB_HAS_PKGCONFIG=y, ZLIB_HAS_PKGCONFIG=n)
--
- if test x$ac_zlib != xno; then
-- if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then
-- if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then
-- GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
-- else
-- GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib"
-- fi
-- LIBZ_PC=""
-+ PKG_CHECK_MODULES(ZLIB, zlib)
-+ HAVE_LIBZ=yes
-+ AC_DEFINE([HAVE_LIBZ], [1], [zlib is enabled])
-+ AC_SUBST(HAVE_LIBZ)
-+ LTLIBZ=$ZLIB_LIBS
-+ AC_SUBST(LTLIBZ)
-+ if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then
-+ GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib"
- else
-- LIBZ_PC=$LIBZ
-+ GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib"
- fi
- fi
- AC_SUBST(LIBZ_PC)
---
-1.9.1
-
diff --git a/meta/recipes-support/gnutls/gnutls_3.5.16.bb b/meta/recipes-support/gnutls/gnutls_3.6.1.bb
similarity index 45%
rename from meta/recipes-support/gnutls/gnutls_3.5.16.bb
rename to meta/recipes-support/gnutls/gnutls_3.6.1.bb
index 635c519..7624a20 100644
--- a/meta/recipes-support/gnutls/gnutls_3.5.16.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.6.1.bb
@@ -1,10 +1,9 @@
require gnutls.inc
SRC_URI += "file://0001-configure.ac-fix-sed-command.patch \
- file://use-pkg-config-to-locate-zlib.patch \
file://arm_eabi.patch \
"
-SRC_URI[md5sum] = "4c39612f1ec3ef7ed79cfb8936fa8143"
-SRC_URI[sha256sum] = "0924dec90c37c05f49fec966eba3672dab4d336d879e5c06e06e13325cbfec25"
+SRC_URI[md5sum] = "4b65ae3ffef59f3eeed51a6166ff12b3"
+SRC_URI[sha256sum] = "20b10d2c9994bc032824314714d0e84c0f19bdb3d715d8ed55beb7364a8ebaed"
BBCLASSEXTEND = "native nativesdk"
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 2/5] nettle: update to 3.4 and cleanup
2017-11-21 20:01 [PATCH 0/5][V2] Master package updates Armin Kuster
2017-11-21 20:01 ` [PATCH 1/5] gnutls: update to 3.6.1 Armin Kuster
@ 2017-11-21 20:01 ` Armin Kuster
2017-11-23 17:07 ` Burton, Ross
2017-11-21 20:01 ` [PATCH 3/5] nss: update to 3.34 Armin Kuster
` (3 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Armin Kuster @ 2017-11-21 20:01 UTC (permalink / raw)
To: akuster, openembedded-core
From: Armin Kuster <akuster@mvista.com>
merge .inc
forward ported two patches to work with 3.4
for more info see:
http://lists.gnu.org/archive/html/info-gnu/2017-11/msg00007.html
Signed-off-by: Armin Kuster <akuster@mvista.com>
---
...d-target-to-only-build-tests-not-run-them.patch | 46 ----------------------
...d-target-to-only-build-tests-not-run-them.patch | 38 ++++++++++++++++++
| 26 ++++++------
.../{nettle-3.3 => nettle-3.4}/dlopen-test.patch | 0
.../nettle/{files => nettle-3.4}/run-ptest | 0
meta/recipes-support/nettle/nettle_3.3.bb | 19 ---------
.../nettle/{nettle.inc => nettle_3.4.bb} | 14 +++++++
7 files changed, 64 insertions(+), 79 deletions(-)
delete mode 100644 meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
create mode 100644 meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch
rename meta/recipes-support/nettle/{nettle-3.3 => nettle-3.4}/check-header-files-of-openssl-only-if-enable_.patch (63%)
rename meta/recipes-support/nettle/{nettle-3.3 => nettle-3.4}/dlopen-test.patch (100%)
rename meta/recipes-support/nettle/{files => nettle-3.4}/run-ptest (100%)
delete mode 100644 meta/recipes-support/nettle/nettle_3.3.bb
rename meta/recipes-support/nettle/{nettle.inc => nettle_3.4.bb} (60%)
diff --git a/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch b/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
deleted file mode 100644
index 23da777..0000000
--- a/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 46edf01cc98db9f9feec984897836dfdd26bdc8d Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Wed, 12 Aug 2015 23:27:27 +0300
-Subject: [PATCH] Add target to only build tests (not run them)
-
-Not sending upstream as this is only a start of a solution to
-installable tests: It's useful for us already as is.
-
-Upstream-Status: Inappropriate [not a complete solution]
-
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
----
- Makefile.in | 3 +++
- testsuite/Makefile.in | 2 ++
- 2 files changed, 5 insertions(+)
-
-diff --git a/Makefile.in b/Makefile.in
-index 08efb7d..7909342 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -55,6 +55,9 @@ clean distclean mostlyclean maintainer-clean tags:
- echo "Making $@ in $$d" ; (cd $$d && $(MAKE) $@); done
- $(MAKE) $@-here
-
-+buildtest:
-+ echo "Making $@ in testsuite" ; (cd testsuite && $(MAKE) $@)
-+
- check-here:
- true
-
-diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
-index 6bc1907..bb65bf0 100644
---- a/testsuite/Makefile.in
-+++ b/testsuite/Makefile.in
-@@ -116,6 +116,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
- # data.
- VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes @IF_ASM@ --partial-loads-ok=yes
-
-+buildtest: $(TS_ALL)
-+
- # The PATH update is for locating dlls on w*ndows.
- check: $(TS_ALL)
- LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \
---
-2.1.4
-
diff --git a/meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch b/meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch
new file mode 100644
index 0000000..c007060
--- /dev/null
+++ b/meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch
@@ -0,0 +1,38 @@
+Add target to only build tests (not run them)
+
+Not sending upstream as this is only a start of a solution to
+installable tests: It's useful for us already as is.
+
+Upstream-Status: Inappropriate [not a complete solution]
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Refactored for 3.4
+Signed-off-by: Armin Kuster <akuster@mvista.com>
+
+Index: nettle-3.4/Makefile.in
+===================================================================
+--- nettle-3.4.orig/Makefile.in
++++ nettle-3.4/Makefile.in
+@@ -55,6 +55,9 @@ clean distclean mostlyclean maintainer-c
+ echo "Making $@ in $$d" ; (cd $$d && $(MAKE) $@); done
+ $(MAKE) $@-here
+
++buildtest:
++ echo "Making $@ in testsuite" ; (cd testsuite && $(MAKE) $@)
++
+ check-here:
+ true
+
+Index: nettle-3.4/testsuite/Makefile.in
+===================================================================
+--- nettle-3.4.orig/testsuite/Makefile.in
++++ nettle-3.4/testsuite/Makefile.in
+@@ -131,6 +131,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$
+ # data.
+ VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes @IF_ASM@ --partial-loads-ok=yes
+
++buildtest: $(TS_ALL)
++
+ # The PATH update is for windows dlls, DYLD_LIBRARY_PATH is for OSX.
+ check: $(TS_ALL)
+ LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" DYLD_LIBRARY_PATH=../.lib \
--git a/meta/recipes-support/nettle/nettle-3.3/check-header-files-of-openssl-only-if-enable_.patch b/meta/recipes-support/nettle/nettle-3.4/check-header-files-of-openssl-only-if-enable_.patch
similarity index 63%
rename from meta/recipes-support/nettle/nettle-3.3/check-header-files-of-openssl-only-if-enable_.patch
rename to meta/recipes-support/nettle/nettle-3.4/check-header-files-of-openssl-only-if-enable_.patch
index e7216ba..d5f2666 100644
--- a/meta/recipes-support/nettle/nettle-3.3/check-header-files-of-openssl-only-if-enable_.patch
+++ b/meta/recipes-support/nettle/nettle-3.4/check-header-files-of-openssl-only-if-enable_.patch
@@ -10,29 +10,27 @@ building for nettle.
Upstream-Status: Pending
Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
----
- configure.ac | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index 4ead52c..982760f 100644
---- a/configure.ac
-+++ b/configure.ac
+refactored for 3.4. pending not in as of 3.4
+
+Signed-off-by: Armin Kuster <akuster@mvista.com>
+
+Index: nettle-3.4/configure.ac
+===================================================================
+--- nettle-3.4.orig/configure.ac
++++ nettle-3.4/configure.ac
@@ -185,9 +185,11 @@ AC_HEADER_TIME
AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(size_t)
--AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h openssl/ecdsa.h],,
+-AC_CHECK_HEADERS([openssl/evp.h openssl/ecdsa.h],,
-[enable_openssl=no
- break])
+if test "x$enable_openssl" = "xyes"; then
-+ AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h openssl/ecdsa.h],,
++ AC_CHECK_HEADERS([openssl/evp.h openssl/ecdsa.h],,
+ [enable_openssl=no
-+ break])
++ break])
+fi
+ # For use by the testsuite
AC_CHECK_HEADERS([valgrind/memcheck.h])
-
---
-1.9.1
-
diff --git a/meta/recipes-support/nettle/nettle-3.3/dlopen-test.patch b/meta/recipes-support/nettle/nettle-3.4/dlopen-test.patch
similarity index 100%
rename from meta/recipes-support/nettle/nettle-3.3/dlopen-test.patch
rename to meta/recipes-support/nettle/nettle-3.4/dlopen-test.patch
diff --git a/meta/recipes-support/nettle/files/run-ptest b/meta/recipes-support/nettle/nettle-3.4/run-ptest
similarity index 100%
rename from meta/recipes-support/nettle/files/run-ptest
rename to meta/recipes-support/nettle/nettle-3.4/run-ptest
diff --git a/meta/recipes-support/nettle/nettle_3.3.bb b/meta/recipes-support/nettle/nettle_3.3.bb
deleted file mode 100644
index 3951678..0000000
--- a/meta/recipes-support/nettle/nettle_3.3.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require nettle.inc
-
-LICENSE = "LGPLv3+ | GPLv2+"
-
-LIC_FILES_CHKSUM = "file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \
- file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
- file://serpent-decrypt.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e \
- file://serpent-set-key.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e"
-
-SRC_URI += "\
- file://check-header-files-of-openssl-only-if-enable_.patch \
- "
-
-SRC_URI_append_class-target = "\
- file://dlopen-test.patch \
- "
-
-SRC_URI[md5sum] = "10f969f78a463704ae73529978148dbe"
-SRC_URI[sha256sum] = "46942627d5d0ca11720fec18d81fc38f7ef837ea4197c1f630e71ce0d470b11e"
diff --git a/meta/recipes-support/nettle/nettle.inc b/meta/recipes-support/nettle/nettle_3.4.bb
similarity index 60%
rename from meta/recipes-support/nettle/nettle.inc
rename to meta/recipes-support/nettle/nettle_3.4.bb
index af51fb6..b4e525c 100644
--- a/meta/recipes-support/nettle/nettle.inc
+++ b/meta/recipes-support/nettle/nettle_3.4.bb
@@ -1,14 +1,28 @@
SUMMARY = "A low level cryptographic library"
HOMEPAGE = "http://www.lysator.liu.se/~nisse/nettle/"
SECTION = "libs"
+LICENSE = "LGPLv3+ | GPLv2+"
+
+LIC_FILES_CHKSUM = "file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \
+ file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://serpent-decrypt.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e \
+ file://serpent-set-key.c;beginline=14;endline=36;md5=ca0d220bc413e1842ecc507690ce416e"
DEPENDS += "gmp"
SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz \
file://Add-target-to-only-build-tests-not-run-them.patch \
file://run-ptest \
+ file://check-header-files-of-openssl-only-if-enable_.patch \
"
+SRC_URI_append_class-target = "\
+ file://dlopen-test.patch \
+ "
+
+SRC_URI[md5sum] = "dc0f13028264992f58e67b4e8915f53d"
+SRC_URI[sha256sum] = "ae7a42df026550b85daca8389b6a60ba6313b0567f374392e54918588a411e94"
+
UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar"
inherit autotools ptest
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 3/5] nss: update to 3.34
2017-11-21 20:01 [PATCH 0/5][V2] Master package updates Armin Kuster
2017-11-21 20:01 ` [PATCH 1/5] gnutls: update to 3.6.1 Armin Kuster
2017-11-21 20:01 ` [PATCH 2/5] nettle: update to 3.4 and cleanup Armin Kuster
@ 2017-11-21 20:01 ` Armin Kuster
2017-11-21 20:01 ` [PATCH 4/5] libassuan: update to 2.4.4 Armin Kuster
` (2 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Armin Kuster @ 2017-11-21 20:01 UTC (permalink / raw)
To: akuster, openembedded-core
From: Armin Kuster <akuster@mvista.com>
for more info see:
https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.34_release_notes
Signed-off-by: Armin Kuster <akuster@mvista.com>
---
meta/recipes-support/nss/{nss_3.33.bb => nss_3.34.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/nss/{nss_3.33.bb => nss_3.34.bb} (98%)
diff --git a/meta/recipes-support/nss/nss_3.33.bb b/meta/recipes-support/nss/nss_3.34.bb
similarity index 98%
rename from meta/recipes-support/nss/nss_3.33.bb
rename to meta/recipes-support/nss/nss_3.34.bb
index e3d4f96..f1fbbb0 100644
--- a/meta/recipes-support/nss/nss_3.33.bb
+++ b/meta/recipes-support/nss/nss_3.34.bb
@@ -28,8 +28,8 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
file://Fix-compilation-for-X32.patch \
"
-SRC_URI[md5sum] = "43663c850e2b2ed48ecb8910b055f5a9"
-SRC_URI[sha256sum] = "98f0dabd36408e83dd3a11727336cc3cdfee4cbdd9aede2b2831eb2389c284e4"
+SRC_URI[md5sum] = "1e30b8e5b13b5b08bbc489c265948d82"
+SRC_URI[sha256sum] = "0d45954181373023c7cfc33e77c8c636d394ec7e55b93e059149ed7888652af5"
UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 4/5] libassuan: update to 2.4.4
2017-11-21 20:01 [PATCH 0/5][V2] Master package updates Armin Kuster
` (2 preceding siblings ...)
2017-11-21 20:01 ` [PATCH 3/5] nss: update to 3.34 Armin Kuster
@ 2017-11-21 20:01 ` Armin Kuster
2017-11-21 20:01 ` [PATCH 5/5] curl: update to 7.56.1 Armin Kuster
2017-11-21 20:38 ` ✗ patchtest: failure for Master package updates (rev2) Patchwork
5 siblings, 0 replies; 13+ messages in thread
From: Armin Kuster @ 2017-11-21 20:01 UTC (permalink / raw)
To: akuster, openembedded-core
From: Armin Kuster <akuster@mvista.com>
forward ported patch
assuan-def.h checksum changed do to "SPDX formating"
assuan.c checksum changes do to "SPDX formating"
Signed-off-by: Armin Kuster <akuster@mvista.com>
---
.../libassuan-add-pkgconfig-support.patch | 77 +++++++++++-----------
.../{libassuan_2.4.3.bb => libassuan_2.4.4.bb} | 11 ++--
2 files changed, 45 insertions(+), 43 deletions(-)
rename meta/recipes-support/libassuan/{libassuan_2.4.3.bb => libassuan_2.4.4.bb} (67%)
diff --git a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch b/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
index b6ccdda..525b076 100644
--- a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
+++ b/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
@@ -6,32 +6,15 @@ Upstream-Status: Denied
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
-Index: libassuan-2.1.2/Makefile.am
-===================================================================
---- libassuan-2.1.2.orig/Makefile.am
-+++ libassuan-2.1.2/Makefile.am
-@@ -24,10 +24,13 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gz
- # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
- GITLOG_TO_CHANGELOG=gitlog-to-changelog
-
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = libassuan.pc
-+
- EXTRA_DIST = autogen.sh autogen.rc README.GIT \
- ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 \
- tests/ChangeLog-2011 contrib/ChangeLog-2011 \
-- build-aux/git-log-footer build-aux/git-log-fix
-+ build-aux/git-log-footer build-aux/git-log-fix libassuan.pc.in
-
- SUBDIRS = m4 src doc tests
-
-Index: libassuan-2.1.2/libassuan.pc.in
+forward ported to 2.4.4
+Signed-off-by: Armin Kuster <akuster@mvista.com>
+
+Index: libassuan-2.4.4/libassuan.pc.in
===================================================================
--- /dev/null
-+++ libassuan-2.1.2/libassuan.pc.in
-@@ -0,0 +1,14 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
++++ libassuan-2.4.4/libassuan.pc.in
+@@ -0,0 +1,13 @@
++prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+api_version=@LIBASSUAN_CONFIG_API_VERSION@
@@ -44,24 +27,42 @@ Index: libassuan-2.1.2/libassuan.pc.in
+Libs: -L${libdir} -lassuan
+Libs.private: -lgpg-error
+Cflags: -I${includedir}
-Index: libassuan-2.1.2/configure.ac
+Index: libassuan-2.4.4/Makefile.am
===================================================================
---- libassuan-2.1.2.orig/configure.ac
-+++ libassuan-2.1.2/configure.ac
-@@ -439,7 +439,7 @@ AC_CONFIG_FILES([doc/Makefile])
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -25,10 +25,13 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-doc
+ # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
+ GITLOG_TO_CHANGELOG=gitlog-to-changelog
+
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = libassuan.pc
++
+ EXTRA_DIST = autogen.sh autogen.rc README.GIT VERSION \
+ ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 \
+ tests/ChangeLog-2011 contrib/ChangeLog-2011 \
+- build-aux/git-log-footer build-aux/git-log-fix
++ build-aux/git-log-footer build-aux/git-log-fix libassuan.pc.in
+
+ if BUILD_DOC
+ doc = doc
+Index: 2.4.4-r0/libassuan-2.4.4/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -485,6 +485,7 @@ AC_CONFIG_FILES([doc/Makefile])
AC_CONFIG_FILES([tests/Makefile])
AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config])
AC_CONFIG_FILES([src/versioninfo.rc])
--
+AC_CONFIG_FILES([libassuan.pc])
+
AC_OUTPUT
- echo "
-Index: libassuan-2.1.2/src/libassuan.m4
+Index: libassuan-2.4.4/src/libassuan.m4
===================================================================
---- libassuan-2.1.2.orig/src/libassuan.m4
-+++ libassuan-2.1.2/src/libassuan.m4
-@@ -15,18 +15,6 @@ dnl Returns ok set to yes or no.
+--- a/src/libassuan.m4
++++ b/src/libassuan.m4
+@@ -16,18 +16,6 @@ dnl Returns ok set to yes or no.
dnl
AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
[ AC_REQUIRE([AC_CANONICAL_HOST])
@@ -80,7 +81,7 @@ Index: libassuan-2.1.2/src/libassuan.m4
tmp=ifelse([$1], ,1:0.9.2,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
-@@ -37,51 +25,12 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
+@@ -38,51 +26,12 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
min_libassuan_version="$tmp"
fi
@@ -105,7 +106,7 @@ Index: libassuan-2.1.2/src/libassuan.m4
-
- if test "$major" -gt "$req_major"; then
- ok=yes
-- else
+- else
- if test "$major" -eq "$req_major"; then
- if test "$minor" -gt "$req_minor"; then
- ok=yes
@@ -134,7 +135,7 @@ Index: libassuan-2.1.2/src/libassuan.m4
if test "$tmp" -gt 0 ; then
AC_MSG_CHECKING([LIBASSUAN API version])
if test "$req_libassuan_api" -eq "$tmp" ; then
-@@ -96,7 +45,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
+@@ -97,7 +46,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
if test $ok = yes; then
if test x"$host" != x ; then
@@ -143,7 +144,7 @@ Index: libassuan-2.1.2/src/libassuan.m4
if test x"$libassuan_config_host" != xnone ; then
if test x"$libassuan_config_host" != x"$host" ; then
AC_MSG_WARN([[
-@@ -137,12 +86,8 @@ dnl
+@@ -138,12 +87,8 @@ dnl
AC_DEFUN([AM_PATH_LIBASSUAN],
[ _AM_PATH_LIBASSUAN_COMMON($1)
if test $ok = yes; then
diff --git a/meta/recipes-support/libassuan/libassuan_2.4.3.bb b/meta/recipes-support/libassuan/libassuan_2.4.4.bb
similarity index 67%
rename from meta/recipes-support/libassuan/libassuan_2.4.3.bb
rename to meta/recipes-support/libassuan/libassuan_2.4.4.bb
index 926c279..7921c1d 100644
--- a/meta/recipes-support/libassuan/libassuan_2.4.3.bb
+++ b/meta/recipes-support/libassuan/libassuan_2.4.4.bb
@@ -7,17 +7,18 @@ LICENSE_${PN} = "LGPLv2.1+"
LICENSE_${PN}-doc = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
- file://src/assuan.c;endline=20;md5=0f465544183405055ec179869fc5b5ba \
- file://src/assuan-defs.h;endline=20;md5=20cd55535260ca1779edae5c7b80b21e"
+ file://src/assuan.c;endline=20;md5=ab92143a5a2adabd06d7994d1467ea5c\
+ file://src/assuan-defs.h;endline=20;md5=15d950c83e82978e35b35e790d7e4d39"
DEPENDS = "libgpg-error"
UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \
- file://libassuan-add-pkgconfig-support.patch"
+ file://libassuan-add-pkgconfig-support.patch \
+ "
-SRC_URI[md5sum] = "8e01a7c72d3e5d154481230668e6eb5a"
-SRC_URI[sha256sum] = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71"
+SRC_URI[md5sum] = "52385ec8d34f258bf10165d32c486002"
+SRC_URI[sha256sum] = "9e69a102272324de0bb56025779f84fd44901afcc6eac51505f6a63ea5737ca1"
BINCONFIG = "${bindir}/libassuan-config"
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 5/5] curl: update to 7.56.1
2017-11-21 20:01 [PATCH 0/5][V2] Master package updates Armin Kuster
` (3 preceding siblings ...)
2017-11-21 20:01 ` [PATCH 4/5] libassuan: update to 2.4.4 Armin Kuster
@ 2017-11-21 20:01 ` Armin Kuster
2017-11-24 12:49 ` Burton, Ross
2017-11-21 20:38 ` ✗ patchtest: failure for Master package updates (rev2) Patchwork
5 siblings, 1 reply; 13+ messages in thread
From: Armin Kuster @ 2017-11-21 20:01 UTC (permalink / raw)
To: akuster, openembedded-core
From: Armin Kuster <akuster@mvista.com>
v2] - remove inherit
curlbuild.h removed from sources
includes:
CVE-2017-1000257
removed patches for the following cve fixs:
CVE-2017-1000254
CVE-2017-1000101
CVE-2017-1000100
CVE-2017-1000099
Signed-off-by: Armin Kuster <akuster@mvista.com>
---
.../curl/{curl_7.54.1.bb => curl_7.56.1.bb} | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
rename meta/recipes-support/curl/{curl_7.54.1.bb => curl_7.56.1.bb} (87%)
diff --git a/meta/recipes-support/curl/curl_7.54.1.bb b/meta/recipes-support/curl/curl_7.56.1.bb
similarity index 87%
rename from meta/recipes-support/curl/curl_7.54.1.bb
rename to meta/recipes-support/curl/curl_7.56.1.bb
index 58f0531..830f350 100644
--- a/meta/recipes-support/curl/curl_7.54.1.bb
+++ b/meta/recipes-support/curl/curl_7.56.1.bb
@@ -7,10 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=8;md5=3a34942f4ae3fbf1a303160714e66
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://0001-replace-krb5-config-with-pkg-config.patch \
- file://CVE-2017-1000099.patch \
- file://CVE-2017-1000100.patch \
- file://CVE-2017-1000101.patch \
- file://CVE-2017-1000254.patch \
"
SRC_URI_append_class-target = " \
@@ -22,11 +18,11 @@ SRC_URI_append_class-target = " \
#
SRC_URI += " file://configure_ac.patch"
-SRC_URI[md5sum] = "6b6eb722f512e7a24855ff084f54fe55"
-SRC_URI[sha256sum] = "fdfc4df2d001ee0c44ec071186e770046249263c491fcae48df0e1a3ca8f25a0"
+SRC_URI[md5sum] = "428de25834ef8c04076906d6d5c0498e"
+SRC_URI[sha256sum] = "2594670367875e7d87b0f129b5e4690150780884d90244ba0fe3e74a778b5f90"
CVE_PRODUCT = "libcurl"
-inherit autotools pkgconfig binconfig multilib_header
+inherit autotools pkgconfig binconfig
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} gnutls proxy threaded-resolver zlib"
PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver zlib"
@@ -64,10 +60,6 @@ EXTRA_OECONF = " \
--without-libpsl \
"
-do_install_append() {
- oe_multilib_header curl/curlbuild.h
-}
-
do_install_append_class-target() {
# cleanup buildpaths from curl-config
sed -i \
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 5/5] curl: update to 7.56.1
2017-11-21 20:01 ` [PATCH 5/5] curl: update to 7.56.1 Armin Kuster
@ 2017-11-24 12:49 ` Burton, Ross
2017-11-24 16:57 ` akuster808
0 siblings, 1 reply; 13+ messages in thread
From: Burton, Ross @ 2017-11-24 12:49 UTC (permalink / raw)
To: Armin Kuster; +Cc: Armin Kuster, OE-core
[-- Attachment #1: Type: text/plain, Size: 2859 bytes --]
Now I remember why this was rejected last time: it breaks dnf in musl (
https://autobuilder.yocto.io/builders/nightly-musl/builds/616).
Ross
On 21 November 2017 at 20:01, Armin Kuster <akuster808@gmail.com> wrote:
> From: Armin Kuster <akuster@mvista.com>
>
> v2] - remove inherit
>
> curlbuild.h removed from sources
>
> includes:
> CVE-2017-1000257
>
> removed patches for the following cve fixs:
> CVE-2017-1000254
> CVE-2017-1000101
> CVE-2017-1000100
> CVE-2017-1000099
>
> Signed-off-by: Armin Kuster <akuster@mvista.com>
> ---
> .../curl/{curl_7.54.1.bb => curl_7.56.1.bb} | 14
> +++-----------
> 1 file changed, 3 insertions(+), 11 deletions(-)
> rename meta/recipes-support/curl/{curl_7.54.1.bb => curl_7.56.1.bb} (87%)
>
> diff --git a/meta/recipes-support/curl/curl_7.54.1.bb
> b/meta/recipes-support/curl/curl_7.56.1.bb
> similarity index 87%
> rename from meta/recipes-support/curl/curl_7.54.1.bb
> rename to meta/recipes-support/curl/curl_7.56.1.bb
> index 58f0531..830f350 100644
> --- a/meta/recipes-support/curl/curl_7.54.1.bb
> +++ b/meta/recipes-support/curl/curl_7.56.1.bb
> @@ -7,10 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=8;md5=
> 3a34942f4ae3fbf1a303160714e66
>
> SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
> file://0001-replace-krb5-config-with-pkg-config.patch \
> - file://CVE-2017-1000099.patch \
> - file://CVE-2017-1000100.patch \
> - file://CVE-2017-1000101.patch \
> - file://CVE-2017-1000254.patch \
> "
>
> SRC_URI_append_class-target = " \
> @@ -22,11 +18,11 @@ SRC_URI_append_class-target = " \
> #
> SRC_URI += " file://configure_ac.patch"
>
> -SRC_URI[md5sum] = "6b6eb722f512e7a24855ff084f54fe55"
> -SRC_URI[sha256sum] = "fdfc4df2d001ee0c44ec071186e770
> 046249263c491fcae48df0e1a3ca8f25a0"
> +SRC_URI[md5sum] = "428de25834ef8c04076906d6d5c0498e"
> +SRC_URI[sha256sum] = "2594670367875e7d87b0f129b5e469
> 0150780884d90244ba0fe3e74a778b5f90"
>
> CVE_PRODUCT = "libcurl"
> -inherit autotools pkgconfig binconfig multilib_header
> +inherit autotools pkgconfig binconfig
>
> PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}
> gnutls proxy threaded-resolver zlib"
> PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver zlib"
> @@ -64,10 +60,6 @@ EXTRA_OECONF = " \
> --without-libpsl \
> "
>
> -do_install_append() {
> - oe_multilib_header curl/curlbuild.h
> -}
> -
> do_install_append_class-target() {
> # cleanup buildpaths from curl-config
> sed -i \
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 4827 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 5/5] curl: update to 7.56.1
2017-11-24 12:49 ` Burton, Ross
@ 2017-11-24 16:57 ` akuster808
2017-11-24 16:59 ` Burton, Ross
0 siblings, 1 reply; 13+ messages in thread
From: akuster808 @ 2017-11-24 16:57 UTC (permalink / raw)
To: Burton, Ross, Armin Kuster; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 3846 bytes --]
On 11/24/2017 04:49 AM, Burton, Ross wrote:
> Now I remember why this was rejected last time: it breaks dnf in musl
> (https://autobuilder.yocto.io/builders/nightly-musl/builds/616).
is it bugged?
- armin
>
> Ross
>
> On 21 November 2017 at 20:01, Armin Kuster <akuster808@gmail.com
> <mailto:akuster808@gmail.com>> wrote:
>
> From: Armin Kuster <akuster@mvista.com <mailto:akuster@mvista.com>>
>
> v2] - remove inherit
>
> curlbuild.h removed from sources
>
> includes:
> CVE-2017-1000257
>
> removed patches for the following cve fixs:
> CVE-2017-1000254
> CVE-2017-1000101
> CVE-2017-1000100
> CVE-2017-1000099
>
> Signed-off-by: Armin Kuster <akuster@mvista.com
> <mailto:akuster@mvista.com>>
> ---
> .../curl/{curl_7.54.1.bb <http://curl_7.54.1.bb> =>
> curl_7.56.1.bb <http://curl_7.56.1.bb>} | 14
> +++-----------
> 1 file changed, 3 insertions(+), 11 deletions(-)
> rename meta/recipes-support/curl/{curl_7.54.1.bb
> <http://curl_7.54.1.bb> => curl_7.56.1.bb <http://curl_7.56.1.bb>}
> (87%)
>
> diff --git a/meta/recipes-support/curl/curl_7.54.1.bb
> <http://curl_7.54.1.bb> b/meta/recipes-support/curl/curl_7.56.1.bb
> <http://curl_7.56.1.bb>
> similarity index 87%
> rename from meta/recipes-support/curl/curl_7.54.1.bb
> <http://curl_7.54.1.bb>
> rename to meta/recipes-support/curl/curl_7.56.1.bb
> <http://curl_7.56.1.bb>
> index 58f0531..830f350 100644
> --- a/meta/recipes-support/curl/curl_7.54.1.bb <http://curl_7.54.1.bb>
> +++ b/meta/recipes-support/curl/curl_7.56.1.bb <http://curl_7.56.1.bb>
> @@ -7,10 +7,6 @@ LIC_FILES_CHKSUM =
> "file://COPYING;beginline=8;md5=3a34942f4ae3fbf1a303160714e66
>
> SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2
> <http://curl.haxx.se/download/curl-$%7BPV%7D.tar.bz2> \
> file://0001-replace-krb5-config-with-pkg-config.patch \
> - file://CVE-2017-1000099.patch \
> - file://CVE-2017-1000100.patch \
> - file://CVE-2017-1000101.patch \
> - file://CVE-2017-1000254.patch \
> "
>
> SRC_URI_append_class-target = " \
> @@ -22,11 +18,11 @@ SRC_URI_append_class-target = " \
> #
> SRC_URI += " file://configure_ac.patch"
>
> -SRC_URI[md5sum] = "6b6eb722f512e7a24855ff084f54fe55"
> -SRC_URI[sha256sum] =
> "fdfc4df2d001ee0c44ec071186e770046249263c491fcae48df0e1a3ca8f25a0"
> +SRC_URI[md5sum] = "428de25834ef8c04076906d6d5c0498e"
> +SRC_URI[sha256sum] =
> "2594670367875e7d87b0f129b5e4690150780884d90244ba0fe3e74a778b5f90"
>
> CVE_PRODUCT = "libcurl"
> -inherit autotools pkgconfig binconfig multilib_header
> +inherit autotools pkgconfig binconfig
>
> PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6',
> d)} gnutls proxy threaded-resolver zlib"
> PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver zlib"
> @@ -64,10 +60,6 @@ EXTRA_OECONF = " \
> --without-libpsl \
> "
>
> -do_install_append() {
> - oe_multilib_header curl/curlbuild.h
> -}
> -
> do_install_append_class-target() {
> # cleanup buildpaths from curl-config
> sed -i \
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> <mailto:Openembedded-core@lists.openembedded.org>
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
> <http://lists.openembedded.org/mailman/listinfo/openembedded-core>
>
>
[-- Attachment #2: Type: text/html, Size: 7883 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 5/5] curl: update to 7.56.1
2017-11-24 16:57 ` akuster808
@ 2017-11-24 16:59 ` Burton, Ross
2017-11-24 20:36 ` akuster808
0 siblings, 1 reply; 13+ messages in thread
From: Burton, Ross @ 2017-11-24 16:59 UTC (permalink / raw)
To: akuster808; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 3279 bytes --]
I haven't looked into it further than verifying that reverting the curl
upgrade makes it work again.
dnf -> python -> gnutls -> curl.
Ross
On 24 November 2017 at 16:57, akuster808 <akuster808@gmail.com> wrote:
>
>
> On 11/24/2017 04:49 AM, Burton, Ross wrote:
>
> Now I remember why this was rejected last time: it breaks dnf in musl (
> https://autobuilder.yocto.io/builders/nightly-musl/builds/616).
>
> is it bugged?
>
> - armin
>
>
> Ross
>
> On 21 November 2017 at 20:01, Armin Kuster <akuster808@gmail.com> wrote:
>
>> From: Armin Kuster <akuster@mvista.com>
>>
>> v2] - remove inherit
>>
>> curlbuild.h removed from sources
>>
>> includes:
>> CVE-2017-1000257
>>
>> removed patches for the following cve fixs:
>> CVE-2017-1000254
>> CVE-2017-1000101
>> CVE-2017-1000100
>> CVE-2017-1000099
>>
>> Signed-off-by: Armin Kuster <akuster@mvista.com>
>> ---
>> .../curl/{curl_7.54.1.bb => curl_7.56.1.bb} | 14
>> +++-----------
>> 1 file changed, 3 insertions(+), 11 deletions(-)
>> rename meta/recipes-support/curl/{curl_7.54.1.bb => curl_7.56.1.bb}
>> (87%)
>>
>> diff --git a/meta/recipes-support/curl/curl_7.54.1.bb
>> b/meta/recipes-support/curl/curl_7.56.1.bb
>> similarity index 87%
>> rename from meta/recipes-support/curl/curl_7.54.1.bb
>> rename to meta/recipes-support/curl/curl_7.56.1.bb
>> index 58f0531..830f350 100644
>> --- a/meta/recipes-support/curl/curl_7.54.1.bb
>> +++ b/meta/recipes-support/curl/curl_7.56.1.bb
>> @@ -7,10 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=8;md
>> 5=3a34942f4ae3fbf1a303160714e66
>>
>> SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
>> file://0001-replace-krb5-config-with-pkg-config.patch \
>> - file://CVE-2017-1000099.patch \
>> - file://CVE-2017-1000100.patch \
>> - file://CVE-2017-1000101.patch \
>> - file://CVE-2017-1000254.patch \
>> "
>>
>> SRC_URI_append_class-target = " \
>> @@ -22,11 +18,11 @@ SRC_URI_append_class-target = " \
>> #
>> SRC_URI += " file://configure_ac.patch"
>>
>> -SRC_URI[md5sum] = "6b6eb722f512e7a24855ff084f54fe55"
>> -SRC_URI[sha256sum] = "fdfc4df2d001ee0c44ec071186e77
>> 0046249263c491fcae48df0e1a3ca8f25a0"
>> +SRC_URI[md5sum] = "428de25834ef8c04076906d6d5c0498e"
>> +SRC_URI[sha256sum] = "2594670367875e7d87b0f129b5e46
>> 90150780884d90244ba0fe3e74a778b5f90"
>>
>> CVE_PRODUCT = "libcurl"
>> -inherit autotools pkgconfig binconfig multilib_header
>> +inherit autotools pkgconfig binconfig
>>
>> PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}
>> gnutls proxy threaded-resolver zlib"
>> PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver zlib"
>> @@ -64,10 +60,6 @@ EXTRA_OECONF = " \
>> --without-libpsl \
>> "
>>
>> -do_install_append() {
>> - oe_multilib_header curl/curlbuild.h
>> -}
>> -
>> do_install_append_class-target() {
>> # cleanup buildpaths from curl-config
>> sed -i \
>> --
>> 2.7.4
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>
>
>
[-- Attachment #2: Type: text/html, Size: 7588 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 5/5] curl: update to 7.56.1
2017-11-24 16:59 ` Burton, Ross
@ 2017-11-24 20:36 ` akuster808
0 siblings, 0 replies; 13+ messages in thread
From: akuster808 @ 2017-11-24 20:36 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 4834 bytes --]
On 11/24/2017 08:59 AM, Burton, Ross wrote:
> I haven't looked into it further than verifying that reverting the
> curl upgrade makes it work again.
>
> dnf -> python -> gnutls -> curl.
k. I am setting up an env to rep this issue.
thanks,
Armin
>
> Ross
>
> On 24 November 2017 at 16:57, akuster808 <akuster808@gmail.com
> <mailto:akuster808@gmail.com>> wrote:
>
>
>
> On 11/24/2017 04:49 AM, Burton, Ross wrote:
>> Now I remember why this was rejected last time: it breaks dnf in
>> musl
>> (https://autobuilder.yocto.io/builders/nightly-musl/builds/616
>> <https://autobuilder.yocto.io/builders/nightly-musl/builds/616>).
> is it bugged?
>
> - armin
>
>>
>> Ross
>>
>> On 21 November 2017 at 20:01, Armin Kuster <akuster808@gmail.com
>> <mailto:akuster808@gmail.com>> wrote:
>>
>> From: Armin Kuster <akuster@mvista.com
>> <mailto:akuster@mvista.com>>
>>
>> v2] - remove inherit
>>
>> curlbuild.h removed from sources
>>
>> includes:
>> CVE-2017-1000257
>>
>> removed patches for the following cve fixs:
>> CVE-2017-1000254
>> CVE-2017-1000101
>> CVE-2017-1000100
>> CVE-2017-1000099
>>
>> Signed-off-by: Armin Kuster <akuster@mvista.com
>> <mailto:akuster@mvista.com>>
>> ---
>> .../curl/{curl_7.54.1.bb <http://curl_7.54.1.bb> =>
>> curl_7.56.1.bb <http://curl_7.56.1.bb>} | 14
>> +++-----------
>> 1 file changed, 3 insertions(+), 11 deletions(-)
>> rename meta/recipes-support/curl/{curl_7.54.1.bb
>> <http://curl_7.54.1.bb> => curl_7.56.1.bb
>> <http://curl_7.56.1.bb>} (87%)
>>
>> diff --git a/meta/recipes-support/curl/curl_7.54.1.bb
>> <http://curl_7.54.1.bb>
>> b/meta/recipes-support/curl/curl_7.56.1.bb
>> <http://curl_7.56.1.bb>
>> similarity index 87%
>> rename from meta/recipes-support/curl/curl_7.54.1.bb
>> <http://curl_7.54.1.bb>
>> rename to meta/recipes-support/curl/curl_7.56.1.bb
>> <http://curl_7.56.1.bb>
>> index 58f0531..830f350 100644
>> --- a/meta/recipes-support/curl/curl_7.54.1.bb
>> <http://curl_7.54.1.bb>
>> +++ b/meta/recipes-support/curl/curl_7.56.1.bb
>> <http://curl_7.56.1.bb>
>> @@ -7,10 +7,6 @@ LIC_FILES_CHKSUM =
>> "file://COPYING;beginline=8;md5=3a34942f4ae3fbf1a303160714e66
>>
>> SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2
>> <http://curl.haxx.se/download/curl-$%7BPV%7D.tar.bz2> \
>>
>> file://0001-replace-krb5-config-with-pkg-config.patch \
>> - file://CVE-2017-1000099.patch \
>> - file://CVE-2017-1000100.patch \
>> - file://CVE-2017-1000101.patch \
>> - file://CVE-2017-1000254.patch \
>> "
>>
>> SRC_URI_append_class-target = " \
>> @@ -22,11 +18,11 @@ SRC_URI_append_class-target = " \
>> #
>> SRC_URI += " file://configure_ac.patch"
>>
>> -SRC_URI[md5sum] = "6b6eb722f512e7a24855ff084f54fe55"
>> -SRC_URI[sha256sum] =
>> "fdfc4df2d001ee0c44ec071186e770046249263c491fcae48df0e1a3ca8f25a0"
>> +SRC_URI[md5sum] = "428de25834ef8c04076906d6d5c0498e"
>> +SRC_URI[sha256sum] =
>> "2594670367875e7d87b0f129b5e4690150780884d90244ba0fe3e74a778b5f90"
>>
>> CVE_PRODUCT = "libcurl"
>> -inherit autotools pkgconfig binconfig multilib_header
>> +inherit autotools pkgconfig binconfig
>>
>> PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES',
>> 'ipv6', d)} gnutls proxy threaded-resolver zlib"
>> PACKAGECONFIG_class-native = "ipv6 proxy ssl
>> threaded-resolver zlib"
>> @@ -64,10 +60,6 @@ EXTRA_OECONF = " \
>> --without-libpsl \
>> "
>>
>> -do_install_append() {
>> - oe_multilib_header curl/curlbuild.h
>> -}
>> -
>> do_install_append_class-target() {
>> # cleanup buildpaths from curl-config
>> sed -i \
>> --
>> 2.7.4
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> <mailto:Openembedded-core@lists.openembedded.org>
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>> <http://lists.openembedded.org/mailman/listinfo/openembedded-core>
>>
>>
>
>
[-- Attachment #2: Type: text/html, Size: 12662 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* ✗ patchtest: failure for Master package updates (rev2)
2017-11-21 20:01 [PATCH 0/5][V2] Master package updates Armin Kuster
` (4 preceding siblings ...)
2017-11-21 20:01 ` [PATCH 5/5] curl: update to 7.56.1 Armin Kuster
@ 2017-11-21 20:38 ` Patchwork
5 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2017-11-21 20:38 UTC (permalink / raw)
To: Armin Kuster; +Cc: openembedded-core
== Series Details ==
Series: Master package updates (rev2)
Revision: 2
URL : https://patchwork.openembedded.org/series/9884/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:
* Patch [5/5] curl: update to 7.56.1
Issue Missing or incorrectly formatted CVE tag in included patch file [test_cve_tag_format]
Suggested fix Correct or include the CVE tag on cve patch with format: "CVE: CVE-YYYY-XXXX"
If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
^ permalink raw reply [flat|nested] 13+ messages in thread