cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

put common php patches here

Browse Source
This commit is contained in:
avsm 2003-05-02 19:46:04 +00:00
parent 6b13705498
commit 84aca7518b
7 changed files with 493 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
www/php4/patches/patch-aclocal_m4 Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-aclocal_m4,v 1.3 2003/05/02 19:46:04 avsm Exp $
--- aclocal.m4.orig Wed Jan 22 11:09:53 2003
+++ aclocal.m4 Wed Jan 22 11:10:12 2003
@@ -3976,7 +3976,7 @@ openbsd*)
shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ finish_cmds=
shlibpath_var=LD_LIBRARY_PATH
;;

40
www/php4/patches/patch-configure_in Normal file
View File

@ -0,0 +1,40 @@
$OpenBSD: patch-configure_in,v 1.7 2003/05/02 19:46:04 avsm Exp $
--- configure.in.orig Fri Dec 27 04:07:18 2002
+++ configure.in Wed Jan 22 10:48:47 2003
@@ -34,9 +34,7 @@ dnl check for working sed
PHP_PROG_SED
PHP_CONFIG_NICE(config.nice)
-for arg in $0 "$@"; do
- CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$arg'"
-done
+CONFIGURE_COMMAND="Built via the OpenBSD Ports Tree"
AC_CANONICAL_HOST
AC_CONFIG_HEADER(main/php_config.h)
@@ -806,14 +804,14 @@ unset with_pic
case $php_build_target in
program|static)
- standard_libtool_flag='-prefer-non-pic -static'
+ standard_libtool_flag='-static'
if test -z "$PHP_MODULES"; then
enable_shared=no
fi
;;
shared)
enable_static=no
- standard_libtool_flag=-prefer-pic
+ standard_libtool_flag=
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
;;
esac
@@ -926,7 +924,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
EXPANDED_DATADIR=$datadir
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
+INCLUDE_PATH=.:$libdir
exec_prefix=$old_exec_prefix
libdir=$old_libdir

44
www/php4/patches/patch-ltmain_sh Normal file
View File

@ -0,0 +1,44 @@
$OpenBSD: patch-ltmain_sh,v 1.3 2003/05/02 19:46:04 avsm Exp $
--- ltmain.sh.orig Sun Jun 30 00:24:48 2002
+++ ltmain.sh Mon Jan 20 14:01:25 2003
@@ -4446,40 +4446,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
exit 0
;;

