- update to rpm-4.17.1
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=612
This commit is contained in:
Git OBS Bridge
parent
4c8827bf04
commit
c793cb9035
14
brp.diff
14
brp.diff
@ -1,5 +1,5 @@
|
||||
--- scripts/brp-strip-comment-note.orig 2021-06-21 12:00:44.650612737 +0000
|
||||
+++ scripts/brp-strip-comment-note 2021-09-23 19:04:31.249193665 +0000
|
||||
--- scripts/brp-strip-comment-note.orig 2022-07-01 09:02:17.586292400 +0000
|
||||
+++ scripts/brp-strip-comment-note 2022-07-21 14:03:57.119809772 +0000
|
||||
@@ -16,6 +16,8 @@ esac
|
||||
# for already stripped elf files in the build root
|
||||
for f in `find "$RPM_BUILD_ROOT" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \
|
||||
@ -9,11 +9,11 @@
|
||||
sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped.*/\1/p'`; do
|
||||
note="-R .note"
|
||||
if $OBJDUMP -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1 | \
|
||||
--- scripts/brp-strip.orig 2021-09-23 19:04:31.249193665 +0000
|
||||
+++ scripts/brp-strip 2021-09-23 19:07:10.624868675 +0000
|
||||
--- scripts/brp-strip.orig 2022-07-01 10:31:45.997506545 +0000
|
||||
+++ scripts/brp-strip 2022-07-21 14:06:12.155573458 +0000
|
||||
@@ -14,4 +14,4 @@ esac
|
||||
|
||||
# Strip ELF binaries
|
||||
find "$RPM_BUILD_ROOT" -type f \! -regex "${RPM_BUILD_ROOT}/*usr/lib/debug.*" \! -name "*.ko" -print0 | \
|
||||
- xargs -0 -r -P$NCPUS -n32 sh -c "file \"\$@\" | sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped.*/\1/p' | xargs -I\{\} $STRIP -g \{\}" ARG0
|
||||
+ xargs -0 -r -P$NCPUS -n32 sh -c "file \"\$@\" | grep -v '/lib/modules/' | sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped.*/\1/p' | xargs -I\{\} $STRIP -g \{\}" ARG0
|
||||
find "$RPM_BUILD_ROOT" -type f \! -regex "${RPM_BUILD_ROOT}/*usr/lib/debug.*" \! -name "*.go" -print0 | \
|
||||
- xargs -0 -r -P$NCPUS -n32 sh -c "file \"\$@\" | sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped.*/\1/p' | grep -v 'no machine' | xargs -I\{\} $STRIP -g \{\}" ARG0
|
||||
+ xargs -0 -r -P$NCPUS -n32 sh -c "file \"\$@\" | grep -v ' shared object,' | grep -v '/lib/modules/ | sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped.*/\1/p' | grep -v 'no machine' | xargs -I\{\} $STRIP -g \{\}" ARG0
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
Update OCaml requires/provides to ignore cmxs
|
||||
|
||||
OCaml cmxs files are static libraries, which can be loaded at runtime
|
||||
via the Dynlink module. They apparently do not provide any useful
|
||||
runtime dependency information to be stored into the packages
|
||||
Provides/Requires list. Therefore just skip them.
|
||||
|
||||
Adjust attr, remove extension and ELF magic
|
||||
Adjust ocamldeps, do nothing with cmxs files.
|
||||
|
||||
Fixes: a6fe37c39b39acbcbd014dd1e6d5653ff84254a1
|
||||
|
||||
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
||||
|
||||
--- fileattrs/ocaml.attr.orig 2021-06-21 12:00:44.587611741 +0000
|
||||
+++ fileattrs/ocaml.attr 2021-12-22 13:54:20.384959876 +0000
|
||||
@@ -1,5 +1,5 @@
|
||||
%__ocaml_provides %{_rpmconfigdir}/ocamldeps.sh --provides
|
||||
%__ocaml_requires %{_rpmconfigdir}/ocamldeps.sh --requires
|
||||
-%__ocaml_magic ^(ELF|Objective caml|OCaml) .*$
|
||||
-%__ocaml_path .(cma|cmi|cmo|cmx|cmxa|cmxs)$
|
||||
+%__ocaml_magic ^(Objective caml|OCaml) .*$
|
||||
+%__ocaml_path .(cma|cmi|cmo|cmx|cmxa)$
|
||||
%__ocaml_flags magic_and_path
|
||||
--- scripts/ocamldeps.sh.orig 2021-06-21 12:00:44.650612737 +0000
|
||||
+++ scripts/ocamldeps.sh 2021-12-22 13:54:20.384959876 +0000
|
||||
@@ -32,6 +32,10 @@
|
||||
# Implementations imported:
|
||||
# HASH NAME_FROM_OTHER_MODULE
|
||||
#
|
||||
+# cmxs files are recoqnized, but need to be ignored.
|
||||
+# They contain references of the interfaces and implementations
|
||||
+# compiled into them.
|
||||
+#
|
||||
# The hash may contain just '-', in which case it is ignored.
|
||||
#
|
||||
# Output:
|
||||
@@ -236,7 +240,7 @@ do
|
||||
*.cmo) parse "${filename}" ;;
|
||||
*.cmx) parse "${filename}" ;;
|
||||
*.cmxa) parse "${filename}" ;;
|
||||
- *.cmxs) parse "${filename}" ;;
|
||||
+ *.cmxs) ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
done
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a
|
||||
size 4514138
|
||||
3
rpm-4.17.1.tar.bz2
Normal file
3
rpm-4.17.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0c11b793466e7258851ff82bd65c8ffd8c2dbbc70acc869a5d34150549926e5d
|
||||
size 4642016
|
||||
14
rpm.changes
14
rpm.changes
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 21 16:11:22 CEST 2022 - mls@suse.de
|
||||
|
||||
- update to rpm-4.17.1
|
||||
* new bcond macro for a nicer way to define build conditionals
|
||||
* openPGP parser and IMA security fixes (CVE-2021-3521)
|
||||
* buildroot policy fixes
|
||||
- refreshed patches:
|
||||
* brp.diff
|
||||
- removed patches:
|
||||
* verbosearg.diff
|
||||
* ocaml-cmxs.diff
|
||||
* 0001-fix-minimize_writes.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 27 11:01:54 UTC 2022 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
|
||||
8
rpm.spec
8
rpm.spec
@ -58,7 +58,7 @@ Requires: /usr/bin/awk
|
||||
Summary: The RPM Package Manager
|
||||
License: GPL-2.0-or-later
|
||||
Group: System/Packages
|
||||
Version: 4.17.0
|
||||
Version: 4.17.1
|
||||
Release: 0
|
||||
URL: https://rpm.org/
|
||||
#Git-Clone: https://github.com/rpm-software-management/rpm
|
||||
@ -109,11 +109,8 @@ Patch117: findsupplements.diff
|
||||
Patch122: db_conversion.diff
|
||||
Patch123: nextiteratorheaderblob.diff
|
||||
Patch131: posttrans.diff
|
||||
Patch132: verbosearg.diff
|
||||
Patch133: zstdpool.diff
|
||||
Patch134: zstdthreaded.diff
|
||||
Patch135: ocaml-cmxs.diff
|
||||
Patch136: 0001-fix-minimize_writes.patch
|
||||
# touches a generated file
|
||||
Patch180: whatrequires-doc.diff
|
||||
Patch6464: auto-config-update-aarch64-ppc64le.diff
|
||||
@ -224,8 +221,7 @@ rm -rf sqlite
|
||||
%patch -P 93 -P 94 -P 99
|
||||
%patch -P 100 -P 102 -P 103
|
||||
%patch -P 117
|
||||
%patch -P 122 -P 123 -P 131 -P 132 -P 133 -P 134
|
||||
%patch -P 135 -P 136
|
||||
%patch -P 122 -P 123 -P 131 -P 133 -P 134
|
||||
%patch -P 180
|
||||
|
||||
%ifarch aarch64 ppc64le riscv64
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
--- rpmio/macro.c.orig
|
||||
+++ rpmio/macro.c
|
||||
@@ -1141,7 +1141,10 @@ static size_t doExpand(MacroBuf mb, rpmMacroEntry me, ARGV_t argv)
|
||||
|
||||
static size_t doVerbose(MacroBuf mb, rpmMacroEntry me, ARGV_t argv)
|
||||
{
|
||||
- mbAppend(mb, rpmIsVerbose() ? '1' : '0');
|
||||
+ if (argv[1] != NULL)
|
||||
+ mbAppendStr(mb, rpmIsVerbose() ? argv[1] : "");
|
||||
+ else
|
||||
+ mbAppend(mb, rpmIsVerbose() ? '1' : '0');
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1282,7 +1285,7 @@ static struct builtins_s {
|
||||
{ "uncompress", doUncompress, 1, ME_FUNC },
|
||||
{ "undefine", doUndefine, 1, ME_FUNC },
|
||||
{ "url2path", doFoo, 1, ME_FUNC },
|
||||
- { "verbose", doVerbose, 0, ME_FUNC },
|
||||
+ { "verbose", doVerbose, -1, ME_FUNC },
|
||||
{ "warn", doOutput, 1, ME_FUNC },
|
||||
{ NULL, NULL, 0 }
|
||||
};
|
||||
@@ -1347,7 +1350,7 @@ doExpandThisMacro(MacroBuf mb, rpmMacroEntry me, ARGV_t args, size_t *parsed)
|
||||
int nargs = argvCount(args) - 1;
|
||||
int needarg = (me->nargs != 0);
|
||||
int havearg = (nargs > 0);
|
||||
- if (needarg != havearg) {
|
||||
+ if (((me->flags & ME_PARSE) || me->nargs >= 0) && needarg != havearg) {
|
||||
mbErr(mb, 1, "%%%s: %s\n", me->name, needarg ?
|
||||
_("argument expected") : _("unexpected argument"));
|
||||
goto exit;
|
||||
Loading…
Reference in New Issue
Block a user