* [PATCH 0/8] upgrade 8 recipes
@ 2017-08-16 8:31 Hongxu Jia
2017-08-16 8:31 ` [PATCH 1/8] apr-util: 1.5.4 -> 1.6.0 Hongxu Jia
` (7 more replies)
0 siblings, 8 replies; 16+ messages in thread
From: Hongxu Jia @ 2017-08-16 8:31 UTC (permalink / raw)
To: openembedded-core, ross.burton
The following changes since commit 034bff2ca431b49b7ca9b1e7b7c214ef94b0eb34:
bitbake: cooker: Ignore common bitbake files for the parse cache invalidation (2017-08-13 09:28:14 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib hongxu/upgrade-20170816
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=hongxu/upgrade-20170816
Hongxu Jia (8):
apr-util: 1.5.4 -> 1.6.0
bash: 4.3.30 -> 4.4
dhcp: 4.3.5 -> 4.3.6
elfutils: 0.168 -> 0.170
libgcrypt: 1.7.8 -> 1.8.0
gnupg: 2.1.20 -> 2.1.23
gpgme: 1.8.0 -> 1.9.0
ncurses: 6.0+20161126 -> 6.0+20170715
meta/recipes-connectivity/dhcp/dhcp.inc | 4 +-
...-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch} | 12 +-
...hclient-dbus.patch => 0002-dhclient-dbus.patch} | 97 +++++---
...-lcrypto.patch => 0003-link-with-lcrypto.patch} | 20 +-
...ild.patch => 0004-Fix-out-of-tree-builds.patch} | 9 +-
...-fix-invoke-dhclient-script-failed-on-Rea.patch | 36 +++
...ch => 0006-site.h-enable-gentle-shutdown.patch} | 17 +-
...re-argument-to-make-the-libxml2-dependenc.patch | 42 ++++
...h => 0008-tweak-to-support-external-bind.patch} | 12 +-
...09-remove-dhclient-script-bash-dependency.patch | 28 +++
...red-libs.patch => 0010-build-shared-libs.patch} | 30 ++-
...ll-to-isc_app_ctxstart-to-not-get-signal.patch} | 10 +-
...dhclient-script-drop-resolv.conf.dhclient.patch | 70 ------
.../dhcp/dhcp/libxml2-configure-argument.patch | 38 ----
.../remove-dhclient-script-bash-dependency.patch | 55 -----
.../dhcp/dhcp/replace-ifconfig-route.patch | 188 ---------------
.../dhcp/dhcp/search-for-libxml2.patch | 23 --
meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb | 20 --
meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb | 20 ++
.../files/{tic-hang.patch => 0001-tic-hang.patch} | 26 ++-
...ble.patch => 0002-configure-reproducible.patch} | 21 +-
.../ncurses/files/fix-cflags-mangle.patch | 18 --
...ses_6.0+20161126.bb => ncurses_6.0+20170715.bb} | 7 +-
...m-Silence-Werror-maybe-uninitialized-fals.patch | 35 ---
.../elfutils-0.168/Fix_one_GCC7_warning.patch | 44 ----
.../elfutils/elfutils-0.168/debian/hurd_path.patch | 17 --
.../elfutils-0.168/debian/ignore_strmerge.diff | 14 --
.../elfutils-0.168/debian/kfreebsd_path.patch | 20 --
.../debian/testsuite-ignore-elflint.diff | 42 ----
.../elfutils/elfutils-0.168/shadow.patch | 23 --
.../elfutils/elfutils/dso-link-change.patch | 32 ---
.../{elfutils_0.168.bb => elfutils_0.170.bb} | 32 ++-
.../elfutils/files/0001-dso-link-change.patch | 52 +++++
...elf_cvt_gunhash-if-dest-and-src-are-same.patch} | 15 +-
.../0003-fixheadercheck.patch} | 23 +-
.../0004-Disable-the-test-to-convert-euc-jp.patch} | 10 +-
.../0005-fix-a-stack-usage-warning.patch} | 15 +-
.../0006-Fix-build-on-aarch64-musl.patch} | 38 +++-
...-path-where-we-have-str-as-uninitialized-.patch | 45 ++++
...e-alternatives-for-glibc-assumptions-hel.patch} | 168 ++++++--------
...ferences-between-mips-machine-identifiers.patch | 0
...-support-for-mips64-abis-in-mips_retval.c.patch | 0
.../0003-Add-mips-n64-relocation-format-hack.patch | 0
.../debian/arm_backend.diff | 0
.../debian}/fallthrough.patch | 0
.../debian/hppa_backend.diff | 0
.../debian/mips_backend.patch} | 115 ++++++----
.../debian/mips_readelf_w.patch | 0
meta/recipes-extended/bash/bash.inc | 4 +
.../recipes-extended/bash/bash/CVE-2016-9401.patch | 50 ----
...roc-run-heredoc-run-execscript-run-test-f.patch | 158 ++-----------
meta/recipes-extended/bash/bash/fix-run-intl.patch | 110 ---------
meta/recipes-extended/bash/bash/test-output.patch | 47 ++--
meta/recipes-extended/bash/bash_4.3.30.bb | 75 ------
meta/recipes-extended/bash/bash_4.4.bb | 58 +++++
.../recipes-support/apr/apr-util/openssl-1.1.patch | 253 ---------------------
.../apr/{apr-util_1.5.4.bb => apr-util_1.6.0.bb} | 7 +-
...config-to-find-pth-instead-of-pth-config.patch} | 29 ++-
...002-use-pkgconfig-instead-of-npth-config.patch} | 21 +-
.../gnupg/0003-dirmngr-uses-libgpg-error.patch | 32 +++
...en.sh-fix-find-version-for-beta-checking.patch} | 17 +-
.../gnupg/gnupg/dirmngr-uses-libgpg-error.patch | 16 --
.../gnupg/{gnupg_2.1.20.bb => gnupg_2.1.23.bb} | 14 +-
.../{pkgconfig.patch => 0001-pkgconfig.patch} | 16 +-
...ython-gpg-error-config-should-not-be-use.patch} | 25 +-
...=> 0003-Correctly-install-python-modules.patch} | 22 +-
...ython-import.patch => 0004-python-import.patch} | 15 ++
...-skip-all-lib-or-usr-lib-directories-in-.patch} | 6 +-
.../gpgme/{gpgme_1.8.0.bb => gpgme_1.9.0.bb} | 16 +-
...pkg-config-for-libgcrypt-instead-of-conf.patch} | 18 +-
...x-building-error-with-O2-in-sysroot-path.patch} | 29 ++-
...slope.c-workaround-ICE-failure-on-mips-w.patch} | 24 +-
...le.am-fix-undefined-reference-to-pthread.patch} | 11 +-
.../{libgcrypt_1.7.8.bb => libgcrypt_1.8.0.bb} | 12 +-
74 files changed, 973 insertions(+), 1655 deletions(-)
rename meta/recipes-connectivity/dhcp/dhcp/{define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch => 0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch} (70%)
rename meta/recipes-connectivity/dhcp/dhcp/{dhcp-3.0.3-dhclient-dbus.patch => 0002-dhclient-dbus.patch} (45%)
rename meta/recipes-connectivity/dhcp/dhcp/{link-with-lcrypto.patch => 0003-link-with-lcrypto.patch} (68%)
rename meta/recipes-connectivity/dhcp/dhcp/{fixsepbuild.patch => 0004-Fix-out-of-tree-builds.patch} (92%)
create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch
rename meta/recipes-connectivity/dhcp/dhcp/{0001-site.h-enable-gentle-shutdown.patch => 0006-site.h-enable-gentle-shutdown.patch} (65%)
create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch
rename meta/recipes-connectivity/dhcp/dhcp/{tweak-to-support-external-bind.patch => 0008-tweak-to-support-external-bind.patch} (93%)
create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch
rename meta/recipes-connectivity/dhcp/dhcp/{build-shared-libs.patch => 0010-build-shared-libs.patch} (90%)
rename meta/recipes-connectivity/dhcp/dhcp/{Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch => 0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch} (92%)
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/remove-dhclient-script-bash-dependency.patch
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/search-for-libxml2.patch
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb
create mode 100644 meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb
rename meta/recipes-core/ncurses/files/{tic-hang.patch => 0001-tic-hang.patch} (63%)
rename meta/recipes-core/ncurses/files/{configure-reproducible.patch => 0002-configure-reproducible.patch} (50%)
delete mode 100644 meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
rename meta/recipes-core/ncurses/{ncurses_6.0+20161126.bb => ncurses_6.0+20170715.bb} (56%)
delete mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch
delete mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/Fix_one_GCC7_warning.patch
delete mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/debian/hurd_path.patch
delete mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/debian/ignore_strmerge.diff
delete mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/debian/kfreebsd_path.patch
delete mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/debian/testsuite-ignore-elflint.diff
delete mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/shadow.patch
delete mode 100644 meta/recipes-devtools/elfutils/elfutils/dso-link-change.patch
rename meta/recipes-devtools/elfutils/{elfutils_0.168.bb => elfutils_0.170.bb} (71%)
create mode 100644 meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
rename meta/recipes-devtools/elfutils/{elfutils/Fix_elf_cvt_gunhash.patch => files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch} (72%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168/fixheadercheck.patch => files/0003-fixheadercheck.patch} (69%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168/0001-remove-the-unneed-checking.patch => files/0004-Disable-the-test-to-convert-euc-jp.patch} (76%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168/0001-fix-a-stack-usage-warning.patch => files/0005-fix-a-stack-usage-warning.patch} (72%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168/aarch64_uio.patch => files/0006-Fix-build-on-aarch64-musl.patch} (51%)
create mode 100644 meta/recipes-devtools/elfutils/files/0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch
rename meta/recipes-devtools/elfutils/{elfutils-0.168/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch => files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch} (89%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168 => files}/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168 => files}/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168 => files}/debian/0003-Add-mips-n64-relocation-format-hack.patch (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168 => files}/debian/arm_backend.diff (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168 => files/debian}/fallthrough.patch (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168 => files}/debian/hppa_backend.diff (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168/debian/mips_backend.diff => files/debian/mips_backend.patch} (92%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168 => files}/debian/mips_readelf_w.patch (100%)
delete mode 100644 meta/recipes-extended/bash/bash/CVE-2016-9401.patch
delete mode 100644 meta/recipes-extended/bash/bash/fix-run-intl.patch
delete mode 100644 meta/recipes-extended/bash/bash_4.3.30.bb
create mode 100644 meta/recipes-extended/bash/bash_4.4.bb
delete mode 100644 meta/recipes-support/apr/apr-util/openssl-1.1.patch
rename meta/recipes-support/apr/{apr-util_1.5.4.bb => apr-util_1.6.0.bb} (92%)
rename meta/recipes-support/gnupg/gnupg/{pkgconfig.patch => 0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch} (81%)
rename meta/recipes-support/gnupg/gnupg/{use-pkgconfig-instead-of-npth-config.patch => 0002-use-pkgconfig-instead-of-npth-config.patch} (81%)
create mode 100644 meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch
rename meta/recipes-support/gnupg/gnupg/{autogen.sh-fix-find-version-for-beta-checking.patch => 0004-autogen.sh-fix-find-version-for-beta-checking.patch} (58%)
delete mode 100644 meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch
rename meta/recipes-support/gnupg/{gnupg_2.1.20.bb => gnupg_2.1.23.bb} (69%)
rename meta/recipes-support/gpgme/gpgme/{pkgconfig.patch => 0001-pkgconfig.patch} (96%)
rename meta/recipes-support/gpgme/gpgme/{python-lang-config.patch => 0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch} (72%)
rename meta/recipes-support/gpgme/gpgme/{0001-Correctly-install-python-modules.patch => 0003-Correctly-install-python-modules.patch} (52%)
rename meta/recipes-support/gpgme/gpgme/{python-import.patch => 0004-python-import.patch} (66%)
rename meta/recipes-support/gpgme/gpgme/{0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch => 0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch} (85%)
rename meta/recipes-support/gpgme/{gpgme_1.8.0.bb => gpgme_1.9.0.bb} (84%)
rename meta/recipes-support/libgcrypt/files/{add-pkgconfig-support.patch => 0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch} (94%)
rename meta/recipes-support/libgcrypt/files/{libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch => 0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch} (55%)
rename meta/recipes-support/libgcrypt/files/{fix-ICE-failure-on-mips-with-option-O-and-g.patch => 0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch} (73%)
rename meta/recipes-support/libgcrypt/files/{fix-undefined-reference-to-pthread.patch => 0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch} (70%)
rename meta/recipes-support/libgcrypt/{libgcrypt_1.7.8.bb => libgcrypt_1.8.0.bb} (75%)
--
2.8.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 1/8] apr-util: 1.5.4 -> 1.6.0
2017-08-16 8:31 [PATCH 0/8] upgrade 8 recipes Hongxu Jia
@ 2017-08-16 8:31 ` Hongxu Jia
2017-08-16 8:31 ` [PATCH 2/8] bash: 4.3.30 -> 4.4 Hongxu Jia
` (6 subsequent siblings)
7 siblings, 0 replies; 16+ messages in thread
From: Hongxu Jia @ 2017-08-16 8:31 UTC (permalink / raw)
To: openembedded-core, ross.burton
Drop backported openssl-1.1.patch
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
.../recipes-support/apr/apr-util/openssl-1.1.patch | 253 ---------------------
.../apr/{apr-util_1.5.4.bb => apr-util_1.6.0.bb} | 7 +-
2 files changed, 3 insertions(+), 257 deletions(-)
delete mode 100644 meta/recipes-support/apr/apr-util/openssl-1.1.patch
rename meta/recipes-support/apr/{apr-util_1.5.4.bb => apr-util_1.6.0.bb} (92%)
diff --git a/meta/recipes-support/apr/apr-util/openssl-1.1.patch b/meta/recipes-support/apr/apr-util/openssl-1.1.patch
deleted file mode 100644
index 891c141..0000000
--- a/meta/recipes-support/apr/apr-util/openssl-1.1.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-# commit f163d8b5af9185de80d24b4dd13951dd64872aa6
-# Author: Rainer Jung <rjung@apache.org>
-# Date: Sun Feb 7 14:40:46 2016 +0000
-#
-# Add support for OpenSSL 1.1.0:
-# - Switch configure test for OpenSSL libcrypto
-# from BN_init() to BN_new().
-# - BN_init() is gone in OpenSSL 1.1.0.
-# BN_new() exists at least since 0.9.8.
-# - use OPENSSL_malloc_init() instead of
-# CRYPTO_malloc_init
-# - make cipherCtx a pointer. Type EVP_CIPHER_CTX
-# is now opaque.
-# - use EVP_CIPHER_CTX_new() in init() functions
-# if initialised flag is not set (and set flag)
-# - use EVP_CIPHER_CTX_free() in cleanup function
-# - Improve reuse cleanup
-# - call EVP_CIPHER_CTX_reset() resp.
-# EVP_CIPHER_CTX_cleanup() in finish functions
-# - call EVP_CIPHER_CTX_reset() resp.
-# EVP_CIPHER_CTX_cleanup() when Update fails
-# Backport of r1728958 and r1728963 from trunk.
-#
-#
-# git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1728969 13f79535-47bb-0310-9956-ffa450edef68
-#
-
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-Upstream-Status: Backport
-diff --git a/build/crypto.m4 b/build/crypto.m4
-index 9f9be6f..57884e3 100644
---- a/build/crypto.m4
-+++ b/build/crypto.m4
-@@ -88,7 +88,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [
- [
- if test "$withval" = "yes"; then
- AC_CHECK_HEADERS(openssl/x509.h, [openssl_have_headers=1])
-- AC_CHECK_LIB(crypto, BN_init, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
-+ AC_CHECK_LIB(crypto, BN_new, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
- if test "$openssl_have_headers" != "0" && test "$openssl_have_libs" != "0"; then
- apu_have_openssl=1
- fi
-@@ -104,7 +104,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [
-
- AC_MSG_NOTICE(checking for openssl in $withval)
- AC_CHECK_HEADERS(openssl/x509.h, [openssl_have_headers=1])
-- AC_CHECK_LIB(crypto, BN_init, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
-+ AC_CHECK_LIB(crypto, BN_new, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
- if test "$openssl_have_headers" != "0" && test "$openssl_have_libs" != "0"; then
- apu_have_openssl=1
- APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-@@ -113,7 +113,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [
-
- if test "$apu_have_openssl" != "1"; then
- AC_CHECK_HEADERS(openssl/x509.h, [openssl_have_headers=1])
-- AC_CHECK_LIB(crypto, BN_init, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
-+ AC_CHECK_LIB(crypto, BN_new, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
- if test "$openssl_have_headers" != "0" && test "$openssl_have_libs" != "0"; then
- apu_have_openssl=1
- APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-diff --git a/crypto/apr_crypto_openssl.c b/crypto/apr_crypto_openssl.c
-index 0740f93..7d61fca 100644
---- a/crypto/apr_crypto_openssl.c
-+++ b/crypto/apr_crypto_openssl.c
-@@ -64,7 +64,7 @@ struct apr_crypto_block_t {
- apr_pool_t *pool;
- const apr_crypto_driver_t *provider;
- const apr_crypto_t *f;
-- EVP_CIPHER_CTX cipherCtx;
-+ EVP_CIPHER_CTX *cipherCtx;
- int initialised;
- int ivSize;
- int blockSize;
-@@ -111,7 +111,11 @@ static apr_status_t crypto_shutdown_helper(void *data)
- static apr_status_t crypto_init(apr_pool_t *pool, const char *params,
- const apu_err_t **result)
- {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- CRYPTO_malloc_init();
-+#else
-+ OPENSSL_malloc_init();
-+#endif
- ERR_load_crypto_strings();
- /* SSL_load_error_strings(); */
- OpenSSL_add_all_algorithms();
-@@ -134,7 +138,7 @@ static apr_status_t crypto_block_cleanup(apr_crypto_block_t *ctx)
- {
-
- if (ctx->initialised) {
-- EVP_CIPHER_CTX_cleanup(&ctx->cipherCtx);
-+ EVP_CIPHER_CTX_free(ctx->cipherCtx);
- ctx->initialised = 0;
- }
-
-@@ -491,8 +495,10 @@ static apr_status_t crypto_block_encrypt_init(apr_crypto_block_t **ctx,
- apr_pool_cleanup_null);
-
- /* create a new context for encryption */
-- EVP_CIPHER_CTX_init(&block->cipherCtx);
-- block->initialised = 1;
-+ if (!block->initialised) {
-+ block->cipherCtx = EVP_CIPHER_CTX_new();
-+ block->initialised = 1;
-+ }
-
- /* generate an IV, if necessary */
- usedIv = NULL;
-@@ -519,16 +525,16 @@ static apr_status_t crypto_block_encrypt_init(apr_crypto_block_t **ctx,
-
- /* set up our encryption context */
- #if CRYPTO_OPENSSL_CONST_BUFFERS
-- if (!EVP_EncryptInit_ex(&block->cipherCtx, key->cipher, config->engine,
-+ if (!EVP_EncryptInit_ex(block->cipherCtx, key->cipher, config->engine,
- key->key, usedIv)) {
- #else
-- if (!EVP_EncryptInit_ex(&block->cipherCtx, key->cipher, config->engine, (unsigned char *) key->key, (unsigned char *) usedIv)) {
-+ if (!EVP_EncryptInit_ex(block->cipherCtx, key->cipher, config->engine, (unsigned char *) key->key, (unsigned char *) usedIv)) {
- #endif
- return APR_EINIT;
- }
-
- /* Clear up any read padding */
-- if (!EVP_CIPHER_CTX_set_padding(&block->cipherCtx, key->doPad)) {
-+ if (!EVP_CIPHER_CTX_set_padding(block->cipherCtx, key->doPad)) {
- return APR_EPADDING;
- }
-
-@@ -582,11 +588,16 @@ static apr_status_t crypto_block_encrypt(unsigned char **out,
- }
-
- #if CRYPT_OPENSSL_CONST_BUFFERS
-- if (!EVP_EncryptUpdate(&ctx->cipherCtx, (*out), &outl, in, inlen)) {
-+ if (!EVP_EncryptUpdate(ctx->cipherCtx, (*out), &outl, in, inlen)) {
- #else
-- if (!EVP_EncryptUpdate(&ctx->cipherCtx, (*out), &outl,
-+ if (!EVP_EncryptUpdate(ctx->cipherCtx, (*out), &outl,
- (unsigned char *) in, inlen)) {
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
-+#else
-+ EVP_CIPHER_CTX_reset(ctx->cipherCtx);
-+#endif
- return APR_ECRYPT;
- }
- *outlen = outl;
-@@ -616,14 +627,22 @@ static apr_status_t crypto_block_encrypt(unsigned char **out,
- static apr_status_t crypto_block_encrypt_finish(unsigned char *out,
- apr_size_t *outlen, apr_crypto_block_t *ctx)
- {
-+ apr_status_t rc = APR_SUCCESS;
- int len = *outlen;
-
-- if (EVP_EncryptFinal_ex(&ctx->cipherCtx, out, &len) == 0) {
-- return APR_EPADDING;
-+ if (EVP_EncryptFinal_ex(ctx->cipherCtx, out, &len) == 0) {
-+ rc = APR_EPADDING;
-+ }
-+ else {
-+ *outlen = len;
- }
-- *outlen = len;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
-+#else
-+ EVP_CIPHER_CTX_reset(ctx->cipherCtx);
-+#endif
-
-- return APR_SUCCESS;
-+ return rc;
-
- }
-
-@@ -662,8 +681,10 @@ static apr_status_t crypto_block_decrypt_init(apr_crypto_block_t **ctx,
- apr_pool_cleanup_null);
-
- /* create a new context for encryption */
-- EVP_CIPHER_CTX_init(&block->cipherCtx);
-- block->initialised = 1;
-+ if (!block->initialised) {
-+ block->cipherCtx = EVP_CIPHER_CTX_new();
-+ block->initialised = 1;
-+ }
-
- /* generate an IV, if necessary */
- if (key->ivSize) {
-@@ -674,16 +695,16 @@ static apr_status_t crypto_block_decrypt_init(apr_crypto_block_t **ctx,
-
- /* set up our encryption context */
- #if CRYPTO_OPENSSL_CONST_BUFFERS
-- if (!EVP_DecryptInit_ex(&block->cipherCtx, key->cipher, config->engine,
-+ if (!EVP_DecryptInit_ex(block->cipherCtx, key->cipher, config->engine,
- key->key, iv)) {
- #else
-- if (!EVP_DecryptInit_ex(&block->cipherCtx, key->cipher, config->engine, (unsigned char *) key->key, (unsigned char *) iv)) {
-+ if (!EVP_DecryptInit_ex(block->cipherCtx, key->cipher, config->engine, (unsigned char *) key->key, (unsigned char *) iv)) {
- #endif
- return APR_EINIT;
- }
-
- /* Clear up any read padding */
-- if (!EVP_CIPHER_CTX_set_padding(&block->cipherCtx, key->doPad)) {
-+ if (!EVP_CIPHER_CTX_set_padding(block->cipherCtx, key->doPad)) {
- return APR_EPADDING;
- }
-
-@@ -737,11 +758,16 @@ static apr_status_t crypto_block_decrypt(unsigned char **out,
- }
-
- #if CRYPT_OPENSSL_CONST_BUFFERS
-- if (!EVP_DecryptUpdate(&ctx->cipherCtx, *out, &outl, in, inlen)) {
-+ if (!EVP_DecryptUpdate(ctx->cipherCtx, *out, &outl, in, inlen)) {
- #else
-- if (!EVP_DecryptUpdate(&ctx->cipherCtx, *out, &outl, (unsigned char *) in,
-+ if (!EVP_DecryptUpdate(ctx->cipherCtx, *out, &outl, (unsigned char *) in,
- inlen)) {
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
-+#else
-+ EVP_CIPHER_CTX_reset(ctx->cipherCtx);
-+#endif
- return APR_ECRYPT;
- }
- *outlen = outl;
-@@ -771,15 +797,22 @@ static apr_status_t crypto_block_decrypt(unsigned char **out,
- static apr_status_t crypto_block_decrypt_finish(unsigned char *out,
- apr_size_t *outlen, apr_crypto_block_t *ctx)
- {
--
-+ apr_status_t rc = APR_SUCCESS;
- int len = *outlen;
-
-- if (EVP_DecryptFinal_ex(&ctx->cipherCtx, out, &len) == 0) {
-- return APR_EPADDING;
-+ if (EVP_DecryptFinal_ex(ctx->cipherCtx, out, &len) == 0) {
-+ rc = APR_EPADDING;
- }
-- *outlen = len;
-+ else {
-+ *outlen = len;
-+ }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ EVP_CIPHER_CTX_cleanup(ctx->cipherCtx);
-+#else
-+ EVP_CIPHER_CTX_reset(ctx->cipherCtx);
-+#endif
-
-- return APR_SUCCESS;
-+ return rc;
-
- }
-
diff --git a/meta/recipes-support/apr/apr-util_1.5.4.bb b/meta/recipes-support/apr/apr-util_1.6.0.bb
similarity index 92%
rename from meta/recipes-support/apr/apr-util_1.5.4.bb
rename to meta/recipes-support/apr/apr-util_1.6.0.bb
index 64f4d94..748d196 100644
--- a/meta/recipes-support/apr/apr-util_1.5.4.bb
+++ b/meta/recipes-support/apr/apr-util_1.6.0.bb
@@ -6,18 +6,17 @@ DEPENDS = "apr expat gdbm"
BBCLASSEXTEND = "native nativesdk"
LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \
+LIC_FILES_CHKSUM = "file://LICENSE;md5=158aa0b1efe0c12f23d4b007ddb9a5db \
file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42"
SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \
file://configfix.patch \
file://configure_fixes.patch \
file://run-ptest \
- file://openssl-1.1.patch \
"
-SRC_URI[md5sum] = "866825c04da827c6e5f53daff5569f42"
-SRC_URI[sha256sum] = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19"
+SRC_URI[md5sum] = "3b03dbff60728a4f4c33f5d929e8b35a"
+SRC_URI[sha256sum] = "483ef4d59e6ac9a36c7d3fd87ad7b9db7ad8ae29c06b9dd8ff22dda1cc416389"
EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
--without-odbc \
--
2.8.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/8] bash: 4.3.30 -> 4.4
2017-08-16 8:31 [PATCH 0/8] upgrade 8 recipes Hongxu Jia
2017-08-16 8:31 ` [PATCH 1/8] apr-util: 1.5.4 -> 1.6.0 Hongxu Jia
@ 2017-08-16 8:31 ` Hongxu Jia
2017-08-17 12:54 ` Richard Purdie
2017-08-16 8:31 ` [PATCH 3/8] dhcp: 4.3.5 -> 4.3.6 Hongxu Jia
` (5 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Hongxu Jia @ 2017-08-16 8:31 UTC (permalink / raw)
To: openembedded-core, ross.burton
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="UTF-8", Size: 25151 bytes --]
Rebase patches:
- fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
- test-output.patch
Drop backported patches:
- CVE-2016-9401.patch
- fix-run-intl.patch
Add ${PN}-loadable for loadable builtins which is new features in Bash 4.4
The 4.4 fixed CVE-2017-5932 and CVE-2016-0634
- https://security-tracker.debian.org/tracker/CVE-2017-5932
- https://security-tracker.debian.org/tracker/CVE-2016-0634
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
meta/recipes-extended/bash/bash.inc | 4 +
.../recipes-extended/bash/bash/CVE-2016-9401.patch | 50 -------
...roc-run-heredoc-run-execscript-run-test-f.patch | 158 +++------------------
meta/recipes-extended/bash/bash/fix-run-intl.patch | 110 --------------
meta/recipes-extended/bash/bash/test-output.patch | 47 ++++--
meta/recipes-extended/bash/bash_4.3.30.bb | 75 ----------
meta/recipes-extended/bash/bash_4.4.bb | 58 ++++++++
7 files changed, 111 insertions(+), 391 deletions(-)
delete mode 100644 meta/recipes-extended/bash/bash/CVE-2016-9401.patch
delete mode 100644 meta/recipes-extended/bash/bash/fix-run-intl.patch
delete mode 100644 meta/recipes-extended/bash/bash_4.3.30.bb
create mode 100644 meta/recipes-extended/bash/bash_4.4.bb
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 6c94a24..ae51aa9 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -70,4 +70,8 @@ PACKAGES += "${PN}-bashbug"
FILES_${PN} = "${bindir}/bash ${base_bindir}/bash.bash"
FILES_${PN}-bashbug = "${bindir}/bashbug"
+PACKAGE_BEFORE_PN += "${PN}-loadable"
+RDEPENDS_${PN}-loadable += "${PN}"
+FILES_${PN}-loadable += "${libdir}/bash/*"
+
RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/bash', '', d)}"
diff --git a/meta/recipes-extended/bash/bash/CVE-2016-9401.patch b/meta/recipes-extended/bash/bash/CVE-2016-9401.patch
deleted file mode 100644
index 28c9277..0000000
--- a/meta/recipes-extended/bash/bash/CVE-2016-9401.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From fa741771ed47b30547be63b5b5dbfb51977aca12 Mon Sep 17 00:00:00 2001
-From: Chet Ramey <chet.ramey@case.edu>
-Date: Fri, 20 Jan 2017 11:47:31 -0500
-Subject: [PATCH] Bash-4.4 patch 6
-
-Bug-Reference-URL:
-https://lists.gnu.org/archive/html/bug-bash/2016-11/msg00116.html
-
-Reference to upstream patch:
-https://ftp.gnu.org/pub/gnu/bash/bash-4.4-patches/bash44-006
-
-Bug-Description:
-Out-of-range negative offsets to popd can cause the shell to crash attempting
-to free an invalid memory block.
-
-Upstream-Status: Backport
-CVE: CVE-2016-9401
-Signed-off-by: Li Zhou <li.zhou@windriver.com>
----
- builtins/pushd.def | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/builtins/pushd.def b/builtins/pushd.def
-index 9c6548f..8a13bae 100644
---- a/builtins/pushd.def
-+++ b/builtins/pushd.def
-@@ -359,7 +359,7 @@ popd_builtin (list)
- break;
- }
-
-- if (which > directory_list_offset || (directory_list_offset == 0 && which == 0))
-+ if (which > directory_list_offset || (which < -directory_list_offset) || (directory_list_offset == 0 && which == 0))
- {
- pushd_error (directory_list_offset, which_word ? which_word : "");
- return (EXECUTION_FAILURE);
-@@ -381,6 +381,11 @@ popd_builtin (list)
- remove that directory from the list and shift the remainder
- of the list into place. */
- i = (direction == '+') ? directory_list_offset - which : which;
-+ if (i < 0 || i > directory_list_offset)
-+ {
-+ pushd_error (directory_list_offset, which_word ? which_word : "");
-+ return (EXECUTION_FAILURE);
-+ }
- free (pushd_directory_list[i]);
- directory_list_offset--;
-
---
-1.9.1
-
diff --git a/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch b/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
index 7f099ae..9ac2461 100644
--- a/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
+++ b/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
@@ -1,15 +1,7 @@
-From 2c30dff8ea8b17ad5ba9881e35ad1eba9c515f13 Mon Sep 17 00:00:00 2001
+From d1cd4c31ea0ed7406a3ad4bdaa211f581063f655 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Thu, 26 Nov 2015 22:09:07 -0500
-Subject: [PATCH] fix run-coproc/run-heredoc/run-execscript/run-test/ failed
-
-FAIL: run-coproc
-update test case:tests/coproc.right, tests/coproc.tests
-git://git.sv.gnu.org/bash.git bash-4.4-testing
-
-FAIL: run-heredoc
-update test case: tests/heredoc.right tests/heredoc3.sub
-git://git.sv.gnu.org/bash.git bash-4.4-testing
+Date: Tue, 15 Aug 2017 10:21:21 +0800
+Subject: [PATCH 2/2] fix run-execscript/run-test/ failed
FAIL: run-execscript:
the test suite should not be run as root
@@ -21,149 +13,33 @@ Upstream-Status: Pending
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- tests/coproc.right | 5 +----
- tests/coproc.tests | 30 +++++++++++++++++++++++++-----
- tests/heredoc.right | 5 ++---
- tests/heredoc3.sub | 3 ++-
- tests/run-execscript | 3 ++-
- tests/run-test | 3 ++-
- 6 files changed, 34 insertions(+), 15 deletions(-)
+ tests/run-execscript | 3 ++-
+ tests/run-test | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
-diff --git a/tests/coproc.right b/tests/coproc.right
-index 6d9deaa..94b001c 100644
---- a/tests/coproc.right
-+++ b/tests/coproc.right
-@@ -1,11 +1,8 @@
--84575
- 63 60
- a b c
--84577
- 63 60
- flop
--./coproc.tests: line 22: 84577 Terminated coproc REFLECT { cat -; }
--84579
-+coproc.tests: REFLECT: status 143
- 63 60
- FOO
- 63 60
-diff --git a/tests/coproc.tests b/tests/coproc.tests
-index 8be3563..d347eb7 100644
---- a/tests/coproc.tests
-+++ b/tests/coproc.tests
-@@ -1,6 +1,13 @@
-+: ${TMPDIR:=/tmp}
-+TMPOUT=${TMPDIR}/coproc-wait-$BASHPID
-+
- coproc { echo a b c; sleep 2; }
-
--echo $COPROC_PID
-+case $COPROC_PID in
-+[0-9]*) ;;
-+*) echo COPROC_PID not integer ;;
-+esac
-+
- echo ${COPROC[@]}
-
- read LINE <&${COPROC[0]}
-@@ -10,7 +17,11 @@ wait $COPROC_PID
-
- coproc REFLECT { cat - ; }
-
--echo $REFLECT_PID
-+case $REFLECT_PID in
-+[0-9]*) ;;
-+*) echo REFLECT_PID not integer ;;
-+esac
-+
- echo ${REFLECT[@]}
-
- echo flop >&${REFLECT[1]}
-@@ -18,12 +29,21 @@ read LINE <&${REFLECT[0]}
-
- echo $LINE
-
--kill $REFLECT_PID
--wait $REFLECT_PID
-+{ sleep 1; kill $REFLECT_PID; } &
-+wait $REFLECT_PID >$TMPOUT 2>&1 || echo "coproc.tests: REFLECT: status $?"
-+grep 'Terminated.*coproc.*REFLECT' < $TMPOUT >/dev/null 2>&1 || {
-+ echo "coproc.tests: wait for REFLECT failed" >&2
-+}
-+rm -f $TMPOUT
-+exec 2>&1
-
- coproc xcase -n -u
-
--echo $COPROC_PID
-+case $COPROC_PID in
-+[0-9]*) ;;
-+*) echo COPROC_PID not integer ;;
-+esac
-+
- echo ${COPROC[@]}
-
- echo foo >&${COPROC[1]}
-diff --git a/tests/heredoc.right b/tests/heredoc.right
-index 6abaa1f..8df91c5 100644
---- a/tests/heredoc.right
-+++ b/tests/heredoc.right
-@@ -76,15 +76,14 @@ ENDEND
- end ENDEND
- hello
- end hello
--x star x
- end x*x
- helloEND
- end helloEND
- hello
- \END
- end hello<NL>\END
--./heredoc3.sub: line 74: warning: here-document at line 72 delimited by end-of-file (wanted `EOF')
--./heredoc3.sub: line 75: syntax error: unexpected end of file
-+./heredoc3.sub: line 75: warning: here-document at line 73 delimited by end-of-file (wanted `EOF')
-+./heredoc3.sub: line 76: syntax error: unexpected end of file
- comsub here-string
- ./heredoc.tests: line 105: warning: here-document at line 103 delimited by end-of-file (wanted `EOF')
- hi
-diff --git a/tests/heredoc3.sub b/tests/heredoc3.sub
-index 73a111e..9d3d846 100644
---- a/tests/heredoc3.sub
-+++ b/tests/heredoc3.sub
-@@ -49,9 +49,10 @@ hello
- END
- echo end hello
-
--cat <<x*x & touch 'x*x'
-+cat <<x*x >/dev/null & touch 'x*x'
- x star x
- x*x
-+wait $!
- echo end 'x*x'
- rm 'x*x'
-
diff --git a/tests/run-execscript b/tests/run-execscript
-index f97ab21..0d00a1b 100644
+index de78644..38397c1 100644
--- a/tests/run-execscript
+++ b/tests/run-execscript
@@ -5,5 +5,6 @@ echo "warning: \`/tmp/bash-notthere' not being found or \`/' being a directory"
echo "warning: produce diff output, please do not consider this a test failure" >&2
echo "warning: if diff output differing only in the location of the bash" >&2
echo "warning: binary appears, please do not consider this a test failure" >&2
--${THIS_SH} ./execscript > /tmp/xx 2>&1
-+rm -f /tmp/xx
-+su -c "${THIS_SH} ./execscript > /tmp/xx 2>&1" test
- diff /tmp/xx exec.right && rm -f /tmp/xx
+-${THIS_SH} ./execscript > ${BASH_TSTOUT} 2>&1
++rm -f ${BASH_TSTOUT}
++su -c "${THIS_SH} ./execscript > ${BASH_TSTOUT} 2>&1" test
+ diff ${BASH_TSTOUT} exec.right && rm -f ${BASH_TSTOUT}
diff --git a/tests/run-test b/tests/run-test
-index b2482c3..2e8f049 100644
+index d68791c..d6317d2 100644
--- a/tests/run-test
+++ b/tests/run-test
@@ -1,4 +1,5 @@
unset GROUPS UID 2>/dev/null
--${THIS_SH} ./test.tests >/tmp/xx 2>&1
-+rm -f /tmp/xx
-+su -c "${THIS_SH} ./test.tests >/tmp/xx 2>&1" test
- diff /tmp/xx test.right && rm -f /tmp/xx
+-${THIS_SH} ./test.tests >${BASH_TSTOUT} 2>&1
++rm -f ${BASH_TSTOUT}
++su -c "${THIS_SH} ./test.tests > ${BASH_TSTOUT} 2>&1" test
+ diff ${BASH_TSTOUT} test.right && rm -f ${BASH_TSTOUT}
--
-1.9.1
+1.8.3.1
diff --git a/meta/recipes-extended/bash/bash/fix-run-intl.patch b/meta/recipes-extended/bash/bash/fix-run-intl.patch
deleted file mode 100644
index d4a3409..0000000
--- a/meta/recipes-extended/bash/bash/fix-run-intl.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From a00d3161fd7b6a698bdd2ed5f0ac5faac580ee2a Mon Sep 17 00:00:00 2001
-From: Dengke Du <dengke.du@windriver.com>
-Date: Wed, 3 Aug 2016 23:13:00 -0400
-Subject: [PATCH] fix run-intl failed
-
-1. Filter extra white space of intl.right
-
- Due to the extra white space of intl.right, when the result of
- sub-test unicode2.sub of intl.tests compared to it, the test
- failed.
-
- So we need to filter the extra white space of intl.right.
-
- Import this patch for intl.right from bash devel branch:
-
- http://git.savannah.gnu.org/cgit/bash.git/log/?h=devel
-
- commit is:
-
- 85ec0778f9d778e1820fb8c0e3e996f2d1103b45
-
-2. Change intl.right correspond to the unicode3.sub's output
-
- In sub-test unicode3.sub of intl.tests, the payload value is:
-
- payload=$'\065\247\100\063\231\053\306\123\070\237\242\352\263'
-
- It used quoted string expansion(escaped octal) to assign ASCII
- characters to variables. So when the test run the following:
-
- printf %q "$payload"
-
- It produced:
-
- $'5\247@3\231+\306S8\237\242\352\263'
-
- When compared to the intl.right(contain the converted character), it failed.
-
- Import parts of patch for intl.right from bash devel branch:
-
- http://git.savannah.gnu.org/cgit/bash.git/log/?h=devel
-
- commit is:
-
- 74b8cbb41398b4453d8ba04d0cdd1b25f9dcb9e3
-
-Upstream-Status: Backport
-
-Signed-off-by: Dengke Du <dengke.du@windriver.com>
----
- tests/intl.right | 30 +++++++++++++++---------------
- 1 file changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/tests/intl.right b/tests/intl.right
-index acf108a..1efdfbe 100644
---- a/tests/intl.right
-+++ b/tests/intl.right
-@@ -18,34 +18,34 @@ aéb
- 1.0000
- 1,0000
- Passed all 1378 Unicode tests
--0000000 303 277 012
-+0000000 303 277 012
- 0000003
--0000000 303 277 012
-+0000000 303 277 012
- 0000003
--0000000 303 277 012
-+0000000 303 277 012
- 0000003
--0000000 303 277 012
-+0000000 303 277 012
- 0000003
--0000000 357 277 277 012
-+0000000 357 277 277 012
- 0000004
--0000000 357 277 277 012
-+0000000 357 277 277 012
- 0000004
--0000000 012
-+0000000 012
- 0000001
--0000000 012
-+0000000 012
- 0000001
--0000000 012
-+0000000 012
- 0000001
--0000000 012
-+0000000 012
- 0000001
--0000000 303 277 012
-+0000000 303 277 012
- 0000003
--0000000 303 277 012
-+0000000 303 277 012
- 0000003
--0000000 303 277 012
-+0000000 303 277 012
- 0000003
--0000000 101 040 302 243 040 305 222 012
-+0000000 101 040 302 243 040 305 222 012
- 0000010
- ./unicode3.sub: line 2: 5§@3™+ÆS8Ÿ¢ê³: command not found
--5§@3™+ÆS8Ÿ¢ê³
-+$'5\247@3\231+\306S8\237\242\352\263'
- + : $'5\247@3\231+\306S8\237\242\352\263'
---
-2.8.1
-
diff --git a/meta/recipes-extended/bash/bash/test-output.patch b/meta/recipes-extended/bash/bash/test-output.patch
index 2b09b7d..0ffcc24 100644
--- a/meta/recipes-extended/bash/bash/test-output.patch
+++ b/meta/recipes-extended/bash/bash/test-output.patch
@@ -1,25 +1,42 @@
-Add FAIL/PASS output to test output.
+From 28eb06047ebd2deaa8c7cd2bf6655ef6a469dc14 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 15 Aug 2017 10:01:56 +0800
+Subject: [PATCH 1/2] Add FAIL/PASS output to test output.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
Signed-off-by: Björn Stenberg <bjst@enea.com>
Upstream-Status: Pending
+
+Rebase to 4.4
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
-diff -uNr a/tests/run-all b/tests/run-all
---- a/tests/run-all 1999-10-08 17:07:46.000000000 +0200
-+++ b/tests/run-all 2012-10-27 21:04:18.663331887 +0200
-@@ -22,7 +22,15 @@
+ tests/run-all | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/tests/run-all b/tests/run-all
+index 2882fe0..e21d026 100644
+--- a/tests/run-all
++++ b/tests/run-all
+@@ -33,7 +33,16 @@ do
case $x in
$0|run-minimal|run-gprof) ;;
*.orig|*~) ;;
-- *) echo $x ; sh $x ;;
-+ *) echo $x
-+ output=`sh $x`
-+ if [ -n "$output" ]; then
-+ echo "$output"
-+ echo "FAIL: $x"
-+ else
-+ echo "PASS: $x"
-+ fi
-+ ;;
+- *) echo $x ; sh $x ; rm -f ${BASH_TSTOUT} ;;
++ *) echo $x
++ output=`sh $x`
++ if [ -n "$output" ]; then
++ echo "$output"
++ echo "FAIL: $x"
++ else
++ echo "PASS: $x"
++ fi
++ rm -f ${BASH_TSTOUT}
++ ;;
esac
done
+--
+1.8.3.1
+
diff --git a/meta/recipes-extended/bash/bash_4.3.30.bb b/meta/recipes-extended/bash/bash_4.3.30.bb
deleted file mode 100644
index b40059f..0000000
--- a/meta/recipes-extended/bash/bash_4.3.30.bb
+++ /dev/null
@@ -1,75 +0,0 @@
-require bash.inc
-
-# GPLv2+ (< 4.0), GPLv3+ (>= 4.0)
-LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-031;apply=yes;striplevel=0;name=patch031 \
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-032;apply=yes;striplevel=0;name=patch032 \
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-033;apply=yes;striplevel=0;name=patch033 \
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-034;apply=yes;striplevel=0;name=patch034 \
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-035;apply=yes;striplevel=0;name=patch035 \
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-036;apply=yes;striplevel=0;name=patch036 \
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-037;apply=yes;striplevel=0;name=patch037 \
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-038;apply=yes;striplevel=0;name=patch038 \
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-039;apply=yes;striplevel=0;name=patch039 \
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-040;apply=yes;striplevel=0;name=patch040 \
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-041;apply=yes;striplevel=0;name=patch041 \
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-042;apply=yes;striplevel=0;name=patch042 \
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-043;apply=yes;striplevel=0;name=patch043 \
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-044;apply=yes;striplevel=0;name=patch044 \
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-045;apply=yes;striplevel=0;name=patch045 \
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-046;apply=yes;striplevel=0;name=patch046 \
- ${GNU_MIRROR}/bash/bash-4.3-patches/bash43-047;apply=yes;striplevel=0;name=patch047 \
- file://execute_cmd.patch;striplevel=0 \
- file://mkbuiltins_have_stringize.patch \
- file://build-tests.patch \
- file://test-output.patch \
- file://fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch \
- file://run-ptest \
- file://fix-run-builtins.patch \
- file://0001-help-fix-printf-format-security-warning.patch \
- file://fix-run-intl.patch \
- file://CVE-2016-9401.patch \
- "
-
-SRC_URI[tarball.md5sum] = "a27b3ee9be83bd3ba448c0ff52b28447"
-SRC_URI[tarball.sha256sum] = "317881019bbf2262fb814b7dd8e40632d13c3608d2f237800a8828fbb8a640dd"
-
-SRC_URI[patch031.md5sum] = "236df1ac1130a033ed0dbe2d2115f28f"
-SRC_URI[patch031.sha256sum] = "cd529f59dd0f2fdd49d619fe34691da6f0affedf87cc37cd460a9f3fe812a61d"
-SRC_URI[patch032.md5sum] = "2360f7e79cfb28526f80021025ea5909"
-SRC_URI[patch032.sha256sum] = "889357d29a6005b2c3308ca5b6286cb223b5e9c083219e5db3156282dd554f4a"
-SRC_URI[patch033.md5sum] = "b551c4ee7b8713759e4143499d0bbd48"
-SRC_URI[patch033.sha256sum] = "fb2a7787a13fbe027a7335aca6eb3c21cdbd813e9edc221274b6a9d8692eaa16"
-SRC_URI[patch034.md5sum] = "c9a56fbe0348e05a886dff97f2872b74"
-SRC_URI[patch034.sha256sum] = "f1694f04f110defe1330a851cc2768e7e57ddd2dfdb0e3e350ca0e3c214ff889"
-SRC_URI[patch035.md5sum] = "e564e8ab44ed1ca3a4e315a9f6cabdc9"
-SRC_URI[patch035.sha256sum] = "370d85e51780036f2386dc18c5efe996eba8e652fc1973f0f4f2ab55a993c1e3"
-SRC_URI[patch036.md5sum] = "b00ff66c41a7c0f06e191200981980b0"
-SRC_URI[patch036.sha256sum] = "ac5f82445b36efdb543dbfae64afed63f586d7574b833e9aa9cd5170bc5fd27c"
-SRC_URI[patch037.md5sum] = "be2a7b05f6ae560313f3c9d5f7127bda"
-SRC_URI[patch037.sha256sum] = "33f170dd7400ab3418d749c55c6391b1d161ef2de7aced1873451b3a3fca5813"
-SRC_URI[patch038.md5sum] = "61e0522830b24fbe8c0d1b010f132470"
-SRC_URI[patch038.sha256sum] = "adbeaa500ca7a82535f0e88d673661963f8a5fcdc7ad63445e68bf5b49786367"
-SRC_URI[patch039.md5sum] = "a4775487abe958536751c8ce53cdf6f9"
-SRC_URI[patch039.sha256sum] = "ab94dced2215541097691f60c3eb323cc28ef2549463e6a5334bbcc1e61e74ec"
-SRC_URI[patch040.md5sum] = "80d3587c58854e226055ef099ffeb535"
-SRC_URI[patch040.sha256sum] = "84bb396b9262992ca5424feab6ed3ec39f193ef5c76dfe4a62b551bd8dd9d76b"
-SRC_URI[patch041.md5sum] = "20bf63eef7cb441c0b1cc49ef3191d03"
-SRC_URI[patch041.sha256sum] = "4ec432966e4198524a7e0cd685fe222e96043769c9613e66742ac475db132c1a"
-SRC_URI[patch042.md5sum] = "70790646ae61e207c995e44931390e50"
-SRC_URI[patch042.sha256sum] = "ac219322db2791da87a496ee6e8e5544846494bdaaea2626270c2f73c1044919"
-SRC_URI[patch043.md5sum] = "855a46955cb251534e80b4732b748e37"
-SRC_URI[patch043.sha256sum] = "47a8a3c005b46e25821f4d8f5ccb04c1d653b1c829cb40568d553dc44f7a6180"
-SRC_URI[patch044.md5sum] = "29623d3282fcbb37e1158136509b5bb8"
-SRC_URI[patch044.sha256sum] = "9338820630bf67373b44d8ea68409f65162ea7a47b9b29ace06a0aed12567f99"
-SRC_URI[patch045.md5sum] = "4473244ca5abfd4b018ea26dc73e7412"
-SRC_URI[patch045.sha256sum] = "ba6ec3978e9eaa1eb3fabdaf3cc6fdf8c4606ac1c599faaeb4e2d69864150023"
-SRC_URI[patch046.md5sum] = "7e5fb09991c077076b86e0e057798913"
-SRC_URI[patch046.sha256sum] = "b3b456a6b690cd293353f17e22d92a202b3c8bce587ae5f2667c20c9ab6f688f"
-SRC_URI[patch047.md5sum] = "8483153bad1a6f52cadc3bd9a8df7835"
-SRC_URI[patch047.sha256sum] = "c69248de7e78ba6b92f118fe1ef47bc86479d5040fe0b1f908ace1c9e3c67c4a"
-
-BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-extended/bash/bash_4.4.bb b/meta/recipes-extended/bash/bash_4.4.bb
new file mode 100644
index 0000000..b602afe
--- /dev/null
+++ b/meta/recipes-extended/bash/bash_4.4.bb
@@ -0,0 +1,58 @@
+require bash.inc
+
+# GPLv2+ (< 4.0), GPLv3+ (>= 4.0)
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
+ ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-001;apply=yes;striplevel=0;name=patch001 \
+ ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-002;apply=yes;striplevel=0;name=patch002 \
+ ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-003;apply=yes;striplevel=0;name=patch003 \
+ ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-004;apply=yes;striplevel=0;name=patch004 \
+ ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-005;apply=yes;striplevel=0;name=patch005 \
+ ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-006;apply=yes;striplevel=0;name=patch006 \
+ ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-007;apply=yes;striplevel=0;name=patch007 \
+ ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-008;apply=yes;striplevel=0;name=patch008 \
+ ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-009;apply=yes;striplevel=0;name=patch009 \
+ ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-010;apply=yes;striplevel=0;name=patch010 \
+ ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-011;apply=yes;striplevel=0;name=patch011 \
+ ${GNU_MIRROR}/bash/bash-4.4-patches/bash44-012;apply=yes;striplevel=0;name=patch012 \
+ file://execute_cmd.patch;striplevel=0 \
+ file://mkbuiltins_have_stringize.patch \
+ file://build-tests.patch \
+ file://test-output.patch \
+ file://fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch \
+ file://run-ptest \
+ file://fix-run-builtins.patch \
+ file://0001-help-fix-printf-format-security-warning.patch \
+ "
+
+SRC_URI[tarball.md5sum] = "148888a7c95ac23705559b6f477dfe25"
+SRC_URI[tarball.sha256sum] = "d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb"
+
+SRC_URI[patch001.md5sum] = "817d01a6c0af6f79308a8b7b649e53d8"
+SRC_URI[patch001.sha256sum] = "3e28d91531752df9a8cb167ad07cc542abaf944de9353fe8c6a535c9f1f17f0f"
+SRC_URI[patch002.md5sum] = "765e14cff12c7284009772e8e24f2fe0"
+SRC_URI[patch002.sha256sum] = "7020a0183e17a7233e665b979c78c184ea369cfaf3e8b4b11f5547ecb7c13c53"
+SRC_URI[patch003.md5sum] = "49e7da93bf07f510a2eb6bb43ac3e5a2"
+SRC_URI[patch003.sha256sum] = "51df5a9192fdefe0ddca4bdf290932f74be03ffd0503a3d112e4199905e718b2"
+SRC_URI[patch004.md5sum] = "4557d674ab5831a5fa98052ab19edaf4"
+SRC_URI[patch004.sha256sum] = "ad080a30a4ac6c1273373617f29628cc320a35c8cd06913894794293dc52c8b3"
+SRC_URI[patch005.md5sum] = "cce96dd77cdd1d293beec10848f6cbb5"
+SRC_URI[patch005.sha256sum] = "221e4b725b770ad0bb6924df3f8d04f89eeca4558f6e4c777dfa93e967090529"
+SRC_URI[patch006.md5sum] = "d3379f8d8abce5c6ee338f931ad008d5"
+SRC_URI[patch006.sha256sum] = "6a8e2e2a6180d0f1ce39dcd651622fb6d2fd05db7c459f64ae42d667f1e344b8"
+SRC_URI[patch007.md5sum] = "ec38c76ca439ca7f9c178e9baede84fc"
+SRC_URI[patch007.sha256sum] = "de1ccc07b7bfc9e25243ad854f3bbb5d3ebf9155b0477df16aaf00a7b0d5edaf"
+SRC_URI[patch008.md5sum] = "e0ba18c1e3b94f905da9b5bf9d38b58b"
+SRC_URI[patch008.sha256sum] = "86144700465933636d7b945e89b77df95d3620034725be161ca0ca5a42e239ba"
+SRC_URI[patch009.md5sum] = "e952d4f44e612048930c559d90eb99bb"
+SRC_URI[patch009.sha256sum] = "0b6bdd1a18a0d20e330cc3bc71e048864e4a13652e29dc0ebf3918bea729343c"
+SRC_URI[patch010.md5sum] = "57b5b35955d68f9a09dbef6b86d2c782"
+SRC_URI[patch010.sha256sum] = "8465c6f2c56afe559402265b39d9e94368954930f9aa7f3dfa6d36dd66868e06"
+SRC_URI[patch011.md5sum] = "cc896e1fa696b93ded568e557e2392d5"
+SRC_URI[patch011.sha256sum] = "dd56426ef7d7295e1107c0b3d06c192eb9298f4023c202ca2ba6266c613d170d"
+SRC_URI[patch012.md5sum] = "fa47fbfa56fb7e9e5367f19a9df5fc9e"
+SRC_URI[patch012.sha256sum] = "fac271d2bf6372c9903e3b353cb9eda044d7fe36b5aab52f21f3f21cd6a2063e"
+
+BBCLASSEXTEND = "nativesdk"
--
2.8.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 3/8] dhcp: 4.3.5 -> 4.3.6
2017-08-16 8:31 [PATCH 0/8] upgrade 8 recipes Hongxu Jia
2017-08-16 8:31 ` [PATCH 1/8] apr-util: 1.5.4 -> 1.6.0 Hongxu Jia
2017-08-16 8:31 ` [PATCH 2/8] bash: 4.3.30 -> 4.4 Hongxu Jia
@ 2017-08-16 8:31 ` Hongxu Jia
2017-08-16 8:31 ` [PATCH 4/8] elfutils: 0.168 -> 0.170 Hongxu Jia
` (4 subsequent siblings)
7 siblings, 0 replies; 16+ messages in thread
From: Hongxu Jia @ 2017-08-16 8:31 UTC (permalink / raw)
To: openembedded-core, ross.burton
1. Rebase patches to 4.3.6
- define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch -> 0001
- dhcp-3.0.3-dhclient-dbus.patch -> 0002
- link-with-lcrypto.patch -> 0003
- fixsepbuild.patch -> 0004
- dhclient-script-drop-resolv.conf.dhclient.patch -> 0005
- 0001-site.h-enable-gentle-shutdown.patch -> 0006
- libxml2-configure-argument.patch -> 0007
- tweak-to-support-external-bind.patch -> 0008
- remove-dhclient-script-bash-dependency.patch -> 0009
- build-shared-libs.patch -> 0010
- Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch -> 0011
2. Drop search-for-libxml2.patch
It is overrided by libxml2-configure-argument.patch
3. Rework dhclient-script-drop-resolv.conf.dhclient.patch and
Drop replace-ifconfig-route.patch.
vim client/scripts/linux
...
Script refresh in 2017. The aliasing code was too convoluted and needs
to go away. Migrated DHCPv4 script to ip command from iproute2 suite.
This is based on Debian script with some tweaks. ifconfig is no longer
used. Everything is done using ip tool from ip-route2.
...
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
meta/recipes-connectivity/dhcp/dhcp.inc | 4 +-
...-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch} | 12 +-
...hclient-dbus.patch => 0002-dhclient-dbus.patch} | 97 +++++++----
...-lcrypto.patch => 0003-link-with-lcrypto.patch} | 20 ++-
...ild.patch => 0004-Fix-out-of-tree-builds.patch} | 9 +-
...-fix-invoke-dhclient-script-failed-on-Rea.patch | 36 ++++
...ch => 0006-site.h-enable-gentle-shutdown.patch} | 17 +-
...re-argument-to-make-the-libxml2-dependenc.patch | 42 +++++
...h => 0008-tweak-to-support-external-bind.patch} | 12 +-
...09-remove-dhclient-script-bash-dependency.patch | 28 +++
...red-libs.patch => 0010-build-shared-libs.patch} | 30 +++-
...ll-to-isc_app_ctxstart-to-not-get-signal.patch} | 10 +-
...dhclient-script-drop-resolv.conf.dhclient.patch | 70 --------
.../dhcp/dhcp/libxml2-configure-argument.patch | 38 -----
.../remove-dhclient-script-bash-dependency.patch | 55 ------
.../dhcp/dhcp/replace-ifconfig-route.patch | 188 ---------------------
.../dhcp/dhcp/search-for-libxml2.patch | 23 ---
meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb | 20 ---
meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb | 20 +++
19 files changed, 265 insertions(+), 466 deletions(-)
rename meta/recipes-connectivity/dhcp/dhcp/{define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch => 0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch} (70%)
rename meta/recipes-connectivity/dhcp/dhcp/{dhcp-3.0.3-dhclient-dbus.patch => 0002-dhclient-dbus.patch} (45%)
rename meta/recipes-connectivity/dhcp/dhcp/{link-with-lcrypto.patch => 0003-link-with-lcrypto.patch} (68%)
rename meta/recipes-connectivity/dhcp/dhcp/{fixsepbuild.patch => 0004-Fix-out-of-tree-builds.patch} (92%)
create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch
rename meta/recipes-connectivity/dhcp/dhcp/{0001-site.h-enable-gentle-shutdown.patch => 0006-site.h-enable-gentle-shutdown.patch} (65%)
create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch
rename meta/recipes-connectivity/dhcp/dhcp/{tweak-to-support-external-bind.patch => 0008-tweak-to-support-external-bind.patch} (93%)
create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch
rename meta/recipes-connectivity/dhcp/dhcp/{build-shared-libs.patch => 0010-build-shared-libs.patch} (90%)
rename meta/recipes-connectivity/dhcp/dhcp/{Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch => 0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch} (92%)
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/remove-dhclient-script-bash-dependency.patch
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/search-for-libxml2.patch
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb
create mode 100644 meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index db4a963..58f4a6f 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -13,7 +13,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=c5c64d696107f84b56fe337d14da1
DEPENDS = "openssl bind"
SRC_URI = "http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
- file://define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch \
file://init-relay file://default-relay \
file://init-server file://default-server \
file://dhclient.conf file://dhcpd.conf \
@@ -21,8 +20,7 @@ SRC_URI = "http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
file://dhclient.service \
file://dhcpd.service file://dhcrelay.service \
file://dhcpd6.service \
- file://search-for-libxml2.patch "
-
+ "
UPSTREAM_CHECK_URI = "ftp://ftp.isc.org/isc/dhcp/"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/"
diff --git a/meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
similarity index 70%
rename from meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
rename to meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
index 32bdaf0..e5b3cf9 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
@@ -1,17 +1,21 @@
-define macro _PATH_DHCPD_CONF and _PATH_DHCLIENT_CONF
+From 7cc29144535a622fc671dc86eb1da65b0473a7c4 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 15 Aug 2017 16:14:22 +0800
+Subject: [PATCH 01/11] define macro _PATH_DHCPD_CONF and _PATH_DHCLIENT_CONF
Upstream-Status: Inappropriate [OE specific]
+Rebase to 4.3.6
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
includes/site.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/includes/site.h b/includes/site.h
-index d87b309..17bc40d 100644
+index b2f7fd7..280fbb9 100644
--- a/includes/site.h
+++ b/includes/site.h
-@@ -139,7 +139,8 @@
+@@ -149,7 +149,8 @@
/* Define this if you want the dhcpd.conf file to go somewhere other than
the default location. By default, it goes in /etc/dhcpd.conf. */
@@ -22,5 +26,5 @@ index d87b309..17bc40d 100644
/* Network API definitions. You do not need to choose one of these - if
you don't choose, one will be chosen for you in your system's config
--
-1.9.1
+1.8.3.1
diff --git a/meta/recipes-connectivity/dhcp/dhcp/dhcp-3.0.3-dhclient-dbus.patch b/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
similarity index 45%
rename from meta/recipes-connectivity/dhcp/dhcp/dhcp-3.0.3-dhclient-dbus.patch
rename to meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
index b4a666d..6459dc0 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/dhcp-3.0.3-dhclient-dbus.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
@@ -1,9 +1,27 @@
-Upstream-Status: Inappropriate [distribution]
+From be7540d31c356e80ee02e90e8bf162b7ac6e5ba5 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 15 Aug 2017 14:56:56 +0800
+Subject: [PATCH 02/11] dhclient dbus
---- client/scripts/bsdos
-+++ client/scripts/bsdos
-@@ -47,6 +47,11 @@
- . /etc/dhcp/dhclient-exit-hooks
+upstream-Status: Inappropriate [distribution]
+
+Rebase to 4.3.6
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ client/scripts/bsdos | 5 +++++
+ client/scripts/freebsd | 5 +++++
+ client/scripts/linux | 5 +++++
+ client/scripts/netbsd | 5 +++++
+ client/scripts/openbsd | 5 +++++
+ client/scripts/solaris | 5 +++++
+ 6 files changed, 30 insertions(+)
+
+diff --git a/client/scripts/bsdos b/client/scripts/bsdos
+index d69d0d8..095b143 100755
+--- a/client/scripts/bsdos
++++ b/client/scripts/bsdos
+@@ -45,6 +45,11 @@ exit_with_hooks() {
+ . /etc/dhclient-exit-hooks
fi
# probably should do something with exit status of the local script
+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
@@ -14,10 +32,12 @@ Upstream-Status: Inappropriate [distribution]
exit $exit_status
}
---- client/scripts/freebsd
-+++ client/scripts/freebsd
-@@ -57,6 +57,11 @@
- . /etc/dhcp/dhclient-exit-hooks
+diff --git a/client/scripts/freebsd b/client/scripts/freebsd
+index 8f3e2a2..ad7fb44 100755
+--- a/client/scripts/freebsd
++++ b/client/scripts/freebsd
+@@ -89,6 +89,11 @@ exit_with_hooks() {
+ . /etc/dhclient-exit-hooks
fi
# probably should do something with exit status of the local script
+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
@@ -28,24 +48,28 @@ Upstream-Status: Inappropriate [distribution]
exit $exit_status
}
---- client/scripts/linux
-+++ client/scripts/linux
-@@ -69,6 +69,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
+diff --git a/client/scripts/linux b/client/scripts/linux
+index 5fb1612..3d447b6 100755
+--- a/client/scripts/linux
++++ b/client/scripts/linux
+@@ -174,6 +174,11 @@ exit_with_hooks() {
+ exit_status=$?
+ fi
+
++ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++ dbus-send --system --dest=com.redhat.dhcp \
++ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++ fi
+ exit $exit_status
}
---- client/scripts/netbsd
-+++ client/scripts/netbsd
-@@ -47,6 +47,11 @@
- . /etc/dhcp/dhclient-exit-hooks
+diff --git a/client/scripts/netbsd b/client/scripts/netbsd
+index 07383b7..aaba8e8 100755
+--- a/client/scripts/netbsd
++++ b/client/scripts/netbsd
+@@ -45,6 +45,11 @@ exit_with_hooks() {
+ . /etc/dhclient-exit-hooks
fi
# probably should do something with exit status of the local script
+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
@@ -56,10 +80,12 @@ Upstream-Status: Inappropriate [distribution]
exit $exit_status
}
---- client/scripts/openbsd
-+++ client/scripts/openbsd
-@@ -47,6 +47,11 @@
- . /etc/dhcp/dhclient-exit-hooks
+diff --git a/client/scripts/openbsd b/client/scripts/openbsd
+index e7f4746..56b980c 100644
+--- a/client/scripts/openbsd
++++ b/client/scripts/openbsd
+@@ -45,6 +45,11 @@ exit_with_hooks() {
+ . /etc/dhclient-exit-hooks
fi
# probably should do something with exit status of the local script
+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
@@ -70,10 +96,12 @@ Upstream-Status: Inappropriate [distribution]
exit $exit_status
}
---- client/scripts/solaris
-+++ client/scripts/solaris
-@@ -47,6 +47,11 @@
- . /etc/dhcp/dhclient-exit-hooks
+diff --git a/client/scripts/solaris b/client/scripts/solaris
+index af553b9..4a2aa69 100755
+--- a/client/scripts/solaris
++++ b/client/scripts/solaris
+@@ -26,6 +26,11 @@ exit_with_hooks() {
+ . /etc/dhclient-exit-hooks
fi
# probably should do something with exit status of the local script
+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
@@ -84,3 +112,6 @@ Upstream-Status: Inappropriate [distribution]
exit $exit_status
}
+--
+1.8.3.1
+
diff --git a/meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch b/meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch
similarity index 68%
rename from meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch
rename to meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch
index 0d0e0dd..810c7b6 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch
@@ -1,24 +1,28 @@
-Author: Andrei Gherzan <andrei@gherzan.ro>
-Date: Thu Feb 2 23:59:11 2012 +0200
+From d80bd792323dbd56269309f85b4506eb6b1b60e9 Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@gherzan.ro>
+Date: Tue, 15 Aug 2017 15:05:47 +0800
+Subject: [PATCH 03/11] link with lcrypto
-From 4.2.0 final release, -lcrypto check was removed and we compile static libraries
-from bind that are linked to libcrypto. This is why i added a patch in order to add
+From 4.2.0 final release, -lcrypto check was removed and we compile
+static libraries
+from bind that are linked to libcrypto. This is why i added a patch in
+order to add
-lcrypto to LIBS.
Upstream-Status: Pending
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-Rebase to 4.3.4
+Rebase to 4.3.6
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
configure.ac | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 097b0c3..726c88e 100644
+index cdfa352..44fb57e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -584,6 +584,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void foo() __attribute__((noreturn));
+@@ -591,6 +591,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void foo() __attribute__((noreturn));
# Look for optional headers.
AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
@@ -30,5 +34,5 @@ index 097b0c3..726c88e 100644
AC_SEARCH_LIBS(socket, [socket])
AC_SEARCH_LIBS(inet_ntoa, [nsl])
--
-2.8.1
+1.8.3.1
diff --git a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
similarity index 92%
rename from meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
rename to meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
index 2f44147..7d1d867 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
@@ -1,10 +1,13 @@
-Fix out of tree builds
+From cccec0344d68dac4100b6f260ee24e7c2da9dfda Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 15 Aug 2017 15:08:22 +0800
+Subject: [PATCH 04/11] Fix out of tree builds
Upstream-Status: Pending
RP 2013/03/21
-Rebase to 4.3.4
+Rebase to 4.3.6
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
@@ -93,5 +96,5 @@ index 54feedf..3990b9c 100644
dist_sysconf_DATA = dhcpd.conf.example
sbin_PROGRAMS = dhcpd
--
-2.8.1
+1.8.3.1
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch b/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch
new file mode 100644
index 0000000..dd56381
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch
@@ -0,0 +1,36 @@
+From 2e8ff0e4f6d39e346ea86b8c514ab4ccc78fa359 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 15 Aug 2017 15:24:14 +0800
+Subject: [PATCH 05/11] dhcp-client: fix invoke dhclient-script failed on
+ Read-only file system
+
+In read-only file system, '/etc' is on the readonly partition,
+and '/etc/resolv.conf' is symlinked to a separate writable
+partition.
+
+In this situation, we create temp files 'resolv.conf.dhclient-new'
+in /tmp dir.
+
+Upstream-Status: Pending
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ client/scripts/linux | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/scripts/linux b/client/scripts/linux
+index 3d447b6..3122a75 100755
+--- a/client/scripts/linux
++++ b/client/scripts/linux
+@@ -40,7 +40,7 @@ make_resolv_conf() {
+ # DHCPv4
+ if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] ||
+ [ -n "$new_domain_name_servers" ]; then
+- new_resolv_conf=/etc/resolv.conf.dhclient-new
++ new_resolv_conf=/tmp/resolv.conf.dhclient-new
+ rm -f $new_resolv_conf
+
+ if [ -n "$new_domain_name" ]; then
+--
+1.8.3.1
+
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch b/meta/recipes-connectivity/dhcp/dhcp/0006-site.h-enable-gentle-shutdown.patch
similarity index 65%
rename from meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch
rename to meta/recipes-connectivity/dhcp/dhcp/0006-site.h-enable-gentle-shutdown.patch
index 47443a5..c62b283 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0006-site.h-enable-gentle-shutdown.patch
@@ -1,17 +1,22 @@
-Upstream-Status: Inappropriate [configuration]
-
-Subject: [PATCH] site.h: enable gentle shutdown
+From 01641d146e4e6bea954e4a4ee1f6230b822665b4 Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Tue, 15 Aug 2017 15:37:49 +0800
+Subject: [PATCH 06/11] site.h: enable gentle shutdown
+Upstream-Status: Inappropriate [configuration]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+
+Rebase to 4.3.6
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
includes/site.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/includes/site.h b/includes/site.h
-index 1dd1251..abb66e4 100644
+index 280fbb9..e6c2972 100644
--- a/includes/site.h
+++ b/includes/site.h
-@@ -289,7 +289,7 @@
+@@ -296,7 +296,7 @@
situations. We plan to revisit this feature and may
make non-backwards compatible changes including the
removal of this define. Use at your own risk. */
@@ -21,5 +26,5 @@ index 1dd1251..abb66e4 100644
/* Include old error codes. This is provided in case you
are building an external program similar to omshell for
--
-2.8.1
+1.8.3.1
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch b/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch
new file mode 100644
index 0000000..43c26ea
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch
@@ -0,0 +1,42 @@
+From 7107511fd209f08f9a96f8938041ae48f3295895 Mon Sep 17 00:00:00 2001
+From: Christopher Larson <chris_larson@mentor.com>
+Date: Tue, 15 Aug 2017 16:17:49 +0800
+Subject: [PATCH 07/11] Add configure argument to make the libxml2 dependency
+ explicit and determinisitic.
+
+Upstream-Status: Pending
+
+Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+
+Rebase to 4.3.6
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ configure.ac | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 44fb57e..8e9f509 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -611,6 +611,17 @@ AC_CHECK_FUNCS(strlcat)
+ # For HP/UX we need -lipv6 for if_nametoindex, perhaps others.
+ AC_SEARCH_LIBS(if_nametoindex, [ipv6])
+
++AC_ARG_WITH(libxml2,
++ AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]),
++ with_libxml2="$withval", with_libxml2="no")
++
++if test x$with_libxml2 != xno; then
++ AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],
++ [if test x$with_libxml2 != xauto; then
++ AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
++ fi])
++fi
++
+ # check for /dev/random (declares HAVE_DEV_RANDOM)
+ AC_MSG_CHECKING(for random device)
+ AC_ARG_WITH(randomdev,
+--
+1.8.3.1
+
diff --git a/meta/recipes-connectivity/dhcp/dhcp/tweak-to-support-external-bind.patch b/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch
similarity index 93%
rename from meta/recipes-connectivity/dhcp/dhcp/tweak-to-support-external-bind.patch
rename to meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch
index 03c6abb..006d18a 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/tweak-to-support-external-bind.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch
@@ -1,7 +1,7 @@
-From ad7bb401f47714fc30c408853b796ce0f1c7e65f Mon Sep 17 00:00:00 2001
+From 92875f5cc44914515e50c11c503a09cec90497b2 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Sat, 11 Jun 2016 22:51:44 -0400
-Subject: [PATCH] tweak to support external bind
+Subject: [PATCH 08/11] tweak to support external bind
Tweak the external bind to oe-core's sysroot rather than
external bind source build.
@@ -34,7 +34,7 @@ index 4730bb3..84d8131 100644
AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
-DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes
diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am
-index da69ea9..fe35e57 100644
+index 5031d0c..a8dfd26 100644
--- a/client/tests/Makefile.am
+++ b/client/tests/Makefile.am
@@ -1,6 +1,6 @@
@@ -46,7 +46,7 @@ index da69ea9..fe35e57 100644
AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
-index f8d6b0e..05cd9c1 100644
+index f6a43e4..2f98d22 100644
--- a/common/tests/Makefile.am
+++ b/common/tests/Makefile.am
@@ -1,6 +1,6 @@
@@ -101,7 +101,7 @@ index 3990b9c..b5d8c2d 100644
AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
-index 65a9f74..2892309 100644
+index a87c5e7..9821081 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -1,6 +1,6 @@
@@ -113,5 +113,5 @@ index 65a9f74..2892309 100644
AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
--
-2.8.1
+1.8.3.1
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch b/meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch
new file mode 100644
index 0000000..912b6d6
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch
@@ -0,0 +1,28 @@
+From f3f8b7726e50e24ef3edf5fa5a17e31d39118d7e Mon Sep 17 00:00:00 2001
+From: Andre McCurdy <armccurdy@gmail.com>
+Date: Tue, 15 Aug 2017 15:49:31 +0800
+Subject: [PATCH 09/11] remove dhclient-script bash dependency
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
+
+Rebase to 4.3.6
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ client/scripts/linux | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/scripts/linux b/client/scripts/linux
+index 3122a75..1712d7d 100755
+--- a/client/scripts/linux
++++ b/client/scripts/linux
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ # dhclient-script for Linux. Dan Halbert, March, 1997.
+ # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
+ # No guarantees about this. I'm a novice at the details of Linux
+--
+1.8.3.1
+
diff --git a/meta/recipes-connectivity/dhcp/dhcp/build-shared-libs.patch b/meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch
similarity index 90%
rename from meta/recipes-connectivity/dhcp/dhcp/build-shared-libs.patch
rename to meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch
index 0b3d6e4..f128731 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/build-shared-libs.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch
@@ -1,9 +1,28 @@
+From 76c370a929e5ab5dbc81c2fbcf4e50f4fbc08ce9 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Tue, 15 Aug 2017 15:53:37 +0800
+Subject: [PATCH 10/11] build shared libs
+
Upstream-Status: Pending
Port patches from Fedora to build shared libs rather than static libs.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+Rebase to 4.3.6
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
+ client/Makefile.am | 4 ++--
+ common/tests/Makefile.am | 13 +++++--------
+ configure.ac | 12 ++----------
+ dhcpctl/Makefile.am | 14 ++++++--------
+ omapip/Makefile.am | 7 +++----
+ relay/Makefile.am | 5 ++---
+ server/Makefile.am | 7 +++----
+ server/tests/Makefile.am | 7 +++----
+ 8 files changed, 26 insertions(+), 43 deletions(-)
+
diff --git a/client/Makefile.am b/client/Makefile.am
index 84d8131..e776bf0 100644
--- a/client/Makefile.am
@@ -19,7 +38,7 @@ index 84d8131..e776bf0 100644
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
EXTRA_DIST = $(man_MANS)
diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
-index 05cd9c1..ab7a5a3 100644
+index 2f98d22..8745e88 100644
--- a/common/tests/Makefile.am
+++ b/common/tests/Makefile.am
@@ -15,26 +15,23 @@ ATF_TESTS += alloc_unittest dns_unittest misc_unittest ns_name_unittest
@@ -53,9 +72,9 @@ index 05cd9c1..ab7a5a3 100644
+ -ldns -lisccfg -lisc
check: $(ATF_TESTS)
- -cp -n $(top_srcdir)/common/tests/Atffile Atffile
+ @if test $(top_srcdir) != ${top_builddir}; then \
diff --git a/configure.ac b/configure.ac
-index 1684df1..dadc3f1 100644
+index 8e9f509..bfe988a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,16 +47,8 @@ AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes")
@@ -167,7 +186,7 @@ index b5d8c2d..d7f876d 100644
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
EXTRA_DIST = $(man_MANS)
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
-index 2892309..056978b 100644
+index 9821081..de95872 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -19,10 +19,9 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c \
@@ -184,3 +203,6 @@ index 2892309..056978b 100644
ATF_TESTS =
if HAVE_ATF
+--
+1.8.3.1
+
diff --git a/meta/recipes-connectivity/dhcp/dhcp/Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch b/meta/recipes-connectivity/dhcp/dhcp/0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch
similarity index 92%
rename from meta/recipes-connectivity/dhcp/dhcp/Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch
rename to meta/recipes-connectivity/dhcp/dhcp/0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch
index 9b43f96..67bb463 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch
@@ -1,8 +1,8 @@
-From e8c30bac53f8baeb80f87b445f42259cc8984fb5 Mon Sep 17 00:00:00 2001
+From 37725f3e22edb50e0ca2d1fff971321a5a4d5112 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Wed, 12 Jul 2017 03:05:13 -0400
-Subject: [PATCH] Moved the call to isc_app_ctxstart() to not get signal block
- by all threads
+Subject: [PATCH 11/11] Moved the call to isc_app_ctxstart() to not get signal
+ block by all threads
Signed-off-by: Francis Dupont <fdupont@isc.org>
@@ -34,7 +34,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/omapip/isclib.c b/omapip/isclib.c
-index 13f0d3e..4af04b6 100644
+index ce86490..6a04345 100644
--- a/omapip/isclib.c
+++ b/omapip/isclib.c
@@ -185,16 +185,6 @@ dhcp_context_create(int flags,
@@ -77,5 +77,5 @@ index 13f0d3e..4af04b6 100644
#if defined (NSUPDATE)
--
-2.8.1
+1.8.3.1
diff --git a/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch b/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch
deleted file mode 100644
index 96095a5..0000000
--- a/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-dhcp-client: fix invoke dhclient-script failed on Read-only file system
-
-In read-only file system, '/etc' is on the readonly partition,
-and '/etc/resolv.conf' is symlinked to a separate writable
-partition.
-
-In this situation, we should use shell variable to instead of
-temp files '/etc/resolv.conf.dhclient' and '/etc/resolv.conf.dhclient6'.
-
-Upstream-Status: Pending
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- client/scripts/linux | 20 +++++++++-----------
- 1 file changed, 9 insertions(+), 11 deletions(-)
-
-diff --git a/client/scripts/linux b/client/scripts/linux
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -27,27 +27,25 @@ ip=/sbin/ip
-
- make_resolv_conf() {
- if [ x"$new_domain_name_servers" != x ]; then
-- cat /dev/null > /etc/resolv.conf.dhclient
-- chmod 644 /etc/resolv.conf.dhclient
-+ resolv_conf=""
- if [ x"$new_domain_search" != x ]; then
-- echo search $new_domain_search >> /etc/resolv.conf.dhclient
-+ resolv_conf="search ${new_domain_search}\n"
- elif [ x"$new_domain_name" != x ]; then
- # Note that the DHCP 'Domain Name Option' is really just a domain
- # name, and that this practice of using the domain name option as
- # a search path is both nonstandard and deprecated.
-- echo search $new_domain_name >> /etc/resolv.conf.dhclient
-+ resolv_conf="search ${new_domain_name}\n"
- fi
- for nameserver in $new_domain_name_servers; do
-- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
-+ resolv_conf="${resolv_conf}nameserver ${nameserver}\n"
- done
-
-- mv /etc/resolv.conf.dhclient /etc/resolv.conf
-+ echo -e "${resolv_conf}" > /etc/resolv.conf
- elif [ "x${new_dhcp6_name_servers}" != x ] ; then
-- cat /dev/null > /etc/resolv.conf.dhclient6
-- chmod 644 /etc/resolv.conf.dhclient6
-+ resolv_conf=""
-
- if [ "x${new_dhcp6_domain_search}" != x ] ; then
-- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
-+ resolv_conf="search ${new_dhcp6_domain_search}\n"
- fi
- shopt -s nocasematch
- for nameserver in ${new_dhcp6_name_servers} ; do
-@@ -59,11 +57,11 @@ make_resolv_conf() {
- else
- zone_id=
- fi
-- echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
-+ resolv_conf="${resolv_conf}nameserver ${nameserver}$zone_id\n"
- done
- shopt -u nocasematch
-
-- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
-+ echo -e "${resolv_conf}" > /etc/resolv.conf
- fi
- }
-
---
-2.8.1
-
diff --git a/meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch b/meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch
deleted file mode 100644
index 1435662..0000000
--- a/meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Add configure argument to make the libxml2 dependency explicit and
-determinisitic.
-
-Upstream-Status: Pending
-
-Signed-off-by: Christopher Larson <chris_larson@mentor.com>
-
-Rebase to 4.3.4
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- configure.ac | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 726c88e..1684df1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -718,7 +718,16 @@ AC_SUBST(BINDSRCDIR)
-
- # We need to find libxml2 if bind was built with support enabled
- # otherwise we'll fail to build omapip/test.c
--AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],)
-+AC_ARG_WITH(libxml2,
-+ AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]),
-+ with_libxml2="$withval", with_libxml2="no")
-+
-+if test x$with_libxml2 != xno; then
-+ AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],
-+ [if test x$with_libxml2 != xauto; then
-+ AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
-+ fi])
-+fi
-
- # OpenLDAP support.
- AC_ARG_WITH(ldap,
---
-2.8.1
-
diff --git a/meta/recipes-connectivity/dhcp/dhcp/remove-dhclient-script-bash-dependency.patch b/meta/recipes-connectivity/dhcp/dhcp/remove-dhclient-script-bash-dependency.patch
deleted file mode 100644
index 997b9f6..0000000
--- a/meta/recipes-connectivity/dhcp/dhcp/remove-dhclient-script-bash-dependency.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 8aed2a9ff09cb0d584ad0a7340fe3a596879d9b1 Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <armccurdy@gmail.com>
-Date: Thu, 21 Jul 2016 19:07:02 -0700
-Subject: [PATCH] remove dhclient-script bash dependency
-
-Take the dash compatible IPv6 link-local address test from the Debian
-version of dhclient-script.
-
-Note that although "echo -e" in the OE version of dhclient-script is
-technically bash specific too, it is supported by Busybox echo when
-Busybox is configured with CONFIG_FEATURE_FANCY_ECHO enabled (which
-is the default in the OE Busybox defconfig) therefore leave as-is.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
----
- client/scripts/linux | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 232a0aa..1383f46 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # dhclient-script for Linux. Dan Halbert, March, 1997.
- # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
- # No guarantees about this. I'm a novice at the details of Linux
-@@ -47,11 +47,11 @@ make_resolv_conf() {
- if [ "x${new_dhcp6_domain_search}" != x ] ; then
- resolv_conf="search ${new_dhcp6_domain_search}\n"
- fi
-- shopt -s nocasematch
- for nameserver in ${new_dhcp6_name_servers} ; do
- # If the nameserver has a link-local address
- # add a <zone_id> (interface name) to it.
-- if [[ "$nameserver" =~ ^fe80:: ]]
-+ if [ "${nameserver##fe80::}" != "$nameserver" ] ||
-+ [ "${nameserver##FE80::}" != "$nameserver" ]
- then
- zone_id="%$interface"
- else
-@@ -59,7 +59,6 @@ make_resolv_conf() {
- fi
- resolv_conf="${resolv_conf}nameserver ${nameserver}$zone_id\n"
- done
-- shopt -u nocasematch
-
- echo -e "${resolv_conf}" > /etc/resolv.conf
- fi
---
-1.9.1
-
diff --git a/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch b/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch
deleted file mode 100644
index d84df5c..0000000
--- a/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-Found this patch here:
-https://lists.isc.org/pipermail/dhcp-users/2011-January/012910.html
-
-and made some adjustments/updates to make it work with this version.
-Wasn't able to find that why this patch was not accepted by ISC DHCP developers.
-
-Upstream-Status: Pending
-
-Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
-
-Rebase to 4.3.4
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- client/scripts/linux | 82 ++++++++++++++++++++++++++++------------------------
- 1 file changed, 45 insertions(+), 37 deletions(-)
-
-diff --git a/client/scripts/linux b/client/scripts/linux
-index a02cfd9..232a0aa 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -101,17 +101,11 @@ fi
- if [ x$old_broadcast_address != x ]; then
- old_broadcast_arg="broadcast $old_broadcast_address"
- fi
--if [ x$new_subnet_mask != x ]; then
-- new_subnet_arg="netmask $new_subnet_mask"
-+if [ -n "$new_subnet_mask" ]; then
-+ new_mask="/$new_subnet_mask"
- fi
--if [ x$old_subnet_mask != x ]; then
-- old_subnet_arg="netmask $old_subnet_mask"
--fi
--if [ x$alias_subnet_mask != x ]; then
-- alias_subnet_arg="netmask $alias_subnet_mask"
--fi
--if [ x$new_interface_mtu != x ]; then
-- mtu_arg="mtu $new_interface_mtu"
-+if [ -n "$alias_subnet_mask" ]; then
-+ alias_mask="/$alias_subnet_mask"
- fi
- if [ x$IF_METRIC != x ]; then
- metric_arg="metric $IF_METRIC"
-@@ -125,9 +119,9 @@ fi
- if [ x$reason = xPREINIT ]; then
- if [ x$alias_ip_address != x ]; then
- # Bring down alias interface. Its routes will disappear too.
-- ifconfig $interface:0- inet 0
-+ ${ip} -4 addr flush dev ${interface} label ${interface}:0
- fi
-- ifconfig $interface 0 up
-+ ${ip} link set dev ${interface} up
-
- # We need to give the kernel some time to get the interface up.
- sleep 1
-@@ -154,25 +148,30 @@ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
- if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
- [ x$alias_ip_address != x$old_ip_address ]; then
- # Possible new alias. Remove old alias.
-- ifconfig $interface:0- inet 0
-+ ${ip} -4 addr flush dev ${interface} label ${interface}:0
- fi
- if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
- # IP address changed. Bringing down the interface will delete all routes,
- # and clear the ARP cache.
-- ifconfig $interface inet 0 down
-+ ${ip} -4 addr flush dev ${interface} label ${interface}
-
- fi
- if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
- [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
-
-- ifconfig $interface inet $new_ip_address $new_subnet_arg \
-- $new_broadcast_arg $mtu_arg
-+ ${ip} -4 addr add ${new_ip_address}${new_mask} ${new_broadcast_arg} \
-+ dev ${interface} label ${interface}
-+ if [ -n "$new_interface_mtu" ]; then
-+ # set MTU
-+ ${ip} link set dev ${interface} mtu ${new_interface_mtu}
-+ fi
- # Add a network route to the computed network address.
- for router in $new_routers; do
- if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
-- route add -host $router dev $interface
-+ ${ip} -4 route add ${router} dev $interface >/dev/null 2>&1
- fi
-- route add default gw $router $metric_arg dev $interface
-+ ${ip} -4 route add default via ${router} dev ${interface} \
-+ ${metric_arg} >/dev/null 2>&1
- done
- else
- # we haven't changed the address, have we changed other options
-@@ -180,21 +179,23 @@ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
- if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then
- # if we've changed routers delete the old and add the new.
- for router in $old_routers; do
-- route del default gw $router
-+ ${ip} -4 route delete default via ${router}
- done
- for router in $new_routers; do
- if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
-- route add -host $router dev $interface
-- fi
-- route add default gw $router $metric_arg dev $interface
-+ ${ip} -4 route add ${router} dev $interface >/dev/null 2>&1
-+ fi
-+ ${ip} -4 route add default via ${router} dev ${interface} \
-+ ${metric_arg} >/dev/null 2>&1
- done
- fi
- fi
- if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
- then
-- ifconfig $interface:0- inet 0
-- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-- route add -host $alias_ip_address $interface:0
-+ ${ip} -4 addr flush dev ${interface} label ${interface}:0
-+ ${ip} -4 addr add ${alias_ip_address}${alias_mask} \
-+ dev ${interface} label ${interface}:0
-+ ${ip} -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1
- fi
- make_resolv_conf
- exit_with_hooks 0
-@@ -204,42 +205,49 @@ if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \
- || [ x$reason = xSTOP ]; then
- if [ x$alias_ip_address != x ]; then
- # Turn off alias interface.
-- ifconfig $interface:0- inet 0
-+ ${ip} -4 addr flush dev ${interface} label ${interface}:0
- fi
- if [ x$old_ip_address != x ]; then
- # Shut down interface, which will delete routes and clear arp cache.
-- ifconfig $interface inet 0 down
-+ ${ip} -4 addr flush dev ${interface} label ${interface}
- fi
- if [ x$alias_ip_address != x ]; then
-- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-- route add -host $alias_ip_address $interface:0
-+ ${ip} -4 addr add ${alias_ip_address}${alias_network_arg} \
-+ dev ${interface} label ${interface}:0
-+ ${ip} -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1
- fi
- exit_with_hooks 0
- fi
-
- if [ x$reason = xTIMEOUT ]; then
- if [ x$alias_ip_address != x ]; then
-- ifconfig $interface:0- inet 0
-+ ${ip} -4 addr flush dev ${interface} label ${interface}:0
-+ fi
-+ ${ip} -4 addr add ${new_ip_address}${new_mask} ${new_broadcast_arg} \
-+ dev ${interface} label ${interface}
-+ if [ -n "$new_interface_mtu" ]; then
-+ # set MTU
-+ ip link set dev ${interface} mtu ${new_interface_mtu}
- fi
-- ifconfig $interface inet $new_ip_address $new_subnet_arg \
-- $new_broadcast_arg $mtu_arg
- set $new_routers
- if ping -q -c 1 $1; then
- if [ x$new_ip_address != x$alias_ip_address ] && \
- [ x$alias_ip_address != x ]; then
-- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-- route add -host $alias_ip_address dev $interface:0
-+ ${ip} -4 addr add ${alias_ip_address}${alias_mask} \
-+ dev ${interface} label ${interface}:0
-+ ${ip} -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1
- fi
- for router in $new_routers; do
- if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
-- route add -host $router dev $interface
-+ ${ip} -4 route add ${router} dev $interface >/dev/null 2>&1
- fi
-- route add default gw $router $metric_arg dev $interface
-+ ${ip} -4 route add default via ${router} dev ${interface} \
-+ ${metric_arg} >/dev/null 2>&1
- done
- make_resolv_conf
- exit_with_hooks 0
- fi
-- ifconfig $interface inet 0 down
-+ ${ip} -4 addr flush dev ${interface}
- exit_with_hooks 1
- fi
-
---
-2.8.1
-
diff --git a/meta/recipes-connectivity/dhcp/dhcp/search-for-libxml2.patch b/meta/recipes-connectivity/dhcp/dhcp/search-for-libxml2.patch
deleted file mode 100644
index a08a5b7..0000000
--- a/meta/recipes-connectivity/dhcp/dhcp/search-for-libxml2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-libdns requires libxml2 if bind was built with libxml2 support
-enabled. Compilation will fail for omapip/test.c in case
-lxml2 isn't used during the build. So, we add losely coupled
-search path which will pick up the lib if it is present.
-
-Signed-off-by: Awais Belal <awais_belal@mentor.com>
-Upstream-Status: Pending
-
-diff --git a/configure.ac b/configure.ac
-index c9dc8b5..85f59be 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -602,6 +602,10 @@ no)
- esac
- AC_SUBST([libbind])
-
-+# We need to find libxml2 if bind was built with support enabled
-+# otherwise we'll fail to build omapip/test.c
-+AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],)
-+
- # OpenLDAP support.
- AC_ARG_WITH(ldap,
- AS_HELP_STRING([--with-ldap],[enable OpenLDAP support in dhcpd (default is no)]),
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb b/meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb
deleted file mode 100644
index 964d05d..0000000
--- a/meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require dhcp.inc
-
-SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
- file://link-with-lcrypto.patch \
- file://fixsepbuild.patch \
- file://dhclient-script-drop-resolv.conf.dhclient.patch \
- file://replace-ifconfig-route.patch \
- file://0001-site.h-enable-gentle-shutdown.patch \
- file://libxml2-configure-argument.patch \
- file://tweak-to-support-external-bind.patch \
- file://remove-dhclient-script-bash-dependency.patch \
- file://build-shared-libs.patch \
- file://Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch \
- "
-
-SRC_URI[md5sum] = "2b5e5b2fa31c2e27e487039d86f83d3f"
-SRC_URI[sha256sum] = "eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954"
-
-PACKAGECONFIG ?= ""
-PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-libxml2,libxml2"
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb b/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb
new file mode 100644
index 0000000..4634a01
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb
@@ -0,0 +1,20 @@
+require dhcp.inc
+
+SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch \
+ file://0002-dhclient-dbus.patch \
+ file://0003-link-with-lcrypto.patch \
+ file://0004-Fix-out-of-tree-builds.patch \
+ file://0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch \
+ file://0006-site.h-enable-gentle-shutdown.patch \
+ file://0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch \
+ file://0008-tweak-to-support-external-bind.patch \
+ file://0009-remove-dhclient-script-bash-dependency.patch \
+ file://0010-build-shared-libs.patch \
+ file://0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch \
+ "
+
+SRC_URI[md5sum] = "afa6e9b3eb7539ea048421a82c668adc"
+SRC_URI[sha256sum] = "a41eaf6364f1377fe065d35671d9cf82bbbc8f21207819b2b9f33f652aec6f1b"
+
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-libxml2,libxml2"
--
2.8.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 4/8] elfutils: 0.168 -> 0.170
2017-08-16 8:31 [PATCH 0/8] upgrade 8 recipes Hongxu Jia
` (2 preceding siblings ...)
2017-08-16 8:31 ` [PATCH 3/8] dhcp: 4.3.5 -> 4.3.6 Hongxu Jia
@ 2017-08-16 8:31 ` Hongxu Jia
2017-08-16 8:31 ` [PATCH 5/8] libgcrypt: 1.7.8 -> 1.8.0 Hongxu Jia
` (3 subsequent siblings)
7 siblings, 0 replies; 16+ messages in thread
From: Hongxu Jia @ 2017-08-16 8:31 UTC (permalink / raw)
To: openembedded-core, ross.burton
The 0.170 Fixed CVE issues
- CVE-2017-7608
- CVE-2017-7612
- CVE-2017-7611
- CVE-2017-7610
- CVE-2016-10255
- CVE-2017-7613
- CVE-2017-7609
- CVE-2016-10254
- CVE-2017-7607
Rebase patches to 0.170
- dso-link-change.patch -> 0001
- Fix_elf_cvt_gunhash.patch -> 0002
- fixheadercheck.patch -> 0003
- 0001-remove-the-unneed-checking.patch -> 0004
- 0001-fix-a-stack-usage-warning.patch -> 0005
- aarch64_uio.patch -> 0006
- shadow.patch -> 0007
- 0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch -> 0008
- debian/mips_backend.diff -> debian/mips_backend.patch
Drop obsolete patches
- 0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch
Upstream fixed it
https://sourceware.org/git/?p=elfutils.git;a=commit;h=7114c513fbebcca8b76796b7f64b57447ba383e1
- Fix_one_GCC7_warning.patch
It is a backported patch
https://sourceware.org/git/?p=elfutils.git;a=commit;h=93c51144c3f664d4e9709da75a1d0fa00ea0fe95
- Drop debian patches, they modify test case.
debian/testsuite-ignore-elflint.diff
debian/kfreebsd_path.patch
debian/hurd_path.patch
debian/ignore_strmerge.diff
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
...m-Silence-Werror-maybe-uninitialized-fals.patch | 35 -----
.../elfutils-0.168/Fix_one_GCC7_warning.patch | 44 ------
.../elfutils/elfutils-0.168/debian/hurd_path.patch | 17 ---
.../elfutils-0.168/debian/ignore_strmerge.diff | 14 --
.../elfutils-0.168/debian/kfreebsd_path.patch | 20 ---
.../debian/testsuite-ignore-elflint.diff | 42 ------
.../elfutils/elfutils-0.168/shadow.patch | 23 ---
.../elfutils/elfutils/dso-link-change.patch | 32 ----
.../{elfutils_0.168.bb => elfutils_0.170.bb} | 32 ++--
.../elfutils/files/0001-dso-link-change.patch | 52 +++++++
...elf_cvt_gunhash-if-dest-and-src-are-same.patch} | 15 +-
| 23 ++-
.../0004-Disable-the-test-to-convert-euc-jp.patch} | 10 +-
.../0005-fix-a-stack-usage-warning.patch} | 15 +-
.../0006-Fix-build-on-aarch64-musl.patch} | 38 +++--
...-path-where-we-have-str-as-uninitialized-.patch | 45 ++++++
...e-alternatives-for-glibc-assumptions-hel.patch} | 168 +++++++++------------
...ferences-between-mips-machine-identifiers.patch | 0
...-support-for-mips64-abis-in-mips_retval.c.patch | 0
.../0003-Add-mips-n64-relocation-format-hack.patch | 0
.../debian/arm_backend.diff | 0
.../debian}/fallthrough.patch | 0
.../debian/hppa_backend.diff | 0
.../debian/mips_backend.patch} | 115 ++++++++------
.../debian/mips_readelf_w.patch | 0
25 files changed, 335 insertions(+), 405 deletions(-)
delete mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch
delete mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/Fix_one_GCC7_warning.patch
delete mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/debian/hurd_path.patch
delete mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/debian/ignore_strmerge.diff
delete mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/debian/kfreebsd_path.patch
delete mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/debian/testsuite-ignore-elflint.diff
delete mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/shadow.patch
delete mode 100644 meta/recipes-devtools/elfutils/elfutils/dso-link-change.patch
rename meta/recipes-devtools/elfutils/{elfutils_0.168.bb => elfutils_0.170.bb} (71%)
create mode 100644 meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
rename meta/recipes-devtools/elfutils/{elfutils/Fix_elf_cvt_gunhash.patch => files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch} (72%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168/fixheadercheck.patch => files/0003-fixheadercheck.patch} (69%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168/0001-remove-the-unneed-checking.patch => files/0004-Disable-the-test-to-convert-euc-jp.patch} (76%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168/0001-fix-a-stack-usage-warning.patch => files/0005-fix-a-stack-usage-warning.patch} (72%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168/aarch64_uio.patch => files/0006-Fix-build-on-aarch64-musl.patch} (51%)
create mode 100644 meta/recipes-devtools/elfutils/files/0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch
rename meta/recipes-devtools/elfutils/{elfutils-0.168/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch => files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch} (89%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168 => files}/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168 => files}/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168 => files}/debian/0003-Add-mips-n64-relocation-format-hack.patch (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168 => files}/debian/arm_backend.diff (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168 => files/debian}/fallthrough.patch (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168 => files}/debian/hppa_backend.diff (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168/debian/mips_backend.diff => files/debian/mips_backend.patch} (92%)
rename meta/recipes-devtools/elfutils/{elfutils-0.168 => files}/debian/mips_readelf_w.patch (100%)
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch
deleted file mode 100644
index 3754c1c..0000000
--- a/meta/recipes-devtools/elfutils/elfutils-0.168/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 668accf322fd7185e273bfd50b84320e71d9de5a Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Fri, 10 Apr 2015 00:29:18 +0200
-Subject: [PATCH] elf_getarsym: Silence -Werror=maybe-uninitialized false
- positive
-
-Upstream-Status: Pending
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- libelf/elf_getarsym.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/libelf/elf_getarsym.c b/libelf/elf_getarsym.c
-index d0bb28a..08954d2 100644
---- a/libelf/elf_getarsym.c
-+++ b/libelf/elf_getarsym.c
-@@ -165,8 +165,13 @@ elf_getarsym (elf, ptr)
- int w = index64_p ? 8 : 4;
-
- /* We have an archive. The first word in there is the number of
-- entries in the table. */
-- uint64_t n;
-+ entries in the table.
-+ Set to SIZE_MAX just to silence -Werror=maybe-uninitialized
-+ elf_getarsym.c:290:9: error: 'n' may be used uninitialized in this function
-+ The read_number_entries function doesn't initialize n only when returning
-+ -1 which in turn ensures to jump over usage of this uninitialized variable.
-+ */
-+ uint64_t n = SIZE_MAX;
- size_t off = elf->start_offset + SARMAG + sizeof (struct ar_hdr);
- if (read_number_entries (&n, elf, &off, index64_p) < 0)
- {
---
-2.3.5
-
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/Fix_one_GCC7_warning.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/Fix_one_GCC7_warning.patch
deleted file mode 100644
index d88f4eb..0000000
--- a/meta/recipes-devtools/elfutils/elfutils-0.168/Fix_one_GCC7_warning.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 93c51144c3f664d4e9709da75a1d0fa00ea0fe95 Mon Sep 17 00:00:00 2001
-From: Mark Wielaard <mark@klomp.org>
-Date: Sun, 12 Feb 2017 21:51:34 +0100
-Subject: [PATCH] libasm: Fix one GCC7 -Wformat-truncation=2 warning.
-
-Make sure that if we have really lots of labels the tempsym doesn't get
-truncated because it is too small to hold the whole name.
-
-This doesn't enable -Wformat-truncation=2 or fix other "issues" pointed
-out by enabling this warning because there are currently some issues
-with it. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79448
-
-Signed-off-by: Mark Wielaard <mark@klomp.org>
-
-Upstream-Status: Backport (https://sourceware.org/git/?p=elfutils.git;a=commit;h=93c51144c3f664d4e9709da75a1d0fa00ea0fe95)
-Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
-
----
- libasm/ChangeLog | 6 +++++-
- libasm/asm_newsym.c | 6 ++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-Index: elfutils-0.168/libasm/asm_newsym.c
-===================================================================
---- elfutils-0.168.orig/libasm/asm_newsym.c
-+++ elfutils-0.168/libasm/asm_newsym.c
-@@ -1,5 +1,5 @@
- /* Define new symbol for current position in given section.
-- Copyright (C) 2002, 2005, 2016 Red Hat, Inc.
-+ Copyright (C) 2002, 2005, 2016, 2017 Red Hat, Inc.
- This file is part of elfutils.
- Written by Ulrich Drepper <drepper@redhat.com>, 2002.
-
-@@ -44,7 +44,9 @@ AsmSym_t *
- asm_newsym (AsmScn_t *asmscn, const char *name, GElf_Xword size,
- int type, int binding)
- {
--#define TEMPSYMLEN 10
-+/* We don't really expect labels with many digits, but in theory it could
-+ be 10 digits (plus ".L" and a zero terminator). */
-+#define TEMPSYMLEN 13
- char tempsym[TEMPSYMLEN];
- AsmSym_t *result;
-
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/hurd_path.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/hurd_path.patch
deleted file mode 100644
index a4d568b..0000000
--- a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/hurd_path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Backport [from debian]
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-
-Index: elfutils-0.165/tests/run-native-test.sh
-===================================================================
---- elfutils-0.165.orig/tests/run-native-test.sh
-+++ elfutils-0.165/tests/run-native-test.sh
-@@ -83,6 +83,9 @@ native_test()
- # "cannot attach to process: Function not implemented".
- [ "$(uname)" = "GNU/kFreeBSD" ] && exit 77
-
-+# hurd's /proc/$PID/maps does not give paths yet.
-+[ "$(uname)" = "GNU" ] && exit 77
-+
- native_test ${abs_builddir}/allregs
- native_test ${abs_builddir}/funcretval
-
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/ignore_strmerge.diff b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/ignore_strmerge.diff
deleted file mode 100644
index 3570dec..0000000
--- a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/ignore_strmerge.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Backport [from debian]
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-
---- elfutils-0.165.orig/tests/run-strip-strmerge.sh
-+++ elfutils-0.165/tests/run-strip-strmerge.sh
-@@ -30,7 +30,7 @@ remerged=remerged.elf
- tempfiles $merged $stripped $debugfile $remerged
-
- echo elflint $input
--testrun ${abs_top_builddir}/src/elflint --gnu $input
-+testrun_on_self_skip ${abs_top_builddir}/src/elflint --gnu $input
- echo elfstrmerge
- testrun ${abs_top_builddir}/tests/elfstrmerge -o $merged $input
- echo elflint $merged
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/kfreebsd_path.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/kfreebsd_path.patch
deleted file mode 100644
index 49085d1..0000000
--- a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/kfreebsd_path.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Upstream-Status: Backport [from debian]
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-
-Index: b/tests/run-native-test.sh
-===================================================================
---- a/tests/run-native-test.sh
-+++ b/tests/run-native-test.sh
-@@ -77,6 +77,12 @@ native_test()
- test $native -eq 0 || testrun "$@" -p $native > /dev/null
- }
-
-+# On the Debian buildds, GNU/kFreeBSD linprocfs /proc/$PID/maps does
-+# not give absolute paths due to sbuild's bind mounts (bug #570805)
-+# therefore the next two test programs are expected to fail with
-+# "cannot attach to process: Function not implemented".
-+[ "$(uname)" = "GNU/kFreeBSD" ] && exit 77
-+
- native_test ${abs_builddir}/allregs
- native_test ${abs_builddir}/funcretval
-
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/testsuite-ignore-elflint.diff b/meta/recipes-devtools/elfutils/elfutils-0.168/debian/testsuite-ignore-elflint.diff
deleted file mode 100644
index 3df3576..0000000
--- a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/testsuite-ignore-elflint.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-On many architectures this test fails because binaries/libs produced by
-binutils don't pass elflint. However elfutils shouldn't FTBFS because of this.
-
-So we run the tests on all archs to see what breaks, but if it breaks we ignore
-the result (exitcode 77 means: this test was skipped).
-
-Upstream-Status: Backport [from debian]
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-
-Index: b/tests/run-elflint-self.sh
-===================================================================
---- a/tests/run-elflint-self.sh
-+++ b/tests/run-elflint-self.sh
-@@ -18,4 +18,4 @@
-
- . $srcdir/test-subr.sh
-
--testrun_on_self ${abs_top_builddir}/src/elflint --quiet --gnu-ld
-+testrun_on_self_skip ${abs_top_builddir}/src/elflint --quiet --gnu-ld
-Index: b/tests/test-subr.sh
-===================================================================
---- a/tests/test-subr.sh
-+++ b/tests/test-subr.sh
-@@ -152,3 +152,18 @@ testrun_on_self_quiet()
- # Only exit if something failed
- if test $exit_status != 0; then exit $exit_status; fi
- }
-+
-+# Same as testrun_on_self(), but skip on failure.
-+testrun_on_self_skip()
-+{
-+ exit_status=0
-+
-+ for file in $self_test_files; do
-+ testrun $* $file \
-+ || { echo "*** failure in $* $file"; exit_status=77; }
-+ done
-+
-+ # Only exit if something failed
-+ if test $exit_status != 0; then exit $exit_status; fi
-+}
-+
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/shadow.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/shadow.patch
deleted file mode 100644
index d31961f..0000000
--- a/meta/recipes-devtools/elfutils/elfutils-0.168/shadow.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix control path where we have str as uninitialized string
-
-| /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/i586-oe-linux-musl/elfutils/0.164-r0/elfutils-0.164/libcpu/i386_disasm.c: In function 'i386_disasm':
-| /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/i586-oe-linux-musl/elfutils/0.164-r0/elfutils-0.164/libcpu/i386_disasm.c:310:5: error: 'str' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-| memcpy (buf + bufcnt, _str, _len); \
-| ^
-| /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/i586-oe-linux-musl/elfutils/0.164-r0/elfutils-0.164/libcpu/i386_disasm.c:709:17: note: 'str' was declared here
-| const char *str;
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-Index: elfutils-0.164/libcpu/i386_disasm.c
-===================================================================
---- elfutils-0.164.orig/libcpu/i386_disasm.c
-+++ elfutils-0.164/libcpu/i386_disasm.c
-@@ -821,6 +821,7 @@ i386_disasm (const uint8_t **startp, con
- }
-
- default:
-+ str = "";
- assert (! "INVALID not handled");
- }
- }
diff --git a/meta/recipes-devtools/elfutils/elfutils/dso-link-change.patch b/meta/recipes-devtools/elfutils/elfutils/dso-link-change.patch
deleted file mode 100644
index d0cd3ed..0000000
--- a/meta/recipes-devtools/elfutils/elfutils/dso-link-change.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream-Status: Pending
-
-# This patch makes the link to the dependencies of libdw explicit, as recent
-# ld no longer implicitly links them. See
-# http://lists.fedoraproject.org/pipermail/devel/2010-March/133601.html as
-# a similar example of the error message you can encounter without this patch,
-# and https://fedoraproject.org/wiki/UnderstandingDSOLinkChange and
-# https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking for more
-# details.
-
---- elfutils-0.148.orig/src/Makefile.am
-+++ elfutils-0.148/src/Makefile.am
-@@ -86,7 +86,7 @@ libdw = ../libdw/libdw.a $(zip_LIBS) $(l
- libelf = ../libelf/libelf.a
- else
- libasm = ../libasm/libasm.so
--libdw = ../libdw/libdw.so
-+libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl
- libelf = ../libelf/libelf.so
- endif
- libebl = ../libebl/libebl.a
---- elfutils-0.148.orig/tests/Makefile.am
-+++ elfutils-0.148/tests/Makefile.am
-@@ -172,7 +172,7 @@ libdw = ../libdw/libdw.a $(zip_LIBS) $(l
- libelf = ../libelf/libelf.a
- libasm = ../libasm/libasm.a
- else
--libdw = ../libdw/libdw.so
-+libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl
- libelf = ../libelf/libelf.so
- libasm = ../libasm/libasm.so
- endif
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.168.bb b/meta/recipes-devtools/elfutils/elfutils_0.170.bb
similarity index 71%
rename from meta/recipes-devtools/elfutils/elfutils_0.168.bb
rename to meta/recipes-devtools/elfutils/elfutils_0.170.bb
index 0717616..8a339e4 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.168.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.170.bb
@@ -6,39 +6,33 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
DEPENDS = "libtool bzip2 zlib virtual/libintl"
DEPENDS_append_libc-musl = " argp-standalone fts "
SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2"
-SRC_URI[md5sum] = "52adfa40758d0d39e5d5c57689bf38d6"
-SRC_URI[sha256sum] = "b88d07893ba1373c7dd69a7855974706d05377766568a7d9002706d5de72c276"
+SRC_URI[md5sum] = "03599aee98c9b726c7a732a2dd0245d5"
+SRC_URI[sha256sum] = "1f844775576b79bdc9f9c717a50058d08620323c1e935458223a12f249c9e066"
SRC_URI += "\
- file://dso-link-change.patch \
- file://Fix_elf_cvt_gunhash.patch \
- file://fixheadercheck.patch \
- file://0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch \
- file://0001-remove-the-unneed-checking.patch \
- file://0001-fix-a-stack-usage-warning.patch \
- file://aarch64_uio.patch \
- file://Fix_one_GCC7_warning.patch \
- file://shadow.patch \
+ file://0001-dso-link-change.patch \
+ file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \
+ file://0003-fixheadercheck.patch \
+ file://0004-Disable-the-test-to-convert-euc-jp.patch \
+ file://0005-fix-a-stack-usage-warning.patch \
+ file://0006-Fix-build-on-aarch64-musl.patch \
+ file://0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch \
"
+SRC_URI_append_libc-musl = " file://0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch"
-# pick the patch from debian
+# Pick patches from debian
# http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.168-0.2.debian.tar.xz
SRC_URI += "\
file://debian/hppa_backend.diff \
file://debian/arm_backend.diff \
- file://debian/mips_backend.diff \
- file://debian/testsuite-ignore-elflint.diff \
+ file://debian/mips_backend.patch \
file://debian/mips_readelf_w.patch \
- file://debian/kfreebsd_path.patch \
file://debian/0001-Ignore-differences-between-mips-machine-identifiers.patch \
file://debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch \
file://debian/0003-Add-mips-n64-relocation-format-hack.patch \
- file://debian/hurd_path.patch \
- file://debian/ignore_strmerge.diff \
"
# Fix the patches from Debian with GCC7
-SRC_URI += "file://fallthrough.patch"
-SRC_URI_append_libc-musl = " file://0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch "
+SRC_URI += "file://debian/fallthrough.patch"
# The buildsystem wants to generate 2 .h files from source using a binary it just built,
# which can not pass the cross compiling, so let's work around it by adding 2 .h files
diff --git a/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch b/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
new file mode 100644
index 0000000..28c57f2
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
@@ -0,0 +1,52 @@
+From 0a69a26c9f7487daca900db87cd1195857a4603f Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 15 Aug 2017 17:10:57 +0800
+Subject: [PATCH 1/7] dso link change
+
+Upstream-Status: Pending
+
+This patch makes the link to the dependencies of libdw explicit, as
+recent ld no longer implicitly links them. See
+http://lists.fedoraproject.org/pipermail/devel/2010-March/133601.html
+as a similar example of the error message you can encounter without this
+patch, and https://fedoraproject.org/wiki/UnderstandingDSOLinkChange and
+https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking for
+more details.
+
+Rebase to 0.170
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ src/Makefile.am | 2 +-
+ tests/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2b1c0dc..9305b84 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -44,7 +44,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl
+ libelf = ../libelf/libelf.a -lz
+ else
+ libasm = ../libasm/libasm.so
+-libdw = ../libdw/libdw.so
++libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl
+ libelf = ../libelf/libelf.so
+ endif
+ libebl = ../libebl/libebl.a
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 3735084..528615d 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -400,7 +400,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl
+ libelf = ../libelf/libelf.a -lz
+ libasm = ../libasm/libasm.a
+ else
+-libdw = ../libdw/libdw.so
++libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl
+ libelf = ../libelf/libelf.so
+ libasm = ../libasm/libasm.so
+ endif
+--
+1.8.3.1
+
diff --git a/meta/recipes-devtools/elfutils/elfutils/Fix_elf_cvt_gunhash.patch b/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch
similarity index 72%
rename from meta/recipes-devtools/elfutils/elfutils/Fix_elf_cvt_gunhash.patch
rename to meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch
index f861e89..2f718eb 100644
--- a/meta/recipes-devtools/elfutils/elfutils/Fix_elf_cvt_gunhash.patch
+++ b/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch
@@ -1,4 +1,7 @@
-Fix elf_cvt_gunhash if dest and src are same.
+From e98670f7c7b4c73fb65534949716fd8d043960d5 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 15 Aug 2017 17:13:59 +0800
+Subject: [PATCH 2/7] Fix elf_cvt_gunhash if dest and src are same.
Upstream-Status: Pending
@@ -6,6 +9,13 @@ The 'dest' and 'src' can be same, we need to save the value of src32[2]
before swaping it.
Signed-off-by: Baoshan Pang <BaoShan.Pang@windriver.com>
+
+Rebase to 0.170
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ libelf/gnuhash_xlate.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
diff --git a/libelf/gnuhash_xlate.h b/libelf/gnuhash_xlate.h
index 6faf113..04d9ca1 100644
--- a/libelf/gnuhash_xlate.h
@@ -27,3 +37,6 @@ index 6faf113..04d9ca1 100644
/* Now the 64 bit words. */
Elf64_Xword *dest64 = (Elf64_Xword *) &dest32[4];
+--
+1.8.3.1
+
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/fixheadercheck.patch b/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch
similarity index 69%
rename from meta/recipes-devtools/elfutils/elfutils-0.168/fixheadercheck.patch
rename to meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch
index 5de3b24..7c49fce 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.168/fixheadercheck.patch
+++ b/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch
@@ -1,13 +1,27 @@
-For some binaries we can get a invalid section alignment, for example if
-sh_align = 1 and sh_addralign is 0. In the case of a zero size section like
-".note.GNU-stack", this is irrelavent as far as I can tell and we shouldn't
+From 565d5935abf5b58773f9c8385c00189221980d98 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 15 Aug 2017 17:17:20 +0800
+Subject: [PATCH 3/7] fixheadercheck
+
+For some binaries we can get a invalid section alignment, for example if
+sh_align = 1 and sh_addralign is 0. In the case of a zero size section
+like
+".note.GNU-stack", this is irrelavent as far as I can tell and we
+shouldn't
error in this case.
RP 2014/6/11
Upstream-Status: Pending
+Rebase to 0.170
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ libelf/elf32_updatenull.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c
+index d83c0b3..a51bf70 100644
--- a/libelf/elf32_updatenull.c
+++ b/libelf/elf32_updatenull.c
@@ -339,8 +339,8 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum)
@@ -21,3 +35,6 @@ diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c
{
__libelf_seterrno (ELF_E_INVALID_ALIGN);
return -1;
+--
+1.8.3.1
+
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/0001-remove-the-unneed-checking.patch b/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch
similarity index 76%
rename from meta/recipes-devtools/elfutils/elfutils-0.168/0001-remove-the-unneed-checking.patch
rename to meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch
index 5be92d7..d893ad6 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.168/0001-remove-the-unneed-checking.patch
+++ b/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch
@@ -1,4 +1,7 @@
-Disable the test to convert euc-jp
+From bb7ed11950101798aae82f7fda8b3dcb05f755c5 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 15 Aug 2017 17:24:06 +0800
+Subject: [PATCH 4/7] Disable the test to convert euc-jp
Remove the test "Test against HP-UX 11.11 bug:
No converter from EUC-JP to UTF-8 is provided"
@@ -9,6 +12,9 @@ iconv support and will cause guild-native building fail.
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Roy Li <rongqing.li@windriver.com>
+
+Rebase to 0.170
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
m4/iconv.m4 | 2 ++
1 file changed, 2 insertions(+)
@@ -34,5 +40,5 @@ index a503646..299f1eb 100644
}]])],
[am_cv_func_iconv_works=yes],
--
-2.0.1
+1.8.3.1
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/0001-fix-a-stack-usage-warning.patch b/meta/recipes-devtools/elfutils/files/0005-fix-a-stack-usage-warning.patch
similarity index 72%
rename from meta/recipes-devtools/elfutils/elfutils-0.168/0001-fix-a-stack-usage-warning.patch
rename to meta/recipes-devtools/elfutils/files/0005-fix-a-stack-usage-warning.patch
index 6923bf7..22a01cf 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.168/0001-fix-a-stack-usage-warning.patch
+++ b/meta/recipes-devtools/elfutils/files/0005-fix-a-stack-usage-warning.patch
@@ -1,17 +1,24 @@
-[PATCH] fix a stack-usage warning
+From dd6dbf6af396519380f48c0ef1ce6cf4dd77f6d7 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 15 Aug 2017 17:25:16 +0800
+Subject: [PATCH 5/7] fix a stack-usage warning
Upstream-Status: Pending
-not use a variable to as a array size, otherwise the warning to error that
+not use a variable to as a array size, otherwise the warning to error
+that
stack usage might be unbounded [-Werror=stack-usage=] will happen
Signed-off-by: Roy Li <rongqing.li@windriver.com>
+
+Rebase to 0.170
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
backends/ppc_initreg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c
-index 64f5379..52dde3e 100644
+index 69d623b..de41dec 100644
--- a/backends/ppc_initreg.c
+++ b/backends/ppc_initreg.c
@@ -93,7 +93,7 @@ ppc_set_initial_registers_tid (pid_t tid __attribute__ ((unused)),
@@ -24,5 +31,5 @@ index 64f5379..52dde3e 100644
dwarf_regs[gpr] = user_regs.r.gpr[gpr];
if (! setfunc (0, gprs, dwarf_regs, arg))
--
-1.9.1
+1.8.3.1
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/aarch64_uio.patch b/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
similarity index 51%
rename from meta/recipes-devtools/elfutils/elfutils-0.168/aarch64_uio.patch
rename to meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
index 38dc57b..5f29a03 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.168/aarch64_uio.patch
+++ b/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
@@ -1,4 +1,7 @@
-Fix build on aarch64/musl
+From e57ad47fc8549353ca80c23b9b4f38f31fde13e5 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 15 Aug 2017 17:27:30 +0800
+Subject: [PATCH 6/7] Fix build on aarch64/musl
Errors
@@ -10,20 +13,28 @@ error: redefinition
^
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Index: elfutils-0.163/backends/aarch64_initreg.c
-===================================================================
---- elfutils-0.163.orig/backends/aarch64_initreg.c
-+++ elfutils-0.163/backends/aarch64_initreg.c
+
+Rebase to 0.170
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ backends/aarch64_initreg.c | 4 ++--
+ backends/arm_initreg.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/backends/aarch64_initreg.c b/backends/aarch64_initreg.c
+index daf6f37..6445276 100644
+--- a/backends/aarch64_initreg.c
++++ b/backends/aarch64_initreg.c
@@ -33,7 +33,7 @@
#include "system.h"
#include <assert.h>
- #ifdef __aarch64__
+ #if defined(__aarch64__) && defined(__linux__)
-# include <linux/uio.h>
+# include <sys/uio.h>
# include <sys/user.h>
# include <sys/ptrace.h>
/* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */
-@@ -82,7 +82,7 @@ aarch64_set_initial_registers_tid (pid_t
+@@ -82,7 +82,7 @@ aarch64_set_initial_registers_tid (pid_t tid __attribute__ ((unused)),
Dwarf_Word dwarf_fregs[32];
for (int r = 0; r < 32; r++)
@@ -32,11 +43,11 @@ Index: elfutils-0.163/backends/aarch64_initreg.c
if (! setfunc (64, 32, dwarf_fregs, arg))
return false;
-Index: elfutils-0.163/backends/arm_initreg.c
-===================================================================
---- elfutils-0.163.orig/backends/arm_initreg.c
-+++ elfutils-0.163/backends/arm_initreg.c
-@@ -37,7 +37,7 @@
+diff --git a/backends/arm_initreg.c b/backends/arm_initreg.c
+index efcabaf..062bb9e 100644
+--- a/backends/arm_initreg.c
++++ b/backends/arm_initreg.c
+@@ -38,7 +38,7 @@
#endif
#ifdef __aarch64__
@@ -45,3 +56,6 @@ Index: elfutils-0.163/backends/arm_initreg.c
# include <sys/user.h>
# include <sys/ptrace.h>
/* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */
+--
+1.8.3.1
+
diff --git a/meta/recipes-devtools/elfutils/files/0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch b/meta/recipes-devtools/elfutils/files/0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch
new file mode 100644
index 0000000..2247704
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/files/0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch
@@ -0,0 +1,45 @@
+From 1e91c1d4e37c05cf95058b4b3c3f352d72886f58 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 15 Aug 2017 17:31:38 +0800
+Subject: [PATCH 7/7] Fix control path where we have str as uninitialized
+ string
+
+|
+/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/i586-oe-linux-musl/elfutils/0.164-r0/elfutils-0.164/libcpu/i386_disasm.c:
+In function 'i386_disasm':
+|
+/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/i586-oe-linux-musl/elfutils/0.164-r0/elfutils-0.164/libcpu/i386_disasm.c:310:5:
+error: 'str' may be used uninitialized in this function
+[-Werror=maybe-uninitialized]
+| memcpy (buf + bufcnt, _str, _len); \
+| ^
+|
+/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/i586-oe-linux-musl/elfutils/0.164-r0/elfutils-0.164/libcpu/i386_disasm.c:709:17:
+note: 'str' was declared here
+| const char *str;
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
+Rebase to 0.170
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ libcpu/i386_disasm.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libcpu/i386_disasm.c b/libcpu/i386_disasm.c
+index 831afbe..60fd6d4 100644
+--- a/libcpu/i386_disasm.c
++++ b/libcpu/i386_disasm.c
+@@ -821,6 +821,7 @@ i386_disasm (Ebl *ebl __attribute__((unused)),
+ }
+ /* Fallthrough */
+ default:
++ str = "";
+ assert (! "INVALID not handled");
+ }
+ }
+--
+1.8.3.1
+
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch b/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch
similarity index 89%
rename from meta/recipes-devtools/elfutils/elfutils-0.168/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch
rename to meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch
index 020ffa1..8864d44 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.168/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch
+++ b/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch
@@ -1,18 +1,18 @@
-From 054fedda5ab9b84160d40d90cb967f2f5822b889 Mon Sep 17 00:00:00 2001
+From 010b0c57e748440eb1ceb3d977875f2488d2b4ce Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 31 Dec 2015 06:35:34 +0000
+Date: Wed, 16 Aug 2017 10:06:26 +0800
Subject: [PATCH] build: Provide alternatives for glibc assumptions helps
compiling it on musl
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Rebase to 0.68
+Rebase to 0.170
+
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
Makefile.am | 2 +-
lib/color.c | 3 ++-
- lib/crc32_file.c | 1 +
lib/fixedsizehash.h | 1 -
lib/system.h | 10 ++++++++++
lib/xmalloc.c | 2 +-
@@ -21,13 +21,13 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
libcpu/i386_gendis.c | 2 +-
libcpu/i386_lex.c | 2 +-
libcpu/i386_parse.c | 2 +-
- libdw/Makefile.am | 4 +++-
+ libdw/Makefile.am | 3 ++-
libdw/libdw_alloc.c | 2 +-
libdwfl/dwfl_build_id_find_elf.c | 3 ++-
libdwfl/dwfl_error.c | 4 +++-
libdwfl/dwfl_module_getdwarf.c | 1 +
libdwfl/find-debuginfo.c | 2 +-
- libdwfl/libdwfl_crc32_file.c | 10 ++++++++++
+ libdwfl/libdwfl_crc32_file.c | 9 +++++++++
libdwfl/linux-kernel-modules.c | 1 +
libebl/eblopenbackend.c | 2 +-
libelf/elf.h | 8 ++++++--
@@ -80,7 +80,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
tests/sectiondump.c | 2 +-
tests/varlocs.c | 2 +-
tests/vdsosyms.c | 2 +-
- 70 files changed, 98 insertions(+), 64 deletions(-)
+ 69 files changed, 95 insertions(+), 64 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 2ff444e..41f77df 100644
@@ -96,10 +96,10 @@ index 2ff444e..41f77df 100644
EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
COPYING COPYING-GPLV2 COPYING-LGPLV3
diff --git a/lib/color.c b/lib/color.c
-index fde2d9d..73292ac 100644
+index f62389d..a2a84b4 100644
--- a/lib/color.c
+++ b/lib/color.c
-@@ -32,12 +32,13 @@
+@@ -32,13 +32,14 @@
#endif
#include <argp.h>
@@ -110,22 +110,11 @@ index fde2d9d..73292ac 100644
#include <string.h>
#include <unistd.h>
#include "libeu.h"
+ #include "color.h"
+#include "system.h"
-
/* Prototype for option handler. */
-diff --git a/lib/crc32_file.c b/lib/crc32_file.c
-index a8434d4..57e4298 100644
---- a/lib/crc32_file.c
-+++ b/lib/crc32_file.c
-@@ -35,6 +35,7 @@
- #include <unistd.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
-+#include "system.h"
-
- int
- crc32_file (int fd, uint32_t *resp)
+ static error_t parse_opt (int key, char *arg, struct argp_state *state);
diff --git a/lib/fixedsizehash.h b/lib/fixedsizehash.h
index dac2a5f..43016fc 100644
--- a/lib/fixedsizehash.h
@@ -139,10 +128,10 @@ index dac2a5f..43016fc 100644
#include <system.h>
diff --git a/lib/system.h b/lib/system.h
-index ccd99d6..0e93e60 100644
+index 9203335..1a60131 100644
--- a/lib/system.h
+++ b/lib/system.h
-@@ -55,6 +55,16 @@
+@@ -50,6 +50,16 @@
#else
# error "Unknown byte order"
#endif
@@ -173,7 +162,7 @@ index 0cde384..217b054 100644
#include <stddef.h>
#include <stdlib.h>
diff --git a/libasm/asm_end.c b/libasm/asm_end.c
-index 191a535..bf5ab06 100644
+index ced24f5..4ad918c 100644
--- a/libasm/asm_end.c
+++ b/libasm/asm_end.c
@@ -32,7 +32,7 @@
@@ -212,10 +201,10 @@ index aae5eae..6d76016 100644
#include <stdio.h>
#include <stdlib.h>
diff --git a/libcpu/i386_lex.c b/libcpu/i386_lex.c
-index b670608..b842c25 100644
+index ba5f4aa..b1e4191 100644
--- a/libcpu/i386_lex.c
+++ b/libcpu/i386_lex.c
-@@ -592,7 +592,7 @@ char *i386_text;
+@@ -577,7 +577,7 @@ char *i386_text;
#endif
#include <ctype.h>
@@ -225,7 +214,7 @@ index b670608..b842c25 100644
#include <libeu.h>
diff --git a/libcpu/i386_parse.c b/libcpu/i386_parse.c
-index 724addf..5b67802 100644
+index ef1ac35..48f2e64 100644
--- a/libcpu/i386_parse.c
+++ b/libcpu/i386_parse.c
@@ -107,7 +107,7 @@
@@ -238,27 +227,19 @@ index 724addf..5b67802 100644
#include <libintl.h>
#include <math.h>
diff --git a/libdw/Makefile.am b/libdw/Makefile.am
-index 082d96c..51cbea0 100644
+index ff8c291..89e792a 100644
--- a/libdw/Makefile.am
+++ b/libdw/Makefile.am
-@@ -102,6 +102,8 @@ endif
- libdw_pic_a_SOURCES =
- am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os)
-
+@@ -105,7 +105,8 @@ am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os)
+ libdw_so_LIBS = libdw_pic.a ../libdwelf/libdwelf_pic.a \
+ ../libdwfl/libdwfl_pic.a ../libebl/libebl.a
+ libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so
+-libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS)
+fts_LDADD = -lfts
-+
++libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) $(fts_LDADD)
libdw_so_SOURCES =
- libdw.so$(EXEEXT): $(srcdir)/libdw.map libdw_pic.a ../libdwelf/libdwelf_pic.a \
- ../libdwfl/libdwfl_pic.a ../libebl/libebl.a \
-@@ -112,7 +114,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map libdw_pic.a ../libdwelf/libdwelf_pic.a \
- -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
- -Wl,--version-script,$<,--no-undefined \
- -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
-- -ldl -lz $(argp_LDADD) $(zip_LIBS)
-+ -ldl -lz $(argp_LDADD) $(zip_LIBS) $(fts_LDADD)
- @$(textrel_check)
- $(AM_V_at)ln -fs $@ $@.$(VERSION)
-
+ libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS)
+ # The rpath is necessary for libebl because its $ORIGIN use will
diff --git a/libdw/libdw_alloc.c b/libdw/libdw_alloc.c
index 28a8cf6..29aeb3f 100644
--- a/libdw/libdw_alloc.c
@@ -273,18 +254,18 @@ index 28a8cf6..29aeb3f 100644
#include <stdlib.h>
#include "libdwP.h"
diff --git a/libdwfl/dwfl_build_id_find_elf.c b/libdwfl/dwfl_build_id_find_elf.c
-index 903e193..b00d10c 100644
+index ee0c164..b06ab59 100644
--- a/libdwfl/dwfl_build_id_find_elf.c
+++ b/libdwfl/dwfl_build_id_find_elf.c
-@@ -27,6 +27,7 @@
- not, see <http://www.gnu.org/licenses/>. */
+@@ -31,6 +31,7 @@
+ #endif
#include "libdwflP.h"
+#include "system.h"
#include <inttypes.h>
#include <fcntl.h>
#include <unistd.h>
-@@ -94,7 +95,7 @@ __libdwfl_open_by_build_id (Dwfl_Module *mod, bool debug, char **file_name,
+@@ -99,7 +100,7 @@ __libdwfl_open_by_build_id (Dwfl_Module *mod, bool debug, char **file_name,
{
if (*file_name != NULL)
free (*file_name);
@@ -316,22 +297,22 @@ index 7bcf61c..c345797 100644
return elf_errmsg (error & 0xffff);
case OTHER_ERROR (LIBDW):
diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
-index 0e8810b..82ad665 100644
+index 9775ace..511c4a6 100644
--- a/libdwfl/dwfl_module_getdwarf.c
+++ b/libdwfl/dwfl_module_getdwarf.c
-@@ -31,6 +31,7 @@
+@@ -35,6 +35,7 @@
#include <fcntl.h>
#include <string.h>
#include <unistd.h>
+#include "system.h"
#include "../libdw/libdwP.h" /* DWARF_E_* values are here. */
#include "../libelf/libelfP.h"
-
+ #include "system.h"
diff --git a/libdwfl/find-debuginfo.c b/libdwfl/find-debuginfo.c
-index 80515db..80b0148 100644
+index 6d5a42a..9267788 100644
--- a/libdwfl/find-debuginfo.c
+++ b/libdwfl/find-debuginfo.c
-@@ -385,7 +385,7 @@ dwfl_standard_find_debuginfo (Dwfl_Module *mod,
+@@ -389,7 +389,7 @@ dwfl_standard_find_debuginfo (Dwfl_Module *mod,
/* If FILE_NAME is a symlink, the debug file might be associated
with the symlink target name instead. */
@@ -341,32 +322,31 @@ index 80515db..80b0148 100644
fd = find_debuginfo_in_path (mod, canon,
debuglink_file, debuglink_crc,
diff --git a/libdwfl/libdwfl_crc32_file.c b/libdwfl/libdwfl_crc32_file.c
-index 6b6b7d3..debc4a4 100644
+index f849128..6f0aca1 100644
--- a/libdwfl/libdwfl_crc32_file.c
+++ b/libdwfl/libdwfl_crc32_file.c
-@@ -31,6 +31,16 @@
+@@ -29,6 +29,15 @@
+ # include <config.h>
+ #endif
- #define crc32_file attribute_hidden __libdwfl_crc32_file
- #define crc32 __libdwfl_crc32
-+
+#ifndef TEMP_FAILURE_RETRY
+#define TEMP_FAILURE_RETRY(expression) \
-+ (__extension__ \
-+ ({ long int __result; \
-+ do __result = (long int) (expression); \
-+ while (__result == -1L && errno == EINTR); \
++ (__extension__ \
++ ({ long int __result; \
++ do __result = (long int) (expression); \
++ while (__result == -1L && errno == EINTR); \
+ __result; }))
+#endif
+
- #define LIB_SYSTEM_H 1
+ #define crc32_file attribute_hidden __libdwfl_crc32_file
+ #define crc32 __libdwfl_crc32
#include <libdwflP.h>
- #include "../lib/crc32_file.c"
diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c
-index 9cd8ea9..4dbf4c5 100644
+index 9d0fef2..9fc09b8 100644
--- a/libdwfl/linux-kernel-modules.c
+++ b/libdwfl/linux-kernel-modules.c
-@@ -36,6 +36,7 @@
- #include <config.h>
+@@ -40,6 +40,7 @@
+ #include <system.h>
#include "libdwflP.h"
+#include "system.h"
@@ -374,7 +354,7 @@ index 9cd8ea9..4dbf4c5 100644
#include <errno.h>
#include <stdio.h>
diff --git a/libebl/eblopenbackend.c b/libebl/eblopenbackend.c
-index 34d439a..56d2345 100644
+index 5371396..2e66dfd 100644
--- a/libebl/eblopenbackend.c
+++ b/libebl/eblopenbackend.c
@@ -32,7 +32,7 @@
@@ -387,7 +367,7 @@ index 34d439a..56d2345 100644
#include <dwarf.h>
#include <stdlib.h>
diff --git a/libelf/elf.h b/libelf/elf.h
-index 74654d6..81eee8b 100644
+index 5cf2b93..990b3af 100644
--- a/libelf/elf.h
+++ b/libelf/elf.h
@@ -21,7 +21,9 @@
@@ -401,7 +381,7 @@ index 74654d6..81eee8b 100644
/* Standard ELF types. */
-@@ -3704,6 +3706,8 @@ enum
+@@ -3705,6 +3707,8 @@ enum
#define R_BPF_NONE 0 /* No reloc */
#define R_BPF_MAP_FD 1 /* Map fd to pointer */
@@ -412,7 +392,7 @@ index 74654d6..81eee8b 100644
#endif /* elf.h */
diff --git a/libelf/libelf.h b/libelf/libelf.h
-index c0d6389..38a68fd 100644
+index 547c0f5..dd78799 100644
--- a/libelf/libelf.h
+++ b/libelf/libelf.h
@@ -29,6 +29,7 @@
@@ -424,10 +404,10 @@ index c0d6389..38a68fd 100644
#include <sys/types.h>
diff --git a/libelf/libelfP.h b/libelf/libelfP.h
-index 4459982..1296f20 100644
+index 7ee6625..5840899 100644
--- a/libelf/libelfP.h
+++ b/libelf/libelfP.h
-@@ -36,6 +36,7 @@
+@@ -32,6 +32,7 @@
#include <ar.h>
#include <gelf.h>
@@ -436,7 +416,7 @@ index 4459982..1296f20 100644
#include <errno.h>
#include <stdbool.h>
diff --git a/src/addr2line.c b/src/addr2line.c
-index 0222088..cd6a9a6 100644
+index ba414a7..04b7116 100644
--- a/src/addr2line.c
+++ b/src/addr2line.c
@@ -23,7 +23,7 @@
@@ -449,7 +429,7 @@ index 0222088..cd6a9a6 100644
#include <inttypes.h>
#include <libdwfl.h>
diff --git a/src/ar.c b/src/ar.c
-index f2f322b..6e70031 100644
+index ec32cee..4efd729 100644
--- a/src/ar.c
+++ b/src/ar.c
@@ -22,7 +22,7 @@
@@ -488,7 +468,7 @@ index 553fc57..46443d0 100644
#include <limits.h>
#include <string.h>
diff --git a/src/elfcmp.c b/src/elfcmp.c
-index 401ab31..873d253 100644
+index 5046420..cff183f 100644
--- a/src/elfcmp.c
+++ b/src/elfcmp.c
@@ -23,7 +23,7 @@
@@ -501,7 +481,7 @@ index 401ab31..873d253 100644
#include <locale.h>
#include <libintl.h>
diff --git a/src/elflint.c b/src/elflint.c
-index 7d3f227..074d21c 100644
+index 51e53c2..da0b0dc 100644
--- a/src/elflint.c
+++ b/src/elflint.c
@@ -24,7 +24,7 @@
@@ -514,7 +494,7 @@ index 7d3f227..074d21c 100644
#include <gelf.h>
#include <inttypes.h>
diff --git a/src/findtextrel.c b/src/findtextrel.c
-index dc41502..325888c 100644
+index 8f1e239..71463af 100644
--- a/src/findtextrel.c
+++ b/src/findtextrel.c
@@ -23,7 +23,7 @@
@@ -527,7 +507,7 @@ index dc41502..325888c 100644
#include <gelf.h>
#include <libdw.h>
diff --git a/src/nm.c b/src/nm.c
-index c54e96f..9e031d9 100644
+index 969c6d3..3113c04 100644
--- a/src/nm.c
+++ b/src/nm.c
@@ -26,7 +26,7 @@
@@ -540,7 +520,7 @@ index c54e96f..9e031d9 100644
#include <gelf.h>
#include <inttypes.h>
diff --git a/src/objdump.c b/src/objdump.c
-index fff4b81..4b1f966 100644
+index 860cfac..61e67bf 100644
--- a/src/objdump.c
+++ b/src/objdump.c
@@ -21,7 +21,7 @@
@@ -553,7 +533,7 @@ index fff4b81..4b1f966 100644
#include <inttypes.h>
#include <libintl.h>
diff --git a/src/ranlib.c b/src/ranlib.c
-index 41a3bcf..0c7da2c 100644
+index cc0ee23..ae851e4 100644
--- a/src/ranlib.c
+++ b/src/ranlib.c
@@ -24,7 +24,7 @@
@@ -566,7 +546,7 @@ index 41a3bcf..0c7da2c 100644
#include <gelf.h>
#include <libintl.h>
diff --git a/src/readelf.c b/src/readelf.c
-index d18a4b7..a6cfb35 100644
+index 346eccd..c831aa8 100644
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -25,7 +25,7 @@
@@ -579,7 +559,7 @@ index d18a4b7..a6cfb35 100644
#include <gelf.h>
#include <inttypes.h>
diff --git a/src/size.c b/src/size.c
-index de0d791..4639d42 100644
+index ad8dbcb..fd83be0 100644
--- a/src/size.c
+++ b/src/size.c
@@ -21,7 +21,7 @@
@@ -592,7 +572,7 @@ index de0d791..4639d42 100644
#include <gelf.h>
#include <inttypes.h>
diff --git a/src/stack.c b/src/stack.c
-index a5a7beb..4c075bc 100644
+index 6f2ff69..6da0243 100644
--- a/src/stack.c
+++ b/src/stack.c
@@ -18,7 +18,7 @@
@@ -605,7 +585,7 @@ index a5a7beb..4c075bc 100644
#include <inttypes.h>
#include <stdio.h>
diff --git a/src/strings.c b/src/strings.c
-index 49aab8b..09d5b1c 100644
+index d214356..76cb26b 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -25,7 +25,7 @@
@@ -618,7 +598,7 @@ index 49aab8b..09d5b1c 100644
#include <gelf.h>
#include <inttypes.h>
diff --git a/src/strip.c b/src/strip.c
-index a875ddf..fd76f7f 100644
+index c7830ec..0d7f148 100644
--- a/src/strip.c
+++ b/src/strip.c
@@ -24,7 +24,7 @@
@@ -628,10 +608,10 @@ index a875ddf..fd76f7f 100644
-#include <error.h>
+#include <err.h>
#include <fcntl.h>
+ #include <fnmatch.h>
#include <gelf.h>
- #include <libelf.h>
diff --git a/src/unstrip.c b/src/unstrip.c
-index d838ae9..0108272 100644
+index 5074909..3d4f952 100644
--- a/src/unstrip.c
+++ b/src/unstrip.c
@@ -31,7 +31,7 @@
@@ -670,7 +650,7 @@ index 286f7e3..c9de089 100644
#include <argp.h>
#include <assert.h>
diff --git a/tests/backtrace-data.c b/tests/backtrace-data.c
-index b7158da..354fa6a 100644
+index a387d8f..955c27d 100644
--- a/tests/backtrace-data.c
+++ b/tests/backtrace-data.c
@@ -27,7 +27,7 @@
@@ -683,7 +663,7 @@ index b7158da..354fa6a 100644
#include <dwarf.h>
#if defined(__x86_64__) && defined(__linux__)
diff --git a/tests/backtrace-dwarf.c b/tests/backtrace-dwarf.c
-index a644c8a..b8cbe27 100644
+index 2dc8a9a..24ca7fb 100644
--- a/tests/backtrace-dwarf.c
+++ b/tests/backtrace-dwarf.c
@@ -22,7 +22,7 @@
@@ -693,10 +673,10 @@ index a644c8a..b8cbe27 100644
-#include <error.h>
+#include <err.h>
#include <unistd.h>
- #include <sys/ptrace.h>
#include <sys/types.h>
+ #include <sys/wait.h>
diff --git a/tests/backtrace.c b/tests/backtrace.c
-index 1ff6353..47e3f7b 100644
+index 21abe8a..d733248 100644
--- a/tests/backtrace.c
+++ b/tests/backtrace.c
@@ -24,7 +24,7 @@
@@ -1047,5 +1027,5 @@ index b876c10..afb2823 100644
#include <stdio.h>
#include <string.h>
--
-2.8.1
+1.8.3.1
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch b/meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.168/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch
rename to meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch b/meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.168/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch
rename to meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/0003-Add-mips-n64-relocation-format-hack.patch b/meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.168/debian/0003-Add-mips-n64-relocation-format-hack.patch
rename to meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/arm_backend.diff b/meta/recipes-devtools/elfutils/files/debian/arm_backend.diff
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.168/debian/arm_backend.diff
rename to meta/recipes-devtools/elfutils/files/debian/arm_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/fallthrough.patch b/meta/recipes-devtools/elfutils/files/debian/fallthrough.patch
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.168/fallthrough.patch
rename to meta/recipes-devtools/elfutils/files/debian/fallthrough.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/hppa_backend.diff b/meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.168/debian/hppa_backend.diff
rename to meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/mips_backend.diff b/meta/recipes-devtools/elfutils/files/debian/mips_backend.patch
similarity index 92%
rename from meta/recipes-devtools/elfutils/elfutils-0.168/debian/mips_backend.diff
rename to meta/recipes-devtools/elfutils/files/debian/mips_backend.patch
index a5e76dd..2e0e54b 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/mips_backend.diff
+++ b/meta/recipes-devtools/elfutils/files/debian/mips_backend.patch
@@ -1,8 +1,60 @@
+From 46d0d0ca718093486eeeedf1b44134e9e29b56f7 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Wed, 16 Aug 2017 09:18:59 +0800
+Subject: [PATCH] mips backends
+
Upstream-Status: Backport [from debian]
+
+Rebase to 0.170
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ backends/Makefile.am | 8 +-
+ backends/mips_init.c | 59 +++++++++
+ backends/mips_regs.c | 104 ++++++++++++++++
+ backends/mips_reloc.def | 79 ++++++++++++
+ backends/mips_retval.c | 321 ++++++++++++++++++++++++++++++++++++++++++++++++
+ backends/mips_symbol.c | 52 ++++++++
+ libebl/eblopenbackend.c | 2 +
+ 7 files changed, 623 insertions(+), 2 deletions(-)
+ create mode 100644 backends/mips_init.c
+ create mode 100644 backends/mips_regs.c
+ create mode 100644 backends/mips_reloc.def
+ create mode 100644 backends/mips_retval.c
+ create mode 100644 backends/mips_symbol.c
-Index: b/backends/mips_init.c
-===================================================================
+diff --git a/backends/Makefile.am b/backends/Makefile.am
+index 7f1f5d4..91baf6e 100644
+--- a/backends/Makefile.am
++++ b/backends/Makefile.am
+@@ -33,12 +33,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
+
+
+ modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \
+- tilegx m68k bpf parisc
++ tilegx m68k bpf parisc mips
+ libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \
+ libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \
+ libebl_aarch64_pic.a libebl_sparc_pic.a libebl_ppc_pic.a \
+ libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a \
+- libebl_m68k_pic.a libebl_bpf_pic.a libebl_parisc_pic.a
++ libebl_m68k_pic.a libebl_bpf_pic.a libebl_parisc_pic.a libebl_mips_pic.a
+ noinst_LIBRARIES = $(libebl_pic)
+ noinst_DATA = $(libebl_pic:_pic.a=.so)
+
+@@ -128,6 +128,10 @@ parisc_SRCS = parisc_init.c parisc_symbol.c parisc_regs.c parisc_retval.c
+ libebl_parisc_pic_a_SOURCES = $(parisc_SRCS)
+ am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os)
+
++mips_SRCS = mips_init.c mips_symbol.c mips_regs.c mips_retval.c
++libebl_mips_pic_a_SOURCES = $(mips_SRCS)
++am_libebl_mips_pic_a_OBJECTS = $(mips_SRCS:.c=.os)
++
+ libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) $(libeu)
+ @rm -f $(@:.so=.map)
+ $(AM_V_at)echo 'ELFUTILS_$(PACKAGE_VERSION) { global: $*_init; local: *; };' \
+diff --git a/backends/mips_init.c b/backends/mips_init.c
+new file mode 100644
+index 0000000..975c04e
--- /dev/null
+++ b/backends/mips_init.c
@@ -0,0 +1,59 @@
@@ -65,8 +117,9 @@ Index: b/backends/mips_init.c
+
+ return MODVERSION;
+}
-Index: b/backends/mips_regs.c
-===================================================================
+diff --git a/backends/mips_regs.c b/backends/mips_regs.c
+new file mode 100644
+index 0000000..44f86cb
--- /dev/null
+++ b/backends/mips_regs.c
@@ -0,0 +1,104 @@
@@ -174,8 +227,9 @@ Index: b/backends/mips_regs.c
+ name[namelen++] = '\0';
+ return namelen;
+}
-Index: b/backends/mips_reloc.def
-===================================================================
+diff --git a/backends/mips_reloc.def b/backends/mips_reloc.def
+new file mode 100644
+index 0000000..4579970
--- /dev/null
+++ b/backends/mips_reloc.def
@@ -0,0 +1,79 @@
@@ -258,8 +312,9 @@ Index: b/backends/mips_reloc.def
+
+#define NO_COPY_RELOC 1
+#define NO_RELATIVE_RELOC 1
-Index: b/backends/mips_retval.c
-===================================================================
+diff --git a/backends/mips_retval.c b/backends/mips_retval.c
+new file mode 100644
+index 0000000..656cd1f
--- /dev/null
+++ b/backends/mips_retval.c
@@ -0,0 +1,321 @@
@@ -584,8 +639,9 @@ Index: b/backends/mips_retval.c
+ DWARF and might be valid. */
+ return -2;
+}
-Index: b/backends/mips_symbol.c
-===================================================================
+diff --git a/backends/mips_symbol.c b/backends/mips_symbol.c
+new file mode 100644
+index 0000000..ba465fe
--- /dev/null
+++ b/backends/mips_symbol.c
@@ -0,0 +1,52 @@
@@ -641,11 +697,11 @@ Index: b/backends/mips_symbol.c
+ return ELF_T_NUM;
+ }
+}
-Index: b/libebl/eblopenbackend.c
-===================================================================
+diff --git a/libebl/eblopenbackend.c b/libebl/eblopenbackend.c
+index 1f81477..5371396 100644
--- a/libebl/eblopenbackend.c
+++ b/libebl/eblopenbackend.c
-@@ -71,6 +71,8 @@ static const struct
+@@ -72,6 +72,8 @@ static const struct
{ "sparc", "elf_sparc", "sparc", 5, EM_SPARC, 0, 0 },
{ "sparc", "elf_sparcv8plus", "sparc", 5, EM_SPARC32PLUS, 0, 0 },
{ "s390", "ebl_s390", "s390", 4, EM_S390, 0, 0 },
@@ -654,33 +710,6 @@ Index: b/libebl/eblopenbackend.c
{ "m32", "elf_m32", "m32", 3, EM_M32, 0, 0 },
{ "m68k", "elf_m68k", "m68k", 4, EM_68K, ELFCLASS32, ELFDATA2MSB },
-Index: b/backends/Makefile.am
-===================================================================
---- a/backends/Makefile.am
-+++ b/backends/Makefile.am
-@@ -33,12 +33,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/libebl -I
-
-
- modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \
-- tilegx m68k bpf parisc
-+ tilegx m68k bpf parisc mips
- libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \
- libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \
- libebl_aarch64_pic.a libebl_sparc_pic.a libebl_ppc_pic.a \
- libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a \
-- libebl_m68k_pic.a libebl_bpf_pic.a libebl_parisc_pic.a
-+ libebl_m68k_pic.a libebl_bpf_pic.a libebl_parisc_pic.a libebl_mips_pic.a
- noinst_LIBRARIES = $(libebl_pic)
- noinst_DATA = $(libebl_pic:_pic.a=.so)
-
-@@ -132,6 +132,10 @@ parisc_SRCS = parisc_init.c parisc_symbo
- libebl_parisc_pic_a_SOURCES = $(parisc_SRCS)
- am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os)
-
-+mips_SRCS = mips_init.c mips_symbol.c mips_regs.c mips_retval.c
-+libebl_mips_pic_a_SOURCES = $(mips_SRCS)
-+am_libebl_mips_pic_a_OBJECTS = $(mips_SRCS:.c=.os)
-+
- libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw)
- @rm -f $(@:.so=.map)
- $(AM_V_at)echo 'ELFUTILS_$(PACKAGE_VERSION) { global: $*_init; local: *; };' \
+--
+1.8.3.1
+
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/debian/mips_readelf_w.patch b/meta/recipes-devtools/elfutils/files/debian/mips_readelf_w.patch
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.168/debian/mips_readelf_w.patch
rename to meta/recipes-devtools/elfutils/files/debian/mips_readelf_w.patch
--
2.8.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 5/8] libgcrypt: 1.7.8 -> 1.8.0
2017-08-16 8:31 [PATCH 0/8] upgrade 8 recipes Hongxu Jia
` (3 preceding siblings ...)
2017-08-16 8:31 ` [PATCH 4/8] elfutils: 0.168 -> 0.170 Hongxu Jia
@ 2017-08-16 8:31 ` Hongxu Jia
2017-08-16 8:31 ` [PATCH 6/8] gnupg: 2.1.20 -> 2.1.23 Hongxu Jia
` (2 subsequent siblings)
7 siblings, 0 replies; 16+ messages in thread
From: Hongxu Jia @ 2017-08-16 8:31 UTC (permalink / raw)
To: openembedded-core, ross.burton
Rebase patches:
- add-pkgconfig-support.patch -> 0001
- libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch -> 0002
- fix-ICE-failure-on-mips-with-option-O-and-g.patch -> 0003
- fix-undefined-reference-to-pthread.patch -> 0004
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
...pkg-config-for-libgcrypt-instead-of-conf.patch} | 18 +++++++++-----
...x-building-error-with-O2-in-sysroot-path.patch} | 29 ++++++++++++++--------
...slope.c-workaround-ICE-failure-on-mips-w.patch} | 24 ++++++++++++------
...le.am-fix-undefined-reference-to-pthread.patch} | 11 ++++----
.../{libgcrypt_1.7.8.bb => libgcrypt_1.8.0.bb} | 12 ++++-----
5 files changed, 59 insertions(+), 35 deletions(-)
rename meta/recipes-support/libgcrypt/files/{add-pkgconfig-support.patch => 0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch} (94%)
rename meta/recipes-support/libgcrypt/files/{libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch => 0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch} (55%)
rename meta/recipes-support/libgcrypt/files/{fix-ICE-failure-on-mips-with-option-O-and-g.patch => 0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch} (73%)
rename meta/recipes-support/libgcrypt/files/{fix-undefined-reference-to-pthread.patch => 0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch} (70%)
rename meta/recipes-support/libgcrypt/{libgcrypt_1.7.8.bb => libgcrypt_1.8.0.bb} (75%)
diff --git a/meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch b/meta/recipes-support/libgcrypt/files/0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch
similarity index 94%
rename from meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch
rename to meta/recipes-support/libgcrypt/files/0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch
index 69589f5..d41c3de 100644
--- a/meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch
+++ b/meta/recipes-support/libgcrypt/files/0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch
@@ -1,10 +1,16 @@
-Add and use pkg-config for libgcrypt instead of -config scripts.
+From 72b9e9040d58c15f0302bd8abda28179f04e1c5f Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Wed, 16 Aug 2017 10:43:18 +0800
+Subject: [PATCH 1/4] Add and use pkg-config for libgcrypt instead of -config
+ scripts.
-Upstream-Status: Denied [upstream have indicated they don't want a pkg-config dependency]
+Upstream-Status: Denied [upstream have indicated they don't want a
+pkg-config dependency]
RP 2014/5/22
-Rebase to 1.7.0
+Rebase to 1.8.0
+
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
configure.ac | 1 +
@@ -14,10 +20,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
create mode 100644 src/libgcrypt.pc.in
diff --git a/configure.ac b/configure.ac
-index f683e21..566e1c8 100644
+index bbe8104..3d2de73 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2314,6 +2314,7 @@ random/Makefile
+@@ -2607,6 +2607,7 @@ random/Makefile
doc/Makefile
src/Makefile
src/gcrypt.h
@@ -173,5 +179,5 @@ index 0000000..2fc8f53
+Libs.private: -L${libdir} -lgpg-error
+Cflags: -I${includedir}
--
-2.8.1
+1.8.3.1
diff --git a/meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch b/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
similarity index 55%
rename from meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
rename to meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
index a3e5403..d7554f3 100644
--- a/meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
+++ b/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
@@ -1,25 +1,34 @@
-Upstream-Status: Pending
+From 97570ef271ea1fb7b5ca903eec88f68407b0ec76 Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Wed, 16 Aug 2017 10:44:41 +0800
+Subject: [PATCH 2/4] libgcrypt: fix building error with '-O2' in sysroot path
-libgcrypt: fix building error with '-O2' in sysroot path
+Upstream-Status: Pending
-Characters like '-O2' or '-Ofast' will be replaced by '-O1' when compiling cipher.
-If we are cross compiling libgcrypt and sysroot contains such characters, we would
+Characters like '-O2' or '-Ofast' will be replaced by '-O1' when
+compiling cipher.
+If we are cross compiling libgcrypt and sysroot contains such
+characters, we would
get compile errors because the sysroot path has been modified.
-Fix this by adding blank spaces before and after the original matching pattern in the
+Fix this by adding blank spaces before and after the original matching
+pattern in the
sed command.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+
+Rebase to 1.8.0
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- cipher/Makefile.am | 2 +-
+ cipher/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
-index 76cdc96..9a89792 100644
+index 95c4510..bd52ec7 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
-@@ -69,7 +69,7 @@ rfc2268.c \
- camellia.c camellia.h camellia-glue.c
+@@ -116,7 +116,7 @@ gost-s-box: gost-s-box.c
+
if ENABLE_O_FLAG_MUNGING
-o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g'
@@ -28,5 +37,5 @@ index 76cdc96..9a89792 100644
o_flag_munging = cat
endif
--
-1.7.9.5
+1.8.3.1
diff --git a/meta/recipes-support/libgcrypt/files/fix-ICE-failure-on-mips-with-option-O-and-g.patch b/meta/recipes-support/libgcrypt/files/0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch
similarity index 73%
rename from meta/recipes-support/libgcrypt/files/fix-ICE-failure-on-mips-with-option-O-and-g.patch
rename to meta/recipes-support/libgcrypt/files/0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch
index 582e62f..105df29 100644
--- a/meta/recipes-support/libgcrypt/files/fix-ICE-failure-on-mips-with-option-O-and-g.patch
+++ b/meta/recipes-support/libgcrypt/files/0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch
@@ -1,4 +1,8 @@
-tests/bench-slope.c: workaround ICE failure on mips with '-O -g'
+From 7cc702c7b5a1ccc2b0091f3effa1391b6c3030fd Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Wed, 16 Aug 2017 10:46:28 +0800
+Subject: [PATCH 3/4] tests/bench-slope.c: workaround ICE failure on mips with
+ '-O -g'
Hit a ICE and could reduce it to the following minimal example:
@@ -24,31 +28,35 @@ END
2. Only -O1 and -g on mips caused the issue:
$ mips-poky-linux-gcc -O1 -g -o mipgcc-test mipgcc-test.c
mipgcc-test.c: In function 'main':
-mipgcc-test.c:18:1: internal compiler error: in dwarf2out_var_location, at dwarf2out.c:20810
+mipgcc-test.c:18:1: internal compiler error: in dwarf2out_var_location,
+at dwarf2out.c:20810
}
^
Please submit a full bug report,
with preprocessed source if appropriate.
See <http://gcc.gnu.org/bugs.html> for instructions
-3. The quick workround is trying to enlarge the size of array with larger
+3. The quick workround is trying to enlarge the size of array with
+larger
than 2.
-4. File a bug to GNU, but it could not be reproduced on there environment.
+4. File a bug to GNU, but it could not be reproduced on there
+environment.
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60643
Upstream-Status: Inappropriate [oe specific]
+Rebase to 1.8.0
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
tests/bench-slope.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/bench-slope.c b/tests/bench-slope.c
-index bd05064..28c2438 100644
+index 75e6e43..4e70842 100644
--- a/tests/bench-slope.c
+++ b/tests/bench-slope.c
-@@ -1197,7 +1197,7 @@ static struct bench_ops hash_ops = {
+@@ -1463,7 +1463,7 @@ static struct bench_ops hash_ops = {
};
@@ -57,7 +65,7 @@ index bd05064..28c2438 100644
{"", &hash_ops},
{0},
};
-@@ -1349,7 +1349,7 @@ static struct bench_ops mac_ops = {
+@@ -1629,7 +1629,7 @@ static struct bench_ops mac_ops = {
};
@@ -67,5 +75,5 @@ index bd05064..28c2438 100644
{0},
};
--
-1.8.1.2
+1.8.3.1
diff --git a/meta/recipes-support/libgcrypt/files/fix-undefined-reference-to-pthread.patch b/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch
similarity index 70%
rename from meta/recipes-support/libgcrypt/files/fix-undefined-reference-to-pthread.patch
rename to meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch
index e7de8ba..8622df3 100644
--- a/meta/recipes-support/libgcrypt/files/fix-undefined-reference-to-pthread.patch
+++ b/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch
@@ -1,7 +1,8 @@
-From cc0e2b403d33892963513a3ba98e4ae5a05a4d3c Mon Sep 17 00:00:00 2001
+From e20dbdb0b8f0af840ef90b299c4e2277c52ddf87 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Sun, 12 Jun 2016 04:44:29 -0400
-Subject: [PATCH] tests/Makefile.am: fix undefined reference to `pthread_create'
+Subject: [PATCH 4/4] tests/Makefile.am: fix undefined reference to
+ `pthread_create'
Add missing '-lpthread' to CFLAGS
@@ -13,15 +14,15 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
-index d462f30..bef6dd7 100644
+index 1744ea7..04cf425 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
-@@ -62,4 +62,4 @@ EXTRA_DIST = README rsa-16k.key cavs_tests.sh cavs_driver.pl \
+@@ -64,4 +64,4 @@ EXTRA_DIST = README rsa-16k.key cavs_tests.sh cavs_driver.pl \
LDADD = $(standard_ldadd) $(GPG_ERROR_LIBS)
t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS)
-t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS)
+t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS) -lpthread
--
-2.8.1
+1.8.3.1
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.7.8.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb
similarity index 75%
rename from meta/recipes-support/libgcrypt/libgcrypt_1.7.8.bb
rename to meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb
index ec8b875..1797d95 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.7.8.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb
@@ -16,13 +16,13 @@ DEPENDS = "libgpg-error"
UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.gz \
- file://add-pkgconfig-support.patch \
- file://libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
- file://fix-ICE-failure-on-mips-with-option-O-and-g.patch \
- file://fix-undefined-reference-to-pthread.patch \
+ file://0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch \
+ file://0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch \
+ file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
+ file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \
"
-SRC_URI[md5sum] = "5588b89b75b1353e2454b04c7b8368f3"
-SRC_URI[sha256sum] = "cb076b2efc7ba752f3d4c663c9ee0589a98b1d614fe90878b1facd607a45fd43"
+SRC_URI[md5sum] = "110ce4352f9ea6f560bdc6c5644ae93c"
+SRC_URI[sha256sum] = "f6e470b7f2d3a703e8747f05a8c19d9e10e26ebf2d5f3d71ff75a40f504e12ee"
BINCONFIG = "${bindir}/libgcrypt-config"
--
2.8.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 6/8] gnupg: 2.1.20 -> 2.1.23
2017-08-16 8:31 [PATCH 0/8] upgrade 8 recipes Hongxu Jia
` (4 preceding siblings ...)
2017-08-16 8:31 ` [PATCH 5/8] libgcrypt: 1.7.8 -> 1.8.0 Hongxu Jia
@ 2017-08-16 8:31 ` Hongxu Jia
2017-08-18 9:38 ` Richard Purdie
2017-08-16 8:31 ` [PATCH 7/8] gpgme: 1.8.0 -> 1.9.0 Hongxu Jia
2017-08-16 8:31 ` [PATCH 8/8] ncurses: 6.0+20161126 -> 6.0+20170715 Hongxu Jia
7 siblings, 1 reply; 16+ messages in thread
From: Hongxu Jia @ 2017-08-16 8:31 UTC (permalink / raw)
To: openembedded-core, ross.burton
COPYING.LIB: Rename to COPYING.LGPL3.
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=3419a339d9c4e800bf30e9021e05982d8c1021c1
Rebase patches:
- pkgconfig.patch -> 0001
- use-pkgconfig-instead-of-npth-config.patch -> 0002
- dirmngr-uses-libgpg-error.patch -> 0003
- autogen.sh-fix-find-version-for-beta-checking.patch -> 0004
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
...config-to-find-pth-instead-of-pth-config.patch} | 29 +++++++++++++++-----
...002-use-pkgconfig-instead-of-npth-config.patch} | 21 +++++++++++---
.../gnupg/0003-dirmngr-uses-libgpg-error.patch | 32 ++++++++++++++++++++++
...en.sh-fix-find-version-for-beta-checking.patch} | 17 +++++++-----
.../gnupg/gnupg/dirmngr-uses-libgpg-error.patch | 16 -----------
.../gnupg/{gnupg_2.1.20.bb => gnupg_2.1.23.bb} | 14 +++++-----
6 files changed, 88 insertions(+), 41 deletions(-)
rename meta/recipes-support/gnupg/gnupg/{pkgconfig.patch => 0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch} (81%)
rename meta/recipes-support/gnupg/gnupg/{use-pkgconfig-instead-of-npth-config.patch => 0002-use-pkgconfig-instead-of-npth-config.patch} (81%)
create mode 100644 meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch
rename meta/recipes-support/gnupg/gnupg/{autogen.sh-fix-find-version-for-beta-checking.patch => 0004-autogen.sh-fix-find-version-for-beta-checking.patch} (58%)
delete mode 100644 meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch
rename meta/recipes-support/gnupg/{gnupg_2.1.20.bb => gnupg_2.1.23.bb} (69%)
diff --git a/meta/recipes-support/gnupg/gnupg/pkgconfig.patch b/meta/recipes-support/gnupg/gnupg/0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch
similarity index 81%
rename from meta/recipes-support/gnupg/gnupg/pkgconfig.patch
rename to meta/recipes-support/gnupg/gnupg/0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch
index f958603..5c9c022 100644
--- a/meta/recipes-support/gnupg/gnupg/pkgconfig.patch
+++ b/meta/recipes-support/gnupg/gnupg/0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch
@@ -1,15 +1,27 @@
-Use pkg-config to find pth instead of pth-config.
+From 59a3c76d4016ffc615f1c45184f4c6820061d69c Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Wed, 16 Aug 2017 11:14:12 +0800
+Subject: [PATCH 1/4] Use pkg-config to find pth instead of pth-config.
Upstream-Status: Denied
-[not submitted but they've been clear they don't want a pkg-config dependency]
+[not submitted but they've been clear they don't want a pkg-config
+dependency]
RP 2014/5/22
-Index: gnupg-2.1.0/m4/gnupg-pth.m4
-===================================================================
---- gnupg-2.1.0.orig/m4/gnupg-pth.m4
-+++ gnupg-2.1.0/m4/gnupg-pth.m4
-@@ -17,33 +17,9 @@ dnl implied warranty of MERCHANTABILITY
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+Rebase to 2.1.23
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ m4/gnupg-pth.m4 | 53 ++++++++---------------------------------------------
+ 1 file changed, 8 insertions(+), 45 deletions(-)
+
+diff --git a/m4/gnupg-pth.m4 b/m4/gnupg-pth.m4
+index 6dc9e0e..5892531 100644
+--- a/m4/gnupg-pth.m4
++++ b/m4/gnupg-pth.m4
+@@ -17,33 +17,9 @@ dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# Taken and modified from the m4 macros which come with Pth.
AC_DEFUN([GNUPG_PTH_VERSION_CHECK],
[
@@ -88,3 +100,6 @@ Index: gnupg-2.1.0/m4/gnupg-pth.m4
AC_SUBST(PTH_LIBS)
])
-
+--
+1.8.3.1
+
diff --git a/meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch b/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch
similarity index 81%
rename from meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch
rename to meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch
index c6dbf1b..6d86e5c 100644
--- a/meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch
+++ b/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch
@@ -1,12 +1,22 @@
+From 53c2aec2e13f4e2d09be7148869c862f07dfdd4d Mon Sep 17 00:00:00 2001
+From: Saul Wold <sgw@linux.intel.com>
+Date: Wed, 16 Aug 2017 11:16:30 +0800
+Subject: [PATCH 2/4] use pkgconfig instead of npth config
+
Upstream-Status: Inappropriate [openembedded specific]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
+Rebase to 2.1.23
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ m4/npth.m4 | 34 ++++++++--------------------------
+ 1 file changed, 8 insertions(+), 26 deletions(-)
-Index: gnupg-2.1.0/m4/npth.m4
-===================================================================
---- gnupg-2.1.0.orig/m4/npth.m4
-+++ gnupg-2.1.0/m4/npth.m4
+diff --git a/m4/npth.m4 b/m4/npth.m4
+index 17c2644..15a931b 100644
+--- a/m4/npth.m4
++++ b/m4/npth.m4
@@ -17,10 +17,10 @@ AC_DEFUN([_AM_PATH_NPTH_CONFIG],
if test "x$npth_config_prefix" != x ; then
NPTH_CONFIG="$npth_config_prefix/bin/npth-config"
@@ -70,3 +80,6 @@ Index: gnupg-2.1.0/m4/npth.m4
NPTH_CFLAGS=""
NPTH_LIBS=""
ifelse([$3], , :, [$3])
+--
+1.8.3.1
+
diff --git a/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch b/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch
new file mode 100644
index 0000000..3e798ef
--- /dev/null
+++ b/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch
@@ -0,0 +1,32 @@
+From 9c3858ffda6246bf9e1e6aeeb920532a56b19408 Mon Sep 17 00:00:00 2001
+From: Saul Wold <sgw@linux.intel.com>
+Date: Wed, 16 Aug 2017 11:18:01 +0800
+Subject: [PATCH 3/4] dirmngr uses libgpg error
+
+Upstream-Status: Pending
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Rebase to 2.1.23
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ dirmngr/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
+index b404165..d3f916e 100644
+--- a/dirmngr/Makefile.am
++++ b/dirmngr/Makefile.am
+@@ -82,7 +82,8 @@ endif
+ dirmngr_LDADD = $(libcommonpth) \
+ $(DNSLIBS) $(LIBASSUAN_LIBS) \
+ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \
+- $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV)
++ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) \
++ $(GPG_ERROR_LIBS)
+ if USE_LDAP
+ dirmngr_LDADD += $(ldaplibs)
+ endif
+--
+1.8.3.1
+
diff --git a/meta/recipes-support/gnupg/gnupg/autogen.sh-fix-find-version-for-beta-checking.patch b/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch
similarity index 58%
rename from meta/recipes-support/gnupg/gnupg/autogen.sh-fix-find-version-for-beta-checking.patch
rename to meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch
index 4241bc3..dcd8582 100644
--- a/meta/recipes-support/gnupg/gnupg/autogen.sh-fix-find-version-for-beta-checking.patch
+++ b/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch
@@ -1,7 +1,7 @@
-From 717f994be2466d378e6611a4739c606db6d0dc46 Mon Sep 17 00:00:00 2001
+From 914ae4a3f7529fb069467bf0ded57dd24ee2e763 Mon Sep 17 00:00:00 2001
From: Wenzong Fan <wenzong.fan@windriver.com>
-Date: Sun, 25 Oct 2015 22:44:47 -0400
-Subject: [PATCH] autogen.sh: fix find-version for beta checking
+Date: Wed, 16 Aug 2017 11:23:22 +0800
+Subject: [PATCH 4/4] autogen.sh: fix find-version for beta checking
find-version always assumes that gnupg is beta if autogen.sh is run
out of git-repo. This doesn't work for users whom just take release
@@ -10,16 +10,19 @@ tarball and re-run autoconf in their local build dir.
Upstream-Status: Pending
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
+
+Rebase to 2.1.23
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
autogen.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/autogen.sh b/autogen.sh
-index 7effd56..d673432 100755
+index e5ba5bf..05e0e11 100755
--- a/autogen.sh
+++ b/autogen.sh
-@@ -228,7 +228,6 @@ if [ "$myhost" = "find-version" ]; then
- rvd=$((0x$(echo ${rev} | head -c 4)))
+@@ -245,7 +245,6 @@ if [ "$myhost" = "find-version" ]; then
+ rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
else
ingit=no
- beta=yes
@@ -27,5 +30,5 @@ index 7effd56..d673432 100755
rev="0000000"
rvd="0"
--
-1.9.1
+1.8.3.1
diff --git a/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch b/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch
deleted file mode 100644
index 7af1955..0000000
--- a/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Pending
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-Index: gnupg-2.1.0/dirmngr/Makefile.am
-===================================================================
---- gnupg-2.1.0.orig/dirmngr/Makefile.am
-+++ gnupg-2.1.0/dirmngr/Makefile.am
-@@ -78,7 +78,8 @@ endif
- dirmngr_LDADD = $(libcommontlsnpth) $(libcommonpth) \
- $(DNSLIBS) $(LIBASSUAN_LIBS) \
- $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \
-- $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV)
-+ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) \
-+ $(GPG_ERROR_LIBS)
- if USE_LDAP
- dirmngr_LDADD += $(ldaplibs)
- endif
diff --git a/meta/recipes-support/gnupg/gnupg_2.1.20.bb b/meta/recipes-support/gnupg/gnupg_2.1.23.bb
similarity index 69%
rename from meta/recipes-support/gnupg/gnupg_2.1.20.bb
rename to meta/recipes-support/gnupg/gnupg_2.1.23.bb
index e56421f..0fb170d 100644
--- a/meta/recipes-support/gnupg/gnupg_2.1.20.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.1.23.bb
@@ -2,7 +2,7 @@ SUMMARY = "GNU Privacy Guard - encryption and signing tools (2.x)"
HOMEPAGE = "http://www.gnupg.org/"
LICENSE = "GPLv3 & LGPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \
- file://COPYING.LIB;md5=a2b6bf2cb38ee52619e60f30a1fc7257"
+ file://COPYING.LGPL3;md5=a2b6bf2cb38ee52619e60f30a1fc7257"
DEPENDS = "npth libassuan libksba zlib bzip2 readline libgcrypt"
@@ -10,14 +10,14 @@ inherit autotools gettext texinfo pkgconfig
UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
- file://pkgconfig.patch \
- file://use-pkgconfig-instead-of-npth-config.patch \
- file://dirmngr-uses-libgpg-error.patch \
- file://autogen.sh-fix-find-version-for-beta-checking.patch \
+ file://0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch \
+ file://0002-use-pkgconfig-instead-of-npth-config.patch \
+ file://0003-dirmngr-uses-libgpg-error.patch \
+ file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \
"
-SRC_URI[md5sum] = "f6bc7e0b82893dfafe09109d86ff6e9b"
-SRC_URI[sha256sum] = "24cf9a69369be64a9f6f8cc11a1be33ab7780ad77a6a1b93719438f49f69960d"
+SRC_URI[md5sum] = "86c2304ead54b74a422e76c3f1bc7a91"
+SRC_URI[sha256sum] = "a94476391595e9351f219188767a9d6ea128e83be5ed3226a7890f49aa2d0d77"
EXTRA_OECONF = "--disable-ldap \
--disable-ccid-driver \
--
2.8.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 7/8] gpgme: 1.8.0 -> 1.9.0
2017-08-16 8:31 [PATCH 0/8] upgrade 8 recipes Hongxu Jia
` (5 preceding siblings ...)
2017-08-16 8:31 ` [PATCH 6/8] gnupg: 2.1.20 -> 2.1.23 Hongxu Jia
@ 2017-08-16 8:31 ` Hongxu Jia
2017-08-17 7:34 ` Richard Purdie
2017-08-16 8:31 ` [PATCH 8/8] ncurses: 6.0+20161126 -> 6.0+20170715 Hongxu Jia
7 siblings, 1 reply; 16+ messages in thread
From: Hongxu Jia @ 2017-08-16 8:31 UTC (permalink / raw)
To: openembedded-core, ross.burton
Rebase patches:
- pkgconfig.patch -> 0001
- python-lang-config.patch -> 0002
- 0001-Correctly-install-python-modules.patch -> 0003
- python-import.patch -> 0004
- 0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch -> 0005
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
.../{pkgconfig.patch => 0001-pkgconfig.patch} | 16 ++++++++++----
...ython-gpg-error-config-should-not-be-use.patch} | 25 ++++++++++++++++------
...=> 0003-Correctly-install-python-modules.patch} | 22 +++++++++++--------
...ython-import.patch => 0004-python-import.patch} | 15 +++++++++++++
...-skip-all-lib-or-usr-lib-directories-in-.patch} | 6 +++---
.../gpgme/{gpgme_1.8.0.bb => gpgme_1.9.0.bb} | 16 +++++++-------
6 files changed, 70 insertions(+), 30 deletions(-)
rename meta/recipes-support/gpgme/gpgme/{pkgconfig.patch => 0001-pkgconfig.patch} (96%)
rename meta/recipes-support/gpgme/gpgme/{python-lang-config.patch => 0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch} (72%)
rename meta/recipes-support/gpgme/gpgme/{0001-Correctly-install-python-modules.patch => 0003-Correctly-install-python-modules.patch} (52%)
rename meta/recipes-support/gpgme/gpgme/{python-import.patch => 0004-python-import.patch} (66%)
rename meta/recipes-support/gpgme/gpgme/{0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch => 0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch} (85%)
rename meta/recipes-support/gpgme/{gpgme_1.8.0.bb => gpgme_1.9.0.bb} (84%)
diff --git a/meta/recipes-support/gpgme/gpgme/pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
similarity index 96%
rename from meta/recipes-support/gpgme/gpgme/pkgconfig.patch
rename to meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
index 341cabf..14a43ee 100644
--- a/meta/recipes-support/gpgme/gpgme/pkgconfig.patch
+++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
@@ -1,10 +1,18 @@
+From 8ae149035c97d27cd2c624704d1651806c53577e Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Wed, 16 Aug 2017 02:00:08 -0400
+Subject: [PATCH 1/5] pkgconfig
+
Update gpgme to use pkgconfig instead of -config files since its
simpler and less error prone when cross compiling.
Upstream-Status: Denied [Upstream not interested in pkg-config support]
RP 2015/4/17
-Rebase to 1.8.0
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+Rebase to 1.9.0
+
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
configure.ac | 1 +
@@ -17,10 +25,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
create mode 100644 src/gpgme.pc.in
diff --git a/configure.ac b/configure.ac
-index 0a67b48..e402dd3 100644
+index 0dac6ce..6a9e507 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -875,6 +875,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
+@@ -866,6 +866,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
src/versioninfo.rc
src/gpgme.h)
AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
@@ -50,7 +58,7 @@ index ce6f1d4..5f38fee 100644
diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in
new file mode 100644
-index 0000000..980a48e
+index 0000000..074bbf6
--- /dev/null
+++ b/src/gpgme-pthread.pc.in
@@ -0,0 +1,15 @@
diff --git a/meta/recipes-support/gpgme/gpgme/python-lang-config.patch b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
similarity index 72%
rename from meta/recipes-support/gpgme/gpgme/python-lang-config.patch
rename to meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
index 132e426..f1f8c91 100644
--- a/meta/recipes-support/gpgme/gpgme/python-lang-config.patch
+++ b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
@@ -1,4 +1,7 @@
-gpgme/lang/python: gpg-error-config should not be used.
+From fb165c9bd96aca8c9ee3e4509c9b6e35d238ad2e Mon Sep 17 00:00:00 2001
+From: Mark Hatle <mark.hatle@windriver.com>
+Date: Wed, 16 Aug 2017 02:02:47 -0400
+Subject: [PATCH 2/5] gpgme/lang/python: gpg-error-config should not be used.
gpg-error-config was modified by OE to always return an error. So we want
to find an alternative way to retrieve whatever it is we need. It turns
@@ -9,10 +12,17 @@ Upstream-Status: Inappropriate [changes are specific to OE]
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Index: gpgme-1.8.0/lang/python/setup.py.in
-===================================================================
---- gpgme-1.8.0.orig/lang/python/setup.py.in
-+++ gpgme-1.8.0/lang/python/setup.py.in
+Rebase to 1.9.0
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ lang/python/setup.py.in | 15 ++-------------
+ 1 file changed, 2 insertions(+), 13 deletions(-)
+
+diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
+index bf4efa3..7c34487 100755
+--- a/lang/python/setup.py.in
++++ b/lang/python/setup.py.in
@@ -24,7 +24,6 @@ import glob
import subprocess
@@ -35,7 +45,7 @@ Index: gpgme-1.8.0/lang/python/setup.py.in
subprocess.check_call(gpgme_config + ['--version'],
stdout=devnull)
except:
-@@ -81,12 +73,9 @@ if not (major > 1 or (major == 1 and min
+@@ -81,12 +73,9 @@ if not (major > 1 or (major == 1 and minor >= 7)):
if not gpgme_h:
gpgme_h = os.path.join(getconfig("prefix")[0], "include", "gpgme.h")
@@ -50,3 +60,6 @@ Index: gpgme-1.8.0/lang/python/setup.py.in
print("Building python gpg module using {} and {}.".format(gpgme_h, gpg_error_h))
+--
+2.8.1
+
diff --git a/meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch
similarity index 52%
rename from meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch
rename to meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch
index 42655fb..d383311 100644
--- a/meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch
+++ b/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch
@@ -1,26 +1,30 @@
-From 4d714c097e497b63d2e8b22a834c671045e215e9 Mon Sep 17 00:00:00 2001
+From 62332eec752dd790f4dd071dfb0dbe86be377203 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 9 Mar 2017 21:34:55 +0200
-Subject: [PATCH] Correctly install python modules
+Date: Wed, 16 Aug 2017 02:05:34 -0400
+Subject: [PATCH 3/5] Correctly install python modules
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
+Rebase to 1.9.0
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
lang/python/Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
-index e32fd12..5ecf6fb 100644
+index d91ead9..67f7cdc 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
-@@ -102,6 +102,7 @@ install-exec-local:
- for PYTHON in $(PYTHONS); do \
+@@ -106,6 +106,7 @@ install-exec-local:
+ cd python$${VERSION}-gpg ; \
$$PYTHON setup.py install \
--prefix $(DESTDIR)$(prefix) \
-+ --install-lib=$(DESTDIR)${pythondir} \
++ --install-lib=$(DESTDIR)${pythondir} \
--record files.txt \
--verbose ; \
- cat files.txt >> install_files.txt ; \
+ cat files.txt >> ../install_files.txt ; \
--
-2.11.0
+2.8.1
diff --git a/meta/recipes-support/gpgme/gpgme/python-import.patch b/meta/recipes-support/gpgme/gpgme/0004-python-import.patch
similarity index 66%
rename from meta/recipes-support/gpgme/gpgme/python-import.patch
rename to meta/recipes-support/gpgme/gpgme/0004-python-import.patch
index 61b77a1..9307103 100644
--- a/meta/recipes-support/gpgme/gpgme/python-import.patch
+++ b/meta/recipes-support/gpgme/gpgme/0004-python-import.patch
@@ -1,9 +1,21 @@
+From ccbf028eea8815d3b16d6c34b527253a6b108ec3 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Wed, 16 Aug 2017 02:06:45 -0400
+Subject: [PATCH 4/5] python import
+
Don't check for output on stderr to know if an import worked, host inputrc and
sysroot readline can cause warnings on stderr.
Upstream-Status: Backport (from autoconf-archive 883a2abd)
Signed-off-by: Ross Burton <ross.burton@intel.com>
+Rebase to 1.9.0
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ m4/ax_python_devel.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
index b990d5b..318b089 100644
--- a/m4/ax_python_devel.m4
@@ -17,3 +29,6 @@ index b990d5b..318b089 100644
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
+--
+2.8.1
+
diff --git a/meta/recipes-support/gpgme/gpgme/0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch b/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch
similarity index 85%
rename from meta/recipes-support/gpgme/gpgme/0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch
rename to meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch
index 84d55b9..7a6cc7b 100644
--- a/meta/recipes-support/gpgme/gpgme/0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch
+++ b/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch
@@ -1,7 +1,7 @@
-From 8c317f6186bd3a9a1c80b4d1e872b3db95934bb6 Mon Sep 17 00:00:00 2001
+From 064ae4441e2c11329748a18157988f9e953f9752 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 13 Apr 2017 16:40:27 +0300
-Subject: [PATCH] gpgme-config: skip all /lib* or /usr/lib* directories in
+Subject: [PATCH 5/5] gpgme-config: skip all /lib* or /usr/lib* directories in
output
The logic was not working in multilib setups which use other
@@ -27,5 +27,5 @@ index a4d152e..8342865 100644
;;
-L*|-l*)
--
-2.11.0
+2.8.1
diff --git a/meta/recipes-support/gpgme/gpgme_1.8.0.bb b/meta/recipes-support/gpgme/gpgme_1.9.0.bb
similarity index 84%
rename from meta/recipes-support/gpgme/gpgme_1.8.0.bb
rename to meta/recipes-support/gpgme/gpgme_1.9.0.bb
index 4ddf6ed..2518147 100644
--- a/meta/recipes-support/gpgme/gpgme_1.8.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.9.0.bb
@@ -6,20 +6,20 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
LICENSE = "GPLv2+ & LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \
- file://src/gpgme.h.in;endline=23;md5=0f7059665c4b7897f4f4d0cb93aa9f98 \
+ file://src/gpgme.h.in;endline=23;md5=9d157d08a69059344e6f82abd2d25781 \
file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d"
UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
- file://pkgconfig.patch \
- file://python-lang-config.patch \
- file://0001-Correctly-install-python-modules.patch \
- file://python-import.patch \
- file://0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \
+ file://0001-pkgconfig.patch \
+ file://0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch \
+ file://0003-Correctly-install-python-modules.patch \
+ file://0004-python-import.patch \
+ file://0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \
"
-SRC_URI[md5sum] = "722a4153904b9b5dc15485a22d29263b"
-SRC_URI[sha256sum] = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33"
+SRC_URI[md5sum] = "1e00bb8ef04d1d05d5a0f19e143854c3"
+SRC_URI[sha256sum] = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb"
DEPENDS = "libgpg-error libassuan"
RDEPENDS_${PN}-cpp += "libstdc++"
--
2.8.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 8/8] ncurses: 6.0+20161126 -> 6.0+20170715
2017-08-16 8:31 [PATCH 0/8] upgrade 8 recipes Hongxu Jia
` (6 preceding siblings ...)
2017-08-16 8:31 ` [PATCH 7/8] gpgme: 1.8.0 -> 1.9.0 Hongxu Jia
@ 2017-08-16 8:31 ` Hongxu Jia
7 siblings, 0 replies; 16+ messages in thread
From: Hongxu Jia @ 2017-08-16 8:31 UTC (permalink / raw)
To: openembedded-core, ross.burton
Rebase patches:
- tic-hang.patch -> 0001
- configure-reproducible.patch -> 0002
Drop fix-cflags-mangle.patch, which accepted by upstream
...
commit 1b74f120ab7be89011408a6ad0f1c748a314bae8
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sun Feb 26 09:01:34 2017 +0100
Import upstream patch 20170225
20170225
+ fixes for CF_CC_ENV_FLAGS (report by Ross Burton).
...
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
.../files/{tic-hang.patch => 0001-tic-hang.patch} | 26 +++++++++++++++++-----
...ble.patch => 0002-configure-reproducible.patch} | 21 ++++++++++++++---
.../ncurses/files/fix-cflags-mangle.patch | 18 ---------------
...ses_6.0+20161126.bb => ncurses_6.0+20170715.bb} | 7 +++---
4 files changed, 42 insertions(+), 30 deletions(-)
rename meta/recipes-core/ncurses/files/{tic-hang.patch => 0001-tic-hang.patch} (63%)
rename meta/recipes-core/ncurses/files/{configure-reproducible.patch => 0002-configure-reproducible.patch} (50%)
delete mode 100644 meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
rename meta/recipes-core/ncurses/{ncurses_6.0+20161126.bb => ncurses_6.0+20170715.bb} (56%)
diff --git a/meta/recipes-core/ncurses/files/tic-hang.patch b/meta/recipes-core/ncurses/files/0001-tic-hang.patch
similarity index 63%
rename from meta/recipes-core/ncurses/files/tic-hang.patch
rename to meta/recipes-core/ncurses/files/0001-tic-hang.patch
index cba89d2..4a97056 100644
--- a/meta/recipes-core/ncurses/files/tic-hang.patch
+++ b/meta/recipes-core/ncurses/files/0001-tic-hang.patch
@@ -1,13 +1,26 @@
+From a95590f676209832fe0b27226e6de3cb50e2b97c Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Wed, 16 Aug 2017 14:31:51 +0800
+Subject: [PATCH 1/2] tic hang
+
Upstream-Status: Inappropriate [configuration]
'tic' of some linux distributions (e.g. fedora 11) hang in an infinite
loop when processing the original file.
-Index: ncurses-5.7/misc/terminfo.src
-===================================================================
---- ncurses-5.7.orig/misc/terminfo.src
-+++ ncurses-5.7/misc/terminfo.src
-@@ -3706,12 +3706,11 @@ konsole-xf3x|KDE console window with key
+Signed-off-by: anonymous
+
+Rebase to 6.0+20170715
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ misc/terminfo.src | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/misc/terminfo.src b/misc/terminfo.src
+index ee3fab3..176d593 100644
+--- a/misc/terminfo.src
++++ b/misc/terminfo.src
+@@ -5177,12 +5177,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm,
# The value for kbs reflects local customization rather than the settings used
# for XFree86 xterm.
konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,
@@ -25,3 +38,6 @@ Index: ncurses-5.7/misc/terminfo.src
# KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but
# it is still useful for deriving the other entries.
konsole-vt100|KDE console window with vt100 (sic) keyboard,
+--
+1.8.3.1
+
diff --git a/meta/recipes-core/ncurses/files/configure-reproducible.patch b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch
similarity index 50%
rename from meta/recipes-core/ncurses/files/configure-reproducible.patch
rename to meta/recipes-core/ncurses/files/0002-configure-reproducible.patch
index 54a8bdc..c47ce6a 100644
--- a/meta/recipes-core/ncurses/files/configure-reproducible.patch
+++ b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch
@@ -1,15 +1,27 @@
+From 939c994f3756c2d6d3cab2e6a04d05fa7c2b1d56 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Wed, 16 Aug 2017 14:45:27 +0800
+Subject: [PATCH 2/2] configure: reproducible
+
"configure" enforces -U for ar flags, breaking deterministic builds.
The flag was added to fix some vaguely specified "recent POSIX binutil
-build problems" in 2015.
+build problems" in 2015.
Upstream-Status: Pending
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
+Rebase to Rebase to 6.0+20170715
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
diff --git a/configure b/configure
-index 7f31208..aa80911 100755
+index 7d7d2c1..f444354 100755
--- a/configure
+++ b/configure
-@@ -4428,7 +4428,7 @@ if test "${cf_cv_ar_flags+set}" = set; then
+@@ -4458,7 +4458,7 @@ if test "${cf_cv_ar_flags+set}" = set; then
else
cf_cv_ar_flags=unknown
@@ -18,3 +30,6 @@ index 7f31208..aa80911 100755
do
# check if $ARFLAGS already contains this choice
+--
+1.8.3.1
+
diff --git a/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch b/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
deleted file mode 100644
index e9447c5..0000000
--- a/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-configure has a piece of logic to detect users "abusing" CC to hold compiler
-flags (which we do). It also has logic to "correct" this by moving the flags
-from CC to CFLAGS, but the sed only handles a single argument in CC.
-
-Replace the sed with awk to filter out all words that start with a hyphen.
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/configure b/configure
-index 7f31208..1a29cfc 100755
---- a/configure
-+++ b/configure
-@@ -2191,2 +2191,2 @@ echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/C
-- cf_flags=`echo "$CC" | sed -e 's/^.*[ ]\(-[^ ]\)/\1/'`
-- CC=`echo "$CC " | sed -e 's/[ ]-[^ ].*$//' -e 's/[ ]*$//'`
-+ cf_flags=`echo "$CC" | awk 'BEGIN{ORS=" ";RS=" "} /^-.+/ {print $1}'`
-+ CC=`echo "$CC " | awk 'BEGIN{ORS=" ";RS=" "} /^[^-].+/ {print $1}'`
diff --git a/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb b/meta/recipes-core/ncurses/ncurses_6.0+20170715.bb
similarity index 56%
rename from meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
rename to meta/recipes-core/ncurses/ncurses_6.0+20170715.bb
index ace3108..127394c 100644
--- a/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
+++ b/meta/recipes-core/ncurses/ncurses_6.0+20170715.bb
@@ -1,12 +1,11 @@
require ncurses.inc
-SRC_URI += "file://tic-hang.patch \
- file://fix-cflags-mangle.patch \
+SRC_URI += "file://0001-tic-hang.patch \
+ file://0002-configure-reproducible.patch \
file://config.cache \
- file://configure-reproducible.patch \
"
# commit id corresponds to the revision in package version
-SRCREV = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068"
+SRCREV = "52681a6a1a18b4d6eb1a716512d0dd827bd71c87"
S = "${WORKDIR}/git"
EXTRA_OECONF += "--with-abi-version=5"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"
--
2.8.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 7/8] gpgme: 1.8.0 -> 1.9.0
2017-08-16 8:31 ` [PATCH 7/8] gpgme: 1.8.0 -> 1.9.0 Hongxu Jia
@ 2017-08-17 7:34 ` Richard Purdie
2017-08-17 8:35 ` [PATCH] gpgme: remove local m4/python.m4 Hongxu Jia
0 siblings, 1 reply; 16+ messages in thread
From: Richard Purdie @ 2017-08-17 7:34 UTC (permalink / raw)
To: Hongxu Jia, openembedded-core, ross.burton
On Wed, 2017-08-16 at 04:31 -0400, Hongxu Jia wrote:
> Rebase patches:
> - pkgconfig.patch -> 0001
> - python-lang-config.patch -> 0002
> - 0001-Correctly-install-python-modules.patch -> 0003
> - python-import.patch -> 0004
> - 0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch ->
> 0005
Looks like there is some kind of python packaging issue:
https://autobuilder.yoctoproject.org/main/builders/nightly-x32/builds/1185/steps/BuildImages/logs/stdio
Cheers,
Richard
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH] gpgme: remove local m4/python.m4
2017-08-17 7:34 ` Richard Purdie
@ 2017-08-17 8:35 ` Hongxu Jia
2017-08-17 9:23 ` Richard Purdie
0 siblings, 1 reply; 16+ messages in thread
From: Hongxu Jia @ 2017-08-17 8:35 UTC (permalink / raw)
To: openembedded-core, richard.purdie
While multilib, the local m4/python.m4 incorrectly assigned
am_cv_python_pyexecdir and am_cv_python_pythondir which caused
the following error enabled:
...
ERROR: gpgme-1.9.0-r0 do_package: QA Issue: gpgme: Files/directories
were installed but not shipped in any package:
/usr/lib/python3.5/site-packages/gpg-1.9.0-py3.5.egg-info
...
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
meta/recipes-support/gpgme/gpgme_1.9.0.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-support/gpgme/gpgme_1.9.0.bb b/meta/recipes-support/gpgme/gpgme_1.9.0.bb
index 2518147..065c346 100644
--- a/meta/recipes-support/gpgme/gpgme_1.9.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.9.0.bb
@@ -73,4 +73,5 @@ do_configure_prepend () {
# Else these could be used in preference to those in aclocal-copy
rm -f ${S}/m4/gpg-error.m4
rm -f ${S}/m4/libassuan.m4
+ rm -f ${S}/m4/python.m4
}
--
2.8.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH] gpgme: remove local m4/python.m4
2017-08-17 8:35 ` [PATCH] gpgme: remove local m4/python.m4 Hongxu Jia
@ 2017-08-17 9:23 ` Richard Purdie
0 siblings, 0 replies; 16+ messages in thread
From: Richard Purdie @ 2017-08-17 9:23 UTC (permalink / raw)
To: Hongxu Jia, openembedded-core
On Thu, 2017-08-17 at 04:35 -0400, Hongxu Jia wrote:
> While multilib, the local m4/python.m4 incorrectly assigned
> am_cv_python_pyexecdir and am_cv_python_pythondir which caused
> the following error enabled:
> ...
> ERROR: gpgme-1.9.0-r0 do_package: QA Issue: gpgme: Files/directories
> were installed but not shipped in any package:
> /usr/lib/python3.5/site-packages/gpg-1.9.0-py3.5.egg-info
> ...
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
> meta/recipes-support/gpgme/gpgme_1.9.0.bb | 1 +
> 1 file changed, 1 insertion(+)
Thanks for the quick turnaround on this and the other fix, its much
appreciated. I'll include them in the next build and see where we are.
Cheers,
Richard
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/8] bash: 4.3.30 -> 4.4
2017-08-16 8:31 ` [PATCH 2/8] bash: 4.3.30 -> 4.4 Hongxu Jia
@ 2017-08-17 12:54 ` Richard Purdie
0 siblings, 0 replies; 16+ messages in thread
From: Richard Purdie @ 2017-08-17 12:54 UTC (permalink / raw)
To: Hongxu Jia, openembedded-core, ross.burton
On Wed, 2017-08-16 at 04:31 -0400, Hongxu Jia wrote:
> Rebase patches:
> - fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
> - test-output.patch
>
> Drop backported patches:
> - CVE-2016-9401.patch
> - fix-run-intl.patch
>
> Add ${PN}-loadable for loadable builtins which is new features in
> Bash 4.4
>
> The 4.4 fixed CVE-2017-5932 and CVE-2016-0634
> - https://security-tracker.debian.org/tracker/CVE-2017-5932
> - https://security-tracker.debian.org/tracker/CVE-2016-0634
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
There is a multilib issue with one of the headers:
https://autobuilder.yocto.io/builders/nightly-multilib/builds/430
Cheers,
Richard
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 6/8] gnupg: 2.1.20 -> 2.1.23
2017-08-16 8:31 ` [PATCH 6/8] gnupg: 2.1.20 -> 2.1.23 Hongxu Jia
@ 2017-08-18 9:38 ` Richard Purdie
0 siblings, 0 replies; 16+ messages in thread
From: Richard Purdie @ 2017-08-18 9:38 UTC (permalink / raw)
To: Hongxu Jia, openembedded-core, ross.burton
On Wed, 2017-08-16 at 04:31 -0400, Hongxu Jia wrote:
> COPYING.LIB: Rename to COPYING.LGPL3.
> https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=3419a
> 339d9c4e800bf30e9021e05982d8c1021c1
>
> Rebase patches:
> - pkgconfig.patch -> 0001
> - use-pkgconfig-instead-of-npth-config.patch -> 0002
> - dirmngr-uses-libgpg-error.patch -> 0003
> - autogen.sh-fix-find-version-for-beta-checking.patch -> 0004
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Its taken a bit of tracking down but this causes "oe-selftest -r
runtime_test.TestImage.test_testimage_dnf" to fail:
NOTE: Executing RunQueue Tasks
NOTE: Running task 547 of 547 (/media/build1/poky/meta/recipes-extended/images/core-image-full-cmdline.bb:do_testimage)
NOTE: recipe core-image-full-cmdline-1.0-r0: task do_testimage: Started
RESULTS:
RESULTS - dnf.DnfBasicTest.test_dnf_help - Testcase 1735: PASSED
RESULTS - ping.PingTest.test_ping - Testcase 964: PASSED
RESULTS - ssh.SSHTest.test_ssh - Testcase 224: PASSED
RESULTS - dnf_runtime.DnfSelftest.test_verify_package_feeds - Testcase -1: FAILED
SUMMARY:
core-image-full-cmdline () - Ran 4 tests in 23.612s
core-image-full-cmdline - FAIL - Required tests failed
ERROR: core-image-full-cmdline-1.0-r0 do_testimage: core-image-full-cmdline - FAILED - check the task log and the ssh log
ERROR: core-image-full-cmdline-1.0-r0 do_testimage: Function failed: do_testimage
ERROR: Logfile of failure stored in: /media/build1/poky/build/tmp/work/qemux86-poky-linux/core-image-full-cmdline/1.0-r0/temp/log.do_testimage.11134
NOTE: recipe core-image-full-cmdline-1.0-r0: task do_testimage: Failed
ERROR: Task (/media/build1/poky/meta/recipes-extended/images/core-image-full-cmdline.bb:do_testimage) failed with exit code '1'
NOTE: Tasks Summary: Attempted 547 tasks of which 546 didn't need to be rerun and 1 failed.
Summary: 1 task failed:
/media/build1/poky/meta/recipes-extended/images/core-image-full-cmdline.bb:do_testimage
Summary: There were 2 ERROR messages shown, returning a non-zero exit code.
----------------------------------------------------------------------
2017-08-18 09:39:52,189 - oe-selftest - INFO - Ran 1 test in 343.737s
2017-08-18 09:39:52,189 - oe-selftest - INFO - FAILED
2017-08-18 09:39:52,189 - oe-selftest - INFO - (failures=1)
2017-08-18 09:39:52,193 - oe-selftest - INFO - RESULTS:
2017-08-18 09:39:52,193 - oe-selftest - INFO - RESULTS - runtime_test.TestImage.test_testimage_dnf - Testcase 1883: FAILED
2017-08-18 09:39:52,193 - oe-selftest - INFO - SUMMARY:
2017-08-18 09:39:52,193 - oe-selftest - INFO - oe-selftest () - Ran 1 test in 343.742s
2017-08-18 09:39:52,193 - oe-selftest - INFO - oe-selftest - FAIL - Required tests failed
With:
diff --git a/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py b/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py
index 6742e8c..f813c43 100644
--- a/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py
+++ b/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py
@@ -37,7 +37,7 @@ class DnfSelftest(DnfTest):
import re
# Use '-y' for non-interactive mode: automatically import the feed signing key
- output_makecache = self.dnf('-y makecache')
+ output_makecache = self.dnf('-vy makecache')
self.assertTrue(re.match(r".*Failed to synchronize cache", output_makecache, re.DOTALL) is None, msg = "dnf makecache failed to synchronize repo: %s" %(output_makecache))
self.assertTrue(re.match(r".*Metadata cache created", output_makecache, re.DOTALL) is not None, msg = "dnf makecache failed: %s" %(output_makecache))
applied the log shows:
NOTE: Traceback (most recent call last):
File "/media/build1/poky/meta/lib/oeqa/core/decorator/__init__.py", line 32, in wrapped_f
return func(*args, **kwargs)
File "/media/build1/poky/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py", line 41, in test_verify_package_feeds
self.assertTrue(re.match(r".*Failed to synchronize cache", output_makecache, re.DOTALL) is None, msg = "dnf makecache failed to synchronize repo: %s" %(output_makecache))
AssertionError: False is not true : dnf makecache failed to synchronize repo: Unable to detect release version (use '--releasever' to specify release version)
DNF version: 2.6.3
cachedir: /var/cache/dnf
Making cache files for all metadata files.
oe-remote-repo: has expired and will be refreshed.
Cannot download 'http://192.168.7.1:33541': repomd.xml GPG signature verification error: gpgme_engine_check_version() error: Invalid crypto engine.
Failed to synchronize cache for repo 'oe-remote-repo', disabling.
Metadata cache created.
If I revert this upgrade it works again. Seems to be some kind of
gpgme/gnupg version compatibility issue?
Cheers,
Richard
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 0/8] Upgrade 8 recipes
@ 2019-07-02 8:16 Hongxu Jia
0 siblings, 0 replies; 16+ messages in thread
From: Hongxu Jia @ 2019-07-02 8:16 UTC (permalink / raw)
To: raj.khem; +Cc: openembedded-devel
The following changes since commit 64974b8779291419486338f75f229a732e450d78:
xfce4-screensaver: 0.1.4 -> 0.1.5 (2019-06-21 06:22:19 -0700)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib hongxu/upgrade-20190702
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=hongxu/upgrade-20190702
Hongxu Jia (8):
python3-pykickstart: 3.18 -> 3.20
python3-blivet: 3.1.2 -> 3.1.4
python-pyparted/python3-pyparted: 3.11.1 -> 3.11.2
libbytesize: 1.4 -> 2.0
libblockdev: 2.20 -> 2.22
network-manager-applet: 1.8.20 -> 1.8.22
thin-provisioning-tools: 0.7.6 -> 0.8.5
libreport: 2.9.7 -> 2.10.0
..._1.8.20.bb => network-manager-applet_1.8.22.bb} | 6 ++--
.../{libblockdev_2.20.bb => libblockdev_2.22.bb} | 2 +-
.../{libreport_2.9.7.bb => libreport_2.10.0.bb} | 2 +-
.../files/0001-fix-out-of-tree-build-failure.patch | 37 +++++++++++++++++++
.../{libbytesize_1.4.bb => libbytesize_2.0.bb} | 8 ++---
.../0001-fix-compile-failed-with-libc-musl.patch | 42 ----------------------
.../files/use-sh-on-path.patch | 21 ++++++++---
...s_0.7.6.bb => thin-provisioning-tools_0.8.5.bb} | 3 +-
...on3-blivet_3.1.2.bb => python3-blivet_3.1.4.bb} | 2 +-
...ckstart_3.18.bb => python3-pykickstart_3.20.bb} | 2 +-
.../python-pyparted/python-pyparted.inc | 2 +-
...yparted_3.11.1.bb => python-pyparted_3.11.2.bb} | 0
...parted_3.11.1.bb => python3-pyparted_3.11.2.bb} | 0
13 files changed, 67 insertions(+), 60 deletions(-)
rename meta-gnome/recipes-connectivity/network-manager-applet/{network-manager-applet_1.8.20.bb => network-manager-applet_1.8.22.bb} (87%)
rename meta-oe/recipes-extended/libblockdev/{libblockdev_2.20.bb => libblockdev_2.22.bb} (97%)
rename meta-oe/recipes-extended/libreport/{libreport_2.9.7.bb => libreport_2.10.0.bb} (96%)
create mode 100644 meta-oe/recipes-support/libbytesize/files/0001-fix-out-of-tree-build-failure.patch
rename meta-oe/recipes-support/libbytesize/{libbytesize_1.4.bb => libbytesize_2.0.bb} (84%)
delete mode 100644 meta-oe/recipes-support/thin-provisioning-tools/files/0001-fix-compile-failed-with-libc-musl.patch
rename meta-oe/recipes-support/thin-provisioning-tools/{thin-provisioning-tools_0.7.6.bb => thin-provisioning-tools_0.8.5.bb} (84%)
rename meta-python/recipes-extended/python-blivet/{python3-blivet_3.1.2.bb => python3-blivet_3.1.4.bb} (96%)
rename meta-python/recipes-extended/python-pykickstart/{python3-pykickstart_3.18.bb => python3-pykickstart_3.20.bb} (94%)
rename meta-python/recipes-extended/python-pyparted/{python-pyparted_3.11.1.bb => python-pyparted_3.11.2.bb} (100%)
rename meta-python/recipes-extended/python-pyparted/{python3-pyparted_3.11.1.bb => python3-pyparted_3.11.2.bb} (100%)
--
2.7.4
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 0/8] upgrade 8 recipes
@ 2018-07-02 5:57 Hongxu Jia
0 siblings, 0 replies; 16+ messages in thread
From: Hongxu Jia @ 2018-07-02 5:57 UTC (permalink / raw)
To: openembedded-core, ross.burton
Build successfully:
- qemux86-64 + glibc
- qemux86-64 + musl
- qemuarm64 + glibc
- qemuarm64 + musl
//Hongxu
The following changes since commit 6f8f984ba363f764e83290b972ec31a90aad1603:
initrdscripts/init-live.sh: fix mounts w/ spaces fail to move to real rootfs (2018-06-28 23:33:55 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib hongxu/upgrade-20180701
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=hongxu/upgrade-20180701
Hongxu Jia (8):
gnupg: 2.2.5 -> 2.2.8
gpgme: 1.10.0 -> 1.11.1
man-db: 2.8.2 -> 2.8.3
elfutils: 0.170 -> 0.172
man-pages: 4.14 -> 4.16
help2man-native: 1.47.5 -> 1.47.6
libgcrypt: 1.8.2 -> 1.8.3
ncurses: 6.1 -> 6.1+20180630
.../{ncurses_6.1.bb => ncurses_6.1+20180630.bb} | 2 +-
.../{elfutils_0.170.bb => elfutils_0.172.bb} | 22 +-
.../elfutils/files/0001-dso-link-change.patch | 8 +-
...0001-libasm-may-link-with-libbz2-if-found.patch | 12 +-
...-elf_cvt_gunhash-if-dest-and-src-are-same.patch | 4 +-
.../elfutils/files/0003-fixheadercheck.patch | 6 +-
.../0004-Disable-the-test-to-convert-euc-jp.patch | 4 +-
.../files/0005-fix-a-stack-usage-warning.patch | 8 +-
.../files/0006-Fix-build-on-aarch64-musl.patch | 4 +-
...-path-where-we-have-str-as-uninitialized-.patch | 12 +-
...de-alternatives-for-glibc-assumptions-hel.patch | 201 ++++++-------
...ferences-between-mips-machine-identifiers.patch | 4 -
.../{arm_backend.diff => 0001-arm_backend.patch} | 322 +++++++++++----------
.../files/debian/0001-disable_werror.patch | 35 +++
.../files/debian/0001-fix-gcc7-ftbfs.patch | 57 ++++
.../{hppa_backend.diff => 0001-hppa_backend.patch} | 170 ++++++-----
...{mips_backend.patch => 0001-mips_backend.patch} | 31 +-
...s_readelf_w.patch => 0001-mips_readelf_w.patch} | 24 +-
.../debian/0001-testsuite-ignore-elflint.patch | 57 ++++
...-support-for-mips64-abis-in-mips_retval.c.patch | 3 -
.../0003-Add-mips-n64-relocation-format-hack.patch | 5 +-
.../elfutils/files/debian/hurd_path.patch | 14 +
.../elfutils/files/debian/ignore_strmerge.diff | 11 +
.../elfutils/files/debian/kfreebsd_path.patch | 17 ++
...-native_1.47.5.bb => help2man-native_1.47.6.bb} | 4 +-
.../man-db/{man-db_2.8.2.bb => man-db_2.8.3.bb} | 4 +-
.../{man-pages_4.14.bb => man-pages_4.16.bb} | 4 +-
.../gnupg/{gnupg_2.2.5.bb => gnupg_2.2.8.bb} | 4 +-
.../gpgme/gpgme/0001-pkgconfig.patch | 18 +-
...python-gpg-error-config-should-not-be-use.patch | 10 +-
.../0003-Correctly-install-python-modules.patch | 6 +-
.../gpgme/gpgme/0004-python-import.patch | 6 +-
...g-skip-all-lib-or-usr-lib-directories-in-.patch | 6 +-
.../gpgme/gpgme/0006-fix-build-path-issue.patch | 6 +-
.../0007-qt-python-Add-variables-to-tests.patch | 12 +-
.../gpgme/{gpgme_1.10.0.bb => gpgme_1.11.1.bb} | 6 +-
.../{libgcrypt_1.8.2.bb => libgcrypt_1.8.3.bb} | 4 +-
37 files changed, 675 insertions(+), 448 deletions(-)
rename meta/recipes-core/ncurses/{ncurses_6.1.bb => ncurses_6.1+20180630.bb} (86%)
rename meta/recipes-devtools/elfutils/{elfutils_0.170.bb => elfutils_0.172.bb} (79%)
rename meta/recipes-devtools/elfutils/files/debian/{arm_backend.diff => 0001-arm_backend.patch} (87%)
create mode 100644 meta/recipes-devtools/elfutils/files/debian/0001-disable_werror.patch
create mode 100644 meta/recipes-devtools/elfutils/files/debian/0001-fix-gcc7-ftbfs.patch
rename meta/recipes-devtools/elfutils/files/debian/{hppa_backend.diff => 0001-hppa_backend.patch} (89%)
rename meta/recipes-devtools/elfutils/files/debian/{mips_backend.patch => 0001-mips_backend.patch} (97%)
rename meta/recipes-devtools/elfutils/files/debian/{mips_readelf_w.patch => 0001-mips_readelf_w.patch} (48%)
create mode 100644 meta/recipes-devtools/elfutils/files/debian/0001-testsuite-ignore-elflint.patch
create mode 100644 meta/recipes-devtools/elfutils/files/debian/hurd_path.patch
create mode 100644 meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff
create mode 100644 meta/recipes-devtools/elfutils/files/debian/kfreebsd_path.patch
rename meta/recipes-devtools/help2man/{help2man-native_1.47.5.bb => help2man-native_1.47.6.bb} (79%)
rename meta/recipes-extended/man-db/{man-db_2.8.2.bb => man-db_2.8.3.bb} (90%)
rename meta/recipes-extended/man-pages/{man-pages_4.14.bb => man-pages_4.16.bb} (87%)
rename meta/recipes-support/gnupg/{gnupg_2.2.5.bb => gnupg_2.2.8.bb} (92%)
rename meta/recipes-support/gpgme/{gpgme_1.10.0.bb => gpgme_1.11.1.bb} (93%)
rename meta/recipes-support/libgcrypt/{libgcrypt_1.8.2.bb => libgcrypt_1.8.3.bb} (92%)
--
2.7.4
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2019-07-02 8:18 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-16 8:31 [PATCH 0/8] upgrade 8 recipes Hongxu Jia
2017-08-16 8:31 ` [PATCH 1/8] apr-util: 1.5.4 -> 1.6.0 Hongxu Jia
2017-08-16 8:31 ` [PATCH 2/8] bash: 4.3.30 -> 4.4 Hongxu Jia
2017-08-17 12:54 ` Richard Purdie
2017-08-16 8:31 ` [PATCH 3/8] dhcp: 4.3.5 -> 4.3.6 Hongxu Jia
2017-08-16 8:31 ` [PATCH 4/8] elfutils: 0.168 -> 0.170 Hongxu Jia
2017-08-16 8:31 ` [PATCH 5/8] libgcrypt: 1.7.8 -> 1.8.0 Hongxu Jia
2017-08-16 8:31 ` [PATCH 6/8] gnupg: 2.1.20 -> 2.1.23 Hongxu Jia
2017-08-18 9:38 ` Richard Purdie
2017-08-16 8:31 ` [PATCH 7/8] gpgme: 1.8.0 -> 1.9.0 Hongxu Jia
2017-08-17 7:34 ` Richard Purdie
2017-08-17 8:35 ` [PATCH] gpgme: remove local m4/python.m4 Hongxu Jia
2017-08-17 9:23 ` Richard Purdie
2017-08-16 8:31 ` [PATCH 8/8] ncurses: 6.0+20161126 -> 6.0+20170715 Hongxu Jia
2018-07-02 5:57 [PATCH 0/8] upgrade 8 recipes Hongxu Jia
2019-07-02 8:16 [PATCH 0/8] Upgrade " Hongxu Jia
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.