From 810cf97189bb902dbc2786ef43c5a1d46341caff4358b6c0c4357312cef4245a Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 5 Nov 2013 11:09:54 +0000 Subject: [PATCH] Accepting request 205643 from home:AndreasSchwab:ff - blkdiscard-BLKSSZGET-fills-in-an-int.patch: Fix type mismatch in blkdiscard OBS-URL: https://build.opensuse.org/request/show/205643 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=192 --- blkdiscard-BLKSSZGET-fills-in-an-int.patch | 27 ++++++++++++++++++++++ util-linux.changes | 6 +++++ util-linux.spec | 3 +++ 3 files changed, 36 insertions(+) create mode 100644 blkdiscard-BLKSSZGET-fills-in-an-int.patch diff --git a/blkdiscard-BLKSSZGET-fills-in-an-int.patch b/blkdiscard-BLKSSZGET-fills-in-an-int.patch new file mode 100644 index 0000000..7ce7143 --- /dev/null +++ b/blkdiscard-BLKSSZGET-fills-in-an-int.patch @@ -0,0 +1,27 @@ +Subject: [PATCH] blkdiscard: BLKSSZGET fills in an int, not a uint64 +Message-ID: 1383435966-29337-1-git-send-email-tytso@mit.edu + +Reported-by: Jason Cipriani +Signed-off-by: "Theodore Ts'o" +--- + sys-utils/blkdiscard.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sys-utils/blkdiscard.c b/sys-utils/blkdiscard.c +index af9ed66..2ddcdb1 100644 +--- a/sys-utils/blkdiscard.c ++++ b/sys-utils/blkdiscard.c +@@ -70,8 +70,8 @@ static void __attribute__((__noreturn__)) usage(FILE *out) + int main(int argc, char **argv) + { + char *path; +- int c, fd, verbose = 0, secure = 0; +- uint64_t end, blksize, secsize, range[2]; ++ int c, fd, verbose = 0, secure = 0, secsize; ++ uint64_t end, blksize, range[2]; + struct stat sb; + + static const struct option longopts[] = { +-- +1.7.12.rc0.22.gcdd159b + diff --git a/util-linux.changes b/util-linux.changes index d082081..fba0b31 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Nov 3 12:53:34 UTC 2013 - schwab@linux-m68k.org + +- blkdiscard-BLKSSZGET-fills-in-an-int.patch: Fix type mismatch in + blkdiscard + ------------------------------------------------------------------- Fri Oct 25 18:52:01 CEST 2013 - sbrabec@suse.cz diff --git a/util-linux.spec b/util-linux.spec index be6361b..a8c6d2d 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -108,6 +108,8 @@ Patch7: more-check-for-buffer-size-when-write-multibyte-char.patch Patch8: more-guarantee-space-for-multibyte.patch # disable encryption Patch12: util-linux-2.23.1-noenc-suse.diff +# PATCH-FIX-UPSTREAM blkdiscard-BLKSSZGET-fills-in-an-int.patch tytso@mit.edu +Patch13: blkdiscard-BLKSSZGET-fills-in-an-int.patch # hack for boot.localfs Patch20: util-linux-HACK-boot.localfs.diff @@ -229,6 +231,7 @@ xzcat %{S:0} | %gpg_verify %{S:12} - %patch7 -p1 %patch8 -p1 %patch12 -p1 +%patch13 -p1 # %patch20 -p1 #