diff --git a/lang/pear/Makefile b/lang/pear/Makefile index d3821b1ad12e..c6e98ba6ecf7 100644 --- a/lang/pear/Makefile +++ b/lang/pear/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.46 2019/02/07 13:40:57 taca Exp $ +# $NetBSD: Makefile,v 1.47 2019/04/30 03:29:07 taca Exp $ # -DISTNAME= PEAR-1.10.7 +DISTNAME= PEAR-1.10.9 PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/PEAR/pear/} -PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= http://download.pear.php.net/package/ EXTRACT_SUFX= .tgz @@ -34,12 +33,12 @@ PEAR_SRCS= ${DISTNAME}${EXTRACT_SUFX} DISTFILES+= ${PEAR_SRCS} EXTRACT_ONLY+= ${PEAR_SRCS} -ARCHIVE_SRCS= Archive_Tar-1.4.5${EXTRACT_SUFX} +ARCHIVE_SRCS= Archive_Tar-1.4.7${EXTRACT_SUFX} ARCHIVE_WRKSRC= ${WRKDIR}/${ARCHIVE_SRCS:S/${EXTRACT_SUFX}//} DISTFILES+= ${ARCHIVE_SRCS} EXTRACT_ONLY+= ${ARCHIVE_SRCS} -CONSOLE_SRCS= Console_Getopt-1.4.1${EXTRACT_SUFX} +CONSOLE_SRCS= Console_Getopt-1.4.2${EXTRACT_SUFX} CONSOLE_WRKSRC= ${WRKDIR}/${CONSOLE_SRCS:S/${EXTRACT_SUFX}//} DISTFILES+= ${CONSOLE_SRCS} EXTRACT_ONLY+= ${CONSOLE_SRCS} diff --git a/lang/pear/distinfo b/lang/pear/distinfo index f51ccfb69b17..e12cf82ef703 100644 --- a/lang/pear/distinfo +++ b/lang/pear/distinfo @@ -1,17 +1,17 @@ -$NetBSD: distinfo,v 1.33 2019/02/07 13:40:57 taca Exp $ +$NetBSD: distinfo,v 1.34 2019/04/30 03:29:07 taca Exp $ -SHA1 (pear20151210/Archive_Tar-1.4.5.tgz) = 1697a5baa9666174b64c48fcdd1b9c4d311100fa -RMD160 (pear20151210/Archive_Tar-1.4.5.tgz) = c2a81c901a4b38f46d7035f3b169296f9969b592 -SHA512 (pear20151210/Archive_Tar-1.4.5.tgz) = 7a7e16e37b0c7112a77333ed2c4d0a0ae57cc1e971191c79b1858227b46f967aee915757a81bdfef3a9487a53b81a99bfbe84f78a346671fe44ac9f1f203a358 -Size (pear20151210/Archive_Tar-1.4.5.tgz) = 20919 bytes -SHA1 (pear20151210/Console_Getopt-1.4.1.tgz) = 1db5b48e15547be532a9c836cd7ef448a3758ddc -RMD160 (pear20151210/Console_Getopt-1.4.1.tgz) = 54d397e321a0168a33a92c98cf39f9f6456d49ea -SHA512 (pear20151210/Console_Getopt-1.4.1.tgz) = e66a78077593ade78a40c59297a24242b0177d21b0e02b08d4fb5e25d8a57a96353c50a9dcc968f60af7458d40443061e0c1cdb11ad3180c7ffed8f0b314b089 -Size (pear20151210/Console_Getopt-1.4.1.tgz) = 5672 bytes -SHA1 (pear20151210/PEAR-1.10.7.tgz) = f67d0b260a865820d93e9b3d2456b2c35da0bc4c -RMD160 (pear20151210/PEAR-1.10.7.tgz) = 8231b489e663e1e8b5fd1a8eeb544acbd08cb433 -SHA512 (pear20151210/PEAR-1.10.7.tgz) = ebe93cff5546ad3a80d3d1c0284e34a46ec8dbdb7d015a11350231244baca75a57596e446c1386bc40650525f59c04617e73b1071a0fe77210dc5979edb5151f -Size (pear20151210/PEAR-1.10.7.tgz) = 291786 bytes +SHA1 (pear20151210/Archive_Tar-1.4.7.tgz) = ac7a3acbcffcd6fb3c8ebc7b0760c4f5ed8c2861 +RMD160 (pear20151210/Archive_Tar-1.4.7.tgz) = 6d45fc7b2445463f5d6738d5d9717b9cacc3ea4c +SHA512 (pear20151210/Archive_Tar-1.4.7.tgz) = e496fdcb1e7a2bbbc4aae88bae5793b0da6e7e7ee0ebbab78de14279cc3a5b7a2ec30d1424c3977ba6e4edd4780c0cb8dcf4288a7495252e28c560b8781d5b75 +Size (pear20151210/Archive_Tar-1.4.7.tgz) = 21134 bytes +SHA1 (pear20151210/Console_Getopt-1.4.2.tgz) = 76ba2a141347ec89b1989ce009e9fed6bf830ea4 +RMD160 (pear20151210/Console_Getopt-1.4.2.tgz) = 8511031ad0fd302c6f2a86bf32e6e9bc2c3af05d +SHA512 (pear20151210/Console_Getopt-1.4.2.tgz) = d3054ed1296478e7aca3764b9abc9b2e8015524d477bf58bebece98dd29181356323e9be593dbaefcd262b4df3134aed1725b0462642d2290ce1bf43dbffb060 +Size (pear20151210/Console_Getopt-1.4.2.tgz) = 5736 bytes +SHA1 (pear20151210/PEAR-1.10.9.tgz) = 121f4543291da473c03121503649737eaa4dd844 +RMD160 (pear20151210/PEAR-1.10.9.tgz) = 536aeae58176ba1770993a82b0a5b64a7a73409d +SHA512 (pear20151210/PEAR-1.10.9.tgz) = 072d2eda510c05649f8d1481665bdd42efa060e6098b4b0d0353c95cf79d342ec601dd36dab3e6583b612582d2f03672a7b5de1518e3a0e8fd190ea698a17e60 +Size (pear20151210/PEAR-1.10.9.tgz) = 291931 bytes SHA1 (pear20151210/Structures_Graph-1.1.1.tgz) = 2a9e5999e035aa3a6789011238b0a9a54806124a RMD160 (pear20151210/Structures_Graph-1.1.1.tgz) = fff02cabb75ee3531eedae19a2dffe999258a96c SHA512 (pear20151210/Structures_Graph-1.1.1.tgz) = 28465396cd540fd1619e0c1bec68fa8c3dff440a6e89c3c5583570edbd3de285e101de7c00e60d49d791ff10d8311f8a38d73ea3cdf52cfc74ecbe2f1842693f @@ -20,4 +20,3 @@ 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 deleted file mode 100644 index be0bea53114a..000000000000 --- a/lang/pear/patches/patch-.._Archive__Tar-1.4.5_Archive_Tar.php +++ /dev/null @@ -1,20 +0,0 @@ -$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; - }