php-4.0.7RC1 / OpenBSD
| From: | Anil Madhavapeddy | Date: | Fri, 17 Aug 2001 18:13:03 +0000 |
| Subject: | php-4.0.7RC1 / OpenBSD | ||
| Groups: | php.qa | ||
| Request: | Send a blank email to php-qa+get-3514@lists.php.net to get a copy of this message | ||
Please test the attached patch to openbsd-current ports
to upgrade to PHP-4.0.7RC1
Testing all the flavors for functionality and on non-i386
platforms especially needed.
This is NOT the final version of this port; some issues
Ill resolve before committing are:
- need to sync with newest libtool patches
- an xml flavor will be added; its not in this port
- you need bison to compile this (not a requirement
on the final version)
If people could just run it through its paces functionality
wise, that would be appreciated.
I've added php-qa to this, in case there are some
OpenBSD users there as well.
Anil
? patch-php4.0.7 Index: Makefile =================================================================== RCS file: /cvs/ports/www/php4/Makefile,v retrieving revision 1.47 diff -u -r1.47 Makefile --- Makefile 2001/07/18 10:59:01 1.47 +++ Makefile 2001/08/17 18:06:11 @@ -9,7 +9,7 @@ # This port current only works with archs supporting dynamic loading ONLY_FOR_ARCHS= i386 m68k sparc -V= 4.0.6 +V= 4.0.7RC1 DISTNAME= php-${V} PKGNAME= php4-${V} FULLPKGNAME-pear= php4-pear-${V} @@ -21,7 +21,7 @@ HOMEPAGE= http://www.php.net/ -MASTER_SITES= http://www.php.net:8000/distributions/ \ +MASTER_SITES= http://www.php.net/~zeev/ \ http://se.php.net/distributions/ \ http://no.php.net/distributions/ \ http://uk.php.net/distributions/ @@ -47,7 +47,7 @@ --enable-sysvshm \ --enable-inline-optimization \ --disable-debug - +CONFIGURE_ENV= YACC='bison -y' USE_LIBTOOL= Yes FLAVORS+= gdbm gettext imap ldap mhash mm recode snmp @@ -202,7 +202,7 @@ ${PREFIX}/lib/libphp4.so ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/php4 ${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/share/doc/php4 - ${INSTALL_DATA} ${WRKSRC}/php.ini-optimized ${PREFIX}/share/doc/php4 + ${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/share/doc/php4 @sed 's,y0y0y0,${TRUEPREFIX},' \ <${FILESDIR}/php4-enable >${PREFIX}/sbin/php4-enable @chown ${BINOWN}:${BINGRP} ${PREFIX}/sbin/php4-enable Index: files/md5 =================================================================== RCS file: /cvs/ports/www/php4/files/md5,v retrieving revision 1.7 diff -u -r1.7 md5 --- files/md5 2001/06/23 23:36:36 1.7 +++ files/md5 2001/08/17 18:06:11 @@ -1,3 +1,3 @@ -MD5 (php-4.0.6.tar.gz) = 5f698521cf2b392cf9bfa87fc1a0fe90 -RMD160 (php-4.0.6.tar.gz) = e455b9a4d1de74cb30f657668a535a2d27b81925 -SHA1 (php-4.0.6.tar.gz) = 6544eb1085b916541af914a11074e9bb8a037a03 +MD5 (php-4.0.7RC1.tar.gz) = 8bd25ce665e5f558068c25c9534d8d26 +RMD160 (php-4.0.7RC1.tar.gz) = 14c36eaa4e3fcbee82bd9abee741c471e85e7eb7 +SHA1 (php-4.0.7RC1.tar.gz) = 1030f06b7b5e0f4140ebcc2db471793a9734d6a0 Index: patches/patch-Zend_zend_alloc_c =================================================================== RCS file: patch-Zend_zend_alloc_c diff -N patch-Zend_zend_alloc_c --- /tmp/cvskdnvG15917 Fri Aug 17 12:06:11 2001 +++ /dev/null Fri Aug 17 12:00:54 2001 @@ -1,13 +0,0 @@ -$OpenBSD: patch-Zend_zend_alloc_c,v 1.1 2001/08/11 00:16:56 avsm Exp $ ---- Zend/zend_alloc.c.orig Tue Jun 19 18:04:53 2001 -+++ Zend/zend_alloc.c Sat Aug 11 00:07:15 2001 -@@ -446,6 +446,9 @@ ZEND_API void shutdown_memory_manager(in - for (i=1; i<MAX_CACHED_MEMORY; i++) { - for (j=0; j<AG(cache_count)[i]; j++) { - ptr = (zend_mem_header *) AG(cache)[i][j]; -+#if MEMORY_LIMIT -+ AG(allocated_memory) -= REAL_SIZE(ptr->size); -+#endif - REMOVE_POINTER_FROM_LIST(ptr); - free(ptr); - } Index: patches/patch-aclocal_m4 =================================================================== RCS file: patch-aclocal_m4 diff -N patch-aclocal_m4 --- /dev/null Fri Aug 17 12:00:54 2001 +++ patch-aclocal_m4 Fri Aug 17 12:06:11 2001 @@ -0,0 +1,38 @@ +$OpenBSD$ +--- aclocal.m4.orig Wed Aug 15 15:33:47 2001 ++++ aclocal.m4 Fri Aug 17 09:10:00 2001 +@@ -2519,6 +2519,9 @@ cygwin* | mingw* | pw32* ) + with_gnu_ld=no + fi + ;; ++openbsd*) ++ with_gnu_ld=no ++ ;; + + esac + +@@ -2923,10 +2926,22 @@ else + ;; + + openbsd*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no ++ deplibs_check_method='pass_all' ++ case "$host_os" in ++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='-R$libdir' ++ ;; ++ *) ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then ++ export_dynamic_flag_spec='${wl}-E' ++ fi ++ ;; ++ esac + ;; + + os2*) Index: patches/patch-configure =================================================================== RCS file: patch-configure diff -N patch-configure --- /dev/null Fri Aug 17 12:00:54 2001 +++ patch-configure Fri Aug 17 12:06:11 2001 @@ -0,0 +1,38 @@ +$OpenBSD$ +--- configure.orig Wed Aug 15 15:33:52 2001 ++++ configure Fri Aug 17 09:10:12 2001 +@@ -60323,6 +60323,9 @@ cygwin* | mingw* | pw32* ) + with_gnu_ld=no + fi + ;; ++openbsd*) ++ with_gnu_ld=no ++ ;; + + esac + +@@ -60727,10 +60730,22 @@ else + ;; + + openbsd*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no ++ deplibs_check_method='pass_all' ++ case "$host_os" in ++ openbsd01.* | openbsd2.0-7 | openbsd2.0-7.*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='-R$libdir' ++ ;; ++ *) ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ if "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ; then ++ export_dynamic_flag_spec='${wl}-E' ++ fi ++ ;; ++ esac + ;; + + os2*) Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/php4/pkg/PLIST,v retrieving revision 1.4 diff -u -r1.4 PLIST --- pkg/PLIST 2001/06/12 15:07:29 1.4 +++ pkg/PLIST 2001/08/17 18:06:11 @@ -1,7 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.4 2001/06/12 15:07:29 avsm Exp $ +@comment $OpenBSD$ @pkgcfl php3-* lib/libphp4.so sbin/php4-enable share/doc/php4/php.ini-dist -share/doc/php4/php.ini-optimized +share/doc/php4/php.ini-recommended @dirrm share/doc/php4 Index: pkg/PLIST-pear =================================================================== RCS file: /cvs/ports/www/php4/pkg/PLIST-pear,v retrieving revision 1.3 diff -u -r1.3 PLIST-pear --- pkg/PLIST-pear 2001/07/05 22:55:40 1.3 +++ pkg/PLIST-pear 2001/08/17 18:06:11 @@ -1,5 +1,6 @@ -@comment $OpenBSD: PLIST-pear,v 1.3 2001/07/05 22:55:40 avsm Exp $ +@comment $OpenBSD$ bin/pear +bin/pearize bin/php-config bin/phpextdist bin/phpize @@ -84,7 +85,6 @@ include/php/ext/standard/php_mail.h include/php/ext/standard/php_math.h include/php/ext/standard/php_metaphone.h -include/php/ext/standard/php_output.h include/php/ext/standard/php_parsedate.h include/php/ext/standard/php_rand.h include/php/ext/standard/php_smart_str.h @@ -100,17 +100,6 @@ include/php/ext/standard/url.h include/php/ext/standard/url_scanner.h include/php/ext/standard/url_scanner_ex.h -include/php/ext/xml/expat/xmlparse/expat_hashtable.h -include/php/ext/xml/expat/xmlparse/xmlparse.h -include/php/ext/xml/expat/xmltok/asciitab.h -include/php/ext/xml/expat/xmltok/iasciitab.h -include/php/ext/xml/expat/xmltok/latin1tab.h -include/php/ext/xml/expat/xmltok/nametab.h -include/php/ext/xml/expat/xmltok/utf8tab.h -include/php/ext/xml/expat/xmltok/xmldef.h -include/php/ext/xml/expat/xmltok/xmlrole.h -include/php/ext/xml/expat/xmltok/xmltok.h -include/php/ext/xml/expat/xmltok/xmltok_impl.h include/php/ext/xml/php_xml.h include/php/main/SAPI.h include/php/main/build-defs.h @@ -129,6 +118,7 @@ include/php/main/php_main.h include/php/main/php_network.h include/php/main/php_open_temporary_file.h +include/php/main/php_output.h include/php/main/php_reentrancy.h include/php/main/php_regex.h include/php/main/php_streams.h @@ -185,6 +175,7 @@ lib/php/HTML/Form.php lib/php/HTML/IT.php lib/php/HTML/ITX.php +lib/php/HTML/IT_Error.php lib/php/HTML/Page.php lib/php/HTML/Processor.php lib/php/HTML/Select.php @@ -255,10 +246,11 @@ @dirrm lib/php/Cache/Container @dirrm lib/php/Cache @dirrm lib/php/Benchmark -@dirrm lib/php @dirrm include/php/regex @dirrm include/php/main +@exec mkdir -p %D/include/php/ext/xml/expat/xmltok @dirrm include/php/ext/xml/expat/xmltok +@exec mkdir -p %D/include/php/ext/xml/expat/xmlparse @dirrm include/php/ext/xml/expat/xmlparse @dirrm include/php/ext/xml/expat @dirrm include/php/ext/xml
? patch-php4.0.7 Index: Makefile =================================================================== RCS file: /cvs/ports/www/php4/Makefile,v retrieving revision 1.47 diff -u -r1.47 Makefile --- Makefile 2001/07/18 10:59:01 1.47 +++ Makefile 2001/08/17 18:06:11 @@ -9,7 +9,7 @@ # This port current only works with archs supporting dynamic loading ONLY_FOR_ARCHS= i386 m68k sparc -V= 4.0.6 +V= 4.0.7RC1 DISTNAME= php-${V} PKGNAME= php4-${V} FULLPKGNAME-pear= php4-pear-${V} @@ -21,7 +21,7 @@ HOMEPAGE= http://www.php.net/ -MASTER_SITES= http://www.php.net:8000/distributions/ \ +MASTER_SITES= http://www.php.net/~zeev/ \ http://se.php.net/distributions/ \ http://no.php.net/distributions/ \ http://uk.php.net/distributions/ @@ -47,7 +47,7 @@ --enable-sysvshm \ --enable-inline-optimization \ --disable-debug - +CONFIGURE_ENV= YACC='bison -y' USE_LIBTOOL= Yes FLAVORS+= gdbm gettext imap ldap mhash mm recode snmp @@ -202,7 +202,7 @@ ${PREFIX}/lib/libphp4.so ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/php4 ${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/share/doc/php4 - ${INSTALL_DATA} ${WRKSRC}/php.ini-optimized ${PREFIX}/share/doc/php4 + ${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/share/doc/php4 @sed 's,y0y0y0,${TRUEPREFIX},' \ <${FILESDIR}/php4-enable >${PREFIX}/sbin/php4-enable @chown ${BINOWN}:${BINGRP} ${PREFIX}/sbin/php4-enable Index: files/md5 =================================================================== RCS file: /cvs/ports/www/php4/files/md5,v retrieving revision 1.7 diff -u -r1.7 md5 --- files/md5 2001/06/23 23:36:36 1.7 +++ files/md5 2001/08/17 18:06:11 @@ -1,3 +1,3 @@ -MD5 (php-4.0.6.tar.gz) = 5f698521cf2b392cf9bfa87fc1a0fe90 -RMD160 (php-4.0.6.tar.gz) = e455b9a4d1de74cb30f657668a535a2d27b81925 -SHA1 (php-4.0.6.tar.gz) = 6544eb1085b916541af914a11074e9bb8a037a03 +MD5 (php-4.0.7RC1.tar.gz) = 8bd25ce665e5f558068c25c9534d8d26 +RMD160 (php-4.0.7RC1.tar.gz) = 14c36eaa4e3fcbee82bd9abee741c471e85e7eb7 +SHA1 (php-4.0.7RC1.tar.gz) = 1030f06b7b5e0f4140ebcc2db471793a9734d6a0 Index: patches/patch-Zend_zend_alloc_c =================================================================== RCS file: patch-Zend_zend_alloc_c diff -N patch-Zend_zend_alloc_c --- /tmp/cvskdnvG15917 Fri Aug 17 12:06:11 2001 +++ /dev/null Fri Aug 17 12:00:54 2001 @@ -1,13 +0,0 @@ -$OpenBSD: patch-Zend_zend_alloc_c,v 1.1 2001/08/11 00:16:56 avsm Exp $ ---- Zend/zend_alloc.c.orig Tue Jun 19 18:04:53 2001 -+++ Zend/zend_alloc.c Sat Aug 11 00:07:15 2001 -@@ -446,6 +446,9 @@ ZEND_API void shutdown_memory_manager(in - for (i=1; i<MAX_CACHED_MEMORY; i++) { - for (j=0; j<AG(cache_count)[i]; j++) { - ptr = (zend_mem_header *) AG(cache)[i][j]; -+#if MEMORY_LIMIT -+ AG(allocated_memory) -= REAL_SIZE(ptr->size); -+#endif - REMOVE_POINTER_FROM_LIST(ptr); - free(ptr); - } Index: patches/patch-aclocal_m4 =================================================================== RCS file: patch-aclocal_m4 diff -N patch-aclocal_m4 --- /dev/null Fri Aug 17 12:00:54 2001 +++ patch-aclocal_m4 Fri Aug 17 12:06:11 2001 @@ -0,0 +1,38 @@ +$OpenBSD$ +--- aclocal.m4.orig Wed Aug 15 15:33:47 2001 ++++ aclocal.m4 Fri Aug 17 09:10:00 2001 +@@ -2519,6 +2519,9 @@ cygwin* | mingw* | pw32* ) + with_gnu_ld=no + fi + ;; ++openbsd*) ++ with_gnu_ld=no ++ ;; + + esac + +@@ -2923,10 +2926,22 @@ else + ;; + + openbsd*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no ++ deplibs_check_method='pass_all' ++ case "$host_os" in ++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='-R$libdir' ++ ;; ++ *) ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then ++ export_dynamic_flag_spec='${wl}-E' ++ fi ++ ;; ++ esac + ;; + + os2*) Index: patches/patch-configure =================================================================== RCS file: patch-configure diff -N patch-configure --- /dev/null Fri Aug 17 12:00:54 2001 +++ patch-configure Fri Aug 17 12:06:11 2001 @@ -0,0 +1,38 @@ +$OpenBSD$ +--- configure.orig Wed Aug 15 15:33:52 2001 ++++ configure Fri Aug 17 09:10:12 2001 +@@ -60323,6 +60323,9 @@ cygwin* | mingw* | pw32* ) + with_gnu_ld=no + fi + ;; ++openbsd*) ++ with_gnu_ld=no ++ ;; + + esac + +@@ -60727,10 +60730,22 @@ else + ;; + + openbsd*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no ++ deplibs_check_method='pass_all' ++ case "$host_os" in ++ openbsd01.* | openbsd2.0-7 | openbsd2.0-7.*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='-R$libdir' ++ ;; ++ *) ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ if "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ; then ++ export_dynamic_flag_spec='${wl}-E' ++ fi ++ ;; ++ esac + ;; + + os2*) Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/php4/pkg/PLIST,v retrieving revision 1.4 diff -u -r1.4 PLIST --- pkg/PLIST 2001/06/12 15:07:29 1.4 +++ pkg/PLIST 2001/08/17 18:06:11 @@ -1,7 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.4 2001/06/12 15:07:29 avsm Exp $ +@comment $OpenBSD$ @pkgcfl php3-* lib/libphp4.so sbin/php4-enable share/doc/php4/php.ini-dist -share/doc/php4/php.ini-optimized +share/doc/php4/php.ini-recommended @dirrm share/doc/php4 Index: pkg/PLIST-pear =================================================================== RCS file: /cvs/ports/www/php4/pkg/PLIST-pear,v retrieving revision 1.3 diff -u -r1.3 PLIST-pear --- pkg/PLIST-pear 2001/07/05 22:55:40 1.3 +++ pkg/PLIST-pear 2001/08/17 18:06:11 @@ -1,5 +1,6 @@ -@comment $OpenBSD: PLIST-pear,v 1.3 2001/07/05 22:55:40 avsm Exp $ +@comment $OpenBSD$ bin/pear +bin/pearize bin/php-config bin/phpextdist bin/phpize @@ -84,7 +85,6 @@ include/php/ext/standard/php_mail.h include/php/ext/standard/php_math.h include/php/ext/standard/php_metaphone.h -include/php/ext/standard/php_output.h include/php/ext/standard/php_parsedate.h include/php/ext/standard/php_rand.h include/php/ext/standard/php_smart_str.h @@ -100,17 +100,6 @@ include/php/ext/standard/url.h include/php/ext/standard/url_scanner.h include/php/ext/standard/url_scanner_ex.h -include/php/ext/xml/expat/xmlparse/expat_hashtable.h -include/php/ext/xml/expat/xmlparse/xmlparse.h -include/php/ext/xml/expat/xmltok/asciitab.h -include/php/ext/xml/expat/xmltok/iasciitab.h -include/php/ext/xml/expat/xmltok/latin1tab.h -include/php/ext/xml/expat/xmltok/nametab.h -include/php/ext/xml/expat/xmltok/utf8tab.h -include/php/ext/xml/expat/xmltok/xmldef.h -include/php/ext/xml/expat/xmltok/xmlrole.h -include/php/ext/xml/expat/xmltok/xmltok.h -include/php/ext/xml/expat/xmltok/xmltok_impl.h include/php/ext/xml/php_xml.h include/php/main/SAPI.h include/php/main/build-defs.h @@ -129,6 +118,7 @@ include/php/main/php_main.h include/php/main/php_network.h include/php/main/php_open_temporary_file.h +include/php/main/php_output.h include/php/main/php_reentrancy.h include/php/main/php_regex.h include/php/main/php_streams.h @@ -185,6 +175,7 @@ lib/php/HTML/Form.php lib/php/HTML/IT.php lib/php/HTML/ITX.php +lib/php/HTML/IT_Error.php lib/php/HTML/Page.php lib/php/HTML/Processor.php lib/php/HTML/Select.php @@ -255,10 +246,11 @@ @dirrm lib/php/Cache/Container @dirrm lib/php/Cache @dirrm lib/php/Benchmark -@dirrm lib/php @dirrm include/php/regex @dirrm include/php/main +@exec mkdir -p %D/include/php/ext/xml/expat/xmltok @dirrm include/php/ext/xml/expat/xmltok +@exec mkdir -p %D/include/php/ext/xml/expat/xmlparse @dirrm include/php/ext/xml/expat/xmlparse @dirrm include/php/ext/xml/expat @dirrm include/php/ext/xml