dnf: upgrade 4.2.21 -> 4.2.23
PATCH 1/30 dnf: upgrade 4.2.21 -> 4.2.23
---
meta/recipes-devtools/dnf/{dnf_4.2.21.bb => dnf_4.2.23.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/dnf/{dnf_4.2.21.bb => dnf_4.2.23.bb} (98%)meta/recipes-devtools/dnf/dnf_4.2.23.bb renamed from meta/recipes-devtools/dnf/dnf_4.2.21.bb +1 -1
@@ -17,7 +17,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \ file://0001-dnf-write-the-log-lock-to-root.patch \ " -SRCREV = "864c381baabf024c299dca75abfda96139b8f583" +SRCREV = "126d861812f827285960592359615ed7cb195aac" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git"
Signature · 1 line
2.27.0
PATCH 2/30 meson: upgrade 0.54.2 -> 0.54.3
---
meta/recipes-devtools/meson/meson.inc | 3 +-
.../0001-Make-CPU-family-warnings-fatal.patch | 2 +-
...sort-shared-before-static-fixes-7171.patch | 35 -------------------
...pport-building-allarch-recipes-again.patch | 2 +-
.../{meson_0.54.2.bb => meson_0.54.3.bb} | 0
...on_0.54.2.bb => nativesdk-meson_0.54.3.bb} | 0
6 files changed, 3 insertions(+), 39 deletions(-)
delete mode 100644 meta/recipes-devtools/meson/meson/0001-boost-Always-sort-shared-before-static-fixes-7171.patch
rename meta/recipes-devtools/meson/{meson_0.54.2.bb => meson_0.54.3.bb} (100%)
rename meta/recipes-devtools/meson/{nativesdk-meson_0.54.2.bb => nativesdk-meson_0.54.3.bb} (100%)meta/recipes-devtools/meson/meson.inc +1 -2
@@ -15,9 +15,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://cross-prop-default.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \ - file://0001-boost-Always-sort-shared-before-static-fixes-7171.patch \ " -SRC_URI[sha256sum] = "a7716eeae8f8dff002e4147642589ab6496ff839e4376a5aed761f83c1fa0455" +SRC_URI[sha256sum] = "f2bdf4cf0694e696b48261cdd14380fb1d0fe33d24744d8b2df0c12f33ebb662" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +1 -1
@@ -1,4 +1,4 @@ -From 830db2c7a136b2446d740c9ca025374352ffd16d Mon Sep 17 00:00:00 2001 +From 62c415eedb62905de76e2e0bbd156a947705cab2 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal
meta/recipes-devtools/meson/meson/0001-boost-Always-sort-shared-before-static-fixes-7171.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 5862ad6965c60caa861dfdcd29e499c34c4d00da Mon Sep 17 00:00:00 2001 -From: Daniel Mensinger <[email protected]> -Date: Thu, 21 May 2020 13:35:27 +0200 -Subject: [PATCH] boost: Always sort shared before static (fixes #7171) - -Upstream-Status: Backport [https://github.com/mesonbuild/meson/commit/5862ad6965c60caa861dfdcd29e499c34c4d00da] - -Signed-off-by: Andrew Geissler <[email protected]> ---- - mesonbuild/dependencies/boost.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py -index 6e85c534..38497041 100644 ---- a/mesonbuild/dependencies/boost.py -+++ b/mesonbuild/dependencies/boost.py -@@ -189,13 +189,13 @@ class BoostLibraryFile(): - def __lt__(self, other: T.Any) -> bool: - if isinstance(other, BoostLibraryFile): - return ( -- self.mod_name, self.version_lib, self.arch, self.static, -+ self.mod_name, self.static, self.version_lib, self.arch, - not self.mt, not self.runtime_static, - not self.debug, self.runtime_debug, self.python_debug, - self.stlport, self.deprecated_iostreams, - self.name, - ) < ( -- other.mod_name, other.version_lib, other.arch, other.static, -+ other.mod_name, other.static, other.version_lib, other.arch, - not other.mt, not other.runtime_static, - not other.debug, other.runtime_debug, other.python_debug, - other.stlport, other.deprecated_iostreams, --- -2.26.2 -
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +1 -1
@@ -1,4 +1,4 @@ -From 45df8f0a71c6b60cb98a336f8690af04965dfa9b Mon Sep 17 00:00:00 2001 +From d976d5a8abd6d42edf794d2a4c211fc6697fb14c Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt <[email protected]> Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again
meta/recipes-devtools/meson/meson_0.54.3.bb renamed from meta/recipes-devtools/meson/meson_0.54.2.bb +0 -0
meta/recipes-devtools/meson/nativesdk-meson_0.54.3.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.54.2.bb +0 -0
Signature · 1 line
2.27.0
PATCH 3/30 libdnf: update 0.47.0 -> 0.48.0
In reply to Alexander Kanavin---
.../libdnf/0001-Add-WITH_TESTS-option.patch | 10 +++---
...s-around-string-literals-used-in-SQL.patch | 36 -------------------
.../{libdnf_0.47.0.bb => libdnf_0.48.0.bb} | 3 +-
3 files changed, 6 insertions(+), 43 deletions(-)
delete mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-Use-single-quotes-around-string-literals-used-in-SQL.patch
rename meta/recipes-devtools/libdnf/{libdnf_0.47.0.bb => libdnf_0.48.0.bb} (91%)meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch +5 -5
@@ -1,4 +1,4 @@ -From 56fa2bbdbd29377a6ef0d0b7aadbac8b5ea8c95b Mon Sep 17 00:00:00 2001 +From 7d60d62b5c5374156703ca7262fb2f85ec5db119 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 6 Nov 2018 13:54:43 +0100 Subject: [PATCH] Add WITH_TESTS option
@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 2 files changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 881152a..965c992 100644 +index 9c6e1b2f..8599c540 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,7 @@ option(WITH_MAN "Enables hawkey man page generation" ON)
@@ -24,8 +24,8 @@ index 881152a..965c992 100644 +option(WITH_TESTS "Enables unit tests" ON) - # load pkg-config first; it's required by other modules -@@ -165,8 +166,10 @@ endif() + # build options - debugging +@@ -179,8 +180,10 @@ endif() # build tests
@@ -37,7 +37,7 @@ index 881152a..965c992 100644 add_subdirectory(python/hawkey) endif() diff --git a/python/hawkey/CMakeLists.txt b/python/hawkey/CMakeLists.txt -index d964534..84d1720 100644 +index d9645346..84d17204 100644 --- a/python/hawkey/CMakeLists.txt +++ b/python/hawkey/CMakeLists.txt @@ -50,4 +50,6 @@ target_link_libraries(_hawkeymodule ${PYTHON_LIBRARY})
meta/recipes-devtools/libdnf/libdnf/0001-Use-single-quotes-around-string-literals-used-in-SQL.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 96ca7d0049461df2293dd0000edcbc69b64255e0 Mon Sep 17 00:00:00 2001 -From: Peter Kjellerstedt <[email protected]> -Date: Sun, 3 May 2020 22:40:39 +0200 -Subject: [PATCH] Use single-quotes around string literals used in SQL - statements - -If sqlite is built with -DSQLITE_DQS=0 in accordance with -https://sqlite.org/quirks.html#dblquote, migration to version 1.2 of the -history database would fail with: - - History database cannot be created: /var/lib/dnf/history.sqlite. - Error: SQLite error on ":memory:": Executing an SQL statement failed: - no such column: 1.2 - -Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/951] -Signed-off-by: Peter Kjellerstedt <[email protected]> ---- - libdnf/transaction/sql/migrate_tables_1_2.sql | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libdnf/transaction/sql/migrate_tables_1_2.sql b/libdnf/transaction/sql/migrate_tables_1_2.sql -index 49b75315..f80ad1c4 100644 ---- a/libdnf/transaction/sql/migrate_tables_1_2.sql -+++ b/libdnf/transaction/sql/migrate_tables_1_2.sql -@@ -1,9 +1,9 @@ - R"**( - BEGIN TRANSACTION; - ALTER TABLE trans -- ADD comment TEXT DEFAULT ""; -+ ADD comment TEXT DEFAULT ''; - UPDATE config -- SET value = "1.2" -+ SET value = '1.2' - WHERE key = 'version'; - COMMIT; - )**"
meta/recipes-devtools/libdnf/libdnf_0.48.0.bb renamed from meta/recipes-devtools/libdnf/libdnf_0.47.0.bb +1 -2
@@ -8,10 +8,9 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \ file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ file://0001-Add-WITH_TESTS-option.patch \ file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \ - file://0001-Use-single-quotes-around-string-literals-used-in-SQL.patch \ " -SRCREV = "8330eea6985c4e4b53796f858de5b6b38b1ddf5c" +SRCREV = "46a28d0cf09277fffc11392e5e362a2eda0d53a8" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git"
Signature · 1 line
2.27.0
PATCH 4/30 ffmpeg: disable altivec on ppc by default
In reply to Alexander KanavinSince 4.3 ffmpeg uses vsx-specific instructions, which aren't available on older ppc machines (including qemuppc):
https://github.com/FFmpeg/FFmpeg/commit/3a557c5d88b7b15b5954ba2743febb055549b536
This disables using the instructions with an option to re-enable them for vsx-capable targets.
--- meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-multimedia/ffmpeg/ffmpeg_4.3.bb +1 -0
@@ -57,6 +57,7 @@ PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample" # features to support PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" +PACKAGECONFIG[altivec] = "--enable-altivec,--disable-altivec," PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2" PACKAGECONFIG[fdk-aac] = "--enable-libfdk-aac --enable-nonfree,--disable-libfdk-aac,fdk-aac" PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl"
Signature · 1 line
2.27.0
PATCH 5/30 dropbear: update 2019.78 -> 2020.79
In reply to Alexander KanavinRefresh dropbear-disable-weak-ciphers.patch as some weak items have been dropped upstream.
License-Update: curve25519 changed to public domain
--- meta/recipes-core/dropbear/dropbear.inc | 2 +- .../dropbear-disable-weak-ciphers.patch | 39 +++++++------------ .../recipes-core/dropbear/dropbear_2019.78.bb | 4 -- .../recipes-core/dropbear/dropbear_2020.79.bb | 3 ++ 4 files changed, 19 insertions(+), 29 deletions(-) delete mode 100644 meta/recipes-core/dropbear/dropbear_2019.78.bb create mode 100644 meta/recipes-core/dropbear/dropbear_2020.79.bb
meta/recipes-core/dropbear/dropbear.inc +1 -1
@@ -5,7 +5,7 @@ SECTION = "console/network" # some files are from other projects and have others license terms: # public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a5ec40cafba26fc4396d0b550f824e01" +LIC_FILES_CHKSUM = "file://LICENSE;md5=da58928b5d844c6667963cb5a109272d" DEPENDS = "zlib virtual/crypt" RPROVIDES_${PN} = "ssh sshd"
meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch +15 -24
@@ -1,33 +1,24 @@ -This feature disables all CBC, SHA1, and diffie-hellman group1 ciphers +From c347ece05a7fdbf50d76cb136b9ed45caed333f6 Mon Sep 17 00:00:00 2001 +From: Joseph Reynolds <[email protected]> +Date: Thu, 20 Jun 2019 16:29:15 -0500 +Subject: [PATCH] dropbear: new feature: disable-weak-ciphers + +This feature disables all CBC, SHA1, and diffie-hellman group1 ciphers in the dropbear ssh server and client since they're considered weak ciphers and we want to support the stong algorithms. Upstream-Status: Inappropriate [configuration] Signed-off-by: Joseph Reynolds <[email protected]> -Index: dropbear-2019.78/default_options.h -=================================================================== ---- dropbear-2019.78.orig/default_options.h -+++ dropbear-2019.78/default_options.h -@@ -91,7 +91,7 @@ IMPORTANT: Some options will require "ma - - /* Enable CBC mode for ciphers. This has security issues though - * is the most compatible with older SSH implementations */ --#define DROPBEAR_ENABLE_CBC_MODE 1 -+#define DROPBEAR_ENABLE_CBC_MODE 0 - - /* Enable "Counter Mode" for ciphers. This is more secure than - * CBC mode against certain attacks. It is recommended for security -@@ -101,7 +101,7 @@ IMPORTANT: Some options will require "ma - /* Message integrity. sha2-256 is recommended as a default, - sha1 for compatibility */ - #define DROPBEAR_SHA1_HMAC 1 --#define DROPBEAR_SHA1_96_HMAC 1 -+#define DROPBEAR_SHA1_96_HMAC 0 - #define DROPBEAR_SHA2_256_HMAC 1 - - /* Hostkey/public key algorithms - at least one required, these are used -@@ -149,12 +149,12 @@ IMPORTANT: Some options will require "ma +--- + default_options.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/default_options.h b/default_options.h +index 1aa2297..7ff1394 100644 +--- a/default_options.h ++++ b/default_options.h +@@ -163,12 +163,12 @@ IMPORTANT: Some options will require "make clean" after changes */ * Small systems should generally include either curve25519 or ecdh for performance. * curve25519 is less widely supported but is faster */
meta/recipes-core/dropbear/dropbear_2019.78.bb deleted +0 -4
@@ -1,4 +0,0 @@ -require dropbear.inc - -SRC_URI[md5sum] = "a972c85ed678ad0fdcb7844e1294fb54" -SRC_URI[sha256sum] = "525965971272270995364a0eb01f35180d793182e63dd0b0c3eb0292291644a4"
meta/recipes-core/dropbear/dropbear_2020.79.bb new file +3 -0
@@ -0,0 +1,3 @@ +require dropbear.inc + +SRC_URI[sha256sum] = "084f00546b1610a3422a0773e2c04cbe1a220d984209e033b548b49f379cc441"
Signature · 1 line
2.27.0
PATCH 6/30 elfutils: upgrade 0.179 -> 0.180
In reply to Alexander KanavinDrop all the debian patches: they are very invasive, the use case is unclear, and rebasing them is just too hard.
Refresh 0002-musl-libs.patch
Add a new musl fix: 0015-config-eu.am-do-not-use-Werror.patch
Add a reproducibility fix: 0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch
---
.../{elfutils_0.179.bb => elfutils_0.180.bb} | 19 +-
.../files/0001-musl-obstack-fts.patch | 11 +-
...m-compile-test_nlist-with-standard-C.patch | 27 +
.../elfutils/files/0002-musl-libs.patch | 17 +-
.../elfutils/files/0003-musl-utils.patch | 7 +-
.../files/0004-Fix-error-on-musl.patch | 7 +-
.../0015-config-eu.am-do-not-use-Werror.patch | 36 +
...ces-between-mips-machine-identifiers.patch | 34 -
...-compile-failure-with-debian-patches.patch | 48 -
...ort-for-mips64-abis-in-mips_retval.c.patch | 171 ----
...-Add-mips-n64-relocation-format-hack.patch | 229 -----
.../elfutils/files/debian/arm_backend.diff | 624 -------------
.../files/debian/disable_werror.patch | 20 -
.../elfutils/files/debian/hppa_backend.diff | 828 ------------------
.../elfutils/files/debian/hurd_path.patch | 17 -
.../files/debian/ignore_strmerge.diff | 14 -
.../elfutils/files/debian/kfreebsd_path.patch | 20 -
.../elfutils/files/debian/mips_backend.diff | 724 ---------------
.../elfutils/files/debian/mips_cfi.patch | 129 ---
.../files/debian/mips_readelf_w.patch | 31 -
.../debian/testsuite-ignore-elflint.diff | 52 --
21 files changed, 81 insertions(+), 2984 deletions(-)
rename meta/recipes-devtools/elfutils/{elfutils_0.179.bb => elfutils_0.180.bb} (86%)
create mode 100644 meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch
create mode 100644 meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
delete mode 100644 meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch
delete mode 100644 meta/recipes-devtools/elfutils/files/debian/0001-fix-compile-failure-with-debian-patches.patch
delete mode 100644 meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch
delete mode 100644 meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch
delete mode 100644 meta/recipes-devtools/elfutils/files/debian/arm_backend.diff
delete mode 100644 meta/recipes-devtools/elfutils/files/debian/disable_werror.patch
delete mode 100644 meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff
delete mode 100644 meta/recipes-devtools/elfutils/files/debian/hurd_path.patch
delete mode 100644 meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff
delete mode 100644 meta/recipes-devtools/elfutils/files/debian/kfreebsd_path.patch
delete mode 100644 meta/recipes-devtools/elfutils/files/debian/mips_backend.diff
delete mode 100644 meta/recipes-devtools/elfutils/files/debian/mips_cfi.patch
delete mode 100644 meta/recipes-devtools/elfutils/files/debian/mips_readelf_w.patch
delete mode 100644 meta/recipes-devtools/elfutils/files/debian/testsuite-ignore-elflint.diffmeta/recipes-devtools/elfutils/elfutils_0.180.bb renamed from meta/recipes-devtools/elfutils/elfutils_0.179.bb +3 -16
@@ -15,33 +15,20 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://0006-Fix-build-on-aarch64-musl.patch \ file://0001-libasm-may-link-with-libbz2-if-found.patch \ file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ - file://debian/hppa_backend.diff \ - file://debian/arm_backend.diff \ - file://debian/mips_backend.diff \ - 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 \ - file://debian/disable_werror.patch \ - file://debian/testsuite-ignore-elflint.diff \ - file://debian/mips_cfi.patch \ - file://debian/0001-fix-compile-failure-with-debian-patches.patch \ file://0001-skip-the-test-when-gcc-not-deployed.patch \ file://0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch \ file://run-ptest \ file://ptest.patch \ + file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ " SRC_URI_append_libc-musl = " \ file://0001-musl-obstack-fts.patch \ file://0002-musl-libs.patch \ file://0003-musl-utils.patch \ file://0004-Fix-error-on-musl.patch \ + file://0015-config-eu.am-do-not-use-Werror.patch \ " -SRC_URI[md5sum] = "8ee56b371b5a7ea081284c44e5164600" -SRC_URI[sha256sum] = "25a545566cbacaa37ae6222e58f1c48ea4570f53ba991886e2f5ce96e22a23a2" +SRC_URI[sha256sum] = "b827b6e35c59d188ba97d7cf148fa8dc6f5c68eb6c5981888dfdbb758c0b569d" inherit autotools gettext ptest pkgconfig
meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch +4 -7
@@ -1,7 +1,7 @@ -From 8ccf3d92b8766b53f203df7e01b489604ef851f3 Mon Sep 17 00:00:00 2001 +From 1ec7b2208803e0fbdcbe6c07b849e7dc4d9fa8a2 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Fri, 23 Aug 2019 10:17:25 +0800 -Subject: [PATCH 1/4] musl-obstack-fts +Subject: [PATCH] musl-obstack-fts Look for libfts and libobstack during configure, these libraries are external to libc when using musl, whereas
@@ -20,10 +20,10 @@ Signed-off-by: Hongxu Jia <[email protected]> 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index cad7b2b..6d4229b 100644 +index e9649c2..03643c8 100644 --- a/configure.ac +++ b/configure.ac -@@ -529,6 +529,60 @@ else +@@ -538,6 +538,60 @@ else fi AC_SUBST([argp_LDADD])
@@ -122,6 +122,3 @@ index 13d9bda..d5a4f7d 100644 unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(demanglelib) elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) --- -2.17.1 -
meta/recipes-devtools/elfutils/files/0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch new file +27 -0
@@ -0,0 +1,27 @@ +From 1ca86294ee5454592c9ad855e13080509d8a92d3 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Tue, 23 Jun 2020 07:49:35 +0000 +Subject: [PATCH] tests/Makefile.am: compile test_nlist with standard CFLAGS + +Otherwise, it will contain build paths in it and wont +be reproducible. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + tests/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 8048b69..d2b28a4 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -86,7 +86,7 @@ backtrace-child-biarch$(EXEEXT): backtrace-child.c + test-nlist$(EXEEXT): test-nlist.c + $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(test_nlist_CFLAGS) $(test_nlist_LDADD) -o $@ $< ++ $(CFLAGS) $(test_nlist_LDADD) -o $@ $< + + TESTS = run-arextract.sh run-arsymtest.sh run-ar.sh newfile test-nlist \ + update1 update2 update3 update4 \
meta/recipes-devtools/elfutils/files/0002-musl-libs.patch +7 -10
@@ -1,7 +1,7 @@ -From ea908c7009de5a208383abf4bec4c6b3d9519ca3 Mon Sep 17 00:00:00 2001 +From 9a57efb0f826a70ae360aa55504ee2de656b92b6 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Fri, 23 Aug 2019 10:18:47 +0800 -Subject: [PATCH 2/4] musl-libs +Subject: [PATCH] musl-libs Collection of fixes needed to compile libelf and other libraries provided by elfutils for musl targets
@@ -104,7 +104,7 @@ index 7bcf61c..11dcc8b 100644 return elf_errmsg (error & 0xffff); case OTHER_ERROR (LIBDW): diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c -index d46ab5a..1c3faee 100644 +index 0434f1e..5afaee8 100644 --- a/libdwfl/linux-kernel-modules.c +++ b/libdwfl/linux-kernel-modules.c @@ -50,6 +50,7 @@
@@ -116,7 +116,7 @@ index d46ab5a..1c3faee 100644 /* If fts.h is included before config.h, its indirect inclusions may not give us the right LFS aliases of these functions, so map them manually. */ diff --git a/libelf/elf.h b/libelf/elf.h -index bed273d..be228e6 100644 +index 197b557..8e5b94c 100644 --- a/libelf/elf.h +++ b/libelf/elf.h @@ -21,7 +21,9 @@
@@ -130,9 +130,9 @@ index bed273d..be228e6 100644 /* Standard ELF types. */ -@@ -4029,6 +4031,7 @@ enum - #define R_NDS32_TLS_TPOFF 102 - #define R_NDS32_TLS_DESC 119 +@@ -4103,6 +4105,7 @@ enum + #define R_ARC_TLS_LE_S9 0x4a + #define R_ARC_TLS_LE_32 0x4b -__END_DECLS -
@@ -140,6 +140,3 @@ index bed273d..be228e6 100644 +} +#endif #endif /* elf.h */ --- -2.17.1 -
meta/recipes-devtools/elfutils/files/0003-musl-utils.patch +2 -5
@@ -1,7 +1,7 @@ -From 94028b16e56c8eef1aa02dcc4da268a0e471b4ea Mon Sep 17 00:00:00 2001 +From 6923400b777d4ba6f040c4006413bf997326460f Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Fri, 23 Aug 2019 10:19:48 +0800 -Subject: [PATCH 3/4] musl-utils +Subject: [PATCH] musl-utils Provide missing defines which otherwise are available on glibc system headers
@@ -161,6 +161,3 @@ index 9b8c09a..1fb5063 100644 /* Name and version of program. */ ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; --- -2.17.1 -
meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch +2 -5
@@ -1,7 +1,7 @@ -From 7ff8cbecde7455b530fa7894a78d2326799f2556 Mon Sep 17 00:00:00 2001 +From 48b769ab692c8f02c1ae467229fe3404f662098a Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Wed, 1 May 2019 22:15:03 +0100 -Subject: [PATCH 4/4] Fix error on musl: +Subject: [PATCH] Fix error on musl: | ../../elfutils-0.176/tests/elfstrmerge.c: In function 'main': | ../../elfutils-0.176/tests/elfstrmerge.c:370:60: error: 'ALLPERMS' undeclared (first use in this function); did you mean 'EPERM'?
@@ -34,6 +34,3 @@ index ba0d68d..1d2447f 100644 /* The original ELF file. */ static int fd = -1; static Elf *elf = NULL; --- -2.17.1 -
meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch new file +36 -0
@@ -0,0 +1,36 @@ +From dce2187dd8f592316357b200ebbe8dbed9ee65cb Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Mon, 22 Jun 2020 21:35:16 +0000 +Subject: [PATCH] config/eu.am: do not use -Werror + +Due to re-definition of error() on musl, gcc starts throwing +errors where none happen with glibc. Since upstream is not +likely to be interested in musl builds, lets just disable +Werror. + +Upstream-Status: Inappropriate [oe core specific] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + config/eu.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/config/eu.am b/config/eu.am +index 6c3c444..3bc0dc9 100644 +--- a/config/eu.am ++++ b/config/eu.am +@@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ + -Wold-style-definition -Wstrict-prototypes -Wtrampolines \ + $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ + $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ +- $(if $($(*F)_no_Werror),,-Werror) \ + $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ + $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ + $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \ +@@ -83,7 +82,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \ + -Wtrampolines \ + $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ + $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ +- $(if $($(*F)_no_Werror),,-Werror) \ + $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ + $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ + $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \
meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 77cb4a53c270d5854d3af24f19547bc3de825233 Mon Sep 17 00:00:00 2001 -From: James Cowgill <[email protected]> -Date: Mon, 5 Jan 2015 15:16:58 +0000 -Subject: [PATCH 1/3] Ignore differences between mips machine identifiers - -Little endian binaries actually use EM_MIPS so you can't tell the endianness -from the elf machine id. Also, the EM_MIPS_RS3_LE machine is dead anyway (the -kernel will not load binaries containing it). - -Signed-off-by: James Cowgill <[email protected]> - -Upstream-Status: Pending [from debian] -Signed-off-by: Hongxu Jia <[email protected]> ---- - backends/mips_init.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -Index: b/backends/mips_init.c -=================================================================== ---- a/backends/mips_init.c -+++ b/backends/mips_init.c -@@ -45,11 +45,7 @@ mips_init (Elf *elf __attribute__ ((unus - return NULL; - - /* We handle it. */ -- if (machine == EM_MIPS) -- eh->name = "MIPS R3000 big-endian"; -- else if (machine == EM_MIPS_RS3_LE) -- eh->name = "MIPS R3000 little-endian"; -- -+ eh->name = "MIPS"; - mips_init_reloc (eh); - HOOK (eh, reloc_simple_type); - HOOK (eh, return_value_location);
meta/recipes-devtools/elfutils/files/debian/0001-fix-compile-failure-with-debian-patches.patch deleted +0 -48
48 lines not on this page · raw message
meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch deleted +0 -171
171 lines not on this page · raw message
meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch deleted +0 -229
229 lines not on this page · raw message
meta/recipes-devtools/elfutils/files/debian/arm_backend.diff deleted +0 -624
624 lines not on this page · raw message
meta/recipes-devtools/elfutils/files/debian/disable_werror.patch deleted +0 -20
@@ -1,20 +0,0 @@ -From: Helmut Grohne <[email protected]> -Subject: disable -Werror as it tends to break with new gcc versions -Bug-Debian: https://bugs.debian.org/886004 -Last-Update: 2018-01-01 - -Upstream-Status: Pending [from debian] -Signed-off-by: Hongxu Jia <[email protected]> - -Index: elfutils-0.176/config/eu.am -=================================================================== ---- elfutils-0.176.orig/config/eu.am -+++ elfutils-0.176/config/eu.am -@@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -W - -Wold-style-definition -Wstrict-prototypes -Wtrampolines \ - $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ - $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ -- $(if $($(*F)_no_Werror),,-Werror) \ - $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ - $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ - $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \
meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff deleted +0 -828
828 lines not on this page · raw message
meta/recipes-devtools/elfutils/files/debian/hurd_path.patch deleted +0 -17
@@ -1,17 +0,0 @@ -Upstream-Status: Pending [from debian] -Signed-off-by: Hongxu Jia <[email protected]> - -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 -
meta/recipes-devtools/elfutils/files/debian/ignore_strmerge.diff deleted +0 -14
@@ -1,14 +0,0 @@ -Upstream-Status: Pending [from debian] -Signed-off-by: Hongxu Jia <[email protected]> - ---- 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
meta/recipes-devtools/elfutils/files/debian/kfreebsd_path.patch deleted +0 -20
@@ -1,20 +0,0 @@ -Upstream-Status: Pending [from debian] -Signed-off-by: Hongxu Jia <[email protected]> - -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 -
meta/recipes-devtools/elfutils/files/debian/mips_backend.diff deleted +0 -724
724 lines not on this page · raw message
meta/recipes-devtools/elfutils/files/debian/mips_cfi.patch deleted +0 -129
72 lines not on this page · raw message
meta/recipes-devtools/elfutils/files/debian/mips_readelf_w.patch deleted +0 -31
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/elfutils/files/debian/testsuite-ignore-elflint.diff deleted +0 -52
52 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.27.0
Part of the diff is not shown here. View the raw message.
PATCH 7/30 gnu-config: update to latest revision
In reply to Alexander Kanavin--- meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/gnu-config/gnu-config_git.bb +2 -2
@@ -8,8 +8,8 @@ DEPENDS_class-native = "hostperl-runtime-native" INHIBIT_DEFAULT_DEPS = "1" -SRCREV = "e78c96e5288993aaea3ec44e5c6ee755c668da79" -PV = "20200515+git${SRCPV}" +SRCREV = "696cd4a4eab1ee9fefbb7e38dbab291d741d0c5a" +PV = "20200621+git${SRCPV}" SRC_URI = "git://git.savannah.gnu.org/config.git \ file://gnu-configize.in"
Signature · 1 line
2.27.0
PATCH 8/30 libgpg-error: update 1.37 -> 1.38
In reply to Alexander KanavinDrop the do_compile_prepend logic as upstream now
handles it correctly.
License-Update: copyright years
--- ...-compiling-into-a-separate-build-dir.patch | 43 ++++++ .../0005-src-gen-lock-obj.sh-add-a-file.patch | 134 ++++++++++++++++++ .../libgpg-error/libgpg-error_1.37.bb | 72 ---------- .../libgpg-error/libgpg-error_1.38.bb | 42 ++++++ 4 files changed, 219 insertions(+), 72 deletions(-) create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/0003-build-Fix-cross-compiling-into-a-separate-build-dir.patch create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/0005-src-gen-lock-obj.sh-add-a-file.patch delete mode 100644 meta/recipes-support/libgpg-error/libgpg-error_1.37.bb create mode 100644 meta/recipes-support/libgpg-error/libgpg-error_1.38.bb
meta/recipes-support/libgpg-error/libgpg-error/0003-build-Fix-cross-compiling-into-a-separate-build-dir.patch new file +43 -0
@@ -0,0 +1,43 @@ +From 6efe006e99a7e739afbf7fe8937445c82630fc8f Mon Sep 17 00:00:00 2001 +From: David Michael <[email protected]> +Date: Mon, 1 Jun 2020 10:24:53 -0400 +Subject: [PATCH] build: Fix cross-compiling into a separate build dir. + +* configure.ac: Create the src directory before writing into it. +* src/Makefile.am (EXTRA_DIST): Add gen-lock-obj.sh. + +-- + +Upstream-Status: Backport +Signed-off-by: David Michael <[email protected]> +Signed-off-by: Alexander Kanavin <[email protected]> +--- + configure.ac | 1 + + src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index def8bba..8c0d845 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -598,6 +598,7 @@ if test x$cross_compiling = xyes; then + case $host in + *-*-linux*) + lock_obj_h_generated=yes ++ mkdir src + LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \ + CC=$CC OBJDUMP=$host_alias-objdump \ + ac_ext=$ac_ext ac_objext=$ac_objext \ +diff --git a/src/Makefile.am b/src/Makefile.am +index 2fb83c0..d773877 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -102,7 +102,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ + gpg-error.vers gpg-error.def.in \ + versioninfo.rc.in gpg-error.w32-manifest.in \ + gpg-error-config-test.sh gpg-error.pc.in \ +- $(lock_obj_pub) ++ gen-lock-obj.sh $(lock_obj_pub) + + BUILT_SOURCES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h \ + code-to-errno.h code-from-errno.h \
meta/recipes-support/libgpg-error/libgpg-error/0005-src-gen-lock-obj.sh-add-a-file.patch new file +134 -0
134 lines not on this page · raw message
meta/recipes-support/libgpg-error/libgpg-error_1.37.bb deleted +0 -72
72 lines not on this page · raw message
meta/recipes-support/libgpg-error/libgpg-error_1.38.bb new file +42 -0
42 lines not on this page · raw message
Signature · 1 line
2.27.0
PATCH 9/30 perl: update 5.30.2 -> 5.32.0
In reply to Alexander Kanavin---
...rl-134117-Close-DATA-in-loc_tools.pl.patch | 30 -
...onment-variable-to-suppress-comments.patch | 30 -
.../perl/files/perl-rdepends.txt | 2493 +----------------
.../perl/{perl_5.30.2.bb => perl_5.32.0.bb} | 12 +-
4 files changed, 25 insertions(+), 2540 deletions(-)
delete mode 100644 meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch
delete mode 100644 meta/recipes-devtools/perl/files/0001-enc2xs-Add-environment-variable-to-suppress-comments.patch
rename meta/recipes-devtools/perl/{perl_5.30.2.bb => perl_5.32.0.bb} (97%)meta/recipes-devtools/perl/files/0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5 Mon Sep 17 00:00:00 2001 -From: Richard Leach <[email protected]> -Date: Sun, 19 May 2019 20:16:41 +0000 -Subject: [PATCH] PATCH: [perl #134117] Close DATA in loc_tools.pl - -This prevents unexpected text and fixes test lib/warnings.t - -Upstream-Status: Backport [a04a75f20f03aa08ce8118b3b0b3f93eb3e997c5] - -Signed-off-by: Matthew Zeng <[email protected]> - ---- - t/loc_tools.pl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/t/loc_tools.pl b/t/loc_tools.pl -index c76e29388a..beebd98d88 100644 ---- a/t/loc_tools.pl -+++ b/t/loc_tools.pl -@@ -421,7 +421,7 @@ sub find_locales ($;$) { - } - - # The rest of the locales are in this file. -- push @Data, <DATA>; -+ push @Data, <DATA>; close DATA; - - foreach my $line (@Data) { - my ($locale_name, $language_codes, $country_codes, $encodings) = --- -2.25.0
meta/recipes-devtools/perl/files/0001-enc2xs-Add-environment-variable-to-suppress-comments.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 31a2c5555f9ef32f35d7d5ce1fd09a010ba5f5c6 Mon Sep 17 00:00:00 2001 -From: Joshua Watt <[email protected]> -Date: Mon, 17 Jun 2019 10:47:15 -0500 -Subject: [PATCH 1/2] enc2xs: Add environment variable to suppress comments - -Comment generation in enc2xs can now be suppressed by setting the -ENC2XS_NO_COMMENTS environment variable. This allows enc2xs to produce -reproducible output by omitting the name of the generating program. - -Signed-off-by: Joshua Watt <[email protected]> -Upstream-Status: Backport [https://github.com/dankogai/p5-encode/pull/145] ---- - cpan/Encode/bin/enc2xs | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs -index 619b64b757..bfce9ee735 100644 ---- a/cpan/Encode/bin/enc2xs -+++ b/cpan/Encode/bin/enc2xs -@@ -144,6 +144,7 @@ getopts('CM:SQqOo:f:n:v',\%opt); - $opt{M} and make_makefile_pl($opt{M}, @ARGV); - $opt{C} and make_configlocal_pm($opt{C}, @ARGV); - $opt{v} ||= $ENV{ENC2XS_VERBOSE}; -+$opt{q} ||= $ENV{ENC2XS_NO_COMMENTS}; - - sub verbose { - print STDERR @_ if $opt{v}; --- -2.21.0 -
meta/recipes-devtools/perl/files/perl-rdepends.txt +21 -2472
2,700 lines not on this page · raw message
meta/recipes-devtools/perl/perl_5.32.0.bb renamed from meta/recipes-devtools/perl/perl_5.30.2.bb +4 -8
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ - https://github.com/arsv/perl-cross/releases/download/1.3.2/perl-cross-1.3.2.tar.gz;name=perl-cross \ + https://github.com/arsv/perl-cross/releases/download/1.3.4/perl-cross-1.3.4.tar.gz;name=perl-cross \ file://perl-rdepends.txt \ file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \ file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \
@@ -18,9 +18,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \ file://perl-dynloader.patch \ file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \ - file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ - file://0001-PATCH-perl-134117-Close-DATA-in-loc_tools.pl.patch \ file://determinism.patch \ " SRC_URI_append_class-native = " \
@@ -30,8 +28,8 @@ SRC_URI_append_class-target = " \ file://encodefix.patch \ " -SRC_URI[perl.sha256sum] = "66db7df8a91979eb576fac91743644da878244cf8ee152f02cd6f5cd7a731689" -SRC_URI[perl-cross.sha256sum] = "defa12f0ad7be0b6c48b4f76e2fb5b37c1b37fbeb6e9ebe938279cd539a0c20c" +SRC_URI[perl.sha256sum] = "efeb1ce1f10824190ad1cadbcccf6fdb8a5d37007d0100d2d9ae5f2b5900c0b4" +SRC_URI[perl-cross.sha256sum] = "755aa0ca8141a942188a269564f86c3c82349f82c346ed5c992495d7f35138ba" S = "${WORKDIR}/perl-${PV}"
@@ -192,7 +190,6 @@ perl_package_preprocess () { ${PKGD}${bindir}/pod2text.perl \ ${PKGD}${bindir}/pod2usage.perl \ ${PKGD}${bindir}/podchecker.perl \ - ${PKGD}${bindir}/podselect.perl \ ${PKGD}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/CORE/config.h \ ${PKGD}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/CORE/perl.h \ ${PKGD}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/CORE/pp.h \
@@ -212,7 +209,7 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN}-misc = "corelist cpan enc2xs encguess h2ph h2xs instmodsh json_pp libnetcfg \ - piconv pl2pm pod2html pod2man pod2text pod2usage podchecker podselect \ + piconv pl2pm pod2html pod2man pod2text pod2usage podchecker \ prove ptar ptardiff ptargrep shasum splain xsubpp zipdetails" ALTERNATIVE_LINK_NAME[corelist] = "${bindir}/corelist" ALTERNATIVE_LINK_NAME[cpan] = "${bindir}/cpan"
@@ -230,7 +227,6 @@ ALTERNATIVE_LINK_NAME[pod2man] = "${bindir}/pod2man" ALTERNATIVE_LINK_NAME[pod2text] = "${bindir}/pod2text" ALTERNATIVE_LINK_NAME[pod2usage] = "${bindir}/pod2usage" ALTERNATIVE_LINK_NAME[podchecker] = "${bindir}/podchecker" -ALTERNATIVE_LINK_NAME[podselect] = "${bindir}/podselect" ALTERNATIVE_LINK_NAME[prove] = "${bindir}/prove" ALTERNATIVE_LINK_NAME[ptar] = "${bindir}/ptar" ALTERNATIVE_LINK_NAME[ptardiff] = "${bindir}/ptardiff"
Signature · 1 line
2.27.0
PATCH 10/30 gst-examples: upstream releases are even numbered
In reply to Alexander Kanavin--- meta/recipes-multimedia/gstreamer/gst-examples_1.16.0.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-multimedia/gstreamer/gst-examples_1.16.0.bb +1 -0
@@ -15,6 +15,7 @@ S = "${WORKDIR}/git" inherit meson pkgconfig features_check +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
Signature · 1 line
2.27.0
PATCH 11/30 bison: upgrade 3.6.3 -> 3.6.4
In reply to Alexander Kanavin---
meta/recipes-devtools/bison/{bison_3.6.3.bb => bison_3.6.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/bison/{bison_3.6.3.bb => bison_3.6.4.bb} (94%)meta/recipes-devtools/bison/bison_3.6.4.bb renamed from meta/recipes-devtools/bison/bison_3.6.3.bb +1 -1
@@ -13,7 +13,7 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ file://add-with-bisonlocaledir.patch \ file://0001-bison-fix-the-parallel-build.patch \ " -SRC_URI[sha256sum] = "06db793651de9dd5f0a85a6fe4bdbca413c0806bf2432377523da96ca0b4b73d" +SRC_URI[sha256sum] = "8b13473b31ca7fcf65e5e8a74224368ffd5df19275602a9c9567ba393f18577d" # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4"
Signature · 1 line
2.27.0
PATCH 12/30 python3-cython: upgrade 0.29.19 -> 0.29.20
In reply to Alexander Kanavin---
meta/recipes-devtools/python/python-cython.inc | 2 +-
.../{python3-cython_0.29.19.bb => python3-cython_0.29.20.bb} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/python/{python3-cython_0.29.19.bb => python3-cython_0.29.20.bb} (100%)meta/recipes-devtools/python/python-cython.inc +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" PYPI_PACKAGE = "Cython" BBCLASSEXTEND = "native nativesdk" -SRC_URI[sha256sum] = "97f98a7dc0d58ea833dc1f8f8b3ce07adf4c0f030d1886c5399a2135ed415258" +SRC_URI[sha256sum] = "22d91af5fc2253f717a1b80b8bb45acb655f643611983fd6f782b9423f8171c7" UPSTREAM_CHECK_REGEX = "Cython-(?P<pver>.*)\.tar" inherit pypi
meta/recipes-devtools/python/python3-cython_0.29.20.bb renamed from meta/recipes-devtools/python/python3-cython_0.29.19.bb +0 -0
Signature · 1 line
2.27.0
PATCH 13/30 stress-ng: upgrade 0.11.12 -> 0.11.14
In reply to Alexander Kanavin---
.../stress-ng/stress-ng/no_daddr_t.patch | 16 +++++++++++++---
...stress-ng_0.11.12.bb => stress-ng_0.11.14.bb} | 2 +-
2 files changed, 14 insertions(+), 4 deletions(-)
rename meta/recipes-extended/stress-ng/{stress-ng_0.11.12.bb => stress-ng_0.11.14.bb} (89%)meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch +13 -3
@@ -1,4 +1,7 @@ -Define daddr_t if __DADDR_T_TYPE is not defined +From 55e11765af2bdc8adfac87dab1fb2682f7e6c236 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 9 Jun 2020 22:10:28 -0700 +Subject: [PATCH] Define daddr_t if __DADDR_T_TYPE is not defined glibc defined daddr_t but musl does not, ideally it should not be used and simple int type is enough. However, its better to leave glibc behavior
@@ -7,9 +10,16 @@ as it is and only define it to int if daddr_t is not provided by libc Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> + +--- + stress-ng.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/stress-ng.h b/stress-ng.h +index 1a66293..802dc25 100644 --- a/stress-ng.h +++ b/stress-ng.h -@@ -3750,6 +3750,10 @@ struct shim_statx { +@@ -3763,6 +3763,10 @@ struct shim_statx { uint64_t __spare2[14]; };
@@ -19,4 +29,4 @@ Signed-off-by: Khem Raj <[email protected]> + /* old ustat struct */ struct shim_ustat { - daddr_t f_tfree; + #if defined(HAVE_DADDR_T)
meta/recipes-extended/stress-ng/stress-ng_0.11.14.bb renamed from meta/recipes-extended/stress-ng/stress-ng_0.11.12.bb +1 -1
@@ -9,7 +9,7 @@ SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ file://no_daddr_t.patch \ " -SRC_URI[sha256sum] = "0ccf437ca1876a3e8a55986c6481697045203a17f5994cb2f5096cd461d18031" +SRC_URI[sha256sum] = "b21436fdbd9dc482a3fd95ae27cccf0097d0f226361ea3785215f7a4ad50136b" DEPENDS = "coreutils-native"
Signature · 1 line
2.27.0
PATCH 14/30 piglit: upgrade to latest revision
In reply to Alexander Kanavin--- meta/recipes-graphics/piglit/piglit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/piglit/piglit_git.bb +1 -1
@@ -10,7 +10,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "5cc4fd749375f37e8e8725a86072d8cff7173b98" +SRCREV = "7d76fca56e8ca72ab6809f6f0234b5971af5690a" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}"
Signature · 1 line
2.27.0
PATCH 15/30 linux-firmware: upgrade 20200519 -> 20200619
In reply to Alexander KanavinLicense-Update: new firmwares, all redistributable
---
...{linux-firmware_20200519.bb => linux-firmware_20200619.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-kernel/linux-firmware/{linux-firmware_20200519.bb => linux-firmware_20200619.bb} (99%)meta/recipes-kernel/linux-firmware/linux-firmware_20200619.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20200519.bb +2 -2
@@ -126,7 +126,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=c15cee50b1a59d27106a37c2929d5291 \ + file://WHENCE;md5=d373d30188c38dabffec0d3cc87abbfd \ " # These are not common licenses, set NO_GENERIC_LICENSE for them
@@ -198,7 +198,7 @@ PE = "1" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "584c49c58291136b966ceffb0a456a672c23d4d759bab8bf86cbbe28061e415e" +SRC_URI[sha256sum] = "962d3ae197d226c8259f9cc7746f7ef12a9d23787cd56bd27302021ba6339722" inherit allarch
Signature · 1 line
2.27.0
PATCH 16/30 systemtap: upgrade 4.2 -> 4.3
In reply to Alexander Kanavin--- meta/recipes-kernel/systemtap/systemtap_git.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/systemtap/systemtap_git.inc +2 -2
@@ -1,7 +1,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "044a0640985ef007c0b2fb6eaf660d9d51800cda" -PV = "4.2" +SRCREV = "c9c23c987d819d07c6b96b54f8e03188fecd9e46" +PV = "4.3" SRC_URI = "git://sourceware.org/git/systemtap.git \ file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \
Signature · 1 line
2.27.0
PATCH 17/30 alsa-lib: upgrade 1.2.2 -> 1.2.3.1
In reply to Alexander Kanavin---
.../alsa/{alsa-lib_1.2.2.bb => alsa-lib_1.2.3.1.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta/recipes-multimedia/alsa/{alsa-lib_1.2.2.bb => alsa-lib_1.2.3.1.bb} (89%)meta/recipes-multimedia/alsa/alsa-lib_1.2.3.1.bb renamed from meta/recipes-multimedia/alsa/alsa-lib_1.2.2.bb +1 -2
@@ -8,8 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \ " SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2" -SRC_URI[md5sum] = "82cdc23a5233d5ed319d2cbc89af5ca5" -SRC_URI[sha256sum] = "d8e853d8805574777bbe40937812ad1419c9ea7210e176f0def3e6ed255ab3ec" +SRC_URI[sha256sum] = "1244585515fbebce7d0e53656c1fb614f99accb8413115ce3efb9a9309c4c892" inherit autotools pkgconfig
Signature · 1 line
2.27.0
PATCH 18/30 alsa-topology-conf: upgrade 1.2.2 -> 1.2.3
In reply to Alexander Kanavin---
...{alsa-topology-conf_1.2.2.bb => alsa-topology-conf_1.2.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-multimedia/alsa/{alsa-topology-conf_1.2.2.bb => alsa-topology-conf_1.2.3.bb} (84%)meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.3.bb renamed from meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.2.bb +1 -1
@@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4" SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2" -SRC_URI[sha256sum] = "b472d6b567c78173bd69543d9cffc9e379c80eb763c3afc8d5b24d5610d19425" +SRC_URI[sha256sum] = "833f99b2cbda34e0cfef867ef1d2e6a74fe276bb7fc525a573be32077f629dff" inherit allarch
Signature · 1 line
2.27.0
PATCH 19/30 alsa-ucm-conf: upgrade 1.2.2 -> 1.2.3
In reply to Alexander Kanavin---
.../alsa/{alsa-ucm-conf_1.2.2.bb => alsa-ucm-conf_1.2.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-multimedia/alsa/{alsa-ucm-conf_1.2.2.bb => alsa-ucm-conf_1.2.3.bb} (85%)meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.3.bb renamed from meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.2.bb +1 -1
@@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4" SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2" -SRC_URI[sha256sum] = "7ebfd929bc85a51f16fa3c8c4db13faa2ea6ff2b2266fc36d6198bdafe73c40c" +SRC_URI[sha256sum] = "1bc24da04bb27a75e323c9f0fb03e44705b6bb8a8baf255b94b41d457d590d00" inherit allarch
Signature · 1 line
2.27.0
PATCH 20/30 alsa-utils: upgrade 1.2.2 -> 1.2.3
In reply to Alexander Kanavin---
...alsa-utils-scripts_1.2.2.bb => alsa-utils-scripts_1.2.3.bb} | 0
meta/recipes-multimedia/alsa/alsa-utils.inc | 3 +--
.../alsa/{alsa-utils_1.2.2.bb => alsa-utils_1.2.3.bb} | 1 +
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-multimedia/alsa/{alsa-utils-scripts_1.2.2.bb => alsa-utils-scripts_1.2.3.bb} (100%)
rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.2.bb => alsa-utils_1.2.3.bb} (95%)meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.3.bb renamed from meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.2.bb +0 -0
meta/recipes-multimedia/alsa/alsa-utils.inc +1 -2
@@ -21,8 +21,7 @@ PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook # alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2" -SRC_URI[md5sum] = "00612234ff4722c8f7f8f7a83ff9bc63" -SRC_URI[sha256sum] = "44807bd578c5f6df6e91a11b8d37e546424a5a1ea8d8e659ee359fe01730e4f3" +SRC_URI[sha256sum] = "ff19ae48c22938de7a491bdb39db74a2eee2546013f39bf1a86185e426f921aa" # On build machines with python-docutils (not python3-docutils !!) installed # rst2man (not rst2man.py) is detected and compile fails with
meta/recipes-multimedia/alsa/alsa-utils_1.2.3.bb renamed from meta/recipes-multimedia/alsa/alsa-utils_1.2.2.bb +1 -0
@@ -1 +1,2 @@ require alsa-utils.inc +
Signature · 1 line
2.27.0
PATCH 21/30 puzzles: upgrade to latest revision
In reply to Alexander Kanavin--- meta/recipes-sato/puzzles/puzzles_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-sato/puzzles/puzzles_git.bb +1 -1
@@ -17,7 +17,7 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "66b9e8c7de0eecb3d85d9a1766fab1082848448b" +SRCREV = "9aa7b7cdfb2bcd200f45941a58d6ae698882a2d4" PE = "2" PV = "0.0+git${SRCPV}"
Signature · 1 line
2.27.0
PATCH 22/30 diffoscope: upgrade 147 -> 148
In reply to Alexander Kanavin---
.../diffoscope/{diffoscope_147.bb => diffoscope_148.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/diffoscope/{diffoscope_147.bb => diffoscope_148.bb} (83%)meta/recipes-support/diffoscope/diffoscope_148.bb renamed from meta/recipes-support/diffoscope/diffoscope_147.bb +1 -1
@@ -7,7 +7,7 @@ PYPI_PACKAGE = "diffoscope" inherit pypi setuptools3 -SRC_URI[sha256sum] = "5b5fdaa4d900c891b319e4b9a006eb16824a0b61fdbe15e75acbbe35602e2da6" +SRC_URI[sha256sum] = "54e39043226045419ba37f9b7aae4b96939f5ec16f37c44cc102e3d3f8e9ab1b" RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic"
Signature · 1 line
2.27.0
PATCH 23/30 libcheck: upgrade 0.14.0 -> 0.15.0
In reply to Alexander Kanavin---
.../libcheck/{libcheck_0.14.0.bb => libcheck_0.15.0.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta/recipes-support/libcheck/{libcheck_0.14.0.bb => libcheck_0.15.0.bb} (83%)meta/recipes-support/libcheck/libcheck_0.15.0.bb renamed from meta/recipes-support/libcheck/libcheck_0.14.0.bb +1 -2
@@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" SRC_URI = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz \ file://not-echo-compiler-info-to-check_stdint.h.patch" -SRC_URI[md5sum] = "270e82a445be6026040267a5e11cc94b" -SRC_URI[sha256sum] = "bd0f0ca1be65b70238b32f8e9fe5d36dc2fbf7a759b7edf28e75323a7d74f30b" +SRC_URI[sha256sum] = "aea2e3c68fa6e1e92378e744b1c0db350ccda4b6bd0d19530d0ae185b3d1ac60" UPSTREAM_CHECK_URI = "https://github.com/libcheck/check/releases/" S = "${WORKDIR}/check-${PV}"
Signature · 1 line
2.27.0
PATCH 24/30 rsync: update 3.1.3 -> 3.2.1
In reply to Alexander KanavinDrop all CVE patches, add the new configure options.
---
.../rsync/files/CVE-2016-9840.patch | 75 ------
.../rsync/files/CVE-2016-9841.patch | 228 ------------------
.../rsync/files/CVE-2016-9842.patch | 33 ---
.../rsync/files/CVE-2016-9843.patch | 53 ----
.../rsync/files/makefile-no-rebuild.patch | 25 +-
.../rsync/{rsync_3.1.3.bb => rsync_3.2.1.bb} | 19 +-
6 files changed, 26 insertions(+), 407 deletions(-)
delete mode 100644 meta/recipes-devtools/rsync/files/CVE-2016-9840.patch
delete mode 100644 meta/recipes-devtools/rsync/files/CVE-2016-9841.patch
delete mode 100644 meta/recipes-devtools/rsync/files/CVE-2016-9842.patch
delete mode 100644 meta/recipes-devtools/rsync/files/CVE-2016-9843.patch
rename meta/recipes-devtools/rsync/{rsync_3.1.3.bb => rsync_3.2.1.bb} (71%)meta/recipes-devtools/rsync/files/CVE-2016-9840.patch deleted +0 -75
@@ -1,75 +0,0 @@ -From 6a043145ca6e9c55184013841a67b2fef87e44c0 Mon Sep 17 00:00:00 2001 -From: Mark Adler <[email protected]> -Date: Wed, 21 Sep 2016 23:35:50 -0700 -Subject: [PATCH] Remove offset pointer optimization in inftrees.c. - -inftrees.c was subtracting an offset from a pointer to an array, -in order to provide a pointer that allowed indexing starting at -the offset. This is not compliant with the C standard, for which -the behavior of a pointer decremented before its allocated memory -is undefined. Per the recommendation of a security audit of the -zlib code by Trail of Bits and TrustInSoft, in support of the -Mozilla Foundation, this tiny optimization was removed, in order -to avoid the possibility of undefined behavior. - -CVE: CVE-2016-9840 -Upstream-Status: Backport -Signed-off-by: Anuj Mittal <[email protected]> ---- - inftrees.c | 18 ++++++++---------- - 1 file changed, 8 insertions(+), 10 deletions(-) - -diff --git a/zlib/inftrees.c b/zlib/inftrees.c -index 22fcd666..0d2670d5 100644 ---- a/zlib/inftrees.c -+++ b/zlib/inftrees.c -@@ -54,7 +54,7 @@ unsigned short FAR *work; - code FAR *next; /* next available space in table */ - const unsigned short FAR *base; /* base value table to use */ - const unsigned short FAR *extra; /* extra bits table to use */ -- int end; /* use base and extra for symbol > end */ -+ unsigned match; /* use base and extra for symbol >= match */ - unsigned short count[MAXBITS+1]; /* number of codes of each length */ - unsigned short offs[MAXBITS+1]; /* offsets in table for each length */ - static const unsigned short lbase[31] = { /* Length codes 257..285 base */ -@@ -181,19 +181,17 @@ unsigned short FAR *work; - switch (type) { - case CODES: - base = extra = work; /* dummy value--not used */ -- end = 19; -+ match = 20; - break; - case LENS: - base = lbase; -- base -= 257; - extra = lext; -- extra -= 257; -- end = 256; -+ match = 257; - break; - default: /* DISTS */ - base = dbase; - extra = dext; -- end = -1; -+ match = 0; - } - - /* initialize state for loop */ -@@ -216,13 +214,13 @@ unsigned short FAR *work; - for (;;) { - /* create table entry */ - here.bits = (unsigned char)(len - drop); -- if ((int)(work[sym]) < end) { -+ if (work[sym] + 1 < match) { - here.op = (unsigned char)0; - here.val = work[sym]; - } -- else if ((int)(work[sym]) > end) { -- here.op = (unsigned char)(extra[work[sym]]); -- here.val = base[work[sym]]; -+ else if (work[sym] >= match) { -+ here.op = (unsigned char)(extra[work[sym] - match]); -+ here.val = base[work[sym] - match]; - } - else { - here.op = (unsigned char)(32 + 64); /* end of block */
meta/recipes-devtools/rsync/files/CVE-2016-9841.patch deleted +0 -228
228 lines not on this page · raw message
meta/recipes-devtools/rsync/files/CVE-2016-9842.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From e54e1299404101a5a9d0cf5e45512b543967f958 Mon Sep 17 00:00:00 2001 -From: Mark Adler <[email protected]> -Date: Sat, 5 Sep 2015 17:45:55 -0700 -Subject: [PATCH] Avoid shifts of negative values inflateMark(). - -The C standard says that bit shifts of negative integers is -undefined. This casts to unsigned values to assure a known -result. - -CVE: CVE-2016-9842 -Upstream-Status: Backport -Signed-off-by: Anuj Mittal <[email protected]> ---- - inflate.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/zlib/inflate.c b/zlib/inflate.c -index 2889e3a0..a7184167 100644 ---- a/zlib/inflate.c -+++ b/zlib/inflate.c -@@ -1506,9 +1506,10 @@ z_streamp strm; - { - struct inflate_state FAR *state; - -- if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16; -+ if (strm == Z_NULL || strm->state == Z_NULL) -+ return (long)(((unsigned long)0 - 1) << 16); - state = (struct inflate_state FAR *)strm->state; -- return ((long)(state->back) << 16) + -+ return (long)(((unsigned long)((long)state->back)) << 16) + - (state->mode == COPY ? state->length : - (state->mode == MATCH ? state->was - state->length : 0)); - }
meta/recipes-devtools/rsync/files/CVE-2016-9843.patch deleted +0 -53
53 lines not on this page · raw message
meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch +16 -9
@@ -1,20 +1,26 @@ +From 5ae38baadd40a996da3d19a147f37e7f1f3355bf Mon Sep 17 00:00:00 2001 +From: Ross Burton <[email protected]> +Date: Tue, 12 Apr 2016 15:51:54 +0100 +Subject: [PATCH] rsync: remove upstream's rebuild logic + Remove the Makefile rules to reinvoke autoconf, they're not out-of-tree safe and generally overcomplicated, and we ensure that autoreconf is invoked if required. Upstream-Status: Inappropriate Signed-off-by: Ross Burton <[email protected]> +--- + Makefile.in | 50 -------------------------------------------------- + 1 file changed, 50 deletions(-) + diff --git a/Makefile.in b/Makefile.in -index 151247d..8f3fdb6 100644 +index 31ddc43..41c9a93 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -141,58 +141,6 @@ gen: conf proto.h man +@@ -167,56 +167,6 @@ gen: conf proto.h man gensend: gen - rsync -aivzc $(GENFILES) $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ + rsync -aic $(GENFILES) $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ --conf: -- cd $(srcdir) && $(MAKE) -f prepare-source.mak conf -- -aclocal.m4: $(srcdir)/m4/*.m4 - aclocal -I $(srcdir)/m4 -
@@ -45,6 +51,7 @@ index 151247d..8f3fdb6 100644 - fi \ - fi - +-.PHONY: reconfigure -reconfigure: configure.sh - ./config.status --recheck - ./config.status
@@ -64,6 +71,6 @@ index 151247d..8f3fdb6 100644 - fi \ - fi - - rsync-ssl: $(srcdir)/rsync-ssl.in Makefile - sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/rsync-ssl.in >rsync-ssl - @chmod +x rsync-ssl + stunnel-rsyncd.conf: $(srcdir)/stunnel-rsyncd.conf.in Makefile + sed 's;\@bindir\@;$(bindir);g' <$(srcdir)/stunnel-rsyncd.conf.in >stunnel-rsyncd.conf +
meta/recipes-devtools/rsync/rsync_3.2.1.bb renamed from meta/recipes-devtools/rsync/rsync_3.1.3.bb +10 -9
@@ -3,27 +3,23 @@ HOMEPAGE = "http://rsync.samba.org/" BUGTRACKER = "http://rsync.samba.org/bugzilla.html" SECTION = "console/network" # GPLv2+ (<< 3.0.0), GPLv3+ (>= 3.0.0) +# Includes opennsh and xxhash dynamic link exception LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +LIC_FILES_CHKSUM = "file://COPYING;md5=9e5a4f9b3a253d51520617aa54f8eb26" DEPENDS = "popt" SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ file://rsyncd.conf \ file://makefile-no-rebuild.patch \ - file://CVE-2016-9840.patch \ - file://CVE-2016-9841.patch \ - file://CVE-2016-9842.patch \ - file://CVE-2016-9843.patch \ -" + " -SRC_URI[md5sum] = "1581a588fde9d89f6bc6201e8129afaf" -SRC_URI[sha256sum] = "55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0" +SRC_URI[sha256sum] = "95f2dd62979b500a99b34c1a6453a0787ada0330e4bec7fcffad37b9062d58d3" # -16548 required for v3.1.3pre1. Already in v3.1.3. CVE_CHECK_WHITELIST += " CVE-2017-16548 " -inherit autotools +inherit autotools-brokensep PACKAGECONFIG ??= "acl attr \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
@@ -32,12 +28,17 @@ PACKAGECONFIG ??= "acl attr \ PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl," PACKAGECONFIG[attr] = "--enable-xattr-support,--disable-xattr-support,attr," PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4" +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" +PACKAGECONFIG[xxhash] = "--enable-xxhash,--disable-xxhash,xxhash" +PACKAGECONFIG[zstd] = "--enable-zstd,--disable-zstd,zstd" # By default, if crosscompiling, rsync disables a number of # capabilities, hardlinking symlinks and special files (i.e. devices) CACHED_CONFIGUREVARS += "rsync_cv_can_hardlink_special=yes rsync_cv_can_hardlink_symlink=yes" EXTRA_OEMAKE = 'STRIP=""' +EXTRA_OECONF = "--disable-simd --disable-md2man --disable-asm" # rsync 3.0 uses configure.sh instead of configure, and # makefile checks the existence of configure.sh
Signature · 1 line
2.27.0
PATCH 25/30 sudo: upgrade 1.9.0 -> 1.9.1
In reply to Alexander KanavinDrop the patch as it is merged upstream.
---
...lude-sys-types.h-for-id_t-definition.patch | 34 -------------------
.../sudo/{sudo_1.9.0.bb => sudo_1.9.1.bb} | 8 ++---
2 files changed, 3 insertions(+), 39 deletions(-)
delete mode 100644 meta/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch
rename meta/recipes-extended/sudo/{sudo_1.9.0.bb => sudo_1.9.1.bb} (84%)meta/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 386e2c2fa2ab2e02ef71c268a57205139be329ab Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 31 Aug 2015 07:07:49 +0000 -Subject: [PATCH] Include sys/types.h for id_t definition - -/sudo_util.h:219:14: error: unknown type name 'id_t' - __dso_public id_t sudo_strtoid_v1(const char *str, const char *sep, - char **endp, const char **errstr); - ^ - make[1]: *** [preserve_fds.o] Error 1 - -Signed-off-by: Khem Raj <[email protected]> ---- -Upstream-Status: Pending - - include/sudo_util.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/sudo_util.h b/include/sudo_util.h -index 89c9f89..ac0855a 100644 ---- a/include/sudo_util.h -+++ b/include/sudo_util.h -@@ -17,6 +17,8 @@ - #ifndef SUDO_UTIL_H - #define SUDO_UTIL_H - -+#include <sys/types.h> -+ - #ifdef HAVE_STDBOOL_H - # include <stdbool.h> - #else --- -2.5.1 -
meta/recipes-extended/sudo/sudo_1.9.1.bb renamed from meta/recipes-extended/sudo/sudo_1.9.0.bb +3 -5
@@ -2,13 +2,11 @@ require sudo.inc SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ - file://0001-Include-sys-types.h-for-id_t-definition.patch \ " PAM_SRC_URI = "file://sudo.pam" -SRC_URI[md5sum] = "060b91a6b171cb7ce587222664549b2c" -SRC_URI[sha256sum] = "ab231439c5dfdf4ecbef74f10d5f7e9686c2255c2f3887085b5c5e13281bf95c" +SRC_URI[sha256sum] = "294116cefe10a02773917fc7440d8384b925955bc96a6e0eaa1977c83b34adff" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
@@ -39,8 +37,8 @@ do_install_append () { chmod 4111 ${D}${bindir}/sudo chmod 0440 ${D}${sysconfdir}/sudoers - # Explicitly remove the /run directory to avoid QA error - rmdir -p --ignore-fail-on-non-empty ${D}/run/sudo + # Explicitly remove the /sudo directory to avoid QA error + rmdir -p --ignore-fail-on-non-empty ${D}/sudo } FILES_${PN} += "${nonarch_libdir}/tmpfiles.d"
Signature · 1 line
2.27.0
PATCH 26/30 python3-numpy: update 1.18.5 -> 1.19.0
In reply to Alexander KanavinLicense-Update: copyright years
---
...-and-so-on-for-libraries-by-default-.patch | 11 +-
...nvert-shebang-from-python-to-python3.patch | 555 ------------------
.../python-numpy/python-numpy.inc | 7 +-
...umpy_1.18.5.bb => python3-numpy_1.19.0.bb} | 0
4 files changed, 10 insertions(+), 563 deletions(-)
delete mode 100644 meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch
rename meta/recipes-devtools/python-numpy/{python3-numpy_1.18.5.bb => python3-numpy_1.19.0.bb} (100%)meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +7 -4
@@ -1,4 +1,4 @@ -From 672a75c8417ce08db9e31fc415ec445479231d5a Mon Sep 17 00:00:00 2001 +From 27f6687e49bf555fc494d2f14bae6ecd0fa30f14 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Thu, 10 Dec 2015 13:20:30 +0200 Subject: [PATCH] Don't search /usr and so on for libraries by default to
@@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 5 insertions(+), 37 deletions(-) diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index ba2b1f4..f94dce1 100644 +index 3a6a7b2..6c2c3da 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py -@@ -278,45 +278,13 @@ if sys.platform == 'win32': - add_system_root(os.path.join(conda_dir, 'Library')) +@@ -309,45 +309,13 @@ if sys.platform == 'win32': + add_system_root(os.path.join(conda_dir, 'Library')) else: - default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib',
@@ -68,3 +68,6 @@ index ba2b1f4..f94dce1 100644 if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) +-- +2.17.1 +
meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch deleted +0 -555
555 lines not on this page · raw message
meta/recipes-devtools/python-numpy/python-numpy.inc +3 -4
@@ -1,15 +1,14 @@ SUMMARY = "A sophisticated Numeric Processing Package for Python" SECTION = "devel/python" LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=643d4e90100b7abe468c4db88127b895" SRCNAME = "numpy" SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ - file://0001-convert-shebang-from-python-to-python3.patch \ " -SRC_URI[sha256sum] = "2c095bd1c5290966cceee8b6ef5cd66f13cd0e9d6d0e8d6fc8961abd64a8e51f" +SRC_URI[sha256sum] = "153cf8b0176e57a611931981acfe093d2f7fef623b48f91176efa199798a6b90" UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
@@ -20,7 +19,7 @@ S = "${WORKDIR}/numpy-${PV}" CLEANBROKEN = "1" -FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" +FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a ${PYTHON_SITEPACKAGES_DIR}/numpy/random/lib/*.a" # install what is needed for numpy.test() RDEPENDS_${PN} = "${PYTHON_PN}-unittest \
meta/recipes-devtools/python-numpy/python3-numpy_1.19.0.bb renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.18.5.bb +0 -0
Signature · 1 line
2.27.0
PATCH 27/30 mesa: update 20.0.7 -> 20.1.2
In reply to Alexander Kanavin---
.../0002-meson.build-make-TLS-ELF-optional.patch | 12 ++++++------
...x_t-for-formatted-output-of-timespec-me.patch | 16 +++++++---------
.../{mesa-gl_20.0.7.bb => mesa-gl_20.1.2.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 3 +--
.../mesa/{mesa_20.0.7.bb => mesa_20.1.2.bb} | 1 +
5 files changed, 15 insertions(+), 17 deletions(-)
rename meta/recipes-graphics/mesa/{mesa-gl_20.0.7.bb => mesa-gl_20.1.2.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_20.0.7.bb => mesa_20.1.2.bb} (95%)meta/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch +6 -6
@@ -1,4 +1,4 @@ -From df835389699b32bb6610b39972502e323f8e09e5 Mon Sep 17 00:00:00 2001 +From dd1d15c75f6ff8ee96cf1e7b74e582bff3183ef6 Mon Sep 17 00:00:00 2001 From: Alistair Francis <[email protected]> Date: Thu, 14 Nov 2019 13:08:31 -0800 Subject: [PATCH] meson.build: make TLS ELF optional
@@ -15,10 +15,10 @@ Signed-off-by: Alistair Francis <[email protected]> 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 09e3759..a954118 100644 +index 261b588..311436e 100644 --- a/meson.build +++ b/meson.build -@@ -387,7 +387,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat +@@ -392,7 +392,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat endif # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
@@ -28,10 +28,10 @@ index 09e3759..a954118 100644 endif diff --git a/meson_options.txt b/meson_options.txt -index 626baf3..637ff14 100644 +index ab43150..d7b1555 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -341,6 +341,12 @@ option( +@@ -355,6 +355,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', )
@@ -42,5 +42,5 @@ index 626baf3..637ff14 100644 + description : 'Enable TLS support in ELF', +) option( - 'I-love-half-baked-turnips', + 'prefer-iris', type : 'boolean',
meta/recipes-graphics/mesa/files/0005-vc4-use-intmax_t-for-formatted-output-of-timespec-me.patch +7 -9
@@ -1,4 +1,4 @@ -From 38a313474e127d61e749866423e708fc86ed9ec5 Mon Sep 17 00:00:00 2001 +From 281a636353666bfdd373c62591e744087e750e89 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Wed, 4 Dec 2019 14:15:28 -0800 Subject: [PATCH] vc4: use intmax_t for formatted output of timespec members
@@ -13,13 +13,14 @@ error: format specifies type 'long' but the argument has type 'time_t' (aka 'lon Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2966] Signed-off-by: Khem Raj <[email protected]> + --- src/gallium/drivers/v3d/v3d_bufmgr.c | 4 ++-- src/gallium/drivers/vc4/vc4_bufmgr.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/v3d/v3d_bufmgr.c b/src/gallium/drivers/v3d/v3d_bufmgr.c -index b3e4d053cc0..c514bf00bf0 100644 +index 31a0803..cc2e2af 100644 --- a/src/gallium/drivers/v3d/v3d_bufmgr.c +++ b/src/gallium/drivers/v3d/v3d_bufmgr.c @@ -80,8 +80,8 @@ v3d_bo_dump_stats(struct v3d_screen *screen)
@@ -27,27 +28,24 @@ index b3e4d053cc0..c514bf00bf0 100644 struct timespec time; clock_gettime(CLOCK_MONOTONIC, &time); - fprintf(stderr, " now: %ld\n", -- time.tv_sec); +- (long)time.tv_sec); + fprintf(stderr, " now: %jd\n", + (intmax_t)time.tv_sec); } } diff --git a/src/gallium/drivers/vc4/vc4_bufmgr.c b/src/gallium/drivers/vc4/vc4_bufmgr.c -index 5ec360934c0..bf05f6cadd6 100644 +index a786e8e..975d49e 100644 --- a/src/gallium/drivers/vc4/vc4_bufmgr.c +++ b/src/gallium/drivers/vc4/vc4_bufmgr.c -@@ -107,8 +107,8 @@ vc4_bo_dump_stats(struct vc4_screen *screen) +@@ -99,8 +99,8 @@ vc4_bo_dump_stats(struct vc4_screen *screen) struct timespec time; clock_gettime(CLOCK_MONOTONIC, &time); - fprintf(stderr, " now: %ld\n", -- time.tv_sec); +- (long)time.tv_sec); + fprintf(stderr, " now: %jd\n", + (intmax_t)time.tv_sec); } } --- -2.24.0 -
meta/recipes-graphics/mesa/mesa-gl_20.1.2.bb renamed from meta/recipes-graphics/mesa/mesa-gl_20.0.7.bb +0 -0
meta/recipes-graphics/mesa/mesa.inc +1 -2
@@ -23,8 +23,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ " -SRC_URI[md5sum] = "609cb7664204e031d4c65c602c652a28" -SRC_URI[sha256sum] = "fe6e258fe772c3cd2ac01741bf7408058c3ac02d66acff9a6e669bd72e3ea178" +SRC_URI[sha256sum] = "283dff72814c8a80ce1ff8271e3f055895d26f4da3f4362acc49193e635780cb" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
meta/recipes-graphics/mesa/mesa_20.1.2.bb renamed from meta/recipes-graphics/mesa/mesa_20.0.7.bb +1 -0
@@ -1 +1,2 @@ require ${BPN}.inc +
Signature · 1 line
2.27.0
PATCH 28/30 go-binary-native: fix upstream version check
In reply to Alexander Kanavin--- meta/recipes-devtools/go/go-binary-native_1.14.4.bb | 3 +++ 1 file changed, 3 insertions(+)
meta/recipes-devtools/go/go-binary-native_1.14.4.bb +3 -0
@@ -11,6 +11,9 @@ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz SRC_URI[go_linux_amd64.sha256sum] = "aed845e4185a0b2a3c3d5e1d0a35491702c55889192bb9c30e67a3de6849c067" SRC_URI[go_linux_arm64.sha256sum] = "05dc46ada4e23a1f58e72349f7c366aae2e9c7a7f1e7653095538bc5bba5e077" +UPSTREAM_CHECK_URI = "https://golang.org/dl/" +UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux" + S = "${WORKDIR}/go" inherit goarch native
Signature · 1 line
2.27.0
PATCH 29/30 Revert "python3-setuptools: patch entrypoints for faster initialization"
In reply to Alexander KanavinApologies, but the patch is not possible to rebase onto the new setuptools, as the code has changed too much. Please get it accepted upstream first.
--- .../python/python-setuptools.inc | 4 +- ...nt-usr-bin-wrappers-signoff-included.patch | 62 ------------------- 2 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-setuptools/0001-ScriptWriter-create-more-efficient-usr-bin-wrappers-signoff-included.patch
meta/recipes-devtools/python/python-setuptools.inc +1 -3
@@ -10,9 +10,7 @@ inherit pypi SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" -SRC_URI += "file://0001-change-shebang-to-python3.patch \ - file://0001-ScriptWriter-create-more-efficient-usr-bin-wrappers-signoff-included.patch \ - " +SRC_URI += "file://0001-change-shebang-to-python3.patch" SRC_URI[md5sum] = "6e9de90b242fdd60ef59f497424ce13a" SRC_URI[sha256sum] = "145fa62b9d7bb544fce16e9b5a9bf4ab2032d2f758b7cd674af09a92736aff74"
meta/recipes-devtools/python/python3-setuptools/0001-ScriptWriter-create-more-efficient-usr-bin-wrappers-signoff-included.patch deleted +0 -62
62 lines not on this page · raw message
Signature · 1 line
2.27.0
Re: [OE-core] [PATCH 29/30] Revert "python3-setuptools: patch entrypoints for faster initialization"
Quoted 2 lines · Alexander Kanavin
Apologies, but the patch is not possible to rebase onto the new setuptools, as the code has changed too much. Please get it accepted upstream first.
That's fine. Their changes to setuptools actually address the same issue, although it's not as significant an improvement (the patch file I had submitted was about 2x as fast). Still, carrying the official fix is the better option.
Trevor
Quoted 93 lines
Signed-off-by Alexander Kanavin <[email protected]>--- .../python/python-setuptools.inc | 4 +- ...nt-usr-bin-wrappers-signoff-included.patch | 62 ------------------- 2 files changed, 1 insertion(+), 65 deletions(-)delete mode 100644
meta/recipes-devtools/python/python3-setuptools/0001-ScriptWriter-create-more-efficient-usr-bin-wrappers-signoff-included.patchmeta/recipes-devtools/python/python-setuptools.inc +1
-3@@ -10,9 +10,7 @@ inherit pypi SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" -SRC_URI += "file://0001-change-shebang-to-python3.patch \ - file://0001-ScriptWriter-create-more-efficient-usr-bin-wrappers-signoff-included.patch \ - " +SRC_URI += "file://0001-change-shebang-to-python3.patch" SRC_URI[md5sum] = "6e9de90b242fdd60ef59f497424ce13a" SRC_URI[sha256sum] = "145fa62b9d7bb544fce16e9b5a9bf4ab2032d2f758b7cd674af09a92736aff74"meta/recipes-devtools/python/python3-setuptools/0001-ScriptWriter-create-more-efficient-usr-bin-wrappers-signoff-included.patch deleted +0
-62@@ -1,62 +0,0 @@ -From aae8cd3de3f289cea3db01212579913c925191e8 Mon Sep 17 00:00:00 2001 -From: Lauri Tirkkonen <[email protected]> -Date: Thu, 26 Mar 2020 14:24:25 +0000 -Subject: [PATCH] ScriptWriter: create more efficient /usr/bin wrappers - -Upstream setuptools writes scripts to /usr/bin that do insanely much -stuff at runtime. https://github.com/pypa/setuptools/issues/510 - -Since the script entry points are already known at build time, we can -just write those directly into the /usr/bin wrapper, avoiding the -expensive 'pkg_resources' import at runtime. The idea is from -https://github.com/ninjaaron/fast-entry_points but patched directly into -the native build of setuptools here, so that all Python modules under -bitbake automatically use it without needing additional build time -dependencies. - -Upstream-Status: Pending - -Signed-off-by: Lauri Tirkkonen <[email protected]> -Signed-off-by: Trevor Gamblin <[email protected]> ---- - setuptools/command/easy_install.py | 14 ++++++-------- - 1 file changed, 6 insertions(+), 8 deletions(-) - -diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 8fba7b41..03a72714 100755 ---- a/setuptools/command/easy_install.py -+++ b/setuptools/command/easy_install.py -@@ -2023,17 +2023,12 @@ class ScriptWriter(object): - """ - - template = textwrap.dedent(r""" -- # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r -- __requires__ = %(spec)r -- import re - import sys -- from pkg_resources import load_entry_point -+ -+ from %(module)s import %(ep0)s - - if __name__ == '__main__': -- sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) -- sys.exit( -- load_entry_point(%(spec)r, %(group)r, %(name)r)() -- ) -+ sys.exit(%(entrypoint)s()) - """).lstrip() - - command_spec_class = CommandSpec -@@ -2068,6 +2063,9 @@ class ScriptWriter(object): - for type_ in 'console', 'gui': - group = type_ + '_scripts' - for name, ep in dist.get_entry_map(group).items(): -+ module = ep.module_name -+ ep0 = ep.attrs[0] -+ entrypoint = '.'.join(ep.attrs) - cls._ensure_safe_name(name) - script_text = cls.template % locals() - args = cls._get_script_args(type_, name, header, script_text) --- -2.24.1 -
PATCH 30/30 python3-setuptools: upgrade 47.1.1 -> 47.3.1
In reply to Alexander Kanavin---
...01-conditionally-do-not-fetch-code-by-easy_install.patch | 6 +++---
meta/recipes-devtools/python/python-setuptools.inc | 3 +--
...n3-setuptools_47.1.1.bb => python3-setuptools_47.3.1.bb} | 0
3 files changed, 4 insertions(+), 5 deletions(-)
rename meta/recipes-devtools/python/{python3-setuptools_47.1.1.bb => python3-setuptools_47.3.1.bb} (100%)meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +3 -3
@@ -1,4 +1,4 @@ -From a8f871c9ebc4fcb99d4163b226aabeef26567099 Mon Sep 17 00:00:00 2001 +From 234c3da52da09b28db5b2c4d33ebe9c800c461ac Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install
@@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <[email protected]> 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 426301d..55c8062 100644 +index 5a9576f..f5961cb 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py -@@ -649,6 +649,11 @@ class easy_install(Command): +@@ -656,6 +656,11 @@ class easy_install(Command): os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir)) def easy_install(self, spec, deps=False):
meta/recipes-devtools/python/python-setuptools.inc +1 -2
@@ -12,8 +12,7 @@ SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-e SRC_URI += "file://0001-change-shebang-to-python3.patch" -SRC_URI[md5sum] = "6e9de90b242fdd60ef59f497424ce13a" -SRC_URI[sha256sum] = "145fa62b9d7bb544fce16e9b5a9bf4ab2032d2f758b7cd674af09a92736aff74" +SRC_URI[sha256sum] = "843037738d1e34e8b326b5e061f474aca6ef9d7ece41329afbc8aac6195a3920" DEPENDS += "${PYTHON_PN}"
meta/recipes-devtools/python/python3-setuptools_47.3.1.bb renamed from meta/recipes-devtools/python/python3-setuptools_47.1.1.bb +0 -0
Signature · 1 line
2.27.0
✗ patchtest: failure for "dnf: upgrade 4.2.21 -> 4.2.23..." and 29 more
In reply to Alexander Kanavin== Series Details ==
Series: "dnf: upgrade 4.2.21 -> 4.2.23..." and 29 more
Revision: 1
URL : https://patchwork.openembedded.org/series/24851/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:
* Issue Upstream-Status is Inappropriate, but no reason was provided [test_upstream_status_presence_format]
Suggested fix Include a brief reason why 0005-src-gen-lock-obj.sh-add-a-file.patch is inappropriate Current Upstream-Status: Inappropriate Standard format Upstream-Status: Inappropriate [reason]
If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe