Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at Sun Dec 19 12:40:27 CET 2010. -------- --- util-linux/util-linux.changes 2010-12-02 17:11:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/util-linux/util-linux.changes 2010-12-14 17:25:55.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 14 16:11:34 UTC 2010 - puzel@novell.com + +- add util-linux-swapon-canonicalize-swap-device.patch + (bnc#641142) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- util-linux-swapon-canonicalize-swap-device.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.R686ag/_old 2010-12-19 12:40:02.000000000 +0100 +++ /var/tmp/diff_new_pack.R686ag/_new 2010-12-19 12:40:02.000000000 +0100 @@ -30,7 +30,7 @@ BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: zlib-devel -Url: http://userweb.kernel.org/~kzak/util-linux-ng/ +Url: http://kernel.org/~kzak/util-linux/ Supplements: filesystem(minix) Provides: fsck-with-dev-lock = %{version} # bnc#651598: @@ -40,7 +40,7 @@ Group: System/Base AutoReqProv: on Version: 2.18 -Release: 6 +Release: 7 Recommends: %name-lang = %{version} Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v%{version}/%name-ng-%{version}.tar.bz2 @@ -85,6 +85,7 @@ Patch8: util-linux-agetty-s-option.patch Patch9: util-linux-fsck-l-option.patch Patch10: util-linux-2.18-no-canonicalize-fix.patch +Patch11: util-linux-swapon-canonicalize-swap-device.patch ## ## adjtimex ## @@ -194,6 +195,8 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 + # cd adjtimex-* # adjtimex patches belongs here ++++++ util-linux-swapon-canonicalize-swap-device.patch ++++++ Index: util-linux-ng-2.18/mount/swapon.c =================================================================== --- util-linux-ng-2.18.orig/mount/swapon.c +++ util-linux-ng-2.18/mount/swapon.c @@ -23,6 +23,7 @@ #include "pathnames.h" #include "swapheader.h" #include "mangle.h" +#include "canonicalize.h" #define PATH_MKSWAP "/sbin/mkswap" @@ -171,7 +172,11 @@ read_proc_swaps(void) { break; swapFiles = q; - swapFiles[numSwaps++] = unmangle(line); + if ((p = unmangle(line)) == NULL) + break; + + swapFiles[numSwaps++] = canonicalize_path(p); + free(p); } fclose(swaps); } @@ -179,10 +184,14 @@ read_proc_swaps(void) { static int is_in_proc_swaps(const char *fname) { int i; + char *p = canonicalize_path(fname); for (i = 0; i < numSwaps; i++) - if (swapFiles[i] && !strcmp(fname, swapFiles[i])) + if (swapFiles[i] && !strcmp(p, swapFiles[i])) { + free(p); return 1; + } + free(p); return 0; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org