9 files changed, 0 insertions, 267 deletions
diff --git a/lang/php53/files/patch-Zend::zend.h b/lang/php53/files/patch-Zend::zend.h
deleted file mode 100644
index 50625c403417..000000000000
--- a/lang/php53/files/patch-Zend::zend.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- Zend/zend.h.orig    Mon Dec  6 15:42:56 2004
-+++ Zend/zend.h Mon Dec  6 15:46:40 2004
-@@ -176,7 +176,7 @@
- #endif
-
-
--#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(__darwin__) && !defined(__APPLE__)
-+#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(__darwin__) && !defined(__APPLE__) && !(defined(ZTS) && defined(__FreeBSD__))
- # define do_alloca(p) alloca(p)
- # define free_alloca(p)
- #else
-
diff --git a/lang/php53/files/patch-configure b/lang/php53/files/patch-configure
deleted file mode 100644
index a56d0519cb51..000000000000
--- a/lang/php53/files/patch-configure
+++ /dev/null
@@ -1,38 +0,0 @@
---- configure.orig	Mon Oct 11 15:51:58 2004
-+++ configure	Mon Oct 11 15:52:26 2004
-@@ -2649,7 +2649,7 @@
-   save_LIBS=$LIBS
-   
- if test -n "$ac_cv_pthreads_lib"; then
--  LIBS="$LIBS -l$ac_cv_pthreads_lib"
-+  LIBS="$LIBS $ac_cv_pthreads_lib"
- fi
- 
- if test -n "$ac_cv_pthreads_cflags"; then
-@@ -10613,7 +10613,7 @@
- if test "$enable_maintainer_zts" = "yes"; then
-   
- if test -n "$ac_cv_pthreads_lib"; then
--  LIBS="$LIBS -l$ac_cv_pthreads_lib"
-+  LIBS="$LIBS $ac_cv_pthreads_lib"
- fi
- 
- if test -n "$ac_cv_pthreads_cflags"; then
-@@ -10630,8 +10630,6 @@
-   case $host_alias in
-   *solaris*)
-     PTHREAD_FLAGS="-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT";;
--  *freebsd*)
--    PTHREAD_FLAGS="-D_REENTRANT -D_THREAD_SAFE";;
-   *linux*)
-     PTHREAD_FLAGS=-D_REENTRANT;;
-   *aix*)
-@@ -88453,7 +88451,7 @@
-   save_LIBS=$LIBS
-   
- if test -n "$ac_cv_pthreads_lib"; then
--  LIBS="$LIBS -l$ac_cv_pthreads_lib"
-+  LIBS="$LIBS $ac_cv_pthreads_lib"
- fi
- 
- if test -n "$ac_cv_pthreads_cflags"; then
diff --git a/lang/php53/files/patch-ext::standard::php_var.h b/lang/php53/files/patch-ext::standard::php_var.h
deleted file mode 100644
index c3b01c3a9fd7..000000000000
--- a/lang/php53/files/patch-ext::standard::php_var.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- ext/standard/php_var.h.orig	2004/09/05 16:29:04
-+++ ext/standard/php_var.h	2005/01/15 18:18:08
-@@ -41,6 +41,7 @@ PHPAPI void php_debug_zval_dump(zval **s
-
- struct php_unserialize_data {
- 	void *first;
-+	void *first_dtor;
- };
-
- typedef struct php_unserialize_data php_unserialize_data_t;
-@@ -54,7 +55,8 @@ PHPAPI int php_var_unserialize(zval **rv
-    zend_hash_destroy(&(var_hash))
-
- #define PHP_VAR_UNSERIALIZE_INIT(var_hash) \
--	(var_hash).first = 0
-+	(var_hash).first = 0; \
-+	(var_hash).first_dtor = 0
- #define PHP_VAR_UNSERIALIZE_DESTROY(var_hash) \
- 	var_destroy(&(var_hash))
-
diff --git a/lang/php53/files/patch-ext::standard::var_unserializer.c b/lang/php53/files/patch-ext::standard::var_unserializer.c
deleted file mode 100644
index 930becda86ed..000000000000
--- a/lang/php53/files/patch-ext::standard::var_unserializer.c
+++ /dev/null
@@ -1,87 +0,0 @@
---- ext/standard/var_unserializer.c.orig	2004/12/03 16:02:48
-+++ ext/standard/var_unserializer.c	2005/01/18 10:57:05
-@@ -56,6 +56,30 @@ static inline void var_push(php_unserial
- 	var_hash->data[var_hash->used_slots++] = *rval;
- }
-
-+static inline void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval)
-+{
-+	var_entries *var_hash = var_hashx->first_dtor, *prev = NULL;
-+
-+	while (var_hash && var_hash->used_slots == VAR_ENTRIES_MAX) {
-+		prev = var_hash;
-+		var_hash = var_hash->next;
-+	}
-+
-+	if (!var_hash) {
-+		var_hash = emalloc(sizeof(var_entries));
-+		var_hash->used_slots = 0;
-+		var_hash->next = 0;
-+
-+		if (!var_hashx->first_dtor)
-+			var_hashx->first_dtor = var_hash;
-+		else
-+			prev->next = var_hash;
-+	}
-+
-+	(*rval)->refcount++;
-+	var_hash->data[var_hash->used_slots++] = *rval;
-+}
-+
- PHPAPI void var_replace(php_unserialize_data_t *var_hashx, zval *ozval, zval **nzval)
- {
- 	int i;
-@@ -93,6 +117,7 @@ static int var_access(php_unserialize_da
- PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
- {
- 	void *next;
-+	int i;
- 	var_entries *var_hash = var_hashx->first;
-
- 	while (var_hash) {
-@@ -100,6 +125,17 @@ PHPAPI void var_destroy(php_unserialize_
- 		efree(var_hash);
- 		var_hash = next;
- 	}
-+
-+	var_hash = var_hashx->first_dtor;
-+
-+	while (var_hash) {
-+		for (i = 0; i < var_hash->used_slots; i++) {
-+			zval_ptr_dtor(&var_hash->data[i]);
-+		}
-+		next = var_hash->next;
-+		efree(var_hash);
-+		var_hash = next;
-+	}
- }
-
- /* }}} */
-@@ -177,7 +213,7 @@ static inline size_t parse_uiv(const uns
- static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, int elements)
- {
- 	while (elements-- > 0) {
--		zval *key, *data, *old_data;
-+		zval *key, *data, **old_data;
-
- 		ALLOC_INIT_ZVAL(key);
-
-@@ -205,14 +241,14 @@ static inline int process_nested_data(UN
-
- 		switch (Z_TYPE_P(key)) {
- 			case IS_LONG:
--				if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)) {
--					var_replace(var_hash, old_data, rval);
-+				if (zend_hash_index_find(ht, Z_LVAL_P(key), (void **)&old_data)==SUCCESS) {
-+					var_push_dtor(var_hash, old_data);
- 				}
- 				zend_hash_index_update(ht, Z_LVAL_P(key), &data, sizeof(data), NULL);
- 				break;
- 			case IS_STRING:
--				if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)) {
--					var_replace(var_hash, old_data, rval);
-+				if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) {
-+					var_push_dtor(var_hash, old_data);
- 				}
- 				zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, sizeof(data), NULL);
- 				break;
diff --git a/lang/php53/files/patch-main::php_config.h.in b/lang/php53/files/patch-main::php_config.h.in
deleted file mode 100644
index 3eed7c4acf66..000000000000
--- a/lang/php53/files/patch-main::php_config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- main/php_config.h.in.orig	Mon Jul 12 16:30:37 2004
-+++ main/php_config.h.in	Mon Jul 12 16:31:38 2004
-@@ -2362,6 +2362,9 @@
- /*   */
- #undef SOLARIS_YP
- 
-+/* Include external shared modules configurations */
-+#include "ext/php_config.h"
-+
- /* Whether sprintf is broken */
- #undef ZEND_BROKEN_SPRINTF
- 
diff --git a/lang/php53/files/patch-pear::Makefile.frag b/lang/php53/files/patch-pear::Makefile.frag
deleted file mode 100644
index ee24944b46c6..000000000000
--- a/lang/php53/files/patch-pear::Makefile.frag
+++ /dev/null
@@ -1,35 +0,0 @@
---- pear/Makefile.frag.orig	Tue Sep  2 03:30:13 2003
-+++ pear/Makefile.frag	Thu Apr 22 23:52:40 2004
-@@ -1,6 +1,7 @@
- # -*- makefile -*-
- 
- peardir=$(PEAR_INSTALLDIR)
-+XML_RPC_ver=1.1.0
- 
- # Skip all php.ini files altogether
- PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0
-@@ -13,10 +14,18 @@
- 
- install-pear:
- 	@echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
--	@if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \
--		$(MAKE) -s install-pear-installer install-pear-packages; \
--	else \
--		cat $(srcdir)/install-pear.txt; \
--		exit 5; \
--	fi
-+	@$(mkinstalldirs) $(INSTALL_ROOT)$(peardir)/bootstrap \
-+		$(INSTALL_ROOT)$(peardir)/bootstrap/Archive \
-+		$(INSTALL_ROOT)$(peardir)/bootstrap/Console \
-+		$(INSTALL_ROOT)$(peardir)/bootstrap/XML \
-+		$(INSTALL_ROOT)$(peardir)/bootstrap/XML/RPC
-+	@cp $(srcdir)/PEAR.php $(srcdir)/System.php \
-+		$(INSTALL_ROOT)$(peardir)/bootstrap
-+	@cp $(srcdir)/Archive/*.php $(INSTALL_ROOT)$(peardir)/bootstrap/Archive
-+	@cp $(srcdir)/Console/*.php $(INSTALL_ROOT)$(peardir)/bootstrap/Console
-+	@cp -R $(srcdir)/OS $(INSTALL_ROOT)$(peardir)/bootstrap
-+	@cp -R $(srcdir)/PEAR $(INSTALL_ROOT)$(peardir)/bootstrap
-+	@tar xf $(srcdir)/packages/XML_RPC-$(XML_RPC_ver).tar
-+	@cp XML_RPC-$(XML_RPC_ver)/RPC.php $(INSTALL_ROOT)$(peardir)/bootstrap/XML
-+	@cp XML_RPC-$(XML_RPC_ver)/Server.php $(INSTALL_ROOT)$(peardir)/bootstrap/XML/RPC
- 
diff --git a/lang/php53/files/patch-pear::scripts::pearcmd.php b/lang/php53/files/patch-pear::scripts::pearcmd.php
deleted file mode 100644
index 35061730a341..000000000000
--- a/lang/php53/files/patch-pear::scripts::pearcmd.php
+++ /dev/null
@@ -1,20 +0,0 @@
---- pear/scripts/pearcmd.php.orig	Sun Jun  6 17:52:41 2004
-+++ pear/scripts/pearcmd.php	Mon Jul 12 16:22:50 2004
-@@ -1,3 +1,4 @@
-+#!%%PREFIX%%/bin/php -n -q -dsafe_mode=0 -doutput_buffering=1
- <?php
- //
- // +----------------------------------------------------------------------+
-@@ -24,9 +25,9 @@
- /**
-  * @nodep Gtk
-  */
--if ('@include_path@' != '@'.'include_path'.'@') {
--    ini_set('include_path', '@include_path@');
--}
-+dl('pcre.so');
-+dl('xml.so');
-+ini_set('include_path', '%%PREFIX%%/share/pear:%%PREFIX%%/share/pear/bootstrap');
- ini_set('allow_url_fopen', true);
- if (!ini_get('safe_mode')) {
-     set_time_limit(0);
diff --git a/lang/php53/files/patch-scripts::Makefile.frag b/lang/php53/files/patch-scripts::Makefile.frag
deleted file mode 100644
index 133dea408d39..000000000000
--- a/lang/php53/files/patch-scripts::Makefile.frag
+++ /dev/null
@@ -1,22 +0,0 @@
---- scripts/Makefile.frag.orig	Tue Nov 23 14:06:16 2004
-+++ scripts/Makefile.frag	Tue Jan 25 08:19:07 2005
-@@ -26,18 +26,12 @@
- 	/ \
- 	Zend/ \
- 	TSRM/ \
--	include/ \
- 	main/ \
- 	main/streams/ \
- 	regex/ \
--	ext/iconv/ \
- 	ext/libxml/ \
- 	ext/standard/ \
--	ext/session/ \
--	ext/xml/ \
--	ext/xml/expat/ \
--	ext/mbstring/ \
--	ext/sqlite/libsqlite/src/sqlite.h
-+	ext/spl/
- 
- install-headers:
- 	-@for i in $(HEADER_DIRS); do \
diff --git a/lang/php53/files/patch-scripts::phpize.in b/lang/php53/files/patch-scripts::phpize.in
deleted file mode 100644
index b75de61d6abf..000000000000
--- a/lang/php53/files/patch-scripts::phpize.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- scripts/phpize.in.orig	Mon Aug 23 14:25:48 2004
-+++ scripts/phpize.in	Mon Aug 23 14:26:41 2004
-@@ -101,14 +101,14 @@
- 
- phpize_autotools()
- {
--  aclocal    || exit 1
--  autoconf   || exit 1
--  autoheader || exit 1
-+  aclocal15     || exit 1
-+  autoconf253   || exit 1
-+  autoheader253 || exit 1
- }
- 
- phpize_libtoolize()
- {
--  libtoolize=`$builddir/build/shtool path glibtoolize libtoolize`
-+  libtoolize=`$builddir/build/shtool path libtoolize13`
-   $libtoolize -f -c || exit 1
- }
-