diff options
| author | taca <taca@pkgsrc.org> | 2019-02-07 13:40:57 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2019-02-07 13:40:57 +0000 |
| commit | 08282026be123e82f958e743256b98e92d79c28b (patch) | |
| tree | a2f04fedc2e2a3dfb57a9356f2806cc60dc08c26 | |
| parent | c235a98377b2cd571252115ec244801dae4a09d7 (diff) | |
| download | pkgsrc-08282026be123e82f958e743256b98e92d79c28b.tar.gz | |
lang/pear: fix broken package with previous commit
Fix broken package with previous commit.
* Make Archive_Tar to 1.4.5 which I have the distfile.
* Upload Archive_Tar-1.4.5.tgz to MASTER_SITE_LOCAL.
* Add patch to update Archive/Tar.php to 1.4.6 from GitHub.
No PKGREVISION bump since it was broken.
| -rw-r--r-- | lang/pear/Makefile | 4 | ||||
| -rw-r--r-- | lang/pear/distinfo | 3 | ||||
| -rw-r--r-- | lang/pear/patches/patch-.._Archive__Tar-1.4.5_Archive_Tar.php | 20 |
3 files changed, 24 insertions, 3 deletions
diff --git a/lang/pear/Makefile b/lang/pear/Makefile index a0a0a187b90..d3821b1ad12 100644 --- a/lang/pear/Makefile +++ b/lang/pear/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2019/02/03 14:06:58 taca Exp $ +# $NetBSD: Makefile,v 1.46 2019/02/07 13:40:57 taca Exp $ # DISTNAME= PEAR-1.10.7 @@ -34,7 +34,7 @@ PEAR_SRCS= ${DISTNAME}${EXTRACT_SUFX} DISTFILES+= ${PEAR_SRCS} EXTRACT_ONLY+= ${PEAR_SRCS} -ARCHIVE_SRCS= Archive_Tar-1.4.6${EXTRACT_SUFX} +ARCHIVE_SRCS= Archive_Tar-1.4.5${EXTRACT_SUFX} ARCHIVE_WRKSRC= ${WRKDIR}/${ARCHIVE_SRCS:S/${EXTRACT_SUFX}//} DISTFILES+= ${ARCHIVE_SRCS} EXTRACT_ONLY+= ${ARCHIVE_SRCS} diff --git a/lang/pear/distinfo b/lang/pear/distinfo index b22df3df05f..f51ccfb69b1 100644 --- a/lang/pear/distinfo +++ b/lang/pear/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2019/02/03 14:06:58 taca Exp $ +$NetBSD: distinfo,v 1.33 2019/02/07 13:40:57 taca Exp $ SHA1 (pear20151210/Archive_Tar-1.4.5.tgz) = 1697a5baa9666174b64c48fcdd1b9c4d311100fa RMD160 (pear20151210/Archive_Tar-1.4.5.tgz) = c2a81c901a4b38f46d7035f3b169296f9969b592 @@ -20,3 +20,4 @@ SHA1 (pear20151210/XML_Util-1.4.3.tgz) = 95e07febe0b6c843c51bfd0157e61fd1ba1e562 RMD160 (pear20151210/XML_Util-1.4.3.tgz) = 55308486e8a32d7bcb775c286d487b1db4a3f00b SHA512 (pear20151210/XML_Util-1.4.3.tgz) = c21a7cef90743e124c4bc8e0453b634de8f6a6b0aac060acc1a17f481a2eb8757d322b05c69151280b7651cea927b2c64b7d49b9fd815dcdc606d0472d967310 Size (pear20151210/XML_Util-1.4.3.tgz) = 18842 bytes +SHA1 (patch-.._Archive__Tar-1.4.5_Archive_Tar.php) = fa693b0c8d89b550952fc4a43a7319b87053c821 diff --git a/lang/pear/patches/patch-.._Archive__Tar-1.4.5_Archive_Tar.php b/lang/pear/patches/patch-.._Archive__Tar-1.4.5_Archive_Tar.php new file mode 100644 index 00000000000..be0bea53114 --- /dev/null +++ b/lang/pear/patches/patch-.._Archive__Tar-1.4.5_Archive_Tar.php @@ -0,0 +1,20 @@ +$NetBSD: patch-.._Archive__Tar-1.4.5_Archive_Tar.php,v 1.1 2019/02/07 13:40:57 taca Exp $ + +* Fix from Archive_Tar-1.4.6. + +--- ../Archive_Tar-1.4.5/Archive/Tar.php.orig 2019-01-02 21:45:20.000000000 +0000 ++++ ../Archive_Tar-1.4.5/Archive/Tar.php +@@ -1770,11 +1770,8 @@ class Archive_Tar extends PEAR + if (strpos($file, 'phar://') === 0) { + return true; + } +- if (strpos($file, DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR) !== false) { +- return true; +- } +- if (strpos($file, '..' . DIRECTORY_SEPARATOR) === 0) { +- return true; ++ if (strpos($file, '../') !== false || strpos($file, '..\\') !== false) { ++ return true; + } + return false; + } |