diff --git a/0001-rpm-4.17-add-un.machine-in-loongarch.patch b/0001-rpm-4.17-add-un.machine-in-loongarch.patch new file mode 100644 index 0000000000000000000000000000000000000000..d49724a7fa4ace162189326bfe6ed85caa9fef83 --- /dev/null +++ b/0001-rpm-4.17-add-un.machine-in-loongarch.patch @@ -0,0 +1,172 @@ +From 2fd84ac97a61c7c22ecbdf549ad25886d47fddd4 Mon Sep 17 00:00:00 2001 +From: Huang Yang +Date: Tue, 26 Apr 2022 16:39:32 +0800 +Subject: [PATCH] rpm 4.17 add un.machine in loongarch + +--- + ...rpm-4.17-add-un.machine-in-loongarch.patch | 29 ++++++++ + rpm.spec | 74 ++++++++++++++++--- + 2 files changed, 93 insertions(+), 10 deletions(-) + create mode 100644 0001-rpm-4.17-add-un.machine-in-loongarch.patch + +diff --git a/0001-rpm-4.17-add-un.machine-in-loongarch.patch b/0001-rpm-4.17-add-un.machine-in-loongarch.patch +new file mode 100644 +index 0000000..eb6c029 +--- /dev/null ++++ b/0001-rpm-4.17-add-un.machine-in-loongarch.patch +@@ -0,0 +1,29 @@ ++From 4d5193e866cc68204c68726e9a31bf4525832482 Mon Sep 17 00:00:00 2001 ++From: Huang Yang ++Date: Tue, 26 Apr 2022 14:43:01 +0800 ++Subject: [PATCH] rpm 4.17 add un.machine in loongarch ++ ++--- ++ lib/rpmrc.c | 6 +++++- ++ 1 file changed, 5 insertions(+), 1 deletion(-) ++ ++diff --git a/lib/rpmrc.c b/lib/rpmrc.c ++index 120777c..cd2ed6a 100644 ++--- a/lib/rpmrc.c +++++ b/lib/rpmrc.c ++@@ -1241,7 +1241,11 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) ++ strcpy(un.machine, "riscv128"); ++ } ++ # endif /* riscv */ ++- +++# if defined(__linux__) && defined(__loongarch64) +++ strcpy(un.machine, "loongarch64"); +++# else +++ strcpy(un.machine, "loongarch32"); +++# endif /* __loongarch64 */ ++ # if defined(__GNUC__) && defined(__alpha__) ++ { ++ unsigned long amask, implver; ++-- ++2.27.0 ++ +diff --git a/rpm.spec b/rpm.spec +index a8796a0..d1afce4 100644 +--- a/rpm.spec ++++ b/rpm.spec +@@ -1,6 +1,6 @@ + Name: rpm + Version: 4.17.0 +-Release: 3 ++Release: 9 + Summary: RPM Package Manager + License: GPLv2+ + URL: http://www.rpm.org/ +@@ -15,12 +15,21 @@ Patch6: bugfix-rpm-4.14.2-wait-once-get-rpmlock-fail.patch + Patch7: Generate-digest-lists.patch + Patch8: Add-digest-list-plugin.patch + Patch9: Don-t-add-dist-to-release-if-it-is-already-there.patch +-Patch10: Use-user.digest_list-to-avoid-duplicate-processing-o.patch ++Patch10: Generate-digest-lists-before-calling-genCpioListAndH.patch + Patch11: call-process_digest_list-after-files-are-added.patch + Patch12: fix-lsetxattr-error-in-container.patch +-Patch13: get-in-use-of-ndb.patch +-Patch14: backport-Use-root-as-default-UID_0_USER-and-UID_0_GROUP.patch +-Patch15: still-in-use-of-python-scripts-from-old-version.patch ++Patch13: rpm-selinux-plugin-check-context-file-exist.patch ++Patch14: get-in-use-of-ndb.patch ++Patch15: backport-Use-root-as-default-UID_0_USER-and-UID_0_GROUP.patch ++Patch16: still-in-use-of-python-scripts-from-old-version.patch ++Patch17: 0001-Add-loongarch-architecture-support.patch ++Patch18: Fix-digest_list_counter.patch ++Patch19: Check-rpm-parser.patch ++Patch20: Remove-digest-list-from-the-kernel-during-package-re.patch ++Patch21: Add-license-to-digest_list.c.patch ++Patch22: Avoid-generating-digest-lists-if-they-are-already-pa.patch ++Patch23: dont-remove-ima-xattr-of-parser-when-upgrading.patch ++Patch24: 0001-rpm-4.17-add-un.machine-in-loongarch.patch + + BuildRequires: gcc autoconf automake libtool make gawk popt-devel openssl-devel readline-devel + BuildRequires: zlib-devel libzstd-devel xz-devel bzip2-devel libarchive-devel ima-evm-utils-devel +@@ -260,9 +269,9 @@ make check || (cat tests/rpmtests.log; exit 0) + %{_rpmconfigdir}/*deps* + %{_rpmconfigdir}/*.prov + %{_rpmconfigdir}/*.req +-%{_rpmconfigdir}/config.* + %{_rpmconfigdir}/mkinstalldirs + %{_rpmconfigdir}/fileattrs/* ++%{_rpmconfigdir}/config.* + + %files -n python3-%{name} + %defattr(-,root,root) +@@ -290,24 +299,69 @@ make check || (cat tests/rpmtests.log; exit 0) + %{_mandir}/man1/gendiff.1* + + %changelog +-*Thu Feb 17 2022 renhongxun - 4.17.0-3 ++* Thu Apr 26 2022 Huang Yang - 4.17.0-9 ++- Type:bugfix ++- ID:NA ++- SUG:NA ++- DESC:add un.machine information in loongarch ++ ++* Wed Mar 16 2022 luhuaxin - 4.17.0-8 ++- Type:bugfix ++- ID:NA ++- SUG:NA ++- DESC:fix issue of digest-list-tools upgrading ++ ++* Tue Mar 15 2022 luhuaxin - 4.17.0-7 ++- Type:bugfix ++- ID:NA ++- SUG:NA ++- DESC:backport IMA patches from 21.03 ++ ++* Thu Feb 17 2022 renhongxun - 4.17.0-6 + - Type:bugfix + - ID:NA + - SUG:NA + - DESC:delete some libdb symbolic link + +-* Wed Feb 16 2022 renhongxun - 4.17.0-2 ++* Tue Jan 11 2022 Sunhaiyong - 4.17.0-5 ++- Add loongarch support. ++ ++* Thu Jan 06 2022 renhongxun - 4.17.0-4 + - Type:bugfix + - ID:NA + - SUG:NA +-- DESC:bugfix on finding python3.x dir ++- DESC:delete new plugins' files + +-* Mon Dec 27 2021 renhongxun - 4.17.0-1 ++* Tue Jan 04 2022 renhongxun - 4.17.0-3 ++- Type:bugfix ++- ID:NA ++- SUG:NA ++- DESC:disable three new plugins ++ ++* Wed Dec 29 2021 renhongxun - 4.17.0-2 ++- Type:bugfix ++- ID:NA ++- SUG:NA ++- DESC:still in use of python scripts from old version ++ ++* Tue Dec 13 2021 renhongxun - 4.17.0-1 + - Type:requirement + - ID:NA + - SUG:NA + - DESC:upgrade to 4.17.0 + ++* Fri Dec 3 2021 luhuaxin<1539327763@qq.com> - 4.15.1-32 ++- Type:bugfix ++- ID:NA ++- SUG:NA ++- DESC:rpm selinux plugin check context file exist ++ ++* Wed Nov 03 2021 tianwei - 4.15.1-31 ++- Type:cve ++- ID:NA ++- SUG:NA ++- DESC:fix CVE-2021-3521 ++ + * Mon Sep 13 2021 zhangtianxing - 4.15.1-30 + - Type:bugfix + - ID:NA +-- +2.30.GIT + diff --git a/rpm.spec b/rpm.spec index 66b081bd36ec9eeed251dbf3b5cf0501a772d72a..d1afce4e718b29a1f3896db74f7f5428ed0d1797 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,6 +1,6 @@ Name: rpm Version: 4.17.0 -Release: 8 +Release: 9 Summary: RPM Package Manager License: GPLv2+ URL: http://www.rpm.org/ @@ -29,6 +29,7 @@ Patch20: Remove-digest-list-from-the-kernel-during-package-re.patch Patch21: Add-license-to-digest_list.c.patch Patch22: Avoid-generating-digest-lists-if-they-are-already-pa.patch Patch23: dont-remove-ima-xattr-of-parser-when-upgrading.patch +Patch24: 0001-rpm-4.17-add-un.machine-in-loongarch.patch BuildRequires: gcc autoconf automake libtool make gawk popt-devel openssl-devel readline-devel BuildRequires: zlib-devel libzstd-devel xz-devel bzip2-devel libarchive-devel ima-evm-utils-devel @@ -298,6 +299,12 @@ make check || (cat tests/rpmtests.log; exit 0) %{_mandir}/man1/gendiff.1* %changelog +* Thu Apr 26 2022 Huang Yang - 4.17.0-9 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:add un.machine information in loongarch + * Wed Mar 16 2022 luhuaxin - 4.17.0-8 - Type:bugfix - ID:NA