From 86da0b89c96ccda0f0816522135f2e44c49ab297 Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Wed, 11 May 2022 18:37:31 +0800 Subject: [PATCH] update to rpm-4.14.3-23.el8.src.rpm Signed-off-by: Liwei Ge --- 1000-rpm-anolis-support-loongarch.patch | 117 ------------------------ rpm-4.14.3-add-path-query-option.patch | 27 +++--- rpm.spec | 19 ++-- 3 files changed, 21 insertions(+), 142 deletions(-) delete mode 100644 1000-rpm-anolis-support-loongarch.patch diff --git a/1000-rpm-anolis-support-loongarch.patch b/1000-rpm-anolis-support-loongarch.patch deleted file mode 100644 index 350516e..0000000 --- a/1000-rpm-anolis-support-loongarch.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 0ff0feb65aa56ae673e0ec0554996a7ce2ff6a38 Mon Sep 17 00:00:00 2001 -From: chenguoqi -Date: Tue, 3 Aug 2021 07:35:19 +0000 -Subject: [PATCH] support loongarch for rpm - ---- - installplatform | 12 ++++++++++++ - lib/rpmrc.c | 6 ++++++ - rpmrc.in | 17 +++++++++++++++++ - 3 files changed, 35 insertions(+) - -diff --git a/installplatform b/installplatform -index 12339fc..74c50a2 100755 ---- a/installplatform -+++ b/installplatform -@@ -168,6 +168,18 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do - CANONARCH=mips64r6el - CANONCOLOR=3 - ;; -+ loongarch32) -+ ISANAME=loongarch -+ ISABITS=32 -+ CANONARCH=loongarch32 -+ CANONCOLOR=0 -+ ;; -+ loongarch64) -+ ISANAME=loongarch -+ ISABITS=64 -+ CANONARCH=loongarch64 -+ CANONCOLOR=3 -+ ;; - m68k) - ISANAME=m68k - ISABITS=32 -diff --git a/lib/rpmrc.c b/lib/rpmrc.c -index cada3f7..c4b13cc 100644 ---- a/lib/rpmrc.c -+++ b/lib/rpmrc.c -@@ -1241,6 +1241,12 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) - } - # endif /* riscv */ - -+# if defined(__linux__) && defined(__loongarch64) -+ strcpy(un.machine, "loongarch64"); -+# elif defined(__linux__) && defined(__loongarch32) -+ strcpy(un.machine, "loongarch32"); -+# endif /* __loongarch64 */ -+ - # if defined(__GNUC__) && defined(__alpha__) - { - unsigned long amask, implver; -diff --git a/rpmrc.in b/rpmrc.in -index 3a5b1e6..425bb97 100644 ---- a/rpmrc.in -+++ b/rpmrc.in -@@ -67,6 +67,8 @@ optflags: mipsr6el -O2 -g - optflags: mips64r6 -O2 -g - optflags: mips64r6el -O2 -g - -+optflags: loongarch64 -O2 -g -+ - optflags: armv3l -O2 -g -march=armv3 - optflags: armv4b -O2 -g -march=armv4 - optflags: armv4l -O2 -g -march=armv4 -@@ -134,6 +136,9 @@ archcolor: mipsr6el 1 - archcolor: mips64r6 2 - archcolor: mips64r6el 2 - -+archcolor: loongarch32 1 -+archcolor: loongarch64 2 -+ - archcolor: m68k 1 - - archcolor: m68kmint 1 -@@ -252,6 +257,9 @@ arch_canon: mips64r6el: mips64r6el 21 - arch_canon: riscv: riscv64 22 - arch_canon: riscv64: riscv64 22 - -+arch_canon: loongarch32: loongarch32 25 -+arch_canon: loongarch64: loongarch64 26 -+ - ############################################################# - # Canonical OS names and numbers - -@@ -353,6 +361,9 @@ buildarchtranslate: mipsr6el: mipsr6el - buildarchtranslate: mips64r6: mips64r6 - buildarchtranslate: mips64r6el: mips64r6el - -+buildarchtranslate: loongarch32: loongarch32 -+buildarchtranslate: loongarch64: loongarch64 -+ - buildarchtranslate: m68k: m68k - - buildarchtranslate: atarist: m68kmint -@@ -442,6 +453,9 @@ arch_compat: mipsr6el: noarch - arch_compat: mips64r6: mipsr6 - arch_compat: mips64r6el: mipsr6el - -+arch_compat: loongarch32: noarch -+arch_compat: loongarch64: loongarch32 -+ - arch_compat: hppa2.0: hppa1.2 - arch_compat: hppa1.2: hppa1.1 - arch_compat: hppa1.1: hppa1.0 -@@ -577,6 +591,9 @@ buildarch_compat: mipsr6el: noarch - buildarch_compat: mips64r6: noarch - buildarch_compat: mips64r6el: noarch - -+buildarch_compat: loongarch32: noarch -+buildarch_compat: loongarch64: noarch -+ - buildarch_compat: armv4b: noarch - buildarch_compat: armv7l: armv6l - buildarch_compat: armv6l: armv5tejl --- -2.27.0 - diff --git a/rpm-4.14.3-add-path-query-option.patch b/rpm-4.14.3-add-path-query-option.patch index 51b37db..0504ec8 100644 --- a/rpm-4.14.3-add-path-query-option.patch +++ b/rpm-4.14.3-add-path-query-option.patch @@ -1,4 +1,4 @@ -From 5e26aa82fb1792c0441131db8dc87976d2d653bb Mon Sep 17 00:00:00 2001 +From 013cd4ba63c35fa75feeccde0022d56e68bc5845 Mon Sep 17 00:00:00 2001 From: Michal Domonkos Date: Mon, 16 Aug 2021 18:21:02 +0200 Subject: [PATCH] Add support for RPMDBI_BASENAMES on file queries @@ -14,8 +14,11 @@ Update the man page for --file to reflect it's current behavior and make Resolves: rhbz#1940895 -Combined with d1aebda01033bc8ba0d748b49f6fad9a5c0caa3f and backported -for 4.14.3. +Combined with: +d1aebda01033bc8ba0d748b49f6fad9a5c0caa3f +f62b6d27cd741406a52a7e9c5b1d6f581dbd3af8 + +Backported for 4.14.3. --- doc/rpm.8 | 9 ++++++-- lib/poptQV.c | 6 +++++- @@ -115,17 +118,17 @@ index 26cdecf10..e6ea1fa2d 100644 mi = rpmtsInitIterator(ts, RPMDBI_PROVIDENAME, fn, 0); diff --git a/lib/rpmcli.h b/lib/rpmcli.h -index 99af2585a..330fd956f 100644 +index 99af2585a..c0d07d137 100644 --- a/lib/rpmcli.h +++ b/lib/rpmcli.h -@@ -82,6 +82,7 @@ rpmcliFini(poptContext optCon); - enum rpmQVSources_e { - RPMQV_PACKAGE = 0, /*!< ... from package name db search. */ - RPMQV_PATH, /*!< ... from file path db search. */ +@@ -102,6 +102,7 @@ enum rpmQVSources_e { + RPMQV_SPECBUILTRPMS, /*!< ... from pkgs which would be built from spec */ + RPMQV_WHATOBSOLETES, /*!< ... from obsoletes db search. */ + RPMQV_WHATCONFLICTS, /*!< ... from conflicts db search. */ + RPMQV_PATH_ALL, /*!< ... from file path db search (all states). */ - RPMQV_ALL, /*!< ... from each installed package. */ - RPMQV_RPM, /*!< ... from reading binary rpm package. */ - RPMQV_GROUP, /*!< ... from group db search. */ + }; + + typedef rpmFlags rpmQVSources; diff --git a/tests/rpmquery.at b/tests/rpmquery.at index 36c62339a..ad580f664 100644 --- a/tests/rpmquery.at @@ -190,5 +193,5 @@ index 36c62339a..ad580f664 100644 AT_SETUP([integer array query]) AT_KEYWORDS([query]) -- -2.33.1 +2.35.1 diff --git a/rpm.spec b/rpm.spec index b420a5f..d2e8994 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,5 +1,3 @@ -%define anolis_release .0.1 -%define _legacy_common_support 1 # build against xz? %bcond_without xz # just for giggles, option to build with internal Berkeley DB @@ -23,7 +21,7 @@ # build with readonly sqlite support? %bcond_without sqlite -%if 0%{?rhel} > 7 || 0%{?anolis} +%if 0%{?rhel} > 7 # Disable python2 build by default %bcond_with python2 %else @@ -34,7 +32,7 @@ %global rpmver 4.14.3 #global snapver rc2 -%global rel 22 +%global rel 23 %global srcver %{version}%{?snapver:-%{snapver}} %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x} @@ -46,7 +44,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}%{rel}%{anolis_release}%{?dist} +Release: %{?snapver:0.%{snapver}.}%{rel}%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://ftp.rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2 @@ -148,8 +146,6 @@ Patch1001: compile-with-Platform-Python-binary-where-relevant.patch # make unversioned %%__python an error unless explicitly overridden Patch1002: rpm-4.14.2-unversioned-python.patch -Patch2000: 1000-rpm-anolis-support-loongarch.patch - # Partially GPL/LGPL dual-licensed and some bits with BSD # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD License: GPLv2+ @@ -223,7 +219,7 @@ BuildRequires: libubsan %endif %if %{with libimaevm} -%if 0%{?fedora} >= 28 || 0%{?rhel} > 7 || 0%{?anolis} +%if 0%{?fedora} >= 28 || 0%{?rhel} > 7 %global imadevname ima-evm-utils-devel %else %global imadevname ima-evm-utils @@ -698,11 +694,8 @@ make check || cat tests/rpmtests.log %doc doc/librpm/html/* %changelog -* Wed Apr 13 2022 Liwei Ge - 4.14.3-22.0.1 -- Rebrand for Anolis OS -- Fix gcc10 -fno-common compile issue for compatible with gcc10 build -- Support loongarch for rpm -- Fix loongarch support +* Tue Apr 05 2022 Michal Domonkos - 4.14.3-23 +- Fix minor ABI regression in rpmcli.h (#1940895) * Tue Feb 15 2022 Michal Domonkos - 4.14.3-22 - Fix spurious %transfiletriggerpostun execution (#2023693) -- Gitee