[arch-commits] CVS update of arch/build/base/tar (4 files)
Alexander Baldeck
alexander at archlinux.org
Fri Jun 8 20:54:57 UTC 2007
Date: Friday, June 8, 2007 @ 16:54:57
Author: alexander
Path: /home/cvs-arch/arch/build/base/tar
Modified: PKGBUILD (1.19 -> 1.20)
Removed: heap-overflow.patch (1.1) tar-1.13.25.patch (1.1)
tar-mangling.patch (1.1)
* removed obsolete patches while building for x86_64
---------------------+
PKGBUILD | 4 -
heap-overflow.patch | 121 --------------------------------------------------
tar-1.13.25.patch | 15 ------
tar-mangling.patch | 64 --------------------------
4 files changed, 1 insertion(+), 203 deletions(-)
Index: arch/build/base/tar/PKGBUILD
diff -u arch/build/base/tar/PKGBUILD:1.19 arch/build/base/tar/PKGBUILD:1.20
--- arch/build/base/tar/PKGBUILD:1.19 Fri Jun 8 14:26:29 2007
+++ arch/build/base/tar/PKGBUILD Fri Jun 8 16:54:57 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.19 2007/06/08 18:26:29 tpowa Exp $
+# $Id: PKGBUILD,v 1.20 2007/06/08 20:54:57 alexander Exp $
# Maintainer: judd <jvinet at zeroflux.org>
pkgname=tar
pkgver=1.17
@@ -14,8 +14,6 @@
build() {
cd $startdir/src/$pkgname-$pkgver
- #patch -Np0 -i ../heap-overflow.patch || return 1
- #patch -Np1 -i ../tar-mangling.patch || return 1
./configure --prefix=/usr --libexecdir=/usr/lib/tar --bindir=/bin
make || return 1
make DESTDIR=$startdir/pkg install
Index: arch/build/base/tar/heap-overflow.patch
diff -u arch/build/base/tar/heap-overflow.patch:1.1 arch/build/base/tar/heap-overflow.patch:removed
--- arch/build/base/tar/heap-overflow.patch:1.1 Thu Mar 2 15:27:43 2006
+++ arch/build/base/tar/heap-overflow.patch Fri Jun 8 16:54:57 2007
@@ -1,121 +0,0 @@
---- src/xheader.c.orig 2004-09-06 06:31:14.000000000 -0500
-+++ src/xheader.c 2006-02-08 16:59:46.000000000 -0500
-@@ -783,6 +783,32 @@ code_num (uintmax_t value, char const *k
- xheader_print (xhdr, keyword, sbuf);
- }
-
-+static bool
-+decode_num (uintmax_t *num, char const *arg, uintmax_t maxval,
-+ char const *keyword)
-+{
-+ uintmax_t u;
-+ char *arg_lim;
-+
-+ if (! (ISDIGIT (*arg)
-+ && (errno = 0, u = strtoumax (arg, &arg_lim, 10), !*arg_lim)))
-+ {
-+ ERROR ((0, 0, _("Malformed extended header: invalid %s=%s"),
-+ keyword, arg));
-+ return false;
-+ }
-+
-+ if (! (u <= maxval && errno != ERANGE))
-+ {
-+ ERROR ((0, 0, _("Extended header %s=%s is out of range"),
-+ keyword, arg));
-+ return false;
-+ }
-+
-+ *num = u;
-+ return true;
-+}
-+
- static void
- dummy_coder (struct tar_stat_info const *st __attribute__ ((unused)),
- char const *keyword __attribute__ ((unused)),
-@@ -821,7 +847,7 @@ static void
- gid_decoder (struct tar_stat_info *st, char const *arg)
- {
- uintmax_t u;
-- if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
-+ if (decode_num (&u, arg, TYPE_MAXIMUM (gid_t), "gid"))
- st->stat.st_gid = u;
- }
-
-@@ -903,7 +929,7 @@ static void
- size_decoder (struct tar_stat_info *st, char const *arg)
- {
- uintmax_t u;
-- if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
-+ if (decode_num (&u, arg, TYPE_MAXIMUM (off_t), "size"))
- st->archive_file_size = st->stat.st_size = u;
- }
-
-@@ -918,7 +944,7 @@ static void
- uid_decoder (struct tar_stat_info *st, char const *arg)
- {
- uintmax_t u;
-- if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
-+ if (decode_num (&u, arg, TYPE_MAXIMUM (uid_t), "uid"))
- st->stat.st_uid = u;
- }
-
-@@ -946,7 +972,7 @@ static void
- sparse_size_decoder (struct tar_stat_info *st, char const *arg)
- {
- uintmax_t u;
-- if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
-+ if (decode_num (&u, arg, TYPE_MAXIMUM (off_t), "GNU.sparse.size"))
- st->stat.st_size = u;
- }
-
-@@ -962,10 +988,10 @@ static void
- sparse_numblocks_decoder (struct tar_stat_info *st, char const *arg)
- {
- uintmax_t u;
-- if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
-+ if (decode_num (&u, arg, SIZE_MAX, "GNU.sparse.numblocks"))
- {
- st->sparse_map_size = u;
-- st->sparse_map = calloc(st->sparse_map_size, sizeof(st->sparse_map[0]));
-+ st->sparse_map = xcalloc (u, sizeof st->sparse_map[0]);
- st->sparse_map_avail = 0;
- }
- }
-@@ -982,8 +1008,14 @@ static void
- sparse_offset_decoder (struct tar_stat_info *st, char const *arg)
- {
- uintmax_t u;
-- if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
-+ if (decode_num (&u, arg, TYPE_MAXIMUM (off_t), "GNU.sparse.offset"))
-+ {
-+ if (st->sparse_map_avail < st->sparse_map_size)
- st->sparse_map[st->sparse_map_avail].offset = u;
-+ else
-+ ERROR ((0, 0, _("Malformed extended header: excess %s=%s"),
-+ "GNU.sparse.offset", arg));
-+ }
- }
-
- static void
-@@ -998,15 +1030,13 @@ static void
- sparse_numbytes_decoder (struct tar_stat_info *st, char const *arg)
- {
- uintmax_t u;
-- if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
-+ if (decode_num (&u, arg, SIZE_MAX, "GNU.sparse.numbytes"))
- {
- if (st->sparse_map_avail == st->sparse_map_size)
-- {
-- st->sparse_map_size *= 2;
-- st->sparse_map = xrealloc (st->sparse_map,
-- st->sparse_map_size
-- * sizeof st->sparse_map[0]);
-- }
-+ st->sparse_map = x2nrealloc (st->sparse_map,
-+ &st->sparse_map_size,
-+ sizeof st->sparse_map[0]);
-+
- st->sparse_map[st->sparse_map_avail++].numbytes = u;
- }
- }
Index: arch/build/base/tar/tar-1.13.25.patch
diff -u arch/build/base/tar/tar-1.13.25.patch:1.1 arch/build/base/tar/tar-1.13.25.patch:removed
--- arch/build/base/tar/tar-1.13.25.patch:1.1 Fri Mar 14 12:41:39 2003
+++ arch/build/base/tar/tar-1.13.25.patch Fri Jun 8 16:54:57 2007
@@ -1,15 +0,0 @@
---- tar-1.13.25/src/misc.c.orig Mon Aug 27 00:14:26 2001
-+++ tar-1.13.25/src/misc.c Mon May 27 11:29:31 2002
-@@ -214,6 +214,13 @@
- return 0;
- }
- while (! ISSLASH (*p));
-+
-+ do
-+ {
-+ if (! *p++)
-+ return 0;
-+ }
-+ while ( ISSLASH (*p));
- }
- }
Index: arch/build/base/tar/tar-mangling.patch
diff -u arch/build/base/tar/tar-mangling.patch:1.1 arch/build/base/tar/tar-mangling.patch:removed
--- arch/build/base/tar/tar-mangling.patch:1.1 Wed Nov 29 14:11:48 2006
+++ arch/build/base/tar/tar-mangling.patch Fri Jun 8 16:54:57 2007
@@ -1,64 +0,0 @@
-diff -u tar-1.16/src/extract.c tar-1.16/src/extract.c
---- tar-1.16/src/extract.c
-+++ tar-1.16/src/extract.c
-@@ -1122,7 +1122,13 @@
- break;
-
- case GNUTYPE_NAMES:
-- *fun = extract_mangle_wrapper;
-+ if (allow_name_mangling_option) {
-+ *fun = extract_mangle_wrapper;
-+ }
-+ else {
-+ ERROR ((0, 0, _("GNUTYPE_NAMES mangling ignored")));
-+ *fun = extract_failure;
-+ }
- break;
-
- case GNUTYPE_MULTIVOL:
-only in patch2:
-unchanged:
---- tar-1.16.orig/src/tar.c
-+++ tar-1.16/src/tar.c
-@@ -247,6 +247,7 @@
- enum
- {
- ANCHORED_OPTION = CHAR_MAX + 1,
-+ ALLOW_NAME_MANGLING_OPTION,
- ATIME_PRESERVE_OPTION,
- BACKUP_OPTION,
- CHECKPOINT_OPTION,
-@@ -705,6 +706,8 @@
-
- {NULL, 'o', 0, 0,
- N_("when creating, same as --old-archive; when extracting, same as --no-same-owner"), GRID+1 },
-+ {"allow-name-mangling", ALLOW_NAME_MANGLING_OPTION, 0, 0,
-+ N_("when creating, allow GNUTYPE_NAMES mangling -- considered dangerous"), GRID+1 },
- #undef GRID
-
- #define GRID 120
-@@ -1431,6 +1434,10 @@
- set_use_compress_program_option ("compress");
- break;
-
-+ case ALLOW_NAME_MANGLING_OPTION:
-+ allow_name_mangling_option = true;
-+ break;
-+
- case ANCHORED_OPTION:
- args->matching_flags |= EXCLUDE_ANCHORED;
- break;
-only in patch2:
-unchanged:
---- tar-1.16.orig/src/common.h
-+++ tar-1.16/src/common.h
-@@ -105,6 +105,9 @@
-
- GLOBAL bool absolute_names_option;
-
-+/* Allow GNUTYPE_NAMES type? */
-+GLOBAL bool allow_name_mangling_option;
-+
- /* Display file times in UTC */
- GLOBAL bool utc_option;
-
More information about the arch-commits
mailing list