rpms/util-linux-ng/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 util-linux-ng-2.13-fdisk-b-4096.patch, 1.1, 1.2 util-linux-ng-2.13-login-pamstart.patch, 1.1, 1.2 util-linux-ng-2.13-mount-pamconsole.patch, 1.1, 1.2 util-linux-ng-2.14-mount-file_t.patch, 1.2, 1.3 util-linux-ng.spec, 1.28, 1.29

Karel Zak (kzak) fedora-extras-commits at redhat.com
Thu Aug 14 00:37:31 UTC 2008 

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18593

Modified Files:
	.cvsignore sources util-linux-ng-2.13-fdisk-b-4096.patch 
	util-linux-ng-2.13-login-pamstart.patch 
	util-linux-ng-2.13-mount-pamconsole.patch 
	util-linux-ng-2.14-mount-file_t.patch util-linux-ng.spec 
Log Message:
* Thu Aug 14 2008 Karel Zak <kzak at redhat.com> 2.14.1-0.1
- upgrade to 2.14.1-rc1
- refresh old patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	9 Jun 2008 13:21:22 -0000	1.11
+++ .cvsignore	14 Aug 2008 00:37:00 -0000	1.12
@@ -1,2 +1,2 @@
-util-linux-ng-2.14.tar.bz2
+util-linux-ng-2.14.1-rc1.tar.bz2
 floppy-0.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	9 Jun 2008 13:21:22 -0000	1.11
+++ sources	14 Aug 2008 00:37:00 -0000	1.12
@@ -1,2 +1,2 @@
-23f227da49df36f33fe47e917e332cd8  util-linux-ng-2.14.tar.bz2
+1af388cc2d5d2d2c7266267796116cea  util-linux-ng-2.14.1-rc1.tar.bz2
 7eeb9a6f7a258174bf0fa80f1370788d  floppy-0.16.tar.bz2

util-linux-ng-2.13-fdisk-b-4096.patch:

Index: util-linux-ng-2.13-fdisk-b-4096.patch
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng-2.13-fdisk-b-4096.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-ng-2.13-fdisk-b-4096.patch	20 Aug 2007 10:48:20 -0000	1.1
+++ util-linux-ng-2.13-fdisk-b-4096.patch	14 Aug 2008 00:37:00 -0000	1.2
@@ -1,6 +1,8 @@
---- util-linux-ng-2.13-rc3/fdisk/fdisk.c.kzak	2007-07-16 23:15:33.000000000 +0200
-+++ util-linux-ng-2.13-rc3/fdisk/fdisk.c	2007-08-13 12:15:42.000000000 +0200
-@@ -2588,7 +2588,7 @@
+Index: util-linux-ng-2.14.1-rc1/fdisk/fdisk.c
+===================================================================
+--- util-linux-ng-2.14.1-rc1.orig/fdisk/fdisk.c
++++ util-linux-ng-2.14.1-rc1/fdisk/fdisk.c
+@@ -2589,7 +2589,7 @@ main(int argc, char **argv) {
  			*/
  			sector_size = atoi(optarg);
  			if (sector_size != 512 && sector_size != 1024 &&

util-linux-ng-2.13-login-pamstart.patch:

Index: util-linux-ng-2.13-login-pamstart.patch
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng-2.13-login-pamstart.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-ng-2.13-login-pamstart.patch	20 Aug 2007 10:48:20 -0000	1.1
+++ util-linux-ng-2.13-login-pamstart.patch	14 Aug 2008 00:37:00 -0000	1.2
@@ -1,11 +1,13 @@
---- util-linux-ng-2.13-rc3/login-utils/login.c.kzak	2007-06-29 01:13:51.000000000 +0200
-+++ util-linux-ng-2.13-rc3/login-utils/login.c	2007-08-13 11:32:10.000000000 +0200
-@@ -546,7 +546,7 @@
+Index: util-linux-ng-2.14.1-rc1/login-utils/login.c
+===================================================================
+--- util-linux-ng-2.14.1-rc1.orig/login-utils/login.c
++++ util-linux-ng-2.14.1-rc1/login-utils/login.c
+@@ -542,7 +542,7 @@ main(int argc, char **argv)
       * Therefore, we are safe not setting it to anything
       */
  
 -    retcode = pam_start("login",username, &conv, &pamh);
 +    retcode = pam_start(hflag?"remote":"login",username, &conv, &pamh);
      if(retcode != PAM_SUCCESS) {
- 	fprintf(stderr, _("login: PAM Failure, aborting: %s\n"),
- 		pam_strerror(pamh, retcode));
+ 	fprintf(stderr, _("%s: PAM failure, aborting: %s\n"),
+ 		"login", pam_strerror(pamh, retcode));

util-linux-ng-2.13-mount-pamconsole.patch:

Index: util-linux-ng-2.13-mount-pamconsole.patch
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng-2.13-mount-pamconsole.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-ng-2.13-mount-pamconsole.patch	20 Aug 2007 10:48:20 -0000	1.1
+++ util-linux-ng-2.13-mount-pamconsole.patch	14 Aug 2008 00:37:00 -0000	1.2
@@ -1,6 +1,8 @@
---- util-linux-ng-2.13-rc3/mount/umount.c.xxx	2007-05-30 10:18:12.000000000 +0200
-+++ util-linux-ng-2.13-rc3/mount/umount.c	2007-08-13 12:02:07.000000000 +0200
-@@ -434,7 +434,7 @@
+Index: util-linux-ng-2.14.1-rc1/mount/umount.c
+===================================================================
+--- util-linux-ng-2.14.1-rc1.orig/mount/umount.c
++++ util-linux-ng-2.14.1-rc1/mount/umount.c
+@@ -461,7 +461,7 @@ static int
  umount_file (char *arg) {
  	struct mntentchn *mc, *fs;
  	const char *file, *options;
@@ -9,7 +11,7 @@
  	int ok;
  
  	if (!*arg) {		/* "" would be expanded to `pwd` */
-@@ -521,13 +521,16 @@
+@@ -548,13 +548,16 @@ umount_file (char *arg) {
  		fstab_has_users = contains(options, "users");
  		fstab_has_owner = contains(options, "owner");
  		fstab_has_group = contains(options, "group");
@@ -27,7 +29,7 @@
  			char *user = getusername();
  
  			options = mc->m.mnt_opts;
-@@ -537,6 +540,14 @@
+@@ -564,6 +567,14 @@ umount_file (char *arg) {
  
  			if (user && mtab_user && streq (user, mtab_user))
  				ok = 1;
@@ -42,9 +44,11 @@
  		}
  		if (!ok)
  			die (2, _("umount: only %s can unmount %s from %s"),
---- util-linux-ng-2.13-rc3/mount/fstab.5.xxx	2007-07-03 01:56:04.000000000 +0200
-+++ util-linux-ng-2.13-rc3/mount/fstab.5	2007-08-13 12:02:07.000000000 +0200
-@@ -156,10 +156,10 @@
+Index: util-linux-ng-2.14.1-rc1/mount/fstab.5
+===================================================================
+--- util-linux-ng-2.14.1-rc1.orig/mount/fstab.5
++++ util-linux-ng-2.14.1-rc1/mount/fstab.5
+@@ -159,10 +159,10 @@ For documentation on all nfs-specific op
  .BR nfs (5).
  Common for all types of file system are the options ``noauto''
  (do not mount when "mount -a" is given, e.g., at boot time), ``user''
@@ -58,9 +62,11 @@
  For more details, see
  .BR mount (8).
  
---- util-linux-ng-2.13-rc3/mount/mount.c.xxx	2007-08-13 12:00:15.000000000 +0200
-+++ util-linux-ng-2.13-rc3/mount/mount.c	2007-08-13 12:05:15.000000000 +0200
-@@ -108,14 +108,15 @@
+Index: util-linux-ng-2.14.1-rc1/mount/mount.c
+===================================================================
+--- util-linux-ng-2.14.1-rc1.orig/mount/mount.c
++++ util-linux-ng-2.14.1-rc1/mount/mount.c
+@@ -102,14 +102,15 @@ struct opt_map {
  #define MS_USER		0x20000000
  #define MS_OWNER	0x10000000
  #define MS_GROUP	0x08000000
@@ -78,7 +84,7 @@
  
  #define MS_PROPAGATION  (MS_SHARED|MS_SLAVE|MS_UNBINDABLE|MS_PRIVATE)
  
-@@ -155,6 +156,8 @@
+@@ -149,6 +150,8 @@ static const struct opt_map opt_map[] = 
    { "comment",	0, 0, MS_COMMENT},	/* fstab comment only (kudzu,_netdev)*/
  
    /* add new options here */
@@ -87,7 +93,7 @@
  #ifdef MS_NOSUB
    { "sub",	0, 1, MS_NOSUB	},	/* allow submounts */
    { "nosub",	0, 0, MS_NOSUB	},	/* don't allow submounts */
-@@ -379,7 +382,7 @@
+@@ -371,7 +374,7 @@ parse_opt(char *opt, int *mask, char **e
  				*mask &= ~om->mask;
  			else
  				*mask |= om->mask;
@@ -96,7 +102,7 @@
  			    && !om->inv)
  				*mask |= MS_SECURE;
  			if ((om->mask == MS_OWNER || om->mask == MS_GROUP)
-@@ -807,7 +810,29 @@
+@@ -810,7 +813,29 @@ suid_check(const char *spec, const char 
  	  }
        }
  
@@ -127,7 +133,7 @@
  	 allow an arbitrary user to mount when he is the owner of
  	 the mount-point and has write-access to the device.
  	 This is even less secure. Let me skip it for the time being;
-@@ -823,7 +848,7 @@
+@@ -826,7 +851,7 @@ suid_check(const char *spec, const char 
  	  *user = getusername();
    }
  
@@ -135,4 +141,4 @@
 +  *flags &= ~(MS_OWNER | MS_GROUP | MS_PAMCONSOLE);
  }
  
- static int
+ /* Check, if there already exists a mounted loop device on the mountpoint node

util-linux-ng-2.14-mount-file_t.patch:

Index: util-linux-ng-2.14-mount-file_t.patch
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng-2.14-mount-file_t.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util-linux-ng-2.14-mount-file_t.patch	23 Jul 2008 23:44:27 -0000	1.2
+++ util-linux-ng-2.14-mount-file_t.patch	14 Aug 2008 00:37:00 -0000	1.3
@@ -1,6 +1,7 @@
-diff -up util-linux-ng-2.14/mount/mount.c.kzak util-linux-ng-2.14/mount/mount.c
---- util-linux-ng-2.14/mount/mount.c.kzak	2008-07-24 01:26:39.000000000 +0200
-+++ util-linux-ng-2.14/mount/mount.c	2008-07-24 01:27:56.000000000 +0200
+Index: util-linux-ng-2.14.1-rc1/mount/mount.c
+===================================================================
+--- util-linux-ng-2.14.1-rc1.orig/mount/mount.c
++++ util-linux-ng-2.14.1-rc1/mount/mount.c
 @@ -332,7 +332,7 @@ append_context(const char *optname, char
  	security_context_t raw = NULL;
  	char *data = NULL;


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- util-linux-ng.spec	23 Jul 2008 23:44:27 -0000	1.28
+++ util-linux-ng.spec	14 Aug 2008 00:37:00 -0000	1.29
@@ -1,8 +1,9 @@
 ### Header
 Summary: A collection of basic system utilities
 Name: util-linux-ng
-Version: 2.14
-Release: 3%{?dist}
+Version: 2.14.1
+Release: 0.1%{?dist}
+%define upstream_suffix	-rc1
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -35,7 +36,7 @@
 BuildRequires: popt-devel
 
 ### Sources
-Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/util-linux-ng-2.14.tar.bz2
+Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/util-linux-ng-%{version}%{upstream_suffix}.tar.bz2
 Source1: util-linux-ng-login.pamd
 Source2: util-linux-ng-remote.pamd
 Source3: util-linux-ng-chsh-chfn.pamd
@@ -108,7 +109,7 @@
 program.
 
 %prep
-%setup -q -a 11
+%setup -q -a 11 -n %{name}-%{version}%{upstream_suffix}
 cp %{SOURCE8} %{SOURCE9} .
 
 %patch0 -p1
@@ -122,7 +123,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1 -b .kzak
+%patch11 -p1
 
 %build
 unset LINGUAS || :
@@ -515,6 +516,10 @@
 /sbin/losetup
 
 %changelog
+* Thu Aug 14 2008 Karel Zak <kzak at redhat.com> 2.14.1-0.1
+- upgrade to 2.14.1-rc1
+- refresh old patches
+
 * Thu Jul 24 2008 Karel Zak <kzak at redhat.com> 2.14-3
 - update util-linux-ng-2.14-mount-file_t.patch to make
   the SELinux warning optional (verbose mode is required)

More information about the fedora-extras-commits mailing list