Update to 1.13.94:

- Added support for POSIX.1-2001 and ustar archive formats.
- Various option cleanups.
- New message translations.
- Bug fixes.

Switch to .bz2 distfile since we already depend on bzip2 anyway.
This commit is contained in:
naddy 2004-04-22 02:56:10 +00:00
parent 6464c50a3f
commit bcb59cf546
8 changed files with 51 additions and 118 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.27 2003/05/24 01:38:08 jolan Exp $ # $OpenBSD: Makefile,v 1.28 2004/04/22 02:56:10 naddy Exp $
COMMENT= "GNU version of the traditional tar archiver" COMMENT= "GNU version of the traditional tar archiver"
DISTNAME= tar-1.13.25 DISTNAME= tar-1.13.94
PKGNAME= g${DISTNAME}p1 PKGNAME= g${DISTNAME}
CATEGORIES= archivers CATEGORIES= archivers
MASTER_SITES= ftp://alpha.gnu.org/gnu/tar/ \ MASTER_SITES= ftp://alpha.gnu.org/gnu/tar/ \
ftp://ftp.sunsite.org.uk/Mirrors/alpha.gnu.org/gnu/tar/ \
ftp://ftp.funet.fi/pub/mirrors/alpha.gnu.org/gnu/tar/ ftp://ftp.funet.fi/pub/mirrors/alpha.gnu.org/gnu/tar/
MAINTAINER= Christian Weisgerber <naddy@openbsd.org> MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
@ -17,17 +16,16 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
EXTRACT_SUFX= .tar.bz2
MODULES= gettext MODULES= gettext
RUN_DEPENDS+= :bzip2-*:archivers/bzip2 RUN_DEPENDS= :bzip2-*:archivers/bzip2
SEPARATE_BUILD= flavored CONFIGURE_STYLE=gnu
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --program-prefix=g CONFIGURE_ARGS= --program-prefix=g
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${LDSTATIC}" \ LDFLAGS="-L${LOCALBASE}/lib ${LDSTATIC}" \
DEFAULT_ARCHIVE="/dev/rst0" \ DEFAULT_ARCHIVE="/dev/rst0"
MAKEINFO="makeinfo --no-split"
FLAVORS= static FLAVORS= static
FLAVOR?= FLAVOR?=

View File

