new version 2.13-pre6

.cvsignore

@@ -1,2 +1,2 @@
 floppy-0.12.tar.gz
-util-linux-2.13-pre5.tar.bz2
+util-linux-2.13-pre6.tar.bz2

sources

@@ -1,2 +1,2 @@
 7d3ac81855e26687dada6a31d2677875  floppy-0.12.tar.gz
-cb6df95064100fe75364fa139634c475  util-linux-2.13-pre5.tar.bz2
+1db1249029439e5e965c2c7178149616  util-linux-2.13-pre6.tar.bz2

util-linux-2.12a-mount-man-cifs.patch

@@ -0,0 +1,30 @@
+--- 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 .)
+ 
++.SH "Mount options for cifs"
++Just like
++.IR nfs " or " smbfs
++implementation expects a binary argument 
++to the mount system call. This argument is constructed by
++.BR mount.cifs (8)
++and the current version of
++.B mount
++(2.12) does not know anything about cifs.
++
+ .SH "Mount options for coherent"
+ None.
+ 

util-linux-2.13-fdisk-gpt.patch

@@ -1,5 +1,5 @@
---- util-linux-2.13-pre4/fdisk/fdisk.c.gpt	2005-10-07 18:40:26.000000000 +0200
+--- util-linux-2.13-pre6/fdisk/fdisk.c.gpt	2005-11-24 15:30:36.000000000 +0100
-+++ util-linux-2.13-pre4/fdisk/fdisk.c	2005-10-07 18:40:26.000000000 +0200
++++ util-linux-2.13-pre6/fdisk/fdisk.c	2005-11-24 15:30:36.000000000 +0100
 @@ -34,6 +34,8 @@
  #include <linux/blkpg.h>
  #endif
