summaryrefslogtreecommitdiff
path: root/lang/php4/files
diff options
context:
space:
mode:
Diffstat (limited to 'lang/php4/files')
-rw-r--r--lang/php4/files/patch-TSRM_threads.m411
-rw-r--r--lang/php4/files/patch-acinclude.m429
-rw-r--r--lang/php4/files/patch-configure38
-rw-r--r--lang/php4/files/patch-configure.in42
-rw-r--r--lang/php4/files/patch-main::php_config.h.in6
-rw-r--r--lang/php4/files/patch-main_SAPI.c8
-rw-r--r--lang/php4/files/patch-sapi_cgi_Makefile.frag9
-rw-r--r--lang/php4/files/patch-sapi_cgi_config9.m454
-rw-r--r--lang/php4/files/patch-scripts::phpize.in6
9 files changed, 152 insertions, 51 deletions
diff --git a/lang/php4/files/patch-TSRM_threads.m4 b/lang/php4/files/patch-TSRM_threads.m4
new file mode 100644
index 000000000000..3f75b837b071
--- /dev/null
+++ b/lang/php4/files/patch-TSRM_threads.m4
@@ -0,0 +1,11 @@
+--- TSRM/threads.m4.orig Fri May 5 08:02:38 2006
++++ TSRM/threads.m4 Fri May 5 08:02:59 2006
+@@ -164,7 +164,7 @@ dnl
+ dnl
+ AC_DEFUN([PTHREADS_ASSIGN_VARS],[
+ 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/php4/files/patch-acinclude.m4 b/lang/php4/files/patch-acinclude.m4
index 853082ef6319..94e15f9f3d58 100644
--- a/lang/php4/files/patch-acinclude.m4
+++ b/lang/php4/files/patch-acinclude.m4
@@ -1,6 +1,29 @@
---- acinclude.m4.orig Fri Sep 23 11:20:22 2005
-+++ acinclude.m4 Tue Nov 15 23:25:54 2005
-@@ -1709,9 +1709,9 @@
+--- acinclude.m4.orig Mon Dec 19 23:29:11 2005
++++ acinclude.m4 Fri May 5 08:05:43 2006
+@@ -84,7 +84,7 @@
+ dnl
+ dnl which array to append to?
+ AC_DEFUN([PHP_ADD_SOURCES],[
+- PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS)))
++ PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,ifelse($4,cgi,PHP_CGI_OBJS,PHP_GLOBAL_OBJS))))
+ ])
+ dnl
+ dnl _PHP_ASSIGN_BUILD_VARS(type)
+@@ -1305,12 +1305,8 @@
+
+ if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
+ dnl ---------------------------------------------- CLI static module
+- if test "$PHP_SAPI" = "cgi"; then
+- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
+- EXT_STATIC="$EXT_STATIC $1"
+- else
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
+- fi
++ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
+ EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
+ fi
+ PHP_ADD_BUILD_DIR($ext_builddir)
+@@ -1713,9 +1709,9 @@
test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
dnl Fallbacks for different configure options
diff --git a/lang/php4/files/patch-configure b/lang/php4/files/patch-configure
deleted file mode 100644
index 0b4f226749ae..000000000000
--- a/lang/php4/files/patch-configure
+++ /dev/null
@@ -1,38 +0,0 @@
---- configure.orig Sun Oct 30 12:06:37 2005
-+++ configure Tue Nov 15 23:25:55 2005
-@@ -2900,7 +2900,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
-@@ -9725,7 +9725,7 @@
- if test "$enable_experimental_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
-@@ -9742,8 +9742,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*)
-@@ -98846,7 +98844,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/php4/files/patch-configure.in b/lang/php4/files/patch-configure.in
new file mode 100644
index 000000000000..b3e0c11e4777
--- /dev/null
+++ b/lang/php4/files/patch-configure.in
@@ -0,0 +1,42 @@
+--- configure.in.orig Fri May 5 08:06:58 2006
++++ configure.in Fri May 5 08:09:15 2006
+@@ -261,7 +261,6 @@ dnl ## Apache module, CGI etc.)
+ dnl .
+ dnl -------------------------------------------------------------------------
+
+-PTHREADS_CHECK
+ PHP_HELP_SEPARATOR([SAPI modules:])
+ PHP_SHLIB_SUFFIX_NAME
+ PHP_SAPI=default
+@@ -287,7 +286,6 @@ AC_MSG_RESULT([$PHP_SAPI])
+
+ if test "$enable_experimental_zts" = "yes"; then
+ PTHREADS_ASSIGN_VARS
+- PTHREADS_FLAGS
+ fi
+
+ if test "$PHP_ENABLE_FASTCGI" = "yes"; then
+@@ -1235,18 +1233,15 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libto
+ INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
+ CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
+
+-all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
+-install_targets="$install_modules $install_pear install-build install-headers install-programs"
++all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET) $(PHP_CGI_TARGET)'
++install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules $install_pear install-build install-headers install-programs"
+
+ case $PHP_SAPI in
+- cgi)
++ apache)
+ install_targets="install-sapi $install_targets"
+ ;;
+- cli)
+- install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
+- ;;
+- *)
+- install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
++ apache2handler)
++ install_targets="install-sapi $install_targets"
+ ;;
+ esac
+
diff --git a/lang/php4/files/patch-main::php_config.h.in b/lang/php4/files/patch-main::php_config.h.in
index ca828a919078..0b470b3f484a 100644
--- a/lang/php4/files/patch-main::php_config.h.in
+++ b/lang/php4/files/patch-main::php_config.h.in
@@ -1,6 +1,6 @@
---- main/php_config.h.in.orig Sun Oct 30 12:06:40 2005
-+++ main/php_config.h.in Wed Nov 16 09:18:14 2005
-@@ -2606,6 +2606,9 @@
+--- main/php_config.h.in.orig Thu Jan 12 19:24:28 2006
++++ main/php_config.h.in Fri May 5 08:02:13 2006
+@@ -2624,6 +2624,9 @@
/* Whether to build zip as dynamic module */
#undef COMPILE_DL_ZIP
diff --git a/lang/php4/files/patch-main_SAPI.c b/lang/php4/files/patch-main_SAPI.c
index 2e7f7431d9cd..7064b4797140 100644
--- a/lang/php4/files/patch-main_SAPI.c
+++ b/lang/php4/files/patch-main_SAPI.c
@@ -1,6 +1,6 @@
---- main/SAPI.c.orig Fri Apr 15 10:50:01 2005
-+++ main/SAPI.c Fri Apr 15 10:50:14 2005
-@@ -565,7 +565,7 @@
+--- main/SAPI.c.orig Sun Jan 1 14:46:59 2006
++++ main/SAPI.c Fri May 5 08:02:13 2006
+@@ -582,7 +582,7 @@
ptr++;
len--;
}
@@ -9,7 +9,7 @@
if(!strncmp(ptr, "image/", sizeof("image/")-1)) {
zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"), "0", sizeof("0") - 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
}
-@@ -712,7 +712,7 @@
+@@ -729,7 +729,7 @@
return SUCCESS;
}
diff --git a/lang/php4/files/patch-sapi_cgi_Makefile.frag b/lang/php4/files/patch-sapi_cgi_Makefile.frag
new file mode 100644
index 000000000000..c10be19f4703
--- /dev/null
+++ b/lang/php4/files/patch-sapi_cgi_Makefile.frag
@@ -0,0 +1,9 @@
+--- sapi/cgi/Makefile.frag.orig Fri May 5 08:09:42 2006
++++ sapi/cgi/Makefile.frag Fri May 5 08:10:05 2006
+@@ -1,2 +1,5 @@
+-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
++$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CGI_OBJS)
+ $(BUILD_CGI)
++
++install-cgi: $(SAPI_CGI_PATH)
++ @$(INSTALL_CGI)
diff --git a/lang/php4/files/patch-sapi_cgi_config9.m4 b/lang/php4/files/patch-sapi_cgi_config9.m4
new file mode 100644
index 000000000000..2d10bb0ac156
--- /dev/null
+++ b/lang/php4/files/patch-sapi_cgi_config9.m4
@@ -0,0 +1,54 @@
+--- sapi/cgi/config9.m4.orig Fri May 5 08:10:10 2006
++++ sapi/cgi/config9.m4 Fri May 5 08:15:23 2006
+@@ -81,7 +81,6 @@ main()
+ ])
+
+
+-if test "$PHP_SAPI" = "default"; then
+ AC_MSG_CHECKING(for CGI build)
+ if test "$PHP_SAPI_CGI" != "no"; then
+ AC_MSG_RESULT(yes)
+@@ -149,25 +148,38 @@ if test "$PHP_SAPI" = "default"; then
+ AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ])
+ AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
+
+- INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)"
+- PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)')
++ INSTALL_CGI="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)"
++ PHP_ADD_SOURCES(sapi/cgi, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, cgi)
++ PHP_ADD_SOURCES(/main, internal_functions.c,,cgi)
+
+ case $host_alias in
+ *darwin*)
+ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ ;;
+ *)
+- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
++ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ ;;
+ esac
+
++ PHP_CGI_TARGET="\$(SAPI_CGI_PATH)"
++ PHP_INSTALL_CGI_TARGET="install-cgi"
+ PHP_SUBST(BUILD_CGI)
++ PHP_SUBST(INSTALL_CGI)
++ PHP_SUBST(PHP_CGI_OBJS)
++ PHP_SUBST(PHP_CGI_TARGET)
++ PHP_SUBST(PHP_INSTALL_CGI_TARGET)
+
+- elif test "$PHP_SAPI_CLI" != "no"; then
+- AC_MSG_RESULT(no)
++ if test "$PHP_SAPI" = "default" ; then
++ PHP_BUILD_PROGRAM($SAPI_CGI_PATH)
++ fi
++ else
++ AC_MSG_RESULT(no)
++ if test "$PHP_SAPI" = "default" ; then
++ if test "$PHP_SAPI_CLI" != "no" ; then
+ OVERALL_TARGET=
+ PHP_SAPI=cli
+ else
+ AC_MSG_ERROR([No SAPIs selected.])
+ fi
++ fi
+ fi
diff --git a/lang/php4/files/patch-scripts::phpize.in b/lang/php4/files/patch-scripts::phpize.in
index 83f38a656499..9db65b6f616a 100644
--- a/lang/php4/files/patch-scripts::phpize.in
+++ b/lang/php4/files/patch-scripts::phpize.in
@@ -1,5 +1,5 @@
---- scripts/phpize.in.orig Wed Jun 15 19:13:52 2005
-+++ scripts/phpize.in Wed Jul 13 09:30:59 2005
+--- scripts/phpize.in.orig Sun Sep 4 06:41:00 2005
++++ scripts/phpize.in Fri May 5 08:02:13 2006
@@ -94,8 +94,8 @@
phpize_check_autotools()
@@ -9,5 +9,5 @@
+ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf259
+ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader259
- if ! test -x "`$php_shtool path $PHP_AUTOCONF`"; then
+ if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then
cat <<EOF
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-16 17:52:29 +0000