diff options
| author | wiz <wiz> | 2010-12-16 10:12:53 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2010-12-16 10:12:53 +0000 |
| commit | 96a1f4218d033c1189d72f870c740d36e466a319 (patch) | |
| tree | debd3c953f82da4ff16dd45774d35a2d2a48acdd | |
| parent | a7e2f3c2ddc4d5b1f3fbc3d267f7fce2c3840d34 (diff) | |
| download | pkgsrc-96a1f4218d033c1189d72f870c740d36e466a319.tar.gz | |
Add patch from upstream fixing test 39. Bump PKGREVISION.
| -rw-r--r-- | archivers/gtar-base/Makefile | 4 | ||||
| -rw-r--r-- | archivers/gtar-base/distinfo | 3 | ||||
| -rw-r--r-- | archivers/gtar-base/patches/patch-ab | 32 |
3 files changed, 36 insertions, 3 deletions
diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile index 386e6cb5e3c..2b8f714fd54 100644 --- a/archivers/gtar-base/Makefile +++ b/archivers/gtar-base/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.68 2010/12/15 22:16:25 wiz Exp $ +# $NetBSD: Makefile,v 1.69 2010/12/16 10:12:53 wiz Exp $ DISTNAME= tar-1.25 PKGNAME= gtar-base-1.25 -PKGREVISION= 2 +PKGREVISION= 3 SVR4_PKGNAME= gtarb CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_GNU:=tar/} diff --git a/archivers/gtar-base/distinfo b/archivers/gtar-base/distinfo index 7b41ede9829..f82147590ab 100644 --- a/archivers/gtar-base/distinfo +++ b/archivers/gtar-base/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.28 2010/12/15 22:16:25 wiz Exp $ +$NetBSD: distinfo,v 1.29 2010/12/16 10:12:53 wiz Exp $ SHA1 (tar-1.25.tar.gz) = 28bcf4cfcb32805afead8a6259158064d96359fb RMD160 (tar-1.25.tar.gz) = 8013ed400958cc8e9d605f5541e52e413bf878dc Size (tar-1.25.tar.gz) = 3400086 bytes SHA1 (patch-aa) = 976d0caa9dd67c04a3c1b40ca5d5bea91bc9fcdf +SHA1 (patch-ab) = ce8f4a5b0a20a5c7da44f06b0e55115e27f7d7e0 SHA1 (patch-ad) = 5573bd0e8aaf71b8a23d8b031c61b48c97b3fa97 SHA1 (patch-al) = 53056a3b20a40aac0e04a1137856c5b47a7d6e0c SHA1 (patch-am) = aec3b1496c227a64b098d0f3666ff9be4e4b10b5 diff --git a/archivers/gtar-base/patches/patch-ab b/archivers/gtar-base/patches/patch-ab new file mode 100644 index 00000000000..5e8e8af3cbb --- /dev/null +++ b/archivers/gtar-base/patches/patch-ab @@ -0,0 +1,32 @@ +$NetBSD: patch-ab,v 1.16 2010/12/16 10:12:54 wiz Exp $ + +Add two patches from upstream, fixing test 39: +* src/extract.c (maybe_recoverable): Treat EMLINK like ELOOP, for +FreeBSD. Problem reported by Christian Weisgerber in +<http://lists.gnu.org/archive/html/bug-tar/2010-11/msg00080.html>. +Problem reported by Bruno Haible in +<http://lists.gnu.org/archive/html/bug-gnulib/2010-11/msg00306.html>. +* src/extract.c (maybe_recoverable): Also treat EFTYPE (if defined) +and ENOTSUP like ELOOP. + +--- src/extract.c.orig 2010-11-01 20:34:59.000000000 +0000 ++++ src/extract.c +@@ -609,6 +609,18 @@ maybe_recoverable (char *file_name, bool + switch (e) + { + case ELOOP: ++ ++ /* With open ("symlink", O_NOFOLLOW|...), POSIX says errno == ELOOP, ++ but some operating systems do not conform to the standard. */ ++#ifdef EFTYPE ++ /* NetBSD uses errno == EFTYPE; see <http://gnats.netbsd.org/43154>. */ ++ case EFTYPE: ++#endif ++ /* FreeBSD 8.1 uses errno == EMLINK. */ ++ case EMLINK: ++ /* Tru64 5.1B uses errno == ENOTSUP. */ ++ case ENOTSUP: ++ + if (! regular + || old_files_option != OVERWRITE_OLD_FILES || dereference_option) + break; |