@@ -57,8 +57,8 @@
  	get_boot(fdisk);
  
  	if (osf_label) {
---- /dev/null	2005-10-07 17:17:17.781101976 +0200
+--- /dev/null	2005-11-14 15:52:26.044616250 +0100
-+++ util-linux-2.13-pre4/fdisk/gpt.h	2005-10-07 18:40:26.000000000 +0200
++++ util-linux-2.13-pre6/fdisk/gpt.h	2005-11-24 15:30:36.000000000 +0100
 @@ -0,0 +1,9 @@
 +
 +#ifndef __GPT_H__
@@ -69,12 +69,12 @@
 +
 +#endif /* __GPT_H__ */
 +
---- util-linux-2.13-pre4/fdisk/Makefile.am.gpt	2005-09-12 20:55:27.000000000 +0200
+--- util-linux-2.13-pre6/fdisk/Makefile.am.gpt	2005-10-16 14:12:52.000000000 +0200
-+++ util-linux-2.13-pre4/fdisk/Makefile.am	2005-10-07 18:46:57.000000000 +0200
++++ util-linux-2.13-pre6/fdisk/Makefile.am	2005-11-24 15:31:42.000000000 +0100
 @@ -5,13 +5,13 @@
  sbin_PROGRAMS = fdisk
  man_MANS = fdisk.8
- fdisk_SOURCES = fdisk.c llseek.c disksize.c fdiskbsdlabel.c fdisksgilabel.c \
+ fdisk_SOURCES = fdisk.c disksize.c fdiskbsdlabel.c fdisksgilabel.c \
 -	fdisksunlabel.c fdiskaixlabel.c i386_sys_types.c partname.c
 +	fdisksunlabel.c fdiskaixlabel.c i386_sys_types.c partname.c gpt.c
  
@@ -87,8 +87,8 @@
  
  if USE_SLANG
  sbin_PROGRAMS += cfdisk
---- util-linux-2.13-pre4/fdisk/fdisk.8.gpt	2005-10-07 18:40:26.000000000 +0200
+--- util-linux-2.13-pre6/fdisk/fdisk.8.gpt	2005-11-24 15:30:36.000000000 +0100
-+++ util-linux-2.13-pre4/fdisk/fdisk.8	2005-10-07 18:40:26.000000000 +0200
++++ util-linux-2.13-pre6/fdisk/fdisk.8	2005-11-24 15:30:36.000000000 +0100
 @@ -42,6 +42,11 @@
  partition tables.
  It understands DOS type partition tables and BSD or SUN type disklabels.
@@ -101,8 +101,8 @@
  The
  .I device
  is usually one of the following:
---- util-linux-2.13-pre4/fdisk/sfdisk.8.gpt	2004-12-31 17:28:30.000000000 +0100
+--- util-linux-2.13-pre6/fdisk/sfdisk.8.gpt	2004-12-31 17:28:30.000000000 +0100
-+++ util-linux-2.13-pre4/fdisk/sfdisk.8	2005-10-07 18:40:26.000000000 +0200
++++ util-linux-2.13-pre6/fdisk/sfdisk.8	2005-11-24 15:30:36.000000000 +0100
 @@ -18,6 +18,11 @@
  on a device, check the partitions on a device, and - very dangerous -
  repartition a device.
@@ -115,8 +115,8 @@
  .SS "List Sizes"
  .BI "sfdisk \-s " partition
  gives the size of
---- /dev/null	2005-10-07 17:17:17.781101976 +0200
+--- /dev/null	2005-11-14 15:52:26.044616250 +0100
-+++ util-linux-2.13-pre4/fdisk/gpt.c	2005-10-07 18:40:26.000000000 +0200
++++ util-linux-2.13-pre6/fdisk/gpt.c	2005-11-24 15:30:36.000000000 +0100
 @@ -0,0 +1,287 @@
 +/*
 +    GPT (GUID Partition Table) signature detection. Based on libparted and 
@@ -405,8 +405,8 @@
 +	exit(EXIT_SUCCESS);
 +}
 +#endif
---- util-linux-2.13-pre4/fdisk/sfdisk.c.gpt	2005-08-14 17:14:18.000000000 +0200
+--- util-linux-2.13-pre6/fdisk/sfdisk.c.gpt	2005-10-16 14:18:32.000000000 +0200
-+++ util-linux-2.13-pre4/fdisk/sfdisk.c	2005-10-07 18:40:26.000000000 +0200
++++ util-linux-2.13-pre6/fdisk/sfdisk.c	2005-11-24 15:30:36.000000000 +0100
 @@ -50,6 +50,8 @@
  #include "nls.h"
  #include "common.h"
@@ -416,7 +416,7 @@
  #define SIZE(a)	(sizeof(a)/sizeof(a[0]))
  
  /*
-@@ -2476,6 +2478,23 @@
+@@ -2457,6 +2459,23 @@
  	return NULL;
  }	
  
@@ -440,7 +440,7 @@
  static void do_list(char *dev, int silent);
  static void do_size(char *dev, int silent);
  static void do_geom(char *dev, int silent);
-@@ -2621,6 +2640,7 @@
+@@ -2602,6 +2621,7 @@
  	while ((dev = nextproc()) != NULL) {
  	    if (is_ide_cdrom_or_tape(dev))
  		continue;
@@ -448,7 +448,7 @@
  	    if (opt_out_geom)
  		do_geom(dev, 1);
  	    if (opt_out_pt_geom)
-@@ -2648,6 +2668,7 @@
+@@ -2629,6 +2649,7 @@
  
      if (opt_list || opt_out_geom || opt_out_pt_geom || opt_size || verify) {
  	while (optind < argc) {
@@ -456,7 +456,7 @@
  	    if (opt_out_geom)
  	      do_geom(argv[optind], 0);
  	    if (opt_out_pt_geom)
-@@ -2676,6 +2697,7 @@
+@@ -2657,6 +2678,7 @@
  	  fatal(_("usage: sfdisk --change-id device partition-number Id\n"));
  	else if (optind != argc-3 && optind != argc-2)
  	  fatal(_("usage: sfdisk --id device partition-number [Id]\n"));
@@ -464,7 +464,7 @@
  	do_change_id(argv[optind], argv[optind+1],
  		     (optind == argc-2) ? 0 : argv[optind+2]);
  	exit(exit_status);
-@@ -2685,6 +2707,8 @@
+@@ -2666,6 +2688,8 @@
        fatal(_("can specify only one device (except with -l or -s)\n"));
      dev = argv[optind];
  
@@ -473,7 +473,7 @@
      if (opt_reread)
        do_reread(dev);
      else if (restore_sector_file)
-@@ -2861,6 +2885,8 @@
+@@ -2842,6 +2866,8 @@
  
      z = &oldp;
  
@@ -482,7 +482,7 @@
      rw = (!no_write && (arg || ac > 1));
      fd = my_open(dev, rw, 0);
  
-@@ -2934,6 +2960,8 @@
+@@ -2943,6 +2969,8 @@
  
      z = &oldp;
  

util-linux.spec

@@ -25,7 +25,7 @@ BuildRoot: %{_tmppath}/%{name}-root
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.10.pre5
+Release: 0.11.pre6
 License: distributable
 Group: System Environment/Base
 
@@ -43,8 +43,8 @@ BuildRequires: e2fsprogs-devel >= 1.36
 BuildRequires: audit-libs-devel >= 1.0.6
 
 ### Sources
-# TODO [stable]: s/2.13-pre5/%{version}/
+# TODO [stable]: s/2.13-pre6/%{version}/
-Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/util-linux-2.13-pre5.tar.bz2
+Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/util-linux-2.13-pre6.tar.bz2
 Source1: util-linux-selinux.pamd
 Source2: util-linux-chsh-chfn.pamd
 Source8: nologin.c
@@ -157,8 +157,11 @@ Patch215: util-linux-2.13-audit-login.patch
 Patch216: util-linux-2.13-ipcs-shmax.patch
 # 171337 - mkfs.cramfs dies creating installer image
 Patch217: util-linux-2.13-cramfs-maxentries.patch
-# [171337 too] - mkfs.cramfs doesn't work correctly with empty files
+# [also 171337] - mkfs.cramfs doesn't work correctly with empty files
 Patch218: util-linux-2.13-cramfs-zerofiles.patch
+# 172203 - mount man page in RHEL4 lacks any info on cifs mount options
+Patch219: util-linux-2.12a-mount-man-cifs.patch
+
 
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
@@ -172,9 +175,9 @@ program.
 
 %prep
 # TODO [stable]: remove -n
-%setup -q -a 11 -n util-linux-2.13-pre5
+%setup -q -a 11 -n util-linux-2.13-pre6
 
-%patch1 -p1 -b .moretc
+%patch1 -p1
 %patch70 -p1
 # nologin
 cp %{SOURCE8} %{SOURCE9} .
@@ -184,7 +187,7 @@ cp %{SOURCE8} %{SOURCE9} .
 %if %{include_raw}
 %patch109 -p1
 %endif
-%patch113 -p1 -b .ctty3
+%patch113 -p1
 %patch120 -p1
 %patch126 -p1
 %patch128 -p1
@@ -194,20 +197,20 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch150 -p0
 %patch151 -p1
 %patch153 -p1
-%patch157 -p1 -b .pamstart
+%patch157 -p1
-%patch159 -p1 -b .console
+%patch159 -p1
 %if %{include_raw}
 %patch160 -p1
 %endif
 %patch164 -p1
-%patch170 -p1 -b .nfsv4
+%patch170 -p1
 %patch171 -p1
 %patch172 -p1
 %patch173 -p1
 %patch174 -p1
-%patch180 -p1 -b .lastlog
+%patch180 -p1
 %patch181 -p1
-%patch182 -p1 -b .typo
+%patch182 -p1
 %patch183 -p1
 %patch184 -p1
 %patch185 -p1
@@ -215,21 +218,21 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch187 -p1
 %patch188 -p1
 %patch189 -p1
-%patch202 -p1 -b .audit
+%patch202 -p1
-%patch203 -p1 -b .gpt
+%patch203 -p1
 %patch204 -p1
 %patch205 -p1
-%patch206 -p1 -b .arch
+%patch206 -p1
-%patch210 -p1 -b .swsuspend
+%patch210 -p1
 %patch211 -p1
 %patch212 -p1
 %patch213 -p1
 %patch214 -p1
-# audit
 %patch215 -p1
 %patch216 -p1
 %patch217 -p1
 %patch218 -p1
+%patch219 -p1
 
 %build
 unset LINGUAS || :
@@ -613,6 +616,10 @@ fi
 /sbin/losetup
 
 %changelog
+* Fri Nov 25 2005 Karel Zak <kzak@redhat.com> 2.13-0.11.pre6
+- update to upstream version 2.13-pre6
+- fix #172203 - mount man page in RHEL4 lacks any info on cifs mount options
+
 * Mon Nov  7 2005 Karel Zak <kzak@redhat.com> 2.13-0.10.pre5
 - fix #171337 - mkfs.cramfs doesn't work correctly with empty files