@ -1,3 +1,3 @@
MD5 (tar-1.13.25.tar.gz) = 6ef8c906e81eee441f8335652670ac4a MD5 (tar-1.13.94.tar.bz2) = ff0c45f0158f92d76b46ec9181b25ae6
RMD160 (tar-1.13.25.tar.gz) = becc909ee111f1288d69881a168ef2c513f42d86 RMD160 (tar-1.13.94.tar.bz2) = 28f0d1e27b167994c970634bedd54d7ca81bb8d7
SHA1 (tar-1.13.25.tar.gz) = d27fda27af621a1182bff289d4bfc7b37019effe SHA1 (tar-1.13.94.tar.bz2) = 9957dd1f5f22464f60cf9c6a6b5078b3fb6cc80c

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-lib_Makefile_in,v 1.3 2001/11/05 00:58:29 naddy Exp $
--- lib/Makefile.in.orig Wed Sep 26 22:34:09 2001
+++ lib/Makefile.in Sun Nov 4 23:11:47 2001
@@ -453,6 +453,7 @@ $(srcdir)/getdate.c: getdate.y
cd $(srcdir) && \
$(YACC) $(YFLAGS) getdate.y && \
mv -f y.tab.c getdate.c
+getdate.o: $(srcdir)/getdate.c
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_buffer_c,v 1.1 2003/10/26 17:22:24 sturm Exp $
--- src/buffer.c.orig 2003-10-25 16:38:17.000000000 +0200
+++ src/buffer.c 2003-10-25 16:38:33.000000000 +0200
@@ -1540,7 +1540,7 @@ new_volume (enum access_mode access)
child = xfork ();
if (child == 0)
{
- execlp (shell, "-sh", "-i", 0);
+ execlp (shell, "-sh", "-i", (void *)NULL);
exec_fatal (shell);
}
else

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-src_extract_c,v 1.1 2002/10/01 02:03:52 brad Exp $
--- src/extract.c.orig Mon Sep 24 14:55:17 2001
+++ src/extract.c Mon Sep 30 21:39:17 2002
@@ -1019,10 +1019,19 @@ extract_archive (void)
{
struct stat st1, st2;
int e;
+ size_t skiplinkcrud;
+
+ if (absolute_names_option)
+ skiplinkcrud = 0;
+ else {
+ skiplinkcrud = FILESYSTEM_PREFIX_LEN (current_link_name);
+ while (ISSLASH (current_link_name[skiplinkcrud]))
+ skiplinkcrud++;
+ }
/* MSDOS does not implement links. However, djgpp's link() actually
copies the file. */
- status = link (current_link_name, CURRENT_FILE_NAME);
+ status = link (current_link_name + skiplinkcrud, CURRENT_FILE_NAME);
if (status == 0)
{

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_misc_c,v 1.1 2002/10/01 02:03:52 brad Exp $
--- src/misc.c.orig Sun Aug 26 19:14:26 2001
+++ src/misc.c Mon Sep 30 21:39:32 2002
@@ -214,6 +214,13 @@ contains_dot_dot (char const *name)
return 0;
}
while (! ISSLASH (*p));
+
+ do
+ {
+ if (! *p++)
+ return 0;
+ }
+ while ( ISSLASH (*p));
}
}

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_xheader_c,v 1.1 2004/04/22 02:56:10 naddy Exp $
--- src/xheader.c.orig 2004-04-22 02:25:31.000000000 +0200
+++ src/xheader.c 2004-04-22 02:25:44.000000000 +0200
@@ -20,6 +20,7 @@
#include <hash.h>
#include <quotearg.h>
+#include <stpcpy.h>
#include <xstrtol.h>
#include "common.h"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.13 2003/12/15 15:49:08 naddy Exp $ @comment $OpenBSD: PLIST,v 1.14 2004/04/22 02:56:10 naddy Exp $
@unexec install-info --delete --info-dir=%D/info %D/info/tar.info @unexec install-info --delete --info-dir=%D/info %D/info/tar.info
bin/gtar bin/gtar
info/tar.info info/tar.info
@ -8,57 +8,45 @@ share/locale/da/LC_MESSAGES/tar.mo
share/locale/de/LC_MESSAGES/tar.mo share/locale/de/LC_MESSAGES/tar.mo
share/locale/es/LC_MESSAGES/tar.mo share/locale/es/LC_MESSAGES/tar.mo
share/locale/et/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/fr/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/id/LC_MESSAGES/tar.mo
share/locale/it/LC_MESSAGES/tar.mo share/locale/it/LC_MESSAGES/tar.mo
share/locale/ja/LC_MESSAGES/tar.mo share/locale/ja/LC_MESSAGES/tar.mo
share/locale/ko/LC_MESSAGES/tar.mo share/locale/ko/LC_MESSAGES/tar.mo
share/locale/ms/LC_MESSAGES/tar.mo
share/locale/nb/LC_MESSAGES/tar.mo
share/locale/nl/LC_MESSAGES/tar.mo share/locale/nl/LC_MESSAGES/tar.mo
share/locale/no/LC_MESSAGES/tar.mo
share/locale/pl/LC_MESSAGES/tar.mo share/locale/pl/LC_MESSAGES/tar.mo
share/locale/pt/LC_MESSAGES/tar.mo share/locale/pt/LC_MESSAGES/tar.mo
share/locale/pt_BR/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/ru/LC_MESSAGES/tar.mo
share/locale/sk/LC_MESSAGES/tar.mo
share/locale/sl/LC_MESSAGES/tar.mo share/locale/sl/LC_MESSAGES/tar.mo
share/locale/sv/LC_MESSAGES/tar.mo share/locale/sv/LC_MESSAGES/tar.mo
share/locale/tr/LC_MESSAGES/tar.mo share/locale/tr/LC_MESSAGES/tar.mo
@dirrm share/locale/tr/LC_MESSAGES share/locale/zh_CN/LC_MESSAGES/tar.mo
@dirrm share/locale/tr share/locale/zh_TW/LC_MESSAGES/tar.mo
@dirrm share/locale/sv/LC_MESSAGES @dirrm share/locale/zh_TW/LC_MESSAGES
@dirrm share/locale/sv @dirrm share/locale/zh_TW
@dirrm share/locale/sl/LC_MESSAGES @dirrm share/locale/zh_CN/LC_MESSAGES
@dirrm share/locale/sl @dirrm share/locale/zh_CN
@dirrm share/locale/ru/LC_MESSAGES @dirrm share/locale/sk/LC_MESSAGES
@dirrm share/locale/ru @dirrm share/locale/sk
@dirrm share/locale/pt_BR/LC_MESSAGES @dirrm share/locale/ro/LC_MESSAGES
@dirrm share/locale/pt_BR @dirrm share/locale/ro
@dirrm share/locale/pt/LC_MESSAGES @dirrm share/locale/nb/LC_MESSAGES
@dirrm share/locale/pt @dirrm share/locale/nb
@dirrm share/locale/pl/LC_MESSAGES @dirrm share/locale/ms/LC_MESSAGES
@dirrm share/locale/pl @dirrm share/locale/ms
@dirrm share/locale/no/LC_MESSAGES @dirrm share/locale/hu/LC_MESSAGES
@dirrm share/locale/no @dirrm share/locale/hu
@dirrm share/locale/nl/LC_MESSAGES @dirrm share/locale/hr/LC_MESSAGES
@dirrm share/locale/nl @dirrm share/locale/hr
@dirrm share/locale/ko/LC_MESSAGES @dirrm share/locale/fi/LC_MESSAGES
@dirrm share/locale/ko @dirrm share/locale/fi
@dirrm share/locale/ja/LC_MESSAGES
@dirrm share/locale/ja
@dirrm share/locale/it/LC_MESSAGES
@dirrm share/locale/it
@dirrm share/locale/id/LC_MESSAGES
@dirrm share/locale/id
@dirrm share/locale/fr/LC_MESSAGES
@dirrm share/locale/fr
@dirrm share/locale/et/LC_MESSAGES
@dirrm share/locale/et
@dirrm share/locale/es/LC_MESSAGES
@dirrm share/locale/es
@dirrm share/locale/de/LC_MESSAGES
@dirrm share/locale/de
@dirrm share/locale/da/LC_MESSAGES
@dirrm share/locale/da
@dirrm share/locale/cs/LC_MESSAGES
@dirrm share/locale/cs
@dirrm share/locale
@exec install-info --info-dir=%D/info %D/info/tar.info @exec install-info --info-dir=%D/info %D/info/tar.info