From 05b526487715e8d6b7170767d239cf8007769b2f Mon Sep 17 00:00:00 2001 From: shangyibin Date: Sat, 8 Jan 2022 18:31:36 +0800 Subject: [PATCH] Fix test failed (cherry picked from commit ef8d01f8f58258242e1743d17767700b9272b34d) --- 2.36-login-lastlog-create.patch | 12 +++++++ ...-resolve-uname26-version-test-failed.patch | 34 +++++++++++++++++++ SKIPPED-no-root-permissions-test.patch | 25 ++++++++++++++ util-linux.spec | 13 ++++++- 4 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 2.36-login-lastlog-create.patch create mode 100644 Add-check-to-resolve-uname26-version-test-failed.patch create mode 100644 SKIPPED-no-root-permissions-test.patch diff --git a/2.36-login-lastlog-create.patch b/2.36-login-lastlog-create.patch new file mode 100644 index 0000000..e2523d3 --- /dev/null +++ b/2.36-login-lastlog-create.patch @@ -0,0 +1,12 @@ +diff -up util-linux-2.36/login-utils/login.c.kzak util-linux-2.36/login-utils/login.c +--- util-linux-2.36/login-utils/login.c.kzak 2020-07-23 14:13:26.777030764 +0200 ++++ util-linux-2.36/login-utils/login.c 2020-07-23 14:11:22.793686983 +0200 +@@ -585,7 +585,7 @@ static void log_lastlog(struct login_con + sa.sa_handler = SIG_IGN; + sigaction(SIGXFSZ, &sa, &oldsa_xfsz); + +- fd = open(_PATH_LASTLOG, O_RDWR, 0); ++ fd = open(_PATH_LASTLOG, O_RDWR | O_CREAT, 0); + if (fd < 0) + goto done; + offset = cxt->pwd->pw_uid * sizeof(ll); diff --git a/Add-check-to-resolve-uname26-version-test-failed.patch b/Add-check-to-resolve-uname26-version-test-failed.patch new file mode 100644 index 0000000..193c6ed --- /dev/null +++ b/Add-check-to-resolve-uname26-version-test-failed.patch @@ -0,0 +1,34 @@ +From 72466ac801928c205604b99fe01f830809bda930 Mon Sep 17 00:00:00 2001 +From: Liquor +Date: Thu, 17 Dec 2020 15:04:56 +0800 +Subject: [PATCH] Add check to resolve uname26-version test failed + +The uname command is modified in packages uname-build-checks, +but the uname26-version test case needs to use the uname -r query +result.As a result,the test fails. +So we add a judgment to check whether uname-build-checks is installed. +--- + tests/ts/misc/setarch | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/tests/ts/misc/setarch b/tests/ts/misc/setarch +index 7c99cca..25d02c1 100755 +--- a/tests/ts/misc/setarch ++++ b/tests/ts/misc/setarch +@@ -77,7 +77,12 @@ ts_finalize_subtest "$finmsg" + # conditional subtest + if [ "$uname26_seems_supported" = "yes" ]; then + ts_init_subtest uname26-version +- tmp=$($TS_CMD_SETARCH $ARCH --uname-2.6 uname -r) ++ rpm -qa | grep -q "uname-build-checks" ++ if [ $? -eq 0 ]; then ++ tmp=$($TS_CMD_SETARCH $ARCH --uname-2.6 uname.bin -r) ++ else ++ tmp=$($TS_CMD_SETARCH $ARCH --uname-2.6 uname -r) ++ fi + if echo "$tmp" | grep -q "^2\.6\."; then + echo "kernel version changed to 2.6" >> $TS_OUTPUT + else +-- +2.27.0 + diff --git a/SKIPPED-no-root-permissions-test.patch b/SKIPPED-no-root-permissions-test.patch new file mode 100644 index 0000000..f8b7526 --- /dev/null +++ b/SKIPPED-no-root-permissions-test.patch @@ -0,0 +1,25 @@ +From 1691faae5ed946ca6058bb9afaeb98b6b2e25f51 Mon Sep 17 00:00:00 2001 +From: shangyibin +Date: Mon, 10 Jan 2022 15:05:34 +0800 +Subject: [PATCH] unshare: SKIPPED (no root permissions) + +--- + tests/ts/lsns/ioctl_ns | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/ts/lsns/ioctl_ns b/tests/ts/lsns/ioctl_ns +index ef63606..a979893 100755 +--- a/tests/ts/lsns/ioctl_ns ++++ b/tests/ts/lsns/ioctl_ns +@@ -21,7 +21,7 @@ TS_DESC="ownership and hierarchy" + . $TS_TOPDIR/functions.sh + ts_init "$*" + +-# ts_skip_nonroot ++ts_skip_nonroot + grep -q '#define HAVE_LINUX_NSFS_H' ${top_builddir}/config.h || ts_skip "no ioctl_ns support" + + [ -r /proc/self/ns/user ] || ts_skip "no USER namespace kernel support" +-- +2.27.0 + diff --git a/util-linux.spec b/util-linux.spec index 2daec0d..0ab0d77 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -3,7 +3,7 @@ Name: util-linux Version: 2.37.2 -Release: 1 +Release: 2 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 @@ -18,6 +18,11 @@ Source7: util-linux-su-l.pamd Source8: util-linux-runuser.pamd Source9: util-linux-runuser-l.pamd +Patch6000: 2.36-login-lastlog-create.patch + +Patch9000: Add-check-to-resolve-uname26-version-test-failed.patch +Patch9001: SKIPPED-no-root-permissions-test.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 @@ -384,6 +389,12 @@ fi %{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*} %changelog +* Mon Jan 10 2022 shangyibin - 2.37.2-2 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix test fail + * Mon Dec 27 2021 tianwei - 2.37.2-1 - Type:enhancement - ID:NA -- Gitee