rpms/util-linux/FC-6 .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 util-linux-2.12a-mount-man-cifs.patch, 1.1, 1.2 util-linux-2.13-mount-context.patch, 1.4, 1.5 util-linux-2.13-mount-man-nfs4.patch, 1.1, 1.2 util-linux.spec, 1.147, 1.148

Fri Dec 15 14:22:47 UTC 2006

Author: kzak

Update of /cvs/dist/rpms/util-linux/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv3513

Modified Files:
	.cvsignore sources util-linux-2.12a-mount-man-cifs.patch 
	util-linux-2.13-mount-context.patch 
	util-linux-2.13-mount-man-nfs4.patch util-linux.spec 
Log Message:
* Thu Dec 15 2006 Karel Zak <kzak at redhat.com> 2.13-0.45.2
- fix #217240 - namei ignores non-directory components instead of saying "Not a directory"
- fix #217241 - namei enforces symlink limits inconsistently
- fix leaking file descriptor in the more command (patch by Steve Grubb)
- remove things for deprecated raw commad from this spec file 
- fix #218915 - fdisk -b 4K
- upgrade to -pre7 release
- fix #217186 - /bin/sh: @MKINSTALLDIRS@: No such file or directory 
  (port po/Makefile.in.in from gettext-0.16)
- fix #216489 - SCHED_BATCH option missing in chrt
- Resolves: rhbz#217240 rhbz#217241 rhbz#218915 rhbz#217186 rhbz#216489



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/util-linux/FC-6/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19

--- .cvsignore	25 Nov 2005 07:32:12 -0000	1.18
+++ .cvsignore	15 Dec 2006 14:22:45 -0000	1.19
@@ -1,2 +1,2 @@
 floppy-0.12.tar.gz
-util-linux-2.13-pre6.tar.bz2
+util-linux-2.13-pre7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/util-linux/FC-6/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	25 Nov 2005 07:32:12 -0000	1.18
+++ sources	15 Dec 2006 14:22:45 -0000	1.19
@@ -1,2 +1,2 @@
 7d3ac81855e26687dada6a31d2677875  floppy-0.12.tar.gz
-1db1249029439e5e965c2c7178149616  util-linux-2.13-pre6.tar.bz2
+13cdf4b76533e8421dc49de188f85291  util-linux-2.13-pre7.tar.bz2

util-linux-2.12a-mount-man-cifs.patch:
 mount.8 |   10 ++++++++++
 1 files changed, 10 insertions(+)

Index: util-linux-2.12a-mount-man-cifs.patch
===================================================================
RCS file: /cvs/dist/rpms/util-linux/FC-6/util-linux-2.12a-mount-man-cifs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-2.12a-mount-man-cifs.patch	25 Nov 2005 07:32:12 -0000	1.1
+++ util-linux-2.12a-mount-man-cifs.patch	15 Dec 2006 14:22:45 -0000	1.2
@@ -1,16 +1,5 @@
 --- util-linux-2.12a/mount/mount.8.cifs	2005-11-23 16:34:34.000000000 +0100
 +++ util-linux-2.12a/mount/mount.8	2005-11-23 16:38:37.000000000 +0100
-@@ -413,8 +413,8 @@
- program has to do is issue a simple
- .IR mount (2)
- system call, and no detailed knowledge of the filesystem type is required.
--For a few types however (like nfs, nfs4, smbfs, ncpfs) ad hoc code is
--necessary. The nfs ad hoc code is built in, but smbfs and ncpfs
-+For a few types however (like nfs, nfs4, smbfs, ncpfs, cifs) ad hoc code is
-+necessary. The nfs ad hoc code is built in, but smbfs, ncpfs and cifs
- have a separate mount program. In order to make it possible to
- treat all types in a uniform way, mount will execute the program
- .I /sbin/mount.TYPE
 @@ -720,6 +720,16 @@
  (However, quota utilities may react to such strings in
  .IR /etc/fstab .)

util-linux-2.13-mount-context.patch:
 Makefile.am |    3 +
 mount.8     |   44 +++++++++++++++++++++++
 mount.c     |  113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 152 insertions(+), 8 deletions(-)

Index: util-linux-2.13-mount-context.patch
===================================================================
RCS file: /cvs/dist/rpms/util-linux/FC-6/util-linux-2.13-mount-context.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- util-linux-2.13-mount-context.patch	22 Nov 2006 00:01:26 -0000	1.4
+++ util-linux-2.13-mount-context.patch	15 Dec 2006 14:22:45 -0000	1.5
@@ -79,7 +79,7 @@
 +	if (verbose)
 +		printf(_("mount: translated %s '%s' to '%s'\n"), 
 +				optname, data, (char *) raw);
-+                                                               // TODO: context options with commans are unsupported by kernel now ;-( 
++                                                               // TODO 2.6.19: context options with commans are unsupported by kernel now ;-( 
 +	bufsz = strlen(optname) + strlen(raw) + 2;              // bufsz = strlen(optname) + strlen(raw) + 4;	/* 4 is \0, '=' and 2x '"' */ 
 +	buf = xmalloc(bufsz);
 +

