summaryrefslogtreecommitdiff
path: root/lang/php5/files
diff options
context:
space:
mode:
Diffstat (limited to 'lang/php5/files')
-rw-r--r--lang/php5/files/patch-Zend::zend.h8
-rw-r--r--lang/php5/files/patch-configure65
-rw-r--r--lang/php5/files/patch-ext_date_lib_timelib_structs.h11
-rw-r--r--lang/php5/files/patch-ext_standard_incomplete_class.c20
-rw-r--r--lang/php5/files/patch-ext_standard_php_incomplete_class.h22
-rw-r--r--lang/php5/files/patch-pear::Makefile.frag35
-rw-r--r--lang/php5/files/patch-pear::scripts::pearcmd.php21
-rw-r--r--lang/php5/files/patch-scripts::Makefile.frag25
8 files changed, 30 insertions, 177 deletions
diff --git a/lang/php5/files/patch-Zend::zend.h b/lang/php5/files/patch-Zend::zend.h
index 701f6a556f56..49d678719636 100644
--- a/lang/php5/files/patch-Zend::zend.h
+++ b/lang/php5/files/patch-Zend::zend.h
@@ -1,11 +1,11 @@
---- Zend/zend.h.orig Thu Aug 25 19:41:08 2005
-+++ Zend/zend.h Wed Nov 16 09:30:03 2005
+--- Zend/zend.h.orig Tue Nov 15 14:35:22 2005
++++ Zend/zend.h Fri Nov 25 09:31:48 2005
@@ -178,7 +178,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__))
+-#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN)
++#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) && !(defined(ZTS) && defined(__FreeBSD__))
# define do_alloca(p) alloca(p)
# define free_alloca(p)
#else
diff --git a/lang/php5/files/patch-configure b/lang/php5/files/patch-configure
index ecd4454dd4f3..1ac8ec049e63 100644
--- a/lang/php5/files/patch-configure
+++ b/lang/php5/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Mon Sep 5 13:16:17 2005
-+++ configure Fri Oct 14 07:48:01 2005
-@@ -2890,7 +2890,7 @@
+--- configure.orig Wed Nov 23 22:37:49 2005
++++ configure Fri Nov 25 10:39:54 2005
+@@ -3654,7 +3654,7 @@
save_LIBS=$LIBS
if test -n "$ac_cv_pthreads_lib"; then
@@ -9,7 +9,7 @@
fi
if test -n "$ac_cv_pthreads_cflags"; then
-@@ -11285,7 +11285,7 @@
+@@ -12074,7 +12074,7 @@
if test "$enable_maintainer_zts" = "yes"; then
if test -n "$ac_cv_pthreads_lib"; then
@@ -18,7 +18,7 @@
fi
if test -n "$ac_cv_pthreads_cflags"; then
-@@ -11302,8 +11302,6 @@
+@@ -12091,8 +12091,6 @@
case $host_alias in
*solaris*)
PTHREAD_FLAGS="-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT";;
@@ -27,51 +27,7 @@
*linux*)
PTHREAD_FLAGS=-D_REENTRANT;;
*aix*)
-@@ -88384,6 +88382,10 @@
- #line 88385 "configure"
- #include "confdefs.h"
-
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
- #if HAVE_CRYPT_H
- #include <crypt.h>
- #endif
-@@ -88441,6 +88443,10 @@
- #line 88442 "configure"
- #include "confdefs.h"
-
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
- #if HAVE_CRYPT_H
- #include <crypt.h>
- #endif
-@@ -88498,6 +88504,10 @@
- #line 88499 "configure"
- #include "confdefs.h"
-
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
- #if HAVE_CRYPT_H
- #include <crypt.h>
- #endif
-@@ -88593,6 +88603,10 @@
- #line 88594 "configure"
- #include "confdefs.h"
-
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
- #if HAVE_CRYPT_H
- #include <crypt.h>
- #endif
-@@ -101571,7 +101585,7 @@
+@@ -100076,7 +100074,7 @@
save_LIBS=$LIBS
if test -n "$ac_cv_pthreads_lib"; then
@@ -80,3 +36,12 @@
fi
if test -n "$ac_cv_pthreads_cflags"; then
+@@ -108808,7 +108806,7 @@
+
+
+
+- for header_file in Zend/ TSRM/ include/ main/ main/streams/ regex/; do
++ for header_file in Zend/ TSRM/ main/ main/streams/ regex/ ext/spl/; do
+
+
+ unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
diff --git a/lang/php5/files/patch-ext_date_lib_timelib_structs.h b/lang/php5/files/patch-ext_date_lib_timelib_structs.h
new file mode 100644
index 000000000000..c85468abc7f0
--- /dev/null
+++ b/lang/php5/files/patch-ext_date_lib_timelib_structs.h
@@ -0,0 +1,11 @@
+--- ext/date/lib/timelib_structs.h.orig Wed Dec 7 11:11:39 2005
++++ ext/date/lib/timelib_structs.h Wed Dec 7 11:11:53 2005
+@@ -21,7 +21,7 @@
+ #ifndef __TIMELIB_STRUCTS_H__
+ #define __TIMELIB_STRUCTS_H__
+
+-#include <timelib_config.h>
++#include "timelib_config.h"
+
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
diff --git a/lang/php5/files/patch-ext_standard_incomplete_class.c b/lang/php5/files/patch-ext_standard_incomplete_class.c
deleted file mode 100644
index f4b5c40e4c3b..000000000000
--- a/lang/php5/files/patch-ext_standard_incomplete_class.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ext/standard/incomplete_class.c.orig Fri Oct 14 07:49:19 2005
-+++ ext/standard/incomplete_class.c Fri Oct 14 07:50:12 2005
-@@ -122,7 +122,7 @@
-
- /* {{{ php_lookup_class_name
- */
--char *php_lookup_class_name(zval *object, size_t *nlen)
-+char *php_lookup_class_name(zval *object, zend_uint *nlen)
- {
- zval **val;
- char *retval = NULL;
-@@ -144,7 +144,7 @@
-
- /* {{{ php_store_class_name
- */
--void php_store_class_name(zval *object, const char *name, size_t len)
-+void php_store_class_name(zval *object, const char *name, zend_uint len)
- {
- zval *val;
- TSRMLS_FETCH();
diff --git a/lang/php5/files/patch-ext_standard_php_incomplete_class.h b/lang/php5/files/patch-ext_standard_php_incomplete_class.h
deleted file mode 100644
index 936036a1b565..000000000000
--- a/lang/php5/files/patch-ext_standard_php_incomplete_class.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- ext/standard/php_incomplete_class.h.orig Fri Oct 14 07:50:22 2005
-+++ ext/standard/php_incomplete_class.h Fri Oct 14 07:50:59 2005
-@@ -42,7 +42,7 @@
-
- #define PHP_CLASS_ATTRIBUTES \
- char *class_name; \
-- size_t name_len; \
-+ zend_uint name_len; \
- zend_bool free_class_name = 0; \
- zend_bool incomplete_class = 0
-
-@@ -55,8 +55,8 @@
-
- zend_class_entry *php_create_incomplete_class(TSRMLS_D);
-
--char *php_lookup_class_name(zval *object, size_t *nlen);
--void php_store_class_name(zval *object, const char *name, size_t len);
-+char *php_lookup_class_name(zval *object, zend_uint *nlen);
-+void php_store_class_name(zval *object, const char *name, zend_uint len);
-
- #ifdef __cplusplus
- };
diff --git a/lang/php5/files/patch-pear::Makefile.frag b/lang/php5/files/patch-pear::Makefile.frag
deleted file mode 100644
index 41b525b28a7c..000000000000
--- a/lang/php5/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.4.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/php5/files/patch-pear::scripts::pearcmd.php b/lang/php5/files/patch-pear::scripts::pearcmd.php
deleted file mode 100644
index e0898d9ed08a..000000000000
--- a/lang/php5/files/patch-pear::scripts::pearcmd.php
+++ /dev/null
@@ -1,21 +0,0 @@
---- pear/scripts/pearcmd.php.orig Mon Mar 28 18:46:06 2005
-+++ pear/scripts/pearcmd.php Wed Nov 16 09:30:03 2005
-@@ -1,3 +1,4 @@
-+#!%%PREFIX%%/bin/php -nq
- <?php
- //
- // +----------------------------------------------------------------------+
-@@ -24,9 +25,10 @@
- /**
- * @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('memory_limit', '16M');
- ini_set('allow_url_fopen', true);
- if (!ini_get('safe_mode')) {
- @set_time_limit(0);
diff --git a/lang/php5/files/patch-scripts::Makefile.frag b/lang/php5/files/patch-scripts::Makefile.frag
deleted file mode 100644
index f3200a0dc3c2..000000000000
--- a/lang/php5/files/patch-scripts::Makefile.frag
+++ /dev/null
@@ -1,25 +0,0 @@
---- scripts/Makefile.frag.orig Tue Jun 7 23:57:06 2005
-+++ scripts/Makefile.frag Wed Sep 7 17:50:23 2005
-@@ -34,21 +34,12 @@
- / \
- Zend/ \
- TSRM/ \
-- include/ \
- main/ \
- main/streams/ \
- regex/ \
-- ext/iconv/ \
- ext/libxml/ \
- ext/standard/ \
-- ext/session/ \
-- ext/dom/xml_common.h \
-- ext/xml/ \
-- ext/xml/expat/ \
-- ext/mbstring/ \
-- ext/mbstring/libmbfl/ \
-- ext/mbstring/libmbfl/mbfl/ \
-- ext/sqlite/libsqlite/src/sqlite.h
-+ ext/spl/
-
- install-headers:
- -@for i in $(HEADER_DIRS); do \
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-13 08:47:19 +0000