cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 1.16

Browse Source
This commit is contained in:
naddy 2006-11-13 16:25:10 +00:00
parent 5ca9fe7422
commit 37fdb40795
9 changed files with 57 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archivers/gtar/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.38 2006/02/27 21:29:55 naddy Exp $
# $OpenBSD: Makefile,v 1.39 2006/11/13 16:25:10 naddy Exp $
COMMENT= "GNU version of the traditional tar archiver"
DISTNAME= tar-1.15.1
PKGNAME= g${DISTNAME}p4
DISTNAME= tar-1.16
PKGNAME= g${DISTNAME}
CATEGORIES= archivers
HOMEPAGE= http://www.gnu.org/software/tar/
@ -21,6 +21,8 @@ EXTRACT_SUFX= .tar.bz2
MODULES= devel/gettext
RUN_DEPENDS= :bzip2-*:archivers/bzip2
REGRESS_DEPENDS=::devel/autoconf/2.60
REGRESS_FLAGS= AUTOCONF_VERSION=2.60
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --program-prefix=g
@ -28,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${DEPBASE}/include" \
LDFLAGS="-L${DEPBASE}/lib ${LDSTATIC}" \
DEFAULT_ARCHIVE=/dev/rst0 \
DEFAULT_RMT_COMMAND=/etc/rmt
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
FLAVORS= static
FLAVOR?=

8
archivers/gtar/distinfo
View File

@ -1,4 +1,4 @@
MD5 (tar-1.15.1.tar.bz2) = 57da3c38f8e06589699548a34d5a5d07
RMD160 (tar-1.15.1.tar.bz2) = 8de6b53b67294a942faec7638fb2cb2b4cccdac1
SHA1 (tar-1.15.1.tar.bz2) = f861b7524a0867833056dc382e68085234cae6ff
SIZE (tar-1.15.1.tar.bz2) = 1611489
MD5 (tar-1.16.tar.bz2) = d6fe544e834a8f9db6e6c7c2d38ec100
RMD160 (tar-1.16.tar.bz2) = 9d4a8a55ae0b62395cc7f72421fd274c443caf66
SHA1 (tar-1.16.tar.bz2) = b98abe392cedb7fcef475a41d61c17a8f800b90c
SIZE (tar-1.16.tar.bz2) = 1785682

42
archivers/gtar/patches/patch-configure
View File

@ -1,21 +1,21 @@
$OpenBSD: patch-configure,v 1.1 2005/01/01 23:47:44 naddy Exp $
--- configure.orig Tue Dec 21 14:30:30 2004
+++ configure Sat Jan 1 22:04:51 2005
@@ -25114,7 +25114,7 @@ s,@DEFAULT_BLOCKING@,$DEFAULT_BLOCKING,;
s,@PU_RMT_PROG@,$PU_RMT_PROG,;t t
s,@DEFAULT_RMT_DIR@,$DEFAULT_RMT_DIR,;t t
s,@DEFAULT_RMT_COMMAND@,$DEFAULT_RMT_COMMAND,;t t
-s,@LIBICONV@,$LIBICONV,;t t
+s,@LIBICONV@,$LTLIBICONV,;t t
s,@LTLIBICONV@,$LTLIBICONV,;t t
s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
s,@USE_NLS@,$USE_NLS,;t t
@@ -25123,7 +25123,7 @@ s,@GMSGFMT@,$GMSGFMT,;t t
s,@XGETTEXT@,$XGETTEXT,;t t
s,@MSGMERGE@,$MSGMERGE,;t t
s,@INTLLIBS@,$INTLLIBS,;t t
-s,@LIBINTL@,$LIBINTL,;t t
+s,@LIBINTL@,$LTLIBINTL,;t t
s,@LTLIBINTL@,$LTLIBINTL,;t t
s,@POSUB@,$POSUB,;t t
s,@AUTOM4TE@,$AUTOM4TE,;t t
$OpenBSD: patch-configure,v 1.2 2006/11/13 16:25:10 naddy Exp $
--- configure.orig Fri Oct 20 17:49:00 2006
+++ configure Fri Oct 20 17:54:49 2006
@@ -40036,7 +40036,7 @@ DEFAULT_ARCHIVE_FORMAT!$DEFAULT_ARCHIVE_
DEFAULT_ARCHIVE!$DEFAULT_ARCHIVE$ac_delim
DEFAULT_BLOCKING!$DEFAULT_BLOCKING$ac_delim
DEFAULT_QUOTING_STYLE!$DEFAULT_QUOTING_STYLE$ac_delim
-LIBICONV!$LIBICONV$ac_delim
+LIBICONV!$LTLIBICONV$ac_delim
LTLIBICONV!$LTLIBICONV$ac_delim
USE_NLS!$USE_NLS$ac_delim
MSGFMT!$MSGFMT$ac_delim
@@ -40048,7 +40048,7 @@ XGETTEXT_015!$XGETTEXT_015$ac_delim
MSGMERGE!$MSGMERGE$ac_delim
INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
INTLLIBS!$INTLLIBS$ac_delim
-LIBINTL!$LIBINTL$ac_delim
+LIBINTL!$LTLIBINTL$ac_delim
LTLIBINTL!$LTLIBINTL$ac_delim
POSUB!$POSUB$ac_delim
AUTOM4TE!$AUTOM4TE$ac_delim

