summaryrefslogtreecommitdiff
path: root/www/php4/patches
diff options
context:
space:
mode:
Diffstat (limited to 'www/php4/patches')
-rw-r--r--www/php4/patches/patch-aa33
-rw-r--r--www/php4/patches/patch-ab15
-rw-r--r--www/php4/patches/patch-ac19
-rw-r--r--www/php4/patches/patch-ad19
-rw-r--r--www/php4/patches/patch-ag24
-rw-r--r--www/php4/patches/patch-ah21
-rw-r--r--www/php4/patches/patch-ai11
-rw-r--r--www/php4/patches/patch-aj28
-rw-r--r--www/php4/patches/patch-ak27
-rw-r--r--www/php4/patches/patch-ap12
-rw-r--r--www/php4/patches/patch-at11
-rw-r--r--www/php4/patches/patch-au22
-rw-r--r--www/php4/patches/patch-av38
13 files changed, 0 insertions, 280 deletions
diff --git a/www/php4/patches/patch-aa b/www/php4/patches/patch-aa
deleted file mode 100644
index 2f7313d3d33..00000000000
--- a/www/php4/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2004/04/30 00:06:42 lukem Exp $
-
---- sapi/cgi/cgi_main.c.orig 2004-04-01 03:01:45.000000000 +1000
-+++ sapi/cgi/cgi_main.c
-@@ -679,6 +679,20 @@ static void init_request_info(TSRMLS_D)
- char *env_script_filename = sapi_cgibin_getenv("SCRIPT_FILENAME",0 TSRMLS_CC);
- char *env_path_translated = sapi_cgibin_getenv("PATH_TRANSLATED",0 TSRMLS_CC);
- char *script_path_translated = env_script_filename;
-+ char *env_script_name = sapi_cgibin_getenv("SCRIPT_NAME",0 TSRMLS_CC);
-+
-+ /*
-+ * CGI/1.1, as documented at:
-+ * http://cgi-spec.golux.com/
-+ * mentions SCRIPT_NAME but not SCRIPT_FILENAME.
-+ * Support web servers that only supply the former,
-+ * even though PHP 4.3 wants the latter ...
-+ */
-+ if (!script_path_translated && env_script_name && *env_script_name == '/') {
-+ env_script_filename = _sapi_cgibin_putenv("SCRIPT_FILENAME",(env_script_name + 1) TSRMLS_CC);
-+
-+ script_path_translated = env_script_filename;
-+ }
-
- #if !DISCARD_PATH
- /* some broken servers do not have script_filename or argv0
-@@ -707,7 +721,6 @@ static void init_request_info(TSRMLS_D)
- char *content_length = sapi_cgibin_getenv("CONTENT_LENGTH",0 TSRMLS_CC);
- char *content_type = sapi_cgibin_getenv("CONTENT_TYPE",0 TSRMLS_CC);
- char *env_path_info = sapi_cgibin_getenv("PATH_INFO",0 TSRMLS_CC);
-- char *env_script_name = sapi_cgibin_getenv("SCRIPT_NAME",0 TSRMLS_CC);
- #if ENABLE_PATHINFO_CHECK
- struct stat st;
- char *env_redirect_url = sapi_cgibin_getenv("REDIRECT_URL",0 TSRMLS_CC);
diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab
deleted file mode 100644
index 4f4c1a4c2b5..00000000000
--- a/www/php4/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.22 2006/05/11 06:50:39 minskim Exp $
-
---- acinclude.m4.orig 2005-12-19 14:29:11.000000000 -0800
-+++ acinclude.m4
-@@ -1195,10 +1195,6 @@ AC_DEFUN([PHP_SHARED_MODULE],[
- install_modules="install-modules"
-
- case $host_alias in
-- *darwin*[)]
-- suffix=so
-- link_cmd='ifelse($4,,[$(CC)],[$(CXX)]) -dynamic -flat_namespace -bundle -undefined suppress $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
-- ;;
- *netware*[)]
- suffix=nlm
- link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) ifelse($1, php4lib, , -L$(top_builddir)/netware -lphp4lib) $(translit(ifelse($1, php4lib, $1, m4_substr($1, 3)),a-z_-,A-Z__)_SHARED_LIBADD)'
diff --git a/www/php4/patches/patch-ac b/www/php4/patches/patch-ac
deleted file mode 100644
index 6ffa2475f85..00000000000
--- a/www/php4/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2006/11/03 07:00:40 wiz Exp $
-
---- ext/curl/curl.c.orig 2006-08-10 17:27:11.000000000 +0000
-+++ ext/curl/curl.c
-@@ -93,6 +93,14 @@
- static int le_curl;
- #define le_curl_name "cURL handle"
-
-+#ifndef CURLOPT_PASSWDFUNCTION
-+#define CURLOPT_PASSWDFUNCTION 0
-+#endif
-+
-+#ifndef CURLOPT_FTPASCII
-+#define CURLOPT_FTPASCII 0
-+#endif
-+
- #ifdef PHP_CURL_NEED_OPENSSL_TSL /* {{{ */
- static MUTEX_T *php_curl_openssl_tsl = NULL;
-
diff --git a/www/php4/patches/patch-ad b/www/php4/patches/patch-ad
deleted file mode 100644
index 31c3107023a..00000000000
--- a/www/php4/patches/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ad,v 1.17 2004/12/09 14:50:23 jlam Exp $
-
---- configure.orig 2004-09-20 18:31:33.000000000 -0400
-+++ configure
-@@ -90314,13 +90314,8 @@ old_CC=$CC
-
- if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
- CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
-+ CFLAGS="$CFLAGS $ac_cv_pthreads_cflags"
- INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
-- cat >meta_ccld<<EOF
--#! /bin/sh
--exec $CC $ac_cv_pthreads_cflags \$@
--EOF
-- CC="$abs_builddir/meta_ccld"
-- chmod +x meta_ccld
- fi
-
- if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
diff --git a/www/php4/patches/patch-ag b/www/php4/patches/patch-ag
deleted file mode 100644
index df59380aeb6..00000000000
--- a/www/php4/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.6 2003/09/01 10:17:38 cjep Exp $
---- php.ini-dist.orig 2003-07-10 00:38:36.000000000 +0200
-+++ php.ini-dist 2003-08-30 21:59:51.000000000 +0200
-@@ -424,8 +424,9 @@
- ; if nonempty.
- user_dir =
-
--; Directory in which the loadable extensions (modules) reside.
--extension_dir = "./"
-+; Directory in which the loadable extensions (modules) reside. If not
-+; defined, then use the extension directory specified at compile-time.
-+; extension_dir = "./"
-
- ; Whether or not to enable the dl() function. The dl() function does NOT work
- ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-@@ -476,7 +477,7 @@
-
- ; Temporary directory for HTTP uploaded files (will use system default if not
- ; specified).
--;upload_tmp_dir =
-+upload_tmp_dir = /tmp
-
- ; Maximum allowed size for uploaded files.
- upload_max_filesize = 2M
diff --git a/www/php4/patches/patch-ah b/www/php4/patches/patch-ah
deleted file mode 100644
index 3371efeb58a..00000000000
--- a/www/php4/patches/patch-ah
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ah,v 1.7 2003/09/01 10:17:38 cjep Exp $
---- php.ini-recommended.orig 2003-07-10 00:38:36.000000000 +0200
-+++ php.ini-recommended 2003-08-30 22:01:36.000000000 +0200
-@@ -440,7 +440,7 @@
- user_dir =
-
- ; Directory in which the loadable extensions (modules) reside.
--extension_dir = "./"
-+; extension_dir = "./"
-
- ; Whether or not to enable the dl() function. The dl() function does NOT work
- ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-@@ -491,7 +491,7 @@
-
- ; Temporary directory for HTTP uploaded files (will use system default if not
- ; specified).
--;upload_tmp_dir =
-+upload_tmp_dir = /tmp
-
- ; Maximum allowed size for uploaded files.
- upload_max_filesize = 2M
diff --git a/www/php4/patches/patch-ai b/www/php4/patches/patch-ai
deleted file mode 100644
index 8d70f18731e..00000000000
--- a/www/php4/patches/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ai,v 1.9 2004/10/31 17:45:44 jdolecek Exp $
-
---- ext/mysql/config.m4.orig Wed Dec 31 11:28:38 2003
-+++ ext/mysql/config.m4 Fri Aug 6 16:43:12 2004
-@@ -3,6 +3,4 @@
- dnl
-
--sinclude(ext/mysql/libmysql/acinclude.m4)
--sinclude(ext/mysql/libmysql/mysql.m4)
- sinclude(libmysql/acinclude.m4)
- sinclude(libmysql/mysql.m4)
diff --git a/www/php4/patches/patch-aj b/www/php4/patches/patch-aj
deleted file mode 100644
index ace86595a34..00000000000
--- a/www/php4/patches/patch-aj
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aj,v 1.9 2005/04/11 20:02:57 jdolecek Exp $
-
---- ext/imap/config.m4.orig 2005-04-08 20:55:11.000000000 +0200
-+++ ext/imap/config.m4 2005-04-08 20:55:01.000000000 +0200
-@@ -54,6 +54,14 @@
- ])
- ])
-
-+dsl Must be before --with-kerberos, affects the check
-+PHP_ARG_WITH(imap-linkage,use IMAP c-client linkage,
-+[ --with-imap-linkage Use IMAP c-client linkage to determine supported items.])
-+
-+if test "$PHP_IMAP_LINKAGE" != "no"; then
-+ AC_DEFINE(HAVE_IMAP_LINKAGE, 1, [ ])
-+fi
-+
- AC_DEFUN([PHP_IMAP_KRB_CHK], [
- if test "$PHP_KERBEROS" != "no"; then
- PHP_SETUP_KERBEROS(IMAP_SHARED_LIBADD,
-@@ -65,7 +73,7 @@
- Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr )
- ])
- ])
-- else
-+ elif test "$PHP_IMAP_LINKAGE" != "yes"; then
- AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [
- AC_MSG_ERROR([This c-client library is built with Kerberos support.
-
diff --git a/www/php4/patches/patch-ak b/www/php4/patches/patch-ak
deleted file mode 100644
index feb955eee17..00000000000
--- a/www/php4/patches/patch-ak
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ak,v 1.4 2005/04/21 23:47:46 salo Exp $
-
---- ext/imap/php_imap.c.orig 2005-01-25 15:23:37.000000000 +0100
-+++ ext/imap/php_imap.c 2005-04-22 01:37:25.000000000 +0200
-@@ -415,6 +415,11 @@
-
- ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL)
-
-+/*
-+ * Optionally use the installed c-client linkage.c to determine which drivers
-+ * are authenticators are linked in. Otherwise use this fixed list.
-+ */
-+#ifndef HAVE_IMAP_LINKAGE
- #ifndef PHP_WIN32
- mail_link(&unixdriver); /* link in the unix driver */
- mail_link(&mhdriver); /* link in the mh driver */
-@@ -430,6 +435,10 @@
- mail_link(&tenexdriver); /* link in the tenex driver */
- mail_link(&mtxdriver); /* link in the mtx driver */
- mail_link(&dummydriver); /* link in the dummy driver */
-+#else /* HAVE_IMAP_LINKAGE */
-+ /* link in the c-client mail and auth drivers */
-+#include "linkage.c"
-+#endif /* HAVE_IMAP_LINKAGE */
-
- #ifndef PHP_WIN32
- auth_link(&auth_log); /* link in the log authenticator */
diff --git a/www/php4/patches/patch-ap b/www/php4/patches/patch-ap
deleted file mode 100644
index bc9bf0ec89a..00000000000
--- a/www/php4/patches/patch-ap
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/03/03 07:11:34 cube Exp $
-
---- pear/install-pear.php.orig 2006-01-07 18:51:54.000000000 +0100
-+++ pear/install-pear.php
-@@ -167,6 +167,7 @@ foreach ($install_files as $package => $
- }
- } else {
- $options['nodeps'] = true;
-+ $options['force'] = $force;
- $installer->setOptions($options);
- $dp = array(&$downloaderpackage);
- $installer->setDownloadedPackages($dp);
diff --git a/www/php4/patches/patch-at b/www/php4/patches/patch-at
deleted file mode 100644
index 4ab86e855a7..00000000000
--- a/www/php4/patches/patch-at
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-at,v 1.1 2006/04/22 10:27:06 jdolecek Exp $
-
---- ext/wddx/wddx.c.orig 2006-04-22 12:18:32.000000000 +0200
-+++ ext/wddx/wddx.c
-@@ -20,2 +20,6 @@
-
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "php.h"
diff --git a/www/php4/patches/patch-au b/www/php4/patches/patch-au
deleted file mode 100644
index 3847b0834b8..00000000000
--- a/www/php4/patches/patch-au
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-au,v 1.5 2007/03/11 16:43:49 grant Exp $
-
---- ext/oracle/config.m4.orig 2004-12-30 18:02:18.000000000 +1100
-+++ ext/oracle/config.m4
-@@ -7,6 +7,8 @@ AC_DEFUN([AC_ORACLE_VERSION],[
- if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
- ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
- test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
-+ elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
-+ ORACLE_VERSION=10.1
- elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
- ORACLE_VERSION=9.0
- elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
-@@ -141,7 +143,7 @@ if test "$PHP_ORACLE" != "no"; then
- PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
- ;;
-
-- 8.1|9.0)
-+ 8.1|9.0|10.1)
- PHP_ADD_LIBRARY(clntsh, 1, ORACLE_SHARED_LIBADD)
- PHP_ADD_LIBPATH($ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
- ;;
diff --git a/www/php4/patches/patch-av b/www/php4/patches/patch-av
deleted file mode 100644
index 0a453c484e1..00000000000
--- a/www/php4/patches/patch-av
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-av,v 1.6 2009/12/21 20:02:44 joerg Exp $
-
---- ext/mssql/config.m4.orig 2009-12-21 19:57:57.000000000 +0000
-+++ ext/mssql/config.m4
-@@ -9,32 +9,7 @@ PHP_ARG_WITH(mssql,for MSSQL support via
-
- if test "$PHP_MSSQL" != "no"; then
-
-- FREETDS_INSTALLATION_DIR=""
-- if test "$PHP_MSSQL" = "yes"; then
--
-- for i in /usr/local /usr; do
-- if test -f $i/include/tds.h; then
-- FREETDS_INSTALLATION_DIR=$i
-- break
-- fi
-- done
--
-- if test -z "$FREETDS_INSTALLATION_DIR"; then
-- AC_MSG_ERROR(Cannot find FreeTDS in known installation directories)
-- fi
--
-- elif test "$PHP_MSSQL" != "no"; then
--
-- if test -f $PHP_MSSQL/include/tds.h; then
-- FREETDS_INSTALLATION_DIR=$PHP_MSSQL
-- else
-- AC_MSG_ERROR(Directory $PHP_MSSQL is not a FreeTDS installation directory)
-- fi
-- fi
--
-- if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then
-- AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.[a|so])
-- fi
-+ FREETDS_INSTALLATION_DIR=$PHP_MSSQL
-
- MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include
- MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-18 00:28:22 +0000