CVS commit: pkgsrc/lang/pear

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Thu Feb  7 13:40:57 UTC 2019

Modified Files:
        pkgsrc/lang/pear: Makefile distinfo
Added Files:
        pkgsrc/lang/pear/patches: patch-.._Archive__Tar-1.4.5_Archive_Tar.php

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/lang/pear/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/lang/pear/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/pear/patches/patch-.._Archive__Tar-1.4.5_Archive_Tar.php

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/pear/Makefile
diff -u pkgsrc/lang/pear/Makefile:1.45 pkgsrc/lang/pear/Makefile:1.46
--- pkgsrc/lang/pear/Makefile:1.45      Sun Feb  3 14:06:58 2019
+++ pkgsrc/lang/pear/Makefile   Thu Feb  7 13:40:57 2019
@@ -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}

Index: pkgsrc/lang/pear/distinfo
diff -u pkgsrc/lang/pear/distinfo:1.32 pkgsrc/lang/pear/distinfo:1.33
--- pkgsrc/lang/pear/distinfo:1.32      Sun Feb  3 14:06:58 2019
+++ pkgsrc/lang/pear/distinfo   Thu Feb  7 13:40:57 2019
@@ -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) =
 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

Added files:

Index: pkgsrc/lang/pear/patches/patch-.._Archive__Tar-1.4.5_Archive_Tar.php
diff -u /dev/null pkgsrc/lang/pear/patches/patch-.._Archive__Tar-1.4.5_Archive_Tar.php:1.1
--- /dev/null   Thu Feb  7 13:40:58 2019
+++ pkgsrc/lang/pear/patches/patch-.._Archive__Tar-1.4.5_Archive_Tar.php        Thu Feb  7 13:40:57 2019
@@ -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;
+     }