forked from pool/util-linux
Compare commits
27 Commits
Author | SHA256 | Date | |
---|---|---|---|
7af9873028 | |||
d87bf9940a | |||
6bdafd9994 | |||
526351100b | |||
d065ff5434 | |||
bf27a97789 | |||
d056d99bac | |||
f93ce2303c | |||
85211d2fa9 | |||
6e30656a72 | |||
0209a3bc33 | |||
aea0e5246b | |||
165fabd559 | |||
549d330fc6 | |||
d2055a82f3 | |||
c0ae35c85a | |||
6858402110 | |||
fa208609dd | |||
25172ba59e | |||
ed47084f94 | |||
b1afa335f2 | |||
31d054b433 | |||
fdc0dc88f2 | |||
b3f37b0f2b | |||
ed19b913bf | |||
3dd6c5f458 | |||
5070c16a96 |
@@ -14,12 +14,11 @@ Signed-off-by: Martin Wilck <mwilck@suse.com>
|
|||||||
libmount/src/context_mount.c | 41 ++++++++++++++++++++++++++++++++----
|
libmount/src/context_mount.c | 41 ++++++++++++++++++++++++++++++++----
|
||||||
1 file changed, 37 insertions(+), 4 deletions(-)
|
1 file changed, 37 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
|
diff -ur util-linux-2.41.orig/libmount/src/context_mount.c util-linux-2.41/libmount/src/context_mount.c
|
||||||
index f914c9b..a48483f 100644
|
--- util-linux-2.41.orig/libmount/src/context_mount.c 2025-03-04 19:14:02.587173600 +0100
|
||||||
--- a/libmount/src/context_mount.c
|
+++ util-linux-2.41/libmount/src/context_mount.c 2025-04-08 14:03:59.173505340 +0200
|
||||||
+++ b/libmount/src/context_mount.c
|
@@ -1469,6 +1469,32 @@
|
||||||
@@ -1423,6 +1423,32 @@ done:
|
}
|
||||||
return rc;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
+/*
|
+/*
|
||||||
@@ -51,7 +50,7 @@ index f914c9b..a48483f 100644
|
|||||||
int mnt_context_get_mount_excode(
|
int mnt_context_get_mount_excode(
|
||||||
struct libmnt_context *cxt,
|
struct libmnt_context *cxt,
|
||||||
int rc,
|
int rc,
|
||||||
@@ -1670,10 +1696,17 @@ int mnt_context_get_mount_excode(
|
@@ -1772,10 +1798,17 @@
|
||||||
case ENODEV:
|
case ENODEV:
|
||||||
if (!buf)
|
if (!buf)
|
||||||
break;
|
break;
|
||||||
@@ -73,6 +72,3 @@ index f914c9b..a48483f 100644
|
|||||||
snprintf(buf, bufsz, _("unknown filesystem type"));
|
snprintf(buf, bufsz, _("unknown filesystem type"));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
--
|
|
||||||
2.19.2
|
|
||||||
|
|
||||||
|
@@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCAAdFiEEsMZNFDAcxu+u32Dk5LcdXuw5woQFAmaGWfQACgkQ5LcdXuw5
|
|
||||||
woQyjw/+Pv55mIJB4V6DM/ZWWEgTKosHRaJK8NyZ8EieuBBz3BDxa8KECru0l8zK
|
|
||||||
3wNiS/H15xnDlVPysQx+tk9ieWc4vPNTJ0WCbb9w4DS1P9aEpG4GwgAoQ+a+MbJY
|
|
||||||
yYdfBYXLFMAxxIM7Crvls14rC5c4MCdFRMaVVdiqQSG6OKTuLXOGV+QglrzeVO6f
|
|
||||||
03SKVv4NS/ModEoZwkGNBB+c63lKVLATIEhBQHE+TL9oB/KtLyEDEEwXc/5Pclz7
|
|
||||||
pGM7knNN6O553NN4G5z0ez1ovZtbGJgNO9arLt2mLau57+dCoodCJn3ohagCfZH5
|
|
||||||
ZeZI8ajj6sxZ2kgfvFF84wYP/eFZf0/3XOZfbif4Hy7UcV/bxZdQION62gvpiy/c
|
|
||||||
/cdHN8Sga2B/1yNQyTO5oZTwr1fGnlInuy5LkvT7ZpfTtLR+QS9OhVcPWBbfYJbD
|
|
||||||
D8KKIfPkuuzsWkpKqCmTim/67s3ZY0zIXWTOntMcFelItrfkr0wClEivBji+f97U
|
|
||||||
wARhXLdS84MqEKyM7VH8hYpl6fgqpJPgWnO+91roXQyrnUCJVzM730oIDiEm1PKI
|
|
||||||
tXnQo5qF+nBpBTvIvfDa5e52mcou42yMGQxGrCmkvzfm9Vypyz7lnyLRrzULYAqA
|
|
||||||
0BZwMNwry1vmhYDWLKGH2TKkE5C7d+nwU4dzOCQWPTJhdm2FKcc=
|
|
||||||
=YzYC
|
|
||||||
-----END PGP SIGNATURE-----
|
|
BIN
util-linux-2.40.2.tar.xz
(Stored with Git LFS)
BIN
util-linux-2.40.2.tar.xz
(Stored with Git LFS)
Binary file not shown.
16
util-linux-2.41.1.tar.sign
Normal file
16
util-linux-2.41.1.tar.sign
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCAAdFiEEsMZNFDAcxu+u32Dk5LcdXuw5woQFAmhaXXIACgkQ5LcdXuw5
|
||||||
|
woTvGg/8DVhCA5WWXbRh+fxsTwb2vIWPgBpjV+wUqxiNeijPXDK7tDcNF9bHvXy7
|
||||||
|
X7ajs4y+ULzw2hBpBmI/k/Oi/enDYNo+Q76du6POjJkasgO0bY9kGVVFhd61BFfk
|
||||||
|
86yY0uOud3n/F/ht1rR3TdFaatA2QtK7AqGmh3xpQh7ELJ8v7uNT/uyU7ZtKJXT3
|
||||||
|
uEa217G1OYxxJlmLmob0jWYYuyjtg0nB/Xw4MiXrTqQbD4K0304eDsYu10DaRPW6
|
||||||
|
ZNEjnCYEaPPkZ1xH3L29ZZlrwZ47ApN52dsTRzoymQGhak5UsKvcL7pWAa3gIlk9
|
||||||
|
m3cL6TnuFXemBF6FqdAu2+xs1gX6zzPW8+2iff+9PrvODXSZPNBamwsVY6Ae39g9
|
||||||
|
8lRQH1RpyXdIB+wg3ItgaGxTYz6aEJU9nCsE2uHQF/IRSdEHsqG5rc00ax0h4Ihk
|
||||||
|
M+3z94Wuo+8NceY7kIM/lkH5sCnVV4WcpGImA3kvaVDkjYhb8XK8Yb3KFR8RE/rH
|
||||||
|
LOCRavkKXaKT4CaS+SLvOZoFTTLciw7oNqecopSsREPk0y4HKbPdfRrfcS38m4ex
|
||||||
|
HXp9yI2Rl7vThtDuNi0Bcp6GmLo4cgWgHBYSNZcnGH88LJk2Ya7Yamg+tUeynGCI
|
||||||
|
6RvQxxfDT8mMf5deEiiLgG9RxjSVlA53dIZf1tB1RUjjh61aLdQ=
|
||||||
|
=mm3H
|
||||||
|
-----END PGP SIGNATURE-----
|
BIN
util-linux-2.41.1.tar.xz
(Stored with Git LFS)
Normal file
BIN
util-linux-2.41.1.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@@ -15,7 +15,7 @@ echo -n "Checking login.defs variables in util-linux... " >&2
|
|||||||
sed -n 's/^.*logindefs_setenv*("[A-Z0-9_]*", "\([A-Z0-9_]*\)".*$/\1/p'
|
sed -n 's/^.*logindefs_setenv*("[A-Z0-9_]*", "\([A-Z0-9_]*\)".*$/\1/p'
|
||||||
) | LC_ALL=C sort -u >util-linux-login_defs-vars.lst
|
) | LC_ALL=C sort -u >util-linux-login_defs-vars.lst
|
||||||
|
|
||||||
if test $(sha1sum util-linux-login_defs-vars.lst | sed 's/ .*$//') != 8516ca34e059b2dee1d4421a3ab07e88331b1674 ; then
|
if test $(sha1sum util-linux-login_defs-vars.lst | sed 's/ .*$//') != 713b442bf6d16353b7f74538ece165b424f90932 ; then
|
||||||
|
|
||||||
echo "does not match!" >&2
|
echo "does not match!" >&2
|
||||||
echo "Checksum is: $(sha1sum util-linux-login_defs-vars.lst | sed 's/ .*$//')" >&2
|
echo "Checksum is: $(sha1sum util-linux-login_defs-vars.lst | sed 's/ .*$//')" >&2
|
||||||
@@ -32,10 +32,13 @@ If it is false positive:
|
|||||||
- The same fix is needed in shadow package in shadow-login_defs-check.sh.
|
- The same fix is needed in shadow package in shadow-login_defs-check.sh.
|
||||||
|
|
||||||
If it is true positive:
|
If it is true positive:
|
||||||
- Check-out shadow package and call shadow-login_defs-check.sh.
|
|
||||||
- Compare its output shadow-login_defs-check-util-linux.lst with
|
- Check-out shadow package and call shadow-login_defs-check.sh. If it
|
||||||
util-linux-login_defs-vars.lst in the util-linux build directory.
|
fails, check the output.
|
||||||
- Update shadow shadow-login_defs-util-linux.patch, if needed.
|
- Update shadow shadow-login_defs-util-linux.patch, if needed.
|
||||||
|
- Verify that the new variable is included in FOREIGNDEFS in lib/getdef.c.
|
||||||
|
If not, add it to shadow-login_defs-util-linux.patch and send the chunk
|
||||||
|
to the upstream.
|
||||||
- If shadow-login_defs-util-linux.patch was updated, update
|
- If shadow-login_defs-util-linux.patch was updated, update
|
||||||
login_defs-support-for-util-linux symbol version in both shadow and
|
login_defs-support-for-util-linux symbol version in both shadow and
|
||||||
util-linux spec files accordingly.
|
util-linux spec files accordingly.
|
||||||
|
@@ -1,3 +1,245 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jun 24 22:41:18 UTC 2025 - Stanislav Brabec <sbrabec@suse.com>
|
||||||
|
|
||||||
|
- Update to version 2.41.1:
|
||||||
|
* cfdisk: fix memory leak and possible NULL dereference
|
||||||
|
* fdisk: fix possible memory leak
|
||||||
|
* findmnt: fix -k option parsing regression (boo#1242705,
|
||||||
|
drop util-linux-libblkid-econf-parse.patch)
|
||||||
|
* hardlink: fix performance regression
|
||||||
|
* include/cctype: fix string comparison
|
||||||
|
* libblkid:
|
||||||
|
* Fix crash while parsing config with libeconf
|
||||||
|
* befs fix underflow
|
||||||
|
* avoid strcasecmp() for ASCII-only strings
|
||||||
|
* libblkid/src/topology/dm: fix fscanf return value check to
|
||||||
|
match expected number of parsed items
|
||||||
|
* libmount:
|
||||||
|
* (subdir) restrict for real mounts only
|
||||||
|
* (subdir) remove unused code
|
||||||
|
* avoid calling memset() unnecessarily
|
||||||
|
* fix --no-canonicalize regression (boo#1244251,
|
||||||
|
drop libmount-fix-no-canonicalize-regression.patch)
|
||||||
|
* lsblk:
|
||||||
|
* use ID_PART_ENTRY_SCHEME as fallback for PTTYPE
|
||||||
|
* avoid strcasecmp() for ASCII-only strings
|
||||||
|
* lscpu:
|
||||||
|
* fix possible buffer overflow in cpuinfo parser
|
||||||
|
* Fix loongarch op-mode output with recent kernel
|
||||||
|
* lsfd:
|
||||||
|
* scan the protocol field of /proc/net/packet as a hex number
|
||||||
|
* fix the description for PACKET.PROTOCOL column
|
||||||
|
* lsns:
|
||||||
|
* enhance compilation without USE_NS_GET_API
|
||||||
|
* fix undefined reference to add_namespace_for_nsfd #3483
|
||||||
|
* more:
|
||||||
|
* fix broken ':!command' command key
|
||||||
|
* fix implicit previous shell_line execution #3508
|
||||||
|
* tests: (test_mkfds::mapped-packet-socket) add a new parameter,
|
||||||
|
protocol
|
||||||
|
* treewide:
|
||||||
|
* add ul_ to parse_timestamp() function name
|
||||||
|
(drop util-linux-rename-common-symbols-4.patch)
|
||||||
|
* add ul_ to parse_switch() function name
|
||||||
|
(drop util-linux-rename-common-symbols-3.patch)
|
||||||
|
* add ul_ to parse_size() function name
|
||||||
|
(drop util-linux-rename-common-symbols-2.patch)
|
||||||
|
* add ul_ to parse_range() function name
|
||||||
|
(drop util-linux-rename-common-symbols-1.patch)
|
||||||
|
* fix optional arguments usage
|
||||||
|
* avoid strcasecmp() for ASCII-only strings
|
||||||
|
* Wipefs: improve --all descriptions for whole-disks
|
||||||
|
* Misc: Do not call exit() on code ending in shared libraries
|
||||||
|
* Other fixes. For complete list see
|
||||||
|
https://kernel.org/pub/linux/utils/util-linux/v2.41/v2.41.1-ReleaseNotes
|
||||||
|
- Fix problem with uname26 listed twice.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jun 10 11:16:10 UTC 2025 - Nicolas Belouin <nicolas@belouin.fr>
|
||||||
|
|
||||||
|
- Fix libmount --no-canonicalize regression (boo#1244251,
|
||||||
|
gh#util-linux/util-linux#3479,
|
||||||
|
libmount-fix-no-canonicalize-regression.patch).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu May 29 15:21:59 UTC 2025 - Stanislav Brabec <sbrabec@suse.com>
|
||||||
|
|
||||||
|
- Add ul_ prefix to functions with common names. Fixes btrfsprogs
|
||||||
|
build failure (gh#util-linux/util-linux#3603,
|
||||||
|
util-linux-rename-common-symbols-1.patch,
|
||||||
|
util-linux-rename-common-symbols-2.patch,
|
||||||
|
util-linux-rename-common-symbols-3.patch,
|
||||||
|
util-linux-rename-common-symbols-4.patch).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue May 20 14:27:14 UTC 2025 - Stanislav Brabec <sbrabec@suse.com>
|
||||||
|
|
||||||
|
- Fix segfault of findmnt (boo#1242705,
|
||||||
|
gh#util-linux/util-linux#3574,
|
||||||
|
util-linux-libblkid-econf-parse.patch).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 17 18:33:03 UTC 2025 - Stanislav Brabec <sbrabec@suse.com>
|
||||||
|
|
||||||
|
- Enable mountfd support again (jsc#PED-9752).
|
||||||
|
BREAKING CHANGE
|
||||||
|
Mountfd is nearly completely compatible with the old mount. There
|
||||||
|
is a special case that cannot be handled by mountfd, and it needs
|
||||||
|
to be handled by applications:
|
||||||
|
Mountfd discriminates between physical mount layer and virtual
|
||||||
|
mount layer. Once the physical mount layer is read-only,
|
||||||
|
read-write mount on the virtual layer is not possible.
|
||||||
|
If the first mount is read only, then the physical filesystem is
|
||||||
|
mounted read-only, and later mount of the same file system as
|
||||||
|
read-write is not possible. To solve this problem, the first
|
||||||
|
mount needs to be read-only only on the virtual layer, keeping
|
||||||
|
the physical layer read-write.
|
||||||
|
The user space fix is simple:
|
||||||
|
Instead of
|
||||||
|
mount -oro
|
||||||
|
use
|
||||||
|
mount -oro=vfs
|
||||||
|
This will keep the physical layer read-write, but the virtual
|
||||||
|
file system layer (and the user space access) will be read-only.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Apr 7 21:00:58 UTC 2025 - Stanislav Brabec <sbrabec@suse.com>
|
||||||
|
|
||||||
|
- Update to version 2.41:
|
||||||
|
* agetty: Fixed an issue where issue files were not being printed
|
||||||
|
from additional locations, such as /run or /usr/lib. This
|
||||||
|
change now allows for the use of local information from /etc,
|
||||||
|
in addition to generated files from /run and
|
||||||
|
distribution-specific files from /usr/lib.
|
||||||
|
* cfdisk and sfdisk: Added support for the --sector-size command
|
||||||
|
line option.
|
||||||
|
* sfdisk: Added a new option, --discard-free.
|
||||||
|
* fdisk: Added a new command, 'T', to discard sectors.
|
||||||
|
* chrt: The --sched-runtime now supports SCHED_{OTHER,BATCH}
|
||||||
|
policies.
|
||||||
|
* column: Can now handle ANSI SGR colors inside OSC 8 hyperlink
|
||||||
|
escape codes and sequences.
|
||||||
|
* enosys: Can now dump defined filters.
|
||||||
|
* libmount:
|
||||||
|
* Added experimental support for statmount() and listmount()
|
||||||
|
syscalls.
|
||||||
|
* This new functionality can be accessed using "findmnt
|
||||||
|
--kernel=listmount".
|
||||||
|
* Added a new mount option,
|
||||||
|
X-mount.nocanonicalize[=source|target].
|
||||||
|
* Added new mount extensions to the "ro" flag (ro[=vfs,fs]).
|
||||||
|
* Added a new option, X-mount.noloop, to disable automatic loop
|
||||||
|
device creation.
|
||||||
|
* Now supports bind symlinks over symlinks.
|
||||||
|
* Reads all kernel info/warning/error messages from new API
|
||||||
|
syscalls (and mount(8) prints them).
|
||||||
|
* libuuid: Now supports RFC9562 UUIDs.
|
||||||
|
* findmnt, lsblk, and lsfd: Added a new --hyperlink command line
|
||||||
|
option to print paths as terminal hyperlinks.
|
||||||
|
* findmnt: Can now address filesystems using --id and --uniq-id
|
||||||
|
(requires listmount() kernel support).
|
||||||
|
* flock: Added support for the --fcntl command line option.
|
||||||
|
* hardlink: Can now prioritize specified trees on the command
|
||||||
|
line using --prioritize-trees.
|
||||||
|
* Can exclude sub-trees using --exclude-subtree or keep them in
|
||||||
|
the current mount using --mount.
|
||||||
|
* Duplicates can now be printed using --list-duplicates.
|
||||||
|
* hwclock: Added a new --param-index option to address position
|
||||||
|
for RTC_PARAM_{GET,SET} ioctls.
|
||||||
|
* kill: Can now decode signal masks (e.g. as used in /proc) to
|
||||||
|
signal names.
|
||||||
|
* libblkid: Made many changes to improve detection, including
|
||||||
|
exfat, GPT, LUKS2, bitlocker, etc.
|
||||||
|
* login: Added support for LOGIN_ENV_SAFELIST in /etc/login.def.
|
||||||
|
* lsfd: Now supports pidfs and AF_VSOCK sockets.
|
||||||
|
* lsipc, ipcmk, ipcrm: Now supports POSIX ipc.
|
||||||
|
* lslogins: Now supports lastlog2.
|
||||||
|
* lsns: Added support for the --filter option.
|
||||||
|
* build by meson: Now supports translated man pages and has fixed
|
||||||
|
many bugs.
|
||||||
|
* mkswap: The option --file should now be usable on btrfs.
|
||||||
|
* nsenter: Improved support for pidfd and can now join target
|
||||||
|
process's socket net namespace.
|
||||||
|
* scriptlive: Added a new option, --echo <never|always|auto>.
|
||||||
|
* zramctl: Now supports COMP-RATIO and --algorithm-params.
|
||||||
|
* Many other new features and fixes. For complete list see
|
||||||
|
https://kernel.org/pub/linux/utils/util-linux/v2.41/v2.41-ReleaseNotes
|
||||||
|
- Update util-linux-login_defs-check.sh:
|
||||||
|
* Make instructions up to date.
|
||||||
|
* Update checksum reflecting the shadow update.
|
||||||
|
- Refresh libmount-print-a-blacklist-hint-for-unknown-filesyst.patch.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 24 17:16:49 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- Delete /usr/sbin/rc* symlinks
|
||||||
|
- Drop bashisms from build recipe
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 28 23:05:38 UTC 2025 - Stanislav Brabec <sbrabec@suse.com>
|
||||||
|
|
||||||
|
- Create and own directories /etc/blkid.conf.d and
|
||||||
|
/usr/etc/blkid.conf.d (boo#1235887#c3).
|
||||||
|
- Add missingok for /etc/blkid.conf.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jan 20 18:12:46 UTC 2025 - Stanislav Brabec <sbrabec@suse.com>
|
||||||
|
|
||||||
|
- Move blkid.conf to /usr/etc (boo#1235887).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 14 22:29:47 UTC 2025 - Stanislav Brabec <sbrabec@suse.com>
|
||||||
|
|
||||||
|
- Update to version 2.40.4:
|
||||||
|
* agetty: Prevent cursor escape (bsc#1194818, drop
|
||||||
|
util-linux-agetty-prevent-cursor-escape.patch)
|
||||||
|
add "systemd" to --version output\
|
||||||
|
* chcpu(8): Document CPU deconfiguring behavior
|
||||||
|
* fdisk: SGI fixes
|
||||||
|
* hardlink: fix memory corruption
|
||||||
|
* hardlink.1 directory|file is mandatory
|
||||||
|
* lib/env: fix env_list_setenv() for strings without '='
|
||||||
|
* libblkid:
|
||||||
|
(exfat) validate fields used by prober
|
||||||
|
(gpt) use blkid_probe_verify_csum() for partition array
|
||||||
|
checksum
|
||||||
|
add FSLASTBLOCK for swaparea
|
||||||
|
bitlocker fix version on big-endian systems
|
||||||
|
* libfdisk: make sure libblkid uses the same sector size
|
||||||
|
* libmount:
|
||||||
|
extract common error handling function
|
||||||
|
propagate first error of multiple filesystem types
|
||||||
|
* logger: correctly format tv_usec
|
||||||
|
* lscpu: Skip aarch64 decode path for rest of the architectures
|
||||||
|
(bsc#1229476, drop util-linux-lscpu-skip-aarch64-decode.patch)
|
||||||
|
* lsns: ignore ESRCH errors reported when accessing files under
|
||||||
|
/proc
|
||||||
|
* mkswap: set selinux label also when creating file
|
||||||
|
* more: make sure we have data on stderr
|
||||||
|
* nsenter: support empty environ
|
||||||
|
* umount, losetup: Document loop destroy behavior
|
||||||
|
(bsc#1159034, drop
|
||||||
|
util-linux-umount-losetup-lazy-destruction.patch,
|
||||||
|
util-linux-umount-losetup-lazy-destruction-generated.patch).
|
||||||
|
* uuidd: fix /var/lib/libuuid mode uuidd-tmpfiles.conf
|
||||||
|
fix /var/lib/libuuid mode uuidd-tmpfiles.conf
|
||||||
|
* Many other fixes, improvements and code cleanup. For the
|
||||||
|
complete list see
|
||||||
|
https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/v2.40.3-ReleaseNotes
|
||||||
|
https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/v2.40.4-ReleaseNotes
|
||||||
|
- Refresh util-linux.keyring. Key validity was extended.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Nov 17 21:06:01 UTC 2024 - Stanislav Brabec <sbrabec@suse.com>
|
||||||
|
|
||||||
|
- Skip aarch64 decode path for rest of the architectures
|
||||||
|
(bsc#1229476, util-linux-lscpu-skip-aarch64-decode.patch).
|
||||||
|
- agetty: Prevent login cursor escape (bsc#1194818,
|
||||||
|
util-linux-agetty-prevent-cursor-escape.patch).
|
||||||
|
- Document unexpected side effects of lazy destruction
|
||||||
|
(bsc#1159034, util-linux-umount-losetup-lazy-destruction.patch,
|
||||||
|
util-linux-umount-losetup-lazy-destruction-generated.patch).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Oct 21 23:25:19 UTC 2024 - Stanislav Brabec <sbrabec@suse.com>
|
Mon Oct 21 23:25:19 UTC 2024 - Stanislav Brabec <sbrabec@suse.com>
|
||||||
|
|
||||||
@@ -12,6 +254,7 @@ Mon Aug 5 22:14:13 UTC 2024 - Stanislav Brabec <sbrabec@suse.com>
|
|||||||
* libmount: improving robustness in reading kernel messages,
|
* libmount: improving robustness in reading kernel messages,
|
||||||
add pidfs to pseudo fs list
|
add pidfs to pseudo fs list
|
||||||
* lscpu: New Arm Cortex part numbers
|
* lscpu: New Arm Cortex part numbers
|
||||||
|
fix hang of lscpu -e (bsc#1225598)
|
||||||
* lsfd: Refactor the pidfd logic, support pidfs
|
* lsfd: Refactor the pidfd logic, support pidfs
|
||||||
(obsoletes
|
(obsoletes
|
||||||
0001-include-Include-unistd.h-in-pidfd-utils.h-for-syscal.patch,
|
0001-include-Include-unistd.h-in-pidfd-utils.h-for-syscal.patch,
|
||||||
@@ -111,7 +354,7 @@ Thu Apr 4 12:27:18 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
|
|||||||
* blockdev: add support for BLKGETZONESZ
|
* blockdev: add support for BLKGETZONESZ
|
||||||
* cfdisk: ask y/n before wipe
|
* cfdisk: ask y/n before wipe
|
||||||
* cfdisk: properly handle out-of-order partitions during resize
|
* cfdisk: properly handle out-of-order partitions during resize
|
||||||
* chcpu: document limitations of -g
|
* chcpu: document limitations of -g (bsc#1218609)
|
||||||
* chsh: use libeconf to read /etc/shells
|
* chsh: use libeconf to read /etc/shells
|
||||||
* column: fix -l
|
* column: fix -l
|
||||||
* column: fix memory leak
|
* column: fix memory leak
|
||||||
@@ -134,10 +377,12 @@ Thu Apr 4 12:27:18 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
|
|||||||
* lsblk: add --highlight
|
* lsblk: add --highlight
|
||||||
* lsblk: add --list-columns
|
* lsblk: add --list-columns
|
||||||
* lsclocks: new command to show clocks
|
* lsclocks: new command to show clocks
|
||||||
* lscpu: even more Arm part numbers
|
* lscpu: even more Arm part numbers (bsc#1223605)
|
||||||
* mkfs.minix: handle 64bit time on 32bit system
|
* mkfs.minix: handle 64bit time on 32bit system
|
||||||
* mkswap: implement --file
|
* mkswap: implement --file
|
||||||
* mkswap: implement --offset
|
* mkswap: implement --offset
|
||||||
|
* more: clean processes not cleaned up after failed SSH session
|
||||||
|
using up 100% CPU (bsc#1220117)
|
||||||
* mount: add --map-users and --map-groups convenience options
|
* mount: add --map-users and --map-groups convenience options
|
||||||
* nsenter: add option `-c` to join the cgroup of target process
|
* nsenter: add option `-c` to join the cgroup of target process
|
||||||
* setarch: add riscv64/riscv32 support
|
* setarch: add riscv64/riscv32 support
|
||||||
@@ -145,6 +390,8 @@ Thu Apr 4 12:27:18 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
|
|||||||
* uuidd: add cont_clock persistence
|
* uuidd: add cont_clock persistence
|
||||||
* uuidgen: add option --count
|
* uuidgen: add option --count
|
||||||
* wall: query logind for list of users with tty (#2088)
|
* wall: query logind for list of users with tty (#2088)
|
||||||
|
properly neutralize escape sequences (bsc#1221831,
|
||||||
|
CVE-2024-28085)
|
||||||
* write: query logind for list of users with tty (#2088)
|
* write: query logind for list of users with tty (#2088)
|
||||||
* libuuid: improved support for 64-bit time
|
* libuuid: improved support for 64-bit time
|
||||||
- skip-lsfd-tests-PR2888.patch: skip some lsfd tests which OBS does
|
- skip-lsfd-tests-PR2888.patch: skip some lsfd tests which OBS does
|
||||||
@@ -264,6 +511,7 @@ Fri Jul 28 14:47:15 UTC 2023 - Goldwyn Rodrigues <rgoldwyn@suse.com>
|
|||||||
|
|
||||||
- Re-add 0001-Revert-libblkid-try-LUKS2-first-when-probing.patch
|
- Re-add 0001-Revert-libblkid-try-LUKS2-first-when-probing.patch
|
||||||
because the patch is not in 2.39.1
|
because the patch is not in 2.39.1
|
||||||
|
(bsc#1224393, boo#1213227, boo#1213361)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jul 26 01:22:20 UTC 2023 - Neil Brown <nfbrown@suse.com>
|
Wed Jul 26 01:22:20 UTC 2023 - Neil Brown <nfbrown@suse.com>
|
||||||
|
@@ -1,9 +1,10 @@
|
|||||||
pub 4096R/EC39C284 2011-10-10 [expires: 2016-10-08]
|
pub rsa4096 2011-10-10 [SC] [expires: 2033-05-14]
|
||||||
uid Karel Zak <kzak@redhat.com>
|
B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284
|
||||||
sub 4096R/7BA16CAC 2011-10-10 [expires: 2016-10-08]
|
uid [ unknown] Karel Zak <kzak@redhat.com>
|
||||||
|
sub rsa4096 2011-10-10 [E] [expires: 2033-05-14]
|
||||||
|
FC0214B4E2D01655F5898228ED846C667BA16CAC
|
||||||
|
|
||||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
Version: GnuPG v2.0.20 (GNU/Linux)
|
|
||||||
|
|
||||||
mQINBE6StA4BEACp9++Y+DgbBloJEuVhsDjDIvAR1n/aHPDyPQQzg/DkKtR3BXHn
|
mQINBE6StA4BEACp9++Y+DgbBloJEuVhsDjDIvAR1n/aHPDyPQQzg/DkKtR3BXHn
|
||||||
dGfTL9/DR8y9YzLNwUf2lWsEAvwHZ2XfUTp5S5nVbgpAB0/Q2ebP0TnkNYaRkxq7
|
dGfTL9/DR8y9YzLNwUf2lWsEAvwHZ2XfUTp5S5nVbgpAB0/Q2ebP0TnkNYaRkxq7
|
||||||
@@ -16,41 +17,42 @@ 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
|
||||||
VeljfCzq
|
NdEeAGQJbiXWb1z9vHHQpDPKMXhK18D5PBnLDIl8iFnpDE+M088Xnavf9eYapj2k
|
||||||
=8wc5
|
Zh9rvA==
|
||||||
|
=cevX
|
||||||
-----END PGP PUBLIC KEY BLOCK-----
|
-----END PGP PUBLIC KEY BLOCK-----
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package util-linux
|
# spec file for package util-linux
|
||||||
#
|
#
|
||||||
# Copyright (c) 2024 SUSE LLC
|
# Copyright (c) 2025 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -85,18 +85,18 @@ Group: Development/Languages/Python
|
|||||||
%endif
|
%endif
|
||||||
# ulbuild == python
|
# ulbuild == python
|
||||||
|
|
||||||
Version: 2.40.2
|
Version: 2.41.1
|
||||||
Release: 0
|
Release: 0
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
URL: https://www.kernel.org/pub/linux/utils/util-linux/
|
URL: https://www.kernel.org/pub/linux/utils/util-linux/
|
||||||
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.40/util-linux-%{version}.tar.xz
|
Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.41/util-linux-%{version}.tar.xz
|
||||||
Source2: util-linux-login_defs-check.sh
|
Source2: util-linux-login_defs-check.sh
|
||||||
Source7: baselibs.conf
|
Source7: baselibs.conf
|
||||||
Source8: login.pamd
|
Source8: login.pamd
|
||||||
Source9: remote.pamd
|
Source9: remote.pamd
|
||||||
Source10: su.pamd
|
Source10: su.pamd
|
||||||
Source11: su.default
|
Source11: su.default
|
||||||
Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.39/util-linux-%{version}.tar.sign
|
Source12: https://www.kernel.org/pub/linux/utils/util-linux/v2.41/util-linux-%{version}.tar.sign
|
||||||
Source13: %{_name}.keyring
|
Source13: %{_name}.keyring
|
||||||
Source14: runuser.pamd
|
Source14: runuser.pamd
|
||||||
Source15: runuser-l.pamd
|
Source15: runuser-l.pamd
|
||||||
@@ -185,7 +185,8 @@ Supplements: filesystem(minix)
|
|||||||
# All login.defs variables require support from shadow side.
|
# All login.defs variables require support from shadow side.
|
||||||
# Upgrade this symbol version only if new variables appear!
|
# Upgrade this symbol version only if new variables appear!
|
||||||
# Verify by shadow-login_defs-check.sh from shadow source package.
|
# Verify by shadow-login_defs-check.sh from shadow source package.
|
||||||
Recommends: login_defs-support-for-util-linux >= 2.37
|
# Use downstream version. Upstream may accept the patch later.
|
||||||
|
Recommends: login_defs-support-for-util-linux >= 4.17.4
|
||||||
%endif
|
%endif
|
||||||
# ulsubset == core
|
# ulsubset == core
|
||||||
|
|
||||||
@@ -485,38 +486,38 @@ export CXXFLAGS="%{optflags} -D_GNU_SOURCE"
|
|||||||
|
|
||||||
# Here we define a build function. For the base build, we use it as it
|
# Here we define a build function. For the base build, we use it as it
|
||||||
# is. For python build, we use it repeatedly for all flavors.
|
# is. For python build, we use it repeatedly for all flavors.
|
||||||
function configure_and_build() {
|
configure_and_build() {
|
||||||
|
|
||||||
# configure options depending on ulbuild and ulsubset values
|
# configure options depending on ulbuild and ulsubset values
|
||||||
configure_options=""
|
configure_options=""
|
||||||
# libmagic is only used for determining in more(1) whether or not a file
|
# libmagic is only used for determining in more(1) whether or not a file
|
||||||
# is binary. but it has builtin code that is doing the same with a simpler
|
# is binary. but it has builtin code that is doing the same with a simpler
|
||||||
# check and the libmagic database dependency is rather large (9MB+)
|
# check and the libmagic database dependency is rather large (9MB+)
|
||||||
configure_options+="--without-libmagic "
|
configure_options="$configure_options --without-libmagic "
|
||||||
|
|
||||||
%if "%ulbuild" == "python"
|
%if "%ulbuild" == "python"
|
||||||
%define _configure ../configure
|
%define _configure ../configure
|
||||||
configure_options+="--disable-all-programs "
|
configure_options="$configure_options --disable-all-programs "
|
||||||
configure_options+="--with-python "
|
configure_options="$configure_options --with-python "
|
||||||
configure_options+="--enable-pylibmount "
|
configure_options="$configure_options --enable-pylibmount "
|
||||||
configure_options+="--enable-libmount "
|
configure_options="$configure_options --enable-libmount "
|
||||||
configure_options+="--enable-libblkid "
|
configure_options="$configure_options --enable-libblkid "
|
||||||
%endif
|
%endif
|
||||||
# ulbuild == python
|
# ulbuild == python
|
||||||
|
|
||||||
%if "%ulbuild" == "base"
|
%if "%ulbuild" == "base"
|
||||||
configure_options+="--enable-all-programs "
|
configure_options="$configure_options --enable-all-programs "
|
||||||
configure_options+="--without-python "
|
configure_options="$configure_options --without-python "
|
||||||
%endif
|
%endif
|
||||||
# ulbuild == base
|
# ulbuild == base
|
||||||
|
|
||||||
%if "%ulsubset" == "core"
|
%if "%ulsubset" == "core"
|
||||||
configure_options+="--without-systemd --disable-liblastlog2"
|
configure_options="$configure_options --without-systemd --disable-liblastlog2"
|
||||||
%endif
|
%endif
|
||||||
# ulsubset == core
|
# ulsubset == core
|
||||||
|
|
||||||
%if "%ulsubset" == "systemd"
|
%if "%ulsubset" == "systemd"
|
||||||
configure_options+="--with-systemd "
|
configure_options="$configure_options --with-systemd "
|
||||||
%endif
|
%endif
|
||||||
# ulsubset == systemd
|
# ulsubset == systemd
|
||||||
|
|
||||||
@@ -560,9 +561,8 @@ configure_options+="--with-systemd "
|
|||||||
--enable-fs-paths-default="/sbin:/usr/sbin"\
|
--enable-fs-paths-default="/sbin:/usr/sbin"\
|
||||||
--enable-static\
|
--enable-static\
|
||||||
--with-vendordir=%{_distconfdir}\
|
--with-vendordir=%{_distconfdir}\
|
||||||
--disable-libmount-mountfd-support\
|
|
||||||
$configure_options
|
$configure_options
|
||||||
make %{?_smp_mflags}
|
%make_build
|
||||||
}
|
}
|
||||||
|
|
||||||
################
|
################
|
||||||
@@ -613,8 +613,10 @@ fi
|
|||||||
################
|
################
|
||||||
%if "%ulbuild" == "base"
|
%if "%ulbuild" == "base"
|
||||||
%make_install
|
%make_install
|
||||||
mkdir -p %{buildroot}{%{_distconfdir}/default,%{_pam_vendordir},%{_sysconfdir}/issue.d}
|
mkdir -p "%{buildroot}/%{_distconfdir}/default" "%{buildroot}/%{_pam_vendordir}" "%{buildroot}/%{_sysconfdir}/issue.d"
|
||||||
install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf
|
install -m 644 %{SOURCE51} %{buildroot}%{_distconfdir}/blkid.conf
|
||||||
|
touch %{buildroot}%{_sysconfdir}/blkid.conf
|
||||||
|
mkdir %{buildroot}%{_sysconfdir}/blkid.conf.d %{buildroot}%{_distconfdir}/blkid.conf.d
|
||||||
install -m 644 %{SOURCE8} %{buildroot}%{_pam_vendordir}/login
|
install -m 644 %{SOURCE8} %{buildroot}%{_pam_vendordir}/login
|
||||||
install -m 644 %{SOURCE9} %{buildroot}%{_pam_vendordir}/remote
|
install -m 644 %{SOURCE9} %{buildroot}%{_pam_vendordir}/remote
|
||||||
%if 0%{?suse_version} <= 1500
|
%if 0%{?suse_version} <= 1500
|
||||||
@@ -668,10 +670,10 @@ rm -f %{buildroot}%{_mandir}/man8/fdisk.8*
|
|||||||
|
|
||||||
# create list of setarch(8) symlinks
|
# create list of setarch(8) symlinks
|
||||||
find %{buildroot}%{_mandir}/man8 -regextype posix-egrep \
|
find %{buildroot}%{_mandir}/man8 -regextype posix-egrep \
|
||||||
-regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|parisc|parisc32|parisc64|uname26)\.8.*" \
|
-regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|parisc|parisc32|parisc64)\.8.*" \
|
||||||
-printf "%{_mandir}/man8/%f*\n" >> %{name}.files
|
-printf "%{_mandir}/man8/%f*\n" >> %{name}.files
|
||||||
find %{buildroot}%{_bindir}/ -regextype posix-egrep -type l \
|
find %{buildroot}%{_bindir}/ -regextype posix-egrep -type l \
|
||||||
-regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|parisc|parisc32|parisc64|uname26)$" \
|
-regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|parisc|parisc32|parisc64)$" \
|
||||||
-printf "%{_bindir}/%f\n" >> %{name}.files
|
-printf "%{_bindir}/%f\n" >> %{name}.files
|
||||||
mkdir -p %{buildroot}/run/uuidd
|
mkdir -p %{buildroot}/run/uuidd
|
||||||
|
|
||||||
@@ -712,8 +714,6 @@ mv %{buildroot}%{_bindir}/login %{buildroot}/bin/
|
|||||||
%else
|
%else
|
||||||
# ulsubset != core, ulbuild == base
|
# ulsubset != core, ulbuild == base
|
||||||
echo -n "" >%{name}.lang
|
echo -n "" >%{name}.lang
|
||||||
ln -sf /sbin/service %{buildroot}%{_sbindir}/rcuuidd
|
|
||||||
ln -sf /sbin/service %{buildroot}%{_sbindir}/rcfstrim
|
|
||||||
%endif
|
%endif
|
||||||
# ulsubset == core, ulbuild == base
|
# ulsubset == core, ulbuild == base
|
||||||
|
|
||||||
@@ -977,7 +977,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
|||||||
# defined no_config
|
# defined no_config
|
||||||
|
|
||||||
%config %dir %{_sysconfdir}/issue.d
|
%config %dir %{_sysconfdir}/issue.d
|
||||||
|
|
||||||
%if %{ul_extra_bin_sbin}
|
%if %{ul_extra_bin_sbin}
|
||||||
%core /bin/kill
|
%core /bin/kill
|
||||||
%core %verify(not mode) %attr(%ul_suid,root,root) /bin/su
|
%core %verify(not mode) %attr(%ul_suid,root,root) /bin/su
|
||||||
@@ -1021,7 +1020,9 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
|||||||
%core %{_bindir}/kill
|
%core %{_bindir}/kill
|
||||||
%core %verify(not mode) %attr(%ul_suid,root,root) %{_bindir}/su
|
%core %verify(not mode) %attr(%ul_suid,root,root) %{_bindir}/su
|
||||||
%core %{_bindir}/eject
|
%core %{_bindir}/eject
|
||||||
|
%core %{_bindir}/bits
|
||||||
%core %{_bindir}/cal
|
%core %{_bindir}/cal
|
||||||
|
%core %{_bindir}/coresched
|
||||||
%core %{_bindir}/chmem
|
%core %{_bindir}/chmem
|
||||||
%core %{_bindir}/choom
|
%core %{_bindir}/choom
|
||||||
%core %{_bindir}/chrt
|
%core %{_bindir}/chrt
|
||||||
@@ -1233,6 +1234,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
|||||||
|
|
||||||
%core %{_mandir}/man1/kill.1.gz
|
%core %{_mandir}/man1/kill.1.gz
|
||||||
%core %{_mandir}/man1/su.1.gz
|
%core %{_mandir}/man1/su.1.gz
|
||||||
|
%core %{_mandir}/man1/bits.1.gz
|
||||||
%core %{_mandir}/man1/cal.1.gz
|
%core %{_mandir}/man1/cal.1.gz
|
||||||
%core %{_mandir}/man1/choom.1.gz
|
%core %{_mandir}/man1/choom.1.gz
|
||||||
%core %{_mandir}/man1/chrt.1.gz
|
%core %{_mandir}/man1/chrt.1.gz
|
||||||
@@ -1240,6 +1242,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
|||||||
%core %{_mandir}/man1/colcrt.1.gz
|
%core %{_mandir}/man1/colcrt.1.gz
|
||||||
%core %{_mandir}/man1/colrm.1.gz
|
%core %{_mandir}/man1/colrm.1.gz
|
||||||
%core %{_mandir}/man1/column.1.gz
|
%core %{_mandir}/man1/column.1.gz
|
||||||
|
%core %{_mandir}/man1/coresched.1.gz
|
||||||
%core %{_mandir}/man1/dmesg.1.gz
|
%core %{_mandir}/man1/dmesg.1.gz
|
||||||
%core %{_mandir}/man1/enosys.1.gz
|
%core %{_mandir}/man1/enosys.1.gz
|
||||||
%core %{_mandir}/man1/eject.1.gz
|
%core %{_mandir}/man1/eject.1.gz
|
||||||
@@ -1366,8 +1369,10 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
|||||||
%license README.licensing
|
%license README.licensing
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%license Documentation/licenses/*
|
%license Documentation/licenses/*
|
||||||
%config(noreplace) %{_sysconfdir}/blkid.conf
|
%ghost %config(missingok) %{_sysconfdir}/blkid.conf
|
||||||
|
%config %dir %{_sysconfdir}/blkid.conf.d
|
||||||
|
%{_distconfdir}/blkid.conf
|
||||||
|
%dir %{_distconfdir}/blkid.conf.d
|
||||||
%{_datadir}/bash-completion/completions/*
|
%{_datadir}/bash-completion/completions/*
|
||||||
%exclude %{_datadir}/bash-completion/completions/findmnt
|
%exclude %{_datadir}/bash-completion/completions/findmnt
|
||||||
%exclude %{_datadir}/bash-completion/completions/logger
|
%exclude %{_datadir}/bash-completion/completions/logger
|
||||||
@@ -1392,10 +1397,11 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
|||||||
# Systemd files #
|
# Systemd files #
|
||||||
#################
|
#################
|
||||||
%if "%ulsubset" == "systemd"
|
%if "%ulsubset" == "systemd"
|
||||||
%exclude %config(noreplace) %{_sysconfdir}/blkid.conf
|
%exclude %{_distconfdir}/blkid.conf
|
||||||
|
%exclude %dir %{_distconfdir}/blkid.conf.d
|
||||||
|
%exclude %config(missingok) %{_sysconfdir}/blkid.conf
|
||||||
|
%exclude %config %{_sysconfdir}/blkid.conf.d
|
||||||
%exclude %config %dir %{_sysconfdir}/issue.d
|
%exclude %config %dir %{_sysconfdir}/issue.d
|
||||||
|
|
||||||
%if %{ul_extra_bin_sbin}
|
%if %{ul_extra_bin_sbin}
|
||||||
/bin/findmnt
|
/bin/findmnt
|
||||||
/bin/logger
|
/bin/logger
|
||||||
@@ -1583,7 +1589,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
|||||||
%exclude %{_mandir}/man8/parisc64.8.gz
|
%exclude %{_mandir}/man8/parisc64.8.gz
|
||||||
%exclude %{_mandir}/man8/uname26.8.gz
|
%exclude %{_mandir}/man8/uname26.8.gz
|
||||||
|
|
||||||
%{_sbindir}/rcfstrim
|
|
||||||
%{_unitdir}/fstrim.service
|
%{_unitdir}/fstrim.service
|
||||||
%{_unitdir}/fstrim.timer
|
%{_unitdir}/fstrim.timer
|
||||||
%endif
|
%endif
|
||||||
@@ -1730,7 +1735,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
|
|||||||
%attr(-,uuidd,uuidd) %ghost %dir /run/uuidd
|
%attr(-,uuidd,uuidd) %ghost %dir /run/uuidd
|
||||||
%{_datadir}/bash-completion/completions/uuidd
|
%{_datadir}/bash-completion/completions/uuidd
|
||||||
%{_mandir}/man8/uuidd.8.gz
|
%{_mandir}/man8/uuidd.8.gz
|
||||||
%{_sbindir}/rcuuidd
|
|
||||||
%{_unitdir}/uuidd.service
|
%{_unitdir}/uuidd.service
|
||||||
%{_unitdir}/uuidd.socket
|
%{_unitdir}/uuidd.socket
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user