From 3af0347d1b4b47c09bb049833dd4db31fcff1f54538c4cb673728f44db160243 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 13 Oct 2009 11:53:50 +0000 Subject: [PATCH 1/6] Accepting request 22331 from home:a_jaeger:branches:openSUSE:Factory Copy from home:a_jaeger:branches:openSUSE:Factory/util-linux via accept of submit request 22331 revision 2. Request was accepted with message: thanks OBS-URL: https://build.opensuse.org/request/show/22331 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=13 --- baselibs.conf | 2 +- util-linux.changes | 5 ----- util-linux.spec | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 5d89a17..1cd6fed 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,6 @@ libuuid1 libuuid-devel - requires -libuuid- + requires -libuid- requires "libuuid1- = " requires -libblkid- requires "libblkid1- = " diff --git a/util-linux.changes b/util-linux.changes index 820f4e0..bf3e481 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Oct 20 12:14:24 CEST 2009 - dmueller@suse.de - -- fix typo in baselibs.conf change - ------------------------------------------------------------------- Tue Oct 13 11:23:07 UTC 2009 - aj@suse.de diff --git a/util-linux.spec b/util-linux.spec index 7f0c6f7..31177ab 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -29,7 +29,7 @@ License: BSD 3-clause (or similar) ; GPL v2 or later Group: System/Base AutoReqProv: on Version: 2.16 -Release: 4 +Release: 3 Requires: %name-lang = %{version} Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2 From 07968f8203ca7240d4deabd20b2d35426d3dcccc17c3f34549f0288583dc6efc Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 20 Oct 2009 10:14:36 +0000 Subject: [PATCH 2/6] - fix typo in baselibs.conf change OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=14 --- baselibs.conf | 2 +- util-linux.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/baselibs.conf b/baselibs.conf index 1cd6fed..5d89a17 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,6 @@ libuuid1 libuuid-devel - requires -libuid- + requires -libuuid- requires "libuuid1- = " requires -libblkid- requires "libblkid1- = " diff --git a/util-linux.changes b/util-linux.changes index bf3e481..820f4e0 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 20 12:14:24 CEST 2009 - dmueller@suse.de + +- fix typo in baselibs.conf change + ------------------------------------------------------------------- Tue Oct 13 11:23:07 UTC 2009 - aj@suse.de From 61fcd97ba05c771037f2edabee14c60571ee0f22332cb700c0fd28f3b8dd615b Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 21 Oct 2009 00:02:08 +0000 Subject: [PATCH 3/6] checked in OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=15 --- baselibs.conf | 4 ---- util-linux.changes | 10 ---------- 2 files changed, 14 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 5d89a17..4ce6559 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,13 +1,9 @@ libuuid1 libuuid-devel - requires -libuuid- - requires "libuuid1- = " requires -libblkid- requires "libblkid1- = " libblkid1 obsoletes "e2fsprogs- <= " libblkid-devel - requires -libblkid- - requires "libblkid1- = " requires -libuuid- requires "libuuid1- = " diff --git a/util-linux.changes b/util-linux.changes index 820f4e0..42af8cc 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue Oct 20 12:14:24 CEST 2009 - dmueller@suse.de - -- fix typo in baselibs.conf change - -------------------------------------------------------------------- -Tue Oct 13 11:23:07 UTC 2009 - aj@suse.de - -- Fix requires of 32-bit devel packages. - ------------------------------------------------------------------- Tue Sep 29 12:58:37 UTC 2009 - hvogel@novell.com From 542dce636bdf9c499a1bf39128a7127bfc1946936e6cc3c2a76e66a7db28776b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 27 Oct 2009 07:58:59 +0000 Subject: [PATCH 4/6] Accepting request 23205 from home:elvigia:branches:Base:System Copy from home:elvigia:branches:Base:System/util-linux via accept of submit request 23205 revision 2. Request was accepted with message: Missing from factory, indeed OBS-URL: https://build.opensuse.org/request/show/23205 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=16 --- baselibs.conf | 4 ++++ util-linux-ng-bnc503008.patch | 24 ++++++++++++++++++++++++ util-linux.changes | 15 +++++++++++++++ util-linux.spec | 4 +++- 4 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 util-linux-ng-bnc503008.patch diff --git a/baselibs.conf b/baselibs.conf index 4ce6559..5d89a17 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,9 +1,13 @@ libuuid1 libuuid-devel + requires -libuuid- + requires "libuuid1- = " requires -libblkid- requires "libblkid1- = " libblkid1 obsoletes "e2fsprogs- <= " libblkid-devel + requires -libblkid- + requires "libblkid1- = " requires -libuuid- requires "libuuid1- = " diff --git a/util-linux-ng-bnc503008.patch b/util-linux-ng-bnc503008.patch new file mode 100644 index 0000000..1482097 --- /dev/null +++ b/util-linux-ng-bnc503008.patch @@ -0,0 +1,24 @@ +commit fdf08588af55d07a99b411708a08f4ebe6819706 +Author: Theodore Ts'o +Date: Sat Oct 3 12:50:06 2009 -0400 + + lib: fix file descriptor leak in is_mounted() + + Remove an extraneous fopen() that leaks memory and a file descriptor. + + Signed-off-by: "Theodore Ts'o" + +diff --git a/lib/ismounted.c b/lib/ismounted.c +index 28ae325..fbe91f9 100644 +--- a/lib/ismounted.c ++++ b/lib/ismounted.c +@@ -70,9 +70,6 @@ static int check_mntent_file(const char *mtab_file, const char *file, + char buf[1024], *device = 0, *mnt_dir = 0, *cp; + + *mount_flags = 0; +- if ((f = fopen(mtab_file, "r")) == NULL) +- return errno; +- + if ((f = setmntent (mtab_file, "r")) == NULL) + return errno; + if (stat(file, &st_buf) == 0) { diff --git a/util-linux.changes b/util-linux.changes index 42af8cc..cb4f923 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Oct 26 17:45:53 UTC 2009 - crrodriguez@opensuse.org + +- fsck during boot up fails with Too many open files [bnc#503008] + +------------------------------------------------------------------- +Tue Oct 20 12:14:24 CEST 2009 - dmueller@suse.de + +- fix typo in baselibs.conf change + +------------------------------------------------------------------- +Tue Oct 13 11:23:07 UTC 2009 - aj@suse.de + +- Fix requires of 32-bit devel packages. + ------------------------------------------------------------------- Tue Sep 29 12:58:37 UTC 2009 - hvogel@novell.com diff --git a/util-linux.spec b/util-linux.spec index 31177ab..9777302 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -29,7 +29,7 @@ License: BSD 3-clause (or similar) ; GPL v2 or later Group: System/Base AutoReqProv: on Version: 2.16 -Release: 3 +Release: 4 Requires: %name-lang = %{version} Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2 @@ -68,6 +68,7 @@ Patch1: util-linux-2.12r-fdisk_remove_bogus_warnings.patch Patch2: util-linux-2.14.1-mount_skip_sync.patch # crypto patch Patch3: util-linux-mount_losetup_crypto.patch +Patch4: util-linux-ng-bnc503008.patch ## ## adjtimex ## @@ -152,6 +153,7 @@ unique IDs (UUIDs). %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # cd adjtimex-* %patch50 -p1 From badf54a788f70cd994c03dbb71c6f9d3e20fb74e929dc90e2961419115fb8698 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 27 Oct 2009 15:47:31 +0000 Subject: [PATCH 5/6] checked in OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=17 --- util-linux-ng-bnc503008.patch | 24 ------------------------ util-linux.changes | 5 ----- util-linux.spec | 2 -- 3 files changed, 31 deletions(-) delete mode 100644 util-linux-ng-bnc503008.patch diff --git a/util-linux-ng-bnc503008.patch b/util-linux-ng-bnc503008.patch deleted file mode 100644 index 1482097..0000000 --- a/util-linux-ng-bnc503008.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit fdf08588af55d07a99b411708a08f4ebe6819706 -Author: Theodore Ts'o -Date: Sat Oct 3 12:50:06 2009 -0400 - - lib: fix file descriptor leak in is_mounted() - - Remove an extraneous fopen() that leaks memory and a file descriptor. - - Signed-off-by: "Theodore Ts'o" - -diff --git a/lib/ismounted.c b/lib/ismounted.c -index 28ae325..fbe91f9 100644 ---- a/lib/ismounted.c -+++ b/lib/ismounted.c -@@ -70,9 +70,6 @@ static int check_mntent_file(const char *mtab_file, const char *file, - char buf[1024], *device = 0, *mnt_dir = 0, *cp; - - *mount_flags = 0; -- if ((f = fopen(mtab_file, "r")) == NULL) -- return errno; -- - if ((f = setmntent (mtab_file, "r")) == NULL) - return errno; - if (stat(file, &st_buf) == 0) { diff --git a/util-linux.changes b/util-linux.changes index cb4f923..820f4e0 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Oct 26 17:45:53 UTC 2009 - crrodriguez@opensuse.org - -- fsck during boot up fails with Too many open files [bnc#503008] - ------------------------------------------------------------------- Tue Oct 20 12:14:24 CEST 2009 - dmueller@suse.de diff --git a/util-linux.spec b/util-linux.spec index 9777302..7f0c6f7 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -68,7 +68,6 @@ Patch1: util-linux-2.12r-fdisk_remove_bogus_warnings.patch Patch2: util-linux-2.14.1-mount_skip_sync.patch # crypto patch Patch3: util-linux-mount_losetup_crypto.patch -Patch4: util-linux-ng-bnc503008.patch ## ## adjtimex ## @@ -153,7 +152,6 @@ unique IDs (UUIDs). %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 # cd adjtimex-* %patch50 -p1 From 237c8f7ae0f1ae8ccdbc5887c0a21ee61870fee627345669c2592c9082bbbd6b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 27 Oct 2009 15:47:32 +0000 Subject: [PATCH 6/6] Updating link to change in openSUSE:Factory/util-linux revision 81.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=fe4aad24d69e32530a8818607ac007f5 --- util-linux-ng-bnc503008.patch | 24 ++++++++++++++++++++++++ util-linux.changes | 5 +++++ util-linux.spec | 4 +++- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 util-linux-ng-bnc503008.patch diff --git a/util-linux-ng-bnc503008.patch b/util-linux-ng-bnc503008.patch new file mode 100644 index 0000000..1482097 --- /dev/null +++ b/util-linux-ng-bnc503008.patch @@ -0,0 +1,24 @@ +commit fdf08588af55d07a99b411708a08f4ebe6819706 +Author: Theodore Ts'o +Date: Sat Oct 3 12:50:06 2009 -0400 + + lib: fix file descriptor leak in is_mounted() + + Remove an extraneous fopen() that leaks memory and a file descriptor. + + Signed-off-by: "Theodore Ts'o" + +diff --git a/lib/ismounted.c b/lib/ismounted.c +index 28ae325..fbe91f9 100644 +--- a/lib/ismounted.c ++++ b/lib/ismounted.c +@@ -70,9 +70,6 @@ static int check_mntent_file(const char *mtab_file, const char *file, + char buf[1024], *device = 0, *mnt_dir = 0, *cp; + + *mount_flags = 0; +- if ((f = fopen(mtab_file, "r")) == NULL) +- return errno; +- + if ((f = setmntent (mtab_file, "r")) == NULL) + return errno; + if (stat(file, &st_buf) == 0) { diff --git a/util-linux.changes b/util-linux.changes index 820f4e0..cb4f923 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 26 17:45:53 UTC 2009 - crrodriguez@opensuse.org + +- fsck during boot up fails with Too many open files [bnc#503008] + ------------------------------------------------------------------- Tue Oct 20 12:14:24 CEST 2009 - dmueller@suse.de diff --git a/util-linux.spec b/util-linux.spec index 7f0c6f7..8324545 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -29,7 +29,7 @@ License: BSD 3-clause (or similar) ; GPL v2 or later Group: System/Base AutoReqProv: on Version: 2.16 -Release: 4 +Release: 5 Requires: %name-lang = %{version} Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2 @@ -68,6 +68,7 @@ Patch1: util-linux-2.12r-fdisk_remove_bogus_warnings.patch Patch2: util-linux-2.14.1-mount_skip_sync.patch # crypto patch Patch3: util-linux-mount_losetup_crypto.patch +Patch4: util-linux-ng-bnc503008.patch ## ## adjtimex ## @@ -152,6 +153,7 @@ unique IDs (UUIDs). %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # cd adjtimex-* %patch50 -p1