From ed3d1273f1d70b50db93635648322bbf82efc5b1 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 20 Feb 2025 01:48:55 +0100 Subject: [PATCH] - merged 4.18.2 from PLD --- allow-at-in-ver-rel.patch | 2 +- build-locale.patch | 12 ++++---- cpuinfo-deps.patch | 6 ++-- gem-in-package-builddir.patch | 11 ------- noexpand.patch | 4 +-- perl-heredoc-matching.patch | 39 ++++++++++++++++++++++++ python-hash-type.patch | 20 +++++++++++++ rpm-builddir-readlink.patch | 24 --------------- rpm-man_pl.patch | 10 ------- rpm-noarch_py_prov.patch | 8 ----- rpm-scripts-closefds.patch | 7 ++--- rpm.spec | 56 +++++++++++++++++------------------ skip-symlinks.patch | 2 +- sqlite-log-crash.patch | 48 ------------------------------ uname-deps.patch | 6 ++-- x32.patch | 29 +++++++++--------- 16 files changed, 119 insertions(+), 165 deletions(-) delete mode 100644 gem-in-package-builddir.patch create mode 100644 perl-heredoc-matching.patch create mode 100644 python-hash-type.patch delete mode 100644 rpm-builddir-readlink.patch delete mode 100644 rpm-man_pl.patch delete mode 100644 rpm-noarch_py_prov.patch delete mode 100644 sqlite-log-crash.patch diff --git a/allow-at-in-ver-rel.patch b/allow-at-in-ver-rel.patch index 06241f8..045935c 100644 --- a/allow-at-in-ver-rel.patch +++ b/allow-at-in-ver-rel.patch @@ -1,9 +1,9 @@ --- rpm-4.16.0/build/rpmbuild_internal.h~ 2020-05-28 12:04:25.000000000 +0200 +++ rpm-4.16.0/build/rpmbuild_internal.h 2020-11-21 19:32:47.432243301 +0100 @@ -18,7 +18,7 @@ - #undef HTDATATYPE #define ALLOWED_CHARS_NAME ".-_+%{}" + #define ALLOWED_FIRSTCHARS_NAME "_%" -#define ALLOWED_CHARS_VERREL "._+%{}~^" +#define ALLOWED_CHARS_VERREL "._+%{}~^@" #define ALLOWED_CHARS_EVR ALLOWED_CHARS_VERREL "-:" diff --git a/build-locale.patch b/build-locale.patch index 49a846b..85687ae 100644 --- a/build-locale.patch +++ b/build-locale.patch @@ -1,6 +1,6 @@ ---- rpm-4.16.1.2.org/macros.in 2021-02-25 08:15:48.438647368 +0100 -+++ rpm-4.16.1.2/macros.in 2021-02-25 08:18:39.103948354 +0100 -@@ -818,9 +818,11 @@ package or when debugging this package.\ +--- rpm-4.18.1/macros.in.orig 2023-09-28 20:57:49.785633725 +0200 ++++ rpm-4.18.1/macros.in 2023-09-28 21:11:58.121037898 +0200 +@@ -741,9 +741,11 @@ package or when debugging this package.\ RPM_PACKAGE_VERSION=\"%{VERSION}\"\ RPM_PACKAGE_RELEASE=\"%{RELEASE}\"\ export RPM_PACKAGE_NAME RPM_PACKAGE_VERSION RPM_PACKAGE_RELEASE\ @@ -9,7 +9,7 @@ LANG=C\ export LANG\ - unset CDPATH DISPLAY ||:\ -+ unset CDPATH DISPLAY LANGUAGE LINGUAS PERL_MM_OPT||:\ - %{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\ ++ unset CDPATH DISPLAY LANGUAGE LINGUAS PERL_MM_OPT ||:\ + unset DEBUGINFOD_URLS ||:\ + %{?buildroot:RPM_BUILD_ROOT=\"%{buildroot}\"\ export RPM_BUILD_ROOT}\ - %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\ diff --git a/cpuinfo-deps.patch b/cpuinfo-deps.patch index 1dab910..e239c8b 100644 --- a/cpuinfo-deps.patch +++ b/cpuinfo-deps.patch @@ -244,9 +244,9 @@ diff -ur rpm-4.16.0/lib/rpmds.c rpm-4.16.0-cpuinfo/lib/rpmds.c +{ + return rpmdsCpuinfoPool(NULL, dsp); +} -diff -ur rpm-4.16.0/lib/rpmds.h rpm-4.16.0-cpuinfo/lib/rpmds.h ---- rpm-4.16.0/lib/rpmds.h 2020-11-08 20:19:15.625093667 +0100 -+++ rpm-4.16.0-cpuinfo/lib/rpmds.h 2020-11-08 20:03:44.001865655 +0100 +diff -ur rpm-4.16.0/include/rpm/rpmds.h rpm-4.16.0-cpuinfo/include/rpm/rpmds.h +--- rpm-4.16.0/include/rpm/rpmds.h 2020-11-08 20:19:15.625093667 +0100 ++++ rpm-4.16.0-cpuinfo/include/rpm/rpmds.h 2020-11-08 20:03:44.001865655 +0100 @@ -419,6 +419,13 @@ */ int rpmdsUname(rpmds * dsp); diff --git a/gem-in-package-builddir.patch b/gem-in-package-builddir.patch deleted file mode 100644 index e75f61c..0000000 --- a/gem-in-package-builddir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rpm-4.16.1.3/build/parsePrep.c.orig 2020-12-10 12:30:21.000000000 +0100 -+++ rpm-4.16.1.3/build/parsePrep.c 2022-04-16 10:55:43.759059308 +0200 -@@ -197,7 +197,7 @@ - char gemnameversion[strlen(sp->source) - 3]; - - rstrlcpy(gemnameversion, sp->source, strlen(sp->source) - 3); -- gemspec = rpmGetPath("%{_builddir}/", gemnameversion, ".gemspec", NULL); -+ gemspec = rpmGetPath("%{_builddir}/", spec->buildSubdir, "/", gemnameversion, ".gemspec", NULL); - - rasprintf(&buf, "%s '%s' && %s spec '%s' --ruby > '%s'", - zipper, fn, gem, fn, gemspec); diff --git a/noexpand.patch b/noexpand.patch index e75a513..1a1a5b4 100644 --- a/noexpand.patch +++ b/noexpand.patch @@ -36,10 +36,10 @@ diff -ur rpm-4.16.0/build/rpmbuild_internal.h rpm-4.16.0-noexpand/build/rpmbuild --- rpm-4.16.0/build/rpmbuild_internal.h 2020-12-18 20:09:28.354868788 +0100 +++ rpm-4.16.0-noexpand/build/rpmbuild_internal.h 2020-12-18 20:09:09.054827168 +0100 @@ -246,6 +246,7 @@ - #define STRIP_NOTHING 0 #define STRIP_TRAILINGSPACE (1 << 0) #define STRIP_COMMENTS (1 << 1) -+#define STRIP_NOEXPAND (1 << 2) + #define STRIP_PARSED (1 << 2) /* Avoid adding to spec->parsed (hack) */ ++#define STRIP_NOEXPAND (1 << 3) #define ALLOW_EMPTY (1 << 16) diff --git a/perl-heredoc-matching.patch b/perl-heredoc-matching.patch new file mode 100644 index 0000000..8ad0160 --- /dev/null +++ b/perl-heredoc-matching.patch @@ -0,0 +1,39 @@ +From 73419594af15e94e77bae413d9754d3775cf0280 Mon Sep 17 00:00:00 2001 +From: Jan Palus +Date: Tue, 12 Dec 2023 19:45:54 +0100 +Subject: [PATCH] perl.req: make heredoc block matching more generic + +match any <) { + +- # skip the "= <<" block ++ # skip the heredoc block + +- if (m/^\s*(?:my\s*)?\$(?:.*)\s*=\s*<<\s*(["'`])(.+?)\1/ || +- m/^\s*(?:my\s*)?\$(.*)\s*=\s*<<(\w+)\s*;/) { ++ if (m/^[^'"#]+[\s,=(]<<\s*(["'`])(.+?)\1/ || ++ m/^[^'"#]+[\s,=(](<<)(\w+)\s*;/) { + $tag = $2; + while () { + chomp; diff --git a/python-hash-type.patch b/python-hash-type.patch new file mode 100644 index 0000000..2b2de68 --- /dev/null +++ b/python-hash-type.patch @@ -0,0 +1,20 @@ +--- rpm-4.18.2/python/header-py.c.orig 2023-11-13 13:18:27.000000000 +0100 ++++ rpm-4.18.2/python/header-py.c 2024-11-23 10:43:56.360696347 +0100 +@@ -316,10 +316,17 @@ + "(Oi)", s, RPMTAG_NEVR); + } + ++#if __BITS_PER_LONG == 64 + static long hdr_hash(PyObject * h) + { + return (long) h; + } ++#else ++static int hdr_hash(PyObject * h) ++{ ++ return (int) h; ++} ++#endif + + static PyObject * hdr_reduce(hdrObject *s) + { diff --git a/rpm-builddir-readlink.patch b/rpm-builddir-readlink.patch deleted file mode 100644 index 069650f..0000000 --- a/rpm-builddir-readlink.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- rpm-4.5/scripts/find-debuginfo.sh~ 2010-01-27 19:25:48.000000000 +0200 -+++ rpm-4.5/scripts/find-debuginfo.sh 2010-01-27 20:23:37.279516094 +0200 -@@ -385,6 +385,9 @@ - debug_base_name="$BUILDDIR" - debug_dest_name="/usr/src/debug/${unique_debug_src_base}" - fi -+# canon debug_base_name, the DW_AT_comp_dir in ELF objects is real a real path -+# and debugedit will ignore them as they are out of build dir. -+ debug_base_name=$(readlink -f "$debug_base_name") - no_recompute= - if [ "$no_recompute_build_id" = "true" ]; then - no_recompute="-n" -@@ -398,6 +400,11 @@ - $strict && exit 2 - fi - -+ if [ ! -s "$SOURCEFILE" ]; then -+ echo >&2 "*** ${strict_error}: no sources found for $f (stripped without sourcefile information?)" -+ $strict && exit 2 -+ fi -+ - # Add .gdb_index if requested. - if $include_gdb_index; then - if type gdb-add-index >/dev/null 2>&1; then diff --git a/rpm-man_pl.patch b/rpm-man_pl.patch deleted file mode 100644 index 8ed712f..0000000 --- a/rpm-man_pl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- rpm-4.16.0/docs/man/pl/rpm.8.orig 2020-05-28 12:04:25.022136604 +0200 -+++ rpm-4.16.0/docs/man/pl/rpm.8 2020-10-13 08:06:11.442087617 +0200 -@@ -318,6 +318,7 @@ - Instaluje pakiety nawet je\[u015B]li niekt\['o]re z nich s\[u0105] - ju\[u017C] zainstalowane na tym systemie. - .TP -+\fB--test\fR - Nie instaluje pakietu, po prostu sprawdza i raportuje potencjalne - konflikty. - .SS OPCJE USUWANIA diff --git a/rpm-noarch_py_prov.patch b/rpm-noarch_py_prov.patch deleted file mode 100644 index 7c42050..0000000 --- a/rpm-noarch_py_prov.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff --color -urN rpm-4.16.0.orig/fileattrs/pythondist.attr rpm-4.16.0/fileattrs/pythondist.attr ---- rpm-4.16.0.orig/fileattrs/pythondist.attr 2020-12-09 12:38:21.203961862 +0100 -+++ rpm-4.16.0/fileattrs/pythondist.attr 2020-12-09 12:58:43.178952892 +0100 -@@ -1,3 +1,3 @@ - %__pythondist_provides %{_rpmconfigdir}/pythondistdeps.py --provides --majorver-provides - %__pythondist_requires %{_rpmconfigdir}/pythondistdeps.py --requires --%__pythondist_path /lib(64|x32)?/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$ -+%__pythondist_path /(lib(64|x32)?|share)/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$ diff --git a/rpm-scripts-closefds.patch b/rpm-scripts-closefds.patch index 6be392e..222f3fd 100644 --- a/rpm-scripts-closefds.patch +++ b/rpm-scripts-closefds.patch @@ -1,14 +1,13 @@ --- rpm-4.16.0/lib/rpminstall.c.orig 2020-05-28 12:04:25.040136702 +0200 +++ rpm-4.16.0/lib/rpminstall.c 2020-10-03 09:46:49.369707250 +0200 -@@ -4,6 +4,8 @@ +@@ -4,6 +4,7 @@ #include "system.h" +#include -+ + #include + #include - #include - #include /* rpmReadPackageFile, vercmp etc */ @@ -114,8 +116,15 @@ Fclose(fd); fd = NULL; diff --git a/rpm.spec b/rpm.spec index 6006709..ef044e3 100644 --- a/rpm.spec +++ b/rpm.spec @@ -10,11 +10,10 @@ %bcond_with imaevm # IMA/EVM signing support (requires libimaevm from ima-evm-utils) %bcond_without audit # audit plugin %bcond_without selinux # SELinux plugin -%bcond_with systemd # systemd inhibit plugin +%bcond_without systemd # systemd inhibit plugin %bcond_without fsverity # fsverity plugin %define popt_ver 1.15 -%define sover 9.3.0 %if "%{_rpmversion}" >= "4.12" && "%{_rpmversion}" < "5" %define with_recommends_tags 1 @@ -33,13 +32,13 @@ Summary(pt_BR.UTF-8): Gerenciador de pacotes RPM Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm -Version: 4.17.1.1 +Version: 4.18.2 Release: 2 Epoch: 1 License: GPL v2 / LGPL v2.1 Group: Base -Source0: http://ftp.rpm.org/releases/rpm-4.17.x/%{name}-%{version}.tar.bz2 -# Source0-md5: 30e5806bdcb06a17cabf23d8f07b6b0f +Source0: http://ftp.rpm.org/releases/rpm-4.18.x/%{name}-%{version}.tar.bz2 +# Source0-md5: 471f5ef532e7f41ff109994cfa959b9e Source1: https://ftp.tld-linux.org/TLD/TLD-Linux.asc # Source1-md5: 5b5caff8c570489ad5bf950734546c24 Source2: macros.local @@ -58,7 +57,6 @@ Source14: %{name}.noautoreqfiles Source15: perl.prov Source16: libtooldeps.sh Source17: libtool.attr -Patch0: %{name}-man_pl.patch Patch1: %{name}-popt-aliases.patch Patch2: %{name}-perl-macros.patch Patch3: %{name}-perl-req-perlfile.patch @@ -66,7 +64,6 @@ Patch4: %{name}-scripts-closefds.patch Patch5: %{name}-dir-macros-relative.patch Patch6: %{name}-perl_req-INC_dirs.patch Patch7: %{name}-debuginfo.patch -Patch9: %{name}-builddir-readlink.patch Patch10: %{name}-changelog_order_check_nonfatal.patch Patch11: %{name}-postun-nofail.patch Patch12: %{name}-clean-docdir.patch @@ -85,16 +82,14 @@ Patch24: cpuinfo-deps.patch Patch25: rpmio-read-proc-files.patch Patch26: allow-at-in-ver-rel.patch Patch28: default-patch-flags.patch -Patch29: %{name}-noarch_py_prov.patch Patch30: missing-ghost-terminate-build.patch Patch31: missing-doc-terminate-build.patch Patch32: noexpand.patch Patch34: skip-symlinks.patch -Patch35: pl-po.patch Patch36: build-locale.patch Patch37: no-exe-for-elf-req.patch -Patch38: gem-in-package-builddir.patch -Patch39: sqlite-log-crash.patch +Patch40: perl-heredoc-matching.patch +Patch41: python-hash-type.patch URL: https://rpm.org/ BuildRequires: acl-devel %{?with_audit:BuildRequires: audit-libs-devel} @@ -243,8 +238,7 @@ Zawiera on: Summary: RPMs library Summary(pl.UTF-8): Biblioteki RPM-a Group: Libraries -Requires: elfutils >= 0.159 -Requires: elfutils-libelf >= 0.159 +Requires: elfutils-libs >= 0.159 Requires: libmagic >= 1.15-2 Requires: popt >= %{popt_ver} Requires: sqlite3-libs >= 3.22.0 @@ -638,7 +632,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %prep %setup -q -n %{name}-%{version}%{?subver} -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -646,7 +639,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch5 -p1 %patch6 -p0 %patch7 -p1 -#%patch9 -p1 %patch10 -p1 %patch11 -p1 %patch12 -p1 @@ -665,16 +657,14 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch25 -p1 %patch26 -p1 %patch28 -p1 -#%patch29 -p1 %patch30 -p1 %patch31 -p1 %patch32 -p1 %patch34 -p1 -%patch35 -p1 %patch36 -p1 %patch37 -p1 -%patch38 -p1 -%patch39 -p1 +%patch40 -p1 +%patch41 -p1 %{__rm} po/*.gmo @@ -780,6 +770,7 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/TLD-Linux.asc %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/platform/alpha*-linux/macros %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ia64-linux/macros +%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/platform/loongarch64-linux/macros %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/platform/mips*-linux/macros %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/platform/riscv64-linux/macros %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/platform/s390*-linux/macros @@ -837,9 +828,11 @@ for be in sqlite bdb ndb; do done %if %{with python3} -# Remove anything that rpm make install might put there -%{__rm} -rf $RPM_BUILD_ROOT%{py3_sitedir} +# Remove anything that rpm make install might put there; +# we already have .egg-info as directory, so there is no reason for transition to file for a while cd python +%{__rm} -rf rpm.egg-info +%{__rm} -rf $RPM_BUILD_ROOT%{py3_sitedir} %py3_install cd .. %endif @@ -987,14 +980,14 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %files lib %defattr(644,root,root,755) -%attr(755,root,root) /%{_lib}/librpm.so.9 -%attr(755,root,root) /%{_lib}/librpm.so.%{sover} -%attr(755,root,root) /%{_lib}/librpmbuild.so.9 -%attr(755,root,root) /%{_lib}/librpmbuild.so.%{sover} -%attr(755,root,root) /%{_lib}/librpmio.so.9 -%attr(755,root,root) /%{_lib}/librpmio.so.%{sover} -%attr(755,root,root) /%{_lib}/librpmsign.so.9 -%attr(755,root,root) /%{_lib}/librpmsign.so.%{sover} +%attr(755,root,root) %ghost /%{_lib}/librpm.so.9 +%attr(755,root,root) /%{_lib}/librpm.so.*.*.* +%attr(755,root,root) %ghost /%{_lib}/librpmbuild.so.9 +%attr(755,root,root) /%{_lib}/librpmbuild.so.*.*.* +%attr(755,root,root) %ghost /%{_lib}/librpmio.so.9 +%attr(755,root,root) /%{_lib}/librpmio.so.*.*.* +%attr(755,root,root) %ghost /%{_lib}/librpmsign.so.9 +%attr(755,root,root) /%{_lib}/librpmsign.so.*.*.* %{?with_plugins:%dir %{_libdir}/rpm-plugins} %files devel @@ -1049,6 +1042,8 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/find-provides %attr(755,root,root) %{_rpmlibdir}/find-requires %attr(755,root,root) %{_rpmlibdir}/ocamldeps.sh +%attr(755,root,root) %{_rpmlibdir}/rpm_macros_provides.sh +%attr(755,root,root) %{_rpmlibdir}/rpmuncompress %attr(755,root,root) %{_rpmlibdir}/script.req %dir %{_rpmlibdir}/fileattrs @@ -1060,10 +1055,12 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{_rpmlibdir}/fileattrs/metainfo.attr %{_rpmlibdir}/fileattrs/ocaml.attr %{_rpmlibdir}/fileattrs/pkgconfig.attr +%{_rpmlibdir}/fileattrs/rpm_macro.attr %{_rpmlibdir}/fileattrs/script.attr %attr(755,root,root) %{_bindir}/gendiff %attr(755,root,root) %{_bindir}/rpmbuild +%attr(755,root,root) %{_bindir}/rpmlua %attr(755,root,root) %{_bindir}/rpmspec %{_mandir}/man1/gendiff.1* @@ -1071,6 +1068,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{_mandir}/man8/rpmbuild.8* %lang(ja) %{_mandir}/ja/man8/rpmbuild.8* %lang(pl) %{_mandir}/pl/man8/rpmbuild.8* +%{_mandir}/man8/rpmlua.8* %{_mandir}/man8/rpmspec.8* %files perlprov diff --git a/skip-symlinks.patch b/skip-symlinks.patch index 1f3eea5..ccd24d1 100644 --- a/skip-symlinks.patch +++ b/skip-symlinks.patch @@ -1,7 +1,7 @@ --- rpm-4.16.1.2/build/rpmfc.c~ 2021-01-24 09:43:15.000000000 +0100 +++ rpm-4.16.1.2/build/rpmfc.c 2021-02-19 09:14:46.031544586 +0100 @@ -1231,7 +1231,7 @@ - size_t slen = strlen(s); + int extension_index = 0; int fcolor = RPMFC_BLACK; rpm_mode_t mode = (fmode ? fmode[ix] : 0); - int is_executable = (mode & (S_IXUSR|S_IXGRP|S_IXOTH)); diff --git a/sqlite-log-crash.patch b/sqlite-log-crash.patch deleted file mode 100644 index 87137f5..0000000 --- a/sqlite-log-crash.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ea3187cfcf9cac87e5bc5e7db79b0338da9e355e Mon Sep 17 00:00:00 2001 -From: Panu Matilainen -Date: Mon, 26 Jun 2023 12:45:09 +0300 -Subject: [PATCH] Don't muck with per-process global sqlite configuration from - the db backend - -sqlite3_config() affects all in-process uses of sqlite. librpm being a -low-level library, it has no business whatsoever making such decisions -for the applications running on top of it. Besides that, the callback can -easily end up pointing to an already closed database, causing an -innocent API user to crash in librpm on an entirely unrelated error on -some other database. "Oops." - -The sqlite API doesn't seem to provide any per-db or non-global context -for logging errors, thus we can only remove the call and let sqlite output -errors the way it pleases (print through stderr, presumably). - -Thanks to Jan Palus for spotting and reporting! ---- - lib/backend/sqlite.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.c -index 5a029d575a..b612732267 100644 ---- a/lib/backend/sqlite.c -+++ b/lib/backend/sqlite.c -@@ -44,13 +44,6 @@ static void rpm_match3(sqlite3_context *sctx, int argc, sqlite3_value **argv) - sqlite3_result_int(sctx, match); - } - --static void errCb(void *data, int err, const char *msg) --{ -- rpmdb rdb = data; -- rpmlog(RPMLOG_WARNING, "%s: %s: %s\n", -- rdb->db_descr, sqlite3_errstr(err), msg); --} -- - static int dbiCursorReset(dbiCursor dbc) - { - if (dbc->stmt) { -@@ -170,7 +163,6 @@ static int sqlite_init(rpmdb rdb, const char * dbhome) - * the "database is locked" errors at every cost - */ - sqlite3_busy_timeout(sdb, 10000); -- sqlite3_config(SQLITE_CONFIG_LOG, errCb, rdb); - - sqlexec(sdb, "PRAGMA secure_delete = OFF"); - sqlexec(sdb, "PRAGMA case_sensitive_like = ON"); diff --git a/uname-deps.patch b/uname-deps.patch index 61ba652..d2f6a29 100644 --- a/uname-deps.patch +++ b/uname-deps.patch @@ -93,10 +93,10 @@ index f7ee76392..754969e39 100644 +{ + return rpmdsUnamePool(NULL, dsp); +} -diff --git a/lib/rpmds.h b/lib/rpmds.h +diff --git a/include/rpm/rpmds.h b/include/rpm/rpmds.h index 90d54aa27..558252c04 100644 ---- a/lib/rpmds.h -+++ b/lib/rpmds.h +--- a/include/rpm/rpmds.h ++++ b/include/rpm/rpmds.h @@ -412,6 +412,13 @@ int rpmdsNVRMatchesDep(const Header h, const rpmds req, int nopromote); */ int rpmdsRpmlib(rpmds * dsp, const void * tblp); diff --git a/x32.patch b/x32.patch index 9eab78d..8f9c068 100644 --- a/x32.patch +++ b/x32.patch @@ -1,7 +1,6 @@ -diff -ur rpm-4.16.1.2/build/rpmfc.c rpm-4.16.1.2.x32/build/rpmfc.c ---- rpm-4.16.1.2/build/rpmfc.c 2021-03-21 21:51:28.231530270 +0100 -+++ rpm-4.16.1.2.x32/build/rpmfc.c 2021-03-21 21:50:04.127398387 +0100 -@@ -641,6 +641,7 @@ +--- rpm-4.18.1/build/rpmfc.c.orig 2023-09-28 20:44:47.296539499 +0200 ++++ rpm-4.18.1/build/rpmfc.c 2023-09-28 20:56:50.552621285 +0200 +@@ -648,6 +648,7 @@ static const struct rpmfcTokens_s rpmfcT { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, @@ -9,7 +8,7 @@ diff -ur rpm-4.16.1.2/build/rpmfc.c rpm-4.16.1.2.x32/build/rpmfc.c { "troff or preprocessor input", RPMFC_INCLUDE }, { "GNU Info", RPMFC_INCLUDE }, -@@ -746,7 +747,11 @@ +@@ -753,7 +754,11 @@ static rpm_color_t rpmfcColor(const char if (strstr(fmstr, fct->token) == NULL) continue; @@ -22,7 +21,7 @@ diff -ur rpm-4.16.1.2/build/rpmfc.c rpm-4.16.1.2.x32/build/rpmfc.c if (fcolor & RPMFC_INCLUDE) break; } -@@ -1147,7 +1152,10 @@ +@@ -1149,7 +1154,10 @@ static uint32_t getElfColor(const char * color = RPMFC_ELF64; break; case ELFCLASS32: @@ -33,10 +32,10 @@ diff -ur rpm-4.16.1.2/build/rpmfc.c rpm-4.16.1.2.x32/build/rpmfc.c + color = RPMFC_ELF32; break; } - elf_end(elf); -diff -ur rpm-4.16.1.2/build/rpmfc.h rpm-4.16.1.2.x32/build/rpmfc.h ---- rpm-4.16.1.2/build/rpmfc.h 2020-05-28 12:04:25.011136544 +0200 -+++ rpm-4.16.1.2.x32/build/rpmfc.h 2021-03-21 21:50:04.127398387 +0100 + } +diff -ur rpm-4.16.1.2/include/rpm/rpmfc.h rpm-4.16.1.2.x32/include/rpm/rpmfc.h +--- rpm-4.16.1.2/include/rpm/rpmfc.h 2020-05-28 12:04:25.011136544 +0200 ++++ rpm-4.16.1.2.x32/include/rpm/rpmfc.h 2021-03-21 21:50:04.127398387 +0100 @@ -26,8 +26,9 @@ RPMFC_BLACK = 0, RPMFC_ELF32 = (1 << 0), @@ -52,16 +51,16 @@ diff -ur rpm-4.16.1.2/configure.ac rpm-4.16.1.2.x32/configure.ac --- rpm-4.16.1.2/configure.ac 2021-03-21 21:51:28.221530479 +0100 +++ rpm-4.16.1.2.x32/configure.ac 2021-03-21 21:50:04.127398387 +0100 @@ -930,6 +930,10 @@ - if echo "$host_os" | grep '.*-gnu' > /dev/null ; then + if echo "$host_os" | grep '.*-gnu$' > /dev/null ; then host_os=`echo "${host_os}" | sed 's/-gnu$//'` fi +if echo "$host_os" | grep '.*-gnux32' > /dev/null ; then + host_os=`echo "${host_os}" | sed 's/-gnux32$//'` + host_os_gnu=-gnux32 +fi - - changequote(<, >) - host_os_exact="${host_os}" + if echo "$host_os" | grep '.*-gnu[[^-]]*$' > /dev/null ; then + AC_MSG_ERROR([unrecognized GNU build triplet $host_os]) + fi diff -ur rpm-4.16.1.2/installplatform rpm-4.16.1.2.x32/installplatform --- rpm-4.16.1.2/installplatform 2020-05-28 12:04:25.027136631 +0200 +++ rpm-4.16.1.2.x32/installplatform 2021-03-21 21:51:47.671145954 +0100 @@ -153,7 +152,7 @@ diff -ur rpm-4.16.1.2/rpmrc.in rpm-4.16.1.2.x32/rpmrc.in optflags: alphaev5 -O2 -g -mieee -mtune=ev5 @@ -155,6 +156,8 @@ - archcolor: riscv64 2 + archcolor: loongarch64 2 +archcolor: x32 4 + -- 2.48.1