Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
805f5d3b0d | ||
|
072774b4ff |
11
.gitignore
vendored
11
.gitignore
vendored
@ -79,14 +79,3 @@
|
||||
/util-linux-2.35.2.tar.xz
|
||||
/util-linux-2.36.tar.xz
|
||||
/util-linux-2.36.1.tar.xz
|
||||
/util-linux-2.36.2.tar.xz
|
||||
/util-linux-2.37-rc2.tar.xz
|
||||
/util-linux-2.37.tar.xz
|
||||
/util-linux-2.37.2.tar.xz
|
||||
/util-linux-2.38-rc1.tar.xz
|
||||
/util-linux-2.38-rc3.tar.xz
|
||||
/util-linux-2.38.tar.xz
|
||||
/util-linux-2.38.1.tar.xz
|
||||
/util-linux-2.39-rc1.tar.xz
|
||||
/util-linux-2.39-rc2.tar.xz
|
||||
/util-linux-2.39-rc3.tar.xz
|
||||
|
55
0001-agetty-keep-freed-issue-file-pointer-zeroized.patch
Normal file
55
0001-agetty-keep-freed-issue-file-pointer-zeroized.patch
Normal file
@ -0,0 +1,55 @@
|
||||
From 9418ba6d05feed6061f5343741b1bc56e7bde663 Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Fri, 20 Dec 2019 15:05:33 +0100
|
||||
Subject: [PATCH] agetty: keep freed issue file pointer zeroized
|
||||
|
||||
References: https://bugzilla.redhat.com/show_bug.cgi?id=1784536
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
---
|
||||
term-utils/agetty.c | 15 +++++++++++----
|
||||
1 file changed, 11 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
|
||||
index 3c20acc98..dfc4921f5 100644
|
||||
--- a/term-utils/agetty.c
|
||||
+++ b/term-utils/agetty.c
|
||||
@@ -1820,8 +1820,12 @@ static int issuefile_read_stream(
|
||||
if (fstat(fileno(f), &st) || !S_ISREG(st.st_mode))
|
||||
return 1;
|
||||
|
||||
- if (!ie->output)
|
||||
- ie->output = open_memstream(&ie->mem, &ie->mem_sz);
|
||||
+ if (!ie->output) {
|
||||
+ free(ie->mem);
|
||||
+ ie->mem_sz = 0;
|
||||
+ ie->mem = NULL;
|
||||
+ ie->output = open_memstream(&ie->mem, &ie->mem_sz);
|
||||
+ }
|
||||
|
||||
while ((c = getc(f)) != EOF) {
|
||||
if (c == '\\')
|
||||
@@ -1965,8 +1969,10 @@ done:
|
||||
if (netlink_groups != 0)
|
||||
open_netlink();
|
||||
#endif
|
||||
- if (ie->output)
|
||||
+ if (ie->output) {
|
||||
fclose(ie->output);
|
||||
+ ie->output = NULL;
|
||||
+ }
|
||||
}
|
||||
|
||||
/* This is --show-issue backend, executed by normal user on the current
|
||||
@@ -1985,7 +1991,8 @@ static void show_issue(struct options *op)
|
||||
|
||||
if (ie.mem_sz)
|
||||
write_all(STDOUT_FILENO, ie.mem, ie.mem_sz);
|
||||
-
|
||||
+ if (ie.output)
|
||||
+ fclose(ie.output);
|
||||
free(ie.mem);
|
||||
}
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
148
column-fix-leading-space-characters-bug.patch
Normal file
148
column-fix-leading-space-characters-bug.patch
Normal file
@ -0,0 +1,148 @@
|
||||
From 651c5d428c2ef103ee8c5b1a310d6f29f0304744 Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Tue, 27 Mar 2018 10:40:13 +0200
|
||||
Subject: [PATCH] column: fix leading space characters bug
|
||||
|
||||
The bug has been introduced during column(1) rewrite. The function
|
||||
read_input() need to skip leading space only temporary to detect empty
|
||||
lines, but the rest of the code has to use the original buffer (line).
|
||||
I've tried to fix one of the symptoms by 5c7b67fbbf41c973ca8d49b1e8bdba22dbb917aa
|
||||
(alter), but this solution is unnecessary and too complex.
|
||||
|
||||
Changes:
|
||||
|
||||
* don't ignore leading space
|
||||
* remove unnecessary stuff introduced by 5c7b67fbbf41c973ca8d49b1e8bdba22dbb917aa
|
||||
* fix regression test with incorrect separator
|
||||
|
||||
Addresses: https://github.com/karelzak/util-linux/issues/575
|
||||
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1560283
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
---
|
||||
tests/expected/column/table-input-separator-space | 2 +-
|
||||
tests/ts/column/table | 2 +-
|
||||
text-utils/column.c | 36 ++---------------------
|
||||
4 files changed, 5 insertions(+), 38 deletions(-)
|
||||
|
||||
diff --git a/tests/expected/column/table-input-separator-space b/tests/expected/column/table-input-separator-space
|
||||
index 8a6513c11..25d9b5ab0 100644
|
||||
--- a/tests/expected/column/table-input-separator-space
|
||||
+++ b/tests/expected/column/table-input-separator-space
|
||||
@@ -1,5 +1,5 @@
|
||||
AAA BBBB C DDDD
|
||||
-BBB CCCC DDD
|
||||
+ BBB CCCC DDD
|
||||
AA BB DD
|
||||
AAAA B CC D
|
||||
AA CC DD
|
||||
diff --git a/tests/ts/column/table b/tests/ts/column/table
|
||||
index 27b52e7c8..5c89d5eaf 100755
|
||||
--- a/tests/ts/column/table
|
||||
+++ b/tests/ts/column/table
|
||||
@@ -37,7 +37,7 @@ $TS_CMD_COLUMN --separator ',' --table $TS_SELF/files/table-sep >> $TS_OUTPUT 2>
|
||||
ts_finalize_subtest
|
||||
|
||||
ts_init_subtest "input-separator-space"
|
||||
-$TS_CMD_COLUMN --separator ',' --table $TS_SELF/files/table-sep-space >> $TS_OUTPUT 2>&1
|
||||
+$TS_CMD_COLUMN --separator "$(echo -e '\t')" --table $TS_SELF/files/table-sep-space >> $TS_OUTPUT 2>&1
|
||||
ts_finalize_subtest
|
||||
|
||||
ts_init_subtest "long"
|
||||
diff --git a/text-utils/column.c b/text-utils/column.c
|
||||
index 89d46d280..195814328 100644
|
||||
--- a/text-utils/column.c
|
||||
+++ b/text-utils/column.c
|
||||
@@ -86,7 +86,6 @@ struct column_control {
|
||||
const char *tree_parent;
|
||||
|
||||
wchar_t *input_separator;
|
||||
- char *input_separator_raw;
|
||||
const char *output_separator;
|
||||
|
||||
wchar_t **ents; /* input entries */
|
||||
@@ -96,7 +95,6 @@ struct column_control {
|
||||
unsigned int greedy :1,
|
||||
json :1,
|
||||
header_repeat :1,
|
||||
- input_sep_space : 1, /* input separator contains space chars */
|
||||
tab_noheadings :1;
|
||||
};
|
||||
|
||||
@@ -470,19 +468,7 @@ static int read_input(struct column_control *ctl, FILE *fp)
|
||||
char *buf = NULL;
|
||||
size_t bufsz = 0;
|
||||
size_t maxents = 0;
|
||||
- int rc = 0, is_space_sep = 0;
|
||||
-
|
||||
- /* Check if columns separator contains spaces chars */
|
||||
- if (ctl->mode == COLUMN_MODE_TABLE && ctl->input_separator_raw) {
|
||||
- char *p;
|
||||
-
|
||||
- for (p = ctl->input_separator_raw; *p; p++) {
|
||||
- if (isspace(*p)) {
|
||||
- is_space_sep = 1;
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
+ int rc = 0;
|
||||
|
||||
/* Read input */
|
||||
do {
|
||||
@@ -496,19 +482,6 @@ static int read_input(struct column_control *ctl, FILE *fp)
|
||||
err(EXIT_FAILURE, _("read failed"));
|
||||
}
|
||||
str = (char *) skip_space(buf);
|
||||
-
|
||||
- /* The table columns separator could be a space. In this case
|
||||
- * don't skip the separator if at begin of the line. For example:
|
||||
- *
|
||||
- * echo -e "\tcol1\tcol2\nrow\t1\t2" \
|
||||
- * | column -t -s "$(echo -e '\t')" --table-columns A,B,C
|
||||
- */
|
||||
- if (is_space_sep && str > buf) {
|
||||
- char *x = strpbrk(buf, ctl->input_separator_raw);
|
||||
- if (x && x < str)
|
||||
- str = x;
|
||||
- }
|
||||
-
|
||||
if (str) {
|
||||
p = strchr(str, '\n');
|
||||
if (p)
|
||||
@@ -517,13 +490,13 @@ static int read_input(struct column_control *ctl, FILE *fp)
|
||||
if (!str || !*str)
|
||||
continue;
|
||||
|
||||
- wcs = mbs_to_wcs(str);
|
||||
+ wcs = mbs_to_wcs(buf);
|
||||
if (!wcs) {
|
||||
/*
|
||||
* Convert broken sequences to \x<hex> and continue.
|
||||
*/
|
||||
size_t tmpsz = 0;
|
||||
- char *tmp = mbs_invalid_encode(str, &tmpsz);
|
||||
+ char *tmp = mbs_invalid_encode(buf, &tmpsz);
|
||||
|
||||
if (!tmp)
|
||||
err(EXIT_FAILURE, _("read failed"));
|
||||
@@ -720,7 +693,6 @@ int main(int argc, char **argv)
|
||||
|
||||
ctl.output_separator = " ";
|
||||
ctl.input_separator = mbs_to_wcs("\t ");
|
||||
- ctl.input_separator_raw = xstrdup("\t ");
|
||||
|
||||
while ((c = getopt_long(argc, argv, "c:dE:eH:hi:JN:n:O:o:p:R:r:s:T:tVW:x", longopts, NULL)) != -1) {
|
||||
|
||||
@@ -775,9 +747,7 @@ int main(int argc, char **argv)
|
||||
break;
|
||||
case 's':
|
||||
free(ctl.input_separator);
|
||||
- free(ctl.input_separator_raw);
|
||||
ctl.input_separator = mbs_to_wcs(optarg);
|
||||
- ctl.input_separator_raw = xstrdup(optarg);
|
||||
ctl.greedy = 0;
|
||||
break;
|
||||
case 'T':
|
||||
--
|
||||
2.14.3
|
||||
|
40
libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch
Normal file
40
libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch
Normal file
@ -0,0 +1,40 @@
|
||||
From 76bb9b30cfcf54b59591a57a3d2a747e514469b2 Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Thu, 19 Nov 2020 09:49:16 +0100
|
||||
Subject: [PATCH] libmount: don't use "symfollow" for helpers on user mounts
|
||||
|
||||
Addresses: https://github.com/karelzak/util-linux/issues/1193
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
---
|
||||
libmount/src/context_mount.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
|
||||
index 8c394c1ff..dd1786176 100644
|
||||
--- a/libmount/src/context_mount.c
|
||||
+++ b/libmount/src/context_mount.c
|
||||
@@ -415,6 +415,9 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr)
|
||||
* string, because there is nothing like MS_EXEC (we only have
|
||||
* MS_NOEXEC in mount flags and we don't care about the original
|
||||
* mount string in libmount for VFS options).
|
||||
+ *
|
||||
+ * This use-case makes sense for MS_SECURE flags only (see
|
||||
+ * mnt_optstr_get_flags() and mnt_context_merge_mflags()).
|
||||
*/
|
||||
if (!(cxt->mountflags & MS_NOEXEC))
|
||||
mnt_optstr_append_option(optstr, "exec", NULL);
|
||||
@@ -422,11 +425,8 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr)
|
||||
mnt_optstr_append_option(optstr, "suid", NULL);
|
||||
if (!(cxt->mountflags & MS_NODEV))
|
||||
mnt_optstr_append_option(optstr, "dev", NULL);
|
||||
- if (!(cxt->mountflags & MS_NOSYMFOLLOW))
|
||||
- mnt_optstr_append_option(optstr, "symfollow", NULL);
|
||||
}
|
||||
|
||||
-
|
||||
if (cxt->flags & MNT_FL_SAVED_USER)
|
||||
rc = mnt_optstr_set_option(optstr, "user", cxt->orig_user);
|
||||
if (rc)
|
||||
--
|
||||
2.25.4
|
||||
|
@ -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
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (util-linux-2.39-rc3.tar.xz) = 8a93d32a5ceb38d50a4b2c8bfa48bcab7ec9b758c89b5a1a4f7fd74558dce37385bd7ea203345148d4389de4ea60ec42058f9d7889a8075d3e616773d085427e
|
||||
SHA512 (util-linux-2.36.1.tar.xz) = 9dfd01ae4c16fa35015dafd222d555988b72e4d1d2fbadd140791b9ef78f84fa8254d4d08dc67cabf41e873338867f19e786b989d708ccfe5161c4f7679bba7a
|
||||
|
8
util-linux-60-raw.rules
Normal file
8
util-linux-60-raw.rules
Normal file
@ -0,0 +1,8 @@
|
||||
#
|
||||
# Enter raw device bindings here.
|
||||
#
|
||||
# An example would be:
|
||||
# ACTION=="add", KERNEL=="sda", RUN+="/usr/bin/raw /dev/raw/raw1 %N"
|
||||
# to bind /dev/raw/raw1 to /dev/sda, or
|
||||
# ACTION=="add", ENV{MAJOR}=="8", ENV{MINOR}=="1", RUN+="/usr/bin/raw /dev/raw/raw2 %M %m"
|
||||
# to bind /dev/raw/raw2 to the device with major 8, minor 1.
|
525
util-linux.spec
525
util-linux.spec
@ -1,22 +1,21 @@
|
||||
### Header
|
||||
Summary: Collection of basic system utilities
|
||||
Summary: A collection of basic system utilities
|
||||
Name: util-linux
|
||||
Version: 2.39
|
||||
Release: 0.5%{?dist}
|
||||
Version: 2.36.1
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
||||
URL: https://en.wikipedia.org/wiki/Util-linux
|
||||
URL: http://en.wikipedia.org/wiki/Util-linux
|
||||
|
||||
### Macros
|
||||
%global upstream_version %{version}-rc3
|
||||
%global upstream_major %(eval echo %{version} | sed -e 's/\([[:digit:]]*\)\.\([[:digit:]]*\)\.[[:digit:]]*$/\1.\2/')
|
||||
%define upstream_version %{version}
|
||||
%define upstream_major %(eval echo %{version} | %{__sed} -e 's/\([[:digit:]]*\)\.\([[:digit:]]*\)\.[[:digit:]]*$/\1.\2/')
|
||||
|
||||
%global compldir %{_datadir}/bash-completion/completions/
|
||||
%define compldir %{_datadir}/bash-completion/completions/
|
||||
|
||||
%global pypkg python3
|
||||
%global pyver 3
|
||||
%define pypkg python3
|
||||
%define pyver 3
|
||||
|
||||
### Dependencies
|
||||
BuildRequires: make
|
||||
BuildRequires: audit-libs-devel >= 1.0.6
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: libselinux-devel
|
||||
@ -26,29 +25,29 @@ BuildRequires: pam-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: popt-devel
|
||||
BuildRequires: libutempter-devel
|
||||
BuildRequires: systemd-devel
|
||||
Buildrequires: systemd-devel
|
||||
BuildRequires: systemd
|
||||
BuildRequires: libuser-devel
|
||||
Buildrequires: libuser-devel
|
||||
BuildRequires: libcap-ng-devel
|
||||
BuildRequires: %{pypkg}-devel
|
||||
BuildRequires: pcre2-devel
|
||||
BuildRequires: gcc
|
||||
BuildRequires: rubygem-asciidoctor
|
||||
%ifarch ppc64le
|
||||
BuildRequires: librtas-devel
|
||||
%endif
|
||||
|
||||
# enable if make changes to build-system
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: libtool
|
||||
BuildRequires: bison
|
||||
#BuildRequires: autoconf
|
||||
#BuildRequires: automake
|
||||
#BuildRequires: libtool
|
||||
#BuildRequires: bison
|
||||
|
||||
### Sources
|
||||
Source0: https://www.kernel.org/pub/linux/utils/util-linux/v%{upstream_major}/util-linux-%{upstream_version}.tar.xz
|
||||
Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v%{upstream_major}/util-linux-%{upstream_version}.tar.xz
|
||||
Source1: util-linux-login.pamd
|
||||
Source2: util-linux-remote.pamd
|
||||
Source3: util-linux-chsh-chfn.pamd
|
||||
Source4: uuidd-tmpfiles.conf
|
||||
Source4: util-linux-60-raw.rules
|
||||
Source5: adjtime
|
||||
Source12: util-linux-su.pamd
|
||||
Source13: util-linux-su-l.pamd
|
||||
@ -66,15 +65,28 @@ Provides: eject = 2.1.6
|
||||
# rfkill has been merged into util-linux v2.31
|
||||
Obsoletes: rfkill <= 0.5
|
||||
Provides: rfkill = 0.5
|
||||
# hardlink has been merged into util-linux v2.34
|
||||
Obsoletes: hardlink <= 1:1.3-9
|
||||
Provides: hardlink = 1:1.3-9
|
||||
# sulogin, utmpdump merged into util-linux v2.22;
|
||||
# last, lastb merged into util-linux v2.24
|
||||
Conflicts: sysvinit-tools < 2.88-14
|
||||
# old versions of e2fsprogs contain fsck, uuidgen
|
||||
Conflicts: e2fsprogs < 1.41.8-5
|
||||
# rename from util-linux-ng back to util-linux
|
||||
Obsoletes: util-linux-ng < 2.19
|
||||
Provides: util-linux-ng = %{version}-%{release}
|
||||
Conflicts: filesystem < 3
|
||||
Provides: /sbin/nologin
|
||||
Provides: /bin/dmesg
|
||||
Provides: /bin/kill
|
||||
Provides: /bin/more
|
||||
Provides: /bin/mount
|
||||
Provides: /bin/umount
|
||||
Provides: /sbin/blkid
|
||||
Provides: /sbin/blockdev
|
||||
Provides: /sbin/findfs
|
||||
Provides: /sbin/fsck
|
||||
Provides: /sbin/nologin
|
||||
|
||||
Requires(post): coreutils
|
||||
Requires: pam >= 1.1.3-7, /etc/pam.d/system-auth
|
||||
@ -84,51 +96,23 @@ Requires: libblkid = %{version}-%{release}
|
||||
Requires: libmount = %{version}-%{release}
|
||||
Requires: libsmartcols = %{version}-%{release}
|
||||
Requires: libfdisk = %{version}-%{release}
|
||||
Requires: util-linux-core = %{version}-%{release}
|
||||
|
||||
### Ready for upstream?
|
||||
###
|
||||
# 151635 - makeing /var/log/lastlog
|
||||
Patch0: login-lastlog-create.patch
|
||||
# Add `/run/motd.d` to the hardcoded MOTD_FILE
|
||||
# https://github.com/coreos/console-login-helper-messages/issues/60
|
||||
Patch1: login-default-motd-file.patch
|
||||
Patch0: 2.36-login-lastlog-create.patch
|
||||
# usptream patch, https://github.com/karelzak/util-linux/issues/1193
|
||||
Patch1: libmount-don-t-use-symfollow-for-helpers-on-user-mou.patch
|
||||
|
||||
%description
|
||||
The util-linux package contains a large variety of low-level system
|
||||
utilities that are necessary for a Linux system to function. Among
|
||||
others, util-linux contains the fdisk configuration tool and the login
|
||||
others, Util-linux contains the fdisk configuration tool and the login
|
||||
program.
|
||||
|
||||
|
||||
%package -n util-linux-core
|
||||
Summary: The most essential utilities from the util-linux suite
|
||||
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
||||
Provides: /bin/dmesg
|
||||
Provides: /bin/kill
|
||||
Provides: /bin/more
|
||||
Provides: /bin/mount
|
||||
Provides: /bin/umount
|
||||
Provides: /sbin/blkid
|
||||
Provides: /sbin/blockdev
|
||||
Provides: /sbin/fsck
|
||||
# hardlink has been merged into util-linux v2.34
|
||||
Obsoletes: hardlink <= 1:1.3-9
|
||||
Provides: hardlink = 1:1.3-9
|
||||
Requires: libuuid = %{version}-%{release}
|
||||
Requires: libblkid = %{version}-%{release}
|
||||
Requires: libmount = %{version}-%{release}
|
||||
Requires: libsmartcols = %{version}-%{release}
|
||||
# old versions of e2fsprogs contain fsck, uuidgen
|
||||
Conflicts: e2fsprogs < 1.41.8-5
|
||||
|
||||
%description -n util-linux-core
|
||||
This is a very basic set of Linux utilities that is necessary on
|
||||
minimal installations.
|
||||
|
||||
|
||||
%package -n libfdisk
|
||||
Summary: Partitioning library for fdisk-like programs
|
||||
Summary: Partitioning library for fdisk-like programs.
|
||||
License: LGPLv2+
|
||||
|
||||
%description -n libfdisk
|
||||
@ -136,9 +120,9 @@ This is library for fdisk-like programs, part of util-linux.
|
||||
|
||||
|
||||
%package -n libfdisk-devel
|
||||
Summary: Partitioning library for fdisk-like programs
|
||||
Summary: Partitioning library for fdisk-like programs.
|
||||
License: LGPLv2+
|
||||
Requires: libfdisk%{?_isa} = %{version}-%{release}
|
||||
Requires: libfdisk = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
|
||||
%description -n libfdisk-devel
|
||||
@ -147,7 +131,7 @@ part of util-linux.
|
||||
|
||||
|
||||
%package -n libsmartcols
|
||||
Summary: Formatting library for ls-like programs
|
||||
Summary: Formatting library for ls-like programs.
|
||||
License: LGPLv2+
|
||||
|
||||
%description -n libsmartcols
|
||||
@ -155,9 +139,9 @@ This is library for ls-like terminal programs, part of util-linux.
|
||||
|
||||
|
||||
%package -n libsmartcols-devel
|
||||
Summary: Formatting library for ls-like programs
|
||||
Summary: Formatting library for ls-like programs.
|
||||
License: LGPLv2+
|
||||
Requires: libsmartcols%{?_isa} = %{version}-%{release}
|
||||
Requires: libsmartcols = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
|
||||
%description -n libsmartcols-devel
|
||||
@ -168,8 +152,8 @@ part of util-linux.
|
||||
%package -n libmount
|
||||
Summary: Device mounting library
|
||||
License: LGPLv2+
|
||||
Requires: libblkid%{?_isa} = %{version}-%{release}
|
||||
Requires: libuuid%{?_isa} = %{version}-%{release}
|
||||
Requires: libblkid = %{version}-%{release}
|
||||
Requires: libuuid = %{version}-%{release}
|
||||
Conflicts: filesystem < 3
|
||||
|
||||
%description -n libmount
|
||||
@ -179,7 +163,7 @@ This is the device mounting library, part of util-linux.
|
||||
%package -n libmount-devel
|
||||
Summary: Device mounting library
|
||||
License: LGPLv2+
|
||||
Requires: libmount%{?_isa} = %{version}-%{release}
|
||||
Requires: libmount = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
|
||||
%description -n libmount-devel
|
||||
@ -190,8 +174,9 @@ part of util-linux.
|
||||
%package -n libblkid
|
||||
Summary: Block device ID library
|
||||
License: LGPLv2+
|
||||
Requires: libuuid%{?_isa} = %{version}-%{release}
|
||||
Requires: libuuid = %{version}-%{release}
|
||||
Conflicts: filesystem < 3
|
||||
Requires(post): coreutils
|
||||
|
||||
%description -n libblkid
|
||||
This is block device identification library, part of util-linux.
|
||||
@ -200,7 +185,7 @@ This is block device identification library, part of util-linux.
|
||||
%package -n libblkid-devel
|
||||
Summary: Block device ID library
|
||||
License: LGPLv2+
|
||||
Requires: libblkid%{?_isa} = %{version}-%{release}
|
||||
Requires: libblkid = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
|
||||
%description -n libblkid-devel
|
||||
@ -228,7 +213,7 @@ See also the "uuid" package, which is a separate implementation.
|
||||
%package -n libuuid-devel
|
||||
Summary: Universally unique ID library
|
||||
License: BSD
|
||||
Requires: libuuid%{?_isa} = %{version}-%{release}
|
||||
Requires: libuuid = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
|
||||
%description -n libuuid-devel
|
||||
@ -262,7 +247,7 @@ SMP systems.
|
||||
|
||||
%package -n %{pypkg}-libmount
|
||||
Summary: Python bindings for the libmount library
|
||||
Requires: libmount%{?_isa} = %{version}-%{release}
|
||||
Requires: libmount = %{version}-%{release}
|
||||
License: LGPLv2+
|
||||
|
||||
%description -n %{pypkg}-libmount
|
||||
@ -273,12 +258,12 @@ mountinfo, etc) and mount filesystems.
|
||||
|
||||
|
||||
%package -n util-linux-user
|
||||
Summary: util-linux utilities based on libuser
|
||||
Summary: libuser based util-linux utilities
|
||||
Requires: util-linux = %{version}-%{release}
|
||||
License: GPLv2
|
||||
|
||||
%description -n util-linux-user
|
||||
chfn and chsh utilities with dependence on libuser.
|
||||
chfn and chsh utilities with dependence on libuser
|
||||
|
||||
|
||||
%prep
|
||||
@ -287,10 +272,6 @@ chfn and chsh utilities with dependence on libuser.
|
||||
%build
|
||||
unset LINGUAS || :
|
||||
|
||||
# enable only when make a change to the build-system
|
||||
#./autogen.sh
|
||||
|
||||
|
||||
export CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS"
|
||||
export SUID_CFLAGS="-fpie"
|
||||
export SUID_LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
|
||||
@ -304,10 +285,8 @@ export DAEMON_LDFLAGS="$SUID_LDFLAGS"
|
||||
--enable-chfn-chsh \
|
||||
--enable-usrdir-path \
|
||||
--enable-write \
|
||||
--disable-raw \
|
||||
--enable-raw \
|
||||
--enable-hardlink \
|
||||
--enable-fdformat \
|
||||
--enable-asciidoc \
|
||||
--with-python=%{pyver} \
|
||||
--with-systemd \
|
||||
--with-udev \
|
||||
@ -321,7 +300,7 @@ export DAEMON_LDFLAGS="$SUID_LDFLAGS"
|
||||
%endif
|
||||
|
||||
# build util-linux
|
||||
%make_build
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%check
|
||||
#to run tests use "--with check"
|
||||
@ -331,17 +310,32 @@ make check
|
||||
|
||||
|
||||
%install
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,6,8,5}
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{pam.d,security/console.apps}
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_tmpfilesdir}/tmpfiles.d
|
||||
mkdir -p ${RPM_BUILD_ROOT}/var/log
|
||||
touch ${RPM_BUILD_ROOT}/var/log/lastlog
|
||||
chmod 0644 ${RPM_BUILD_ROOT}/var/log/lastlog
|
||||
|
||||
# install util-linux
|
||||
%make_install
|
||||
make install DESTDIR=${RPM_BUILD_ROOT}
|
||||
|
||||
# raw
|
||||
echo '.so man8/raw.8' > $RPM_BUILD_ROOT%{_mandir}/man8/rawdevices.8
|
||||
{
|
||||
# see RH bugzilla #216664
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/udev/rules.d
|
||||
pushd ${RPM_BUILD_ROOT}%{_prefix}/lib/udev/rules.d
|
||||
install -m 644 %{SOURCE4} ./60-raw.rules
|
||||
popd
|
||||
}
|
||||
|
||||
# sbin -> bin
|
||||
mv ${RPM_BUILD_ROOT}%{_sbindir}/raw ${RPM_BUILD_ROOT}%{_bindir}/raw
|
||||
|
||||
# And a dirs uuidd needs that the makefiles don't create
|
||||
install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_tmpfilesdir}/uuidd.conf
|
||||
install -d ${RPM_BUILD_ROOT}/run/uuidd
|
||||
install -d ${RPM_BUILD_ROOT}/var/lib/libuuid
|
||||
|
||||
@ -401,9 +395,9 @@ done
|
||||
%endif
|
||||
|
||||
# we install getopt-*.{bash,tcsh} by doc directive
|
||||
#chmod 644 misc-utils/getopt-*.{bash,tcsh}
|
||||
#rm -f ${RPM_BUILD_ROOT}%{_datadir}/doc/util-linux/getopt/*
|
||||
#rmdir ${RPM_BUILD_ROOT}%{_datadir}/doc/util-linux/getopt
|
||||
chmod 644 misc-utils/getopt-*.{bash,tcsh}
|
||||
rm -f ${RPM_BUILD_ROOT}%{_datadir}/doc/util-linux/getopt/*
|
||||
rmdir ${RPM_BUILD_ROOT}%{_datadir}/doc/util-linux/getopt
|
||||
|
||||
ln -sf ../proc/self/mounts %{buildroot}/etc/mtab
|
||||
|
||||
@ -428,6 +422,37 @@ find $RPM_BUILD_ROOT%{_mandir}/man8 -regextype posix-egrep \
|
||||
-regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|uname26)\.8.*" \
|
||||
-printf "%{_mandir}/man8/%f*\n" >> %{name}.files
|
||||
|
||||
%post
|
||||
# only for minimal buildroots without /var/log
|
||||
[ -d /var/log ] || mkdir -p /var/log
|
||||
touch /var/log/lastlog
|
||||
chown root:root /var/log/lastlog
|
||||
chmod 0644 /var/log/lastlog
|
||||
# Fix the file context, do not use restorecon
|
||||
if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
|
||||
SECXT=$( /usr/sbin/matchpathcon -n /var/log/lastlog 2> /dev/null )
|
||||
if [ -n "$SECXT" ]; then
|
||||
# Selinux enabled, but without policy? It's true for buildroots
|
||||
# without selinux stuff on host machine with enabled selinux.
|
||||
# We don't want to use any RPM dependence on selinux policy for
|
||||
# matchpathcon(2). SELinux policy should be optional.
|
||||
/usr/bin/chcon "$SECXT" /var/log/lastlog >/dev/null 2>&1 || :
|
||||
fi
|
||||
fi
|
||||
if [ ! -L /etc/mtab ]; then
|
||||
ln -sf ../proc/self/mounts /etc/mtab || :
|
||||
fi
|
||||
|
||||
%post -n libblkid
|
||||
### Move blkid cache to /run
|
||||
[ -d /run/blkid ] || mkdir -p /run/blkid
|
||||
for I in /etc/blkid.tab /etc/blkid.tab.old \
|
||||
/etc/blkid/blkid.tab /etc/blkid/blkid.tab.old; do
|
||||
|
||||
if [ -f "$I" ]; then
|
||||
mv "$I" /run/blkid/ || :
|
||||
fi
|
||||
done
|
||||
|
||||
%pre -n uuidd
|
||||
getent group uuidd >/dev/null || groupadd -r uuidd
|
||||
@ -440,17 +465,14 @@ exit 0
|
||||
# "systemctl preset" and it enable/disable service only.
|
||||
%post -n uuidd
|
||||
%systemd_post uuidd.service
|
||||
if [ $1 -eq 1 ] && [ -x /usr/bin/systemctl ]; then
|
||||
# install
|
||||
if [ $1 -eq 1 ]; then
|
||||
/bin/systemctl start uuidd.service > /dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%preun -n uuidd
|
||||
%systemd_preun uuidd.socket
|
||||
%systemd_preun uuidd.service
|
||||
|
||||
%postun -n uuidd
|
||||
%systemd_postun_with_restart uuidd.socket
|
||||
%systemd_postun_with_restart uuidd.service
|
||||
|
||||
%triggerpostun -- util-linux < 2.35.1-7
|
||||
@ -462,6 +484,7 @@ fi
|
||||
%files -f %{name}.files
|
||||
%doc README NEWS AUTHORS
|
||||
%doc Documentation/deprecated.txt
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license Documentation/licenses/*
|
||||
%doc misc-utils/getopt-*.{bash,tcsh}
|
||||
|
||||
@ -471,36 +494,51 @@ fi
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/su-l
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/runuser
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/runuser-l
|
||||
%config(noreplace) %{_prefix}/lib/udev/rules.d/60-raw.rules
|
||||
|
||||
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/adjtime
|
||||
|
||||
%attr(4755,root,root) %{_bindir}/mount
|
||||
%attr(4755,root,root) %{_bindir}/umount
|
||||
%attr(4755,root,root) %{_bindir}/su
|
||||
%attr(755,root,root) %{_bindir}/login
|
||||
%attr(2755,root,tty) %{_bindir}/write
|
||||
|
||||
%ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog
|
||||
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
|
||||
|
||||
%{_unitdir}/fstrim.*
|
||||
|
||||
%{_bindir}/cal
|
||||
%{_bindir}/chmem
|
||||
%{_bindir}/choom
|
||||
%{_bindir}/chrt
|
||||
%{_bindir}/col
|
||||
%{_bindir}/colcrt
|
||||
%{_bindir}/colrm
|
||||
%{_bindir}/column
|
||||
%{_bindir}/dmesg
|
||||
%{_bindir}/eject
|
||||
%{_bindir}/fallocate
|
||||
%{_bindir}/fincore
|
||||
%{_bindir}/fadvise
|
||||
%{_bindir}/findmnt
|
||||
%{_bindir}/flock
|
||||
%{_bindir}/getopt
|
||||
%{_bindir}/hardlink
|
||||
%{_bindir}/hexdump
|
||||
%{_bindir}/ionice
|
||||
%{_bindir}/ipcmk
|
||||
%{_bindir}/ipcrm
|
||||
%{_bindir}/ipcs
|
||||
%{_bindir}/irqtop
|
||||
%{_bindir}/isosize
|
||||
%{_bindir}/kill
|
||||
%{_bindir}/last
|
||||
%{_bindir}/lastb
|
||||
%{_bindir}/logger
|
||||
%{_bindir}/look
|
||||
%{_bindir}/lsblk
|
||||
%{_bindir}/lscpu
|
||||
%{_bindir}/lsfd
|
||||
%{_bindir}/lsipc
|
||||
%{_bindir}/lsirq
|
||||
%{_bindir}/lslocks
|
||||
@ -509,98 +547,125 @@ fi
|
||||
%{_bindir}/lsns
|
||||
%{_bindir}/mcookie
|
||||
%{_bindir}/mesg
|
||||
%{_bindir}/more
|
||||
%{_bindir}/mountpoint
|
||||
%{_bindir}/namei
|
||||
%{_bindir}/pipesz
|
||||
%{_bindir}/nsenter
|
||||
%{_bindir}/prlimit
|
||||
%{_bindir}/raw
|
||||
%{_bindir}/rename
|
||||
%{_bindir}/renice
|
||||
%{_bindir}/rev
|
||||
%{_bindir}/script
|
||||
%{_bindir}/scriptlive
|
||||
%{_bindir}/scriptreplay
|
||||
%{_bindir}/setarch
|
||||
%{_bindir}/setpriv
|
||||
%{_bindir}/setsid
|
||||
%{_bindir}/setterm
|
||||
%{_bindir}/uclampset
|
||||
%{_bindir}/taskset
|
||||
%{_bindir}/ul
|
||||
%{_bindir}/unshare
|
||||
%{_bindir}/utmpdump
|
||||
%{_bindir}/uuidgen
|
||||
%{_bindir}/uuidparse
|
||||
%{_bindir}/waitpid
|
||||
%{_bindir}/wall
|
||||
%{_bindir}/wdctl
|
||||
%{_bindir}/whereis
|
||||
%{_mandir}/man1/cal.1*
|
||||
%{_mandir}/man1/choom.1*
|
||||
%{_mandir}/man1/chrt.1*
|
||||
%{_mandir}/man1/col.1*
|
||||
%{_mandir}/man1/colcrt.1*
|
||||
%{_mandir}/man1/colrm.1*
|
||||
%{_mandir}/man1/column.1*
|
||||
%{_mandir}/man1/dmesg.1*
|
||||
%{_mandir}/man1/eject.1*
|
||||
%{_mandir}/man1/fadvise.1.*
|
||||
%{_mandir}/man1/fallocate.1*
|
||||
%{_mandir}/man1/fincore.1*
|
||||
%{_mandir}/man1/flock.1*
|
||||
%{_mandir}/man1/getopt.1*
|
||||
%{_mandir}/man1/hardlink.1*
|
||||
%{_mandir}/man1/hexdump.1*
|
||||
%{_mandir}/man1/ionice.1*
|
||||
%{_mandir}/man1/ipcmk.1*
|
||||
%{_mandir}/man1/ipcrm.1*
|
||||
%{_mandir}/man1/ipcs.1*
|
||||
%{_mandir}/man1/irqtop.1*
|
||||
%{_mandir}/man1/kill.1*
|
||||
%{_mandir}/man1/last.1*
|
||||
%{_mandir}/man1/lastb.1*
|
||||
%{_mandir}/man1/logger.1*
|
||||
%{_mandir}/man1/login.1*
|
||||
%{_mandir}/man1/look.1*
|
||||
%{_mandir}/man1/lscpu.1*
|
||||
%{_mandir}/man1/lsfd.1*
|
||||
%{_mandir}/man1/lsipc.1*
|
||||
%{_mandir}/man1/lsirq.1*
|
||||
%{_mandir}/man1/lslogins.1*
|
||||
%{_mandir}/man1/lsmem.1*
|
||||
%{_mandir}/man1/mcookie.1*
|
||||
%{_mandir}/man1/mesg.1*
|
||||
%{_mandir}/man1/more.1*
|
||||
%{_mandir}/man1/mountpoint.1*
|
||||
%{_mandir}/man1/namei.1*
|
||||
%{_mandir}/man1/pipesz.1.*
|
||||
%{_mandir}/man1/nsenter.1*
|
||||
%{_mandir}/man1/prlimit.1*
|
||||
%{_mandir}/man1/rename.1*
|
||||
%{_mandir}/man1/renice.1*
|
||||
%{_mandir}/man1/rev.1*
|
||||
%{_mandir}/man1/runuser.1*
|
||||
%{_mandir}/man1/script.1*
|
||||
%{_mandir}/man1/scriptlive.1*
|
||||
%{_mandir}/man1/scriptreplay.1*
|
||||
%{_mandir}/man1/setpriv.1*
|
||||
%{_mandir}/man1/setsid.1*
|
||||
%{_mandir}/man1/setterm.1*
|
||||
%{_mandir}/man1/su.1*
|
||||
%{_mandir}/man1/uclampset.1.*
|
||||
%{_mandir}/man1/taskset.1*
|
||||
%{_mandir}/man1/ul.1*
|
||||
%{_mandir}/man1/unshare.1*
|
||||
%{_mandir}/man1/utmpdump.1.gz
|
||||
%{_mandir}/man1/uuidgen.1*
|
||||
%{_mandir}/man1/uuidparse.1*
|
||||
%{_mandir}/man1/waitpid.1.*
|
||||
%{_mandir}/man1/wall.1*
|
||||
%{_mandir}/man1/whereis.1*
|
||||
%{_mandir}/man1/write.1*
|
||||
%{_mandir}/man5/fstab.5*
|
||||
%{_mandir}/man5/terminal-colors.d.5*
|
||||
%{_mandir}/man8/addpart.8*
|
||||
%{_mandir}/man8/agetty.8*
|
||||
%{_mandir}/man8/blkdiscard.8*
|
||||
%{_mandir}/man8/blkpr.8.*
|
||||
%{_mandir}/man8/blkid.8*
|
||||
%{_mandir}/man8/blkzone.8*
|
||||
%{_mandir}/man8/blockdev.8*
|
||||
%{_mandir}/man8/chcpu.8*
|
||||
%{_mandir}/man8/chmem.8*
|
||||
%{_mandir}/man8/ctrlaltdel.8*
|
||||
%{_mandir}/man8/delpart.8*
|
||||
%{_mandir}/man8/fdisk.8*
|
||||
%{_mandir}/man8/findfs.8*
|
||||
%{_mandir}/man8/findmnt.8*
|
||||
%{_mandir}/man8/fsck.8*
|
||||
%{_mandir}/man8/fsck.cramfs.8*
|
||||
%{_mandir}/man8/fsck.minix.8*
|
||||
%{_mandir}/man8/fsfreeze.8*
|
||||
%{_mandir}/man8/fstrim.8*
|
||||
%{_mandir}/man8/isosize.8*
|
||||
%{_mandir}/man8/ldattach.8*
|
||||
%{_mandir}/man8/losetup.8*
|
||||
%{_mandir}/man8/lsblk.8*
|
||||
%{_mandir}/man8/lslocks.8*
|
||||
%{_mandir}/man8/lsns.8*
|
||||
%{_mandir}/man8/mkfs.8*
|
||||
%{_mandir}/man8/mkfs.cramfs.8*
|
||||
%{_mandir}/man8/mkfs.minix.8*
|
||||
%{_mandir}/man8/mkswap.8*
|
||||
%{_mandir}/man8/mount.8*
|
||||
%{_mandir}/man8/nologin.8*
|
||||
%{_mandir}/man8/partx.8*
|
||||
%{_mandir}/man8/pivot_root.8*
|
||||
%{_mandir}/man8/raw.8*
|
||||
%{_mandir}/man8/rawdevices.8*
|
||||
%{_mandir}/man8/readprofile.8*
|
||||
%{_mandir}/man8/resizepart.8*
|
||||
%{_mandir}/man8/rfkill.8*
|
||||
@ -608,27 +673,37 @@ fi
|
||||
%{_mandir}/man8/setarch.8*
|
||||
%{_mandir}/man8/sulogin.8.gz
|
||||
%{_mandir}/man8/swaplabel.8*
|
||||
%{_mandir}/man8/swapoff.8*
|
||||
%{_mandir}/man8/swapon.8*
|
||||
%{_mandir}/man8/switch_root.8*
|
||||
%{_mandir}/man8/umount.8*
|
||||
%{_mandir}/man8/wdctl.8.gz
|
||||
%{_mandir}/man8/wipefs.8*
|
||||
%{_mandir}/man8/zramctl.8*
|
||||
%{_sbindir}/addpart
|
||||
%{_sbindir}/agetty
|
||||
%{_sbindir}/blkdiscard
|
||||
%{_sbindir}/blkpr
|
||||
%{_sbindir}/blkid
|
||||
%{_sbindir}/blkzone
|
||||
%{_sbindir}/blockdev
|
||||
%{_sbindir}/chcpu
|
||||
%{_sbindir}/ctrlaltdel
|
||||
%{_sbindir}/delpart
|
||||
%{_sbindir}/fdisk
|
||||
%{_sbindir}/findfs
|
||||
%{_sbindir}/fsck
|
||||
%{_sbindir}/fsck.cramfs
|
||||
%{_sbindir}/fsck.minix
|
||||
%{_sbindir}/fsfreeze
|
||||
%{_sbindir}/fstrim
|
||||
%{_sbindir}/ldattach
|
||||
%{_sbindir}/losetup
|
||||
%{_sbindir}/mkfs
|
||||
%{_sbindir}/mkfs.cramfs
|
||||
%{_sbindir}/mkfs.minix
|
||||
%{_sbindir}/mkswap
|
||||
%{_sbindir}/nologin
|
||||
%{_sbindir}/partx
|
||||
%{_sbindir}/pivot_root
|
||||
%{_sbindir}/readprofile
|
||||
%{_sbindir}/resizepart
|
||||
@ -637,38 +712,53 @@ fi
|
||||
%{_sbindir}/runuser
|
||||
%{_sbindir}/sulogin
|
||||
%{_sbindir}/swaplabel
|
||||
%{_sbindir}/swapoff
|
||||
%{_sbindir}/swapon
|
||||
%{_sbindir}/switch_root
|
||||
%{_sbindir}/wipefs
|
||||
%{_sbindir}/zramctl
|
||||
|
||||
%{compldir}/addpart
|
||||
%{compldir}/blkdiscard
|
||||
%{compldir}/blkid
|
||||
%{compldir}/blkzone
|
||||
%{compldir}/blockdev
|
||||
%{compldir}/cal
|
||||
%{compldir}/chcpu
|
||||
%{compldir}/chmem
|
||||
%{compldir}/chrt
|
||||
%{compldir}/col
|
||||
%{compldir}/colcrt
|
||||
%{compldir}/colrm
|
||||
%{compldir}/column
|
||||
%{compldir}/ctrlaltdel
|
||||
%{compldir}/delpart
|
||||
%{compldir}/dmesg
|
||||
%{compldir}/eject
|
||||
%{compldir}/fallocate
|
||||
%{compldir}/fdisk
|
||||
%{compldir}/fincore
|
||||
%{compldir}/findfs
|
||||
%{compldir}/findmnt
|
||||
%{compldir}/flock
|
||||
%{compldir}/fsck
|
||||
%{compldir}/fsck.cramfs
|
||||
%{compldir}/fsck.minix
|
||||
%{compldir}/fsfreeze
|
||||
%{compldir}/fstrim
|
||||
%{compldir}/getopt
|
||||
%{compldir}/hexdump
|
||||
%{compldir}/ionice
|
||||
%{compldir}/ipcmk
|
||||
%{compldir}/ipcrm
|
||||
%{compldir}/ipcs
|
||||
%{compldir}/irqtop
|
||||
%{compldir}/isosize
|
||||
%{compldir}/last
|
||||
%{compldir}/lastb
|
||||
%{compldir}/ldattach
|
||||
%{compldir}/logger
|
||||
%{compldir}/look
|
||||
%{compldir}/losetup
|
||||
%{compldir}/lsblk
|
||||
%{compldir}/lscpu
|
||||
%{compldir}/lsipc
|
||||
@ -682,12 +772,18 @@ fi
|
||||
%{compldir}/mkfs
|
||||
%{compldir}/mkfs.cramfs
|
||||
%{compldir}/mkfs.minix
|
||||
%{compldir}/mkswap
|
||||
%{compldir}/more
|
||||
%{compldir}/mountpoint
|
||||
%{compldir}/namei
|
||||
%{compldir}/pipesz
|
||||
%{compldir}/nsenter
|
||||
%{compldir}/partx
|
||||
%{compldir}/pivot_root
|
||||
%{compldir}/prlimit
|
||||
%{compldir}/raw
|
||||
%{compldir}/readprofile
|
||||
%{compldir}/rename
|
||||
%{compldir}/renice
|
||||
%{compldir}/resizepart
|
||||
%{compldir}/rev
|
||||
%{compldir}/rfkill
|
||||
@ -698,11 +794,15 @@ fi
|
||||
%{compldir}/scriptreplay
|
||||
%{compldir}/setarch
|
||||
%{compldir}/setpriv
|
||||
%{compldir}/setsid
|
||||
%{compldir}/setterm
|
||||
%{compldir}/su
|
||||
%{compldir}/swaplabel
|
||||
%{compldir}/uclampset
|
||||
%{compldir}/swapoff
|
||||
%{compldir}/swapon
|
||||
%{compldir}/taskset
|
||||
%{compldir}/ul
|
||||
%{compldir}/unshare
|
||||
%{compldir}/utmpdump
|
||||
%{compldir}/uuidgen
|
||||
%{compldir}/uuidparse
|
||||
@ -713,6 +813,7 @@ fi
|
||||
%{compldir}/write
|
||||
%{compldir}/zramctl
|
||||
|
||||
|
||||
%ifnarch s390 s390x
|
||||
%{_sbindir}/clock
|
||||
%{_sbindir}/fdformat
|
||||
@ -739,95 +840,6 @@ fi
|
||||
%endif
|
||||
|
||||
|
||||
%files -n util-linux-core
|
||||
%attr(4755,root,root) %{_bindir}/mount
|
||||
%attr(4755,root,root) %{_bindir}/umount
|
||||
%{_bindir}/chrt
|
||||
%{_bindir}/dmesg
|
||||
%{_bindir}/findmnt
|
||||
%{_bindir}/flock
|
||||
%{_bindir}/hardlink
|
||||
%{_bindir}/ionice
|
||||
%{_bindir}/ipcmk
|
||||
%{_bindir}/ipcrm
|
||||
%{_bindir}/ipcs
|
||||
%{_bindir}/kill
|
||||
%{_bindir}/logger
|
||||
%{_bindir}/more
|
||||
%{_bindir}/mountpoint
|
||||
%{_bindir}/nsenter
|
||||
%{_bindir}/renice
|
||||
%{_bindir}/setsid
|
||||
%{_bindir}/taskset
|
||||
%{_bindir}/unshare
|
||||
%{compldir}/blkid
|
||||
%{compldir}/blockdev
|
||||
%{compldir}/chrt
|
||||
%{compldir}/dmesg
|
||||
%{compldir}/findmnt
|
||||
%{compldir}/flock
|
||||
%{compldir}/hardlink
|
||||
%{compldir}/fsck
|
||||
%{compldir}/ionice
|
||||
%{compldir}/ipcmk
|
||||
%{compldir}/ipcrm
|
||||
%{compldir}/ipcs
|
||||
%{compldir}/logger
|
||||
%{compldir}/losetup
|
||||
%{compldir}/mkswap
|
||||
%{compldir}/more
|
||||
%{compldir}/mountpoint
|
||||
%{compldir}/nsenter
|
||||
%{compldir}/partx
|
||||
%{compldir}/renice
|
||||
%{compldir}/setsid
|
||||
%{compldir}/swapoff
|
||||
%{compldir}/swapon
|
||||
%{compldir}/taskset
|
||||
%{compldir}/unshare
|
||||
%{_mandir}/man1/chrt.1*
|
||||
%{_mandir}/man1/dmesg.1*
|
||||
%{_mandir}/man1/flock.1*
|
||||
%{_mandir}/man1/hardlink.1*
|
||||
%{_mandir}/man1/ionice.1*
|
||||
%{_mandir}/man1/ipcmk.1*
|
||||
%{_mandir}/man1/ipcrm.1*
|
||||
%{_mandir}/man1/ipcs.1*
|
||||
%{_mandir}/man1/kill.1*
|
||||
%{_mandir}/man1/logger.1*
|
||||
%{_mandir}/man1/more.1*
|
||||
%{_mandir}/man1/mountpoint.1*
|
||||
%{_mandir}/man1/nsenter.1*
|
||||
%{_mandir}/man1/renice.1*
|
||||
%{_mandir}/man1/setsid.1*
|
||||
%{_mandir}/man1/taskset.1*
|
||||
%{_mandir}/man1/unshare.1*
|
||||
%{_mandir}/man8/agetty.8*
|
||||
%{_mandir}/man8/blkid.8*
|
||||
%{_mandir}/man8/blockdev.8*
|
||||
%{_mandir}/man8/findmnt.8*
|
||||
%{_mandir}/man8/fsck.8*
|
||||
%{_mandir}/man8/losetup.8*
|
||||
%{_mandir}/man8/mkswap.8*
|
||||
%{_mandir}/man8/mount.8*
|
||||
%{_mandir}/man8/partx.8*
|
||||
%{_mandir}/man8/swapoff.8*
|
||||
%{_mandir}/man8/swapon.8*
|
||||
%{_mandir}/man8/switch_root.8*
|
||||
%{_mandir}/man8/umount.8*
|
||||
%{_sbindir}/agetty
|
||||
%{_sbindir}/blkid
|
||||
%{_sbindir}/blockdev
|
||||
%{_sbindir}/fsck
|
||||
%{_sbindir}/losetup
|
||||
%{_sbindir}/mkswap
|
||||
%{_sbindir}/partx
|
||||
%{_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
|
||||
@ -840,6 +852,7 @@ fi
|
||||
|
||||
|
||||
%files -n uuidd
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license Documentation/licenses/COPYING.GPL-2.0-or-later
|
||||
%{_mandir}/man8/uuidd.8*
|
||||
%{_sbindir}/uuidd
|
||||
@ -847,10 +860,10 @@ fi
|
||||
%dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
|
||||
%dir %attr(2775, uuidd, uuidd) /run/uuidd
|
||||
%{compldir}/uuidd
|
||||
%{_tmpfilesdir}/uuidd.conf
|
||||
|
||||
|
||||
%files -n libfdisk
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license Documentation/licenses/COPYING.LGPL-2.1-or-later libfdisk/COPYING
|
||||
%{_libdir}/libfdisk.so.*
|
||||
|
||||
@ -861,6 +874,7 @@ fi
|
||||
|
||||
|
||||
%files -n libsmartcols
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license Documentation/licenses/COPYING.LGPL-2.1-or-later libsmartcols/COPYING
|
||||
%{_libdir}/libsmartcols.so.*
|
||||
|
||||
@ -871,6 +885,7 @@ fi
|
||||
|
||||
|
||||
%files -n libmount
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license Documentation/licenses/COPYING.LGPL-2.1-or-later libmount/COPYING
|
||||
%{_libdir}/libmount.so.*
|
||||
|
||||
@ -893,6 +908,7 @@ fi
|
||||
|
||||
|
||||
%files -n libuuid
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license Documentation/licenses/COPYING.BSD-3-Clause libuuid/COPYING
|
||||
%{_libdir}/libuuid.so.*
|
||||
|
||||
@ -914,134 +930,17 @@ fi
|
||||
%{_libdir}/pkgconfig/uuid.pc
|
||||
|
||||
%files -n %{pypkg}-libmount
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license Documentation/licenses/COPYING.LGPL-2.1-or-later libmount/COPYING
|
||||
%{_libdir}/python*/site-packages/libmount/
|
||||
|
||||
%changelog
|
||||
* Wed Apr 19 2023 Karel Zak <kzak@redhat.com> - 2.39-0.5
|
||||
- upgrade to v2.39-rc3 (fixes XFS and rw/ro issues)
|
||||
* Thu Jan 7 2021 Karel Zak <kzak@redhat.com> - 2.36.1-1
|
||||
- add upstream patch to fix 'symfollow' mount issue
|
||||
- upgrade to upstream v2.36.1
|
||||
https://www.kernel.org/pub/linux/utils/util-linux/v2.36/v2.36.1-ReleaseNotes
|
||||
|
||||
* Wed Apr 5 2023 Karel Zak <kzak@redhat.com> - 2.39-0.4
|
||||
- fix #2180593 (superblock reconfiguration libmount issue)
|
||||
|
||||
* Tue Apr 4 2023 Karel Zak <kzak@redhat.com> - 2.39-0.3
|
||||
- fix spec file
|
||||
|
||||
* Tue Apr 4 2023 Karel Zak <kzak@redhat.com> - 2.39-0.2
|
||||
- upgrade to v2.39-rc2
|
||||
|
||||
* Mon Mar 20 2023 Karel Zak <kzak@redhat.com> - 2.39-0.1
|
||||
- upgrade to v2.39-rc1
|
||||
https://kernel.org/pub/linux/utils/util-linux/v2.39/v2.39-ReleaseNotes
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.38.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Dec 17 2022 Florian Weimer <fweimer@redhat.com> - 2.38.1-3
|
||||
- Backport upstream patch to fix C99 issue in kill
|
||||
|
||||
* Mon Aug 22 2022 Karel Zak <kzak@redhat.com> - 2.38.1-2
|
||||
- improve tmpfiles.d use in spec file
|
||||
|
||||
* Thu Aug 4 2022 Karel Zak <kzak@redhat.com> - 2.38.1-1
|
||||
- upgrade to v2.38.1
|
||||
https://kernel.org/pub/linux/utils/util-linux/v2.38/v2.38.1-ReleaseNotes
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.38-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.38-4
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Wed Apr 13 2022 Karel Zak <kzak@redhat.com> - 2.38-3
|
||||
- fix spec file changelog order
|
||||
|
||||
* Wed Mar 30 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.38-2
|
||||
- simplify creation of /etc/mtab symlink
|
||||
|
||||
* Wed Mar 30 2022 Karel Zak <kzak@redhat.com> - 2.38-1
|
||||
- upgrade to v2.38
|
||||
- don't (re)generate build-system
|
||||
- modernize spec file style (thanks to Zbigniew)
|
||||
|
||||
* Thu Mar 17 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.38-0.5
|
||||
- Drop very old upgrade scriptlet for libblkid
|
||||
|
||||
* Wed Mar 16 2022 Karel Zak <kzak@redhat.com> - 2.38-0.4
|
||||
- upgrade to v2.38-rc3
|
||||
https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.38/v2.38-ReleaseNotes
|
||||
|
||||
* Wed Feb 2 2022 Karel Zak <kzak@redhat.com> - 2.38-0.3
|
||||
- add /usr/lib/tmpfiles.d/uuidd.conf (based on #2047952)
|
||||
|
||||
* Wed Feb 2 2022 Karel Zak <kzak@redhat.com> - 2.38-0.2
|
||||
- release ownership of /var/log/lastlog
|
||||
|
||||
* Mon Jan 31 2022 Karel Zak <kzak@redhat.com> - 2.38-0.1
|
||||
- upgrade to v2.38-rc1
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.37.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Tue Aug 17 2021 Karel Zak <kzak@redhat.com> - 2.37.2-1
|
||||
* upgrade to v2.37.2
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.37-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Wed Jul 14 2021 Karel Zak <kzak@redhat.com> - 2.37-5
|
||||
- remove unused util-linux-60-raw.rules
|
||||
|
||||
* Wed Jul 14 2021 Karel Zak <kzak@redhat.com> - 2.37-4
|
||||
- disable raw(8) - no more supported since Linux v5.14 (commit 03e4922f1c81fc2ed3a87b4f91a8d3aafc7e093)
|
||||
- remove dependence on deprecated pcre2posix.h
|
||||
- fix #1981729 - close_range() 3rd argument
|
||||
|
||||
* Wed Jun 16 2021 Richard W.M. Jones <rjones@redhat.com> - 2.37-3
|
||||
- Rebuild for updated pcre2
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.37-2
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* Tue Jun 1 2021 Karel Zak <kzak@redhat.com> - 2.37-1
|
||||
- upgrade to v2.37
|
||||
- introduce util-linux-core subpackage
|
||||
|
||||
* Fri May 14 2021 Karel Zak <kzak@redhat.com> - 2.37-0.1
|
||||
- upgrade to v2.37-rc2
|
||||
https://kernel.org/pub/linux/utils/util-linux/v2.37/v2.37-ReleaseNotes
|
||||
|
||||
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.36.2-3
|
||||
- Rebuilt for updated systemd-rpm-macros
|
||||
See https://pagure.io/fesco/issue/2583.
|
||||
|
||||
* Tue Mar 2 2021 Karel Zak <kzak@redhat.com> - 2.36.2-2
|
||||
- spec file cleanup https://src.fedoraproject.org/rpms/util-linux/pull-request/9
|
||||
|
||||
* Fri Feb 12 2021 Karel Zak <kzak@redhat.com> - 2.36.2-1
|
||||
- upgrade to stable upstream 2.36.2
|
||||
https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.36/v2.36.2-ReleaseNotes
|
||||
|
||||
* Wed Jan 27 2021 Kelvin Fan <kfan@redhat.com> - 2.36.1-4
|
||||
- Add patch to add /run/motd.d to default MOTD_FILE in login(1)
|
||||
|
||||
* Thu Jan 14 2021 Karel Zak <kzak@redhat.com> - 2.36.1-3
|
||||
- improve uuidd scriptlets (fix #1767553)
|
||||
|
||||
* Thu Nov 19 2020 Karel Zak <kzak@redhat.com> - 2.36.1-2
|
||||
- remove unused patches
|
||||
- remove versions and seq.numbers from patch names
|
||||
- fix mount "symfollow" issue (upstream patch)
|
||||
|
||||
* Mon Nov 16 2020 Karel Zak <kzak@redhat.com> - 2.36.1-1
|
||||
- upgrade to stable upstream 2.36.1
|
||||
|
||||
* Thu Nov 12 2020 Tom Stellard <tstellar@redhat.com> - 2.36-4
|
||||
- Use make macros
|
||||
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
|
||||
|
||||
* Tue Sep 01 2020 Karel Zak <kzak@redhat.com> - 2.36-3
|
||||
- remove mountinfo workaround (unnecessary for kernel 5.8)
|
||||
* Thu Aug 27 2020 Karel Zak <kzak@redhat.com> - 2.36-3
|
||||
- fix #1860461 - sfdisk regression creating simple 3 partition MBR disk
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.36-2
|
||||
|
@ -1 +0,0 @@
|
||||
d /run/uuidd 2775 uuidd uuidd
|
Loading…
Reference in New Issue
Block a user