Tue Dec 23 00:13:26 UTC 2008

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5318

Modified Files:
	.cvsignore sources util-linux-ng-2.13-fdisk-b-4096.patch 
	util-linux-ng-2.13-login-lastlog.patch 
	util-linux-ng-2.13-login-pamstart.patch 
	util-linux-ng-2.14-mount-managed.patch util-linux-ng.spec 
Added Files:
	util-linux-ng-2.14-ipcs-32bit.patch 
Removed Files:
	util-linux-ng-2.13-ipcs-32bit.patch 
	util-linux-ng-2.14-fdisk-cylinder.patch 
	util-linux-ng-2.14-mount-file_t.patch 
	util-linux-ng-2.14-mount-man-tmpfs.patch 
Log Message:
* Mon Dec 22 2008 Karel Zak <kzak at redhat.com> 2.14.2-0.1
- upgrade to 2.14.2-rc1
- refresh old patches


util-linux-ng-2.14-ipcs-32bit.patch:

--- NEW FILE util-linux-ng-2.14-ipcs-32bit.patch ---
diff -up util-linux-ng-2.14.2-rc1/sys-utils/ipcs.c.kzak util-linux-ng-2.14.2-rc1/sys-utils/ipcs.c
--- util-linux-ng-2.14.2-rc1/sys-utils/ipcs.c.kzak	2008-12-22 18:53:06.000000000 +0100
+++ util-linux-ng-2.14.2-rc1/sys-utils/ipcs.c	2008-12-22 19:31:20.000000000 +0100
@@ -253,6 +253,26 @@ print_perms (int id, struct ipc_perm *ip
 		printf(" %-10d\n", ipcp->gid);
 }
 
+static unsigned long long
+shminfo_from_proc(const char *name, unsigned long def)
+{
+	char path[256];
+	char buf[64];
+	FILE *f;
+	unsigned long long res = def;
+
+	if (!name)
+		return res;
+
+	snprintf(path, sizeof(path), "/proc/sys/kernel/%s", name);
+
+	if (!(f = fopen(path, "r")))
+		return res;
+	if (fgets(buf, sizeof(buf), f))
+		res = atoll(buf);
+	fclose(f);
+	return res;
+}
 
 void do_shm (char format)
 {
@@ -268,7 +288,7 @@ void do_shm (char format)
 		printf (_("kernel not configured for shared memory\n"));
 		return;
 	}
-	
+
 	switch (format) {
 	case LIMITS:
 		printf (_("------ Shared Memory Limits --------\n"));
@@ -276,12 +296,12 @@ void do_shm (char format)
 			return;
 		/* glibc 2.1.3 and all earlier libc's have ints as fields
 		   of struct shminfo; glibc 2.1.91 has unsigned long; ach */
-		printf (_("max number of segments = %lu\n"),
-			(unsigned long) shminfo.shmmni);
-		printf (_("max seg size (kbytes) = %lu\n"),
-			(unsigned long) (shminfo.shmmax >> 10));
+		printf (_("max number of segments = %llu\n"),
+			shminfo_from_proc("shmmni", shminfo.shmmni));
+		printf (_("max seg size (kbytes) = %llu\n"),
+			(shminfo_from_proc("shmmax", shminfo.shmmax) >> 10));
 		printf (_("max total shared memory (kbytes) = %llu\n"),
-			getpagesize() / 1024 * (unsigned long long) shminfo.shmall);
+			getpagesize() / 1024 * shminfo_from_proc("shmall", shminfo.shmall));
 		printf (_("min seg size (bytes) = %lu\n"),
 			(unsigned long) shminfo.shmmin);
 		return;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	10 Sep 2008 11:47:47 -0000	1.13
+++ .cvsignore	23 Dec 2008 00:12:55 -0000	1.14
@@ -1,2 +1,2 @@
-util-linux-ng-2.14.1.tar.bz2
+util-linux-ng-2.14.2-rc1.tar.bz2
 floppy-0.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	10 Sep 2008 11:47:47 -0000	1.13
