]>
Commit | Line | Data |
---|---|---|
fe95eee9 AM |
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 | |
f212f39a | 3 | @@ -17,6 +17,9 @@ |
4 | #include <errno.h> | |
5 | #include <blkid.h> | |
6 | #include <stddef.h> | |
7 | +#ifdef __dietlibc__ | |
8 | +#include <sys/stat.h> /* for major and minor macros */ | |
9 | +#endif | |
10 | ||
11 | #include "nls.h" | |
12 | #include "mountP.h" | |
fe95eee9 AM |
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 | |
f212f39a | 15 | @@ -9,6 +9,9 @@ |
fe95eee9 | 16 | #include <limits.h> |
f212f39a | 17 | #include <dirent.h> |
18 | #include <fcntl.h> | |
f212f39a | 19 | +#ifdef __dietlibc__ |
20 | +#include <sys/stat.h> /* for makedev macro */ | |
21 | +#endif | |
22 | ||
fe95eee9 | 23 | #include "at.h" |
f212f39a | 24 | #include "mangle.h" |
f212f39a | 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 | |
27 | @@ -12,6 +12,9 @@ | |
28 | #include <sys/stat.h> | |
29 | #include <locale.h> | |
30 | #include <string.h> | |
31 | +#ifdef __dietlibc__ | |
32 | +#include <stdint.h> | |
33 | +#endif | |
34 | ||
35 | static int do_scale_by_power (uintmax_t *x, int base, int power) | |
36 | { | |
f212f39a | 37 | --- util-linux-2.19/lib/at.c~ 2011-01-31 16:43:47.000000000 +0100 |
38 | +++ util-linux-2.19/lib/at.c 2011-02-10 20:30:37.336797058 +0100 | |
39 | @@ -7,6 +7,7 @@ | |
40 | #include <stdlib.h> | |
41 | #include <fcntl.h> | |
42 | #include <sys/stat.h> | |
43 | +#include <limits.h> | |
44 | ||
45 | #include "at.h" | |
46 | ||
f212f39a | 47 | --- util-linux-2.19/misc-utils/findmnt.c~ 2011-01-31 16:43:47.000000000 +0100 |
48 | +++ util-linux-2.19/misc-utils/findmnt.c 2011-02-10 20:54:23.100130391 +0100 | |
232bdb1a AM |
49 | @@ -36,6 +36,9 @@ |
50 | # include <libudev.h> | |
51 | #endif | |
52 | #include <libmount.h> | |
f212f39a | 53 | +#ifdef __dietlibc__ |
54 | +#include <sys/stat.h> /* for major and minor macros */ | |
55 | +#endif | |
56 | ||
232bdb1a AM |
57 | #include "pathnames.h" |
58 | #include "nls.h" | |
4fa9d824 AM |
59 | --- util-linux-2.19/disk-utils/fsck.c~ 2011-02-07 16:19:29.000000000 +0100 |
60 | +++ util-linux-2.19/disk-utils/fsck.c 2011-02-10 21:09:27.024658725 +0100 | |
f212f39a | 61 | @@ -270,7 +270,13 @@ |
62 | if (verbose) | |
63 | printf(_("Locking disk %s ... "), diskname); | |
64 | ||
65 | - inst->lock = open(diskname, O_CLOEXEC | O_RDONLY); | |
66 | + inst->lock = open(diskname, | |
67 | +#ifdef O_CLOEXEC | |
68 | + O_CLOEXEC | O_RDONLY | |
69 | +#else | |
70 | + O_RDONLY | |
71 | +#endif | |
72 | + ); | |
73 | if (inst->lock >= 0) { | |
74 | int rc = -1; | |
75 | ||
a7980c08 ER |
76 | --- util-linux-2.21/configure.ac~ 2012-02-24 12:53:35.000000000 +0200 |
77 | +++ util-linux-2.21/configure.ac 2012-03-05 21:03:25.833675080 +0200 | |
232bdb1a | 78 | @@ -323,6 +323,7 @@ AC_CHECK_FUNCS([ \ |
f212f39a | 79 | llseek \ |
80 | lseek64 \ | |
232bdb1a | 81 | mempcpy \ |
f212f39a | 82 | + mkostemp \ |
4fa9d824 AM |
83 | nanosleep \ |
84 | personality \ | |
85 | posix_fadvise \ | |
86 | @@ -330,6 +331,7 @@ | |
87 | usleep \ | |
88 | warn \ | |
89 | warnx \ | |
f212f39a | 90 | + versionsort \ |
4fa9d824 AM |
91 | ]) |
92 | AC_FUNC_FSEEKO | |
93 | ||
f212f39a | 94 | --- util-linux-2.19/misc-utils/findfs.c~ 2011-01-31 16:43:47.000000000 +0100 |
95 | +++ util-linux-2.19/misc-utils/findfs.c 2011-02-10 22:24:39.615735924 +0100 | |
96 | @@ -12,6 +12,7 @@ | |
97 | ||
98 | #include <blkid.h> | |
99 | ||
100 | +#include "c.h" | |
101 | #include "nls.h" | |
102 | ||
103 | static void __attribute__((__noreturn__)) usage(int rc) | |
a7980c08 ER |
104 | --- util-linux-2.21/libmount/src/tab_parse.c~ 2012-03-05 21:00:14.000000000 +0200 |
105 | +++ util-linux-2.21/libmount/src/tab_parse.c 2012-03-05 21:05:27.562569076 +0200 | |
106 | @@ -524,7 +524,13 @@ | |
107 | DIR *dir = NULL; | |
108 | struct dirent **namelist = NULL; | |
109 | ||
110 | - n = scandir(dirname, &namelist, mnt_table_parse_dir_filter, versionsort); | |
111 | + n = scandir(dirname, &namelist, mnt_table_parse_dir_filter, | |
f212f39a | 112 | +#ifdef HAVE_VERSIONSORT |
a7980c08 | 113 | + versionsort |
f212f39a | 114 | +#else |
a7980c08 | 115 | + alphasort |
f212f39a | 116 | +#endif |
a7980c08 | 117 | + ); |
f212f39a | 118 | if (n <= 0) |
119 | return 0; | |
120 | ||
6e84fb29 JB |
121 | --- util-linux-2.22.1/lib/tt.c.orig 2012-09-20 15:16:51.349635172 +0200 |
122 | +++ util-linux-2.22.1/lib/tt.c 2012-10-13 16:58:37.331962836 +0200 | |
123 | @@ -59,11 +59,13 @@ | |
124 | */ | |
125 | static size_t mbs_safe_width(const char *s) | |
126 | { | |
127 | - mbstate_t st; | |
128 | const char *p = s; | |
129 | size_t width = 0; | |
130 | +#ifdef HAVE_WIDECHAR | |
131 | + mbstate_t st; | |
132 | ||
133 | memset(&st, 0, sizeof(st)); | |
134 | +#endif | |
135 | ||
136 | while (p && *p) { | |
137 | if (iscntrl((unsigned char) *p)) { | |
138 | @@ -108,7 +110,9 @@ | |
139 | */ | |
140 | static char *mbs_safe_encode(const char *s, size_t *width) | |
141 | { | |
142 | +#ifdef HAVE_WIDECHAR | |
143 | mbstate_t st; | |
144 | +#endif | |
145 | const char *p = s; | |
146 | char *res, *r; | |
147 | size_t sz = s ? strlen(s) : 0; | |
148 | @@ -117,8 +121,9 @@ | |
149 | if (!sz) | |
150 | return NULL; | |
151 | ||
152 | +#ifdef HAVE_WIDECHAR | |
153 | memset(&st, 0, sizeof(st)); | |
154 | - | |
155 | +#endif | |
156 | res = malloc((sz * 4) + 1); | |
157 | if (!res) | |
158 | return NULL; | |
159 | --- util-linux-2.22.1/include/ttyutils.h.orig 2012-09-20 15:16:51.343635134 +0200 | |
160 | +++ util-linux-2.22.1/include/ttyutils.h 2012-10-13 16:58:53.058628843 +0200 | |
161 | @@ -11,6 +11,7 @@ | |
162 | #define UL_TTY_KEEPCFLAGS (1 << 1) | |
163 | #define UL_TTY_UTF8 (1 << 2) | |
164 | ||
165 | +#ifndef __dietlibc__ | |
166 | static inline void reset_virtual_console(struct termios *tp, int flags) | |
167 | { | |
168 | /* Use defaults of <sys/ttydefaults.h> for base settings */ | |
169 | @@ -78,6 +79,7 @@ | |
170 | tp->c_cc[VLNEXT] = CLNEXT; | |
171 | tp->c_cc[VEOL2] = _POSIX_VDISABLE; | |
172 | } | |
173 | +#endif | |
174 | ||
175 | static inline int get_terminal_width(void) | |
176 | { | |
177 | --- util-linux-2.22.1/configure.ac.orig 2012-10-13 17:14:16.488590090 +0200 | |
178 | +++ util-linux-2.22.1/configure.ac 2012-10-13 22:11:41.324507881 +0200 | |
179 | @@ -915,6 +915,9 @@ | |
180 | UL_REQUIRES_HAVE([cramfs], [z], [z library]) | |
181 | AM_CONDITIONAL(BUILD_CRAMFS, test "x$build_cramfs" = xyes) | |
182 | ||
183 | +AC_ARG_ENABLE([minix], AS_HELP_STRING([--disable-minix], [do not build fsck.minix]), [], enable_minix=yes) | |
184 | +UL_BUILD_INIT([minix]) | |
185 | +AM_CONDITIONAL(BUILD_MINIX, test "x$build_minix" = xyes) | |
186 | ||
187 | if test "x$have_io" = xyes -o "x$linux_os" = xyes; then | |
188 | build_hwclock=yes | |
189 | @@ -1193,6 +1196,12 @@ | |
190 | [sched_getaffinity]) | |
191 | AM_CONDITIONAL(BUILD_TASKSET, test "x$build_taskset" = xyes) | |
192 | ||
193 | +AC_ARG_ENABLE([setarch], AS_HELP_STRING([--disable-setarch], [do not build setarch]), [], enable_setarch=yes) | |
194 | +UL_BUILD_INIT([setarch]) | |
195 | +AM_CONDITIONAL(BUILD_SETARCH, test "x$build_setarch" = xyes) | |
196 | +AC_ARG_ENABLE([ldattach], AS_HELP_STRING([--disable-ldattach], [do not build ldattach]), [], enable_ldattach=yes) | |
197 | +UL_BUILD_INIT([ldattach]) | |
198 | +AM_CONDITIONAL(BUILD_LDATTACH, test "x$build_ldattach" = xyes) | |
199 | ||
200 | AC_ARG_ENABLE([wall], | |
201 | AS_HELP_STRING([--disable-wall], [do not build wall]), | |
202 | --- util-linux-2.22.1/disk-utils/Makemodule.am.orig 2012-09-20 15:16:51.321634997 +0200 | |
203 | +++ util-linux-2.22.1/disk-utils/Makemodule.am 2012-10-13 22:12:29.384505863 +0200 | |
204 | @@ -1,4 +1,4 @@ | |
205 | - | |
206 | +if BUILD_MINIX | |
207 | sbin_PROGRAMS += fsck.minix | |
208 | dist_man_MANS += disk-utils/fsck.minix.8 | |
209 | fsck_minix_SOURCES = \ | |
210 | @@ -6,6 +6,7 @@ | |
211 | disk-utils/minix_programs.h \ | |
212 | lib/ismounted.c | |
213 | fsck_minix_LDADD = $(LDADD) libcommon.la | |
214 | +endif | |
215 | ||
216 | sbin_PROGRAMS += mkfs.minix | |
217 | dist_man_MANS += disk-utils/mkfs.minix.8 | |
218 | --- util-linux-2.22.1/sys-utils/Makemodule.am.orig 2012-10-10 14:14:06.515276813 +0200 | |
219 | +++ util-linux-2.22.1/sys-utils/Makemodule.am 2012-10-13 22:18:31.467824001 +0200 | |
220 | @@ -59,10 +59,12 @@ | |
221 | cytune_SOURCES = sys-utils/cytune.c sys-utils/cyclades.h | |
222 | cytune_LDADD = $(LDADD) libcommon.la | |
223 | ||
224 | +if BUILD_LDATTACH | |
225 | usrsbin_exec_PROGRAMS += ldattach | |
226 | dist_man_MANS += sys-utils/ldattach.8 | |
227 | ldattach_SOURCES = sys-utils/ldattach.c | |
228 | ldattach_LDADD = $(LDADD) libcommon.la | |
229 | +endif | |
230 | ||
231 | usrsbin_exec_PROGRAMS += tunelp | |
232 | dist_man_MANS += sys-utils/tunelp.8 | |
233 | @@ -73,6 +75,7 @@ | |
234 | rtcwake_SOURCES = sys-utils/rtcwake.c | |
235 | rtcwake_LDADD = $(LDADD) libcommon.la | |
236 | ||
237 | +if BUILD_SETARCH | |
238 | usrbin_exec_PROGRAMS += setarch | |
239 | dist_man_MANS += sys-utils/setarch.8 | |
240 | setarch_SOURCES = sys-utils/setarch.c | |
241 | @@ -123,6 +124,7 @@ | |
242 | ||
243 | INSTALL_EXEC_HOOKS += install-exec-hook-setarch | |
244 | UNINSTALL_HOOKS += uninstall-hook-setarch | |
245 | +endif | |
246 | ||
247 | endif # LINUX | |
248 |