From 273e0e472b5a3fed9015367bec8345483ad1ef849bf3354f1f4ee91dec8b54d6 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 16 Feb 2009 15:06:39 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=74 --- util-linux-2.14.1-fdisk_cylinder.patch | 16 ---------------- util-linux.changes | 6 ++++++ util-linux.spec | 7 ++++--- 3 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 util-linux-2.14.1-fdisk_cylinder.patch diff --git a/util-linux-2.14.1-fdisk_cylinder.patch b/util-linux-2.14.1-fdisk_cylinder.patch deleted file mode 100644 index ba366b6..0000000 --- a/util-linux-2.14.1-fdisk_cylinder.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: util-linux-ng-2.14.1/fdisk/fdisk.c -=================================================================== ---- util-linux-ng-2.14.1.orig/fdisk/fdisk.c 2008-11-05 16:38:11.000000000 +0100 -+++ util-linux-ng-2.14.1/fdisk/fdisk.c 2008-11-05 17:23:30.000000000 +0100 -@@ -1186,8 +1186,9 @@ read_int(unsigned int low, unsigned int - while(isspace(*(line_ptr + suflen))) - *(line_ptr + suflen--) = '\0'; - -- if ((*line_ptr == 'C' || *line_ptr == 'c') && -- *(line_ptr + 1) == '\0') { -+ if (((*line_ptr == 'C' || *line_ptr == 'c') && -+ *(line_ptr + 1) == '\0') || -+ *line_ptr == '\0') { - /* - * Cylinders - */ diff --git a/util-linux.changes b/util-linux.changes index f31c7d8..e79bbcb 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 16 12:35:00 CET 2009 - mkoenig@suse.de + +- remove util-linux-2.14.1-fdisk_cylinder.patch + fixed upstream + ------------------------------------------------------------------- Thu Feb 12 17:12:28 CET 2009 - mkoenig@suse.de diff --git a/util-linux.spec b/util-linux.spec index aca1d99..1d668bd 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -29,7 +29,7 @@ License: BSD 3-Clause; GPL v2 or later Group: System/Base AutoReqProv: on Version: 2.14.2 -Release: 1 +Release: 2 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 @@ -74,7 +74,6 @@ Patch10: util-linux-2.14.1-lscpu_add_hypervisor_detection.patch # bnc#433028 Patch11: util-linux-2.14.1-mount_swap_pagesize.patch Patch12: util-linux-2.14.1-sys-utils_lscpu_exit.patch -Patch15: util-linux-2.14.1-fdisk_cylinder.patch # bnc#444966 Patch17: util-linux-2.14.1-mount_race.patch # bnc#447036 @@ -136,7 +135,6 @@ Authors: %patch10 -p1 %patch11 -p1 %patch12 -p1 -%patch15 -p1 %patch17 -p1 %patch18 -p1 %patch19 -p1 @@ -627,6 +625,9 @@ fi #%endif %changelog +* Mon Feb 16 2009 mkoenig@suse.de +- remove util-linux-2.14.1-fdisk_cylinder.patch + fixed upstream * Thu Feb 12 2009 mkoenig@suse.de - update to version 2.14.2 chrt: