comparison: openpkg/tar.patch
openpkg/tar.patch
- changeset 729
- 777fac408e45
- parent 250
- bda4f5eec616
equal
deleted
inserted
replaced
| 1:7ee94732d58d | 2:d53ea22dd566 |
|---|---|
| 1 Index: Makefile.in | 1 Index: Makefile.in |
| 2 --- Makefile.in.orig 2010-03-10 11:52:09.000000000 +0100 | 2 --- Makefile.in.orig 2011-03-12 10:50:13.000000000 +0100 |
| 3 +++ Makefile.in 2010-03-10 18:28:13.000000000 +0100 | 3 +++ Makefile.in 2011-07-31 17:41:03.000000000 +0200 |
| 4 @@ -899,7 +899,7 @@ | 4 @@ -1028,7 +1028,7 @@ |
| 5 top_srcdir = @top_srcdir@ | 5 top_srcdir = @top_srcdir@ |
| 6 ACLOCAL_AMFLAGS = -I m4 | 6 ACLOCAL_AMFLAGS = -I m4 |
| 7 EXTRA_DIST = ChangeLog.1 Make.rules | 7 EXTRA_DIST = ChangeLog.1 Make.rules |
| 8 -SUBDIRS = doc gnu lib rmt src scripts po tests | 8 -SUBDIRS = doc gnu lib rmt src scripts po tests |
| 9 +SUBDIRS = doc gnu lib src | 9 +SUBDIRS = doc gnu lib src |
| 10 gen_start_date = 2009-03-06 | 10 gen_start_date = 2009-03-06 |
| 11 prev_change_log = ChangeLog.CVS | 11 prev_change_log = ChangeLog.CVS |
| 12 changelog_dir = . | 12 changelog_dir = . |
| 13 Index: gnu/argp-help.c | 13 Index: gnu/argp-help.c |
| 14 --- gnu/argp-help.c.orig 2010-03-10 11:50:33.000000000 +0100 | 14 --- gnu/argp-help.c.orig 2011-03-12 10:14:26.000000000 +0100 |
| 15 +++ gnu/argp-help.c 2010-03-10 18:26:15.000000000 +0100 | 15 +++ gnu/argp-help.c 2011-07-31 17:44:24.000000000 +0200 |
| 16 @@ -571,8 +571,7 @@ | 16 @@ -571,10 +571,7 @@ |
| 17 return val; | 17 return val; |
| 18 } | 18 } |
| 19 | 19 |
| 20 -static inline int | 20 -static inline int |
| 21 -#if __GNUC__ >= 3 | |
| 21 -__attribute__ ((always_inline)) | 22 -__attribute__ ((always_inline)) |
| 23 -#endif | |
| 22 +static int | 24 +static int |
| 23 hol_entry_long_iterate (const struct hol_entry *entry, | 25 hol_entry_long_iterate (const struct hol_entry *entry, |
| 24 int (*func)(const struct argp_option *opt, | 26 int (*func)(const struct argp_option *opt, |
| 25 const struct argp_option *real, | 27 const struct argp_option *real, |
| 26 Index: gnu/strerror.c | 28 Index: gnu/strerror.c |
| 27 --- gnu/strerror.c.orig 2010-03-10 11:50:43.000000000 +0100 | 29 --- gnu/strerror.c.orig 2011-03-12 10:14:33.000000000 +0100 |
| 28 +++ gnu/strerror.c 2010-03-10 18:26:15.000000000 +0100 | 30 +++ gnu/strerror.c 2011-07-31 17:41:03.000000000 +0200 |
| 29 @@ -25,6 +25,7 @@ | 31 @@ -25,6 +25,7 @@ |
| 30 | 32 |
| 31 # include <errno.h> | 33 # include <errno.h> |
| 32 # include <stdio.h> | 34 # include <stdio.h> |
| 33 +# include <limits.h> | 35 +# include <limits.h> |
| 34 | 36 |
| 35 # if GNULIB_defined_ESOCK /* native Windows platforms */ | 37 # if GNULIB_defined_ESOCK /* native Windows platforms */ |
| 36 # if HAVE_WINSOCK2_H | 38 # if HAVE_WINSOCK2_H |
| 37 Index: src/compare.c | |
| 38 --- src/compare.c.orig 2010-01-26 12:28:09.000000000 +0100 | |
| 39 +++ src/compare.c 2010-03-10 18:26:15.000000000 +0100 | |
| 40 @@ -277,7 +277,7 @@ | |
| 41 size_t len = strlen (current_stat_info.link_name); | |
| 42 char *linkbuf = alloca (len + 1); | |
| 43 | |
| 44 - int status = readlink (current_stat_info.file_name, linkbuf, len + 1); | |
| 45 + int status = readlink (current_stat_info.file_name, linkbuf, len); | |
| 46 | |
| 47 if (status < 0) | |
| 48 { | |
| 49 Index: src/create.c | |
| 50 --- src/create.c.orig 2010-03-09 13:52:41.000000000 +0100 | |
| 51 +++ src/create.c 2010-03-10 18:26:15.000000000 +0100 | |
| 52 @@ -1690,7 +1690,7 @@ | |
| 53 if (linklen != st->stat.st_size || linklen + 1 == 0) | |
| 54 xalloc_die (); | |
| 55 buffer = (char *) alloca (linklen + 1); | |
| 56 - size = readlink (p, buffer, linklen + 1); | |
| 57 + size = readlink (p, buffer, linklen); | |
| 58 if (size < 0) | |
| 59 { | |
| 60 file_removed_diag (p, top_level, readlink_diag); | |
| 61 Index: src/tar.c | 39 Index: src/tar.c |
| 62 --- src/tar.c.orig 2010-03-09 13:52:41.000000000 +0100 | 40 --- src/tar.c.orig 2010-10-24 20:07:55.000000000 +0200 |
| 63 +++ src/tar.c 2010-03-10 18:26:15.000000000 +0100 | 41 +++ src/tar.c 2011-07-31 17:41:03.000000000 +0200 |
| 64 @@ -20,6 +20,7 @@ | 42 @@ -20,6 +20,7 @@ |
| 65 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ | 43 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ |
| 66 | 44 |
| 67 #include <system.h> | 45 #include <system.h> |
| 68 +#include <locale.h> | 46 +#include <locale.h> |
| 69 | 47 |
| 70 #include <fnmatch.h> | 48 #include <fnmatch.h> |
| 71 #include <argp.h> | 49 #include <argp.h> |
| 72 Index: src/utf8.c | 50 Index: src/utf8.c |
| 73 --- src/utf8.c.orig 2010-01-26 12:30:20.000000000 +0100 | 51 --- src/utf8.c.orig 2010-01-22 18:18:15.000000000 +0100 |
| 74 +++ src/utf8.c 2010-03-10 18:26:15.000000000 +0100 | 52 +++ src/utf8.c 2011-07-31 17:41:03.000000000 +0200 |
| 75 @@ -22,6 +22,9 @@ | 53 @@ -22,6 +22,9 @@ |
| 76 #include "common.h" | 54 #include "common.h" |
| 77 #ifdef HAVE_ICONV_H | 55 #ifdef HAVE_ICONV_H |
| 78 # include <iconv.h> | 56 # include <iconv.h> |
| 79 +#else | 57 +#else |
| 81 +# define ICONV_CONST const | 59 +# define ICONV_CONST const |
| 82 #endif | 60 #endif |
| 83 | 61 |
| 84 #ifndef ICONV_CONST | 62 #ifndef ICONV_CONST |
| 85 Index: src/xheader.c | 63 Index: src/xheader.c |
| 86 --- src/xheader.c.orig 2010-02-12 11:03:09.000000000 +0100 | 64 --- src/xheader.c.orig 2010-11-27 12:18:49.000000000 +0100 |
| 87 +++ src/xheader.c 2010-03-10 18:26:15.000000000 +0100 | 65 +++ src/xheader.c 2011-07-31 17:41:03.000000000 +0200 |
| 88 @@ -26,6 +26,10 @@ | 66 @@ -26,6 +26,10 @@ |
| 89 | 67 |
| 90 #include "common.h" | 68 #include "common.h" |
| 91 | 69 |
| 92 +#ifndef SIZE_MAX | 70 +#ifndef SIZE_MAX |
| 93 +# define SIZE_MAX ((size_t) -1) | 71 +# define SIZE_MAX ((size_t) -1) |
| 94 +#endif | 72 +#endif |
| 95 + | 73 + |
| 74 static void xheader_init (struct xheader *xhdr); | |
| 96 static bool xheader_protected_pattern_p (char const *pattern); | 75 static bool xheader_protected_pattern_p (char const *pattern); |
| 97 static bool xheader_protected_keyword_p (char const *keyword); | 76 static bool xheader_protected_keyword_p (char const *keyword); |
| 98 static void xheader_set_single_keyword (char *) __attribute__ ((noreturn)); |
