packages: util-linux-ng/util-linux-ctrlaltdel-man.patch (NEW), util-linux-n...
qboosh
qboosh at pld-linux.org
Sun May 9 10:45:05 CEST 2010
Author: qboosh Date: Sun May 9 08:45:05 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- remaining patches from old util-linux
---- Files affected:
packages/util-linux-ng:
util-linux-ctrlaltdel-man.patch (NONE -> 1.1) (NEW), util-linux-fdformat-ide.patch (NONE -> 1.1) (NEW), util-linux-fhs.patch (NONE -> 1.1) (NEW), util-linux-hotkeys.patch (NONE -> 1.1) (NEW), util-linux-info.patch (NONE -> 1.1) (NEW), util-linux-login-lastlog.patch (NONE -> 1.1) (NEW), util-linux-procpartitions.patch (NONE -> 1.1) (NEW), util-linux-swaponsymlink.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/util-linux-ng/util-linux-ctrlaltdel-man.patch
diff -u /dev/null packages/util-linux-ng/util-linux-ctrlaltdel-man.patch:1.1
--- /dev/null Sun May 9 10:45:05 2010
+++ packages/util-linux-ng/util-linux-ctrlaltdel-man.patch Sun May 9 10:44:59 2010
@@ -0,0 +1,12 @@
+- Non-existant simpleinit(8) mentioned in ctrlaltdel(8)
+
+--- util-linux-2.13-pre6/sys-utils/ctrlaltdel.8.kzak 2006-08-10 12:23:53.000000000 +0200
++++ util-linux-2.13-pre6/sys-utils/ctrlaltdel.8 2006-08-10 12:24:08.000000000 +0200
+@@ -32,7 +32,6 @@
+ .SH FILES
+ .I /etc/rc.local
+ .SH "SEE ALSO"
+-.BR simpleinit (8),
+ .BR init (8)
+ .SH AUTHOR
+ Peter Orbaek (poe at daimi.aau.dk)
================================================================
Index: packages/util-linux-ng/util-linux-fdformat-ide.patch
diff -u /dev/null packages/util-linux-ng/util-linux-fdformat-ide.patch:1.1
--- /dev/null Sun May 9 10:45:05 2010
+++ packages/util-linux-ng/util-linux-fdformat-ide.patch Sun May 9 10:44:59 2010
@@ -0,0 +1,22 @@
+--- util-linux-2.12p/disk-utils/fdformat.8.ide 2005-04-25 11:39:19.528340384 +0200
++++ util-linux-2.12p/disk-utils/fdformat.8 2005-04-25 11:44:07.189609224 +0200
+@@ -45,6 +45,10 @@
+ .BR setfdprm (8)
+ to load the disk parameters.
+
++For ATAPI IDE floppy driver (also known as LS-120 drives or "Superdisk"
++drives) you have to use the
++.BR floppy (8).
++
+ .SH OPTIONS
+ .TP
+ .B \-n
+@@ -54,6 +58,7 @@
+ .BR fd (4),
+ .BR setfdprm (8),
+ .BR mkfs (8),
+-.BR emkfs (8)
++.BR emkfs (8),
++.BR floppy (8)
+ .SH AUTHOR
+ Werner Almesberger (almesber at nessie.cs.id.ethz.ch)
================================================================
Index: packages/util-linux-ng/util-linux-fhs.patch
diff -u /dev/null packages/util-linux-ng/util-linux-fhs.patch:1.1
--- /dev/null Sun May 9 10:45:05 2010
+++ packages/util-linux-ng/util-linux-fhs.patch Sun May 9 10:44:59 2010
@@ -0,0 +1,12 @@
+diff -urN util-linux-2.11d.org/include/pathnames.h util-linux-2.11d/include/pathnames.h
+--- util-linux-2.11d.org/include/pathnames.h Sun Jun 3 21:48:00 2001
++++ util-linux-2.11d/include/pathnames.h Sun Jun 3 21:48:47 2001
+@@ -101,7 +105,7 @@
+ #define SECURETTY "/etc/securetty"
+ #define _PATH_UTMP "/var/run/utmp"
+ #define _PATH_WTMP LOGDIR "/wtmp"
+-#define _PATH_WTMPLOCK "/etc/wtmplock"
++#define _PATH_WTMPLOCK VARPATH "/lock/wtmplock"
+
+ /* no more . in DEFPATH */
+ #define _PATH_DEFPATH "/usr/local/bin:/bin:/usr/bin"
================================================================
Index: packages/util-linux-ng/util-linux-hotkeys.patch
diff -u /dev/null packages/util-linux-ng/util-linux-hotkeys.patch:1.1
--- /dev/null Sun May 9 10:45:05 2010
+++ packages/util-linux-ng/util-linux-hotkeys.patch Sun May 9 10:44:59 2010
@@ -0,0 +1,46 @@
+- vipw asks for editing shadow in local language but only "Y" is accepted as yes
+
+--- util-linux-2.12j/po/ca.po.sopwith 2004-12-05 14:08:08.000000000 -0500
++++ util-linux-2.12j/po/ca.po 2004-12-10 13:10:52.411668785 -0500
+@@ -7183,7 +7183,7 @@
+ #: login-utils/vipw.c:354
+ #, c-format
+ msgid "Would you like to edit %s now [y/n]? "
+-msgstr "Desitgeu editar %s ara? [s/n] "
++msgstr "Desitgeu editar %s ara? [y/n] "
+
+ #: login-utils/wall.c:104
+ #, c-format
+--- util-linux-2.12j/po/da.po.sopwith 2004-12-05 14:08:09.000000000 -0500
++++ util-linux-2.12j/po/da.po 2004-12-10 13:09:50.382880759 -0500
+@@ -1470,7 +1470,7 @@
+
+ #: fdisk/cfdisk.c:1526
+ msgid "Do you wish to start with a zero table [y/N] ?"
+-msgstr "Vil du starte med nulstillet tabel [j/N] ?"
++msgstr "Vil du starte med nulstillet tabel [y/N] ?"
+
+ #: fdisk/cfdisk.c:1574
+ msgid "You specified more cylinders than fit on disk"
+--- util-linux-2.12j/po/nl.po.sopwith 2004-12-05 14:08:15.000000000 -0500
++++ util-linux-2.12j/po/nl.po 2004-12-10 13:09:50.390878282 -0500
+@@ -1493,7 +1493,7 @@
+
+ #: fdisk/cfdisk.c:1526
+ msgid "Do you wish to start with a zero table [y/N] ?"
+-msgstr "Wilt u met een lege tabel beginnen [j/N] ?"
++msgstr "Wilt u met een lege tabel beginnen [y/N] ?"
+
+ #: fdisk/cfdisk.c:1574
+ msgid "You specified more cylinders than fit on disk"
+--- util-linux-2.12j/po/pt_BR.po.sopwith 2004-12-05 14:08:15.000000000 -0500
++++ util-linux-2.12j/po/pt_BR.po 2004-12-10 13:11:47.560587674 -0500
+@@ -7161,7 +7161,7 @@
+ #: login-utils/vipw.c:354
+ #, c-format
+ msgid "Would you like to edit %s now [y/n]? "
+-msgstr "Você gostaria de editar %s agora [s/n]"
++msgstr "Você gostaria de editar %s agora [y/n]"
+
+ #: login-utils/wall.c:104
+ #, c-format
================================================================
Index: packages/util-linux-ng/util-linux-info.patch
diff -u /dev/null packages/util-linux-ng/util-linux-info.patch:1.1
--- /dev/null Sun May 9 10:45:05 2010
+++ packages/util-linux-ng/util-linux-info.patch Sun May 9 10:44:59 2010
@@ -0,0 +1,14 @@
+--- util-linux-2.11n.org/sys-utils/ipc.texi Wed Feb 20 13:35:02 2002
++++ util-linux-2.11n/sys-utils/ipc.texi Wed Feb 20 13:35:10 2002
+@@ -30,9 +30,9 @@
+ programs within the terms of the GNU GPL.
+ @end titlepage
+
+- at dircategory Miscellaneous
++ at dircategory Miscellaneous:
+ @direntry
+-* ipc: (ipc). System V style inter process communication
++* ipc: (ipc). System V style inter process communication
+ @end direntry
+
+ @node Top, Overview, Notes, (dir)
================================================================
Index: packages/util-linux-ng/util-linux-login-lastlog.patch
diff -u /dev/null packages/util-linux-ng/util-linux-login-lastlog.patch:1.1
--- /dev/null Sun May 9 10:45:05 2010
+++ packages/util-linux-ng/util-linux-login-lastlog.patch Sun May 9 10:44:59 2010
@@ -0,0 +1,11 @@
+--- util-linux-2.12p/login-utils/login.c.login-lastlog 2005-03-24 13:26:06.516865128 +0100
++++ util-linux-2.12p/login-utils/login.c 2005-03-24 13:26:58.136017824 +0100
+@@ -1397,7 +1397,7 @@
+ struct lastlog ll;
+ int fd;
+
+- if ((fd = open(_PATH_LASTLOG, O_RDWR, 0)) >= 0) {
++ if ((fd = open(_PATH_LASTLOG, O_RDWR|O_CREAT, 0)) >= 0) {
+ lseek(fd, (off_t)pwd->pw_uid * sizeof(ll), SEEK_SET);
+ if (!quiet) {
+ if (read(fd, (char *)&ll, sizeof(ll)) == sizeof(ll) &&
================================================================
Index: packages/util-linux-ng/util-linux-procpartitions.patch
diff -u /dev/null packages/util-linux-ng/util-linux-procpartitions.patch:1.1
--- /dev/null Sun May 9 10:45:05 2010
+++ packages/util-linux-ng/util-linux-procpartitions.patch Sun May 9 10:44:59 2010
@@ -0,0 +1,41 @@
+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. Falure 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];
+ 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);
+ }
++ setvbuf(procpt, iobuf, _IOFBF, sizeof(iobuf));
+
+ while (fgets(line, sizeof(line), procpt)) {
+ if (sscanf (line, " %d %d %d %[^\n ]",
+--- util-linux-2.11y/fdisk/fdisk.c.procpartitions 2003-01-13 14:28:41.000000000 -0500
++++ util-linux-2.11y/fdisk/fdisk.c 2003-01-13 14:28:41.000000000 -0500
+@@ -2371,12 +2371,14 @@
+ FILE *procpt;
+ char line[100], ptname[100], devname[120], *s;
+ int ma, mi, sz;
++ char iobuf[32*1024];
+
+ procpt = fopen(PROC_PARTITIONS, "r");
+ if (procpt == NULL) {
+ fprintf(stderr, _("cannot open %s\n"), PROC_PARTITIONS);
+ return;
+ }
++ setvbuf(procpt, iobuf, _IOFBF, sizeof(iobuf));
+
+ while (fgets(line, sizeof(line), procpt)) {
+ if (sscanf (line, " %d %d %d %[^\n ]",
================================================================
Index: packages/util-linux-ng/util-linux-swaponsymlink.patch
diff -u /dev/null packages/util-linux-ng/util-linux-swaponsymlink.patch:1.1
--- /dev/null Sun May 9 10:45:05 2010
+++ packages/util-linux-ng/util-linux-swaponsymlink.patch Sun May 9 10:44:59 2010
@@ -0,0 +1,28 @@
+When swap is a simlink, the swap entry in
+/etc/fstab may not match /proc/swaps. That
+means strcmp shouldn't be used for swapon.
+
+--- util-linux-2.12p/mount/swapon.c.sopwith Wed Dec 22 04:50:19 2004
++++ util-linux-2.12p/mount/swapon.c Thu Dec 23 14:44:49 2004
+@@ -138,9 +138,19 @@
+ is_in_proc_swaps(const char *fname) {
+ int i;
+
+- for (i = 0; i < numSwaps; i++)
+- if (swapFiles[i] && !strcmp(fname, swapFiles[i]))
++ for (i = 0; i < numSwaps; i++) {
++ struct stat swapped, swapping;
++
++ if (!swapFiles[i]) continue;
++
++ if (!strcmp(fname, swapFiles[i])
++ || (!stat (swapFiles[i], &swapped)
++ && !stat (fname, &swapping)
++ && (swapped.st_dev == swapping.st_dev
++ && swapped.st_ino == swapping.st_ino))
++ )
+ return 1;
++ }
+ return 0;
+ }
+
================================================================
More information about the pld-cvs-commit
mailing list