diff --git a/2251.patch b/2251.patch deleted file mode 100644 index f625932baf5336c940ce1bdefa2bfca235379a8f..0000000000000000000000000000000000000000 --- a/2251.patch +++ /dev/null @@ -1,264 +0,0 @@ -From 8b36444f447949c3ab477f2c43b45a94c30ee7bf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sun, 21 May 2023 21:42:14 +0200 -Subject: [PATCH 1/4] fadvise: (test) dynamically calculate expected test - values -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Thomas Weißschuh ---- - tests/ts/fadvise/drop | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop -index 7c7eee5dc2..86c0d5b0a3 100755 ---- a/tests/ts/fadvise/drop -+++ b/tests/ts/fadvise/drop -@@ -16,7 +16,7 @@ ts_check_prog "sleep" - ts_cd "$TS_OUTDIR" - - FILE="ddtest" --BS=4k -+BS=4096 - COUNT=8 - - FILE_FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")" -@@ -41,22 +41,22 @@ create_file() { - echo - - create_file -- echo "offset: 8192" -- "$TS_CMD_FADVISE" -o 8192 "$FILE" -+ echo "offset: $(( 2 * $BS ))" -+ "$TS_CMD_FADVISE" -o $(( 2 * $BS )) "$FILE" - echo status: $? - "$TS_CMD_FINCORE" "$FILE" - echo - - create_file -- echo "length: 16384" -- "$TS_CMD_FADVISE" -l 16384 "$FILE" -+ echo "length: $(( 4 * $BS ))" -+ "$TS_CMD_FADVISE" -l $(( 4 * $BS )) "$FILE" - echo status: $? - "$TS_CMD_FINCORE" "$FILE" - echo - - create_file -- echo "offset: 8192, length: 16384 fd: 42" -- "$TS_CMD_FADVISE" -o 8192 -l 16384 --fd 42 42<"$FILE" -+ echo "offset: $(( 2 * $BS )), length: $(( 4 * $BS )) fd: 42" -+ "$TS_CMD_FADVISE" -o $(( 2 * $BS )) -l $(( 4 * $BS )) --fd 42 42<"$FILE" - echo status: $? - "$TS_CMD_FINCORE" "$FILE" - echo - -From e5009e773fc801eca887dd43b721cd1b1aa327be Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sun, 21 May 2023 21:43:38 +0200 -Subject: [PATCH 2/4] fadvise: (tests) factor out calls to "fincore" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This will make it easier to pass argument later. - -Signed-off-by: Thomas Weißschuh ---- - tests/ts/fadvise/drop | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop -index 86c0d5b0a3..8869b7da4d 100755 ---- a/tests/ts/fadvise/drop -+++ b/tests/ts/fadvise/drop -@@ -28,37 +28,41 @@ create_file() { - dd if=/dev/zero of="$FILE" bs=$BS count=$COUNT conv=fsync >& /dev/null - } - -+do_fincore() { -+ "$TS_CMD_FINCORE" "$FILE" -+} -+ - { - create_file -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - create_file - echo "whole file" - "$TS_CMD_FADVISE" "$FILE" - echo status: $? -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - create_file - echo "offset: $(( 2 * $BS ))" - "$TS_CMD_FADVISE" -o $(( 2 * $BS )) "$FILE" - echo status: $? -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - create_file - echo "length: $(( 4 * $BS ))" - "$TS_CMD_FADVISE" -l $(( 4 * $BS )) "$FILE" - echo status: $? -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - create_file - echo "offset: $(( 2 * $BS )), length: $(( 4 * $BS )) fd: 42" - "$TS_CMD_FADVISE" -o $(( 2 * $BS )) -l $(( 4 * $BS )) --fd 42 42<"$FILE" - echo status: $? -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - rm "$FILE" - -From 33980996d0b429fc59c40f8352633c0a21a0f96a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sun, 21 May 2023 21:44:20 +0200 -Subject: [PATCH 3/4] fadvise: (test) don't compare fincore page counts -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -These depend on the machines pagesize and are therefore not a good -comparision. - -Signed-off-by: Thomas Weißschuh ---- - tests/expected/fadvise/drop | 20 ++++++++++---------- - tests/ts/fadvise/drop | 2 +- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/tests/expected/fadvise/drop b/tests/expected/fadvise/drop -index f2360b56fb..25f23e050a 100644 ---- a/tests/expected/fadvise/drop -+++ b/tests/expected/fadvise/drop -@@ -1,23 +1,23 @@ -- RES PAGES SIZE FILE -- 32K 8 32K ddtest -+ RES SIZE FILE -+ 32K 32K ddtest - - whole file - status: 0 --RES PAGES SIZE FILE -- 0B 0 32K ddtest -+RES SIZE FILE -+ 0B 32K ddtest - - offset: 8192 - status: 0 --RES PAGES SIZE FILE -- 8K 2 32K ddtest -+RES SIZE FILE -+ 8K 32K ddtest - - length: 16384 - status: 0 -- RES PAGES SIZE FILE -- 16K 4 32K ddtest -+ RES SIZE FILE -+ 16K 32K ddtest - - offset: 8192, length: 16384 fd: 42 - status: 0 -- RES PAGES SIZE FILE -- 16K 4 32K ddtest -+ RES SIZE FILE -+ 16K 32K ddtest - -diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop -index 8869b7da4d..6c4298e872 100755 ---- a/tests/ts/fadvise/drop -+++ b/tests/ts/fadvise/drop -@@ -29,7 +29,7 @@ create_file() { - } - - do_fincore() { -- "$TS_CMD_FINCORE" "$FILE" -+ "$TS_CMD_FINCORE" -o RES,SIZE,FILE "$FILE" - } - - { - -From c0f31b79f5d1c665cdc057fb32f4d161d28aa5b2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sun, 21 May 2023 21:45:10 +0200 -Subject: [PATCH 4/4] fadvise: (test) test with 64k blocks -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This will allow the tests to also pass on systems with 64k pagesizes. - -Closes #2249 -Signed-off-by: Thomas Weißschuh ---- - tests/expected/fadvise/drop | 26 +++++++++++++------------- - tests/ts/fadvise/drop | 2 +- - 2 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/tests/expected/fadvise/drop b/tests/expected/fadvise/drop -index 25f23e050a..e7bb26b6e2 100644 ---- a/tests/expected/fadvise/drop -+++ b/tests/expected/fadvise/drop -@@ -1,23 +1,23 @@ -- RES SIZE FILE -- 32K 32K ddtest -+ RES SIZE FILE -+ 512K 512K ddtest - - whole file - status: 0 --RES SIZE FILE -- 0B 32K ddtest -+RES SIZE FILE -+ 0B 512K ddtest - --offset: 8192 -+offset: 131072 - status: 0 --RES SIZE FILE -- 8K 32K ddtest -+ RES SIZE FILE -+ 128K 512K ddtest - --length: 16384 -+length: 262144 - status: 0 -- RES SIZE FILE -- 16K 32K ddtest -+ RES SIZE FILE -+ 256K 512K ddtest - --offset: 8192, length: 16384 fd: 42 -+offset: 131072, length: 262144 fd: 42 - status: 0 -- RES SIZE FILE -- 16K 32K ddtest -+ RES SIZE FILE -+ 256K 512K ddtest - -diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop -index 6c4298e872..45dcb9110b 100755 ---- a/tests/ts/fadvise/drop -+++ b/tests/ts/fadvise/drop -@@ -16,7 +16,7 @@ ts_check_prog "sleep" - ts_cd "$TS_OUTDIR" - - FILE="ddtest" --BS=4096 -+BS=65536 - COUNT=8 - - FILE_FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")" diff --git a/libmount-Fix-regression-when-mounting-with-atime.patch b/libmount-Fix-regression-when-mounting-with-atime.patch deleted file mode 100644 index c149eab5cea3cde3afec8e0d10bffad04c7a825c..0000000000000000000000000000000000000000 --- a/libmount-Fix-regression-when-mounting-with-atime.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 2b99ee2526ae61be761b0e31c50e106dbec5e9e4 Mon Sep 17 00:00:00 2001 -From: Filipe Manana -Date: Thu, 17 Aug 2023 10:20:13 +0100 -Subject: [PATCH] libmount: Fix regression when mounting with atime - -A regression was introduced in v2.39 that causes mounting with the atime -option to fail: - - $ mkfs.ext4 -F /dev/sdi - $ mount -o atime /dev/sdi /mnt/sdi - mount: /mnt/sdi: not mount point or bad option. - dmesg(1) may have more information after failed mount system call. - -The failure comes from the mount_setattr(2) call returning -EINVAL. This -is because we pass an invalid value for the attr_clr argument. From a -strace capture we have: - - mount_setattr(4, "", AT_EMPTY_PATH, {attr_set=0, attr_clr=MOUNT_ATTR_NOATIME, propagation=0 /* MS_??? */, userns_fd=0}, 32) = -1 EINVAL (Invalid argument) - -We can't pass MOUNT_ATTR_NOATIME to mount_setattr(2) through the attr_clr -argument because all atime options are exclusive, so in order to set atime -one has to pass MOUNT_ATTR__ATIME to attr_clr and leave attr_set as -MOUNT_ATTR_RELATIME (which is defined as a value of 0). - -This can be read from the man page for mount_setattr(2) and also from the -kernel source: - - $ cat fs/namespace.c - static int build_mount_kattr(const struct mount_attr *attr, size_t usize, - struct mount_kattr *kattr, unsigned int flags) - { - (...) - /* - * Since the MOUNT_ATTR_ values are an enum, not a bitmap, - * users wanting to transition to a different atime setting cannot - * simply specify the atime setting in @attr_set, but must also - * specify MOUNT_ATTR__ATIME in the @attr_clr field. - * So ensure that MOUNT_ATTR__ATIME can't be partially set in - * @attr_clr and that @attr_set can't have any atime bits set if - * MOUNT_ATTR__ATIME isn't set in @attr_clr. - */ - if (attr->attr_clr & MOUNT_ATTR__ATIME) { - if ((attr->attr_clr & MOUNT_ATTR__ATIME) != MOUNT_ATTR__ATIME) - return -EINVAL; - - /* - * Clear all previous time settings as they are mutually - * exclusive. - */ - kattr->attr_clr |= MNT_RELATIME | MNT_NOATIME; - switch (attr->attr_set & MOUNT_ATTR__ATIME) { - case MOUNT_ATTR_RELATIME: - kattr->attr_set |= MNT_RELATIME; - break; - case MOUNT_ATTR_NOATIME: - kattr->attr_set |= MNT_NOATIME; - break; - case MOUNT_ATTR_STRICTATIME: - break; - default: - return -EINVAL; - } - (...) - -So fix this by setting attr_clr MOUNT_ATTR__ATIME if we want to clear any -atime related option. - -Signed-off-by: Filipe Manana ---- - libmount/src/optlist.c | 13 ++++++++++++- - tests/expected/libmount/context-mount-flags | 3 +++ - tests/ts/libmount/context | 9 ++++++++- - 3 files changed, 23 insertions(+), 2 deletions(-) - -diff --git a/libmount/src/optlist.c b/libmount/src/optlist.c -index e93810b47..d0afc94f7 100644 ---- a/libmount/src/optlist.c -+++ b/libmount/src/optlist.c -@@ -875,7 +875,18 @@ int mnt_optlist_get_attrs(struct libmnt_optlist *ls, uint64_t *set, uint64_t *cl - - if (opt->ent->mask & MNT_INVERT) { - DBG(OPTLIST, ul_debugobj(ls, " clr: %s", opt->ent->name)); -- *clr |= x; -+ /* -+ * All atime settings are mutually exclusive so *clr must -+ * have MOUNT_ATTR__ATIME set. -+ * -+ * See the function fs/namespace.c:build_mount_kattr() -+ * in the linux kernel source. -+ */ -+ if (x == MOUNT_ATTR_RELATIME || x == MOUNT_ATTR_NOATIME || -+ x == MOUNT_ATTR_STRICTATIME) -+ *clr |= MOUNT_ATTR__ATIME; -+ else -+ *clr |= x; - } else { - DBG(OPTLIST, ul_debugobj(ls, " set: %s", opt->ent->name)); - *set |= x; -diff --git a/tests/expected/libmount/context-mount-flags b/tests/expected/libmount/context-mount-flags -index 960641863..eb71323dd 100644 ---- a/tests/expected/libmount/context-mount-flags -+++ b/tests/expected/libmount/context-mount-flags -@@ -3,3 +3,6 @@ ro,nosuid,noexec - successfully mounted - rw,nosuid,noexec - successfully umounted -+successfully mounted -+rw,relatime -+successfully umounted -diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context -index f5b47185e..a5d2e81a3 100755 ---- a/tests/ts/libmount/context -+++ b/tests/ts/libmount/context -@@ -116,8 +116,15 @@ $TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPU - - ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG - is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG --ts_finalize_subtest - -+# Test that the atime option works after the migration to use the new kernel mount APIs. -+ts_run $TESTPROG --mount -o atime $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG -+$TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG -+is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG -+ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG -+is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG -+ -+ts_finalize_subtest - - ts_init_subtest "mount-loopdev" - mkdir -p $MOUNTPOINT &> /dev/null --- -2.40.1 diff --git a/login-default-motd-file.patch b/login-default-motd-file.patch deleted file mode 100644 index 3670848498094fae83dfa7452b09e13e0d79e759..0000000000000000000000000000000000000000 --- a/login-default-motd-file.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/pathnames.h b/include/pathnames.h -index 3845d4c33..fac3a0783 100644 ---- a/include/pathnames.h -+++ b/include/pathnames.h -@@ -41,7 +41,7 @@ - #ifndef _PATH_MAILDIR - # define _PATH_MAILDIR "/var/spool/mail" - #endif --#define _PATH_MOTDFILE "/usr/share/misc/motd:/run/motd:/etc/motd" -+#define _PATH_MOTDFILE "/usr/share/misc/motd:/run/motd:/run/motd.d:/etc/motd:/etc/motd.d" - #ifndef _PATH_NOLOGIN - # define _PATH_NOLOGIN "/etc/nologin" - #endif diff --git a/login-lastlog-create.patch b/login-lastlog-create.patch deleted file mode 100644 index e2523d3aaadd1d9cb4a527db65491ac04a3566f5..0000000000000000000000000000000000000000 --- a/login-lastlog-create.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/util-linux-2.38.1-harlink-test.patch b/util-linux-2.38.1-harlink-test.patch new file mode 100644 index 0000000000000000000000000000000000000000..29b252399a76e56df05b5748022fac1823538651 --- /dev/null +++ b/util-linux-2.38.1-harlink-test.patch @@ -0,0 +1,80 @@ +From 1b5fc3fe13947baab133bd426f3377e2eb5ccc90 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Wed, 8 Jun 2022 11:50:04 +0200 +Subject: [PATCH] tests: (hardlink) remove runtime depend output + +The Method: field depends on kernel crypto support, otherwise hardlink +falls back to memcpy(). + +Fixes: https://github.com/util-linux/util-linux/issues/1710 +Signed-off-by: Karel Zak +--- + .../expected/hardlink/options-maximum-size-8191 | 2 +- + .../expected/hardlink/options-maximum-size-8192 | 2 +- + tests/ts/hardlink/options | 16 ++++++++++++---- + 3 files changed, 14 insertions(+), 6 deletions(-) + +diff --git a/tests/expected/hardlink/options-maximum-size-8191 b/tests/expected/hardlink/options-maximum-size-8191 +index 30fe1acad4..d57c92ae94 100644 +--- a/tests/expected/hardlink/options-maximum-size-8191 ++++ b/tests/expected/hardlink/options-maximum-size-8191 +@@ -1,6 +1,6 @@ + Number of test files: 26 + Mode: real +-Method: sha256 ++Method: [Redacted] + Files: 26 + Linked: 0 files + Compared: 0 xattrs +diff --git a/tests/expected/hardlink/options-maximum-size-8192 b/tests/expected/hardlink/options-maximum-size-8192 +index 723811e9ee..c571adf52d 100644 +--- a/tests/expected/hardlink/options-maximum-size-8192 ++++ b/tests/expected/hardlink/options-maximum-size-8192 +@@ -1,6 +1,6 @@ + Number of test files: 26 + Mode: real +-Method: sha256 ++Method: [Redacted] + Files: 26 + Linked: 18 files + Compared: 0 xattrs +diff --git a/tests/ts/hardlink/options b/tests/ts/hardlink/options +index fc1a0d6525..2a1c919a28 100755 +--- a/tests/ts/hardlink/options ++++ b/tests/ts/hardlink/options +@@ -40,6 +40,14 @@ show_srcdir() + find "$SRCDIR" -type f -printf "%P\t%n\t%s\t%Ts\t%m\n" | sort + } + ++summary_clean() ++{ ++ sed -i \ ++ -e 's/^Duration:.*/Duration: [Redacted]/' \ ++ -e 's/^Method:.*/Method: [Redacted]/' \ ++ $TS_OUTPUT ++} ++ + create_srcdir + + ts_init_subtest "orig" # just list original dir +@@ -80,16 +88,16 @@ ts_finalize_subtest + ts_init_subtest "maximum-size-8191" + create_srcdir + echo "Number of test files: $(find "$SRCDIR" -type f | wc -l)" >> $TS_OUTPUT +-$TS_CMD_HARDLINK --maximum-size 8191 "$SRCDIR" | \ +- sed 's/^Duration:.*/Duration: [Redacted]/' >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_HARDLINK --maximum-size 8191 "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG ++summary_clean + show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_finalize_subtest + + ts_init_subtest "maximum-size-8192" + create_srcdir + echo "Number of test files: $(find "$SRCDIR" -type f | wc -l)" >> $TS_OUTPUT +-$TS_CMD_HARDLINK --maximum-size 8192 "$SRCDIR" | \ +- sed 's/^Duration:.*/Duration: [Redacted]/' >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_HARDLINK --maximum-size 8192 "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG ++summary_clean + show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_finalize_subtest + diff --git a/util-linux-2.39.2.tar.xz b/util-linux-2.38.1.tar.xz similarity index 48% rename from util-linux-2.39.2.tar.xz rename to util-linux-2.38.1.tar.xz index 4a84420b4c0966dc628ecdc5ff03036dc7a033e4..e99a8156eebf5538d69205a3ce720e730ce144dd 100644 Binary files a/util-linux-2.39.2.tar.xz and b/util-linux-2.38.1.tar.xz differ diff --git a/util-linux-disable-conflict-man-pages.patch b/util-linux-disable-conflict-man-pages.patch deleted file mode 100644 index 427fca91c0b2f2061bdd00575f9a544a269f5439..0000000000000000000000000000000000000000 --- a/util-linux-disable-conflict-man-pages.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- util-linux-2.39.1/po-man/po4a.cfg.orig 2023-07-31 12:35:59.261051700 +0800 -+++ util-linux-2.39.1/po-man/po4a.cfg 2023-07-31 12:36:29.365355000 +0800 -@@ -50,13 +50,11 @@ - [type:asciidoc] ../login-utils/last.1.adoc $lang:$lang/last.1.adoc - [type:asciidoc] ../login-utils/login.1.adoc $lang:$lang/login.1.adoc - [type:asciidoc] ../login-utils/lslogins.1.adoc $lang:$lang/lslogins.1.adoc --[type:asciidoc] ../login-utils/newgrp.1.adoc $lang:$lang/newgrp.1.adoc - [type:asciidoc] ../login-utils/nologin.8.adoc $lang:$lang/nologin.8.adoc - [type:asciidoc] ../login-utils/runuser.1.adoc $lang:$lang/runuser.1.adoc - [type:asciidoc] ../login-utils/su.1.adoc $lang:$lang/su.1.adoc - [type:asciidoc] ../login-utils/sulogin.8.adoc $lang:$lang/sulogin.8.adoc - [type:asciidoc] ../login-utils/utmpdump.1.adoc $lang:$lang/utmpdump.1.adoc --[type:asciidoc] ../login-utils/vipw.8.adoc $lang:$lang/vipw.8.adoc - - [type:asciidoc] ../misc-utils/blkid.8.adoc $lang:$lang/blkid.8.adoc - [type:asciidoc] ../misc-utils/cal.1.adoc $lang:$lang/cal.1.adoc diff --git a/util-linux.spec b/util-linux.spec index 82a581a286dcc9d753f218a723e817929c5fae19..5373b544fb1d9547ed8fd63ada6bd21568408858 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1,10 +1,10 @@ -%define anolis_release 2 -%global upstream_version 2.39.2 -%global major_version v2.39 +%define anolis_release 1 +%global upstream_version 2.38.1 +%global major_version v2.38 %global compldir %{_datadir}/bash-completion/completions/ Name: util-linux -Version: 2.39.2 +Version: 2.38.1 Release: %{anolis_release}%{?dist} Summary: Collection of basic system utilities @@ -20,13 +20,8 @@ Source12: util-linux-su.pamd Source13: util-linux-su-l.pamd Source14: util-linux-runuser.pamd Source15: util-linux-runuser-l.pamd -# https://github.com/util-linux/util-linux/pull/2251 -Patch0: https://patch-diff.githubusercontent.com/raw/util-linux/util-linux/pull/2251.patch -# Disable conflicts man pages with shadow-utils -Patch1: util-linux-disable-conflict-man-pages.patch -Patch2: login-lastlog-create.patch -Patch3: login-default-motd-file.patch -Patch4: libmount-Fix-regression-when-mounting-with-atime.patch +# https://github.com/util-linux/util-linux/commit/1b5fc3fe13947baab133bd426f3377e2eb5ccc90.patch +Patch0: util-linux-2.38.1-harlink-test.patch BuildRequires: make BuildRequires: audit-libs-devel @@ -40,19 +35,21 @@ BuildRequires: popt-devel BuildRequires: libutempter-devel Buildrequires: systemd-devel BuildRequires: systemd +Buildrequires: libuser-devel BuildRequires: libcap-ng-devel BuildRequires: python3-devel BuildRequires: gcc +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: bison BuildRequires: rubygem-asciidoctor -BuildRequires: po4a Provides: /sbin/nologin Provides: /sbin/findfs Provides: eject = 2.1.6 Provides: rfkill = 0.5 Provides: util-linux-ng = %{version}-%{release} -Provides: util-linux-user = %{version}-%{release} -Obsoletes: util-linux-user < %{version}-%{release} Requires(post): coreutils Requires: pam >= 1.1.3-7, /etc/pam.d/system-auth @@ -237,20 +234,20 @@ written in the Python programming language to use the interface supplied by the libmount library to work with mount tables (fstab, mountinfo, etc) and mount filesystems. -%package -n util-linux-i18n -Summary: Internationalization pack for util-linux + +%package -n util-linux-user +Summary: libuser based util-linux utilities Requires: util-linux = %{version}-%{release} License: GPLv2 - -%description -n util-linux-i18n -Internationalization pack with translated messages and manual pages for -util-linux commands. + +%description -n util-linux-user +chfn and chsh utilities with dependence on libuser %prep %autosetup -n %{name}-%{upstream_version} -p1 %build -unset LINGUAS || : +./autogen.sh export CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS" export SUID_CFLAGS="-fpie" @@ -260,7 +257,6 @@ export DAEMON_LDFLAGS="$SUID_LDFLAGS" %configure \ --with-systemdsystemunitdir=%{_unitdir} \ - --without-user \ --disable-silent-rules \ --disable-bfs \ --disable-pg \ @@ -282,7 +278,7 @@ export DAEMON_LDFLAGS="$SUID_LDFLAGS" %make_build %check -make check "TESTS_PARALLEL=--parallel=1" +make check %install @@ -323,9 +319,9 @@ ln -sf ../proc/self/mounts %{buildroot}/etc/mtab rm -f $RPM_BUILD_ROOT%{_libdir}/lib{uuid,blkid,mount,smartcols,fdisk}.a rm -f $RPM_BUILD_ROOT%{compldir}/{mount,umount} -%find_lang %name --all-name --with-man +%find_lang %name -touch %{name}.files +mv %{name}.lang %{name}.files find $RPM_BUILD_ROOT%{_bindir}/ -regextype posix-egrep -type l \ -regex ".*(linux32|linux64|i386|x86_64|uname26)$" \ @@ -375,16 +371,12 @@ fi %config(noreplace) %{_sysconfdir}/pam.d/su-l %config(noreplace) %{_sysconfdir}/pam.d/runuser %config(noreplace) %{_sysconfdir}/pam.d/runuser-l -%config(noreplace) %{_sysconfdir}/pam.d/chfn -%config(noreplace) %{_sysconfdir}/pam.d/chsh %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/adjtime %attr(4755,root,root) %{_bindir}/su %attr(755,root,root) %{_bindir}/login %attr(2755,root,tty) %{_bindir}/write -%attr(4711,root,root) %{_bindir}/chfn -%attr(4711,root,root) %{_bindir}/chsh %{_unitdir}/fstrim.* %{_bindir}/cal @@ -397,7 +389,6 @@ fi %{_bindir}/eject %{_bindir}/fallocate %{_bindir}/fincore -%{_bindir}/fadvise %{_bindir}/getopt %{_bindir}/hexdump %{_bindir}/irqtop @@ -417,7 +408,6 @@ fi %{_bindir}/mcookie %{_bindir}/mesg %{_bindir}/namei -%{_bindir}/pipesz %{_bindir}/prlimit %{_bindir}/rename %{_bindir}/rev @@ -432,20 +422,16 @@ fi %{_bindir}/utmpdump %{_bindir}/uuidgen %{_bindir}/uuidparse -%{_bindir}/waitpid %{_bindir}/wall %{_bindir}/wdctl %{_bindir}/whereis %{_mandir}/man1/cal.1* -%{_mandir}/man1/chfn.1* %{_mandir}/man1/choom.1* -%{_mandir}/man1/chsh.1* %{_mandir}/man1/col.1* %{_mandir}/man1/colcrt.1* %{_mandir}/man1/colrm.1* %{_mandir}/man1/column.1* %{_mandir}/man1/eject.1* -%{_mandir}/man1/fadvise.1* %{_mandir}/man1/fallocate.1* %{_mandir}/man1/fincore.1* %{_mandir}/man1/getopt.1* @@ -464,7 +450,6 @@ fi %{_mandir}/man1/mcookie.1* %{_mandir}/man1/mesg.1* %{_mandir}/man1/namei.1* -%{_mandir}/man1/pipesz.1* %{_mandir}/man1/prlimit.1* %{_mandir}/man1/rename.1* %{_mandir}/man1/rev.1* @@ -480,7 +465,6 @@ fi %{_mandir}/man1/utmpdump.1.* %{_mandir}/man1/uuidgen.1* %{_mandir}/man1/uuidparse.1* -%{_mandir}/man1/waitpid.1* %{_mandir}/man1/wall.1* %{_mandir}/man1/whereis.1* %{_mandir}/man1/write.1* @@ -488,7 +472,6 @@ fi %{_mandir}/man5/terminal-colors.d.5* %{_mandir}/man8/addpart.8* %{_mandir}/man8/blkdiscard.8* -%{_mandir}/man8/blkpr.8* %{_mandir}/man8/blkzone.8* %{_mandir}/man8/chcpu.8* %{_mandir}/man8/chmem.8* @@ -522,7 +505,6 @@ fi %{_mandir}/man8/zramctl.8* %{_sbindir}/addpart %{_sbindir}/blkdiscard -%{_sbindir}/blkpr %{_sbindir}/blkzone %{_sbindir}/chcpu %{_sbindir}/ctrlaltdel @@ -554,9 +536,7 @@ fi %{compldir}/blkzone %{compldir}/cal %{compldir}/chcpu -%{compldir}/chfn %{compldir}/chmem -%{compldir}/chsh %{compldir}/col %{compldir}/colcrt %{compldir}/colrm @@ -564,7 +544,6 @@ fi %{compldir}/ctrlaltdel %{compldir}/delpart %{compldir}/eject -%{compldir}/fadvise %{compldir}/fallocate %{compldir}/fdisk %{compldir}/fincore @@ -595,7 +574,6 @@ fi %{compldir}/mkfs.cramfs %{compldir}/mkfs.minix %{compldir}/namei -%{compldir}/pipesz %{compldir}/pivot_root %{compldir}/prlimit %{compldir}/readprofile @@ -618,7 +596,6 @@ fi %{compldir}/utmpdump %{compldir}/uuidgen %{compldir}/uuidparse -%{compldir}/waitpid %{compldir}/wall %{compldir}/wdctl %{compldir}/whereis @@ -644,6 +621,7 @@ fi %{compldir}/sfdisk %files -n util-linux-core +%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab %attr(4755,root,root) %{_bindir}/mount %attr(4755,root,root) %{_bindir}/umount %{_bindir}/chrt @@ -729,7 +707,17 @@ fi %{_sbindir}/swapoff %{_sbindir}/swapon %{_sbindir}/switch_root -/etc/mtab + + +%files -n util-linux-user +%config(noreplace) %{_sysconfdir}/pam.d/chfn +%config(noreplace) %{_sysconfdir}/pam.d/chsh +%attr(4711,root,root) %{_bindir}/chfn +%attr(4711,root,root) %{_bindir}/chsh +%{_mandir}/man1/chfn.1* +%{_mandir}/man1/chsh.1* +%{compldir}/chfn +%{compldir}/chsh %files -n uuidd @@ -810,9 +798,10 @@ fi %license Documentation/licenses/COPYING.LGPL-2.1-or-later libmount/COPYING %{python3_sitearch}/libmount -%files -n util-linux-i18n -f %{name}.lang - %changelog +* Tue Nov 14 2023 happy_orange - 2.38.1-2 +- rollback to 2.38 to fix the mount error + * Mon Oct 09 2023 happy_orange - 2.39.2-2 - fix mount error and move user package to main package and add util-linux-i18n package