8
archivers/gtar/patches/patch-lib_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_Makefile_in,v 1.5 2005/01/01 23:47:44 naddy Exp $
--- lib/Makefile.in.orig Sat Jan 1 22:11:14 2005
+++ lib/Makefile.in Sat Jan 1 22:12:28 2005
@@ -720,7 +720,7 @@ info-am:
$OpenBSD: patch-lib_Makefile_in,v 1.6 2006/11/13 16:25:10 naddy Exp $
--- lib/Makefile.in.orig Sat Oct 21 17:16:52 2006
+++ lib/Makefile.in Mon Nov 13 01:58:17 2006
@@ -938,7 +938,7 @@ info-am:
install-data-am:

12
archivers/gtar/patches/patch-src_sparse_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_sparse_c,v 1.1 2006/01/11 16:40:52 naddy Exp $
--- src/sparse.c.orig Wed Jan 11 17:33:48 2006
+++ src/sparse.c Wed Jan 11 17:34:29 2006
@@ -182,7 +182,7 @@ sparse_scan_file (struct tar_sparse_file
{
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))

15
archivers/gtar/patches/patch-src_tar_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_tar_c,v 1.1 2005/01/30 14:56:57 naddy Exp $
--- src/tar.c.orig Tue Dec 21 15:11:26 2004
+++ src/tar.c Sun Jan 30 15:22:05 2005
@@ -617,9 +617,9 @@ parse_opt(int key, char *arg, struct arg
switch (key)
{
- case 1:
+ case ARGP_KEY_ARG:
/* File name or non-parsed option, because of ARGP_IN_ORDER */
- name_add (optarg);
+ name_add (arg);
args->input_files++;
break;

122
archivers/gtar/patches/patch-src_xheader_c
View File

@ -1,122 +0,0 @@
$OpenBSD: patch-src_xheader_c,v 1.3 2006/02/27 21:29:55 naddy Exp $
--- src/xheader.c.orig Mon Sep 6 13:31:14 2004
+++ src/xheader.c Sun Feb 26 22:08:44 2006
@@ -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;
}
}

12
archivers/gtar/patches/patch-tests_shortrec_at Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-tests_shortrec_at,v 1.1 2006/11/13 16:25:10 naddy Exp $
--- tests/shortrec.at.orig Fri Oct 20 17:35:12 2006
+++ tests/shortrec.at Fri Oct 20 17:35:28 2006
@@ -28,7 +28,7 @@ AT_KEYWORDS([shortrec.at])
AT_TAR_CHECK([
mkdir directory
(cd directory && touch a b c d e f g h i j k l m n o p q r)
-tar -c -b 1 directory | tar -t -f - >/dev/null
+tar -c -b 1 -f - directory | tar -t -f - >/dev/null
tar -c -b 1 -f archive directory
tar -t -f archive >/dev/null
tar -t -f - < archive >/dev/null

15
archivers/gtar/pkg/PLIST
View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.19 2005/04/23 15:29:45 espie Exp $
@comment $OpenBSD: PLIST,v 1.20 2006/11/13 16:25:10 naddy Exp $
bin/gtar
libexec/grmt
@endfake
@info info/tar.info
share/locale/bg/LC_MESSAGES/tar.mo
share/locale/cs/LC_MESSAGES/tar.mo
share/locale/da/LC_MESSAGES/tar.mo
share/locale/de/LC_MESSAGES/tar.mo
@ -11,16 +12,16 @@ share/locale/es/LC_MESSAGES/tar.mo
share/locale/et/LC_MESSAGES/tar.mo
share/locale/fi/LC_MESSAGES/tar.mo
share/locale/fr/LC_MESSAGES/tar.mo
share/locale/ga/
share/locale/ga/LC_MESSAGES/
share/locale/ga/LC_MESSAGES/tar.mo
share/locale/gl/LC_MESSAGES/tar.mo
share/locale/hr/LC_MESSAGES/tar.mo
share/locale/hu/LC_MESSAGES/tar.mo
share/locale/id/LC_MESSAGES/tar.mo
share/locale/it/LC_MESSAGES/tar.mo
share/locale/ja/LC_MESSAGES/tar.mo
share/locale/ko/LC_MESSAGES/tar.mo
share/locale/ky/
share/locale/ky/LC_MESSAGES/
share/locale/ky/LC_MESSAGES/tar.mo
share/locale/ms/
share/locale/ms/LC_MESSAGES/
share/locale/ms/LC_MESSAGES/tar.mo
@ -32,9 +33,13 @@ share/locale/pt/LC_MESSAGES/tar.mo
share/locale/pt_BR/LC_MESSAGES/tar.mo
share/locale/ro/LC_MESSAGES/tar.mo
share/locale/ru/LC_MESSAGES/tar.mo
share/locale/rw/
share/locale/rw/LC_MESSAGES/
share/locale/rw/LC_MESSAGES/tar.mo
share/locale/sk/LC_MESSAGES/tar.mo
share/locale/sl/LC_MESSAGES/tar.mo
share/locale/sv/LC_MESSAGES/tar.mo
share/locale/tr/LC_MESSAGES/tar.mo
share/locale/uk/LC_MESSAGES/tar.mo
share/locale/vi/LC_MESSAGES/tar.mo
share/locale/zh_CN/LC_MESSAGES/tar.mo
share/locale/zh_TW/LC_MESSAGES/tar.mo