Compare commits
10 Commits
65aae489bc
...
0e7fd4ce9b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0e7fd4ce9b | ||
|
|
0272330a26 | ||
|
|
49ae744d6d | ||
|
|
23612617b3 | ||
|
|
8c3da2608a | ||
|
|
e5ed90d5c7 | ||
|
|
a6674deaaf | ||
|
|
2660c6194c | ||
|
|
b5809194b0 | ||
|
|
6035d8dba6 |
59
backport-hexdump-check-blocksize-when-display-data.patch
Normal file
59
backport-hexdump-check-blocksize-when-display-data.patch
Normal file
@ -0,0 +1,59 @@
|
||||
From dfa1ad272528a92384adac523cf2f2949b767d8d Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Tue, 27 Feb 2024 18:38:02 +0100
|
||||
Subject: [PATCH] hexdump: check blocksize when display data
|
||||
|
||||
hexdump(1) stores input to buffer and apply format unit when prints
|
||||
the output. The unit can move pointer which points to the buffer, but
|
||||
code does not check for limits.
|
||||
|
||||
Fixes: https://github.com/util-linux/util-linux/issues/2806
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
---
|
||||
text-utils/hexdump-display.c | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/text-utils/hexdump-display.c b/text-utils/hexdump-display.c
|
||||
index bc92bd0ca..c865127c8 100644
|
||||
--- a/text-utils/hexdump-display.c
|
||||
+++ b/text-utils/hexdump-display.c
|
||||
@@ -250,6 +250,8 @@ void display(struct hexdump *hex)
|
||||
struct list_head *p, *q, *r;
|
||||
|
||||
while ((bp = get(hex)) != NULL) {
|
||||
+ ssize_t rem = hex->blocksize;
|
||||
+
|
||||
fs = &hex->fshead; savebp = bp; saveaddress = address;
|
||||
|
||||
list_for_each(p, fs) {
|
||||
@@ -263,7 +265,7 @@ void display(struct hexdump *hex)
|
||||
|
||||
cnt = fu->reps;
|
||||
|
||||
- while (cnt) {
|
||||
+ while (cnt && rem >= 0) {
|
||||
list_for_each(r, &fu->prlist) {
|
||||
pr = list_entry(r, struct hexdump_pr, prlist);
|
||||
|
||||
@@ -280,12 +282,18 @@ void display(struct hexdump *hex)
|
||||
print(pr, bp);
|
||||
|
||||
address += pr->bcnt;
|
||||
+
|
||||
+ rem -= pr->bcnt;
|
||||
+ if (rem < 0)
|
||||
+ break;
|
||||
+
|
||||
bp += pr->bcnt;
|
||||
}
|
||||
--cnt;
|
||||
}
|
||||
}
|
||||
bp = savebp;
|
||||
+ rem = hex->blocksize;
|
||||
address = saveaddress;
|
||||
}
|
||||
}
|
||||
--
|
||||
2.33.0
|
||||
|
||||
28
backport-last-avoid-out-of-bounds-array-access.patch
Normal file
28
backport-last-avoid-out-of-bounds-array-access.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From 75822efb8e948b538d9e9ccc329a5430fdabb7ea Mon Sep 17 00:00:00 2001
|
||||
From: biubiuzy <294772273@qq.com>
|
||||
Date: Fri, 23 Feb 2024 17:44:12 +0800
|
||||
Subject: [PATCH] last: avoid out of bounds array access
|
||||
|
||||
---
|
||||
login-utils/last.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/login-utils/last.c b/login-utils/last.c
|
||||
index bbbe817f8..f5a9fec08 100644
|
||||
--- a/login-utils/last.c
|
||||
+++ b/login-utils/last.c
|
||||
@@ -351,7 +351,10 @@ static int time_formatter(int fmt, char *dst, size_t dlen, time_t *when)
|
||||
{
|
||||
char buf[CTIME_BUFSIZ];
|
||||
|
||||
- ctime_r(when, buf);
|
||||
+ if (!ctime_r(when, buf)) {
|
||||
+ ret = -1;
|
||||
+ break;
|
||||
+ }
|
||||
snprintf(dst, dlen, "%s", buf);
|
||||
ret = rtrim_whitespace((unsigned char *) dst);
|
||||
break;
|
||||
--
|
||||
2.33.0
|
||||
|
||||
28
backport-lscpu-don-t-use-NULL-sharedmap.patch
Normal file
28
backport-lscpu-don-t-use-NULL-sharedmap.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From 9ce09ccc3c8eee9be4fb5f33ae382d92c69dc411 Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Wed, 20 Mar 2024 14:42:28 +0100
|
||||
Subject: [PATCH] lscpu: don't use NULL sharedmap
|
||||
|
||||
Fixes: https://github.com/util-linux/util-linux/issues/2846
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
---
|
||||
sys-utils/lscpu-topology.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sys-utils/lscpu-topology.c b/sys-utils/lscpu-topology.c
|
||||
index 7ee18e785..e3742e319 100644
|
||||
--- a/sys-utils/lscpu-topology.c
|
||||
+++ b/sys-utils/lscpu-topology.c
|
||||
@@ -253,7 +253,8 @@ struct lscpu_cache *lscpu_cpu_get_cache(struct lscpu_cxt *cxt,
|
||||
for (i = 0; i < cxt->ncaches; i++) {
|
||||
struct lscpu_cache *ca = &cxt->caches[i];
|
||||
|
||||
- if (strcmp(ca->name, name) == 0 &&
|
||||
+ if (ca->sharedmap &&
|
||||
+ strcmp(ca->name, name) == 0 &&
|
||||
CPU_ISSET_S(cpu->logical_id, cxt->setsize, ca->sharedmap))
|
||||
return ca;
|
||||
}
|
||||
--
|
||||
2.33.0
|
||||
|
||||
63
backport-lscpu-use-topology-maps-in-more-robust-way.patch
Normal file
63
backport-lscpu-use-topology-maps-in-more-robust-way.patch
Normal file
@ -0,0 +1,63 @@
|
||||
From 01cb80bae8e79b21067b4a85eb4f82b14104130c Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Mon, 19 Sep 2022 13:30:14 +0200
|
||||
Subject: [PATCH] lscpu: use topology maps in more robust way
|
||||
|
||||
Addresses: https://github.com/util-linux/util-linux/issues/1810
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
---
|
||||
sys-utils/lscpu-topology.c | 16 +++++++++-------
|
||||
1 file changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/sys-utils/lscpu-topology.c b/sys-utils/lscpu-topology.c
|
||||
index fe4da7cd5..754b3fcb4 100644
|
||||
--- a/sys-utils/lscpu-topology.c
|
||||
+++ b/sys-utils/lscpu-topology.c
|
||||
@@ -106,7 +106,7 @@ static int cputype_read_topology(struct lscpu_cxt *cxt, struct lscpu_cputype *ct
|
||||
struct lscpu_cpu *cpu = cxt->cpus[i];
|
||||
cpu_set_t *thread_siblings = NULL, *core_siblings = NULL;
|
||||
cpu_set_t *book_siblings = NULL, *drawer_siblings = NULL;
|
||||
- int num, n;
|
||||
+ int num, n = 0;
|
||||
|
||||
if (!cpu || cpu->type != ct)
|
||||
continue;
|
||||
@@ -126,7 +126,8 @@ static int cputype_read_topology(struct lscpu_cxt *cxt, struct lscpu_cputype *ct
|
||||
ul_path_readf_cpuset(sys, &drawer_siblings, cxt->maxcpus,
|
||||
"cpu%d/topology/drawer_siblings", num);
|
||||
|
||||
- n = CPU_COUNT_S(cxt->setsize, thread_siblings);
|
||||
+ if (thread_siblings)
|
||||
+ n = CPU_COUNT_S(cxt->setsize, thread_siblings);
|
||||
if (!n)
|
||||
n = 1;
|
||||
if (n > nthreads)
|
||||
@@ -140,9 +141,9 @@ static int cputype_read_topology(struct lscpu_cxt *cxt, struct lscpu_cputype *ct
|
||||
* E.g. completely virtualized architectures like s390 may
|
||||
* have multiple sockets of different sizes.
|
||||
*/
|
||||
- if (!ct->coremaps)
|
||||
+ if (!ct->coremaps && thread_siblings)
|
||||
ct->coremaps = xcalloc(npos, sizeof(cpu_set_t *));
|
||||
- if (!ct->socketmaps)
|
||||
+ if (!ct->socketmaps && core_siblings)
|
||||
ct->socketmaps = xcalloc(npos, sizeof(cpu_set_t *));
|
||||
if (!ct->bookmaps && book_siblings)
|
||||
ct->bookmaps = xcalloc(npos, sizeof(cpu_set_t *));
|
||||
@@ -150,9 +151,10 @@ static int cputype_read_topology(struct lscpu_cxt *cxt, struct lscpu_cputype *ct
|
||||
ct->drawermaps = xcalloc(npos, sizeof(cpu_set_t *));
|
||||
|
||||
/* add to topology maps */
|
||||
- add_cpuset_to_array(ct->coremaps, &ct->ncores, thread_siblings, cxt->setsize);
|
||||
- add_cpuset_to_array(ct->socketmaps, &ct->nsockets, core_siblings, cxt->setsize);
|
||||
-
|
||||
+ if (thread_siblings)
|
||||
+ add_cpuset_to_array(ct->coremaps, &ct->ncores, thread_siblings, cxt->setsize);
|
||||
+ if (core_siblings)
|
||||
+ add_cpuset_to_array(ct->socketmaps, &ct->nsockets, core_siblings, cxt->setsize);
|
||||
if (book_siblings)
|
||||
add_cpuset_to_array(ct->bookmaps, &ct->nbooks, book_siblings, cxt->setsize);
|
||||
if (drawer_siblings)
|
||||
--
|
||||
2.33.0
|
||||
|
||||
64
backport-lsipc-fix-semaphore-USED-counter.patch
Normal file
64
backport-lsipc-fix-semaphore-USED-counter.patch
Normal file
@ -0,0 +1,64 @@
|
||||
From fa45a6e516065f489b1cfb924ec3fc06960e0839 Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Tue, 26 Mar 2024 12:45:24 +0100
|
||||
Subject: [PATCH] lsipc: fix semaphore USED counter
|
||||
|
||||
The code incorrectly counts only with the first item in the linked
|
||||
list (due to a typo). It seems rather fragile to use "semds" and
|
||||
"semdsp" as variable names in the same code ...
|
||||
|
||||
# lsipc -gs
|
||||
|
||||
Old:
|
||||
|
||||
KEY ID PERMS OWNER NSEMS RESOURCE DESCRIPTION LIMIT USED USE%
|
||||
SEMMNI Number of semaphore identifiers 32000 3 0.01%
|
||||
SEMMNS Total number of semaphores 1024000000 369 0.00%
|
||||
SEMMSL Max semaphores per semaphore set. 32000 - -
|
||||
SEMOPM Max number of operations per semop(2) 500 - -
|
||||
SEMVMX Semaphore max value 32767 - -
|
||||
|
||||
Fixed:
|
||||
|
||||
KEY ID PERMS OWNER NSEMS RESOURCE DESCRIPTION LIMIT USED USE%
|
||||
SEMMNI Number of semaphore identifiers 32000 3 0.01%
|
||||
SEMMNS Total number of semaphores 1024000000 156 0.00%
|
||||
SEMMSL Max semaphores per semaphore set. 32000 - -
|
||||
SEMOPM Max number of operations per semop(2) 500 - -
|
||||
SEMVMX Semaphore max value 32767 - -
|
||||
|
||||
Addresses: https://issues.redhat.com/browse/RHEL-30269
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
---
|
||||
sys-utils/lsipc.c | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/sys-utils/lsipc.c b/sys-utils/lsipc.c
|
||||
index 2c5561112..515788c13 100644
|
||||
--- a/sys-utils/lsipc.c
|
||||
+++ b/sys-utils/lsipc.c
|
||||
@@ -717,16 +717,18 @@ static void do_sem(int id, struct lsipc_control *ctl, struct libscols_table *tb)
|
||||
|
||||
static void do_sem_global(struct lsipc_control *ctl, struct libscols_table *tb)
|
||||
{
|
||||
- struct sem_data *semds, *semdsp;
|
||||
+ struct sem_data *semds;
|
||||
struct ipc_limits lim;
|
||||
int nsems = 0, nsets = 0;
|
||||
|
||||
ipc_sem_get_limits(&lim);
|
||||
|
||||
if (ipc_sem_get_info(-1, &semds) > 0) {
|
||||
- for (semdsp = semds; semdsp->next != NULL; semdsp = semdsp->next) {
|
||||
+ struct sem_data *p;
|
||||
+
|
||||
+ for (p = semds; p->next != NULL; p = p->next) {
|
||||
++nsets;
|
||||
- nsems += semds->sem_nsems;
|
||||
+ nsems += p->sem_nsems;
|
||||
}
|
||||
ipc_sem_free_info(semds);
|
||||
}
|
||||
--
|
||||
2.33.0
|
||||
|
||||
67
backport-lslocks-fix-buffer-overflow.patch
Normal file
67
backport-lslocks-fix-buffer-overflow.patch
Normal file
@ -0,0 +1,67 @@
|
||||
From c7e20a87573202ed5288447b557cb7cff1b40a17 Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Thu, 29 Feb 2024 20:43:35 +0100
|
||||
Subject: [PATCH] lslocks: fix buffer overflow
|
||||
|
||||
* don't use memset() to init variables
|
||||
* use xreaddir() to reduce code
|
||||
* use ssize_t for readlinkat() return value to avoid buffer overflow
|
||||
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
(cherry picked from commit f030775ffeaa8627c88434f7d0cba1a454aa0ffa)
|
||||
---
|
||||
misc-utils/lslocks.c | 16 +++++++---------
|
||||
1 file changed, 7 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
|
||||
index b14d419..06c707a 100644
|
||||
--- a/misc-utils/lslocks.c
|
||||
+++ b/misc-utils/lslocks.c
|
||||
@@ -45,6 +45,7 @@
|
||||
#include "closestream.h"
|
||||
#include "optutils.h"
|
||||
#include "procutils.h"
|
||||
+#include "fileutils.h"
|
||||
|
||||
/* column IDs */
|
||||
enum {
|
||||
@@ -164,13 +165,12 @@ static char *get_filename_sz(ino_t inode, pid_t lock_pid, size_t *size)
|
||||
struct stat sb;
|
||||
struct dirent *dp;
|
||||
DIR *dirp;
|
||||
- size_t len;
|
||||
+ size_t sz;
|
||||
int fd;
|
||||
- char path[PATH_MAX], sym[PATH_MAX], *ret = NULL;
|
||||
+ char path[PATH_MAX] = { 0 },
|
||||
+ sym[PATH_MAX] = { 0 }, *ret = NULL;
|
||||
|
||||
*size = 0;
|
||||
- memset(path, 0, sizeof(path));
|
||||
- memset(sym, 0, sizeof(sym));
|
||||
|
||||
/*
|
||||
* We know the pid so we don't have to
|
||||
@@ -181,16 +181,14 @@ static char *get_filename_sz(ino_t inode, pid_t lock_pid, size_t *size)
|
||||
if (!(dirp = opendir(path)))
|
||||
return NULL;
|
||||
|
||||
- if ((len = strlen(path)) >= (sizeof(path) - 2))
|
||||
+ if ((sz = strlen(path)) >= (sizeof(path) - 2))
|
||||
goto out;
|
||||
|
||||
if ((fd = dirfd(dirp)) < 0 )
|
||||
goto out;
|
||||
|
||||
- while ((dp = readdir(dirp))) {
|
||||
- if (!strcmp(dp->d_name, ".") ||
|
||||
- !strcmp(dp->d_name, ".."))
|
||||
- continue;
|
||||
+ while ((dp = xreaddir(dirp))) {
|
||||
+ ssize_t len;
|
||||
|
||||
errno = 0;
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
||||
70
backport-uuidd-fix-open-lock-state-issue.patch
Normal file
70
backport-uuidd-fix-open-lock-state-issue.patch
Normal file
@ -0,0 +1,70 @@
|
||||
From b7bb8d16eabaf51207ec1f2f9435c45a38bb8e7a Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Mon, 25 Mar 2024 13:50:08 +0800
|
||||
Subject: [PATCH] uuidd: fix open/lock state issue
|
||||
|
||||
* warn on open/lock state issue
|
||||
|
||||
* enable access to /var/lib/libuuid/, because ProtectSystem=strict make it read-only
|
||||
|
||||
openat(AT_FDCWD, "/var/lib/libuuid/clock.txt",
|
||||
O_RDWR|O_CREAT|O_CLOEXEC, 0660) = -1 EROFS (Read-only file system)
|
||||
|
||||
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2040366
|
||||
Upstream: http://github.com/util-linux/util-linux/commit/f27876f9c1056bf41fd940d5c4990b4277e0024f
|
||||
Upstream: http://github.com/util-linux/util-linux/commit/417982d0236a12756923d88e627f5e4facf8951c
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
---
|
||||
misc-utils/uuidd.c | 9 ++++++---
|
||||
misc-utils/uuidd.service.in | 1 +
|
||||
2 files changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
|
||||
index fa8db17..78a37d2 100644
|
||||
--- a/misc-utils/uuidd.c
|
||||
+++ b/misc-utils/uuidd.c
|
||||
@@ -494,7 +494,8 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
|
||||
break;
|
||||
case UUIDD_OP_TIME_UUID:
|
||||
num = 1;
|
||||
- __uuid_generate_time(uu, &num);
|
||||
+ if (__uuid_generate_time(uu, &num) < 0 && !uuidd_cxt->quiet)
|
||||
+ warnx(_("failed to open/lock clock counter"));
|
||||
if (uuidd_cxt->debug) {
|
||||
uuid_unparse(uu, str);
|
||||
fprintf(stderr, _("Generated time UUID: %s\n"), str);
|
||||
@@ -504,7 +505,8 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
|
||||
break;
|
||||
case UUIDD_OP_RANDOM_UUID:
|
||||
num = 1;
|
||||
- __uuid_generate_random(uu, &num);
|
||||
+ if (__uuid_generate_time(uu, &num) < 0 && !uuidd_cxt->quiet)
|
||||
+ warnx(_("failed to open/lock clock counter"));
|
||||
if (uuidd_cxt->debug) {
|
||||
uuid_unparse(uu, str);
|
||||
fprintf(stderr, _("Generated random UUID: %s\n"), str);
|
||||
@@ -513,7 +515,8 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
|
||||
reply_len = sizeof(uu);
|
||||
break;
|
||||
case UUIDD_OP_BULK_TIME_UUID:
|
||||
- __uuid_generate_time(uu, &num);
|
||||
+ if (__uuid_generate_time(uu, &num) < 0 && !uuidd_cxt->quiet)
|
||||
+ warnx(_("failed to open/lock clock counter"));
|
||||
if (uuidd_cxt->debug) {
|
||||
uuid_unparse(uu, str);
|
||||
fprintf(stderr, P_("Generated time UUID %s "
|
||||
diff --git a/misc-utils/uuidd.service.in b/misc-utils/uuidd.service.in
|
||||
index b4c9c46..e64ca59 100644
|
||||
--- a/misc-utils/uuidd.service.in
|
||||
+++ b/misc-utils/uuidd.service.in
|
||||
@@ -18,6 +18,7 @@ ProtectKernelModules=yes
|
||||
ProtectControlGroups=yes
|
||||
RestrictAddressFamilies=AF_UNIX
|
||||
MemoryDenyWriteExecute=yes
|
||||
+ReadWritePaths=/var/lib/libuuid/
|
||||
SystemCallFilter=@default @file-system @basic-io @system-service @signal @io-event @network-io
|
||||
|
||||
[Install]
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
Name: util-linux
|
||||
Version: 2.37.2
|
||||
Release: 28
|
||||
Release: 33
|
||||
Summary: A random collection of Linux utilities
|
||||
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
||||
URL: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
|
||||
@ -144,12 +144,19 @@ Patch6122: backport-sys-utils-lscpu-Unblock-SIGSEGV-before-vmware_bdoor.pat
|
||||
Patch6123: backport-libblkid-Check-offset-in-LUKS2-header.patch
|
||||
Patch6124: backport-more-fix-poll-use.patch
|
||||
Patch6125: backport-CVE-2024-28085.patch
|
||||
Patch6126: backport-lscpu-don-t-use-NULL-sharedmap.patch
|
||||
Patch6127: backport-lscpu-use-topology-maps-in-more-robust-way.patch
|
||||
Patch6128: backport-hexdump-check-blocksize-when-display-data.patch
|
||||
Patch6129: backport-lslocks-fix-buffer-overflow.patch
|
||||
Patch6130: backport-last-avoid-out-of-bounds-array-access.patch
|
||||
Patch6131: backport-lsipc-fix-semaphore-USED-counter.patch
|
||||
|
||||
Patch9000: Add-check-to-resolve-uname26-version-test-failed.patch
|
||||
Patch9001: SKIPPED-no-root-permissions-test.patch
|
||||
%ifarch sw_64
|
||||
Patch9002: util-linux-Add-sw64-architecture.patch
|
||||
%endif
|
||||
Patch9003: backport-uuidd-fix-open-lock-state-issue.patch
|
||||
|
||||
BuildRequires: audit-libs-devel >= 1.0.6 gettext-devel libselinux-devel ncurses-devel pam-devel zlib-devel popt-devel
|
||||
BuildRequires: libutempter-devel systemd-devel systemd libuser-devel libcap-ng-devel python3-devel gcc autoconf automake
|
||||
@ -166,6 +173,7 @@ Provides: eject = 2.1.6 rfkill = 0.5
|
||||
Provides: util-linux-ng = %{version}-%{release} hardlink = 1:1.3-9
|
||||
Provides: /bin/dmesg /bin/kill /bin/more /bin/mount /bin/umount /sbin/blkid
|
||||
Provides: /sbin/blockdev /sbin/findfs /sbin/fsck /sbin/nologin
|
||||
Provides: /bin/last /bin/lastb /bin/mesg /bin/wall
|
||||
Obsoletes: eject <= 2.1.5 rfkill <= 0.5 util-linux-ng < 2.19 hardlink <= 1:1.3-9
|
||||
|
||||
%description
|
||||
@ -276,7 +284,6 @@ This package contains some doc and man help files for %{name}.
|
||||
autoreconf
|
||||
|
||||
unset LINGUAS || :
|
||||
# del support enable-raw https://github.com/torvalds/linux/commit/603e4922f1c81fc2ed3a87b4f91a8d3aafc7e093
|
||||
%configure \
|
||||
--with-systemdsystemunitdir=%{_unitdir} \
|
||||
--disable-silent-rules \
|
||||
@ -285,7 +292,7 @@ unset LINGUAS || :
|
||||
--enable-chfn-chsh \
|
||||
--enable-usrdir-path \
|
||||
--enable-write \
|
||||
--disable-raw \
|
||||
--enable-raw \
|
||||
--enable-hardlink \
|
||||
--with-python=3 \
|
||||
--with-systemd \
|
||||
@ -307,6 +314,7 @@ make check
|
||||
install -d %{buildroot}%{_sysconfdir}/pam.d
|
||||
install -d %{buildroot}{/run/uuidd,/var/lib/libuuid,/var/log}
|
||||
|
||||
mv %{buildroot}%{_sbindir}/raw %{buildroot}%{_bindir}/raw
|
||||
install -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/login
|
||||
install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/remote
|
||||
install -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/chsh
|
||||
@ -324,6 +332,7 @@ ln -sf ../proc/self/mounts %{buildroot}/etc/mtab
|
||||
touch %{buildroot}/var/log/lastlog
|
||||
chmod 0644 %{buildroot}/var/log/lastlog
|
||||
|
||||
echo ".so man8/raw.8" > %{buildroot}%{_mandir}/man8/rawdevices.8
|
||||
echo ".so man8/hwclock.8" > %{buildroot}%{_mandir}/man8/clock.8
|
||||
|
||||
%find_lang %name
|
||||
@ -426,8 +435,11 @@ fi
|
||||
%{_unitdir}/fstrim.*
|
||||
%{_bindir}/{cal,chrt,col,colcrt,colrm,column,chmem,dmesg,eject,fallocate,fincore,findmnt,choom,uclampset}
|
||||
%{_bindir}/{flock,getopt,hexdump,ionice,ipcmk,ipcrm,ipcs,isosize,kill,last,lastb,logger,hardlink}
|
||||
%ifarch ppc64le
|
||||
%{_bindir}/{ppc,ppc32,ppc64}
|
||||
%endif
|
||||
%{_bindir}/{look,lsblk,lscpu,lsipc,lslocks,lslogins,lsmem,lsns,mcookie,mesg,more,mountpoint}
|
||||
%{_bindir}/{namei,nsenter,prlimit,rename,renice,rev,script,scriptreplay,setarch,setpriv}
|
||||
%{_bindir}/{namei,nsenter,prlimit,raw,rename,renice,rev,script,scriptreplay,setarch,setpriv}
|
||||
%{_bindir}/{setsid,setterm,taskset,ul,unshare,utmpdump,uuidgen,uuidparse,wdctl,whereis,scriptlive,irqtop,lsirq}
|
||||
%{_sbindir}/{addpart,agetty,blkdiscard,blkid,blkzone,blockdev,chcpu,ctrlaltdel,delpart,fdisk}
|
||||
%{_sbindir}/{findfs,fsck,fsck.cramfs,fsck.minix,fsfreeze,fstrim,ldattach,losetup,mkfs,mkfs.cramfs}
|
||||
@ -440,7 +452,7 @@ fi
|
||||
%{compldir}/{fstrim,getopt,hexdump,ionice,ipcmk,ipcrm,ipcs,isosize,last,ldattach}
|
||||
%{compldir}/{logger,look,losetup,lsblk,lscpu,lsipc,lslocks,lslogins,lsmem,lsns}
|
||||
%{compldir}/{mcookie,mesg,mkfs,mkfs.cramfs,mkfs.minix,mkswap,more,mountpoint}
|
||||
%{compldir}/{namei,nsenter,partx,pivot_root,prlimit,readprofile,rename,renice}
|
||||
%{compldir}/{namei,nsenter,partx,pivot_root,prlimit,raw,readprofile,rename,renice}
|
||||
%{compldir}/{resizepart,rev,rfkill,rtcwake,runuser,script,scriptreplay,setarch}
|
||||
%{compldir}/{setpriv,setsid,setterm,su,swaplabel,swapoff,swapon,taskset,ul,unshare}
|
||||
%{compldir}/{utmpdump,uuidgen,uuidparse,wall,wdctl,whereis,wipefs,write,zramctl}
|
||||
@ -510,11 +522,51 @@ fi
|
||||
%{_mandir}/man8/{blkdiscard.8*,blkid.8*,blkzone.8*,blockdev.8*,chcpu.8*,chmem.8*,ctrlaltdel.8*,delpart.8*}
|
||||
%{_mandir}/man8/{fdisk.8*,findfs.8*,findmnt.8*,fsck.8*,fsck.cramfs.8*,fsck.minix.8*,fsfreeze.8*,fstrim.8*}
|
||||
%{_mandir}/man8/{isosize.8*,ldattach.8*,losetup.8*,lsblk.8*,lslocks.8*,lsns.8*,mkfs.8*,mkfs.cramfs.8*}
|
||||
%{_mandir}/man8/{mkfs.minix.8*,mkswap.8*,mount.8*,nologin.8*,partx.8*,pivot_root.8*}
|
||||
%{_mandir}/man8/{mkfs.minix.8*,mkswap.8*,mount.8*,nologin.8*,partx.8*,pivot_root.8*,raw.8*,rawdevices.8*}
|
||||
%{_mandir}/man8/{readprofile.8*,resizepart.8*,rfkill.8*,rtcwake.8*,setarch.8*,sulogin.8.gz,swaplabel.8*}
|
||||
%{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*}
|
||||
|
||||
%changelog
|
||||
* Tue Jun 18 2024 hefq343 <fengqing.he@shingroup.cn> - 2.37.2-33
|
||||
- Type:update
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:add support for ppc64le
|
||||
|
||||
* Fri Jun 07 2024 yanglongkang <yanglongkang@h-partners.com> - 2.37.2-32
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:sync community patches
|
||||
backport-uuidd-fix-open-lock-state-issue.patch
|
||||
|
||||
* Tue May 7 2024 zhangyao <zhangyao108@huawei.com> - 2.37.2-31
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:sync community patches
|
||||
backport-hexdump-check-blocksize-when-display-data.patch
|
||||
backport-lslocks-fix-buffer-overflow.patch
|
||||
backport-last-avoid-out-of-bounds-array-access.patch
|
||||
backport-lsipc-fix-semaphore-USED-counter.patch
|
||||
|
||||
* Sun Apr 28 2024 zhangyao <zhangyao108@huawei.com> - 2.37.2-30
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:fix lscpu core dump
|
||||
backport-lscpu-don-t-use-NULL-sharedmap.patch
|
||||
backport-lscpu-use-topology-maps-in-more-robust-way.patch
|
||||
|
||||
|
||||
* Mon Apr 22 2024 zhangyao <zhangyao108@huawei.com> - 2.37.2-29
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:add provides and support enable-raw
|
||||
The current version of the kernel also supports the raw driver.
|
||||
To keep consistent with the previous version, roll back the modification.
|
||||
|
||||
* Fri Mar 29 2024 zhangyao <zhangyao108@huawei.com> - 2.37.2-28
|
||||
- Type:CVE
|
||||
- CVE:CVE-2024-28085
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user