Upgrade RPM to 5.4.16 (CVE HEAD)
v4 cover Upgrade RPM to 5.4.16 (CVE HEAD)
v4:
* Move large patches to externally downloaded
- Included in a commit to be testable, but that commit should not be merged
* Disable default stack-protector for popt
* Fix AddErase API breakage
* Break popt header dependency
* Allow popt to be built internal (does not yet work, note caveat in recipe)
* Update 'security_flags.inc' to know about RPM
* rpmresolve remove unnecessary -lpopt
V3:
* Update rpm-db5-or-db6.patch to remove potential host contamination
* Update rpm-disable-auto-stack-protector.patch to only disable the stack protector
* Add new patch: rpm-atomic-ops.patch
- Disable atomic operations in bson when the architecture does not support them
* Add new patch: rpm-gnu-atomic.patch
- Dynamically detect and disable when -fgnu-tm/libitm support is not available
* Add new patch: rpm-tagname-type.patch and rpm-python-tagname.patch
- Fix rpm-python legacy API regressions
* Add new patch: rpm-disable-blaketest.patch
- Disable building the blake test apps, they appear to have dep issues in large parallel builds.
* Update db-6.0.30 to make it clear that when it is updated, to also update RPM5.
V2:
Fixed three issues
- Added Apache 2.0 license for specific mongodb code
- Switch SSE usage dynamically in rpmio/keccak.c
See rpm-keccak-sse-intrin.patch
- Add support for architectures that do not support sync_add_and_fetch_8 See rpm-atomic-ops.patch
All of those changes are made in patch 1/3.
This has been built for all of the qemu* BSPs.
V1:
There is not yet an official RPM 5.4.16 release, however one will be coming soon. Until then, 4 distinct patches are used to upgrade RPM 5.4.15 to 5.4.16. These patches are part of the commit (compressed w/ .xz). However I am not sending them as part of the email as it's not very interesting to review base64. :P
Many of the OE patches have been sent to the RPM 5 maintainer, and may be part of the official 5.4.16 release. When that release happens I expect a simple rebase to remove the unnecessary patches.
The following changes since commit 380ee36811939d947024bf78de907e3c071b834f:
image creation: allow overriding .rootfs suffix (2016-03-07 17:16:53 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib mhatle/rpm-5.4.16
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=mhatle/rpm-5.4.16
Mark Hatle (7):
rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head security_flags.inc: Special flags are needed for RPM
rpm: Enable specific crypto and digest settings via variables
rpm: A number of the patches have been submitted upstream
rpmresolve: It is not necessary to manually specify -lpopt
db: remove the NO_UPDATE_REASON and replace it a comment about RPM
rpm: Temporarily provide the RPM patches (NOT NOT MERGE)
meta/conf/distro/include/security_flags.inc | 2 +
meta/lib/oe/package_manager.py | 14 +-
.../rpm/rpm/0001-define-EM_AARCH64.patch | 2 +-
...arseArgvString-to-parse-the-_gpg_check_pa.patch | 2 +-
.../beecrypt-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 42815 bytes
meta/recipes-devtools/rpm/rpm/debugedit-segv.patch | 48 +-
...debugedit-valid-file-to-fix-segment-fault.patch | 2 +-
.../rpm/rpm/fstack-protector-configure-check.patch | 21 -
.../rpm/rpm/header-include-fix.patch | 12 +-
.../rpm/rpm/lua-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 269940 bytes
.../rpm/rpm/makefile-am-exec-hook.patch | 2 +-
.../rpm/popt-disable-auto-stack-protector.patch | 27 +
.../rpm/rpm/python-rpm-rpmsense.patch | 32 +-
.../rpm/rpm/rpm-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 2239384 bytes
meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch | 73 ++
meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch | 2 +-
meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch | 43 +-
meta/recipes-devtools/rpm/rpm/rpm-db60.patch | 56 +
.../rpm/rpm/rpm-disable-Wno-override-init.patch | 32 -
.../rpm/rpm/rpm-disable-auto-stack-protector.patch | 24 +
.../rpm/rpm/rpm-disable-blaketest.patch | 28 +
.../rpm/rpm/rpm-fix-logio-cp.patch | 2 +-
.../rpm/rpm/rpm-fix-parseEmbedded.patch | 27 +
meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch | 61 ++
.../rpm/rpm/rpm-hardlink-segfault-fix.patch | 2 +-
.../rpm/rpm/rpm-keccak-sse-intrin.patch | 27 +
...ction.c-fix-file-conflicts-for-mips64-N32.patch | 2 +-
meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch | 2 +-
.../rpm/rpm/rpm-lsb-compatibility.patch | 2 +-
.../rpm/rpm/rpm-lua-fix-print.patch | 104 --
...rpm-macros.in-disable-external-key-server.patch | 16 +-
.../rpm/rpm/rpm-mongodb-sasl.patch | 69 ++
meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch | 2 +-
...b-before-verifyscript-to-avoid-null-point.patch | 2 +-
.../rpm/rpm/rpm-packageorigin.patch | 2 +-
.../rpm/rpm/rpm-payload-use-hashed-inode.patch | 22 +-
.../rpm/rpm/rpm-pkgconfigdeps.patch | 10 +-
.../rpm/rpm/rpm-platform-file-fix.patch | 2 +-
meta/recipes-devtools/rpm/rpm/rpm-platform.patch | 2 +-
meta/recipes-devtools/rpm/rpm/rpm-platform2.patch | 4 +-
meta/recipes-devtools/rpm/rpm/rpm-py-init.patch | 16 +-
.../rpm/rpm/rpm-python-AddErase.patch | 35 +
.../rpm/rpm/rpm-python-restore-origin.patch | 49 +
.../rpm/rpm/rpm-python-tagname.patch | 24 +
.../rpm/rpm/rpm-remove-sykcparse-decl.patch | 14 -
meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch | 2 +-
.../rpm/rpm/rpm-rpmdb-grammar.patch | 124 +++
.../rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch | 2 +-
.../rpm/rpm/rpm-rpmio-headers.patch | 19 +
meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch | 67 --
.../recipes-devtools/rpm/rpm/rpm-rpmpgp-popt.patch | 26 +
.../rpm/rpm/rpm-scriptletexechelper.patch | 29 +-
.../rpm/rpm/rpm-syck-fix-gram.patch | 1081 ++++++++++++++++++++
.../rpm-tag-generate-endian-conversion-fix.patch | 2 +-
.../rpm/rpm/rpm-tagname-type.patch | 25 +
.../rpm/rpm/rpm-tools-mtree-LDFLAGS.patch | 2 +-
meta/recipes-devtools/rpm/rpm/rpmatch.patch | 32 +-
.../recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch | 27 +-
.../rpm/syck-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 4837 bytes
meta/recipes-devtools/rpm/rpm/uclibc-support.patch | 38 +-
...broken-logic-for-ghost-avoidance-Mark-Hat.patch | 38 -
meta/recipes-devtools/rpm/rpm_5.4+cvs.bb | 302 +++++-
.../rpm/{rpm_5.4.14.bb => rpm_5.4.16.bb} | 197 +++-
meta/recipes-devtools/rpm/rpmresolve_1.0.bb | 2 +-
meta/recipes-support/db/db_6.0.30.bb | 2 +-
65 files changed, 2368 insertions(+), 569 deletions(-)
create mode 100644 meta/recipes-devtools/rpm/rpm/beecrypt-5.4.15-to-5.4.16-20160225.patch.gz
delete mode 100644 meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/lua-5.4.15-to-5.4.16-20160225.patch.gz
create mode 100644 meta/recipes-devtools/rpm/rpm/popt-disable-auto-stack-protector.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-5.4.15-to-5.4.16-20160225.patch.gz
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-db60.patch
delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-disable-auto-stack-protector.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-disable-blaketest.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-keccak-sse-intrin.patch
delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-lua-fix-print.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-python-AddErase.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-python-restore-origin.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-python-tagname.patch
delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmdb-grammar.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmio-headers.patch
delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-popt.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-syck-fix-gram.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-tagname-type.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/syck-5.4.15-to-5.4.16-20160225.patch.gz
delete mode 100644 meta/recipes-devtools/rpm/rpm/verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch
rename meta/recipes-devtools/rpm/{rpm_5.4.14.bb => rpm_5.4.16.bb} (81%)Signature · 1 line
2.5.0
PATCH v4 1/7 rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head
meta/lib/oe/package_manager.py was also updated. This ensures that any diagnostic messages are ignored from the output of rpmresolve.
The patches have been split into bug fixes (things that belong upstream) and local changes that are OE specific.
The following patches are obsolete and have been removed:
rpm-remove-sykcparse-decl.patch fstack-protector-configure-check.patch rpm-disable-Wno-override-init.patch rpm-lua-fix-print.patch
rpm-rpmpgp-fix.patch verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch
---
meta/lib/oe/package_manager.py | 14 +-
meta/recipes-devtools/rpm/rpm/debugedit-segv.patch | 46 +-
.../rpm/rpm/fstack-protector-configure-check.patch | 21 -
.../rpm/rpm/header-include-fix.patch | 10 +
.../rpm/popt-disable-auto-stack-protector.patch | 27 +
.../rpm/rpm/python-rpm-rpmsense.patch | 30 +-
meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch | 73 ++
meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch | 43 +-
meta/recipes-devtools/rpm/rpm/rpm-db60.patch | 56 +
.../rpm/rpm/rpm-disable-Wno-override-init.patch | 32 -
.../rpm/rpm/rpm-disable-auto-stack-protector.patch | 24 +
.../rpm/rpm/rpm-disable-blaketest.patch | 28 +
.../rpm/rpm/rpm-fix-parseEmbedded.patch | 27 +
meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch | 61 ++
.../rpm/rpm/rpm-keccak-sse-intrin.patch | 27 +
.../rpm/rpm/rpm-lua-fix-print.patch | 104 --
...rpm-macros.in-disable-external-key-server.patch | 16 +-
.../rpm/rpm/rpm-mongodb-sasl.patch | 69 ++
.../rpm/rpm/rpm-payload-use-hashed-inode.patch | 20 -
.../rpm/rpm/rpm-pkgconfigdeps.patch | 10 +-
meta/recipes-devtools/rpm/rpm/rpm-py-init.patch | 16 +-
.../rpm/rpm/rpm-python-AddErase.patch | 35 +
.../rpm/rpm/rpm-python-restore-origin.patch | 49 +
.../rpm/rpm/rpm-python-tagname.patch | 24 +
.../rpm/rpm/rpm-remove-sykcparse-decl.patch | 14 -
.../rpm/rpm/rpm-rpmdb-grammar.patch | 124 +++
.../rpm/rpm/rpm-rpmio-headers.patch | 19 +
meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch | 67 --
.../recipes-devtools/rpm/rpm/rpm-rpmpgp-popt.patch | 26 +
.../rpm/rpm/rpm-scriptletexechelper.patch | 29 +-
.../rpm/rpm/rpm-syck-fix-gram.patch | 1081 ++++++++++++++++++++
.../rpm/rpm/rpm-tagname-type.patch | 25 +
meta/recipes-devtools/rpm/rpm/rpmatch.patch | 30 +-
.../recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch | 27 +-
meta/recipes-devtools/rpm/rpm/uclibc-support.patch | 36 +-
...broken-logic-for-ghost-avoidance-Mark-Hat.patch | 38 -
meta/recipes-devtools/rpm/rpm_5.4+cvs.bb | 225 +++-
.../rpm/{rpm_5.4.14.bb => rpm_5.4.16.bb} | 120 ++-
38 files changed, 2189 insertions(+), 534 deletions(-)
delete mode 100644 meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/popt-disable-auto-stack-protector.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-db60.patch
delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-disable-auto-stack-protector.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-disable-blaketest.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-keccak-sse-intrin.patch
delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-lua-fix-print.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-python-AddErase.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-python-restore-origin.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-python-tagname.patch
delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmdb-grammar.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmio-headers.patch
delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-popt.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-syck-fix-gram.patch
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-tagname-type.patch
delete mode 100644 meta/recipes-devtools/rpm/rpm/verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch
rename meta/recipes-devtools/rpm/{rpm_5.4.14.bb => rpm_5.4.16.bb} (90%)meta/lib/oe/package_manager.py +9 -5
@@ -418,11 +418,15 @@ class RpmPkgsList(PkgsList): # Populate deps dictionary for better manipulation for line in dependencies.splitlines(): - pkg, dep = line.split("|") - if not pkg in deps: - deps[pkg] = list() - if not dep in deps[pkg]: - deps[pkg].append(dep) + try: + pkg, dep = line.split("|") + if not pkg in deps: + deps[pkg] = list() + if not dep in deps[pkg]: + deps[pkg].append(dep) + except: + # Ignore any other lines they're debug or errors + pass for line in tmp_output.split('\n'): if len(line.strip()) == 0:
meta/recipes-devtools/rpm/rpm/debugedit-segv.patch +24 -22
81 lines not on this page · raw message
meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch deleted +0 -21
@@ -1,21 +0,0 @@ -Some options checked in this loop are needing linking to find out -if the option can be used or not e.g. -fstack-protector which needs -libssp to be staged and available for compiler to link against -Therefore we change the compile only check to compile and link check - -Signed-off-by: Khem Raj <[email protected]> -Upstream-Status: Pending - -Index: rpm-5.4.14/configure.ac -=================================================================== ---- rpm-5.4.14.orig/configure.ac -+++ rpm-5.4.14/configure.ac -@@ -201,7 +201,7 @@ dnl # GNU GCC (usually "gcc") - my_save_cflags="$CFLAGS" - CFLAGS=$c - AC_MSG_CHECKING([whether GCC supports $c]) -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([])], - [AC_MSG_RESULT([yes])] - [my_cflags=$c], - [AC_MSG_RESULT([no])]
meta/recipes-devtools/rpm/rpm/header-include-fix.patch +10 -0
@@ -1,5 +1,15 @@ +Update two rpm headers to include other headers. + +Using rpmdb.h w/o including errno.h may result in a warning. + +Using rpmtag.h w/o also adding stdint.h will result in numerous failures +about unknown types on modern compilers. + Upstream-Status: Pending +Signed-off-by: Qing He <[email protected]> +Signed-off-by: Mark Hatle <[email protected]> + Index: rpm-5.4.14/rpmdb/rpmdb.h =================================================================== --- rpm-5.4.14.orig/rpmdb/rpmdb.h
meta/recipes-devtools/rpm/rpm/popt-disable-auto-stack-protector.patch new file +27 -0
@@ -0,0 +1,27 @@ +popt: Disable default stack protection on internal version of popt + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mark Hatle <[email protected]> + +Index: rpm-5.4.15/popt/configure.ac +=================================================================== +--- rpm-5.4.15.orig/popt/configure.ac ++++ rpm-5.4.15/popt/configure.ac +@@ -123,7 +123,6 @@ AS_IF([test "x$popt_gcc_warnings" = xyes + popt_CFLAGS_ADD([-Wjump-misses-init],[POPT_CFLAGS]) + popt_CFLAGS_ADD([-Wno-format-nonliteral],[POPT_CFLAGS]) + popt_CFLAGS_ADD([-Wframe-larger-than=$MAX_STACK_SIZE],[POPT_CFLAGS]) +- popt_CFLAGS_ADD([-fstack-protector-all],[POPT_CFLAGS]) + popt_CFLAGS_ADD([-fasynchronous-unwind-tables],[POPT_CFLAGS]) + popt_CFLAGS_ADD([-fdiagnostics-show-option],[POPT_CFLAGS]) + popt_CFLAGS_ADD([-funit-at-a-time],[POPT_CFLAGS]) +@@ -203,7 +202,7 @@ AC_SUBST([POPT_LDFLAGS]) + # -fno-delete-null-pointer as the kernel does http://patchwork.kernel.org/patch/36060/ + # GNU GCC (usually "gcc") + AS_IF([test "x$GCC" != x], +- [ for c in -fno-delete-null-pointer-checks -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector -fexceptions ++ [ for c in -fno-delete-null-pointer-checks -fexceptions + do + popt_CFLAGS_ADD([$c], [POPT_CFLAGS]) + done
meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch +14 -16
@@ -8,26 +8,24 @@ Upstream-Status: Pending Signed-off-by: Mark Hatle <[email protected]> -Index: rpm-5.4.14/python/rpmmodule.c +Index: rpm/python/rpmmodule.c =================================================================== ---- rpm-5.4.14.orig/python/rpmmodule.c -+++ rpm-5.4.14/python/rpmmodule.c -@@ -494,12 +494,16 @@ void init_rpm(void) - REGISTER_ENUM(RPMSENSE_EQUAL); - REGISTER_ENUM(RPMSENSE_NOTEQUAL); - REGISTER_ENUM(RPMSENSE_FIND_REQUIRES); --#if defined(RPM_VENDOR_MANDRIVA) -+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE) +--- rpm.orig/python/rpmmodule.c ++++ rpm/python/rpmmodule.c +@@ -525,12 +525,15 @@ static int initModule(PyObject *m) REGISTER_ENUM(RPMSENSE_PREREQ); + REGISTER_ENUM(RPMSENSE_PRETRANS); + REGISTER_ENUM(RPMSENSE_INTERP); ++#else ++ #if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE) REGISTER_ENUM(RPMSENSE_SCRIPT_PRE); REGISTER_ENUM(RPMSENSE_SCRIPT_POST); REGISTER_ENUM(RPMSENSE_SCRIPT_PREUN); -- REGISTER_ENUM(RPMSENSE_SCRIPT_POSTUN) -+ REGISTER_ENUM(RPMSENSE_SCRIPT_POSTUN); -+#endif -+ -+#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE) + REGISTER_ENUM(RPMSENSE_SCRIPT_POSTUN); + REGISTER_ENUM(RPMSENSE_SCRIPT_VERIFY); +-#else + REGISTER_ENUM(RPMSENSE_MISSINGOK); ++ #endif + REGISTER_ENUM(RPMSENSE_NOTEQUAL); #endif - - REGISTER_ENUM(RPMDEPS_FLAG_NOUPGRADE); + REGISTER_ENUM(RPMSENSE_FIND_REQUIRES);
meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch new file +73 -0
73 lines not on this page · raw message
meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch +20 -23
110 lines not on this page · raw message
meta/recipes-devtools/rpm/rpm/rpm-db60.patch new file +56 -0
56 lines not on this page · raw message
meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 70d881873b443c9bad502db9665595455d4f0ac9 Mon Sep 17 00:00:00 2001 -From: Robert Yang <[email protected]> -Date: Tue, 8 Jul 2014 07:41:10 +0800 -Subject: [PATCH] configure.ac: disable -Wno-override-init - -Fixed rpm-native.do_configure error on CentOS 5.x: - -cc1: error: unrecognized command line option "-Wno-override-init" - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index adeffe0..6746b4c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -163,7 +163,7 @@ AC_ARG_ENABLE(build-warnings, - # XXX gcc-4.2 on Mac OS X hasn't - # CFLAGS="$CFLAGS -Wno-unused-but-set-variable" - # XXX rpmio/set.c needs this -- CFLAGS="$CFLAGS -Wno-override-init" -+# CFLAGS="$CFLAGS -Wno-override-init" - elif test ".`$CC -V 2>&1 | grep 'Sun C'`" != .; then - dnl # Sun Studio (usually "cc") - CFLAGS="$CFLAGS -v" --- -1.8.2.1 -
meta/recipes-devtools/rpm/rpm/rpm-disable-auto-stack-protector.patch new file +24 -0
@@ -0,0 +1,24 @@ +Make security switches manual settings + +RPM checks for the availability of the stack protector switch and +transactional-memory support. If supported it unconditionally +enables the compiler options which can cause errors if the support has +not been built into the compiler. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mark Hatle <[email protected]> + +Index: rpm-5.4.15/configure.ac +=================================================================== +--- rpm-5.4.15.orig/configure.ac ++++ rpm-5.4.15/configure.ac +@@ -425,7 +425,7 @@ dnl # rpm_CFLAGS_ADD([-fstack-arrays],[ + dnl # build RPM instrumented for extra optimization/security (GCC only) + dnl # --- other optimizations + rpm_CFLAGS_ADD([-fexceptions], [RPM_CFLAGS]) +- rpm_CFLAGS_ADD([-D_FORTIFY_SOURCE=2 -fstack-protector], [RPM_CFLAGS]) ++dnl rpm_CFLAGS_ADD([-D_FORTIFY_SOURCE=2 -fstack-protector], [RPM_CFLAGS]) + dnl # rpm_CFLAGS_ADD([-fstack-protector-all],[RPM_CFLAGS]) + + if test \( ".`$CC --version 2>&1 | grep 'GCC'`" != . \); then
meta/recipes-devtools/rpm/rpm/rpm-disable-blaketest.patch new file +28 -0
@@ -0,0 +1,28 @@ +rpmio: Disable building of the tblake2 test(s). + +There is some type of a dependency fault here that can occasionally result in: + +gcc: error: tblake2b.o: No such file or directory +or +gcc: error: tblake2bp.o: No such file or directory + +These items are simply test cases that are not packaged, so they can be +safely disabled to resolve the dependency issue. + +Upstream-Status: Inappropriate [workaround] + +Signed-off-by: Mark Hatle <[email protected]> + +Index: rpm-5.4.15/rpmio/Makefile.am +=================================================================== +--- rpm-5.4.15.orig/rpmio/Makefile.am ++++ rpm-5.4.15/rpmio/Makefile.am +@@ -29,7 +29,7 @@ EXTRA_PROGRAMS += bsdiff bspatch pcrsed + tmire todbc toid tperl tpython tput trpmio tsexp tsvn tsw ttcl \ + dumpasn1 lookup3 trel twitter github tmicrojson duk + +-noinst_PROGRAMS += b2sum tset tblake2b tblake2bp tblake2s tblake2sp tgfs ++#noinst_PROGRAMS += b2sum tset tblake2b tblake2bp tblake2s tblake2sp tgfs + if WITH_LIBGIT2 + noinst_PROGRAMS += tgit + else
meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch new file +27 -0
@@ -0,0 +1,27 @@ +Fix an issue where parseEmbedded is not defined, but is still used. + +Upstream-Status: Pending + +Signed-off-by: Mark Hatle <[email protected]> + +Index: rpm/rpmio/macro.c +=================================================================== +--- rpm.orig/rpmio/macro.c ++++ rpm/rpmio/macro.c +@@ -1616,8 +1616,6 @@ exit: + * @retval *avp invocation args + * @return script string + */ +-#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_MOZJS) || defined(WITH_JNIEMBED) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_MRUBY_EMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL) +- + static char _FIXME_embedded_interpreter_eval_returned_null[] = + "FIXME: embedded interpreter eval returned null."; + +@@ -1668,7 +1666,6 @@ bingo: + script[nb] = '\0'; + return script; + } +-#endif + + /** + * The main macro recursion loop.
meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch new file +61 -0
61 lines not on this page · raw message
meta/recipes-devtools/rpm/rpm/rpm-keccak-sse-intrin.patch new file +27 -0
@@ -0,0 +1,27 @@ +rpm - rpmio/keccak.c: make SSE/MMX dependent upon gcc config + +Upstream-Status: Pending + +Signed-off-by: Mark Hatle <[email protected]> + +Index: rpm-5.4.15/rpmio/keccak.c +=================================================================== +--- rpm-5.4.15.orig/rpmio/keccak.c ++++ rpm-5.4.15/rpmio/keccak.c +@@ -17,9 +17,13 @@ http://keccak.noekeon.org/ + #if OPTIMIZED == 64 + /* ===== "KeccakOpt64-settings.h" */ + #define Unrolling 18 +-//#define UseBebigokimisa +-#define UseSSE +-//#define UseMMX ++#if defined(__SSE2__) ++ #define UseSSE ++#elif defined(__MMX__) ++ #define UseMMX ++#else ++ #define UseBebigokimisa ++#endif + /* ===== */ + #endif +
meta/recipes-devtools/rpm/rpm/rpm-lua-fix-print.patch deleted +0 -104
104 lines not on this page · raw message
meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch +10 -6
@@ -12,16 +12,20 @@ it's easy enough to do by enabling the necessary macros. Signed-off-by: yzhu1 <[email protected]> Signed-off-by: Mark Hatle <[email protected]> ---- a/macros/macros.in -+++ b/macros/macros.in -@@ -546,8 +546,8 @@ $_arbitrary_tags_tests Foo:Bar +Index: rpm/macros/macros.in +=================================================================== +--- rpm.orig/macros/macros.in ++++ rpm/macros/macros.in +@@ -563,10 +563,10 @@ $_arbitrary_tags_tests Foo:Bar + # Horowitz Key Protocol server configuration # +-%_hkp_keyserver hkp://keys.rpm5.org ++#%_hkp_keyserver hkp://keys.rpm5.org #%_hkp_keyserver hkp://keys.n3npq.net --%_hkp_keyserver hkp://pool.sks-keyservers.net + #%_hkp_keyserver hkp://pool.sks-keyservers.net -%_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search= -+#%_hkp_keyserver hkp://pool.sks-keyservers.net +#%_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search= - %_nssdb_path /etc/pki/nssdb + # NSS_InitContext() parameter configuration
meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch new file +69 -0
69 lines not on this page · raw message
meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch +0 -20
@@ -124,23 +124,3 @@ Index: rpm-5.4.14/build/files.c } ui32 = fl->totalFileSize; -Index: rpm-5.4.14/lib/fsm.c -=================================================================== ---- rpm-5.4.14.orig/lib/fsm.c -+++ rpm-5.4.14/lib/fsm.c -@@ -904,6 +904,7 @@ int fsmMapAttrs(IOSM_t fsm) - - if (fi && i >= 0 && i < (int) fi->fc) { - mode_t perms = (S_ISDIR(st->st_mode) ? fi->dperms : fi->fperms); -+ ino_t finalInode = (fi->finodes ? (ino_t)fi->finodes[i] : 0); - mode_t finalMode = (fi->fmodes ? (mode_t)fi->fmodes[i] : perms); - dev_t finalRdev = (dev_t)(fi->frdevs ? fi->frdevs[i] : 0); - rpmuint32_t finalMtime = (fi->fmtimes ? fi->fmtimes[i] : 0); -@@ -943,6 +944,7 @@ int fsmMapAttrs(IOSM_t fsm) - if ((S_ISCHR(st->st_mode) || S_ISBLK(st->st_mode)) - && st->st_nlink == 0) - st->st_nlink = 1; -+ st->st_ino = finalInode; - st->st_rdev = finalRdev; - st->st_mtime = finalMtime; - }
meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch +5 -5
@@ -9,14 +9,14 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Mark Hatle <[email protected]> -Index: rpm-5.4.14/scripts/pkgconfigdeps.sh +Index: rpm/scripts/pkgconfigdeps.sh =================================================================== ---- rpm-5.4.14.orig/scripts/pkgconfigdeps.sh -+++ rpm-5.4.14/scripts/pkgconfigdeps.sh +--- rpm.orig/scripts/pkgconfigdeps.sh ++++ rpm/scripts/pkgconfigdeps.sh @@ -18,8 +18,8 @@ case $1 in *.pc) # Query the dependencies of the package. - DIR=`dirname ${filename}` + DIR=$(dirname ${filename}) - PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" - export PKG_CONFIG_PATH + PKG_CONFIG_LIBDIR="$DIR:$DIR/../../share/pkgconfig"
@@ -27,7 +27,7 @@ Index: rpm-5.4.14/scripts/pkgconfigdeps.sh @@ -42,8 +42,8 @@ case $1 in [ -n "$oneshot" ] && echo "$oneshot"; oneshot="" # Query the dependencies of the package. - DIR=`dirname ${filename}` + DIR=$(dirname ${filename}) - PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" - export PKG_CONFIG_PATH + PKG_CONFIG_LIBDIR="$DIR:$DIR/../../share/pkgconfig"
meta/recipes-devtools/rpm/rpm/rpm-py-init.patch +9 -7
@@ -11,15 +11,17 @@ Upstream-Status: Pending Signed-off-by: Mark Hatle <[email protected]> -Index: rpm-5.4.14/python/rpmmodule.c +Index: rpm/python/rpmmodule.c =================================================================== ---- rpm-5.4.14.orig/python/rpmmodule.c -+++ rpm-5.4.14/python/rpmmodule.c -@@ -392,7 +392,8 @@ void init_rpm(void) - if (Py_AtExit(rpm_exithook) == -1) - return; +--- rpm.orig/python/rpmmodule.c ++++ rpm/python/rpmmodule.c +@@ -382,9 +382,8 @@ static int initModule(PyObject *m) + /* XXX add --noparentdirs --nolinktos to rpmtsCheck() */ + global_depFlags = (RPMDEPS_FLAG_NOPARENTDIRS | RPMDEPS_FLAG_NOLINKTOS); -- rpmReadConfigFiles(NULL, NULL); +- /* failure to initialize rpm (crypto and all) is rather fatal too... */ +- if (rpmReadConfigFiles(NULL, NULL) == -1) +- return 0; + const char *argv[1] = {"rpmmodule", 0}; + rpmcliInit(1, argv, NULL);
meta/recipes-devtools/rpm/rpm/rpm-python-AddErase.patch new file +35 -0
@@ -0,0 +1,35 @@ +rpm/python: The RPM5 API requires a hdrNum to be passed in + +The former behavior of passing in -1 as the hdrNum resulting in erase +operations that did not complete, but also did not error. Changing to +using the header instance resolves this problem. + +Upstream-Status: Pending + +Signed-off-by: Mark Hatle <[email protected]> + +Index: rpm-5.4.15/python/rpmts-py.c +=================================================================== +--- rpm-5.4.15.orig/python/rpmts-py.c ++++ rpm-5.4.15/python/rpmts-py.c +@@ -241,12 +241,19 @@ static PyObject * + rpmts_AddErase(rpmtsObject * s, PyObject * args) + { + Header h; ++ uint32_t hdrNum; + + if (!PyArg_ParseTuple(args, "O&:AddErase", hdrFromPyObject, &h)) + return NULL; + +-SPEW((stderr, "*** %s(%p,%p) ts %p\n", __FUNCTION__, s, h, s->ts)); ++ hdrNum = headerGetInstance(h); ++ ++SPEW((stderr, "*** %s(%p,%p) ts %p hdrNum %ld\n", __FUNCTION__, s, h, s->ts, hdrNum)); ++#ifdef REFERENCE /* this doesn't work, RPM5 requires a unique hdrNum */ + return PyBool_FromLong(rpmtsAddEraseElement(s->ts, h, -1) == 0); ++#else ++ return PyBool_FromLong(rpmtsAddEraseElement(s->ts, h, hdrNum) == 0); ++#endif + } + + static int
meta/recipes-devtools/rpm/rpm/rpm-python-restore-origin.patch new file +49 -0
49 lines not on this page · raw message
meta/recipes-devtools/rpm/rpm/rpm-python-tagname.patch new file +24 -0
@@ -0,0 +1,24 @@ +rpm-python-module: Change the extension tag from PyCObject to PyInt + +Use the tagValue to determine the custom PyInt value to use for the extension +tag. Without this, any custom tag extensions will be returned in a format +that the tagNumFromPyObject and related functions like hdr_subscript will +failed to process. Usually the failure is error: expected a string or integer + +Upstream-Status: Pending + +Signed-off-by: Mark Hatle <[email protected]> + +Index: rpm-5.4.15/python/rpmmodule.c +=================================================================== +--- rpm-5.4.15.orig/python/rpmmodule.c ++++ rpm-5.4.15/python/rpmmodule.c +@@ -316,7 +316,7 @@ static void addRpmTags(PyObject *module) + { + if (ext->name == NULL || ext->type != HEADER_EXT_TAG) + continue; +- PyDict_SetItemString(d, (char *) ext->name, to=PyCObject_FromVoidPtr((void *)ext, NULL)); ++ PyDict_SetItemString(d, (char *) ext->name, to=PyInt_FromLong(tagValue(ext->name))); + Py_XDECREF(to); + PyDict_SetItem(dict, to, o=PyString_FromString(ext->name + 7)); + Py_XDECREF(o);
meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch deleted +0 -14
@@ -1,14 +0,0 @@ -Index: rpm-5.4.14/syck/lib/syck.h -=================================================================== ---- rpm-5.4.14.orig/syck/lib/syck.h -+++ rpm-5.4.14/syck/lib/syck.h -@@ -621,9 +621,6 @@ long syck_seq_count( SyckNode *seq ) - */ - void syckerror( char *msg ) - /*@*/; --int syckparse( void * ) -- /*@globals fileSystem @*/ -- /*@modifies fileSystem @*/; - /* XXX union YYSTYPE *sycklval has issues on Mac OS X. */ - int sycklex( void *_sycklval, SyckParser *parser ) - /*@modifies _sycklval, parser @*/;
meta/recipes-devtools/rpm/rpm/rpm-rpmdb-grammar.patch new file +124 -0
124 lines not on this page · raw message
meta/recipes-devtools/rpm/rpm/rpm-rpmio-headers.patch new file +19 -0
@@ -0,0 +1,19 @@ +Fix a typo in the rpmio Makefile.am + +Upstream-Status: Pending + +Signed-off-by: Mark Hatle <[email protected]> + +Index: rpm/rpmio/Makefile.am +=================================================================== +--- rpm.orig/rpmio/Makefile.am ++++ rpm/rpmio/Makefile.am +@@ -121,7 +121,7 @@ luaLPATHdir = ${pkgsharedir)/lua + + pkgincdir = $(pkgincludedir)$(WITH_PATH_VERSIONED_SUFFIX) + pkginc_HEADERS = argv.h mire.h rpmzlog.h yarn.h \ +- rpmbf.h rpmcb.h rpmio.h rpmlog.h rpmiotypes.h rpmmacro.h ++ rpmbf.h rpmcb.h rpmio.h rpmlog.h rpmiotypes.h rpmmacro.h \ + rpmpgp.h rpmsw.h rpmutil.h + noinst_HEADERS = \ + ar.h bcon.h bson.h cpio.h crc.h envvar.h fnmatch.h fts.h glob.h iosm.h \
meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch deleted +0 -67
67 lines not on this page · raw message
meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-popt.patch new file +26 -0
@@ -0,0 +1,26 @@ +rpmpgp.h: We do not require the popt header in order to use rpmpgp functions + +This can cause failures if the internal libpopt is used, as it's header is +not exported. + +Upstream-Status: Pending + +Signed-off-by: Mark Hatle <[email protected]> + +Index: rpm-5.4.14/rpmio/rpmpgp.h +=================================================================== +--- rpm-5.4.14.orig/rpmio/rpmpgp.h ++++ rpm-5.4.14/rpmio/rpmpgp.h +@@ -11,11 +11,11 @@ + */ + + #include <string.h> +-#include <popt.h> + #include <rpmiotypes.h> + #include <yarn.h> + + #if defined(_RPMPGP_INTERNAL) ++#include <popt.h> + #include <rpmsw.h> + + /*@unchecked@*/
meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch +14 -15
@@ -12,22 +12,21 @@ Upstream-Status: Pending Signed-off-by: Mark Hatle <[email protected]> -Index: rpm-5.4.14/lib/psm.c +Index: rpm/lib/psm.c =================================================================== ---- rpm-5.4.14.orig/lib/psm.c -+++ rpm-5.4.14/lib/psm.c -@@ -806,6 +806,10 @@ static rpmRC runScript(rpmpsm psm, Heade +--- rpm.orig/lib/psm.c ++++ rpm/lib/psm.c +@@ -846,6 +846,9 @@ static rpmRC runScript(rpmpsm psm, Heade + pid_t pid; int xx; int i; - +#ifdef RPM_VENDOR_OE + const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL); +#endif -+ - if (psm->sstates != NULL && ix >= 0 && ix < RPMSCRIPT_MAX) - ssp = psm->sstates + ix; - if (ssp != NULL) -@@ -872,14 +876,29 @@ assert(he->p.str != NULL); + + #ifdef __clang__ + #pragma clang diagnostic push +@@ -923,14 +926,29 @@ assert(he->p.str != NULL); (F_ISSET(psm, UNORDERED) ? "a" : "")); if (Phe->p.argv == NULL) {
@@ -63,7 +62,7 @@ Index: rpm-5.4.14/lib/psm.c ldconfig_done = (ldconfig_path && !strcmp(argv[0], ldconfig_path) ? 1 : 0); } -@@ -930,7 +949,12 @@ assert(he->p.str != NULL); +@@ -981,7 +999,12 @@ assert(he->p.str != NULL); goto exit; if (rpmIsDebug() &&
@@ -77,7 +76,7 @@ Index: rpm-5.4.14/lib/psm.c { static const char set_x[] = "set -x\n"; nw = Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); -@@ -1065,12 +1089,22 @@ assert(he->p.str != NULL); +@@ -1116,12 +1139,22 @@ assert(he->p.str != NULL); { const char * rootDir = rpmtsRootDir(ts); if (!rpmtsChrootDone(ts) && rootDir != NULL &&
@@ -100,7 +99,7 @@ Index: rpm-5.4.14/lib/psm.c xx = Chdir("/"); rpmlog(RPMLOG_DEBUG, D_("%s: %s(%s)\texecv(%s) pid %d\n"), psm->stepName, sln, NVRA, -@@ -2985,6 +3019,13 @@ assert(psm->te != NULL); +@@ -3052,6 +3085,13 @@ assert(psm->te != NULL); case PSM_SCRIPT: /* Run current package scriptlets. */ /* XXX running %verifyscript/%sanitycheck doesn't have psm->te */ { rpmtxn _parent = (psm && psm->te ? psm->te->txn : NULL);
@@ -114,7 +113,7 @@ Index: rpm-5.4.14/lib/psm.c xx = rpmtxnBegin(rpmtsGetRdb(ts), _parent, NULL); rc = runInstScript(psm); if (rc) -@@ -2992,11 +3033,24 @@ assert(psm->te != NULL); +@@ -3059,11 +3099,24 @@ assert(psm->te != NULL); else xx = rpmtxnCommit(rpmtsGetRdb(ts)->db_txn); rpmtsGetRdb(ts)->db_txn = NULL;
@@ -139,7 +138,7 @@ Index: rpm-5.4.14/lib/psm.c break; case PSM_IMMED_TRIGGERS: /* Run triggers in this package other package(s) set off. */ -@@ -3006,7 +3060,18 @@ assert(psm->te != NULL); +@@ -3073,7 +3126,18 @@ assert(psm->te != NULL); F_SET(psm, GOTTRIGGERS); } if (psm->triggers != NULL)
meta/recipes-devtools/rpm/rpm/rpm-syck-fix-gram.patch new file +1081 -0
1,081 lines not on this page · raw message
meta/recipes-devtools/rpm/rpm/rpm-tagname-type.patch new file +25 -0
@@ -0,0 +1,25 @@ +rpmdb/tagname.c: Add the 0x54aafb71 (filenames) type to rpmTagGetType + +There is already a workaround in the _tagName function to show that the +special 'filenames' item is value. This adds a similar patch to the +_tagType to return the proper type, otherwise it comes back as a simple +RPM_STRING_ARRAY_TYPE which limits the response to the first element. + +Upstream-Status: Pending + +Signed-off-by: Mark Hatle <[email protected]> + +Index: rpm-5.4.15/rpmdb/tagname.c +=================================================================== +--- rpm-5.4.15.orig/rpmdb/tagname.c ++++ rpm-5.4.15/rpmdb/tagname.c +@@ -353,6 +353,9 @@ static unsigned int _tagType(rpmTag tag) + case RPMDBI_RECNO: + case RPMDBI_HEAP: + break; ++ /* XXX make sure that h.['filenames'] in python "works". */ ++ case 0x54aafb71: ++ return (RPM_STRING_ARRAY_TYPE + RPM_ARRAY_RETURN_TYPE); + default: + if (_rpmTags.byValue == NULL) + break;
meta/recipes-devtools/rpm/rpm/rpmatch.patch +11 -19
@@ -1,5 +1,6 @@ -Add configure check for rpmatch() and -creates a compatable macro if it is not provided by the C library. +Create a compatable macro if rpmatch() is not provided by the C library. + +This uses an existing configure check. This is needed for uclibc since it does not have the above function implemented.
@@ -8,24 +9,15 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> -Index: rpm-5.4.14/configure.ac -=================================================================== ---- rpm-5.4.14.orig/configure.ac -+++ rpm-5.4.14/configure.ac -@@ -943,7 +943,7 @@ AC_CHECK_FUNCS([dnl - ftok getaddrinfo getattrlist getcwd getdelim getline getmode getnameinfo dnl - getpassphrase getxattr getwd iconv inet_aton lchflags lchmod lchown dnl - lgetxattr lsetxattr lutimes madvise mempcpy mkdtemp mkstemp mtrace dnl -- posix_fadvise posix_fallocate putenv realpath regcomp secure_getenv __secure_getenv dnl -+ posix_fadvise posix_fallocate putenv realpath regcomp rpmatch secure_getenv __secure_getenv dnl - setattrlist setenv setlocale setmode setxattr dnl - sigaddset sigdelset sigemptyset sighold sigrelse sigpause dnl - sigprocmask sigsuspend sigaction dnl -Index: rpm-5.4.14/system.h +Updated to rpm 5.4.15+. + +Signed-off-by: Mark Hatle <[email protected]> + +Index: rpm/system.h =================================================================== ---- rpm-5.4.14.orig/system.h -+++ rpm-5.4.14/system.h -@@ -353,6 +353,14 @@ extern int _tolower(int) __THROW /*@*/; +--- rpm.orig/system.h ++++ rpm/system.h +@@ -358,6 +358,14 @@ extern int _tolower(int) __THROW /*@*/; #include <libgen.h> #endif
meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch +16 -11
@@ -12,21 +12,26 @@ Upstream-Status: Inappropriate [other] Signed-off-by: Joe Slater <[email protected]> ---- a/Makefile.am -+++ b/Makefile.am -@@ -127,13 +127,13 @@ rpm_SOURCES = build.c - rpm_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) +Index: rpm/Makefile.am +=================================================================== +--- rpm.orig/Makefile.am ++++ rpm/Makefile.am +@@ -202,14 +202,16 @@ rpm_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAG rpm_LDADD = rpm.o $(myLDADD) rpm.o: $(top_srcdir)/rpmqv.c -- $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.cc -+ $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.c + ln -sf $< rpmqv.cc ++ ln -sf $< rpmqv.c +- $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c rpmqv.cc ++ $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c rpmqv.c rpmbuild_SOURCES = build.c rpmbuild_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) rpmbuild_LDADD = rpmbuild.o $(myLDADD) - rpmbuild.o: $(top_srcdir)/rpmqv.c -- $(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.cc -+ $(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.c + rpmbuild.o: $(top_srcdir)/rpmqv.c + ln -sf $< rpmqv.cc ++ ln -sf $< rpmqv.c +- $(COMPILE) -DIAM_RPMBT -o $@ -c rpmqv.cc ++ $(COMPILE) -DIAM_RPMBT -o $@ -c rpmqv.c - .PHONY: splint - splint: + .syntastic_c_config: Makefile + @echo $(COMPILE) | tr ' ' '\n' | sed -e '1d' > $@
meta/recipes-devtools/rpm/rpm/uclibc-support.patch +18 -18
@@ -4,10 +4,10 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> -Index: rpm-5.4.14/rpmio/rpmio.h +Index: rpm/rpmio/rpmio.h =================================================================== ---- rpm-5.4.14.orig/rpmio/rpmio.h -+++ rpm-5.4.14/rpmio/rpmio.h +--- rpm.orig/rpmio/rpmio.h ++++ rpm/rpmio/rpmio.h @@ -23,7 +23,8 @@ */ /*@{*/
@@ -18,11 +18,11 @@ Index: rpm-5.4.14/rpmio/rpmio.h #define USE_COOKIE_SEEK_POINTER 1 typedef _IO_off64_t _libio_off_t; typedef _libio_off_t * _libio_pos_t; -Index: rpm-5.4.14/system.h +Index: rpm/system.h =================================================================== ---- rpm-5.4.14.orig/system.h -+++ rpm-5.4.14/system.h -@@ -481,7 +481,7 @@ extern void muntrace (void) +--- rpm.orig/system.h ++++ rpm/system.h +@@ -489,7 +489,7 @@ extern void muntrace (void) #endif /* defined(__LCLINT__) */ /* Memory allocation via macro defs to get meaningful locations from mtrace() */
@@ -31,11 +31,11 @@ Index: rpm-5.4.14/system.h #define xmalloc(_size) (malloc(_size) ? : vmefail(_size)) #define xcalloc(_nmemb, _size) (calloc((_nmemb), (_size)) ? : vmefail(_size)) #define xrealloc(_ptr, _size) (realloc((_ptr), (_size)) ? : vmefail(_size)) -Index: rpm-5.4.14/lib/librpm.vers +Index: rpm/lib/librpm.vers =================================================================== ---- rpm-5.4.14.orig/lib/librpm.vers -+++ rpm-5.4.14/lib/librpm.vers -@@ -405,6 +405,10 @@ LIBRPM_0 +--- rpm.orig/lib/librpm.vers ++++ rpm/lib/librpm.vers +@@ -406,6 +406,10 @@ LIBRPM_0 specedit; strict_erasures; XrpmtsiInit;
@@ -46,14 +46,14 @@ Index: rpm-5.4.14/lib/librpm.vers local: *; }; -Index: rpm-5.4.14/rpmio/librpmio.vers +Index: rpm/rpmio/librpmio.vers =================================================================== ---- rpm-5.4.14.orig/rpmio/librpmio.vers -+++ rpm-5.4.14/rpmio/librpmio.vers -@@ -1056,6 +1056,10 @@ LIBRPMIO_0 - mongo_write_concern_set_mode; - mongo_write_concern_set_w; - mongo_write_concern_set_wtimeout; +--- rpm.orig/rpmio/librpmio.vers ++++ rpm/rpmio/librpmio.vers +@@ -1455,6 +1455,10 @@ LIBRPMIO_0 + _mongoc_write_result_init; + _mongoc_write_result_merge; + _mongoc_write_result_merge_legacy; + xmalloc; + xrealloc; + xcalloc;
meta/recipes-devtools/rpm/rpm/verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From 9e7b72ee0c994609975981e135fc18d0387aefb6 Mon Sep 17 00:00:00 2001 -From: jbj <jbj> -Date: Wed, 14 May 2014 21:19:41 +0000 -Subject: [PATCH] - verify: fix: broken logic for %ghost avoidance (Mark - Hatle). - -Upstream-Status: Backport - -Signed-off-by: Mark Hatle <[email protected]> ---- - CHANGES | 1 + - lib/verify.c | 3 +-- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: rpm-5.4.14/CHANGES -=================================================================== ---- rpm-5.4.14.orig/CHANGES -+++ rpm-5.4.14/CHANGES -@@ -1,3 +1,5 @@ -+ - jbj: verify: fix: broken logic for %ghost avoidance (Mark Hatle). -+ - 5.4.13 -> 5.4.14: - - mooney: use __sun instead of __sun__ in #define (lp#1243472). - - mooney: rpmconstant: ensure linkage w Oracle Studio 12.3 (lp#1243469). -Index: rpm-5.4.14/lib/verify.c -=================================================================== ---- rpm-5.4.14.orig/lib/verify.c -+++ rpm-5.4.14/lib/verify.c -@@ -588,8 +588,7 @@ uint32_t fc = rpmfiFC(fi); - continue; - - /* If not verifying %ghost, skip ghost files. */ -- /* XXX the broken!!! logic disables %ghost queries always. */ -- if (!(FF_ISSET(qva->qva_fflags, GHOST) && FF_ISSET(fflags, GHOST))) -+ if (!FF_ISSET(qva->qva_fflags, GHOST) && FF_ISSET(fflags, GHOST)) - continue; - - /* Gather per-file data into a carrier. */
meta/recipes-devtools/rpm/rpm_5.4+cvs.bb +175 -50
341 lines not on this page · raw message
meta/recipes-devtools/rpm/rpm_5.4.16.bb renamed from meta/recipes-devtools/rpm/rpm_5.4.14.bb +79 -41
31 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.5.0
Part of the diff is not shown here. View the raw message.
PATCH v4 2/7 security_flags.inc: Special flags are needed for RPM
In reply to Mark HatleRPM interally has support to build and work with the stack protector. This is disabled by default in the RPM package, and the proper settings should be specified in the security_flags. Using the default setting of stack-protector-strong causes linking problems due to issues with libtool selecting the wrong GCC objections to link against.
Falling back to the RPM values of stack-protector will permit linking to work properly, and some level of protection.
--- meta/conf/distro/include/security_flags.inc | 2 ++ 1 file changed, 2 insertions(+)
meta/conf/distro/include/security_flags.inc +2 -0
@@ -78,6 +78,8 @@ SECURITY_CFLAGS_pn-python-pycurl = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python-smartpm = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python-numpy = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python3 = "${SECURITY_NO_PIE_CFLAGS}" +# Revert RPM to using internally supported values +SECURITY_CFLAGS_pn-rpm = "${lcl_maybe_fortify} -fstack-protector" SECURITY_CFLAGS_pn-syslinux = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-tcl = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-tiff = "${SECURITY_NO_PIE_CFLAGS}"
Signature · 1 line
2.5.0
PATCH v4 3/7 rpm: Enable specific crypto and digest settings via variables
In reply to Mark HatleAllow the user to set the specific digest and non-repudiable signature algorithms. This should be done on a distribution wide basis.
See recipe for exact instructions, but values are now set using:RPM_FILE_DIGEST_ALGO (default 1 - md5)RPM_SELF_SIGN_ALGO (default DSA)
Also, change the PACKAGECONFIG to define the default crypto engine for RPM5. Not just the available crypto engines. If a crypto engine is not selected, the system will default to the internal beecrypt version.
--- meta/recipes-devtools/rpm/rpm_5.4+cvs.bb | 81 ++++++++++++++++++++++++++++++-- meta/recipes-devtools/rpm/rpm_5.4.16.bb | 81 ++++++++++++++++++++++++++++++-- 2 files changed, 152 insertions(+), 10 deletions(-)
meta/recipes-devtools/rpm/rpm_5.4+cvs.bb +76 -5
@@ -168,6 +168,68 @@ rpm_macros_class-nativesdk = "%{_usrlibrpm}/macros:%{_usrlibrpm}/${DISTRO}/macro # sqlite lua tcl augeas nss gcrypt neon xz xar keyutils perl selinux +# Set the digest algorithm used for verifying file integrity +# If this value changes, and two different packages have different values +# the "same file" validation (two packages have a non-conflict file) +# will fail. This may lead to upgrade problems. You should treat this +# value as a distribution wide setting, and only change it when you intend +# a full system upgrade! +# +# Defined file digest algorithm values (note: not all are available!): +# 1 MD5 (legacy RPM default) +# 2 SHA1 +# 3 RIPEMD-160 +# 5 MD2 +# 6 TIGER-192 +# 8 SHA256 +# 9 SHA384 +# 10 SHA512 +# 11 SHA224 +# 104 MD4 +# 105 RIPEMD-128 +# 106 CRC-32 +# 107 ADLER-32 +# 108 CRC-64 (ECMA-182 polynomial, untested uint64_t problems) +# 109 Jenkins lookup3.c hashlittle() +# 111 RIPEMD-256 +# 112 RIPEMD-320 +# 188 BLAKE2B +# 189 BLAKE2BP +# 190 BLAKE2S +# 191 BLAKE2SP +RPM_FILE_DIGEST_ALGO ?= "1" + +# All packages build with RPM5 contain a non-repudiable signature. +# The purpose of this signature is not to show authenticity of a package, +# but instead act as a secondary package wide validation that shows it +# wasn't damaged by accident in transport. (When later you sign the package, +# this signature may or may not be replaced as there are three signature +# slots, one for DSA/RSA, one for ECSDA, and one reserved.) +# +# There is a known issue w/ RSA signatures that if they start with an 0x00 +# the signing and validation may fail. +# +# The following is the list of choices for the non-rpudiable signature +# (note: not all of these are implemented): +# DSA (default) +# RSA (implies SHA1) +# ECDSA (implies SHA256) +# DSA/SHA1 +# DSA/SHA224 +# DSA/SHA256 +# DSA/SHA384 +# DSA/SHA512 +# RSA/SHA1 +# RSA/SHA224 +# RSA/SHA256 +# RSA/SHA384 +# RSA/SHA512 +# ECDSA/SHA224 (using NIST P-224) +# ECDSA/SHA256 (using NIST P-256) +# ECDSA/SHA384 (using NIST P-384) +# ECDSA/SHA512 (using NIST P-521) +RPM_SELF_SIGN_ALGO ?= "DSA" + # Note: perl and sqlite w/o db specified does not currently work. # tcl, augeas, nss, gcrypt, xar and keyutils support is untested. PACKAGECONFIG ??= "db bzip2 zlib popt openssl libelf python"
@@ -203,10 +265,17 @@ PACKAGECONFIG[db] = "${WITH_DB},--without-db,db," PACKAGECONFIG[sqlite] = "--with-sqlite,--without-sqlite,sqlite3," +# This switch simply disables external beecrypt, RPM5 always uses beecrypt +# for base64 processing and various digest algorithms. +# Beecrypt is only the preferred crypto engine if it's the only engine enabled. PACKAGECONFIG[beecrypt] = "--with-beecrypt=external,--with-beecrypt=internal,beecrypt," -PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," -PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss," -PACKAGECONFIG[gcrypt] = "--with-gcrypt,--without-gcrypt,gcrypt," + +# --with-usecrypto= setting defined the item as the preferred system +# crypto engine, which will take priority over the included beecrypt +PACKAGECONFIG[openssl] = "--with-openssl --with-usecrypto=openssl,--without-openssl,openssl," +PACKAGECONFIG[nss] = "--with-nss --with-usecrypto=nss,--without-nss,nss," +PACKAGECONFIG[gcrypt] = "--with-gcrypt --with-usecrypto=gcrypt,--without-gcrypt,gcrypt," + PACKAGECONFIG[keyutils] = "--with-keyutils,--without-keyutils,keyutils," PACKAGECONFIG[libelf] = "--with-libelf,--without-libelf,elfutils,"
@@ -450,8 +519,10 @@ do_configure() { } do_install_append() { - # Preserve the previous default of DSA self-signed pkgs - sed -i -e 's,%_build_sign.*,%_build_sign DSA,' ${D}/${libdir}/rpm/macros.rpmbuild + # Configure -distribution wide- package crypto settings + # If these change, effectively all packages have to be upgraded! + sed -i -e 's,%_build_file_digest_algo.*,%_build_sign ${RPM_FILE_DIGEST_ALGO},' ${D}/${libdir}/rpm/macros.rpmbuild + sed -i -e 's,%_build_sign.*,%_build_sign ${RPM_SELF_SIGN_ALGO},' ${D}/${libdir}/rpm/macros.rpmbuild sed -i -e 's,%__scriptlet_requires,#%%__scriptlet_requires,' ${D}/${libdir}/rpm/macros sed -i -e 's,%__perl_provides,#%%__perl_provides,' ${D}/${libdir}/rpm/macros ${D}/${libdir}/rpm/macros.d/*
meta/recipes-devtools/rpm/rpm_5.4.16.bb +76 -5
100 lines not on this page · raw message
Signature · 1 line
2.5.0
PATCH v2 4/7 rpm: A number of the patches have been submitted upstream
In reply to Mark HatleNote the upstream submission in the patches.
--- meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch | 2 +- .../0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch | 2 +- meta/recipes-devtools/rpm/rpm/debugedit-segv.patch | 2 +- .../rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch | 2 +- meta/recipes-devtools/rpm/rpm/header-include-fix.patch | 2 +- meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch | 2 +- meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-hardlink-segfault-fix.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-keccak-sse-intrin.patch | 2 +- .../rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch | 2 +- .../rpm/rpm/rpm-opendb-before-verifyscript-to-avoid-null-point.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-platform.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-platform2.patch | 4 ++-- meta/recipes-devtools/rpm/rpm/rpm-python-restore-origin.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-python-tagname.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-rpmio-headers.patch | 2 +- .../rpm/rpm/rpm-tag-generate-endian-conversion-fix.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-tagname-type.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpmatch.patch | 2 +- meta/recipes-devtools/rpm/rpm/uclibc-support.patch | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-)
meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch +1 -1
@@ -1,6 +1,6 @@ [PATCH] define EM_AARCH64 -Upstream-Status: pending +Upstream-Status: Submitted [RPM5 maintainer] EM_AARCH64 maybe not be defined due to old version elf.h, and lead to that debugedit can not work on aarch64 elf object files, since there is
meta/recipes-devtools/rpm/rpm/0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch +1 -1
@@ -4,7 +4,7 @@ Date: Tue, 11 Nov 2014 16:28:22 +0800 Subject: [PATCH] using poptParseArgvString to parse the _gpg_check_password_cmd -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Both __gpg_check_password_cmd and __gpg_sign_cmd include "%{_gpg_name}", but strace shows that gpg_name has a quote when run _gpg_check_password,
meta/recipes-devtools/rpm/rpm/debugedit-segv.patch +1 -1
@@ -11,7 +11,7 @@ Note: in all other places a backup copy was used, just not buildid processing. Also the process (...) function was modified to verify the data is not NULL as well. This is an extra check and is not strictly necessary. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch +1 -1
@@ -14,7 +14,7 @@ Before the above operations, invoke elf_begin/elf_update/elf_end with ELF_C_RDWR and ELF_F_LAYOUT set to enlarge the above file, it could make sure the file is safe for the following elf operations. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Hongxu Jia <[email protected]> --- tools/debugedit.c | 25 +++++++++++++++++++++++++
meta/recipes-devtools/rpm/rpm/header-include-fix.patch +1 -1
@@ -5,7 +5,7 @@ Using rpmdb.h w/o including errno.h may result in a warning. Using rpmtag.h w/o also adding stdint.h will result in numerous failures about unknown types on modern compilers. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Qing He <[email protected]> Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch +1 -1
@@ -14,7 +14,7 @@ install-exec-am. It also removed the dependency in install-data-hook on install-pkgbinPROGRAMS. This means install-pkgbinPROGRAMS will only be run once so there whould be any file contention. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Morgan Little <[email protected]>
meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch +1 -1
@@ -4,7 +4,7 @@ We want to see the RPMSENSE_SCRIPT values for use with SMART. We also want to see the MISSINGOK value so we can avoid recommended packages causing failures. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch +1 -1
@@ -7,7 +7,7 @@ Provide an alternative. This alternative function is based on code from: Code is under an Apache 2.0 License. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch +1 -1
@@ -14,7 +14,7 @@ This patch changes the list of supported items to: <arch>-<vendor>-<os> <arch>-<vendor>-<os>-<extension> -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-fix-logio-cp.patch +1 -1
@@ -1,7 +1,7 @@ Occasionally the cp -p fails with a non-zero return code. This will cause the system abort the build. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch +1 -1
@@ -1,6 +1,6 @@ Fix an issue where parseEmbedded is not defined, but is still used. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch +1 -1
@@ -3,7 +3,7 @@ configure.ac: Check if the current compiler supports the transactions Some distributions appear to have compilers that are built without support for transactions, even though they are GCC 4.7 or newer. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-hardlink-segfault-fix.patch +1 -1
@@ -8,7 +8,7 @@ are found. We need to fix the caller to check the return code too. RP 2014/6/10 -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Index: rpm-5.4.14/lib/fsm.c ===================================================================
meta/recipes-devtools/rpm/rpm/rpm-keccak-sse-intrin.patch +1 -1
@@ -1,6 +1,6 @@ rpm - rpmio/keccak.c: make SSE/MMX dependent upon gcc config -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-lib-transaction.c-fix-file-conflicts-for-mips64-N32.patch +1 -1
@@ -20,7 +20,7 @@ This caused the system to only permit a binary comparison - "new preferred" or else comparison the system will now perform a 'last-in-wins' resolution when "neither is preferred". -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Robert Yang <[email protected]> Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch +1 -1
@@ -2,7 +2,7 @@ During installation, the libtool relink attempts to link to -lrpm... The problem is that it hasn't been installed yet! So small change causes the libtool to instead use the build version. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-lsb-compatibility.patch +1 -1
@@ -5,7 +5,7 @@ appears to be invalid. Instead of relying solely on the platform comparison we also want to generate a perceived platform based on the valid rpm contents of arch and os. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch +1 -1
@@ -1,6 +1,6 @@ Fix errors when building with sasl2 disabled -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch +1 -1
@@ -1,6 +1,6 @@ lib/order.c: Make the dependency loop messages into debug msgs -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-opendb-before-verifyscript-to-avoid-null-point.patch +1 -1
@@ -6,7 +6,7 @@ rpmpsmStage function(rpmVerifyScript->rpmpsmScriptStage->rpmpsmStage) and occur fault because of null point(rpmtsGetRdb(ts) == NULL and rpmtsGetRdb(ts)->db_txn). So we open rpmdb to avoid bad input when find headerIsEntry true. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Zhixiong Chi <[email protected]> Index: rpm-5.4.14/lib/verify.c
meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch +1 -1
@@ -2,7 +2,7 @@ Add the ability to query the packageorigin Written by jbj at rpm5.org -Upstream-Status: Inappropriate [not author] +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-payload-use-hashed-inode.patch +1 -1
@@ -17,7 +17,7 @@ Patch taken from http://git.pld-linux.org/?p=packages/rpm.git;a=commitdiff;h=105 RP 2014/6/10 -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Index: rpm-5.4.14/build/files.c ===================================================================
meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch +1 -1
@@ -2,7 +2,7 @@ Don't add the first line of /etc/rpm/platform to the list of patterns to match when computing an arch score, use it just for getting information about the platform (cpu/vendor/os). Fixes #3864. -Upstream-Status: Inappropriate [embedded specific] +Upstream-Status: Submitted [RPM5 maintainer] Index: rpm-5.4.14/lib/rpmrc.c ===================================================================
meta/recipes-devtools/rpm/rpm/rpm-platform.patch +1 -1
@@ -1,6 +1,6 @@ Fix up platform and related sysinfo file loading. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] This ensures that RPM knows the compatible set of package types at all times.
meta/recipes-devtools/rpm/rpm/rpm-platform2.patch +2 -2
@@ -1,7 +1,5 @@ Fix up platform and related sysinfo file loading (part 2). -Upstream-Status: Pending - We need to ensure that we set the _gnu flag somehow. We do this by reading from the platform file, and setting a new _platform_gnu and related vars.
@@ -11,6 +9,8 @@ values. The macros file uses the configure time defaults in _platform_... versions have not been defined. This preserves existing behavior, but ensures reasonable defaults are always available. +Upstream-Status: Submitted [RPM5 maintainer] + Signed-off-by: Mark Hatle <[email protected]> Index: rpm-5.4.14/lib/rpmrc.c
meta/recipes-devtools/rpm/rpm/rpm-python-restore-origin.patch +1 -1
@@ -2,7 +2,7 @@ Fix an issue where the PACKAGEORIGIN is not properly stored. Restore the rpmtsCallback fdSetOpen call and related code. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-python-tagname.patch +1 -1
@@ -5,7 +5,7 @@ tag. Without this, any custom tag extensions will be returned in a format that the tagNumFromPyObject and related functions like hdr_subscript will failed to process. Usually the failure is error: expected a string or integer -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch +1 -1
@@ -3,7 +3,7 @@ lib/rpmts.c: Ensure that we check both providename and filepaths When looking up a missing dependencies, such as /bin/sh, we need to lookup in both the providename and filepaths DB, not just the filepaths DB. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch +1 -1
@@ -9,7 +9,7 @@ getent: ELF 32-bit MSB executable, MIPS, N32 MIPS64 [snip] And "rpm -qp --filecolor" was wrong (it was 1, but should be 4). -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Robert Yang <[email protected]> ---
meta/recipes-devtools/rpm/rpm/rpm-rpmio-headers.patch +1 -1
@@ -1,6 +1,6 @@ Fix a typo in the rpmio Makefile.am -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-tag-generate-endian-conversion-fix.patch +1 -1
@@ -6,7 +6,7 @@ when the generating process is executed on different architectures. This patch resolves it by taking the byte order that host uses. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Ming Liu <[email protected]> ---
meta/recipes-devtools/rpm/rpm/rpm-tagname-type.patch +1 -1
@@ -5,7 +5,7 @@ special 'filenames' item is value. This adds a similar patch to the _tagType to return the proper type, otherwise it comes back as a simple RPM_STRING_ARRAY_TYPE which limits the response to the first element. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Mark Hatle <[email protected]>
meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch +1 -1
@@ -1,5 +1,5 @@ Source: None -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Author: Khem Raj <[email protected]> Date: 2011-03-03 Description:
meta/recipes-devtools/rpm/rpm/rpmatch.patch +1 -1
@@ -5,7 +5,7 @@ This uses an existing configure check. This is needed for uclibc since it does not have the above function implemented. -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Khem Raj <[email protected]>
meta/recipes-devtools/rpm/rpm/uclibc-support.patch +1 -1
@@ -1,6 +1,6 @@ Define the x* wrappers for uclibc as well -Upstream-Status: Pending +Upstream-Status: Submitted [RPM5 maintainer] Signed-off-by: Khem Raj <[email protected]>
Signature · 1 line
2.5.0
PATCH v4 5/7 rpmresolve: It is not necessary to manually specify -lpopt
In reply to Mark HatlePopt may be internal or external to rpm. Either way the rpm libraries will link properly with or without -lpopt.
--- meta/recipes-devtools/rpm/rpmresolve_1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/rpm/rpmresolve_1.0.bb +1 -1
@@ -11,7 +11,7 @@ SRC_URI = "file://rpmresolve.c" S = "${WORKDIR}" do_compile() { - ${CC} ${CFLAGS} -ggdb -I${STAGING_INCDIR}/rpm ${LDFLAGS} rpmresolve.c -o rpmresolve -lrpmbuild -lrpm -lrpmio -lrpmdb -lpopt + ${CC} ${CFLAGS} -ggdb -I${STAGING_INCDIR}/rpm ${LDFLAGS} rpmresolve.c -o rpmresolve -lrpmbuild -lrpm -lrpmio -lrpmdb } do_install() {
Signature · 1 line
2.5.0
PATCH v4 6/7 db: remove the NO_UPDATE_REASON and replace it a comment about RPM
In reply to Mark Hatle--- meta/recipes-support/db/db_6.0.30.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/db/db_6.0.30.bb +1 -1
@@ -15,7 +15,7 @@ LICENSE = "AGPL-3.0" VIRTUAL_NAME ?= "virtual/db" RCONFLICTS_${PN} = "db3" -RECIPE_NO_UPDATE_REASON = "Updating to 6.1.x requires also updating rpm to 5.4.15" +# Note, when upgraded to 6.1.x, a patch in RPM will need to be removed to activate db 6.1 support. SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \
Signature · 1 line
2.5.0
PATCH v4 7/7 rpm: Temporarily provide the RPM patches (NOT NOT MERGE)
In reply to Mark HatleUntil we can make these available at a download site, temporarily include them.
--- .../rpm/beecrypt-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 42815 bytes .../rpm/rpm/lua-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 269940 bytes .../rpm/rpm/rpm-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 2239384 bytes .../rpm/rpm/syck-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 4837 bytes meta/recipes-devtools/rpm/rpm_5.4.16.bb | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-devtools/rpm/rpm/beecrypt-5.4.15-to-5.4.16-20160225.patch.gz create mode 100644 meta/recipes-devtools/rpm/rpm/lua-5.4.15-to-5.4.16-20160225.patch.gz create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-5.4.15-to-5.4.16-20160225.patch.gz create mode 100644 meta/recipes-devtools/rpm/rpm/syck-5.4.15-to-5.4.16-20160225.patch.gz
meta/recipes-devtools/rpm/rpm/beecrypt-5.4.15-to-5.4.16-20160225.patch.gz new file binary +0 -0
meta/recipes-devtools/rpm/rpm/lua-5.4.15-to-5.4.16-20160225.patch.gz new file binary +0 -0
meta/recipes-devtools/rpm/rpm/rpm-5.4.15-to-5.4.16-20160225.patch.gz new file binary +0 -0
meta/recipes-devtools/rpm/rpm/syck-5.4.15-to-5.4.16-20160225.patch.gz new file binary +0 -0
meta/recipes-devtools/rpm/rpm_5.4.16.bb +4 -4
@@ -51,10 +51,10 @@ DEPENDS_append_class-native = " file-replacement-native" S = "${WORKDIR}/rpm-5.4.15" SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm;extract=rpm-5.4.15.tar.gz \ - http://downloads.yoctoproject.org/releases/rpm5/rpm-5.4.15-to-5.4.16-20160225.patch.gz - http://downloads.yoctoproject.org/releases/rpm5/syck-5.4.15-to-5.4.16-20160225.patch.gz - http://downloads.yoctoproject.org/releases/rpm5/beecrypt-5.4.15-to-5.4.16-20160225.patch.gz - http://downloads.yoctoproject.org/releases/rpm5/lua-5.4.15-to-5.4.16-20160225.patch.gz + file://rpm-5.4.15-to-5.4.16-20160225.patch.gz + file://syck-5.4.15-to-5.4.16-20160225.patch.gz + file://beecrypt-5.4.15-to-5.4.16-20160225.patch.gz + file://lua-5.4.15-to-5.4.16-20160225.patch.gz file://perfile_rpmdeps.sh \ file://pythondeps.sh \ "
Signature · 1 line
2.5.0
One problem - target rpmresolve now fails to link:
| rpmresolve.c: In function 'getPackageStr':
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/include/rpm/rpmdb.h:1427:13:
warning: implicit declaration of function 'rpmioFreePoolItem' [-Wimplicit-function-declaration]
| ((rpmmi)rpmioFreePoolItem((rpmioItem)(_mi), __FUNCTION__, __FILE__,__LINE__))
| ^ | rpmresolve.c:54:11: note: in expansion of macro 'rpmmiFree' | (void)rpmmiFree(mi); | ^ | rpmresolve.c: In function 'printDepList': | rpmresolve.c:297:34: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] | prov = names[k]; | ^ | rpmresolve.c: In function 'main': | rpmresolve.c:388:5: warning: implicit declaration of function 'rpmcliInit' [-Wimplicit-function-declaration] | rpmcliInit(argc, argv, NULL); | ^ | /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmdb.so:
undefined reference to `_ITM_WaWU4'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmio.so:
undefined reference to `_ITM_beginTransaction'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmdb.so:
undefined reference to `_ITM_RfWU4'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmio.so:
undefined reference to `_ITM_commitTransaction'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmio.so:
undefined reference to `_ITM_RU4'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmio.so:
undefined reference to `_ITM_WU4'
| collect2: error: ld returned 1 exit status
The warnings are not great, but the fails are critical.
Interestingly rpmresolve-native works fine.
Ross
Quoted 198 lines · Mark Hatle
v4:
* Move large patches to externally downloaded
- Included in a commit to be testable, but that commit should not be
merged
* Disable default stack-protector for popt
* Fix AddErase API breakage
* Break popt header dependency
* Allow popt to be built internal (does not yet work, note caveat in recipe)
* Update 'security_flags.inc' to know about RPM
* rpmresolve remove unnecessary -lpoptV3:
* Update rpm-db5-or-db6.patch to remove potential host contamination
* Update rpm-disable-auto-stack-protector.patch to only disable the stack protector
* Add new patch: rpm-atomic-ops.patch
- Disable atomic operations in bson when the architecture does not
support them
* Add new patch: rpm-gnu-atomic.patch
- Dynamically detect and disable when -fgnu-tm/libitm support is not
available
* Add new patch: rpm-tagname-type.patch and rpm-python-tagname.patch
- Fix rpm-python legacy API regressions
* Add new patch: rpm-disable-blaketest.patch
- Disable building the blake test apps, they appear to have dep issues
in large
parallel builds.
* Update db-6.0.30 to make it clear that when it is updated, to also update RPM5.V2:
Fixed three issues
- Added Apache 2.0 license for specific mongodb code- Switch SSE usage dynamically in
rpmio/keccak.c
See rpm-keccak-sse-intrin.patch- Add support for architectures that do not support
sync_add_and_fetch_8See rpm-atomic-ops.patchAll of those changes are made in patch 1/3.
This has been built for all of the qemu* BSPs.
V1:
There is not yet an official RPM 5.4.16 release, however one will be coming soon. Until then, 4 distinct patches are used to upgrade RPM 5.4.15 to 5.4.16. These patches are part of the commit (compressed w/ .xz). However I am not sending them as part of the email as it's not very interesting to review base64. :PMany of the OE patches have been sent to the RPM 5 maintainer, and may be part of the official 5.4.16 release. When that release happens I expect a simple rebase to remove the unnecessary patches.
The following changes since commit
380ee36811939d947024bf78de907e3c071b834f:image creation: allow overriding .rootfs suffix (2016-03-07 17:16:53
+0000)are available in the git repository at:
git://git.openembedded.org/openembedded-core-contribmhatle/rpm-5.4.16http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=mhatle/rpm-5.4.16
Mark Hatle (7):
rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head security_flags.inc: Special flags are needed for RPM
rpm: Enable specific crypto and digest settings via variables
rpm: A number of the patches have been submitted upstream
rpmresolve: It is not necessary to manually specify -lpopt
db: remove theNO_UPDATE_REASONand replace it a comment about RPM
rpm: Temporarily provide the RPM patches (NOT NOT MERGE)meta/conf/distro/include/security_flags.inc | 2 + meta/lib/oe/package_manager.py | 14 +- .../rpm/rpm/0001-define-EM_AARCH64.patch | 2 +- ...arseArgvString-to-parse-the-_gpg_check_pa.patch | 2 +- .../beecrypt-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 42815 bytes meta/recipes-devtools/rpm/rpm/debugedit-segv.patch | 48 +- ...debugedit-valid-file-to-fix-segment-fault.patch | 2 +- .../rpm/rpm/fstack-protector-configure-check.patch | 21 - .../rpm/rpm/header-include-fix.patch | 12 +- .../rpm/rpm/lua-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 269940 bytes .../rpm/rpm/makefile-am-exec-hook.patch | 2 +- .../rpm/popt-disable-auto-stack-protector.patch | 27 + .../rpm/rpm/python-rpm-rpmsense.patch | 32 +- .../rpm/rpm/rpm-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 2239384 bytes meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch | 73 ++ meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch | 43 +- meta/recipes-devtools/rpm/rpm/rpm-db60.patch | 56 + .../rpm/rpm/rpm-disable-Wno-override-init.patch | 32 - .../rpm/rpm/rpm-disable-auto-stack-protector.patch | 24 + .../rpm/rpm/rpm-disable-blaketest.patch | 28 + .../rpm/rpm/rpm-fix-logio-cp.patch | 2 +- .../rpm/rpm/rpm-fix-parseEmbedded.patch | 27 + meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch | 61 ++ .../rpm/rpm/rpm-hardlink-segfault-fix.patch | 2 +- .../rpm/rpm/rpm-keccak-sse-intrin.patch | 27 + ...ction.c-fix-file-conflicts-for-mips64-N32.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch | 2 +- .../rpm/rpm/rpm-lsb-compatibility.patch | 2 +- .../rpm/rpm/rpm-lua-fix-print.patch | 104 -- ...rpm-macros.in-disable-external-key-server.patch | 16 +- .../rpm/rpm/rpm-mongodb-sasl.patch | 69 ++ meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch | 2 +- ...b-before-verifyscript-to-avoid-null-point.patch | 2 +- .../rpm/rpm/rpm-packageorigin.patch | 2 +- .../rpm/rpm/rpm-payload-use-hashed-inode.patch | 22 +- .../rpm/rpm/rpm-pkgconfigdeps.patch | 10 +- .../rpm/rpm/rpm-platform-file-fix.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-platform.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-platform2.patch | 4 +- meta/recipes-devtools/rpm/rpm/rpm-py-init.patch | 16 +- .../rpm/rpm/rpm-python-AddErase.patch | 35 + .../rpm/rpm/rpm-python-restore-origin.patch | 49 + .../rpm/rpm/rpm-python-tagname.patch | 24 + .../rpm/rpm/rpm-remove-sykcparse-decl.patch | 14 - meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch | 2 +- .../rpm/rpm/rpm-rpmdb-grammar.patch | 124 +++ .../rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch | 2 +- .../rpm/rpm/rpm-rpmio-headers.patch | 19 + meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch | 67 -- .../recipes-devtools/rpm/rpm/rpm-rpmpgp-popt.patch | 26 + .../rpm/rpm/rpm-scriptletexechelper.patch | 29 +- .../rpm/rpm/rpm-syck-fix-gram.patch | 1081 ++++++++++++++++++++ .../rpm-tag-generate-endian-conversion-fix.patch | 2 +- .../rpm/rpm/rpm-tagname-type.patch | 25 + .../rpm/rpm/rpm-tools-mtree-LDFLAGS.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpmatch.patch | 32 +- .../recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch | 27 +- .../rpm/syck-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 4837 bytes meta/recipes-devtools/rpm/rpm/uclibc-support.patch | 38 +- ...broken-logic-for-ghost-avoidance-Mark-Hat.patch | 38 - meta/recipes-devtools/rpm/rpm_5.4+cvs.bb | 302 +++++- .../rpm/{rpm_5.4.14.bb => rpm_5.4.16.bb} | 197 +++- meta/recipes-devtools/rpm/rpmresolve_1.0.bb | 2 +- meta/recipes-support/db/db_6.0.30.bb | 2 +- 65 files changed, 2368 insertions(+), 569 deletions(-) create mode 100644 meta/recipes-devtools/rpm/rpm/beecrypt-5.4.15-to-5.4.16-20160225.patch.gz delete mode 100644 meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch create mode 100644 meta/recipes-devtools/rpm/rpm/lua-5.4.15-to-5.4.16-20160225.patch.gz create mode 100644 meta/recipes-devtools/rpm/rpm/popt-disable-auto-stack-protector.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-5.4.15-to-5.4.16-20160225.patch.gz create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-db60.patch delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-disable-auto-stack-protector.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-disable-blaketest.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-keccak-sse-intrin.patch delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-lua-fix-print.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-python-AddErase.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-python-restore-origin.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-python-tagname.patch delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmdb-grammar.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmio-headers.patch delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-popt.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-syck-fix-gram.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-tagname-type.patch create mode 100644 meta/recipes-devtools/rpm/rpm/syck-5.4.15-to-5.4.16-20160225.patch.gz delete mode 100644 meta/recipes-devtools/rpm/rpm/verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch rename meta/recipes-devtools/rpm/{rpm_5.4.14.bb => rpm_5.4.16.bb} (81%)--
2.5.0--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Erm, two problems. One of the runs failed to configure rpm (
http://errors.yoctoproject.org/Errors/Details/54813/).
Ross
Quoted 249 lines · Ross
One problem - target rpmresolve now fails to link:
|
rpmresolve.c: In function 'getPackageStr':
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/include/rpm/rpmdb.h:1427:13:
warning: implicit declaration of function 'rpmioFreePoolItem' [-Wimplicit-function-declaration]
| ((rpmmi)rpmioFreePoolItem((rpmioItem)(_mi),__FUNCTION__,__FILE__,__LINE__))| ^ | rpmresolve.c:54:11: note: in expansion of macro 'rpmmiFree' | (void)rpmmiFree(mi); | ^ | rpmresolve.c: In function 'printDepList': | rpmresolve.c:297:34: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] | prov = names[k]; | ^ | rpmresolve.c: In function 'main': | rpmresolve.c:388:5: warning: implicit declaration of function 'rpmcliInit' [-Wimplicit-function-declaration] | rpmcliInit(argc, argv, NULL); | ^ | /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmdb.so:undefined reference to `_ITM_WaWU4'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmio.so:
undefined reference to `_ITM_beginTransaction'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmdb.so:
undefined reference to `_ITM_RfWU4'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmio.so:
undefined reference to `_ITM_commitTransaction'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmio.so:
undefined reference to `_ITM_RU4'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmio.so:
undefined reference to `_ITM_WU4'
| collect2: error: ld returned 1 exit statusThe warnings are not great, but the fails are critical.
Interestingly rpmresolve-native works fine.
Ross
Quoted 202 lines · Mark Hatle
v4:
* Move large patches to externally downloaded
- Included in a commit to be testable, but that commit should not be
merged
* Disable default stack-protector for popt
* Fix AddErase API breakage
* Break popt header dependency
* Allow popt to be built internal (does not yet work, note caveat in recipe)
* Update 'security_flags.inc' to know about RPM
* rpmresolve remove unnecessary -lpoptV3:
* Update rpm-db5-or-db6.patch to remove potential host contamination
* Update rpm-disable-auto-stack-protector.patch to only disable the stack protector
* Add new patch: rpm-atomic-ops.patch
- Disable atomic operations in bson when the architecture does not
support them
* Add new patch: rpm-gnu-atomic.patch
- Dynamically detect and disable when -fgnu-tm/libitm support is not
available
* Add new patch: rpm-tagname-type.patch and rpm-python-tagname.patch
- Fix rpm-python legacy API regressions
* Add new patch: rpm-disable-blaketest.patch
- Disable building the blake test apps, they appear to have dep issues
in large
parallel builds.
* Update db-6.0.30 to make it clear that when it is updated, to also update RPM5.V2:
Fixed three issues
- Added Apache 2.0 license for specific mongodb code- Switch SSE usage dynamically in
rpmio/keccak.c
See rpm-keccak-sse-intrin.patch- Add support for architectures that do not support
sync_add_and_fetch_8See rpm-atomic-ops.patchAll of those changes are made in patch 1/3.
This has been built for all of the qemu* BSPs.
V1:
There is not yet an official RPM 5.4.16 release, however one will be coming
soon. Until then, 4 distinct patches are used to upgrade RPM 5.4.15 to 5.4.16. These patches are part of the commit (compressed w/ .xz). However
I am not sending them as part of the email as it's not very interesting to review base64. :PMany of the OE patches have been sent to the RPM 5 maintainer, and may be part of the official 5.4.16 release. When that release happens I expect a simple rebase to remove the unnecessary patches.
The following changes since commit
380ee36811939d947024bf78de907e3c071b834f:image creation: allow overriding .rootfs suffix (2016-03-07 17:16:53
+0000)are available in the git repository at:
git://git.openembedded.org/openembedded-core-contribmhatle/rpm-5.4.16http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=mhatle/rpm-5.4.16
Mark Hatle (7):
rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head security_flags.inc: Special flags are needed for RPM
rpm: Enable specific crypto and digest settings via variables
rpm: A number of the patches have been submitted upstream
rpmresolve: It is not necessary to manually specify -lpopt
db: remove theNO_UPDATE_REASONand replace it a comment about RPM
rpm: Temporarily provide the RPM patches (NOT NOT MERGE)meta/conf/distro/include/security_flags.inc | 2 + meta/lib/oe/package_manager.py | 14 +- .../rpm/rpm/0001-define-EM_AARCH64.patch | 2 +- ...arseArgvString-to-parse-the-_gpg_check_pa.patch | 2 +- .../beecrypt-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 42815 bytes meta/recipes-devtools/rpm/rpm/debugedit-segv.patch | 48 +- ...debugedit-valid-file-to-fix-segment-fault.patch | 2 +- .../rpm/rpm/fstack-protector-configure-check.patch | 21 - .../rpm/rpm/header-include-fix.patch | 12 +- .../rpm/rpm/lua-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 269940 bytes .../rpm/rpm/makefile-am-exec-hook.patch | 2 +- .../rpm/popt-disable-auto-stack-protector.patch | 27 + .../rpm/rpm/python-rpm-rpmsense.patch | 32 +- .../rpm/rpm/rpm-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 2239384 bytes meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch | 73 ++ meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch | 43 +- meta/recipes-devtools/rpm/rpm/rpm-db60.patch | 56 + .../rpm/rpm/rpm-disable-Wno-override-init.patch | 32 - .../rpm/rpm/rpm-disable-auto-stack-protector.patch | 24 + .../rpm/rpm/rpm-disable-blaketest.patch | 28 + .../rpm/rpm/rpm-fix-logio-cp.patch | 2 +- .../rpm/rpm/rpm-fix-parseEmbedded.patch | 27 + meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch | 61 ++ .../rpm/rpm/rpm-hardlink-segfault-fix.patch | 2 +- .../rpm/rpm/rpm-keccak-sse-intrin.patch | 27 + ...ction.c-fix-file-conflicts-for-mips64-N32.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch | 2 +- .../rpm/rpm/rpm-lsb-compatibility.patch | 2 +- .../rpm/rpm/rpm-lua-fix-print.patch | 104 -- ...rpm-macros.in-disable-external-key-server.patch | 16 +- .../rpm/rpm/rpm-mongodb-sasl.patch | 69 ++ meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch | 2 +- ...b-before-verifyscript-to-avoid-null-point.patch | 2 +- .../rpm/rpm/rpm-packageorigin.patch | 2 +- .../rpm/rpm/rpm-payload-use-hashed-inode.patch | 22 +- .../rpm/rpm/rpm-pkgconfigdeps.patch | 10 +- .../rpm/rpm/rpm-platform-file-fix.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-platform.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-platform2.patch | 4 +- meta/recipes-devtools/rpm/rpm/rpm-py-init.patch | 16 +- .../rpm/rpm/rpm-python-AddErase.patch | 35 + .../rpm/rpm/rpm-python-restore-origin.patch | 49 + .../rpm/rpm/rpm-python-tagname.patch | 24 + .../rpm/rpm/rpm-remove-sykcparse-decl.patch | 14 - meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch | 2 +- .../rpm/rpm/rpm-rpmdb-grammar.patch | 124 +++ .../rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch | 2 +- .../rpm/rpm/rpm-rpmio-headers.patch | 19 + meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch | 67 -- .../recipes-devtools/rpm/rpm/rpm-rpmpgp-popt.patch | 26 + .../rpm/rpm/rpm-scriptletexechelper.patch | 29 +- .../rpm/rpm/rpm-syck-fix-gram.patch | 1081 ++++++++++++++++++++ .../rpm-tag-generate-endian-conversion-fix.patch | 2 +- .../rpm/rpm/rpm-tagname-type.patch | 25 + .../rpm/rpm/rpm-tools-mtree-LDFLAGS.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpmatch.patch | 32 +- .../recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch | 27 +- .../rpm/syck-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 4837 bytes meta/recipes-devtools/rpm/rpm/uclibc-support.patch | 38 +- ...broken-logic-for-ghost-avoidance-Mark-Hat.patch | 38 - meta/recipes-devtools/rpm/rpm_5.4+cvs.bb | 302 +++++- .../rpm/{rpm_5.4.14.bb => rpm_5.4.16.bb} | 197 +++- meta/recipes-devtools/rpm/rpmresolve_1.0.bb | 2 +- meta/recipes-support/db/db_6.0.30.bb | 2 +- 65 files changed, 2368 insertions(+), 569 deletions(-) create mode 100644 meta/recipes-devtools/rpm/rpm/beecrypt-5.4.15-to-5.4.16-20160225.patch.gz delete mode 100644 meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch create mode 100644 meta/recipes-devtools/rpm/rpm/lua-5.4.15-to-5.4.16-20160225.patch.gz create mode 100644 meta/recipes-devtools/rpm/rpm/popt-disable-auto-stack-protector.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-5.4.15-to-5.4.16-20160225.patch.gz create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-db60.patch delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-disable-auto-stack-protector.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-disable-blaketest.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-keccak-sse-intrin.patch delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-lua-fix-print.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-python-AddErase.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-python-restore-origin.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-python-tagname.patch delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmdb-grammar.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmio-headers.patch delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-popt.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-syck-fix-gram.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-tagname-type.patch create mode 100644 meta/recipes-devtools/rpm/rpm/syck-5.4.15-to-5.4.16-20160225.patch.gz delete mode 100644 meta/recipes-devtools/rpm/rpm/verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch rename meta/recipes-devtools/rpm/{rpm_5.4.14.bb => rpm_5.4.16.bb} (81%)--
2.5.0--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Quoted 2 lines · Ross
Erm, two problems. One of the runs failed to configure rpm
(http://errors.yoctoproject.org/Errors/Details/54813/).
Does 'musl' work in poky yet, or do you still need an external layer?
I've not configured musl before, so I'm not sure what steps are necessary.
--Mark
Quoted 255 lines
Ross
On 8 March 2016 at 11:10, Burton, Ross <[email protected] <mailto:[email protected]>> wrote:
One problem - target rpmresolve now fails to link:
|
rpmresolve.c: In function 'getPackageStr':
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/include/rpm/rpmdb.h:1427:13: warning:
implicit declaration of function 'rpmioFreePoolItem' [-Wimplicit-function-declaration]
| ((rpmmi)rpmioFreePoolItem((rpmioItem)(_mi),__FUNCTION__,__FILE__,
__LINE__))
| ^
| rpmresolve.c:54:11: note: in expansion of macro 'rpmmiFree'
| (void)rpmmiFree(mi);
| ^
|rpmresolve.c: In function 'printDepList':
| rpmresolve.c:297:34: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
| prov = names[k];
| ^
|rpmresolve.c: In function 'main':
| rpmresolve.c:388:5: warning: implicit declaration of function 'rpmcliInit' [-Wimplicit-function-declaration]
|rpmcliInit(argc, argv, NULL);
| ^
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmdb.so:
undefined reference to `_ITM_WaWU4'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmio.so:
undefined reference to `_ITM_beginTransaction'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmdb.so:
undefined reference to `_ITM_RfWU4'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmio.so:
undefined reference to `_ITM_commitTransaction'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmio.so:
undefined reference to `_ITM_RU4'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmio.so:
undefined reference to `_ITM_WU4'
| collect2: error: ld returned 1 exit statusThe warnings are not great, but the fails are critical.
Interestingly rpmresolve-native works fine.
Ross
On 7 March 2016 at 17:59, Mark Hatle <[email protected] <mailto:[email protected]>> wrote:
v4:
* Move large patches to externally downloaded
- Included in a commit to be testable, but that commit should not be
merged
* Disable default stack-protector for popt
* Fix AddErase API breakage
* Break popt header dependency
* Allow popt to be built internal (does not yet work, note caveat in recipe)
* Update 'security_flags.inc' to know about RPM
* rpmresolve remove unnecessary -lpoptV3:
* Update rpm-db5-or-db6.patch to remove potential host contamination
* Update rpm-disable-auto-stack-protector.patch to only disable the stack protector
* Add new patch: rpm-atomic-ops.patch
- Disable atomic operations in bson when the architecture does not
support them
* Add new patch: rpm-gnu-atomic.patch
- Dynamically detect and disable when -fgnu-tm/libitm support is not
available
* Add new patch: rpm-tagname-type.patch and rpm-python-tagname.patch
- Fix rpm-python legacy API regressions
* Add new patch: rpm-disable-blaketest.patch
- Disable building the blake test apps, they appear to have dep issues
in large
parallel builds.
* Update db-6.0.30 to make it clear that when it is updated, to also update RPM5.V2:
Fixed three issues
- Added Apache 2.0 license for specific mongodb code- Switch SSE usage dynamically in
rpmio/keccak.cSee rpm-keccak-sse-intrin.patch- Add support for architectures that do not support
sync_add_and_fetch_8See rpm-atomic-ops.patchAll of those changes are made in patch 1/3.
This has been built for all of the qemu* BSPs.
V1:
There is not yet an official RPM 5.4.16 release, however one will be coming soon. Until then, 4 distinct patches are used to upgrade RPM 5.4.15 to 5.4.16. These patches are part of the commit (compressed w/ .xz). However I am not sending them as part of the email as it's not very interesting to review base64. :PMany of the OE patches have been sent to the RPM 5 maintainer, and may be part of the official 5.4.16 release. When that release happens I expect a simple rebase to remove the unnecessary patches.
The following changes since commit
380ee36811939d947024bf78de907e3c071b834f:image creation: allow overriding .rootfs suffix (2016-03-07 17:16:53
+0000)are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib
<http://git.openembedded.org/openembedded-core-contrib> mhatle/rpm-5.4.16http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=mhatle/rpm-5.4.16
Mark Hatle (7):
rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head security_flags.inc: Special flags are needed for RPM
rpm: Enable specific crypto and digest settings via variables
rpm: A number of the patches have been submitted upstream
rpmresolve: It is not necessary to manually specify -lpopt
db: remove theNO_UPDATE_REASONand replace it a comment about RPM
rpm: Temporarily provide the RPM patches (NOT NOT MERGE)meta/conf/distro/include/security_flags.inc | 2 +
meta/lib/oe/package_manager.py| 14 +-
.../rpm/rpm/0001-define-EM_AARCH64.patch| 2 +-
...arseArgvString-to-parse-the-_gpg_check_pa.patch | 2 +-
.../beecrypt-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 42815 bytes
meta/recipes-devtools/rpm/rpm/debugedit-segv.patch| 48 +-
...debugedit-valid-file-to-fix-segment-fault.patch | 2 +-
.../rpm/rpm/fstack-protector-configure-check.patch| 21 -
.../rpm/rpm/header-include-fix.patch| 12 +-
.../rpm/rpm/lua-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 269940 bytes
.../rpm/rpm/makefile-am-exec-hook.patch| 2 +-
.../rpm/popt-disable-auto-stack-protector.patch| 27 +
.../rpm/rpm/python-rpm-rpmsense.patch| 32 +-
.../rpm/rpm/rpm-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 2239384
bytes
meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch| 73 ++
meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch| 2 +-
meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch| 43 +-
meta/recipes-devtools/rpm/rpm/rpm-db60.patch| 56 +
.../rpm/rpm/rpm-disable-Wno-override-init.patch| 32 -
.../rpm/rpm/rpm-disable-auto-stack-protector.patch| 24 +
.../rpm/rpm/rpm-disable-blaketest.patch| 28 +
.../rpm/rpm/rpm-fix-logio-cp.patch| 2 +-
.../rpm/rpm/rpm-fix-parseEmbedded.patch| 27 +
meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch| 61 ++
.../rpm/rpm/rpm-hardlink-segfault-fix.patch| 2 +-
.../rpm/rpm/rpm-keccak-sse-intrin.patch| 27 +
...ction.c-fix-file-conflicts-for-mips64-N32.patch | 2 +-
meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch| 2 +-
.../rpm/rpm/rpm-lsb-compatibility.patch| 2 +-
.../rpm/rpm/rpm-lua-fix-print.patch| 104 --
...rpm-macros.in-disable-external-key-server.patch | 16 +-
.../rpm/rpm/rpm-mongodb-sasl.patch| 69 ++
meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch| 2 +-
...b-before-verifyscript-to-avoid-null-point.patch | 2 +-
.../rpm/rpm/rpm-packageorigin.patch| 2 +-
.../rpm/rpm/rpm-payload-use-hashed-inode.patch| 22 +-
.../rpm/rpm/rpm-pkgconfigdeps.patch| 10 +-
.../rpm/rpm/rpm-platform-file-fix.patch| 2 +-
meta/recipes-devtools/rpm/rpm/rpm-platform.patch| 2 +-
meta/recipes-devtools/rpm/rpm/rpm-platform2.patch| 4 +-
meta/recipes-devtools/rpm/rpm/rpm-py-init.patch| 16 +-
.../rpm/rpm/rpm-python-AddErase.patch| 35 +
.../rpm/rpm/rpm-python-restore-origin.patch| 49 +
.../rpm/rpm/rpm-python-tagname.patch| 24 +
.../rpm/rpm/rpm-remove-sykcparse-decl.patch| 14 -
meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch| 2 +-
.../rpm/rpm/rpm-rpmdb-grammar.patch| 124 +++
.../rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch| 2 +-
.../rpm/rpm/rpm-rpmio-headers.patch| 19 +
meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch| 67 --
.../recipes-devtools/rpm/rpm/rpm-rpmpgp-popt.patch| 26 +
.../rpm/rpm/rpm-scriptletexechelper.patch| 29 +-
.../rpm/rpm/rpm-syck-fix-gram.patch| 1081
++++++++++++++++++++
.../rpm-tag-generate-endian-conversion-fix.patch| 2 +-
.../rpm/rpm/rpm-tagname-type.patch| 25 +
.../rpm/rpm/rpm-tools-mtree-LDFLAGS.patch| 2 +-
meta/recipes-devtools/rpm/rpm/rpmatch.patch| 32 +-
.../recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch| 27 +-
.../rpm/syck-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 4837 bytes
meta/recipes-devtools/rpm/rpm/uclibc-support.patch| 38 +-
...broken-logic-for-ghost-avoidance-Mark-Hat.patch | 38 -
meta/recipes-devtools/rpm/rpm_5.4+cvs.bb <http://cvs.bb> |
302 +++++-
.../rpm/{rpm_5.4.14.bb <http://rpm_5.4.14.bb> => rpm_5.4.16.bb
<http://rpm_5.4.16.bb>} | 197 +++-
meta/recipes-devtools/rpm/rpmresolve_1.0.bb <http://rpmresolve_1.0.bb>
| 2 +-
meta/recipes-support/db/db_6.0.30.bb <http://db_6.0.30.bb>
| 2 +-
65 files changed, 2368 insertions(+), 569 deletions(-)
create mode 100644
meta/recipes-devtools/rpm/rpm/beecrypt-5.4.15-to-5.4.16-20160225.patch.gz
delete mode 100644
meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
create mode 100644
meta/recipes-devtools/rpm/rpm/lua-5.4.15-to-5.4.16-20160225.patch.gz
create mode 100644
meta/recipes-devtools/rpm/rpm/popt-disable-auto-stack-protector.patch
create mode 100644
meta/recipes-devtools/rpm/rpm/rpm-5.4.15-to-5.4.16-20160225.patch.gz
create mode 100644meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-db60.patch
delete mode 100644
meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch
create mode 100644
meta/recipes-devtools/rpm/rpm/rpm-disable-auto-stack-protector.patch
create mode 100644
meta/recipes-devtools/rpm/rpm/rpm-disable-blaketest.patch
create mode 100644
meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch
create mode 100644meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patchcreate mode 100644
meta/recipes-devtools/rpm/rpm/rpm-keccak-sse-intrin.patch
delete mode 100644meta/recipes-devtools/rpm/rpm/rpm-lua-fix-print.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-python-AddErase.patchcreate mode 100644
meta/recipes-devtools/rpm/rpm/rpm-python-restore-origin.patch
create mode 100644meta/recipes-devtools/rpm/rpm/rpm-python-tagname.patchdelete mode 100644
meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch
create mode 100644meta/recipes-devtools/rpm/rpm/rpm-rpmdb-grammar.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-rpmio-headers.patchdelete mode 100644meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-popt.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-syck-fix-gram.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-tagname-type.patchcreate mode 100644
meta/recipes-devtools/rpm/rpm/syck-5.4.15-to-5.4.16-20160225.patch.gz
delete mode 100644
meta/recipes-devtools/rpm/rpm/verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch
rename meta/recipes-devtools/rpm/{rpm_5.4.14.bb <http://rpm_5.4.14.bb>
=> rpm_5.4.16.bb <http://rpm_5.4.16.bb>} (81%)--
2.5.0--
_______________________________________________
Openembedded-core mailing list [email protected] <mailto:[email protected]>
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Quoted 4 lines · Mark Hatle
Does 'musl' work in poky yet, or do you still need an external layer?
I've not configured musl before, so I'm not sure what steps are necessary.
Oh didn't notice that was musl. Most of oe-core builds standalone with musl now, but rpm is a known exception. Ignore this one, it's nothing to do with the upgrade.
Ross
Quoted 1 line · Ross
One problem - target rpmresolve now fails to link:
Is this a world build or what target configuration is using rpmresolve?
I never ran into this and I've built most of the various configurations.
(see below)
Quoted 21 lines
|
rpmresolve.c: In function 'getPackageStr':
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/include/rpm/rpmdb.h:1427:13:
warning: implicit declaration of function 'rpmioFreePoolItem' [-Wimplicit-function-declaration]
| ((rpmmi)rpmioFreePoolItem((rpmioItem)(_mi),__FUNCTION__,__FILE__,__LINE__))| ^ | rpmresolve.c:54:11: note: in expansion of macro 'rpmmiFree' | (void)rpmmiFree(mi); | ^ | rpmresolve.c: In function 'printDepList': | rpmresolve.c:297:34: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] | prov = names[k]; | ^ | rpmresolve.c: In function 'main': | rpmresolve.c:388:5: warning: implicit declaration of function 'rpmcliInit' [-Wimplicit-function-declaration] | rpmcliInit(argc, argv, NULL); | ^ | /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmdb.so:
Quoted 12 lines
undefined reference to `_ITM_WaWU4'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmio.so:
undefined reference to `_ITM_beginTransaction'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmdb.so:
undefined reference to `_ITM_RfWU4'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmio.so:
undefined reference to `_ITM_commitTransaction'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmio.so:
undefined reference to `_ITM_RU4'
| /data/poky-master/tmp-glibc/sysroots/qemux86/usr/lib/../lib/librpmio.so:
undefined reference to `_ITM_WU4'
| collect2: error: ld returned 1 exit status
The error above says that the system is using atomic operations, and rpmresolve is not defined to provide the libitm library. This -should- be automatic, but apparently gcc/binutils did not include the support for some reason.
The manual switch to using libitm functionality is -fgnu-tm which doesn't not work on all architectures or configurations -- so we'll have to try to detect the functionality and enable it selectively based on that.
Quoted 1 line
The warnings are not great, but the fails are critical.
I'm not going to worry about the warnings, they've been there for a fairly long time and the usage is reasonable... but the linkage issues need to be fixed.
--Mark
Quoted 202 lines
Interestingly rpmresolve-native works fine.
Ross
On 7 March 2016 at 17:59, Mark Hatle <[email protected] <mailto:[email protected]>> wrote:
v4:
* Move large patches to externally downloaded
- Included in a commit to be testable, but that commit should not be merged
* Disable default stack-protector for popt
* Fix AddErase API breakage
* Break popt header dependency
* Allow popt to be built internal (does not yet work, note caveat in recipe)
* Update 'security_flags.inc' to know about RPM
* rpmresolve remove unnecessary -lpoptV3:
* Update rpm-db5-or-db6.patch to remove potential host contamination
* Update rpm-disable-auto-stack-protector.patch to only disable the stack protector
* Add new patch: rpm-atomic-ops.patch
- Disable atomic operations in bson when the architecture does not support
them
* Add new patch: rpm-gnu-atomic.patch
- Dynamically detect and disable when -fgnu-tm/libitm support is not available
* Add new patch: rpm-tagname-type.patch and rpm-python-tagname.patch
- Fix rpm-python legacy API regressions
* Add new patch: rpm-disable-blaketest.patch
- Disable building the blake test apps, they appear to have dep issues in
large
parallel builds.
* Update db-6.0.30 to make it clear that when it is updated, to also update RPM5.V2:
Fixed three issues
- Added Apache 2.0 license for specific mongodb code- Switch SSE usage dynamically in
rpmio/keccak.cSee rpm-keccak-sse-intrin.patch- Add support for architectures that do not support
sync_add_and_fetch_8See rpm-atomic-ops.patchAll of those changes are made in patch 1/3.
This has been built for all of the qemu* BSPs.
V1:
There is not yet an official RPM 5.4.16 release, however one will be coming soon. Until then, 4 distinct patches are used to upgrade RPM 5.4.15 to 5.4.16. These patches are part of the commit (compressed w/ .xz). However I am not sending them as part of the email as it's not very interesting to review base64. :PMany of the OE patches have been sent to the RPM 5 maintainer, and may be part of the official 5.4.16 release. When that release happens I expect a simple rebase to remove the unnecessary patches.
The following changes since commit
380ee36811939d947024bf78de907e3c071b834f:image creation: allow overriding .rootfs suffix (2016-03-07 17:16:53 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib
<http://git.openembedded.org/openembedded-core-contrib> mhatle/rpm-5.4.16http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=mhatle/rpm-5.4.16
Mark Hatle (7):
rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head security_flags.inc: Special flags are needed for RPM
rpm: Enable specific crypto and digest settings via variables
rpm: A number of the patches have been submitted upstream
rpmresolve: It is not necessary to manually specify -lpopt
db: remove theNO_UPDATE_REASONand replace it a comment about RPM
rpm: Temporarily provide the RPM patches (NOT NOT MERGE)meta/conf/distro/include/security_flags.inc | 2 +
meta/lib/oe/package_manager.py| 14 +-
.../rpm/rpm/0001-define-EM_AARCH64.patch| 2 +-
...arseArgvString-to-parse-the-_gpg_check_pa.patch | 2 +-
.../beecrypt-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 42815 bytes
meta/recipes-devtools/rpm/rpm/debugedit-segv.patch| 48 +-
...debugedit-valid-file-to-fix-segment-fault.patch | 2 +-
.../rpm/rpm/fstack-protector-configure-check.patch| 21 -
.../rpm/rpm/header-include-fix.patch| 12 +-
.../rpm/rpm/lua-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 269940 bytes
.../rpm/rpm/makefile-am-exec-hook.patch| 2 +-
.../rpm/popt-disable-auto-stack-protector.patch| 27 +
.../rpm/rpm/python-rpm-rpmsense.patch| 32 +-
.../rpm/rpm/rpm-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 2239384 bytes
meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch| 73 ++
meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch| 2 +-
meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch| 43 +-
meta/recipes-devtools/rpm/rpm/rpm-db60.patch| 56 +
.../rpm/rpm/rpm-disable-Wno-override-init.patch| 32 -
.../rpm/rpm/rpm-disable-auto-stack-protector.patch| 24 +
.../rpm/rpm/rpm-disable-blaketest.patch| 28 +
.../rpm/rpm/rpm-fix-logio-cp.patch| 2 +-
.../rpm/rpm/rpm-fix-parseEmbedded.patch| 27 +
meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch| 61 ++
.../rpm/rpm/rpm-hardlink-segfault-fix.patch| 2 +-
.../rpm/rpm/rpm-keccak-sse-intrin.patch| 27 +
...ction.c-fix-file-conflicts-for-mips64-N32.patch | 2 +-
meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch| 2 +-
.../rpm/rpm/rpm-lsb-compatibility.patch| 2 +-
.../rpm/rpm/rpm-lua-fix-print.patch| 104 --
...rpm-macros.in-disable-external-key-server.patch | 16 +-
.../rpm/rpm/rpm-mongodb-sasl.patch| 69 ++
meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch| 2 +-
...b-before-verifyscript-to-avoid-null-point.patch | 2 +-
.../rpm/rpm/rpm-packageorigin.patch| 2 +-
.../rpm/rpm/rpm-payload-use-hashed-inode.patch| 22 +-
.../rpm/rpm/rpm-pkgconfigdeps.patch| 10 +-
.../rpm/rpm/rpm-platform-file-fix.patch| 2 +-
meta/recipes-devtools/rpm/rpm/rpm-platform.patch| 2 +-
meta/recipes-devtools/rpm/rpm/rpm-platform2.patch| 4 +-
meta/recipes-devtools/rpm/rpm/rpm-py-init.patch| 16 +-
.../rpm/rpm/rpm-python-AddErase.patch| 35 +
.../rpm/rpm/rpm-python-restore-origin.patch| 49 +
.../rpm/rpm/rpm-python-tagname.patch| 24 +
.../rpm/rpm/rpm-remove-sykcparse-decl.patch| 14 -
meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch| 2 +-
.../rpm/rpm/rpm-rpmdb-grammar.patch| 124 +++
.../rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch| 2 +-
.../rpm/rpm/rpm-rpmio-headers.patch| 19 +
meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch| 67 --
.../recipes-devtools/rpm/rpm/rpm-rpmpgp-popt.patch| 26 +
.../rpm/rpm/rpm-scriptletexechelper.patch| 29 +-
.../rpm/rpm/rpm-syck-fix-gram.patch| 1081 ++++++++++++++++++++
.../rpm-tag-generate-endian-conversion-fix.patch| 2 +-
.../rpm/rpm/rpm-tagname-type.patch| 25 +
.../rpm/rpm/rpm-tools-mtree-LDFLAGS.patch| 2 +-
meta/recipes-devtools/rpm/rpm/rpmatch.patch| 32 +-
.../recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch| 27 +-
.../rpm/syck-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 4837 bytes
meta/recipes-devtools/rpm/rpm/uclibc-support.patch| 38 +-
...broken-logic-for-ghost-avoidance-Mark-Hat.patch | 38 -
meta/recipes-devtools/rpm/rpm_5.4+cvs.bb <http://cvs.bb> | 302
+++++-
.../rpm/{rpm_5.4.14.bb <http://rpm_5.4.14.bb> => rpm_5.4.16.bb
<http://rpm_5.4.16.bb>} | 197 +++-
meta/recipes-devtools/rpm/rpmresolve_1.0.bb <http://rpmresolve_1.0.bb>
| 2 +-
meta/recipes-support/db/db_6.0.30.bb <http://db_6.0.30.bb> |
2 +-
65 files changed, 2368 insertions(+), 569 deletions(-)
create mode 100644
meta/recipes-devtools/rpm/rpm/beecrypt-5.4.15-to-5.4.16-20160225.patch.gz
delete mode 100644
meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
create mode 100644
meta/recipes-devtools/rpm/rpm/lua-5.4.15-to-5.4.16-20160225.patch.gz
create mode 100644
meta/recipes-devtools/rpm/rpm/popt-disable-auto-stack-protector.patch
create mode 100644
meta/recipes-devtools/rpm/rpm/rpm-5.4.15-to-5.4.16-20160225.patch.gz
create mode 100644meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-db60.patch
delete mode 100644
meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch
create mode 100644
meta/recipes-devtools/rpm/rpm/rpm-disable-auto-stack-protector.patch
create mode 100644meta/recipes-devtools/rpm/rpm/rpm-disable-blaketest.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-keccak-sse-intrin.patchdelete mode 100644meta/recipes-devtools/rpm/rpm/rpm-lua-fix-print.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-python-AddErase.patchcreate mode 100644
meta/recipes-devtools/rpm/rpm/rpm-python-restore-origin.patch
create mode 100644meta/recipes-devtools/rpm/rpm/rpm-python-tagname.patchdelete mode 100644
meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch
create mode 100644meta/recipes-devtools/rpm/rpm/rpm-rpmdb-grammar.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-rpmio-headers.patchdelete mode 100644meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-popt.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-syck-fix-gram.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-tagname-type.patchcreate mode 100644
meta/recipes-devtools/rpm/rpm/syck-5.4.15-to-5.4.16-20160225.patch.gz
delete mode 100644
meta/recipes-devtools/rpm/rpm/verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch
rename meta/recipes-devtools/rpm/{rpm_5.4.14.bb <http://rpm_5.4.14.bb> =>
rpm_5.4.16.bb <http://rpm_5.4.16.bb>} (81%)--
2.5.0--
_______________________________________________
Openembedded-core mailing list [email protected] <mailto:[email protected]>
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Failed to look at the full list of failures.
SMART is failing in selftest on many systems:
AssertionError: 1 != 0 : smart info python-smartpm
error: 'rpm' python module is not available
(http://errors.yoctoproject.org/Errors/Details/54843/)
Again the Python support appears to be flakey at image creation sometimes:
Computing transaction...error:
Can't install nativesdk-python-rpm-5.4.16-r0@i686_nativesdk: no package provides /usr/bin/python
(http://errors.yoctoproject.org/Errors/Details/54860/)
Ross
Quoted 198 lines · Mark Hatle
v4:
* Move large patches to externally downloaded
- Included in a commit to be testable, but that commit should not be
merged
* Disable default stack-protector for popt
* Fix AddErase API breakage
* Break popt header dependency
* Allow popt to be built internal (does not yet work, note caveat in recipe)
* Update 'security_flags.inc' to know about RPM
* rpmresolve remove unnecessary -lpoptV3:
* Update rpm-db5-or-db6.patch to remove potential host contamination
* Update rpm-disable-auto-stack-protector.patch to only disable the stack protector
* Add new patch: rpm-atomic-ops.patch
- Disable atomic operations in bson when the architecture does not
support them
* Add new patch: rpm-gnu-atomic.patch
- Dynamically detect and disable when -fgnu-tm/libitm support is not
available
* Add new patch: rpm-tagname-type.patch and rpm-python-tagname.patch
- Fix rpm-python legacy API regressions
* Add new patch: rpm-disable-blaketest.patch
- Disable building the blake test apps, they appear to have dep issues
in large
parallel builds.
* Update db-6.0.30 to make it clear that when it is updated, to also update RPM5.V2:
Fixed three issues
- Added Apache 2.0 license for specific mongodb code- Switch SSE usage dynamically in
rpmio/keccak.c
See rpm-keccak-sse-intrin.patch- Add support for architectures that do not support
sync_add_and_fetch_8See rpm-atomic-ops.patchAll of those changes are made in patch 1/3.
This has been built for all of the qemu* BSPs.
V1:
There is not yet an official RPM 5.4.16 release, however one will be coming soon. Until then, 4 distinct patches are used to upgrade RPM 5.4.15 to 5.4.16. These patches are part of the commit (compressed w/ .xz). However I am not sending them as part of the email as it's not very interesting to review base64. :PMany of the OE patches have been sent to the RPM 5 maintainer, and may be part of the official 5.4.16 release. When that release happens I expect a simple rebase to remove the unnecessary patches.
The following changes since commit
380ee36811939d947024bf78de907e3c071b834f:image creation: allow overriding .rootfs suffix (2016-03-07 17:16:53
+0000)are available in the git repository at:
git://git.openembedded.org/openembedded-core-contribmhatle/rpm-5.4.16http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=mhatle/rpm-5.4.16
Mark Hatle (7):
rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head security_flags.inc: Special flags are needed for RPM
rpm: Enable specific crypto and digest settings via variables
rpm: A number of the patches have been submitted upstream
rpmresolve: It is not necessary to manually specify -lpopt
db: remove theNO_UPDATE_REASONand replace it a comment about RPM
rpm: Temporarily provide the RPM patches (NOT NOT MERGE)meta/conf/distro/include/security_flags.inc | 2 + meta/lib/oe/package_manager.py | 14 +- .../rpm/rpm/0001-define-EM_AARCH64.patch | 2 +- ...arseArgvString-to-parse-the-_gpg_check_pa.patch | 2 +- .../beecrypt-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 42815 bytes meta/recipes-devtools/rpm/rpm/debugedit-segv.patch | 48 +- ...debugedit-valid-file-to-fix-segment-fault.patch | 2 +- .../rpm/rpm/fstack-protector-configure-check.patch | 21 - .../rpm/rpm/header-include-fix.patch | 12 +- .../rpm/rpm/lua-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 269940 bytes .../rpm/rpm/makefile-am-exec-hook.patch | 2 +- .../rpm/popt-disable-auto-stack-protector.patch | 27 + .../rpm/rpm/python-rpm-rpmsense.patch | 32 +- .../rpm/rpm/rpm-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 2239384 bytes meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch | 73 ++ meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch | 43 +- meta/recipes-devtools/rpm/rpm/rpm-db60.patch | 56 + .../rpm/rpm/rpm-disable-Wno-override-init.patch | 32 - .../rpm/rpm/rpm-disable-auto-stack-protector.patch | 24 + .../rpm/rpm/rpm-disable-blaketest.patch | 28 + .../rpm/rpm/rpm-fix-logio-cp.patch | 2 +- .../rpm/rpm/rpm-fix-parseEmbedded.patch | 27 + meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch | 61 ++ .../rpm/rpm/rpm-hardlink-segfault-fix.patch | 2 +- .../rpm/rpm/rpm-keccak-sse-intrin.patch | 27 + ...ction.c-fix-file-conflicts-for-mips64-N32.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch | 2 +- .../rpm/rpm/rpm-lsb-compatibility.patch | 2 +- .../rpm/rpm/rpm-lua-fix-print.patch | 104 -- ...rpm-macros.in-disable-external-key-server.patch | 16 +- .../rpm/rpm/rpm-mongodb-sasl.patch | 69 ++ meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch | 2 +- ...b-before-verifyscript-to-avoid-null-point.patch | 2 +- .../rpm/rpm/rpm-packageorigin.patch | 2 +- .../rpm/rpm/rpm-payload-use-hashed-inode.patch | 22 +- .../rpm/rpm/rpm-pkgconfigdeps.patch | 10 +- .../rpm/rpm/rpm-platform-file-fix.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-platform.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpm-platform2.patch | 4 +- meta/recipes-devtools/rpm/rpm/rpm-py-init.patch | 16 +- .../rpm/rpm/rpm-python-AddErase.patch | 35 + .../rpm/rpm/rpm-python-restore-origin.patch | 49 + .../rpm/rpm/rpm-python-tagname.patch | 24 + .../rpm/rpm/rpm-remove-sykcparse-decl.patch | 14 - meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch | 2 +- .../rpm/rpm/rpm-rpmdb-grammar.patch | 124 +++ .../rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch | 2 +- .../rpm/rpm/rpm-rpmio-headers.patch | 19 + meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch | 67 -- .../recipes-devtools/rpm/rpm/rpm-rpmpgp-popt.patch | 26 + .../rpm/rpm/rpm-scriptletexechelper.patch | 29 +- .../rpm/rpm/rpm-syck-fix-gram.patch | 1081 ++++++++++++++++++++ .../rpm-tag-generate-endian-conversion-fix.patch | 2 +- .../rpm/rpm/rpm-tagname-type.patch | 25 + .../rpm/rpm/rpm-tools-mtree-LDFLAGS.patch | 2 +- meta/recipes-devtools/rpm/rpm/rpmatch.patch | 32 +- .../recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch | 27 +- .../rpm/syck-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 4837 bytes meta/recipes-devtools/rpm/rpm/uclibc-support.patch | 38 +- ...broken-logic-for-ghost-avoidance-Mark-Hat.patch | 38 - meta/recipes-devtools/rpm/rpm_5.4+cvs.bb | 302 +++++- .../rpm/{rpm_5.4.14.bb => rpm_5.4.16.bb} | 197 +++- meta/recipes-devtools/rpm/rpmresolve_1.0.bb | 2 +- meta/recipes-support/db/db_6.0.30.bb | 2 +- 65 files changed, 2368 insertions(+), 569 deletions(-) create mode 100644 meta/recipes-devtools/rpm/rpm/beecrypt-5.4.15-to-5.4.16-20160225.patch.gz delete mode 100644 meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch create mode 100644 meta/recipes-devtools/rpm/rpm/lua-5.4.15-to-5.4.16-20160225.patch.gz create mode 100644 meta/recipes-devtools/rpm/rpm/popt-disable-auto-stack-protector.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-5.4.15-to-5.4.16-20160225.patch.gz create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-db60.patch delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-disable-auto-stack-protector.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-disable-blaketest.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-keccak-sse-intrin.patch delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-lua-fix-print.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-python-AddErase.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-python-restore-origin.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-python-tagname.patch delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmdb-grammar.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmio-headers.patch delete mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-popt.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-syck-fix-gram.patch create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-tagname-type.patch create mode 100644 meta/recipes-devtools/rpm/rpm/syck-5.4.15-to-5.4.16-20160225.patch.gz delete mode 100644 meta/recipes-devtools/rpm/rpm/verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch rename meta/recipes-devtools/rpm/{rpm_5.4.14.bb => rpm_5.4.16.bb} (81%)--
2.5.0--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
The configuration I've been testing on is:
recent Fedora + qemux86 or qemux86-64 and core-image-sato.
I'll try to replicate this failure set, but I'm very surprised there is an issue.... as I have been running the oe test cases..
Quoted 8 lines · Ross
Failed to look at the full list of failures.
SMART is failing in selftest on many systems:
AssertionError: 1 != 0 : smart info python-smartpm
error: 'rpm' python module is not available
(http://errors.yoctoproject.org/Errors/Details/54843/)
Quoted 6 lines
Again the Python support appears to be flakey at image creation sometimes:
Computing transaction...error:
Can't install nativesdk-python-rpm-5.4.16-r0@i686_nativesdk: no package provides/usr/bin/python
(http://errors.yoctoproject.org/Errors/Details/54860/)
This one, at least on the surface, looks like a packaging error of some kind. the nativesdk-python-rpm shouldn't be requiring or providing "/usr/bin/python" from what I can tell.. I'll look into this one as well. It may turn out to be fairly simple to fix at least.
--Mark
Quoted 200 lines
Ross
On 7 March 2016 at 17:59, Mark Hatle <[email protected] <mailto:[email protected]>> wrote:
v4:
* Move large patches to externally downloaded
- Included in a commit to be testable, but that commit should not be merged
* Disable default stack-protector for popt
* Fix AddErase API breakage
* Break popt header dependency
* Allow popt to be built internal (does not yet work, note caveat in recipe)
* Update 'security_flags.inc' to know about RPM
* rpmresolve remove unnecessary -lpoptV3:
* Update rpm-db5-or-db6.patch to remove potential host contamination
* Update rpm-disable-auto-stack-protector.patch to only disable the stack protector
* Add new patch: rpm-atomic-ops.patch
- Disable atomic operations in bson when the architecture does not support
them
* Add new patch: rpm-gnu-atomic.patch
- Dynamically detect and disable when -fgnu-tm/libitm support is not available
* Add new patch: rpm-tagname-type.patch and rpm-python-tagname.patch
- Fix rpm-python legacy API regressions
* Add new patch: rpm-disable-blaketest.patch
- Disable building the blake test apps, they appear to have dep issues in
large
parallel builds.
* Update db-6.0.30 to make it clear that when it is updated, to also update RPM5.V2:
Fixed three issues
- Added Apache 2.0 license for specific mongodb code- Switch SSE usage dynamically in
rpmio/keccak.cSee rpm-keccak-sse-intrin.patch- Add support for architectures that do not support
sync_add_and_fetch_8See rpm-atomic-ops.patchAll of those changes are made in patch 1/3.
This has been built for all of the qemu* BSPs.
V1:
There is not yet an official RPM 5.4.16 release, however one will be coming soon. Until then, 4 distinct patches are used to upgrade RPM 5.4.15 to 5.4.16. These patches are part of the commit (compressed w/ .xz). However I am not sending them as part of the email as it's not very interesting to review base64. :PMany of the OE patches have been sent to the RPM 5 maintainer, and may be part of the official 5.4.16 release. When that release happens I expect a simple rebase to remove the unnecessary patches.
The following changes since commit
380ee36811939d947024bf78de907e3c071b834f:image creation: allow overriding .rootfs suffix (2016-03-07 17:16:53 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib
<http://git.openembedded.org/openembedded-core-contrib> mhatle/rpm-5.4.16http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=mhatle/rpm-5.4.16
Mark Hatle (7):
rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head security_flags.inc: Special flags are needed for RPM
rpm: Enable specific crypto and digest settings via variables
rpm: A number of the patches have been submitted upstream
rpmresolve: It is not necessary to manually specify -lpopt
db: remove theNO_UPDATE_REASONand replace it a comment about RPM
rpm: Temporarily provide the RPM patches (NOT NOT MERGE)meta/conf/distro/include/security_flags.inc | 2 +
meta/lib/oe/package_manager.py| 14 +-
.../rpm/rpm/0001-define-EM_AARCH64.patch| 2 +-
...arseArgvString-to-parse-the-_gpg_check_pa.patch | 2 +-
.../beecrypt-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 42815 bytes
meta/recipes-devtools/rpm/rpm/debugedit-segv.patch| 48 +-
...debugedit-valid-file-to-fix-segment-fault.patch | 2 +-
.../rpm/rpm/fstack-protector-configure-check.patch| 21 -
.../rpm/rpm/header-include-fix.patch| 12 +-
.../rpm/rpm/lua-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 269940 bytes
.../rpm/rpm/makefile-am-exec-hook.patch| 2 +-
.../rpm/popt-disable-auto-stack-protector.patch| 27 +
.../rpm/rpm/python-rpm-rpmsense.patch| 32 +-
.../rpm/rpm/rpm-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 2239384 bytes
meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patch| 73 ++
meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch| 2 +-
meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch| 43 +-
meta/recipes-devtools/rpm/rpm/rpm-db60.patch| 56 +
.../rpm/rpm/rpm-disable-Wno-override-init.patch| 32 -
.../rpm/rpm/rpm-disable-auto-stack-protector.patch| 24 +
.../rpm/rpm/rpm-disable-blaketest.patch| 28 +
.../rpm/rpm/rpm-fix-logio-cp.patch| 2 +-
.../rpm/rpm/rpm-fix-parseEmbedded.patch| 27 +
meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patch| 61 ++
.../rpm/rpm/rpm-hardlink-segfault-fix.patch| 2 +-
.../rpm/rpm/rpm-keccak-sse-intrin.patch| 27 +
...ction.c-fix-file-conflicts-for-mips64-N32.patch | 2 +-
meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch| 2 +-
.../rpm/rpm/rpm-lsb-compatibility.patch| 2 +-
.../rpm/rpm/rpm-lua-fix-print.patch| 104 --
...rpm-macros.in-disable-external-key-server.patch | 16 +-
.../rpm/rpm/rpm-mongodb-sasl.patch| 69 ++
meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch| 2 +-
...b-before-verifyscript-to-avoid-null-point.patch | 2 +-
.../rpm/rpm/rpm-packageorigin.patch| 2 +-
.../rpm/rpm/rpm-payload-use-hashed-inode.patch| 22 +-
.../rpm/rpm/rpm-pkgconfigdeps.patch| 10 +-
.../rpm/rpm/rpm-platform-file-fix.patch| 2 +-
meta/recipes-devtools/rpm/rpm/rpm-platform.patch| 2 +-
meta/recipes-devtools/rpm/rpm/rpm-platform2.patch| 4 +-
meta/recipes-devtools/rpm/rpm/rpm-py-init.patch| 16 +-
.../rpm/rpm/rpm-python-AddErase.patch| 35 +
.../rpm/rpm/rpm-python-restore-origin.patch| 49 +
.../rpm/rpm/rpm-python-tagname.patch| 24 +
.../rpm/rpm/rpm-remove-sykcparse-decl.patch| 14 -
meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch| 2 +-
.../rpm/rpm/rpm-rpmdb-grammar.patch| 124 +++
.../rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch| 2 +-
.../rpm/rpm/rpm-rpmio-headers.patch| 19 +
meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patch| 67 --
.../recipes-devtools/rpm/rpm/rpm-rpmpgp-popt.patch| 26 +
.../rpm/rpm/rpm-scriptletexechelper.patch| 29 +-
.../rpm/rpm/rpm-syck-fix-gram.patch| 1081 ++++++++++++++++++++
.../rpm-tag-generate-endian-conversion-fix.patch| 2 +-
.../rpm/rpm/rpm-tagname-type.patch| 25 +
.../rpm/rpm/rpm-tools-mtree-LDFLAGS.patch| 2 +-
meta/recipes-devtools/rpm/rpm/rpmatch.patch| 32 +-
.../recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch| 27 +-
.../rpm/syck-5.4.15-to-5.4.16-20160225.patch.gz | Bin 0 -> 4837 bytes
meta/recipes-devtools/rpm/rpm/uclibc-support.patch| 38 +-
...broken-logic-for-ghost-avoidance-Mark-Hat.patch | 38 -
meta/recipes-devtools/rpm/rpm_5.4+cvs.bb <http://cvs.bb> | 302
+++++-
.../rpm/{rpm_5.4.14.bb <http://rpm_5.4.14.bb> => rpm_5.4.16.bb
<http://rpm_5.4.16.bb>} | 197 +++-
meta/recipes-devtools/rpm/rpmresolve_1.0.bb <http://rpmresolve_1.0.bb>
| 2 +-
meta/recipes-support/db/db_6.0.30.bb <http://db_6.0.30.bb> |
2 +-
65 files changed, 2368 insertions(+), 569 deletions(-)
create mode 100644
meta/recipes-devtools/rpm/rpm/beecrypt-5.4.15-to-5.4.16-20160225.patch.gz
delete mode 100644
meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
create mode 100644
meta/recipes-devtools/rpm/rpm/lua-5.4.15-to-5.4.16-20160225.patch.gz
create mode 100644
meta/recipes-devtools/rpm/rpm/popt-disable-auto-stack-protector.patch
create mode 100644
meta/recipes-devtools/rpm/rpm/rpm-5.4.15-to-5.4.16-20160225.patch.gz
create mode 100644meta/recipes-devtools/rpm/rpm/rpm-atomic-ops.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-db60.patch
delete mode 100644
meta/recipes-devtools/rpm/rpm/rpm-disable-Wno-override-init.patch
create mode 100644
meta/recipes-devtools/rpm/rpm/rpm-disable-auto-stack-protector.patch
create mode 100644meta/recipes-devtools/rpm/rpm/rpm-disable-blaketest.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-gnu-atomic.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-keccak-sse-intrin.patchdelete mode 100644meta/recipes-devtools/rpm/rpm/rpm-lua-fix-print.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-python-AddErase.patchcreate mode 100644
meta/recipes-devtools/rpm/rpm/rpm-python-restore-origin.patch
create mode 100644meta/recipes-devtools/rpm/rpm/rpm-python-tagname.patchdelete mode 100644
meta/recipes-devtools/rpm/rpm/rpm-remove-sykcparse-decl.patch
create mode 100644meta/recipes-devtools/rpm/rpm/rpm-rpmdb-grammar.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-rpmio-headers.patchdelete mode 100644meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-fix.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-rpmpgp-popt.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-syck-fix-gram.patchcreate mode 100644meta/recipes-devtools/rpm/rpm/rpm-tagname-type.patchcreate mode 100644
meta/recipes-devtools/rpm/rpm/syck-5.4.15-to-5.4.16-20160225.patch.gz
delete mode 100644
meta/recipes-devtools/rpm/rpm/verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch
rename meta/recipes-devtools/rpm/{rpm_5.4.14.bb <http://rpm_5.4.14.bb> =>
rpm_5.4.16.bb <http://rpm_5.4.16.bb>} (81%)--
2.5.0--
_______________________________________________
Openembedded-core mailing list [email protected] <mailto:[email protected]>
http://lists.openembedded.org/mailman/listinfo/openembedded-core