From 1ebda4d177a64d16ecc23e65745fe31001a90af7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 14 Aug 2013 13:04:52 +0200 Subject: update to latest stable upstream, fix uclibc/musl issues --- package/util-linux/patches/patch-Makefile_in | 11 -------- package/util-linux/patches/patch-fdisks_cfdisk_c | 13 ++++++++++ .../patches/patch-fdisks_fdisksunlabel_c | 30 ++++++++++++++++++++++ .../util-linux/patches/patch-include_ttyutils_h | 12 +++++++++ package/util-linux/patches/patch-lib_fileutils_c | 14 ++++++++++ .../util-linux/patches/patch-libblkid_src_save_c | 14 ++++++++++ .../patches/patch-libmount_src_tab_parse_c | 10 ++++---- .../util-linux/patches/patch-libmount_src_utils_c | 14 ++++++++++ .../util-linux/patches/patch-term-utils_setterm_c | 13 ++++++++++ .../util-linux/patches/patch-term-utils_ttymsg_c | 12 +++++++++ .../util-linux/patches/patch-text-utils_hexdump_h | 12 +++++++++ package/util-linux/patches/patch-text-utils_pg_c | 13 ++++++++++ 12 files changed, 152 insertions(+), 16 deletions(-) delete mode 100644 package/util-linux/patches/patch-Makefile_in create mode 100644 package/util-linux/patches/patch-fdisks_cfdisk_c create mode 100644 package/util-linux/patches/patch-fdisks_fdisksunlabel_c create mode 100644 package/util-linux/patches/patch-include_ttyutils_h create mode 100644 package/util-linux/patches/patch-lib_fileutils_c create mode 100644 package/util-linux/patches/patch-libblkid_src_save_c create mode 100644 package/util-linux/patches/patch-libmount_src_utils_c create mode 100644 package/util-linux/patches/patch-term-utils_setterm_c create mode 100644 package/util-linux/patches/patch-term-utils_ttymsg_c create mode 100644 package/util-linux/patches/patch-text-utils_hexdump_h create mode 100644 package/util-linux/patches/patch-text-utils_pg_c (limited to 'package/util-linux/patches') diff --git a/package/util-linux/patches/patch-Makefile_in b/package/util-linux/patches/patch-Makefile_in deleted file mode 100644 index 11469823f..000000000 --- a/package/util-linux/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- util-linux-2.22.2.orig/Makefile.in 2012-12-13 12:19:40.000000000 +0100 -+++ util-linux-2.22.2/Makefile.in 2013-02-28 14:08:40.000000000 +0100 -@@ -83,7 +83,7 @@ bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXE - sbin_PROGRAMS = $(am__EXEEXT_27) $(am__EXEEXT_28) $(am__EXEEXT_29) \ - $(am__EXEEXT_30) $(am__EXEEXT_31) $(am__EXEEXT_32) \ - $(am__EXEEXT_33) $(am__EXEEXT_34) $(am__EXEEXT_35) \ -- $(am__EXEEXT_36) $(am__EXEEXT_37) fsck.minix$(EXEEXT) \ -+ $(am__EXEEXT_36) $(am__EXEEXT_37) \ - mkfs.minix$(EXEEXT) mkfs$(EXEEXT) mkfs.bfs$(EXEEXT) \ - mkswap$(EXEEXT) $(am__EXEEXT_38) $(am__EXEEXT_39) \ - $(am__EXEEXT_40) $(am__EXEEXT_41) $(am__EXEEXT_42) \ diff --git a/package/util-linux/patches/patch-fdisks_cfdisk_c b/package/util-linux/patches/patch-fdisks_cfdisk_c new file mode 100644 index 000000000..c7595e3cc --- /dev/null +++ b/package/util-linux/patches/patch-fdisks_cfdisk_c @@ -0,0 +1,13 @@ +patch taken from sabotage linux -- https://github.com/rofl0r/sabotage + +--- util-linux-2.23.2.orig/fdisks/cfdisk.c 2013-07-30 10:39:26.000000000 +0200 ++++ util-linux-2.23.2/fdisks/cfdisk.c 2013-08-14 12:42:25.000000000 +0200 +@@ -325,7 +325,7 @@ int num_parts = 0; + int logical = 0; + long long logical_sectors[MAXIMUM_PARTS]; + +-__sighandler_t old_SIGINT, old_SIGTERM; ++sighandler_t old_SIGINT, old_SIGTERM; + + int arrow_cursor = FALSE; + int display_units = MEGABYTES; diff --git a/package/util-linux/patches/patch-fdisks_fdisksunlabel_c b/package/util-linux/patches/patch-fdisks_fdisksunlabel_c new file mode 100644 index 000000000..35851b9b6 --- /dev/null +++ b/package/util-linux/patches/patch-fdisks_fdisksunlabel_c @@ -0,0 +1,30 @@ +patch taken from sabotage linux -- https://github.com/rofl0r/sabotage + +--- util-linux-2.23.2.orig/fdisks/fdisksunlabel.c 2013-07-30 10:39:26.000000000 +0200 ++++ util-linux-2.23.2/fdisks/fdisksunlabel.c 2013-08-14 12:38:12.000000000 +0200 +@@ -383,9 +383,11 @@ static void fetch_sun(struct fdisk_conte + } + } + +-static int verify_sun_cmp(int *a, int *b, void *data) ++static void* cmp_data; ++static int verify_sun_cmp(const void *pa, const void *pb) + { +- unsigned int *verify_sun_starts = (unsigned int *) data; ++ const int *a = pa, *b = pb; ++ unsigned int *verify_sun_starts = (unsigned int *) cmp_data; + + if (*a == -1) + return 1; +@@ -449,9 +451,8 @@ static int sun_verify_disklabel(struct f + else + array[i] = -1; + } +- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]), +- (int (*)(const void *,const void *,void *)) verify_sun_cmp, +- verify_sun_starts); ++ cmp_data = verify_sun_starts; ++ qsort(array,ARRAY_SIZE(array),sizeof(array[0]), verify_sun_cmp); + + if (array[0] == -1) { + fdisk_info(cxt, _("No partitions defined")); diff --git a/package/util-linux/patches/patch-include_ttyutils_h b/package/util-linux/patches/patch-include_ttyutils_h new file mode 100644 index 000000000..2fd1baed0 --- /dev/null +++ b/package/util-linux/patches/patch-include_ttyutils_h @@ -0,0 +1,12 @@ +patch taken from sabotage linux -- https://github.com/rofl0r/sabotage + +--- util-linux-2.23.2.orig/include/ttyutils.h 2013-07-15 10:25:46.000000000 +0200 ++++ util-linux-2.23.2/include/ttyutils.h 2013-08-14 12:31:25.000000000 +0200 +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #ifdef HAVE_SYS_IOCTL_H + #include + #endif diff --git a/package/util-linux/patches/patch-lib_fileutils_c b/package/util-linux/patches/patch-lib_fileutils_c new file mode 100644 index 000000000..d4edf1c6a --- /dev/null +++ b/package/util-linux/patches/patch-lib_fileutils_c @@ -0,0 +1,14 @@ +--- util-linux-2.23.2.orig/lib/fileutils.c 2013-06-13 09:46:10.000000000 +0200 ++++ util-linux-2.23.2/lib/fileutils.c 2013-08-14 11:58:47.000000000 +0200 +@@ -37,7 +37,11 @@ int xmkstemp(char **tmpname, char *dir) + xasprintf(&localtmp, "%s/%s.XXXXXX", _PATH_TMP, + program_invocation_short_name); + old_mode = umask(077); ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + fd = mkostemp(localtmp, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC); ++#else ++ fd = mkstemp(localtmp); ++#endif + umask(old_mode); + if (fd == -1) { + free(localtmp); diff --git a/package/util-linux/patches/patch-libblkid_src_save_c b/package/util-linux/patches/patch-libblkid_src_save_c new file mode 100644 index 000000000..c25f42c10 --- /dev/null +++ b/package/util-linux/patches/patch-libblkid_src_save_c @@ -0,0 +1,14 @@ +--- util-linux-2.23.2.orig/libblkid/src/save.c 2013-07-30 10:39:26.000000000 +0200 ++++ util-linux-2.23.2/libblkid/src/save.c 2013-08-14 11:59:06.000000000 +0200 +@@ -110,7 +110,11 @@ int blkid_flush_cache(blkid_cache cache) + tmp = malloc(strlen(filename) + 8); + if (tmp) { + sprintf(tmp, "%s-XXXXXX", filename); ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + fd = mkostemp(tmp, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC); ++#else ++ fd = mkstemp(tmp); ++#endif + if (fd >= 0) { + if (fchmod(fd, 0644) != 0) + DBG(SAVE, blkid_debug("%s: fchmod failed", filename)); diff --git a/package/util-linux/patches/patch-libmount_src_tab_parse_c b/package/util-linux/patches/patch-libmount_src_tab_parse_c index 96ee4c22f..9abf59d71 100644 --- a/package/util-linux/patches/patch-libmount_src_tab_parse_c +++ b/package/util-linux/patches/patch-libmount_src_tab_parse_c @@ -1,5 +1,5 @@ ---- util-linux-2.22.2.orig/libmount/src/tab_parse.c 2012-12-12 21:04:47.000000000 +0100 -+++ util-linux-2.22.2/libmount/src/tab_parse.c 2013-02-28 14:34:10.000000000 +0100 +--- util-linux-2.23.2.orig/libmount/src/tab_parse.c 2013-07-30 10:39:26.000000000 +0200 ++++ util-linux-2.23.2/libmount/src/tab_parse.c 2013-08-14 11:39:26.000000000 +0200 @@ -16,6 +16,8 @@ #include #include @@ -62,9 +62,9 @@ "%n", /* number of read bytes */ &fs->id, -@@ -162,10 +172,14 @@ static int mnt_parse_mountinfo_line(stru - return -EINVAL; - } +@@ -164,10 +174,14 @@ static int mnt_parse_mountinfo_line(stru + if (p > s + 1) + fs->opt_fields = strndup(s + 1, p - s - 1); s = p + 3; + len = strlen (s) + 1; + fstype = malloc (sizeof *fstype * len); diff --git a/package/util-linux/patches/patch-libmount_src_utils_c b/package/util-linux/patches/patch-libmount_src_utils_c new file mode 100644 index 000000000..b0fcc2afa --- /dev/null +++ b/package/util-linux/patches/patch-libmount_src_utils_c @@ -0,0 +1,14 @@ +--- util-linux-2.23.2.orig/libmount/src/utils.c 2013-07-30 11:15:27.000000000 +0200 ++++ util-linux-2.23.2/libmount/src/utils.c 2013-08-14 11:58:25.000000000 +0200 +@@ -842,7 +842,11 @@ int mnt_open_uniq_filename(const char *f + */ + oldmode = umask(S_IRGRP|S_IWGRP|S_IXGRP| + S_IROTH|S_IWOTH|S_IXOTH); ++#if defined(__GLIBC__) && !defined(__UCLIBC__) + fd = mkostemp(n, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC); ++#else ++ fd = mkstemp(n); ++#endif + umask(oldmode); + + if (fd >= 0 && name) diff --git a/package/util-linux/patches/patch-term-utils_setterm_c b/package/util-linux/patches/patch-term-utils_setterm_c new file mode 100644 index 000000000..bd84e5bbb --- /dev/null +++ b/package/util-linux/patches/patch-term-utils_setterm_c @@ -0,0 +1,13 @@ +patch taken from sabotage linux -- https://github.com/rofl0r/sabotage + +--- util-linux-2.23.2.orig/term-utils/setterm.c 2013-06-13 09:46:10.000000000 +0200 ++++ util-linux-2.23.2/term-utils/setterm.c 2013-08-14 12:47:43.000000000 +0200 +@@ -123,7 +123,7 @@ + #include "nls.h" + #include "closestream.h" + +-#if __GNU_LIBRARY__ < 5 ++#if defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ < 5 + #ifndef __alpha__ + # include + #define __NR_klogctl __NR_syslog diff --git a/package/util-linux/patches/patch-term-utils_ttymsg_c b/package/util-linux/patches/patch-term-utils_ttymsg_c new file mode 100644 index 000000000..a93f16d4e --- /dev/null +++ b/package/util-linux/patches/patch-term-utils_ttymsg_c @@ -0,0 +1,12 @@ +patch taken from sabotage linux -- https://github.com/rofl0r/sabotage + +--- util-linux-2.23.2.orig/term-utils/ttymsg.c 2013-07-30 10:39:26.000000000 +0200 ++++ util-linux-2.23.2/term-utils/ttymsg.c 2013-08-14 12:50:50.000000000 +0200 +@@ -41,6 +41,7 @@ + */ + + #include ++#include + #include + #include + #include diff --git a/package/util-linux/patches/patch-text-utils_hexdump_h b/package/util-linux/patches/patch-text-utils_hexdump_h new file mode 100644 index 000000000..79e53a00d --- /dev/null +++ b/package/util-linux/patches/patch-text-utils_hexdump_h @@ -0,0 +1,12 @@ +patch taken from sabotage linux -- https://github.com/rofl0r/sabotage + +--- util-linux-2.23.2.orig/text-utils/hexdump.h 2013-07-30 10:39:26.000000000 +0200 ++++ util-linux-2.23.2/text-utils/hexdump.h 2013-08-14 12:44:31.000000000 +0200 +@@ -33,6 +33,7 @@ + * @(#)hexdump.h 5.4 (Berkeley) 6/1/90 + */ + ++#include + typedef struct _pr { + struct _pr *nextpr; /* next print unit */ + #define F_ADDRESS 0x001 /* print offset */ diff --git a/package/util-linux/patches/patch-text-utils_pg_c b/package/util-linux/patches/patch-text-utils_pg_c new file mode 100644 index 000000000..daa6adaee --- /dev/null +++ b/package/util-linux/patches/patch-text-utils_pg_c @@ -0,0 +1,13 @@ +patch taken from sabotage linux -- https://github.com/rofl0r/sabotage + +--- util-linux-2.23.2.orig/text-utils/pg.c 2013-07-30 10:39:26.000000000 +0200 ++++ util-linux-2.23.2/text-utils/pg.c 2013-08-14 12:44:55.000000000 +0200 +@@ -37,7 +37,7 @@ + #ifndef TIOCGWINSZ + # include + #endif +-#include ++#include + #include + #include + #include -- cgit v1.2.3