summaryrefslogtreecommitdiff
path: root/archivers/php53-phar/files
diff options
context:
space:
mode:
Diffstat (limited to 'archivers/php53-phar/files')
-rw-r--r--archivers/php53-phar/files/patch-CVE-2015-230112
-rw-r--r--archivers/php53-phar/files/patch-config.m441
-rw-r--r--archivers/php53-phar/files/patch-phar.c11
3 files changed, 0 insertions, 64 deletions
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