pool/rpm
SHA256
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 991573 from Base:System

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/991573
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=300
This commit is contained in:
Dominique Leuenberger 2022-08-08 06:45:00 +00:00 committed by Git OBS Bridge
commit e565ddd7cb
20 changed files with 45 additions and 409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0001-fix-minimize_writes.patch
View File

@ -1,31 +0,0 @@
commit 03f146e955e099c24f7a49eff461645e1c0a0fd7
Author: Panu Matilainen <pmatilai@redhat.com>
Date: Thu Jan 13 11:25:30 2022 +0200
Fix minimize_writes not minimizing writes since 4.15 regression
Commit 13f70e3710b2df49a923cc6450ff4a8f86e65666 caused minimize_writes
to actually not minimize anything since fsmVerify() only "verifies"
the thing does NOT exist anymore when it exist. Sigh.
FA_TOUCH needs different kind of verification, stat the file instead
to see if it needs creating afterall. This is all soooo broken...
Fixes: #1881
--- lib/fsm.c.orig
+++ lib/fsm.c
@@ -945,7 +945,12 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,
}
/* Assume file does't exist when tmp suffix is in use */
if (!fp->suffix) {
- rc = fsmVerify(fp->fpath, fi);
+ if (fp->action == FA_TOUCH) {
+ struct stat sb;
+ rc = fsmStat(fp->fpath, 1, &sb);
+ } else {
+ rc = fsmVerify(fp->fpath, fi);
+ }
} else {
rc = RPMERR_ENOENT;
}

3
RPM-HOWTO.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3a1341b0686afa37681ccf2ebacc25bfec0ae96c5f05b4bcf5840d14fd9a29f0
size 18681

14
brp.diff
View File

@ -1,5 +1,5 @@
--- scripts/brp-strip-comment-note.orig 2021-06-21 12:00:44.650612737 +0000 --- scripts/brp-strip-comment-note.orig 2022-07-01 09:02:17.586292400 +0000
+++ scripts/brp-strip-comment-note 2021-09-23 19:04:31.249193665 +0000 +++ scripts/brp-strip-comment-note 2022-07-21 14:03:57.119809772 +0000
@@ -16,6 +16,8 @@ esac @@ -16,6 +16,8 @@ esac
# for already stripped elf files in the build root # 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 {} \; | \ 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 sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped.*/\1/p'`; do
note="-R .note" note="-R .note"
if $OBJDUMP -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1 | \ 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.orig 2022-07-01 10:31:45.997506545 +0000
+++ scripts/brp-strip 2021-09-23 19:07:10.624868675 +0000 +++ scripts/brp-strip 2022-07-21 14:06:12.155573458 +0000
@@ -14,4 +14,4 @@ esac @@ -14,4 +14,4 @@ esac
# Strip ELF binaries # Strip ELF binaries
find "$RPM_BUILD_ROOT" -type f \! -regex "${RPM_BUILD_ROOT}/*usr/lib/debug.*" \! -name "*.ko" -print0 | \ 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' | xargs -I\{\} $STRIP -g \{\}" ARG0 - 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 '/lib/modules/' | 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 ' shared object,' | grep -v '/lib/modules/ | sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped.*/\1/p' | grep -v 'no machine' | xargs -I\{\} $STRIP -g \{\}" ARG0

BIN
debugedit-5.0.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

19
debuginfo-mono.patch
View File

@ -1,19 +0,0 @@
--- scripts/find-debuginfo.in.orig 2021-09-23 20:28:21.646855995 +0000
+++ scripts/find-debuginfo.in 2021-09-23 20:28:53.530790698 +0000
@@ -434,6 +434,16 @@ while read nlinks inum f; do
;;
*) continue ;;
esac
+ # double check that we really have an ELF file,
+ # to handle monodevelop-debugger-gdb and monodevelop-debugger-mdb
+ ftype=`/usr/bin/file $f | cut -d: -f2-`
+ case $ftype in
+ *ELF*) ;;
+ *)
+ echo "$f is not an ELF file, skipping"
+ continue
+ ;;
+ esac
if [ $nlinks -gt 1 ]; then
var=seen_$inum
if test -n "${!var}"; then

