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

util-linux.spec

@@ -21,7 +21,7 @@ License:        BSD 3-Clause, GPL v2 or later
 Group:          System/Base
 Autoreqprov:    on
 Version:        2.12r+2.13rc2+git20070725
-Release:        14
+Release:        16
 %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
@@ -52,27 +52,28 @@ Source30:       README.largedisk
 # add hostid
 Patch1:         util-linux-2.12-misc_utils_hostid.patch
 # 104405 - mount -a doesn't work with hotpluggable devices
-Patch16:        util-linux-mount_opt_nofail.patch
+Patch2:         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
 # 160822 - fix for 153657
-Patch29:        util-linux-2.12r-fdisk_cyl.patch
+Patch3:         util-linux-2.12r-fdisk_cyl.patch
 # 238687 - let mkfs tools open block devices with O_EXCL
-Patch34:        util-linux-2.12r-disk_utils_mkfs_open_exclusive.patch
+Patch4:         util-linux-2.12r-disk_utils_mkfs_open_exclusive.patch
 # 241372 - remove legacy warnings from fdisk
-Patch35:        util-linux-2.12r-fdisk_remove_bogus_warnings.patch
+Patch5:         util-linux-2.12r-fdisk_remove_bogus_warnings.patch
 # 254437 - swapon should automatically reset the suspend signature
 # TODO: Needs to be ported to new version
 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
+Patch6:         util-linux-2.13-sys_utils_build_rdev_x86_64.patch
 # 297172 - mount does not free loop devices if it fails
-Patch46:        util-linux-2.13-loop.patch 
-Patch47:        util-linux-2.13-mount_create_mtab.patch
-Patch48:        util-linux-2.13-schedutils_error_handling.patch
+Patch7:         util-linux-2.13-loop.patch 
+Patch8:         util-linux-2.13-mount_create_mtab.patch
+Patch9:         util-linux-2.13-schedutils_error_handling.patch
 # 304861 - support password hashing and key length
-Patch49:        cryptsetup-2.13-crypto.diff
+Patch10:        cryptsetup-2.13-crypto.diff
+Patch11:        util-linux-2.13-mount_fd_leak.patch
 ##
 ##
 ## adjtimex
@@ -108,19 +109,17 @@ Authors:
 %prep
 %setup -q -a 9 -b 10 -b 11 -b 12 -b 13 -n %name-ng-%upver
 %patch1 -p1
-%patch16 -p1
-#%patch26
-%patch29 -p1
-#%patch30 -p1
-#%patch32 -p1
-%patch34 -p1
-%patch35 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 #%patch38 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 #
 cd adjtimex-*
 %patch50 -p1
@@ -561,6 +560,8 @@ fi
 #%endif
 
 %changelog
+* Wed Aug 29 2007 - mkoenig@suse.de
+- fix fd leaks in previous patch
 * Tue Aug 28 2007 - lnussel@suse.de
 - add support for specifying the key length and password hash
   algorithm [#304861]