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
77 #include <sys/statvfs.h>
78 #include <sys/types.h>
80 +#include <sys/stat.h> /* for major and minor macros */
85 --- util-linux-2.19/disk-utils/fsck.c~ 2011-02-07 16:19:29.000000000 +0100
86 +++ util-linux-2.19/disk-utils/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.21/configure.ac~ 2012-02-24 12:53:35.000000000 +0200
103 +++ util-linux-2.21/configure.ac 2012-03-05 21:03:25.833675080 +0200
120 --- util-linux-2.19/misc-utils/findfs.c~ 2011-01-31 16:43:47.000000000 +0100
121 +++ util-linux-2.19/misc-utils/findfs.c 2011-02-10 22:24:39.615735924 +0100
129 static void __attribute__((__noreturn__)) usage(int rc)
130 --- util-linux-2.21/libmount/src/tab_parse.c~ 2012-03-05 21:00:14.000000000 +0200
131 +++ util-linux-2.21/libmount/src/tab_parse.c 2012-03-05 21:05:27.562569076 +0200
134 struct dirent **namelist = NULL;
136 - n = scandir(dirname, &namelist, mnt_table_parse_dir_filter, versionsort);
137 + n = scandir(dirname, &namelist, mnt_table_parse_dir_filter,
138 +#ifdef HAVE_VERSIONSORT
147 --- util-linux-2.22.1/lib/Makemodule.am.orig 2012-09-20 15:16:51.344635140 +0200
148 +++ util-linux-2.22.1/lib/Makemodule.am 2012-10-13 16:15:53.662070426 +0200
170 +libcommon_la_SOURCES += \
176 libcommon_la_SOURCES += \
177 lib/linux_version.c \
178 --- util-linux-2.22.1/lib/tt.c.orig 2012-09-20 15:16:51.349635172 +0200
179 +++ util-linux-2.22.1/lib/tt.c 2012-10-13 16:58:37.331962836 +0200
182 static size_t mbs_safe_width(const char *s)
187 +#ifdef HAVE_WIDECHAR
190 memset(&st, 0, sizeof(st));
194 if (iscntrl((unsigned char) *p)) {
197 static char *mbs_safe_encode(const char *s, size_t *width)
199 +#ifdef HAVE_WIDECHAR
204 size_t sz = s ? strlen(s) : 0;
209 +#ifdef HAVE_WIDECHAR
210 memset(&st, 0, sizeof(st));
213 res = malloc((sz * 4) + 1);
216 --- util-linux-2.22.1/include/ttyutils.h.orig 2012-09-20 15:16:51.343635134 +0200
217 +++ util-linux-2.22.1/include/ttyutils.h 2012-10-13 16:58:53.058628843 +0200
219 #define UL_TTY_KEEPCFLAGS (1 << 1)
220 #define UL_TTY_UTF8 (1 << 2)
222 +#ifndef __dietlibc__
223 static inline void reset_virtual_console(struct termios *tp, int flags)
225 /* Use defaults of <sys/ttydefaults.h> for base settings */
227 tp->c_cc[VLNEXT] = CLNEXT;
228 tp->c_cc[VEOL2] = _POSIX_VDISABLE;
232 static inline int get_terminal_width(void)
234 --- util-linux-2.22.1/configure.ac.orig 2012-10-13 17:14:16.488590090 +0200
235 +++ util-linux-2.22.1/configure.ac 2012-10-13 22:11:41.324507881 +0200
237 UL_REQUIRES_HAVE([cramfs], [z], [z library])
238 AM_CONDITIONAL(BUILD_CRAMFS, test "x$build_cramfs" = xyes)
240 +AC_ARG_ENABLE([minix], AS_HELP_STRING([--disable-minix], [do not build fsck.minix]), [], enable_minix=yes)
241 +UL_BUILD_INIT([minix])
242 +AM_CONDITIONAL(BUILD_MINIX, test "x$build_minix" = xyes)
244 if test "x$have_io" = xyes -o "x$linux_os" = xyes; then
246 @@ -1193,6 +1196,12 @@
248 AM_CONDITIONAL(BUILD_TASKSET, test "x$build_taskset" = xyes)
250 +AC_ARG_ENABLE([setarch], AS_HELP_STRING([--disable-setarch], [do not build setarch]), [], enable_setarch=yes)
251 +UL_BUILD_INIT([setarch])
252 +AM_CONDITIONAL(BUILD_SETARCH, test "x$build_setarch" = xyes)
253 +AC_ARG_ENABLE([ldattach], AS_HELP_STRING([--disable-ldattach], [do not build ldattach]), [], enable_ldattach=yes)
254 +UL_BUILD_INIT([ldattach])
255 +AM_CONDITIONAL(BUILD_LDATTACH, test "x$build_ldattach" = xyes)
257 AC_ARG_ENABLE([wall],
258 AS_HELP_STRING([--disable-wall], [do not build wall]),
259 --- util-linux-2.22.1/disk-utils/Makemodule.am.orig 2012-09-20 15:16:51.321634997 +0200
260 +++ util-linux-2.22.1/disk-utils/Makemodule.am 2012-10-13 22:12:29.384505863 +0200
264 sbin_PROGRAMS += fsck.minix
265 dist_man_MANS += disk-utils/fsck.minix.8
266 fsck_minix_SOURCES = \
268 disk-utils/minix_programs.h \
270 fsck_minix_LDADD = $(LDADD) libcommon.la
273 sbin_PROGRAMS += mkfs.minix
274 dist_man_MANS += disk-utils/mkfs.minix.8
275 --- util-linux-2.22.1/sys-utils/Makemodule.am.orig 2012-10-10 14:14:06.515276813 +0200
276 +++ util-linux-2.22.1/sys-utils/Makemodule.am 2012-10-13 22:18:31.467824001 +0200
278 cytune_SOURCES = sys-utils/cytune.c sys-utils/cyclades.h
279 cytune_LDADD = $(LDADD) libcommon.la
282 usrsbin_exec_PROGRAMS += ldattach
283 dist_man_MANS += sys-utils/ldattach.8
284 ldattach_SOURCES = sys-utils/ldattach.c
285 ldattach_LDADD = $(LDADD) libcommon.la
288 usrsbin_exec_PROGRAMS += tunelp
289 dist_man_MANS += sys-utils/tunelp.8
291 rtcwake_SOURCES = sys-utils/rtcwake.c
292 rtcwake_LDADD = $(LDADD) libcommon.la
295 usrbin_exec_PROGRAMS += setarch
296 dist_man_MANS += sys-utils/setarch.8
297 setarch_SOURCES = sys-utils/setarch.c
300 INSTALL_EXEC_HOOKS += install-exec-hook-setarch
301 UNINSTALL_HOOKS += uninstall-hook-setarch