diff --git a/util-linux-2.12a-pamsession.patch b/util-linux-2.12a-pamsession.patch new file mode 100644 index 0000000..cace510 --- /dev/null +++ b/util-linux-2.12a-pamsession.patch @@ -0,0 +1,12 @@ +diff -urb util-linux-2.12a.orig/login-utils/login.c util-linux-2.12a/login-utils/login.c +--- util-linux-2.12a.orig/login-utils/login.c 2005-04-08 09:43:37.000000000 -0400 ++++ util-linux-2.12a/login-utils/login.c 2005-04-08 11:14:37.850579656 -0400 +@@ -703,6 +703,8 @@ + PAM_FAIL_CHECK; + + retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED); ++ if (retcode != PAM_SUCCESS) ++ pam_close_session(pamh, 0); + PAM_FAIL_CHECK; + + #else /* ! USE_PAM */ diff --git a/util-linux-2.12p-fdformat-ide.patch b/util-linux-2.12p-fdformat-ide.patch new file mode 100644 index 0000000..80ea0b6 --- /dev/null +++ b/util-linux-2.12p-fdformat-ide.patch @@ -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@nessie.cs.id.ethz.ch) diff --git a/util-linux-2.12p-fstab-man.patch b/util-linux-2.12p-fstab-man.patch new file mode 100644 index 0000000..58075ea --- /dev/null +++ b/util-linux-2.12p-fstab-man.patch @@ -0,0 +1,25 @@ +--- util-linux-2.12p/mount/fstab.5.sync 2005-04-25 11:56:00.625150536 +0200 ++++ util-linux-2.12p/mount/fstab.5 2005-04-25 12:07:12.089072504 +0200 +@@ -49,10 +49,11 @@ + The file + .B fstab + contains descriptive information about the various file systems. ++It is the duty of the system administrator to properly create and maintain this file. + .B fstab +-is only read by programs, and not written; it is the duty of the system +-administrator to properly create and maintain this file. Each filesystem +-is described on a separate line; fields on each line are separated by tabs ++can be modified by special utils (e.g. ++.BR fstab-sync (8)). ++Each filesystem is described on a separate line; fields on each line are separated by tabs + or spaces. Lines starting with '#' are comments. The order of records in + .B fstab + is important because +@@ -200,6 +201,7 @@ + .BR swapon (8), + .BR fs (5) + .BR nfs (5) ++.BR fstab-sync (8) + .SH HISTORY + The ancestor of this + .B fstab diff --git a/util-linux-2.12p-lvm2dupes-76467.patch b/util-linux-2.12p-lvm2dupes-76467.patch new file mode 100644 index 0000000..3d74b33 --- /dev/null +++ b/util-linux-2.12p-lvm2dupes-76467.patch @@ -0,0 +1,27 @@ +--- util-linux-2.12p/mount/mount_by_label.c.lvm2dupes 2005-04-25 11:33:53.657880224 +0200 ++++ util-linux-2.12p/mount/mount_by_label.c 2005-04-25 11:36:32.075797040 +0200 +@@ -195,6 +195,15 @@ + return 1; + } + ++/* We need to avoid listing /dev/dm-X devices, because they are added to the uuidcache separately by the ++ uuidcache_init_dm routine. Duplicate entries cause mount-by-label to fail. ++ */ ++static int ++is_lvm2(char *ptname) ++{ ++ return !strncmp(ptname, "dm-", 3); ++} ++ + static void + uuidcache_init(void) { + char line[100]; +@@ -266,7 +275,7 @@ + /* devfs has .../disc and .../part1 etc. */ + + for (s = ptname; *s; s++); +- if (isdigit(s[-1]) || is_xvm(ptname)) { ++ if ((isdigit(s[-1]) || is_xvm(ptname)) && !is_lvm2(ptname)) { + + /* + * Note: this is a heuristic only - there is no reason diff --git a/util-linux.spec b/util-linux.spec index 776c5cf..e39d7c6 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -27,7 +27,7 @@ Summary: A collection of basic system utilities. Name: util-linux Version: 2.12p -Release: 7 +Release: 8 License: distributable Group: System Environment/Base @@ -116,6 +116,16 @@ Patch180: util-linux-2.12p-login-lastlog.patch Patch181: util-linux-2.12p-mtab-lock.patch # Stupid typo (#151156) Patch182: util-linux-2.12p-ipcs-typo.patch +# 154498 - util-linux login & pam session +Patch183: util-linux-2.12a-pamsession.patch +# 155293 - man 5 nfs should include vers as a mount option +Patch184: util-linux-2.12p-nfsman.patch +# 76467 - At boot time, fsck chokes on LVs listed by label in fstab +Patch185: util-linux-2.12p-lvm2dupes-76467.patch +# add note about ATAPI IDE floppy to fdformat.8 +Patch186: util-linux-2.12p-fdformat-ide.patch +# 145355 - Man pages for fstab and fstab-sync in conflict. +Patch187: util-linux-2.12p-fstab-man.patch # When adding patches, please make sure that it is easy to find out what bug # the # patch fixes. @@ -236,6 +246,12 @@ mv MCONFIG.new MCONFIG %patch181 -p1 %patch182 -p1 -b .typo +%patch183 -p1 +%patch184 -p1 +%patch185 -p1 +%patch186 -p1 +%patch187 -p1 + %build unset LINGUAS || : @@ -625,6 +641,14 @@ fi /sbin/losetup %changelog +* Mon Apr 25 2005 Karel Zak 2.12p-8 +- fix #154498 - util-linux login & pam session +- fix #155293 - man 5 nfs should include vers as a mount option +- fix #76467 - At boot time, fsck chokes on LVs listed by label in fstab +- new Source URL +- added note about ATAPI IDE floppy to fdformat.8 +- fix #145355 - Man pages for fstab and fstab-sync in conflict + * Tue Apr 5 2005 Karel Zak 2.12p-7 - enable build with libblkid from e2fsprogs-devel - remove workaround for duplicated labels