+++ sources	23 Dec 2008 00:12:56 -0000	1.14
@@ -1,2 +1,2 @@
-9aab772ee9b1f4e67dff98169f3cb380  util-linux-ng-2.14.1.tar.bz2
+620a0b46dd7a98d541299ac5a8772d98  util-linux-ng-2.14.2-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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util-linux-ng-2.13-fdisk-b-4096.patch	14 Aug 2008 00:37:00 -0000	1.2
+++ util-linux-ng-2.13-fdisk-b-4096.patch	23 Dec 2008 00:12:56 -0000	1.3
@@ -1,8 +1,8 @@
-Index: util-linux-ng-2.14.1-rc1/fdisk/fdisk.c
+Index: util-linux-ng-2.14.2-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) {
+--- util-linux-ng-2.14.2-rc1.orig/fdisk/fdisk.c
++++ util-linux-ng-2.14.2-rc1/fdisk/fdisk.c
+@@ -2591,7 +2591,7 @@ main(int argc, char **argv) {
  			*/
  			sector_size = atoi(optarg);
  			if (sector_size != 512 && sector_size != 1024 &&

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

Index: util-linux-ng-2.13-login-lastlog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng-2.13-login-lastlog.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-ng-2.13-login-lastlog.patch	20 Aug 2007 10:48:20 -0000	1.1
+++ util-linux-ng-2.13-login-lastlog.patch	23 Dec 2008 00:12:56 -0000	1.2
@@ -1,6 +1,8 @@
---- util-linux-ng-2.13-rc3/login-utils/login.c.xxx	2007-08-13 12:11:14.000000000 +0200
-+++ util-linux-ng-2.13-rc3/login-utils/login.c	2007-08-13 12:12:24.000000000 +0200
-@@ -1402,7 +1402,7 @@
+Index: util-linux-ng-2.14.2-rc1/login-utils/login.c
+===================================================================
+--- util-linux-ng-2.14.2-rc1.orig/login-utils/login.c
++++ util-linux-ng-2.14.2-rc1/login-utils/login.c
+@@ -1415,7 +1415,7 @@ dolastlog(int quiet) {
      struct lastlog ll;
      int fd;
  

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util-linux-ng-2.13-login-pamstart.patch	14 Aug 2008 00:37:00 -0000	1.2
+++ util-linux-ng-2.13-login-pamstart.patch	23 Dec 2008 00:12:56 -0000	1.3
@@ -1,8 +1,8 @@
-Index: util-linux-ng-2.14.1-rc1/login-utils/login.c
+Index: util-linux-ng-2.14.2-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)
+--- util-linux-ng-2.14.2-rc1.orig/login-utils/login.c
++++ util-linux-ng-2.14.2-rc1/login-utils/login.c
+@@ -555,7 +555,7 @@ main(int argc, char **argv)
       * Therefore, we are safe not setting it to anything
       */
  

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

Index: util-linux-ng-2.14-mount-managed.patch
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng-2.14-mount-managed.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-ng-2.14-mount-managed.patch	19 May 2008 11:48:40 -0000	1.1
+++ util-linux-ng-2.14-mount-managed.patch	23 Dec 2008 00:12:56 -0000	1.2
@@ -1,7 +1,8 @@
-diff -up util-linux-ng-2.14-rc3/mount/mount.c.mng util-linux-ng-2.14-rc3/mount/mount.c
---- util-linux-ng-2.14-rc3/mount/mount.c.mng	2008-05-14 12:55:32.000000000 +0200
-+++ util-linux-ng-2.14-rc3/mount/mount.c	2008-05-19 12:11:39.000000000 +0200
-@@ -176,6 +176,8 @@ static const struct opt_map opt_map[] = 
+Index: util-linux-ng-2.14.2-rc1/mount/mount.c
+===================================================================
+--- util-linux-ng-2.14.2-rc1.orig/mount/mount.c
++++ util-linux-ng-2.14.2-rc1/mount/mount.c
+@@ -180,6 +180,8 @@ static const struct opt_map opt_map[] = 
    { "norelatime", 0, 1, MS_RELATIME }, /* Update access time without regard
  					  to mtime/ctime */
  #endif


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- util-linux-ng.spec	21 Nov 2008 14:47:23 -0000	1.35
+++ util-linux-ng.spec	23 Dec 2008 00:12:56 -0000	1.36
@@ -1,12 +1,14 @@
 ### Header
 Summary: A collection of basic system utilities
 Name: util-linux-ng
-Version: 2.14.1
-Release: 5%{?dist}
+Version: 2.14.2
+Release: 0.1%{?dist}
 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
 
+%define upstream_version %{version}-rc1
+
 ### Features
 %if 0%{?rhel}
 %define include_raw 1
@@ -35,7 +37,7 @@
 BuildRequires: popt-devel
 
 ### Sources
-Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/util-linux-ng-%{version}.tar.bz2
+Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/util-linux-ng-%{upstream_version}.tar.bz2
 Source1: util-linux-ng-login.pamd
 Source2: util-linux-ng-remote.pamd
 Source3: util-linux-ng-chsh-chfn.pamd
@@ -92,17 +94,11 @@
 # 218915 - fdisk -b 4K (move to upstream?)
 Patch7: util-linux-ng-2.13-fdisk-b-4096.patch
 # 231192 - ipcs is not printing correct values on pLinux
-Patch8: util-linux-ng-2.13-ipcs-32bit.patch
+Patch8: util-linux-ng-2.14-ipcs-32bit.patch
 # add a missing header
 Patch9: util-linux-ng-2.13-floppy-locale.patch
 # remove partitions
 Patch10: util-linux-ng-2.14-blockdev-rmpart.patch
-# 390691: mount should check selinux context on mount, and warn on file_t
-Patch11: util-linux-ng-2.14-mount-file_t.patch
-# 465761: mount manpage is missing uid/gid mount options for tmpfs (upstream patch)
-Patch12: util-linux-ng-2.14-mount-man-tmpfs.patch
-# 472502: Problem with fdisk and use +sectors for the end of partition (upstream patch)
-Patch13: util-linux-ng-2.14-fdisk-cylinder.patch
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -111,7 +107,7 @@
 program.
 
 %prep
-%setup -q -a 11 -n %{name}-%{version}
+%setup -q -a 11 -n %{name}-%{upstream_version}
 cp %{SOURCE8} %{SOURCE9} .
 
 %patch0 -p1
@@ -124,9 +120,6 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
 
 %build
 unset LINGUAS || :
@@ -519,6 +512,10 @@
 /sbin/losetup
 
 %changelog
+* Mon Dec 22 2008 Karel Zak <kzak at redhat.com> 2.14.2-0.1
+- upgrade to 2.14.2-rc1
+- refresh old patches
+
 * Fri Nov 21 2008 Karel Zak <kzak at redhat.com> 2.14.1-5
 - fix #472502 - problem with fdisk and use +sectors for the end of partition
 


--- util-linux-ng-2.13-ipcs-32bit.patch DELETED ---


--- util-linux-ng-2.14-fdisk-cylinder.patch DELETED ---


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


--- util-linux-ng-2.14-mount-man-tmpfs.patch DELETED ---


