commit d5aef51dc0ccae2c72c8bb8872b35f57b1bde0f8
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sun Feb 28 14:23:42 2021 +0100
- rel 2; rediff patches
su-paths.patch | 11 ++++++-----
util-linux-fdformat-ide.patch | 15 ++++++++-------
util-linux-fhs.patch | 16 +++++++++-------
util-linux-login-lastlog.patch | 15 ++++++++-------
util-linux-procpartitions.patch | 38 +++++++++++++++++---------------------
util-linux.spec | 2 +-
6 files changed, 49 insertions(+), 48 deletions(-)
---
diff --git a/util-linux.spec b/util-linux.spec
index af679ae..7c95ee1 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -39,7 +39,7 @@ Summary(tr.UTF-8): Temel sistem araçları
Summary(uk.UTF-8): Набір базових системних утиліт для Linux
Name: util-linux
Version: 2.36.2
-Release: 1
+Release: 2
License: GPL v2+, GPL v3 (hwclock)
Group: Applications/System
# https://github.com/karelzak/util-linux (GitHub backup)
diff --git a/su-paths.patch b/su-paths.patch
index 42705e5..8f4eb49 100644
--- a/su-paths.patch
+++ b/su-paths.patch
@@ -1,8 +1,9 @@
---- coreutils-4.5.3/login-utils/su-common.c.orig Sun Oct 27 21:57:03 2002
-+++ coreutils-4.5.3/login-utils/su-common.c Sun Oct 27 22:15:05 2002
-@@ -154,6 +154,15 @@
- # define DEFAULT_ROOT_LOGIN_PATH "/usr/ucb:/bin:/usr/bin:/etc"
- #endif
+diff -urNp -x '*.orig' util-linux-2.36.2.org/login-utils/su-common.c
util-linux-2.36.2/login-utils/su-common.c
+--- util-linux-2.36.2.org/login-utils/su-common.c 2021-02-12
12:32:01.749988723 +0100
++++ util-linux-2.36.2/login-utils/su-common.c 2021-02-28 14:22:27.508126765
+0100
+@@ -100,6 +100,15 @@ UL_DEBUG_DEFINE_MASKNAMES(su) = UL_DEBUG
+
+ #define is_pam_failure(_rc) ((_rc) != PAM_SUCCESS)
+/* The default paths which get set are both bogus and oddly influenced
+ by <paths.h> and -D on the commands line. Just to be clear, we'll set
diff --git a/util-linux-fdformat-ide.patch b/util-linux-fdformat-ide.patch
index 26980d8..905d83b 100644
--- a/util-linux-fdformat-ide.patch
+++ b/util-linux-fdformat-ide.patch
@@ -1,6 +1,7 @@
---- util-linux-2.29.2/disk-utils/fdformat.8.orig 2017-02-22
11:16:55.235092833 +0100
-+++ util-linux-2.29.2/disk-utils/fdformat.8 2017-03-28 16:45:00.661104437
+0200
-@@ -43,6 +43,11 @@
+diff -urNp -x '*.orig' util-linux-2.36.2.org/disk-utils/fdformat.8
util-linux-2.36.2/disk-utils/fdformat.8
+--- util-linux-2.36.2.org/disk-utils/fdformat.8 2021-02-02
16:41:37.963357493 +0100
++++ util-linux-2.36.2/disk-utils/fdformat.8 2021-02-28 14:21:08.782332493
+0100
+@@ -43,6 +43,11 @@ when a non-standard format is being used
autodetected earlier. In this case, use
.BR setfdprm (8)
to load the disk parameters.
@@ -12,11 +13,11 @@
.SH OPTIONS
.TP
\fB\-f\fR, \fB\-\-from\fR \fIN\fR
-@@ -65,6 +70,7 @@
- .SH "SEE ALSO"
+@@ -71,6 +76,7 @@ Werner Almesberger ([email protected]
+ .SH SEE ALSO
.BR fd (4),
.BR emkfs (8),
+.BR floppy (8),
.BR mkfs (8),
- .BR setfdprm (8)
- .SH AUTHOR
+ .BR setfdprm (8),
+ .BR ufiformat (8)
diff --git a/util-linux-fhs.patch b/util-linux-fhs.patch
index a0fbf59..1dc23fc 100644
--- a/util-linux-fhs.patch
+++ b/util-linux-fhs.patch
@@ -1,17 +1,19 @@
---- util-linux-2.30/include/pathnames.h.orig 2017-02-23 13:19:13.927424206
+0100
-+++ util-linux-2.30/include/pathnames.h 2017-06-22 21:40:58.287666726
+0200
-@@ -41,7 +41,7 @@
+diff -urNp -x '*.orig' util-linux-2.36.2.org/include/pathnames.h
util-linux-2.36.2/include/pathnames.h
+--- util-linux-2.36.2.org/include/pathnames.h 2021-02-12 12:32:01.736988771
+0100
++++ util-linux-2.36.2/include/pathnames.h 2021-02-28 14:21:31.543044005
+0100
+@@ -39,7 +39,7 @@
#define _PATH_NOLOGIN_TXT "/etc/nologin.txt"
#ifndef _PATH_MAILDIR
-# define _PATH_MAILDIR "/var/spool/mail"
+# define _PATH_MAILDIR "/var/mail"
#endif
- #define _PATH_MOTDFILE "/etc/motd"
+ #define _PATH_MOTDFILE
"/usr/share/misc/motd:/run/motd:/etc/motd"
#ifndef _PATH_NOLOGIN
---- util-linux-2.21/login-utils/login.1~ 2012-02-10 15:45:52.000000000
+0200
-+++ util-linux-2.21/login-utils/login.1 2012-03-05 18:07:04.386917212
+0200
-@@ -223,7 +223,7 @@
+diff -urNp -x '*.orig' util-linux-2.36.2.org/login-utils/login.1
util-linux-2.36.2/login-utils/login.1
+--- util-linux-2.36.2.org/login-utils/login.1 2021-02-12 12:32:01.748988728
+0100
++++ util-linux-2.36.2/login-utils/login.1 2021-02-28 14:21:31.543044005
+0100
+@@ -347,7 +347,7 @@ the superuser logs in. ENV_ROOTPATH tak
.I /var/run/utmp
.I /var/log/wtmp
.I /var/log/lastlog
diff --git a/util-linux-login-lastlog.patch b/util-linux-login-lastlog.patch
index f0cb1e0..7ac363d 100644
--- a/util-linux-login-lastlog.patch
+++ b/util-linux-login-lastlog.patch
@@ -1,11 +1,12 @@
---- util-linux-2.21/login-utils/login.c~ 2012-02-10 16:16:07.000000000
+0200
-+++ util-linux-2.21/login-utils/login.c 2012-03-05 17:33:34.932052369
+0200
-@@ -503,7 +503,7 @@
- if (!cxt->pwd)
- return;
+diff -urNp -x '*.orig' util-linux-2.36.2.org/login-utils/login.c
util-linux-2.36.2/login-utils/login.c
+--- util-linux-2.36.2.org/login-utils/login.c 2021-02-12 12:32:01.748988728
+0100
++++ util-linux-2.36.2/login-utils/login.c 2021-02-28 14:21:48.563576067
+0100
+@@ -586,7 +586,7 @@ static void log_lastlog(struct login_con
+ sa.sa_handler = SIG_IGN;
+ sigaction(SIGXFSZ, &sa, &oldsa_xfsz);
- fd = open(_PATH_LASTLOG, O_RDWR, 0);
+ fd = open(_PATH_LASTLOG, O_RDWR|O_CREAT, 0);
if (fd < 0)
- return;
-
+ goto done;
+ offset = cxt->pwd->pw_uid * sizeof(ll);
diff --git a/util-linux-procpartitions.patch b/util-linux-procpartitions.patch
index 19db66f..6199864 100644
--- a/util-linux-procpartitions.patch
+++ b/util-linux-procpartitions.patch
@@ -1,30 +1,26 @@
-Mount has to read /proc/partitions in one gulp. It doesn't. Failed for me
-after a hard powerdown (oops) and the resulting fsck-the-world frenzy on
-startup, before the mount -a. Failure cause is identical (getting out of
-sync with the text at the 1K boundary), but failure mode not quite so
-drastic as it doesn't bail out like fsck does.
-
---- util-linux-2.11y/disk-utils/blockdev.c.procpartitions 2002-03-08
17:57:02.000000000 -0500
-+++ util-linux-2.11y/disk-utils/blockdev.c 2003-01-13 14:28:41.000000000
-0500
-@@ -290,6 +290,7 @@
- char ptname[200];
+diff -urNp -x '*.orig' util-linux-2.36.2.org/disk-utils/blockdev.c
util-linux-2.36.2/disk-utils/blockdev.c
+--- util-linux-2.36.2.org/disk-utils/blockdev.c 2021-02-02
16:41:37.962357499 +0100
++++ util-linux-2.36.2/disk-utils/blockdev.c 2021-02-28 14:22:07.717508138
+0100
+@@ -431,6 +431,7 @@ static void report_all_devices(void)
+ char ptname[200 + 1];
char device[210];
int ma, mi, sz;
+ char iobuf[32*1024];
- procpt = fopen(PROC_PARTITIONS, "r");
- if (!procpt) {
-@@ -297,6 +298,7 @@
- progname, PROC_PARTITIONS);
- exit(1);
+ procpt = fopen(_PATH_PROC_PARTITIONS, "r");
+ if (!procpt)
+@@ -444,6 +445,7 @@ static void report_all_devices(void)
+ sprintf(device, "/dev/%s", ptname);
+ report_device(device, 1);
}
+ setvbuf(procpt, iobuf, _IOFBF, sizeof(iobuf));
- while (fgets(line, sizeof(line), procpt)) {
- if (sscanf (line, " %d %d %d %[^\n ]",
---- util-linux-2.26/disk-utils/fdisk-list.c.orig 2015-02-10
10:49:46.346584245 +0100
-+++ util-linux-2.26/disk-utils/fdisk-list.c 2015-02-23 21:04:01.522730338
+0100
-@@ -198,6 +198,7 @@
+ fclose(procpt);
+ }
+diff -urNp -x '*.orig' util-linux-2.36.2.org/disk-utils/fdisk-list.c
util-linux-2.36.2/disk-utils/fdisk-list.c
+--- util-linux-2.36.2.org/disk-utils/fdisk-list.c 2021-02-12
12:32:01.733988782 +0100
++++ util-linux-2.36.2/disk-utils/fdisk-list.c 2021-02-28 14:22:07.717508138
+0100
+@@ -320,6 +320,7 @@ done:
char *next_proc_partition(FILE **f)
{
char line[128 + 1];
@@ -32,7 +28,7 @@ drastic as it doesn't bail out like fsck does.
if (!*f) {
*f = fopen(_PATH_PROC_PARTITIONS, "r");
-@@ -205,6 +206,7 @@
+@@ -327,6 +328,7 @@ char *next_proc_partition(FILE **f)
warn(_("cannot open %s"), _PATH_PROC_PARTITIONS);
return NULL;
}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/util-linux.git/commitdiff/d5aef51dc0ccae2c72c8bb8872b35f57b1bde0f8
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