11
debuglink.diff
View File

@ -1,11 +0,0 @@
--- scripts/find-debuginfo.in.orig 2021-09-23 20:27:13.686995174 +0000
+++ scripts/find-debuginfo.in 2021-09-23 20:27:40.826939593 +0000
@@ -407,7 +407,7 @@ debug_link()
get_debugfn()
{
dn=$(dirname "${1#$RPM_BUILD_ROOT}")
- bn=$(basename "$1" .debug)${unique_debug_suffix}.debug
+ bn=$(basename "$1")${unique_debug_suffix}.debug
debugdn=${debugdir}${dn}
debugfn=${debugdn}/${bn}
}

41
debugsubpkg.diff
View File

@ -1,41 +0,0 @@
--- scripts/find-debuginfo.in.orig 2021-09-23 20:25:41.059184871 +0000
+++ scripts/find-debuginfo.in 2021-09-23 20:26:40.363063418 +0000
@@ -643,19 +643,25 @@ if $run_dwz \
fi
fi
-# For each symlink whose target has a .debug file,
-# make a .debug symlink to that file.
-find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*" -type l -print |
-while read f
-do
- t=$(readlink -m "$f").debug
- f=${f#$RPM_BUILD_ROOT}
- t=${t#$RPM_BUILD_ROOT}
- if [ -f "$debugdir$t" ]; then
- echo "symlinked /usr/lib/debug$t to /usr/lib/debug${f}.debug"
- debug_link "/usr/lib/debug$t" "${f}.debug"
- fi
-done
+# We used to make a .debug symlink for each symlink whose target
+# has a .debug file to that file. This is not necessary because
+# the debuglink section contains only the destination of those links.
+# Creating those links anyway results in debuginfo packages for
+# devel packages just because of the .so symlinks in them.
+
+## For each symlink whose target has a .debug file,
+## make a .debug symlink to that file.
+#find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*" -type l -print |
+#while read f
+#do
+# t=$(readlink -m "$f").debug
+# f=${f#$RPM_BUILD_ROOT}
+# t=${t#$RPM_BUILD_ROOT}
+# if [ -f "$debugdir$t" ]; then
+# echo "symlinked /usr/lib/debug$t to /usr/lib/debug${f}.debug"
+# debug_link "/usr/lib/debug$t" "${f}.debug"
+# fi
+#done
if [ -s "$SOURCEFILE" ]; then
# See also debugedit invocation. Directories must match up.

21
finddebuginfo-absolute-links.diff
View File

@ -1,21 +0,0 @@
--- scripts/find-debuginfo.in.orig 2021-09-23 20:23:21.967469723 +0000
+++ scripts/find-debuginfo.in 2021-09-23 20:24:51.623286108 +0000
@@ -391,7 +391,17 @@ debug_link()
local l="/usr/lib/debug$2"
local t="$1"
echo >> "$LINKSFILE" "$l $t"
- link_relative "$t" "$l" "$RPM_BUILD_ROOT"
+
+ # this should correspond to what brp-symlink is doing
+ case $t in
+ /usr*)
+ link_relative "$t" "$l" "$RPM_BUILD_ROOT"
+ ;;
+ *)
+ mkdir -p "$(dirname "$RPM_BUILD_ROOT$l")" && \
+ ln -snf "$t" "$RPM_BUILD_ROOT$l"
+ ;;
+ esac
}
get_debugfn()

89
finddebuginfo.diff
View File

