Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (bb027a9c62f96e81dfd547d6f22bff7fd792bd6e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (bb027a9c62f96e81dfd547d6f22bff7fd792bd6e)
  • Date: Mon, 23 Oct 2006 12:21:02 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

archive/tar/DETAILS | 10 +
archive/tar/HISTORY | 4
archive/tar/PRE_BUILD | 4
archive/tar/patches/tar-1.15.1-sparse_fix-1.patch | 26 ----
archive/tar/patches/tar.patch | 121
----------------------
python-devel/setuptools/DETAILS | 6 -
6 files changed, 13 insertions(+), 158 deletions(-)

New commits:
commit f8c3677f29631f51a887d1c64c5ba7718052cf0e
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

tar-1.16

commit 47d8fba1ae1f42852d67963c8c11ff4256fc549e
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

setuptools-0.6c3

diff --git a/archive/tar/DETAILS b/archive/tar/DETAILS
index 6129b2f..5578b9f 100755
--- a/archive/tar/DETAILS
+++ b/archive/tar/DETAILS
@@ -1,12 +1,14 @@
SPELL=tar
- VERSION=1.15.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.16
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:4c86794cb3e1f97b40e8ad246a24df66e05afba2bae2edb27b4524f1a37bcaea2a99318b8ebed4654ff43451cf66a6714d40c920f68e0cb3ba6c7d36c6cab0d6
+ SOURCE2_URL[0]=$GNU_URL/$SPELL/$SOURCE2
+ SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
WEB_SITE=http://www.gnu.org/software/tar/tar.html
ENTERED=20010922
- UPDATED=20050526
SECURITY_PATCH=1
LICENSE[0]=GPL
KEYWORDS="archive"
diff --git a/archive/tar/HISTORY b/archive/tar/HISTORY
index f0aca5d..d8060bb 100644
--- a/archive/tar/HISTORY
+++ b/archive/tar/HISTORY
@@ -1,3 +1,7 @@
+2006-10-23 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: version 1.16
+ * PRE_BUILD, patches/*: deleted
+
2006-06-28 Eric Sandall <eric AT sandall.us>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/archive/tar/PRE_BUILD b/archive/tar/PRE_BUILD
deleted file mode 100755
index 1cc5923..0000000
--- a/archive/tar/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p0 < ${SCRIPT_DIRECTORY}/patches/tar-1.15.1-sparse_fix-1.patch &&
-patch -p0 < ${SCRIPT_DIRECTORY}/patches/tar.patch
diff --git a/archive/tar/patches/tar-1.15.1-sparse_fix-1.patch
b/archive/tar/patches/tar-1.15.1-sparse_fix-1.patch
deleted file mode 100644
index 234e741..0000000
--- a/archive/tar/patches/tar-1.15.1-sparse_fix-1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2005-03-19
-Initial Package Version: 1.15.1
-Origin: Tar Bug Reports List
-Upstream Status: Applied
-Description: Fixes large file corruptions using option -S
- http://lists.gnu.org/archive/html/bug-tar/2005-03/msg00004.html
---- src/sparse.c.orig 2005-03-20 04:23:34.144506120 +0000
-+++ src/sparse.c 2005-03-20 04:23:56.842055568 +0000
-@@ -1,6 +1,6 @@
- /* Functions for dealing with sparse files
-
-- Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-+ Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
-@@ -182,7 +182,7 @@
- {
- static char buffer[BLOCKSIZE];
- size_t count;
-- size_t offset = 0;
-+ off_t offset = 0;
- struct sp_array sp = {0, 0};
-
- if (!lseek_or_error (file, 0, SEEK_SET))
diff --git a/archive/tar/patches/tar.patch b/archive/tar/patches/tar.patch
deleted file mode 100644
index 679f818..0000000
--- a/archive/tar/patches/tar.patch
+++ /dev/null
@@ -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;
- }
- }
diff --git a/python-devel/setuptools/DETAILS b/python-devel/setuptools/DETAILS
index 00cb486..e294843 100755
--- a/python-devel/setuptools/DETAILS
+++ b/python-devel/setuptools/DETAILS
@@ -1,8 +1,8 @@
SPELL=setuptools
CHEESESHOP_PKG=$SPELL
- VERSION=0.6b4
-
SOURCE_HASH=sha512:68c032a017ef7317bd54b924787f2a928f19cc8789979b884bcb82837c5e19f332fb7a6e84aac640b93f7a35a0c8a81a2111dbec9a771c430d9cd342b74b196f
- SOURCE="$SPELL-$VERSION.zip"
+ VERSION=0.6c3
+
SOURCE_HASH=sha512:4a5b7930121f3480f3c6fcedf494b127535988e428776ac3093845ec7b232d40130fffb0ad86343337b3d3719548c5c6ce7ee0946836df62e59be7440c9f3b1f
+ SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]="http://cheeseshop.python.org/packages/source/${CHEESESHOP_PKG:0:1}/${CHEESESHOP_PKG}/$SOURCE";
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://peak.telecommunity.com/DevCenter/$SPELL";



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (bb027a9c62f96e81dfd547d6f22bff7fd792bd6e), Treeve Jelbert, 10/23/2006

Archive powered by MHonArc 2.6.24.

Top of Page