util-linux-2.13-mount-man-nfs4.patch:
 mount.8 |   75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 72 insertions(+), 3 deletions(-)

Index: util-linux-2.13-mount-man-nfs4.patch
===================================================================
RCS file: /cvs/dist/rpms/util-linux/FC-6/util-linux-2.13-mount-man-nfs4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-2.13-mount-man-nfs4.patch	20 Sep 2006 14:26:00 -0000	1.1
+++ util-linux-2.13-mount-man-nfs4.patch	15 Dec 2006 14:22:45 -0000	1.2
@@ -1,6 +1,6 @@
---- util-linux-2.13-pre2/mount/mount.8.nfsv4	2005-08-02 19:34:16.000000000 +0200
-+++ util-linux-2.13-pre2/mount/mount.8	2005-08-17 10:44:06.000000000 +0200
-@@ -384,6 +384,7 @@
+--- util-linux-2.13-pre7/mount/mount.8.man-nfs4	2006-03-06 00:04:37.000000000 +0100
++++ util-linux-2.13-pre7/mount/mount.8	2006-12-14 00:30:33.000000000 +0100
+@@ -385,6 +385,7 @@
  .IR msdos ,
  .IR ncpfs ,
  .IR nfs ,
@@ -8,16 +8,16 @@
  .IR ntfs ,
  .IR proc ,
  .IR qnx4 ,
-@@ -421,7 +422,7 @@
+@@ -422,7 +423,7 @@
  program has to do is issue a simple
  .IR mount (2)
  system call, and no detailed knowledge of the filesystem type is required.
--For a few types however (like nfs, smbfs, ncpfs) ad hoc code is
-+For a few types however (like nfs, nfs4, smbfs, ncpfs) ad hoc code is
- necessary. The nfs ad hoc code is built in, but smbfs and ncpfs
+-For a few types however (like nfs, cifs, smbfs, ncpfs) ad hoc code is
++For a few types however (like nfs, nfs4, cifs, smbfs, ncpfs) ad hoc code is
+ necessary. The nfs ad hoc code is built in, but cifs, smbfs, and ncpfs
  have a separate mount program. In order to make it possible to
  treat all types in a uniform way, mount will execute the program
