1 --- util-linux-ng-2.18/libmount/src/fs.c~ 2010-06-08 10:44:20.000000000 +0200
2 +++ util-linux-ng-2.18/libmount/src/fs.c 2010-08-26 11:12:31.326572794 +0200
8 +#include <sys/stat.h> /* for major and minor macros */
13 --- util-linux-ng-2.18/libmount/src/tab_parse.c~ 2010-06-07 12:35:06.000000000 +0200
14 +++ util-linux-ng-2.18/libmount/src/tab_parse.c 2010-08-26 11:16:35.762572782 +0200
20 +#include <sys/stat.h> /* for makedev macro */
25 --- util-linux-2.19/lib/strutils.c~ 2011-01-31 16:43:47.000000000 +0100
26 +++ util-linux-2.19/lib/strutils.c 2011-02-10 12:49:12.221843465 +0100
35 static int do_scale_by_power (uintmax_t *x, int base, int power)
37 --- util-linux-2.19/libmount/src/utils.c~ 2011-01-24 23:46:29.000000000 +0100
38 +++ util-linux-2.19/libmount/src/utils.c 2011-02-10 20:12:00.499611392 +0100
43 +#ifdef _SC_GETPW_R_SIZE_MAX
44 size_t sz = sysconf(_SC_GETPW_R_SIZE_MAX);
50 if (!username || !uid)
55 +#ifdef _SC_GETGR_R_SIZE_MAX
56 size_t sz = sysconf(_SC_GETGR_R_SIZE_MAX);
62 if (!groupname || !gid)
63 --- util-linux-2.19/lib/at.c~ 2011-01-31 16:43:47.000000000 +0100
64 +++ util-linux-2.19/lib/at.c 2011-02-10 20:30:37.336797058 +0100
73 --- util-linux-2.19/misc-utils/findmnt.c~ 2011-01-31 16:43:47.000000000 +0100
74 +++ util-linux-2.19/misc-utils/findmnt.c 2011-02-10 20:54:23.100130391 +0100
80 +#include <sys/stat.h> /* for major and minor macros */
85 --- util-linux-2.19/fsck/fsck.c~ 2011-02-07 16:19:29.000000000 +0100
86 +++ util-linux-2.19/fsck/fsck.c 2011-02-10 21:09:27.024658725 +0100
89 printf(_("Locking disk %s ... "), diskname);
91 - inst->lock = open(diskname, O_CLOEXEC | O_RDONLY);
92 + inst->lock = open(diskname,
94 + O_CLOEXEC | O_RDONLY
99 if (inst->lock >= 0) {
102 --- util-linux-2.19/configure.ac~ 2011-02-10 21:28:23.395401725 +0100
103 +++ util-linux-2.19/configure.ac 2011-02-10 22:12:29.997898392 +0100
113 --- util-linux-2.19/misc-utils/findfs.c~ 2011-01-31 16:43:47.000000000 +0100
114 +++ util-linux-2.19/misc-utils/findfs.c 2011-02-10 22:24:39.615735924 +0100
122 static void __attribute__((__noreturn__)) usage(int rc)
123 --- util-linux-2.19/term-utils/scriptreplay.c~ 2011-01-31 16:43:47.000000000 +0100
124 +++ util-linux-2.19/term-utils/scriptreplay.c 2011-02-10 22:26:22.019069258 +0100
132 #define SCRIPT_MIN_DELAY 0.0001 /* from original sripreplay.pl */
133 --- util-linux-2.19/libmount/src/tab_parse.c~ 2011-02-10 23:28:02.091461025 +0100
134 +++ util-linux-2.19/libmount/src/tab_parse.c 2011-02-10 23:29:04.934794359 +0100
137 /* TODO: it would be nice to have a scandir() implementaion that
138 * is able to use already opened directory */
139 - n = scandir(dirname, &namelist, NULL, versionsort);
140 + n = scandir(dirname, &namelist, NULL,
141 +#ifdef HAVE_VERSIONSORT