openpkg/tar.patch@4ecfc2416fd8 (annotated)
openpkg/tar.patch
Tue, 29 Mar 2011 19:46:35 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 29 Mar 2011 19:46:35 +0200
- changeset 333
- 4ecfc2416fd8
- parent 13
- cb59d6afeb61
- child 428
- f880f219c566
- permissions
- -rw-r--r--
Correct and introduce slightly needed logic, leading to better reliability:
Update bash(1) patch logic, correct several buildconf make location
errors, correct failed bash(1) configure invocation, enable perl(1) to
build with unpathed make(1), patch rpm(1) to correctly link with
internal libdb(3), and lastly unsuscessfully try to reorganize rpm patch
hunks.
| michael@13 | 1 | Index: Makefile.in |
| michael@250 | 2 | --- Makefile.in.orig 2010-03-10 11:52:09.000000000 +0100 |
| michael@250 | 3 | +++ Makefile.in 2010-03-10 18:28:13.000000000 +0100 |
| michael@250 | 4 | @@ -899,7 +899,7 @@ |
| michael@250 | 5 | top_srcdir = @top_srcdir@ |
| michael@13 | 6 | ACLOCAL_AMFLAGS = -I m4 |
| michael@250 | 7 | EXTRA_DIST = ChangeLog.1 Make.rules |
| michael@250 | 8 | -SUBDIRS = doc gnu lib rmt src scripts po tests |
| michael@250 | 9 | +SUBDIRS = doc gnu lib src |
| michael@250 | 10 | gen_start_date = 2009-03-06 |
| michael@250 | 11 | prev_change_log = ChangeLog.CVS |
| michael@250 | 12 | changelog_dir = . |
| michael@250 | 13 | Index: gnu/argp-help.c |
| michael@250 | 14 | --- gnu/argp-help.c.orig 2010-03-10 11:50:33.000000000 +0100 |
| michael@250 | 15 | +++ gnu/argp-help.c 2010-03-10 18:26:15.000000000 +0100 |
| michael@250 | 16 | @@ -571,8 +571,7 @@ |
| michael@13 | 17 | return val; |
| michael@13 | 18 | } |
| michael@13 | 19 | |
| michael@13 | 20 | -static inline int |
| michael@13 | 21 | -__attribute__ ((always_inline)) |
| michael@13 | 22 | +static int |
| michael@13 | 23 | hol_entry_long_iterate (const struct hol_entry *entry, |
| michael@250 | 24 | int (*func)(const struct argp_option *opt, |
| michael@250 | 25 | const struct argp_option *real, |
| michael@250 | 26 | Index: gnu/strerror.c |
| michael@250 | 27 | --- gnu/strerror.c.orig 2010-03-10 11:50:43.000000000 +0100 |
| michael@250 | 28 | +++ gnu/strerror.c 2010-03-10 18:26:15.000000000 +0100 |
| michael@250 | 29 | @@ -25,6 +25,7 @@ |
| michael@250 | 30 | |
| michael@250 | 31 | # include <errno.h> |
| michael@250 | 32 | # include <stdio.h> |
| michael@250 | 33 | +# include <limits.h> |
| michael@250 | 34 | |
| michael@250 | 35 | # if GNULIB_defined_ESOCK /* native Windows platforms */ |
| michael@250 | 36 | # if HAVE_WINSOCK2_H |
| michael@13 | 37 | Index: src/compare.c |
| michael@250 | 38 | --- src/compare.c.orig 2010-01-26 12:28:09.000000000 +0100 |
| michael@250 | 39 | +++ src/compare.c 2010-03-10 18:26:15.000000000 +0100 |
| michael@250 | 40 | @@ -277,7 +277,7 @@ |
| michael@13 | 41 | size_t len = strlen (current_stat_info.link_name); |
| michael@13 | 42 | char *linkbuf = alloca (len + 1); |
| michael@13 | 43 | |
| michael@13 | 44 | - int status = readlink (current_stat_info.file_name, linkbuf, len + 1); |
| michael@13 | 45 | + int status = readlink (current_stat_info.file_name, linkbuf, len); |
| michael@13 | 46 | |
| michael@13 | 47 | if (status < 0) |
| michael@13 | 48 | { |
| michael@13 | 49 | Index: src/create.c |
| michael@250 | 50 | --- src/create.c.orig 2010-03-09 13:52:41.000000000 +0100 |
| michael@250 | 51 | +++ src/create.c 2010-03-10 18:26:15.000000000 +0100 |
| michael@250 | 52 | @@ -1690,7 +1690,7 @@ |
| michael@13 | 53 | if (linklen != st->stat.st_size || linklen + 1 == 0) |
| michael@13 | 54 | xalloc_die (); |
| michael@13 | 55 | buffer = (char *) alloca (linklen + 1); |
| michael@13 | 56 | - size = readlink (p, buffer, linklen + 1); |
| michael@13 | 57 | + size = readlink (p, buffer, linklen); |
| michael@13 | 58 | if (size < 0) |
| michael@13 | 59 | { |
| michael@250 | 60 | file_removed_diag (p, top_level, readlink_diag); |
| michael@13 | 61 | Index: src/tar.c |
| michael@250 | 62 | --- src/tar.c.orig 2010-03-09 13:52:41.000000000 +0100 |
| michael@250 | 63 | +++ src/tar.c 2010-03-10 18:26:15.000000000 +0100 |
| michael@13 | 64 | @@ -20,6 +20,7 @@ |
| michael@13 | 65 | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ |
| michael@13 | 66 | |
| michael@13 | 67 | #include <system.h> |
| michael@13 | 68 | +#include <locale.h> |
| michael@13 | 69 | |
| michael@13 | 70 | #include <fnmatch.h> |
| michael@13 | 71 | #include <argp.h> |
| michael@13 | 72 | Index: src/utf8.c |
| michael@250 | 73 | --- src/utf8.c.orig 2010-01-26 12:30:20.000000000 +0100 |
| michael@250 | 74 | +++ src/utf8.c 2010-03-10 18:26:15.000000000 +0100 |
| michael@13 | 75 | @@ -22,6 +22,9 @@ |
| michael@13 | 76 | #include "common.h" |
| michael@13 | 77 | #ifdef HAVE_ICONV_H |
| michael@13 | 78 | # include <iconv.h> |
| michael@13 | 79 | +#else |
| michael@13 | 80 | +# define iconv_t void * |
| michael@13 | 81 | +# define ICONV_CONST const |
| michael@13 | 82 | #endif |
| michael@13 | 83 | |
| michael@13 | 84 | #ifndef ICONV_CONST |
| michael@13 | 85 | Index: src/xheader.c |
| michael@250 | 86 | --- src/xheader.c.orig 2010-02-12 11:03:09.000000000 +0100 |
| michael@250 | 87 | +++ src/xheader.c 2010-03-10 18:26:15.000000000 +0100 |
| michael@250 | 88 | @@ -26,6 +26,10 @@ |
| michael@13 | 89 | |
| michael@250 | 90 | #include "common.h" |
| michael@13 | 91 | |
| michael@13 | 92 | +#ifndef SIZE_MAX |
| michael@13 | 93 | +# define SIZE_MAX ((size_t) -1) |
| michael@13 | 94 | +#endif |
| michael@13 | 95 | + |
| michael@13 | 96 | static bool xheader_protected_pattern_p (char const *pattern); |
| michael@13 | 97 | static bool xheader_protected_keyword_p (char const *keyword); |
| michael@13 | 98 | static void xheader_set_single_keyword (char *) __attribute__ ((noreturn)); |
