openpkg/tar.patch@3309487768d4 (annotated)
openpkg/tar.patch
Sat, 18 Jul 2009 14:08:34 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 18 Jul 2009 14:08:34 +0200
- changeset 206
- 3309487768d4
- child 250
- bda4f5eec616
- permissions
- -rw-r--r--
Adjust buildconf until Nokia corrects flawed GNU iconv integration.
The problem corrected by this adjustment involves font glyphs appearing
as normal font sized empty squares. All text is illegible.
| michael@13 | 1 | Index: Makefile.in |
| michael@13 | 2 | --- Makefile.in.orig 2007-10-10 13:00:22 +0200 |
| michael@13 | 3 | +++ Makefile.in 2007-10-17 08:40:12 +0200 |
| michael@13 | 4 | @@ -485,7 +485,7 @@ |
| michael@13 | 5 | target_alias = @target_alias@ |
| michael@13 | 6 | ACLOCAL_AMFLAGS = -I m4 |
| michael@13 | 7 | EXTRA_DIST = ChangeLog.1 PORTS |
| michael@13 | 8 | -SUBDIRS = doc lib rmt src scripts po tests |
| michael@13 | 9 | +SUBDIRS = doc lib src |
| michael@13 | 10 | all: config.h |
| michael@13 | 11 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
| michael@13 | 12 | |
| michael@13 | 13 | Index: lib/argp-help.c |
| michael@13 | 14 | --- lib/argp-help.c.orig 2007-09-28 15:11:36 +0200 |
| michael@13 | 15 | +++ lib/argp-help.c 2007-10-17 08:40:12 +0200 |
| michael@13 | 16 | @@ -570,8 +570,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@13 | 24 | int (*func)(const struct argp_option *opt, |
| michael@13 | 25 | const struct argp_option *real, |
| michael@13 | 26 | Index: src/compare.c |
| michael@13 | 27 | --- src/compare.c.orig 2007-08-26 10:56:55 +0200 |
| michael@13 | 28 | +++ src/compare.c 2007-10-17 08:40:12 +0200 |
| michael@13 | 29 | @@ -278,7 +278,7 @@ |
| michael@13 | 30 | size_t len = strlen (current_stat_info.link_name); |
| michael@13 | 31 | char *linkbuf = alloca (len + 1); |
| michael@13 | 32 | |
| michael@13 | 33 | - int status = readlink (current_stat_info.file_name, linkbuf, len + 1); |
| michael@13 | 34 | + int status = readlink (current_stat_info.file_name, linkbuf, len); |
| michael@13 | 35 | |
| michael@13 | 36 | if (status < 0) |
| michael@13 | 37 | { |
| michael@13 | 38 | Index: src/create.c |
| michael@13 | 39 | --- src/create.c.orig 2007-10-05 19:46:49 +0200 |
| michael@13 | 40 | +++ src/create.c 2007-10-17 08:40:12 +0200 |
| michael@13 | 41 | @@ -1696,7 +1696,7 @@ |
| michael@13 | 42 | if (linklen != st->stat.st_size || linklen + 1 == 0) |
| michael@13 | 43 | xalloc_die (); |
| michael@13 | 44 | buffer = (char *) alloca (linklen + 1); |
| michael@13 | 45 | - size = readlink (p, buffer, linklen + 1); |
| michael@13 | 46 | + size = readlink (p, buffer, linklen); |
| michael@13 | 47 | if (size < 0) |
| michael@13 | 48 | { |
| michael@13 | 49 | readlink_diag (p); |
| michael@13 | 50 | Index: src/incremen.c |
| michael@13 | 51 | --- src/incremen.c.orig 2007-10-01 23:19:55 +0200 |
| michael@13 | 52 | +++ src/incremen.c 2007-10-17 08:40:12 +0200 |
| michael@13 | 53 | @@ -526,6 +526,7 @@ |
| michael@13 | 54 | children = CHANGED_CHILDREN; |
| michael@13 | 55 | but changed to: */ |
| michael@13 | 56 | free (name_buffer); |
| michael@13 | 57 | + if (dirp) |
| michael@13 | 58 | free (dirp); |
| michael@13 | 59 | return NULL; |
| michael@13 | 60 | } |
| michael@13 | 61 | Index: src/tar.c |
| michael@13 | 62 | --- src/tar.c.orig 2007-09-26 23:36:58 +0200 |
| michael@13 | 63 | +++ src/tar.c 2007-10-17 08:40:12 +0200 |
| 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@13 | 73 | --- src/utf8.c.orig 2007-06-27 15:30:32 +0200 |
| michael@13 | 74 | +++ src/utf8.c 2007-10-17 08:40:12 +0200 |
| 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@13 | 86 | --- src/xheader.c.orig 2007-06-27 15:30:32 +0200 |
| michael@13 | 87 | +++ src/xheader.c 2007-10-17 08:40:12 +0200 |
| michael@13 | 88 | @@ -27,6 +27,10 @@ |
| michael@13 | 89 | |
| michael@13 | 90 | #include <fnmatch.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)); |
| michael@13 | 99 | Index: lib/strerror.c |
| michael@13 | 100 | --- lib/strerror.c.orig 2007-09-28 15:11:37 +0200 |
| michael@13 | 101 | +++ lib/strerror.c 2007-10-18 00:55:28 +0200 |
| michael@13 | 102 | @@ -23,6 +23,7 @@ |
| michael@13 | 103 | |
| michael@13 | 104 | # include <string.h> |
| michael@13 | 105 | # include <stdio.h> |
| michael@13 | 106 | +# include <limits.h> |
| michael@13 | 107 | |
| michael@13 | 108 | # undef strerror |
| michael@13 | 109 |
