diff --git a/backport-fix_loongarch_test_error.patch b/backport-fix_loongarch_test_error.patch new file mode 100644 index 0000000000000000000000000000000000000000..3267c50fcbd2bbdc859b24244bd25ae71ec90da3 --- /dev/null +++ b/backport-fix_loongarch_test_error.patch @@ -0,0 +1,42 @@ +From 9aaf33afaa2c12e6359b7a1defe7070286fc9302 Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Wed, 23 Oct 2024 15:33:18 +0800 +Subject: [PATCH] fix loongarch test error + +--- + tests/ts/fincore/count | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/ts/fincore/count b/tests/ts/fincore/count +index ba5f6cd..fc5038a 100755 +--- a/tests/ts/fincore/count ++++ b/tests/ts/fincore/count +@@ -107,6 +107,7 @@ if test -f "$TS_EXPECTED.$PAGE_SIZE"; then + OUT_COLUMNS="PAGES,SIZE,FILE" + else + TS_EXPECTED+=".nosize" ++ TS_EXPECTED_ERR+=".nosize" + OUT_COLUMNS="PAGES,FILE" + fi + +@@ -123,7 +124,6 @@ input= + input=no_such_file + INPUT="${INPUT} ${input}" + +- ts_log_both "[ NO EXCITING FILE ]" + $TS_CMD_FINCORE --output $OUT_COLUMNS --bytes --noheadings $input + footer "$?" + } >> $TS_OUTPUT 2>> $TS_ERRLOG +@@ -220,8 +220,8 @@ input= + "oflag=append seek=$hole_count" + } >> $TS_OUTPUT 2>> $TS_ERRLOG + ++ts_log_both "[ MULTIPLE FILES ]" + { +- ts_log_both "[ MULTIPLE FILES ]" + $TS_CMD_FINCORE --output $OUT_COLUMNS --bytes $INPUT + footer "$?" + } >> $TS_OUTPUT 2>> $TS_ERRLOG +-- +2.27.0 + diff --git a/util-linux.spec b/util-linux.spec index 3b0da1034b1d0525858a16940aeec083ec73c055..762b4eb0ca82f829a93dc34afeef9ffa53cd7932 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -3,7 +3,7 @@ Name: util-linux Version: 2.39.1 -Release: 12 +Release: 15 Summary: A random collection of Linux utilities License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git @@ -38,6 +38,7 @@ Patch6016: backport-libmount-improve-mnt_table_next_child_fs.patch Patch6017: backport-libmount-make-sure-option-is-used-as-string.patch Patch6018: backport-libmount-fix-possible-memory-leak.patch Patch6019: backport-libmount-Fix-atime-remount-for-new-API.patch +Patch6020: backport-fix_loongarch_test_error.patch Patch9000: SKIPPED-no-root-permissions-test.patch Patch9001: util-linux-Add-sw64-architecture.patch @@ -45,8 +46,10 @@ Patch9002: sfdisk-fix-crash-casued-by-out-of-bounds-access.patch Patch9003: add-new-gmo-file.patch BuildRequires: audit-libs-devel >= 1.0.6 gettext-devel libselinux-devel ncurses-devel pam-devel zlib-devel popt-devel -BuildRequires: libutempter-devel systemd-devel systemd libuser-devel libcap-ng-devel python3-devel gcc autoconf automake +BuildRequires: libutempter-devel systemd-devel systemd libuser-devel libcap-ng-devel python3-devel gcc BuildRequires: make readline-devel po4a lsof git +#enable if make changes to build-system +BuildRequires: autoconf automake libtool bison Requires(post): coreutils Requires: pam >= 1.1.3-7, /etc/pam.d/system-auth audit-libs >= 1.0.6 @@ -167,9 +170,12 @@ This package contains some doc and man help files for %{name}. %build %define _build_arg0__ CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS" SUID_CFLAGS="-fpie" %define _build_arg1__ SUID_LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" DAEMON_CFLAGS="$SUID_CFLAGS" DAEMON_LDFLAGS="$SUID_LDFLAGS" -#autoreconf unset LINGUAS || : + +#enable if make changes to build-system +./autogen.sh + # del support enable-raw https://github.com/torvalds/linux/commit/603e4922f1c81fc2ed3a87b4f91a8d3aafc7e093 %configure \ --with-systemdsystemunitdir=%{_unitdir} \ @@ -229,7 +235,7 @@ cat %{name}.lang >> %{name}.files find %{buildroot}%{_mandir}/man8 -regextype posix-egrep \ -regex ".*(linux32|linux64|aarch64|i386|x86_64|ppc64le|uname26)\.8.*" \ -printf "%{_mandir}/man8/%f*\n" > %{name}-help.files - + rm -rf %{buildroot}%{_libdir}/*.{la,a} rm -rf %{buildroot}%{_libdir}/python*/site-packages/*.{la,a} @@ -413,21 +419,39 @@ fi %endif %changelog -* Thu Sep 12 2024 liweigang - 2.39.1-12 +* Wed Oct 23 2024 shenzhongwei - 2.39.1-15 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix loongarch test error + +* Thu Sep 12 2024 liweigang - 2.39.1-14 - Type:enhancement - CVE: NA - SUG: NA - DESC: delete the architecture judgment in the patch list -* Tue Sep 10 2024 zhangyao - 2.39.1-11 +* Mon Sep 9 2024 zhangyao - 2.39.1-13 - Type:bugfix - CVE:NA - SUG:NA - DESC:reslove install conflicts with procps-ng-i18n together -* Mon Aug 5 2024 liyuzhe - 2.39.1-10 +* Mon Aug 5 2024 - 2.39.1-12 - Fixed incorrect macro usage in summary fields of devel and help subpackages +* Wed Jul 31 2024 zhangyao - 2.39.1-11 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix build error caused by build-system changed + +* Mon Jul 22 2024 liweigang - 2.39.1-10 +- Type: bugfix +- CVE: NA +- SUG: NA +- DESC: fix build error due to automake update + * Wed Jul 3 2024 zhangyao - 2.39.1-9 - Type:bugfix - CVE:NA