head 1.11; access; symbols pkgsrc-2013Q2:1.11.0.8 pkgsrc-2013Q2-base:1.11 pkgsrc-2012Q4:1.11.0.6 pkgsrc-2012Q4-base:1.11 pkgsrc-2011Q4:1.11.0.4 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q2:1.11.0.2 pkgsrc-2011Q2-base:1.11 pkgsrc-2009Q4:1.10.0.50 pkgsrc-2009Q4-base:1.10 pkgsrc-2009Q3:1.10.0.48 pkgsrc-2009Q3-base:1.10 pkgsrc-2009Q2:1.10.0.46 pkgsrc-2009Q2-base:1.10 pkgsrc-2009Q1:1.10.0.44 pkgsrc-2009Q1-base:1.10 pkgsrc-2008Q4:1.10.0.42 pkgsrc-2008Q4-base:1.10 pkgsrc-2008Q3:1.10.0.40 pkgsrc-2008Q3-base:1.10 cube-native-xorg:1.10.0.38 cube-native-xorg-base:1.10 pkgsrc-2008Q2:1.10.0.36 pkgsrc-2008Q2-base:1.10 cwrapper:1.10.0.34 pkgsrc-2008Q1:1.10.0.32 pkgsrc-2008Q1-base:1.10 pkgsrc-2007Q4:1.10.0.30 pkgsrc-2007Q4-base:1.10 pkgsrc-2007Q3:1.10.0.28 pkgsrc-2007Q3-base:1.10 pkgsrc-2007Q2:1.10.0.26 pkgsrc-2007Q2-base:1.10 pkgsrc-2007Q1:1.10.0.24 pkgsrc-2007Q1-base:1.10 pkgsrc-2006Q4:1.10.0.22 pkgsrc-2006Q4-base:1.10 pkgsrc-2006Q3:1.10.0.20 pkgsrc-2006Q3-base:1.10 pkgsrc-2006Q2:1.10.0.18 pkgsrc-2006Q2-base:1.10 pkgsrc-2006Q1:1.10.0.16 pkgsrc-2006Q1-base:1.10 pkgsrc-2005Q4:1.10.0.14 pkgsrc-2005Q4-base:1.10 pkgsrc-2005Q3:1.10.0.12 pkgsrc-2005Q3-base:1.10 pkgsrc-2005Q2:1.10.0.10 pkgsrc-2005Q2-base:1.10 pkgsrc-2005Q1:1.10.0.8 pkgsrc-2005Q1-base:1.10 pkgsrc-2004Q4:1.10.0.6 pkgsrc-2004Q4-base:1.10 pkgsrc-2004Q3:1.10.0.4 pkgsrc-2004Q3-base:1.10 pkgsrc-2004Q2:1.10.0.2 pkgsrc-2004Q2-base:1.10 pkgsrc-2004Q1:1.9.0.4 pkgsrc-2004Q1-base:1.9 pkgsrc-2003Q4:1.9.0.2 pkgsrc-2003Q4-base:1.9 netbsd-1-6-1:1.8.0.2 netbsd-1-6-1-base:1.8 netbsd-1-6:1.7.0.8 netbsd-1-6-RELEASE-base:1.7 pkgviews:1.7.0.4 pkgviews-base:1.7 buildlink2:1.7.0.2 buildlink2-base:1.7 netbsd-1-5-PATCH003:1.7 netbsd-1-5-PATCH001:1.5 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.11 date 2010.02.10.18.08.33; author joerg; state dead; branches; next 1.10; 1.10 date 2004.04.30.00.06.42; author lukem; state Exp; branches; next 1.9; 1.9 date 2003.08.31.19.56.06; author jdolecek; state dead; branches; next 1.8; 1.8 date 2002.09.04.14.47.40; author agc; state Exp; branches; next 1.7; 1.7 date 2001.10.16.04.54.24; author jlam; state Exp; branches 1.7.8.1; next 1.6; 1.6 date 2001.05.14.14.12.28; author jlam; state Exp; branches; next 1.5; 1.5 date 2001.03.13.21.34.03; author jlam; state Exp; branches; next 1.4; 1.4 date 2000.12.25.21.03.47; author jlam; state Exp; branches; next 1.3; 1.3 date 2000.12.17.21.33.55; author jlam; state Exp; branches; next 1.2; 1.2 date 2000.12.17.17.18.02; author jlam; state Exp; branches; next 1.1; 1.1 date 2000.12.17.09.19.32; author jlam; state Exp; branches 1.1.1.1; next ; 1.7.8.1 date 2002.10.24.16.59.56; author wiz; state Exp; branches; next ; 1.1.1.1 date 2000.12.17.09.19.32; author jlam; state Exp; branches; next ; desc @@ 1.11 log @Retire PHP 4. @ text @$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); @ 1.10 log @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 to operate as a CGI... Fixes problem using PHP 4.3 under a variety of non-Apache web servers. @ text @d1 1 a1 1 $NetBSD$ @ 1.9 log @Update PHP to final 4.3.3 Some highlights of changes since 4.2.3: * PCRE updated to 4.3, GD to 2.0.15 * improved Apache2 support * much improved stream & URL wrapper support, output compression support * added CLI (Command Line Interface) SAPI * debug_backtrace() backported from ZendEngine2 * faster build system * huge number of other bug fixes and improvements Packaging changes: * 'pcre', 'xml', and 'session' modules folded back into main package - 'pcre' and 'xml' is required by PEAR, and 'session' is just too essential to be separate * 'gd' module now uses bundled PHP GD library, which is better integrated * PHP modules use shared distinfo when possible to ease future PHP updates * ${PREFIX}/bin/php is now CLI version, ${PREFIX}/libexec/cgi-big/php remains CGI version @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 2002/09/04 14:47:40 agc Exp $ d3 20 a22 9 --- Makefile.in.orig Sat Apr 21 21:09:12 2001 +++ Makefile.in @@@@ -19,7 +19,7 @@@@ PROGRAM_NAME = php PROGRAM_SOURCES = stub.c PROGRAM_LDADD = libphp4.la $(EXT_PROGRAM_LDADD) -PROGRAM_LDFLAGS = -export-dynamic +PROGRAM_LDFLAGS = -static ${EXPORT_SYMBOLS_LDFLAGS} $(LINK_LIBGCC_LDFLAGS) PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD) d24 10 a33 1 targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM) @ 1.8 log @Apply patches from Lubomir Sedlacik in PR 18115 to generalise the linker flags used to export symbols by setting them on a per-OS basis. > many packages force -Wl,-export-dynamic which is not portable outside GNU ld > and cause problems e.g. on Solaris. some of these packages use if > conditionals either only for NetBSD or except SunOS, but the state is not > coherent and it may complicate later when support for new OS is added to > pkgsrc (e.g. ongoing work on HP-UX support). > > jlam proposed the following framework in discussion on tech-pkg: > > http://mail-index.netbsd.org/tech-pkg/2002/06/21/0009.html > > now, ${EXPORT_SYMBOLS_LDFLAGS} is used instead of directly defining > -Wl,-export-dynamic which is set in appropriate defs.*.mk to reasonable > values. packages should be converted to this framework by: > > 1) replacing LDFLAGS+= -Wl,-export-dynamic and LIBS+= -export-dynamic with: > > LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} > > 2) for use in patchfiles, add this variable to MAKE_ENV if needed: > > MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS} > > 3) replace occurances of -Wl,-export-dynamic and -export-dynamic in patch > files with: > > $(EXPORT_SYMBOLS_LDFLAGS) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.7 2001/10/16 04:54:24 jlam Exp $ @ 1.7 log @Update ap-php and php to 4.0.6. Changes from version 4.0.5 include: - Bug fixes (memory leaks and other errors) - Made $HTTP_SESSION_VARS['foo'] and $foo be references to the same value when register_globals is on. (Andrei) - Added is_callable() function that can be used to find out whether its argument is a valid callable construct. (Andrei) - Added pg_last_notice() function. (Rasmus from suggestion by Dirk@@rackspace.com) - Added support to getimagesize to return dimensions of BMP and PSD files. (Derick) - Added Japanese multibyte string functions support. (Rui) - Added key_exists() to check if a given key or index exists in an array or object. (David Croft) - Added -C command-line option to avoid chdir to the script's directory. (Stig) - printf argnum (parameter swapping) support. (Morten Poulsen, Rasmus) - Modified get_parent_class() and get_class_methods() to accept a class name as well as a class instance. (Andrei, Zend Engine) - Added array_map() function that applies a callback to the elements of given arrays and returns the result. It can also be used with a null callback to transpose arrays. (Andrei) - Added array_filter(), which allows filtering of array elements via the specified callback. (Andrei) @ text @d1 1 a1 1 $NetBSD$ d10 1 a10 1 +PROGRAM_LDFLAGS = -static -export-dynamic $(LINK_LIBGCC_LDFLAGS) @ 1.7.8.1 log @Pull the following up to the 1.6 branch (requested by agc): Apply patches from Lubomir Sedlacik in PR 18115 to generalise the linker flags used to export symbols by setting them on a per-OS basis. > many packages force -Wl,-export-dynamic which is not portable outside GNU ld > and cause problems e.g. on Solaris. some of these packages use if > conditionals either only for NetBSD or except SunOS, but the state is not > coherent and it may complicate later when support for new OS is added to > pkgsrc (e.g. ongoing work on HP-UX support). > > jlam proposed the following framework in discussion on tech-pkg: > > http://mail-index.netbsd.org/tech-pkg/2002/06/21/0009.html > > now, ${EXPORT_SYMBOLS_LDFLAGS} is used instead of directly defining > -Wl,-export-dynamic which is set in appropriate defs.*.mk to reasonable > values. packages should be converted to this framework by: > > 1) replacing LDFLAGS+= -Wl,-export-dynamic and LIBS+= -export-dynamic with: > > LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} > > 2) for use in patchfiles, add this variable to MAKE_ENV if needed: > > MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS} > > 3) replace occurances of -Wl,-export-dynamic and -export-dynamic in patch > files with: > > $(EXPORT_SYMBOLS_LDFLAGS) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 2002/09/04 14:47:40 agc Exp $ d10 1 a10 1 +PROGRAM_LDFLAGS = -static ${EXPORT_SYMBOLS_LDFLAGS} $(LINK_LIBGCC_LDFLAGS) @ 1.6 log @Update php4 and modules to 4.0.5. Changes from version 4.0.4.1nb1 include many general bugfixes, important fixes to the pgsql module to support PostgreSQL transactions correctly, speedups, and a zlib output compressor. @ text @d3 9 a11 3 --- configure.in.orig Mon Apr 30 09:37:22 2001 +++ configure.in @@@@ -353,7 +353,8 @@@@ d13 1 a13 19 dnl Check for IPv6 support AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support, -[AC_TRY_COMPILE([#include +[AC_TRY_COMPILE([#include +#include #include ], [struct sockaddr_in6 s; int i=AF_INET6; s], ac_cv_ipv6_support=yes, ac_cv_ipv6_support=no)]) if test "$ac_cv_ipv6_support" = yes; then @@@@ -820,10 +821,6 @@@@ PHP_CONFIGURE_PART(Configuring shared libtool) $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool' - else - PHP_COMPILE='$(COMPILE) -c $< && touch $@@' - CXX_PHP_COMPILE='$(CXX_COMPILE) -c $< && touch $@@' - fi fi CC="$old_CC" @ 1.5 log @Include before including in thest for IPv6 support. Fix suggested in pkg/12199 by Olaf Seibert . @ text @d3 1 a3 1 --- configure.in.orig Thu Jan 11 13:18:18 2001 d5 1 a5 1 @@@@ -340,7 +340,8 @@@@ d15 1 a15 1 @@@@ -837,10 +838,6 @@@@ @ 1.4 log @Update php4 to the latest stable release 4.0.4. Relevant changes from version 4.0.3 include many bugfixes (including one bad interaction with mod_perl which caused segfaults) and additions of several new functions. Several new PHP modules were also added to the main distribution, including new database extensions and OpenSSL, and some bugs with improperly closing database connections was fixed. @ text @d3 1 a3 1 --- configure.in.orig Mon Dec 18 23:32:10 2000 d5 11 a15 1 @@@@ -837,10 +837,6 @@@@ @ 1.3 log @Make this package look more like php3 by installing a php binary for use as a CGI executable for HTTP servers without a SAPI module. @ text @d3 4 a6 30 --- configure.orig Sun Oct 15 07:47:10 2000 +++ configure @@@@ -17706,7 +17706,7 @@@@ ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 fi - for lib in imap c-client4 c-client; do + for lib in imapuw imap c-client4 c-client; do IMAP_LIB=$lib str="$IMAP_DIR/lib/lib$lib.*" @@@@ -37830,6 +37830,7 @@@@ fi +if false; then echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 echo "configure:37835: checking for pam_start in -lpam" >&5 ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` @@@@ -37874,6 +37875,8 @@@@ else echo "$ac_t""no" 1>&6 fi + +fi # if false for ac_func in getcwd getwd @@@@ -44218,9 +44221,6 @@@@ d12 1 a12 1 fi d15 1 @ 1.2 log @Add 'www' to common CATEGORIES. Patches to find imap-uw headers and libraries in correct location. @ text @d31 10 @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- configure.orig Sun Oct 15 13:47:10 2000 d5 9 @ 1.1.1.1 log @Create a php4 package upon which both HTTP/PHP4 servers and PHP4 extension modules depend. Move most of the guts of the ap-php4 package into this one. @ text @@