-@@ -449,9 +450,10 @@
+@@ -450,9 +451,10 @@
  All of the filesystem types listed there will be tried,
  except for those that are labeled "nodev" (e.g.,
  .IR devpts ,
@@ -30,7 +30,7 @@
  If
  .I /etc/filesystems
  ends in a line with a single * only, mount will read
-@@ -1373,6 +1375,73 @@
+@@ -1368,6 +1370,73 @@
  .B nolock
  Do not use locking. Do not start lockd.
  


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/FC-6/util-linux.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- util-linux.spec	22 Nov 2006 00:01:26 -0000	1.147
+++ util-linux.spec	15 Dec 2006 14:22:45 -0000	1.148
@@ -9,17 +9,10 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.45.1%{?dist}
+Release: 0.45.2%{?dist}
 License: distributable
 Group: System Environment/Base
 
-### Features
-%if 0%{?rhel}
-%define include_raw 1
-%else
-%define include_raw 0
-%endif
-
 ### Macros
 %define floppyver 0.12
 %define no_hwclock_archs s390 s390x
@@ -45,8 +38,8 @@
 BuildRequires: zlib-devel
 
 ### Sources
-# TODO [stable]: s/2.13-pre6/%{version}/
-Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/util-linux-2.13-pre6.tar.bz2
+# TODO [stable]: s/2.13-pre7/%{version}/
+Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/util-linux-2.13-pre7.tar.bz2
 Source1: util-linux-login.pamd
 Source2: util-linux-remote.pamd
 Source3: util-linux-chsh-chfn.pamd
@@ -78,8 +71,6 @@
 Patch1: util-linux-2.13-moretc.patch
 # Reduce MAX_PARTS to 16 (upstream reasonably won't take it)
 Patch70: util-linux-2.12a-partlimit.patch
-# Note on how to set up raw device mappings using RHL /etc/sysconfig/rawdevices
-Patch109: util-linux-2.11f-rawman.patch
 
 Patch100: util-linux-2.12j-managed.patch
 
@@ -104,8 +95,6 @@
 Patch157: util-linux-2.12a-pamstart.patch
 # Patch to enable the pamconsole flag for restricting mounting to users at the console (#133941)
 Patch159: util-linux-2.12j-pamconsole.patch
-# Allow raw(8) to bind raw devices whose device nodes do not yet exist.
-Patch160: raw-handle-nonpresent-devs.patch
 
 Patch164: util-linux-2.12j-113790-hotkeys.patch
 
@@ -198,8 +187,6 @@
 # 182553 - fdisk -l inside xen guest shows no disks
 # 188981 - "sfdisk -l" tries to open partitions
 Patch241: util-linux-2.13-fdisk-isfull.patch
-# 181549 - raw(8) manpage has old information about dd
-Patch242: util-linux-2.12a-raw-man-dd.patch
 # Don't use asm/page.h
 Patch243: util-linux-2.13-swap-page.patch
 # IPv6 support to login command
@@ -222,6 +209,17 @@
 Patch254: util-linux-2.13-mount-comment.patch
 # 211749 - add -r option to losetup to create a read-only loop
 Patch255: util-linux-2.13-losetup-rdonly.patch
+# 216489 - SCHED_BATCH option missing in chrt
+Patch256: util-linux-2.13-schedutils-SCHED_BATCH.patch
+# 217186 - /bin/sh: @MKINSTALLDIRS@: No such file or directory
+Patch257: util-linux-2.13-mkdir_p.patch
+# 218915 - fdisk -b 4K
+Patch258: util-linux-2.13-fdisk-b-4096.patch
+# leaking file descriptor
+Patch259: util-linux-2.13-more-CLOEXEC.patch
+# 217240 - namei ignores non-directory components instead of saying "Not a directory"
+# 217241 - namei enforces symlink limits inconsistently
+Patch260: util-linux-2.13-namei-logic.patch
 
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
@@ -235,7 +233,7 @@
 
 %prep
 # TODO [stable]: remove -n
-%setup -q -a 11 -n util-linux-2.13-pre6
+%setup -q -a 11 -n util-linux-2.13-pre7
 
 %patch1 -p1
 %patch70 -p1
@@ -244,9 +242,6 @@
 %patch100 -p1
 %patch106 -p1
 %patch107 -p1
-%if %{include_raw}
-%patch109 -p1
-%endif
 %patch113 -p1
 %patch120 -p1
 %patch126 -p1
@@ -259,11 +254,7 @@
 %patch153 -p1
 %patch157 -p1
 %patch159 -p1
-%if %{include_raw}
-%patch160 -p1
-%endif
 %patch164 -p1
-
 %patch170 -p1
 %patch180 -p1
 %patch181 -p1
@@ -306,7 +297,6 @@
 %patch239 -p1
 %patch240 -p1
 %patch241 -p1
-%patch242 -p1
 %patch243 -p1
 %patch245 -p1
 %patch247 -p1
@@ -318,6 +308,11 @@
 %patch253 -p1
 %patch254 -p1
 %patch255 -p1
+%patch256 -p1
+%patch257 -p1
+%patch258 -p1
+%patch259 -p1
+%patch260 -p1
 
 %build
 unset LINGUAS || :
@@ -347,9 +342,6 @@
 	--enable-login-utils \
 	--enable-kill \
 	--enable-write \
-%if %{include_raw}
-	--enable-raw \
-%endif
 	--enable-rdev
 
 # reset to original 
@@ -397,10 +389,6 @@
 install -m 755 nologin ${RPM_BUILD_ROOT}/sbin
 install -m 644 nologin.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
 
-%if %{include_raw}
-echo '.so man8/raw.8' > $RPM_BUILD_ROOT%{_mandir}/man8/rawdevices.8
-%endif
-
 # Correct mail spool path.
 sed -e 's,/usr/spool/mail,/var/spool/mail,g' ${RPM_BUILD_ROOT}%{_mandir}/man1/login.1 > ${RPM_BUILD_ROOT}%{_mandir}/man1/login.1.new 
 mv ${RPM_BUILD_ROOT}%{_mandir}/man1/login.1.new ${RPM_BUILD_ROOT}%{_mandir}/man1/login.1
@@ -614,10 +602,6 @@
 %{_mandir}/man8/floppy.8*
 %endif
 %{_bindir}/namei
-
-%if %{include_raw}
-%{_bindir}/raw
-%endif
 %{_bindir}/rename
 %{_bindir}/renice
 %{_bindir}/rev
@@ -696,10 +680,6 @@
 %{_mandir}/man8/mkfs.8*
 %{_mandir}/man8/mkswap.8*
 %{_mandir}/man8/pivot_root.8*
-%if %{include_raw}
-%{_mandir}/man8/raw.8*
-%{_mandir}/man8/rawdevices.8*
-%endif
 %{_mandir}/man8/renice.8*
 %{_mandir}/man8/setsid.8*
 %ifnarch s390 s390x
@@ -721,6 +701,17 @@
 /sbin/losetup
 
 %changelog
+* Thu Dec 15 2006 Karel Zak <kzak at redhat.com> 2.13-0.45.2
+- fix #217240 - namei ignores non-directory components instead of saying "Not a directory"
+- fix #217241 - namei enforces symlink limits inconsistently
+- fix leaking file descriptor in the more command (patch by Steve Grubb)
+- remove things for deprecated raw commad from this spec file 
+- fix #218915 - fdisk -b 4K
+- upgrade to -pre7 release
+- fix #217186 - /bin/sh: @MKINSTALLDIRS@: No such file or directory 
+  (port po/Makefile.in.in from gettext-0.16)
+- fix #216489 - SCHED_BATCH option missing in chrt
+
 * Wed Nov 22 2006 Karel Zak <kzak at redhat.com> 2.13-0.45.1
 - fix #216760 - mount with context or fscontext option fails
   (temporarily disabled the support for additional contexts 