12
www/php4/patches/patch-main_php_open_temporary_file_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-main_php_open_temporary_file_c,v 1.3 2003/05/02 19:46:04 avsm Exp $
--- main/php_open_temporary_file.c.orig Sun Jan 19 17:05:39 2003
+++ main/php_open_temporary_file.c Sun Jan 19 17:05:52 2003
@@ -128,7 +128,7 @@ static FILE *php_do_open_temporary_file(
trailing_slash = "/";
}
- (void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXX", path, trailing_slash, pfx);
+ (void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXXXXXX", path, trailing_slash, pfx);
#ifdef PHP_WIN32
if (GetTempFileName(path, pfx, 0, opened_path)) {

187
www/php4/patches/patch-php_ini-dist Normal file
View File

@ -0,0 +1,187 @@
$OpenBSD: patch-php_ini-dist,v 1.6 2003/05/02 19:46:04 avsm Exp $
--- php.ini-dist.orig Thu Dec 26 13:27:08 2002
+++ php.ini-dist Fri May 2 18:11:03 2003
@@ -403,10 +403,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-;
-; Windows: "\path1;\path2"
-;include_path = ".;c:\php\includes"
+include_path = ".:OPENBSD_INCLUDE_PATH"
; The root of the PHP pages, used only if nonempty.
; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
@@ -420,7 +417,7 @@ doc_root =
user_dir =
; Directory in which the loadable extensions (modules) reside.
-extension_dir = ./
+extension_dir = MODULES_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
@@ -474,7 +471,7 @@ upload_max_filesize = 2M
;;;;;;;;;;;;;;;;;;
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
-allow_url_fopen = On
+allow_url_fopen = Off
; Define the anonymous ftp password (your email address)
;from="john@doe.com"
@@ -492,80 +489,6 @@ default_socket_timeout = 60
; fgets() and file() will work regardless of the source of the file.
; auto_detect_line_endings = Off
-
-;;;;;;;;;;;;;;;;;;;;;;
-; Dynamic Extensions ;
-;;;;;;;;;;;;;;;;;;;;;;
-;
-; If you wish to have an extension loaded automatically, use the following
-; syntax:
-;
-; extension=modulename.extension
-;
-; For example, on Windows:
-;
-; extension=msql.dll
-;
-; ... or under UNIX:
-;
-; extension=msql.so
-;
-; Note that it should be the name of the module only; no directory information
-; needs to go here. Specify the location of the extension with the
-; extension_dir directive above.
-
-
-;Windows Extensions
-;Note that MySQL and ODBC support is now built in, so no dll is needed for it.
-;
-;extension=php_bz2.dll
-;extension=php_cpdf.dll
-;extension=php_crack.dll
-;extension=php_curl.dll
-;extension=php_db.dll
-;extension=php_dba.dll
-;extension=php_dbase.dll
-;extension=php_dbx.dll
-;extension=php_domxml.dll
-;extension=php_exif.dll
-;extension=php_fbsql.dll
-;extension=php_fdf.dll
-;extension=php_filepro.dll
-;extension=php_gd.dll
-;extension=php_gd2.dll
-;extension=php_gettext.dll
-;extension=php_hyperwave.dll
-;extension=php_iconv.dll
-;extension=php_ifx.dll
-;extension=php_iisfunc.dll
-;extension=php_imap.dll
-;extension=php_interbase.dll
-;extension=php_java.dll
-;extension=php_ldap.dll
-;extension=php_mbstring.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
-;extension=php_mime_magic.dll
-;extension=php_ming.dll
-;extension=php_mssql.dll
-;extension=php_msql.dll
-;extension=php_oci8.dll
-;extension=php_openssl.dll
-;extension=php_oracle.dll
-;extension=php_pdf.dll
-;extension=php_pgsql.dll
-;extension=php_printer.dll
-;extension=php_shmop.dll
-;extension=php_snmp.dll
-;extension=php_sockets.dll
-;extension=php_sybase_ct.dll
-;extension=php_w32api.dll
-;extension=php_xmlrpc.dll
-;extension=php_xslt.dll
-;extension=php_yaz.dll
-;extension=php_zip.dll
-
-
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
@@ -577,13 +500,8 @@ default_socket_timeout = 60
define_syslog_variables = Off
[mail function]
-; For Win32 only.
-SMTP = localhost
-
-; For Win32 only.
-sendmail_from = me@localhost.com
-; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
+;You may supply arguments as well (default: "sendmail -t -i").
;sendmail_path =
[Java]
@@ -1091,3 +1009,57 @@ sockets.use_system_read = On
; Local Variables:
; tab-width: 4
; End:
+
+;;;;;;;;;;;;;;;;;;;;;;
+; Dynamic Extensions ;
+;;;;;;;;;;;;;;;;;;;;;;
+;
+; If you wish to have an extension loaded automatically, use the following
+; syntax:
+;
+; extension=modulename.so
+;
+; Note that it should be the name of the module only; no directory information
+; needs to go here. Specify the location of the extension with the
+; extension_dir directive above.
+
+;extension=bz2.so
+;extension=cpdf.so
+;extension=crack.so
+;extension=curl.so
+;extension=db.so
+;extension=dba.so
+;extension=dbase.so
+;extension=dbx.so
+;extension=domxml.so
+;extension=exif.so
+;extension=fbsql.so
+;extension=fdf.so
+;extension=filepro.so
+;extension=gd.so
+;extension=hyperwave.so
+;extension=ifx.so
+;extension=imap.so
+;extension=interbase.so
+;extension=java.so
+;extension=ldap.so
+;extension=mbstring.so
+;extension=mcrypt.so
+;extension=mhash.so
+;extension=ming.so
+;extension=mssql.so
+;extension=msql.so
+;extension=oci8.so
+;extension=openssl.so
+;extension=oracle.so
+;extension=pdf.so
+;extension=pgsql.so
+;extension=printer.so
+;extension=shmop.so
+;extension=snmp.so
+;extension=sockets.so
+;extension=sybase_ct.so
+;extension=xmlrpc.so
+;extension=xslt.so
+;extension=yaz.so
+;extension=zip.so

186
www/php4/patches/patch-php_ini-recommended Normal file
View File

@ -0,0 +1,186 @@
$OpenBSD: patch-php_ini-recommended,v 1.4 2003/05/02 19:46:05 avsm Exp $
--- php.ini-recommended.orig Thu Dec 26 13:27:08 2002
+++ php.ini-recommended Fri May 2 18:11:27 2003
@@ -418,11 +418,8 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
+include_path = ".:OPENBSD_INCLUDE_PATH"
;
-; Windows: "\path1;\path2"
-;include_path = ".;c:\php\includes"
-
; The root of the PHP pages, used only if nonempty.
; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
; if you are running php as a CGI under any web server (other than IIS)
@@ -435,7 +432,7 @@ doc_root =
user_dir =
; Directory in which the loadable extensions (modules) reside.
-extension_dir = ./
+extension_dir = MODULES_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
@@ -489,7 +486,7 @@ upload_max_filesize = 2M
;;;;;;;;;;;;;;;;;;
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
-allow_url_fopen = On
+allow_url_fopen = Off
; Define the anonymous ftp password (your email address)
;from="john@doe.com"
@@ -508,79 +505,6 @@ default_socket_timeout = 60
; auto_detect_line_endings = Off
-;;;;;;;;;;;;;;;;;;;;;;
-; Dynamic Extensions ;
-;;;;;;;;;;;;;;;;;;;;;;
-;
-; If you wish to have an extension loaded automatically, use the following
-; syntax:
-;
-; extension=modulename.extension
-;
-; For example, on Windows:
-;
-; extension=msql.dll
-;
-; ... or under UNIX:
-;
-; extension=msql.so
-;
-; Note that it should be the name of the module only; no directory information
-; needs to go here. Specify the location of the extension with the
-; extension_dir directive above.
-
-
-;Windows Extensions
-;Note that MySQL and ODBC support is now built in, so no dll is needed for it.
-;
-;extension=php_bz2.dll
-;extension=php_cpdf.dll
-;extension=php_crack.dll
-;extension=php_curl.dll
-;extension=php_db.dll
-;extension=php_dba.dll
-;extension=php_dbase.dll
-;extension=php_dbx.dll
-;extension=php_domxml.dll
-;extension=php_exif.dll
-;extension=php_fbsql.dll
-;extension=php_fdf.dll
-;extension=php_filepro.dll
-;extension=php_gd.dll
-;extension=php_gd2.dll
-;extension=php_gettext.dll
-;extension=php_hyperwave.dll
-;extension=php_iconv.dll
-;extension=php_ifx.dll
-;extension=php_iisfunc.dll
-;extension=php_imap.dll
-;extension=php_interbase.dll
-;extension=php_java.dll
-;extension=php_ldap.dll
-;extension=php_mbstring.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
-;extension=php_mime_magic.dll
-;extension=php_ming.dll
-;extension=php_mssql.dll
-;extension=php_msql.dll
-;extension=php_oci8.dll
-;extension=php_openssl.dll
-;extension=php_oracle.dll
-;extension=php_pdf.dll
-;extension=php_pgsql.dll
-;extension=php_printer.dll
-;extension=php_shmop.dll
-;extension=php_snmp.dll
-;extension=php_sockets.dll
-;extension=php_sybase_ct.dll
-;extension=php_w32api.dll
-;extension=php_xmlrpc.dll
-;extension=php_xslt.dll
-;extension=php_yaz.dll
-;extension=php_zip.dll
-
-
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
@@ -592,11 +516,6 @@ default_socket_timeout = 60
define_syslog_variables = Off
[mail function]
-; For Win32 only.
-SMTP = localhost
-
-; For Win32 only.
-sendmail_from = me@localhost.com
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
;sendmail_path =
@@ -1083,6 +1002,56 @@ sockets.use_system_read = On
;exif.decode_jis_motorola = JIS
;exif.decode_jis_intel = JIS
-; Local Variables:
-; tab-width: 4
-; End:
+;;;;;;;;;;;;;;;;;;;;;;
+; Dynamic Extensions ;
+;;;;;;;;;;;;;;;;;;;;;;
+;
+; If you wish to have an extension loaded automatically, use the following
+; syntax:
+;
+; extension=modulename.so
+;
+; Note that it should be the name of the module only; no directory information
+; needs to go here. Specify the location of the extension with the
+; extension_dir directive above.
+
+;extension=bz2.so
+;extension=cpdf.so
+;extension=crack.so
+;extension=curl.so
+;extension=db.so
+;extension=dba.so
+;extension=dbase.so
+;extension=dbx.so
+;extension=domxml.so
+;extension=exif.so
+;extension=fbsql.so
+;extension=fdf.so
+;extension=filepro.so
+;extension=gd.so
+;extension=hyperwave.so
+;extension=ifx.so
+;extension=imap.so
+;extension=interbase.so
+;extension=java.so
+;extension=ldap.so
+;extension=mbstring.so
+;extension=mcrypt.so
+;extension=mhash.so
+;extension=ming.so
+;extension=mssql.so
+;extension=msql.so
+;extension=oci8.so
+;extension=openssl.so
+;extension=oracle.so
+;extension=pdf.so
+;extension=pgsql.so
+;extension=printer.so
+;extension=shmop.so
+;extension=snmp.so
+;extension=sockets.so
+;extension=sybase_ct.so
+;extension=xmlrpc.so
+;extension=xslt.so
+;extension=yaz.so
+;extension=zip.so

12
www/php4/patches/patch-run-tests_php Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-run-tests_php,v 1.1 2003/05/02 19:46:05 avsm Exp $
--- run-tests.php.orig Thu Jan 23 13:26:55 2003
+++ run-tests.php Thu Jan 23 13:27:05 2003
@@ -44,6 +44,8 @@ if (getenv('TEST_PHP_SRCDIR')) {
$cwd = getcwd();
set_time_limit(0);
+
+ob_flush();
while(ob_get_level()) {
ob_end_clean();
}