diff options
Diffstat (limited to 'archivers')
-rw-r--r-- | archivers/Makefile | 4 | ||||
-rw-r--r-- | archivers/php53-bz2/Makefile | 9 | ||||
-rw-r--r-- | archivers/php53-phar/Makefile | 9 | ||||
-rw-r--r-- | archivers/php53-phar/files/patch-CVE-2015-2301 | 12 | ||||
-rw-r--r-- | archivers/php53-phar/files/patch-config.m4 | 41 | ||||
-rw-r--r-- | archivers/php53-phar/files/patch-phar.c | 11 | ||||
-rw-r--r-- | archivers/php53-zip/Makefile | 9 | ||||
-rw-r--r-- | archivers/php53-zip/files/patch-config.m4 | 10 | ||||
-rw-r--r-- | archivers/php53-zlib/Makefile | 9 |
9 files changed, 0 insertions, 114 deletions
diff --git a/archivers/Makefile b/archivers/Makefile index 2d0c878940ca..cff811948a3f 100644 --- a/archivers/Makefile +++ b/archivers/Makefile @@ -145,10 +145,6 @@ SUBDIR += php5-snappy SUBDIR += php5-zip SUBDIR += php5-zlib - SUBDIR += php53-bz2 - SUBDIR += php53-phar - SUBDIR += php53-zip - SUBDIR += php53-zlib SUBDIR += php55-bz2 SUBDIR += php55-phar SUBDIR += php55-zip diff --git a/archivers/php53-bz2/Makefile b/archivers/php53-bz2/Makefile deleted file mode 100644 index 1d6c3fcfd72f..000000000000 --- a/archivers/php53-bz2/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -bz2 - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php53-phar/Makefile b/archivers/php53-phar/Makefile deleted file mode 100644 index d01230bca21b..000000000000 --- a/archivers/php53-phar/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -phar - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php53-phar/files/patch-CVE-2015-2301 b/archivers/php53-phar/files/patch-CVE-2015-2301 deleted file mode 100644 index 896408a16ffc..000000000000 --- a/archivers/php53-phar/files/patch-CVE-2015-2301 +++ /dev/null @@ -1,12 +0,0 @@ ---- phar_object.c 2015-03-16 13:56:47.878348393 -0400 -+++ phar_object.c 2015-03-16 13:56:47.826347993 -0400 -@@ -2320,8 +2320,8 @@ - } - its_ok: - if (SUCCESS == php_stream_stat_path(newpath, &ssb)) { -- efree(oldpath); - zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "phar \"%s\" exists and must be unlinked prior to conversion", newpath); -+ efree(oldpath); - return NULL; - } - if (!phar->is_data) { diff --git a/archivers/php53-phar/files/patch-config.m4 b/archivers/php53-phar/files/patch-config.m4 deleted file mode 100644 index 1a981bfefdc1..000000000000 --- a/archivers/php53-phar/files/patch-config.m4 +++ /dev/null @@ -1,41 +0,0 @@ ---- config.m4.orig 2011-11-25 15:31:20.000000000 +0100 -+++ config.m4 2011-11-25 15:47:45.000000000 +0100 -@@ -4,8 +4,38 @@ - PHP_ARG_ENABLE(phar, for phar archive support, - [ --disable-phar Disable phar support], yes) - -+PHP_ARG_WITH(pcre-dir, pcre install prefix, -+[ --with-pcre-dir PHAR: pcre install prefix], no, no) -+ -+ - if test "$PHP_PHAR" != "no"; then -+ -+ dnl This is PECL build, check if bundled PCRE library is used -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=$INCLUDES -+ AC_EGREP_CPP(yes,[ -+#include <main/php_config.h> -+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -+ ],[ -+ PHP_PCRE_REGEX=yes -+ ],[ -+ AC_EGREP_CPP(yes,[ -+#include <main/php_config.h> -+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -+ ],[ -+ PHP_PCRE_REGEX=pecl -+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) -+ ],[ -+ PHP_PCRE_REGEX=no -+ ]) -+ ]) -+ - PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) -+ PHP_HASH=yes - AC_MSG_CHECKING([for phar openssl support]) - if test "$PHP_HASH_SHARED" != "yes"; then - if test "$PHP_HASH" != "no"; then diff --git a/archivers/php53-phar/files/patch-phar.c b/archivers/php53-phar/files/patch-phar.c deleted file mode 100644 index 231ec40a8423..000000000000 --- a/archivers/php53-phar/files/patch-phar.c +++ /dev/null @@ -1,11 +0,0 @@ ---- phar.c.orig 2011-11-25 15:38:44.000000000 +0100 -+++ phar.c 2011-11-25 15:39:01.000000000 +0100 -@@ -3716,7 +3716,7 @@ - ZEND_MOD_OPTIONAL("openssl") - ZEND_MOD_OPTIONAL("zlib") - ZEND_MOD_OPTIONAL("standard") --#if defined(HAVE_HASH) && !defined(COMPILE_DL_HASH) -+#if defined(HAVE_HASH) - ZEND_MOD_REQUIRED("hash") - #endif - #if HAVE_SPL diff --git a/archivers/php53-zip/Makefile b/archivers/php53-zip/Makefile deleted file mode 100644 index f66c3111003a..000000000000 --- a/archivers/php53-zip/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -zip - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php53-zip/files/patch-config.m4 b/archivers/php53-zip/files/patch-config.m4 deleted file mode 100644 index a87640ff160d..000000000000 --- a/archivers/php53-zip/files/patch-config.m4 +++ /dev/null @@ -1,10 +0,0 @@ ---- config.m4.orig 2009-04-09 16:16:30.000000000 +0200 -+++ config.m4 2009-04-09 16:17:02.000000000 +0200 -@@ -65,6 +65,7 @@ - #endif - ],[ - PHP_PCRE_REGEX=pecl -+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) - ],[ - PHP_PCRE_REGEX=no - ]) diff --git a/archivers/php53-zlib/Makefile b/archivers/php53-zlib/Makefile deleted file mode 100644 index 8f410d872b66..000000000000 --- a/archivers/php53-zlib/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -zlib - -.include "${MASTERDIR}/Makefile" |