OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=25

util-linux-2.12r-disk_utils_mkswap_fix.patch

@@ -1,17 +0,0 @@
-default swap to V1 in any case [#205956]
-
-Index: util-linux-ng-2.12r+git20070330/disk-utils/mkswap.c
-===================================================================
---- util-linux-ng-2.12r+git20070330.orig/disk-utils/mkswap.c
-+++ util-linux-ng-2.12r+git20070330/disk-utils/mkswap.c
-@@ -617,9 +617,7 @@ main(int argc, char ** argv) {
- 			version = 1;
- 		else
- 		/* use version 1 as default, if possible */
--		if (PAGES <= V0_MAX_PAGES && PAGES > V1_MAX_PAGES)
--			version = 0;
--		else if (linux_version_code() < MAKE_VERSION(2,1,117))
-+		if (linux_version_code() < MAKE_VERSION(2,1,117))
- 			version = 0;
- 		else if (pagesize < 2048)
- 			version = 0;

util-linux-2.12r-mount_mount.8_xfs_update.patch

@@ -1,17 +0,0 @@
-Index: mount/mount.8
-===================================================================
---- mount/mount.8.orig
-+++ mount/mount.8
-@@ -1841,6 +1841,12 @@ system call.
- .TP
- .B dmapi " / " xdsm
- Enable the DMAPI (Data Management API) event callouts.
-+Use with the "mtpt" option.
-+.TP
-+.BI  mtpt= mountpoint
-+Use with the "dmapi" option. The value specified here will be
-+included in the DMAPI mount event, and should be the path of
-+the actual mountpoint that is used.
- .TP
- .BI logbufs= value
- Set the number of in-memory log buffers.

util-linux-2.12r-sys_utils_readprofile_mapfile.patch

@@ -1,45 +0,0 @@
-diff -ruNp util-linux-2.12r/sys-utils/readprofile.c util-linux-2.12r.fix/sys-utils/readprofile.c
---- util-linux-2.12r/sys-utils/readprofile.c	2004-12-11 11:11:09.000000000 +1100
-+++ util-linux-2.12r.fix/sys-utils/readprofile.c	2006-05-19 17:45:56.000000000 +1000
-@@ -324,6 +324,7 @@ main(int argc, char **argv) {
- 	 */
- 	while (fgets(mapline,S_LEN,map)) {
- 		unsigned int this=0;
-+		int done = 0;
- 
- 		if (sscanf(mapline,"%llx %s %s",&next_add,mode,next_name)!=3) {
- 			fprintf(stderr,_("%s: %s(%i): wrong map line\n"),
-@@ -332,12 +333,17 @@ main(int argc, char **argv) {
- 		}
- 		header_printed = 0;
- 
--		/* ignore any LEADING (before a '[tT]' symbol is found)
--		   Absolute symbols */
--		if ((*mode == 'A' || *mode == '?') && total == 0) continue;
--		if (*mode != 'T' && *mode != 't' &&
--		    *mode != 'W' && *mode != 'w')
--			break;	/* only text is profiled */
-+		/* the kernel only profiles up to _etext */
-+		if (!strcmp(next_name, "_etext"))
-+			done = 1;
-+		else {
-+			/* ignore any LEADING (before a '[tT]' symbol is found)
-+			   Absolute symbols */
-+			if ((*mode == 'A' || *mode == '?') && total == 0) continue;
-+			if (*mode != 'T' && *mode != 't' &&
-+			    *mode != 'W' && *mode != 'w')
-+				break;	/* only text is profiled */
-+		}
- 
- 		if (indx >= len / sizeof(*buf)) {
- 			fprintf(stderr, _("%s: profile address out of range. "
-@@ -387,6 +393,8 @@ main(int argc, char **argv) {
- 		strcpy(fn_name,next_name);
- 
- 		maplineno++;
-+		if (done)
-+			break;
- 	}
- 
- 	/* clock ticks, out of kernel text - probably modules */
-

util-linux-2.13-schedutils_ionice_idle.patch

@@ -1,55 +0,0 @@
-From 19ab897e353f5a418590e2dcc07b91c3610f08bf Mon Sep 17 00:00:00 2001
-From: Matthias Koenig <mkoenig@suse.de>
-Date: Tue, 17 Jul 2007 14:58:42 +0200
-Subject: [PATCH] schedutils: cleanup ionice usage for idle class
-
-The idle class has no class data. It will print a warning if
-a prio argument is given for it, since this will be ignored.
-Output for idle class will not contain prio data.
-
-Signed-off-by: Matthias Koenig <mkoenig@suse.de>
----
- schedutils/ionice.c |   13 +++++++++----
- 1 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/schedutils/ionice.c b/schedutils/ionice.c
-index ac72121..2d23dd0 100644
---- a/schedutils/ionice.c
-+++ b/schedutils/ionice.c
-@@ -95,11 +95,11 @@ int main(int argc, char *argv[])
- 		switch (c) {
- 		case 'n':
- 			ioprio = strtol(optarg, NULL, 10);
--			set = 1;
-+			set |= 1;
- 			break;
- 		case 'c':
- 			ioprio_class = strtol(optarg, NULL, 10);
--			set = 1;
-+			set |= 2;
- 			break;
- 		case 'p':
- 			pid = strtol(optarg, NULL, 10);
-@@ -119,6 +119,8 @@ int main(int argc, char *argv[])
- 		case IOPRIO_CLASS_BE:
- 			break;
- 		case IOPRIO_CLASS_IDLE:
-+			if (set & 1)
-+				printf("Ignoring given class data for idle class\n");
- 			ioprio = 7;
- 			break;
- 		default:
-@@ -136,8 +138,11 @@ int main(int argc, char *argv[])
- 			perror("ioprio_get");
- 		else {
- 			ioprio_class = ioprio >> IOPRIO_CLASS_SHIFT;
--			ioprio = ioprio & 0xff;
--			printf("%s: prio %d\n", to_prio[ioprio_class], ioprio);
-+			if (ioprio_class != IOPRIO_CLASS_IDLE) {
-+				ioprio = ioprio & 0xff;
-+				printf("%s: prio %d\n", to_prio[ioprio_class], ioprio);
-+			} else
-+				printf("%s\n", to_prio[ioprio_class]);
- 		}
- 	} else {
- 		if (ioprio_set(IOPRIO_WHO_PROCESS, pid, ioprio | ioprio_class << IOPRIO_CLASS_SHIFT) == -1) {

util-linux-ng-2.13-rc2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:832e2bd4a0b4eb03589cc8a655603b12fd6734081de140e07016f1aea949598c
-size 2654222

util-linux-ng-2.13rc2+git20070725.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74640e1af0289d3be9397c8a7c8b62f147a3dbfad232fd4a7ec15a41e9ac1cf8
+size 1544622

util-linux.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jul 25 18:43:42 CEST 2007 - mkoenig@suse.de
+
+- update to git20070725
+- removed patches (merged upstream):
+  util-linux-2.12r-mount_mount.8_xfs_update.patch  
+  util-linux-2.12r-sys_utils_readprofile_mapfile.patch
+  util-linux-2.12r-disk_utils_mkswap_fix.patch
+  util-linux-2.13-schedutils_ionice_idle.patch
+
 -------------------------------------------------------------------
 Tue Jul 17 10:44:18 CEST 2007 - mkoenig@suse.de
 

util-linux.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package util-linux (Version 2.12r+2.13rc2)
+# spec file for package util-linux (Version 2.12r+2.13rc2+git20070725)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -20,9 +20,9 @@ PreReq:         %install_info_prereq permissions
 License:        BSD 3-Clause, GPL v2 or later
 Group:          System/Base
 Autoreqprov:    on
-Version:        2.12r+2.13rc2
+Version:        2.12r+2.13rc2+git20070725
 Release:        1
-%define upver 2.13-rc2
+%define upver 2.13rc2+git20070725
 Summary:        A collection of basic system utilities
 Source:         ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%upver.tar.bz2
 Source2:        nologin.c
@@ -56,14 +56,8 @@ Patch16:        util-linux-mount_opt_nofail.patch
 # 176582 - If the user doesn't specify -t <fstype> mount.fstype will never be called
 #TODO: check alternative upstream fix
 #Patch96:        util-linux-2.12r-mount_external_prog_on_guess.patch
-# 158955 - document xfs dmapi mount options better
-Patch26:        util-linux-2.12r-mount_mount.8_xfs_update.patch 
 # 160822 - fix for 153657
 Patch29:        util-linux-2.12r-fdisk_cyl.patch
-# 179122 - Fix readprofile on ppc64
-Patch30:        util-linux-2.12r-sys_utils_readprofile_mapfile.patch
-# 205956 - default swap to V1 in any case
-Patch32:        util-linux-2.12r-disk_utils_mkswap_fix.patch
 # 238687 - let mkfs tools open block devices with O_EXCL
 Patch34:        util-linux-2.12r-disk_utils_mkfs_open_exclusive.patch
 # 241372 - remove legacy warnings from fdisk
@@ -73,7 +67,6 @@ Patch35:        util-linux-2.12r-fdisk_remove_bogus_warnings.patch
 Patch38:        util-linux-2.12r-mount_swapon_swsuspend_resume.patch
 # suse48633 - util-linux on x86_64 does not contain "rdev" and "vidmode"
 Patch45:        util-linux-2.13-sys_utils_build_rdev_x86_64.patch
-Patch46:        util-linux-2.13-schedutils_ionice_idle.patch
 ##
 ## adjtimex
 ##
@@ -109,15 +102,15 @@ Authors:
 %setup -q -a 9 -b 10 -b 11 -b 12 -b 13 -n %name-ng-%upver
 %patch1 -p1
 %patch16 -p1
-%patch26
+#%patch26
 %patch29 -p1
-%patch30 -p1
+#%patch30 -p1
-%patch32 -p1
+#%patch32 -p1
 %patch34 -p1
 %patch35 -p1
 #%patch38 -p1
 %patch45 -p1
-%patch46 -p1
+#%patch46 -p1
 #
 cd adjtimex-*
 %patch50 -p1
@@ -181,8 +174,8 @@ make setctsid CFLAGS="$RPM_OPT_FLAGS"
 CFLAGS=-DCONFIG_SMP
 %endif
 # Use autogen, when building from git tree
-autoreconf -fi
+#autoreconf -fi
-#./autogen.sh
+./autogen.sh
 ./configure --mandir=%{_mandir} \
             --datadir=%{_datadir} \
 	    --with-fsprobe=volume_id \
@@ -558,6 +551,13 @@ fi
 #%endif
 
 %changelog
+* Wed Jul 25 2007 - mkoenig@suse.de
+- update to git20070725
+- removed patches (merged upstream):
+  util-linux-2.12r-mount_mount.8_xfs_update.patch
+  util-linux-2.12r-sys_utils_readprofile_mapfile.patch
+  util-linux-2.12r-disk_utils_mkswap_fix.patch
+  util-linux-2.13-schedutils_ionice_idle.patch
 * Tue Jul 17 2007 - mkoenig@suse.de
 - updated to version 2.13-rc2:
   * add wakertc