@ -1,89 +0,0 @@
--- scripts/find-debuginfo.in.orig 2021-07-26 23:05:31.867817624 +0000
+++ scripts/find-debuginfo.in 2021-09-23 20:20:03.763875636 +0000
@@ -412,12 +412,18 @@ trap 'rm -rf "$temp"' EXIT
# Build a list of unstripped ELF files and their hardlinks
touch "$temp/primary"
-find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*.debug" -type f \
- \( -perm -0100 -or -perm -0010 -or -perm -0001 \) \
- -print | LC_ALL=C sort |
-file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped.*/\1/p' |
-xargs --no-run-if-empty stat -c '%h %D_%i %n' |
+find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*.debug" -type f \( -perm /111 -or -name "*.so*" -or -name "*.ko" \) ! -name "*.a" -print0 | LC_ALL=C sort -z |
+xargs --no-run-if-empty -0 stat -c '%h %D_%i %n' |
while read nlinks inum f; do
+ case $(objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in
+ *debuglink*) continue ;;
+ *debug*) ;;
+ *gnu.version*)
+ echo "WARNING: "`echo $f | sed -e "s,^$RPM_BUILD_ROOT/*,/,"`" is already stripped!"
+ continue
+ ;;
+ *) continue ;;
+ esac
if [ $nlinks -gt 1 ]; then
var=seen_$inum
if test -n "${!var}"; then
@@ -450,6 +456,8 @@ do_file()
if [ "$no_recompute_build_id" = "true" ]; then
no_recompute="-n"
fi
+ mode=$(stat -c %a "$f")
+ chmod +w "$f"
id=$(${install_dir}/debugedit -b "$debug_base_name" -d "$debug_dest_name" \
$no_recompute -i \
${build_id_seed:+--build-id-seed="$build_id_seed"} \
@@ -477,17 +485,30 @@ do_file()
# just has its file names collected and adjusted.
case "$dn" in
/usr/lib/debug/*)
+ chmod $mode "$f"
return ;;
esac
mkdir -p "${debugdn}"
- if test -w "$f"; then
- strip_to_debug "${debugfn}" "$f"
- else
- chmod u+w "$f"
- strip_to_debug "${debugfn}" "$f"
- chmod u-w "$f"
- fi
+ objcopy --only-keep-debug "$f" "$debugfn" || :
+ (
+ shopt -s extglob
+ strip_option="--strip-all"
+ case "$f" in
+ *.ko)
+ strip_option="--strip-debug" ;;
+ *$STRIP_KEEP_SYMTAB*)
+ if test -n "$STRIP_KEEP_SYMTAB"; then
+ strip_option="--strip-debug"
+ fi
+ ;;
+ esac
+ if test "$NO_DEBUGINFO_STRIP_DEBUG" = true ; then
+ strip_option=
+ fi
+ objcopy --add-gnu-debuglink="$debugfn" -R .comment -R .GCC.command.line $strip_option "$f"
+ chmod $mode "$f"
+ ) || :
# strip -g implies we have full symtab, don't add mini symtab in that case.
# It only makes sense to add a minisymtab for executables and shared
@@ -646,12 +667,14 @@ if [ -s "$SOURCEFILE" ]; then
# and non-standard modes may be inherented from original directories, fixup
find "${RPM_BUILD_ROOT}${debug_dest_name}" -type d -print0 |
xargs --no-run-if-empty -0 chmod 0755
+ find "${RPM_BUILD_ROOT}${debug_dest_name}" -type f -print0 |
+ xargs --no-run-if-empty -0 chmod a+r
fi
if [ -d "${RPM_BUILD_ROOT}/usr/lib" ] || [ -d "${RPM_BUILD_ROOT}/usr/src" ]; then
((nout > 0)) ||
test ! -d "${RPM_BUILD_ROOT}/usr/lib" ||
- (cd "${RPM_BUILD_ROOT}/usr/lib"; find debug -type d) |
+ (cd "${RPM_BUILD_ROOT}/usr/lib"; test ! -d debug || find debug -type d) |
sed 's,^,%dir /usr/lib/,' >> "$LISTFILE"
(cd "${RPM_BUILD_ROOT}/usr"

46
ocaml-cmxs.diff
View File

@ -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

16
python-rpm-packaging.diff
View File

@ -1,16 +0,0 @@
--- fileattrs/pythondist.attr.orig 2021-09-23 20:14:04.880605674 +0000
+++ fileattrs/pythondist.attr 2021-09-23 20:15:23.392446317 +0000
@@ -1,3 +1,4 @@
%__pythondist_provides %{_rpmconfigdir}/pythondistdeps.py --provides --majorver-provides
-%__pythondist_requires %{_rpmconfigdir}/pythondistdeps.py --requires
+#disabled for now
+#%__pythondist_requires %{_rpmconfigdir}/pythondistdeps.py --requires
%__pythondist_path /lib(64)?/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$
--- scripts/pythondistdeps.py.orig 2021-09-23 20:14:26.496561795 +0000
+++ scripts/pythondistdeps.py 2021-09-23 20:14:30.748553177 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
#
# Copyright 2010 Per Øyvind Karlsen <proyvind@moondrake.org>

3
python-rpm-packaging.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f82689c47ecbac6b1e93a71cdfab30a6365ac5265dc2cb48381c6e2aeffd193f
size 32846

5
python-rpm.changes
View File

@ -1,3 +1,8 @@
------------------------------------------------------------------
Thu Jul 21 16:11:22 CEST 2022 - mls@suse.de
- update to rpm-4.17.1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 23 20:57:45 CEST 2021 - mls@suse.de Thu Sep 23 20:57:45 CEST 2021 - mls@suse.de

2
python-rpm.spec
View File

@ -21,7 +21,7 @@
%global with_python 1 %global with_python 1
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-rpm Name: python-rpm
Version: 4.17.0 Version: 4.17.1
Release: 0 Release: 0
Summary: Python Bindings for Manipulating RPM Packages Summary: Python Bindings for Manipulating RPM Packages
License: GPL-2.0-or-later License: GPL-2.0-or-later

3
rpm-4.17.0.tar.bz2
View File

@ -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
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0c11b793466e7258851ff82bd65c8ffd8c2dbbc70acc869a5d34150549926e5d
size 4642016

25
rpm.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
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>
- remove obsolete RPM-HOWTO from 1999 (removed RPM-HOWTO.tar.bz2)
- move debugedit to separate package
(Removed debuginfo-mono.patch, debuglink.diff, debugsubpkg.diff,
finddebuginfo-absolute-links.diff, finddebuginfo.diff,
singlefilemode.diff, debugedit-5.0.tar.xz)
- move python-rpm-packaging to separate package
(Removed python-rpm-packaging.diff, python-rpm-packaging.tar.bz2)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 31 19:58:07 UTC 2022 - Dirk Müller <dmueller@suse.com> Tue May 31 19:58:07 UTC 2022 - Dirk Müller <dmueller@suse.com>

77
rpm.spec
View File

@ -58,14 +58,11 @@ Requires: /usr/bin/awk
Summary: The RPM Package Manager Summary: The RPM Package Manager
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/Packages Group: System/Packages
Version: 4.17.0 Version: 4.17.1
Release: 0 Release: 0
URL: https://rpm.org/ URL: https://rpm.org/
#Git-Clone: https://github.com/rpm-software-management/rpm #Git-Clone: https://github.com/rpm-software-management/rpm
Source: http://ftp.rpm.org/releases/rpm-4.17.x/rpm-%{version}.tar.bz2 Source: http://ftp.rpm.org/releases/rpm-4.17.x/rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2
Source2: https://sourceware.org/ftp/debugedit/5.0/debugedit-5.0.tar.xz
Source3: python-rpm-packaging.tar.bz2
Source5: rpmsort Source5: rpmsort
Source8: rpmconfigcheck Source8: rpmconfigcheck
Source9: sysconfig.services-rpm Source9: sysconfig.services-rpm
@ -112,20 +109,10 @@ Patch117: findsupplements.diff
Patch122: db_conversion.diff Patch122: db_conversion.diff
Patch123: nextiteratorheaderblob.diff Patch123: nextiteratorheaderblob.diff
Patch131: posttrans.diff Patch131: posttrans.diff
Patch132: verbosearg.diff
Patch133: zstdpool.diff Patch133: zstdpool.diff
Patch134: zstdthreaded.diff Patch134: zstdthreaded.diff
Patch135: ocaml-cmxs.diff
Patch136: 0001-fix-minimize_writes.patch
# touches a generated file # touches a generated file
Patch180: whatrequires-doc.diff Patch180: whatrequires-doc.diff
Patch200: finddebuginfo.diff
Patch201: finddebuginfo-absolute-links.diff
Patch202: debugsubpkg.diff
Patch203: debuglink.diff
Patch204: debuginfo-mono.patch
Patch205: singlefilemode.diff
Patch300: python-rpm-packaging.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# #
@ -196,6 +183,8 @@ Requires: tar
Requires: util-linux Requires: util-linux
Requires: which Requires: which
Requires: xz Requires: xz
# needed for debuginfo generation
Requires: debugedit = 5.0
# drop candidates # drop candidates
Requires: cpio Requires: cpio
Requires: file Requires: file
@ -209,17 +198,6 @@ Conflicts: rpm < 4.15.0
If you want to build a rpm, you need this package. It provides rpmbuild If you want to build a rpm, you need this package. It provides rpmbuild
and requires some packages that are usually required. and requires some packages that are usually required.
%package build-python
Summary: RPM dependency generator for Python
Group: Development/Languages/Python
Requires: python3-base
# To avoid widespread breakage by package mistakenly ignoring
# their requirement of python-rpm-macros (bsc#1180125)
Requires: python-rpm-macros
%description build-python
Provides and requires generator for .py files and modules.
%package build-perl %package build-perl
Summary: RPM dependency generator for Perl Summary: RPM dependency generator for Perl
Group: Development/Languages/Perl Group: Development/Languages/Perl
@ -230,9 +208,6 @@ Provides and requires generator for .pl files and modules.
%prep %prep
%setup -q -n rpm-%{version} %setup -q -n rpm-%{version}
tar -xjf %{SOURCE1}
tar -xJf %{SOURCE2}
tar -xjf %{SOURCE3}
rm -rf sqlite rm -rf sqlite
%patch -P 5 -P 12 -P 13 -P 16 -P 18 %patch -P 5 -P 12 -P 13 -P 16 -P 18
@ -246,20 +221,9 @@ rm -rf sqlite
%patch -P 93 -P 94 -P 99 %patch -P 93 -P 94 -P 99
%patch -P 100 -P 102 -P 103 %patch -P 100 -P 102 -P 103
%patch -P 117 %patch -P 117
%patch -P 122 -P 123 -P 131 -P 132 -P 133 -P 134 %patch -P 122 -P 123 -P 131 -P 133 -P 134
%patch -P 135 -P 136
%patch -P 180 %patch -P 180
# debugedit patches
pushd debugedit-5.0
%patch -P 200 -P 201 -P 202 -P 203 -P 204 -P 205
popd
# python-rpm-packaging patches
pushd python-rpm-packaging
%patch -P 300
popd
%ifarch aarch64 ppc64le riscv64 %ifarch aarch64 ppc64le riscv64
%patch6464 %patch6464
%endif %endif
@ -303,14 +267,6 @@ $BUILDTARGET
rm po/de.gmo rm po/de.gmo
make %{?_smp_mflags} make %{?_smp_mflags}
%if "%{NAME}" != "python-rpm"
pushd debugedit-5.0
./configure --bindir=/usr/lib/rpm
touch find-debuginfo.1
make
popd
%endif
%install %install
mkdir -p %{buildroot}/usr/lib mkdir -p %{buildroot}/usr/lib
mkdir -p %{buildroot}/usr/share/locale mkdir -p %{buildroot}/usr/share/locale
@ -392,16 +348,6 @@ echo -n "%{_target_cpu}-suse-linux-gnueabi" > %{buildroot}/etc/rpm/platform
echo "setting the default database backend to 'ndb'" echo "setting the default database backend to 'ndb'"
sed -i -e '/_db_backend/s/sqlite/ndb/' %{buildroot}/usr/lib/rpm/macros sed -i -e '/_db_backend/s/sqlite/ndb/' %{buildroot}/usr/lib/rpm/macros
# install debugedit files
pushd debugedit-5.0
make install-exec DESTDIR="%{buildroot}"
popd
# install python-rpm-packaging files
cp -a python-rpm-packaging/fileattrs/*.attr %{buildroot}/usr/lib/rpm/fileattrs
cp -a python-rpm-packaging/scripts/* %{buildroot}/usr/lib/rpm
chmod 755 %{buildroot}/usr/lib/rpm/brp-python-bytecompile
%post %post
%{fillup_only -an services} %{fillup_only -an services}
@ -442,7 +388,6 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%license COPYING %license COPYING
%doc docs/manual %doc docs/manual
%doc RPM-HOWTO
/etc/rpm /etc/rpm
%if !0%{?usrmerged} %if !0%{?usrmerged}
/bin/rpm /bin/rpm
@ -498,17 +443,11 @@ fi
/usr/lib/rpm/ocamldeps.sh /usr/lib/rpm/ocamldeps.sh
/usr/lib/rpm/elfdeps /usr/lib/rpm/elfdeps
/usr/lib/rpm/rpmdeps /usr/lib/rpm/rpmdeps
/usr/lib/rpm/debugedit
/usr/lib/rpm/sepdebugcrcfix
/usr/bin/rpmspec /usr/bin/rpmspec
/usr/lib/rpm/brp-* /usr/lib/rpm/brp-*
%exclude /usr/lib/rpm/brp-python-hardlink
%exclude /usr/lib/rpm/brp-python-bytecompile
/usr/lib/rpm/check-* /usr/lib/rpm/check-*
/usr/lib/rpm/*find* /usr/lib/rpm/*find*
/usr/lib/rpm/fileattrs/ /usr/lib/rpm/fileattrs/
%exclude /usr/lib/rpm/fileattrs/python.attr
%exclude /usr/lib/rpm/fileattrs/pythondist.attr
%exclude /usr/lib/rpm/fileattrs/perl*.attr %exclude /usr/lib/rpm/fileattrs/perl*.attr
/usr/lib/rpm/*.prov /usr/lib/rpm/*.prov
%exclude /usr/lib/rpm/perl.prov %exclude /usr/lib/rpm/perl.prov
@ -519,14 +458,6 @@ fi
/usr/lib/rpm/config.sub /usr/lib/rpm/config.sub
%endif %endif
%files build-python
%defattr(-,root,root)
/usr/lib/rpm/fileattrs/python.attr
/usr/lib/rpm/fileattrs/pythondist.attr
/usr/lib/rpm/pythondistdeps.py
/usr/lib/rpm/brp-python-hardlink
/usr/lib/rpm/brp-python-bytecompile
%files build-perl %files build-perl
%defattr(-,root,root) %defattr(-,root,root)
/usr/lib/rpm/fileattrs/perl*.attr /usr/lib/rpm/fileattrs/perl*.attr

10
singlefilemode.diff
View File

@ -1,10 +0,0 @@
--- scripts/find-debuginfo.in.orig 2021-09-24 09:10:06.477724685 +0000
+++ scripts/find-debuginfo.in 2021-09-24 09:10:26.557680705 +0000
@@ -168,7 +168,6 @@ while [ $# -gt 0 ]; do
;;
--dwz-single-file-mode)
dwz_single_file_mode=true
- shift
;;
--build-id-seed)
build_id_seed=$2

32
verbosearg.diff
View File

@ -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;