Update of /cvsroot/fink/dists/10.2-gcc3.3/unstable/crypto/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23867/crypto/finkinfo
Modified Files:
apr-ssl.info apache2-ssl.info apache2-ssl.patch
php4-apache2-ssl.info php4-apache2-ssl.patch
Log Message:
Backported latest versions from 10.3 that link to db42.
The recode php4 module had to be removed since it didn't build.
Maintainer set to none since TheSin is no longer maintaining 10.2-gcc3.3.
Index: apr-ssl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.2-gcc3.3/unstable/crypto/finkinfo/apr-ssl.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- apr-ssl.info 18 Nov 2003 10:00:22 -0000 1.4
+++ apr-ssl.info 24 Mar 2004 18:22:05 -0000 1.5
@@ -1,13 +1,13 @@
Package: apr-ssl
Version: 0.9.5
-Revision: 1
+Revision: 2
Description: Apache Portable Runtime (with SSL)
License: BSD
-Maintainer: Dustin Sias <[EMAIL PROTECTED]>
+Maintainer: None <[EMAIL PROTECTED]>
# Dependencies:
Depends: %N-shlibs (= %v-%r) | apr-shlibs (= %v-%r)
-BuildDepends: expat (>= 1.95.3-1), fink (>= 0.11.0-1), dlcompat-dev, gdbm3, db41-ssl
(>= 4.1.25-15), libiconv-dev, openldap-ssl (>= 2.1.22-13)
+BuildDepends: expat (>= 1.95.3-1), fink (>= 0.11.0-1), gdbm3, db42-ssl (>= 4.2.52-2),
libiconv-dev, openldap-ssl (>= 2.1.22-14), dlcompat-dev
BuildDependsOnly: True
Conflicts: apr, svn-client (<< 0.14.3-1), apache2 (<< 2.0.47-1)
Replaces: apr
@@ -22,6 +22,9 @@
PatchScript: <<
perl -pi.bak -e "s/need_relink=yes/need_relink=no/" apr/build/ltmain.sh
perl -pi.bak -e "s/need_relink=yes/need_relink=no/"
apr-util/xml/expat/conftools/ltmain.sh
+### Force db 4.2
+perl -pi.bak -e 's/db([\-_])4([\._])0/db${1}4${2}2/' apr/configure
+perl -pi.bak -e 's/db([\-_])4([\._])0/db${1}4${2}2/' apr-util/configure
<<
SetLIBS: -L%p/lib
@@ -29,18 +32,10 @@
ConfigureParams: --libexecdir='${prefix}/lib/apr-0' --datadir='${prefix}/share/apr-0'
--sysconfdir='${prefix}/etc/apr-0' --sharedstatedir='${prefix}/share/apr-0'
--includedir='${prefix}/include/apr-0' --mandir='${prefix}/share/man'
--infodir='${prefix}/share/info' --with-expat=%p --with-dbm=db4 --with-ldap
SetCPPFLAGS: -no-cpp-precomp
CompileScript: <<
- #!/bin/sh
- cd apr
- #./buildconf
- perl -pi.bak -e "s/hardcode_direct=yes/hardcode_direct=no/" configure
- ./configure %c
- make
-
- cd ../apr-util
- #./buildconf
- perl -pi.bak -e 's/db([\-_])4([\._])0/db${1}4${2}1/' configure
- ./configure %c --with-apr=%b/apr --with-ldap
- make
+ cd apr; ./configure %c
+ cd apr; make
+ cd apr-util; ./configure %c --with-apr=%b/apr
+ cd apr-util; make
<<
# Install Phase:
@@ -50,7 +45,7 @@
cd apr-util; make install prefix=%i
<<
SplitOff: <<
- Depends: expat-shlibs (>= 1.95.3-1), gdbm3-shlibs, db41-ssl-shlibs (>= 4.1.25-15),
openldap-ssl-shlibs (>= 2.1.22-13)
+ Depends: expat-shlibs (>= 1.95.3-1), gdbm3-shlibs, db42-ssl-shlibs (>= 4.2.52-2),
openldap-ssl-shlibs (>= 2.1.22-14)
Conflicts: apr-shlibs, svn-client (<< 0.14.3-1), apache2 (<< 2.0.47-1)
Replaces: apr-shlibs
Package: %N-shlibs
@@ -80,6 +75,6 @@
but hardcoding the /sw/lib path in the link command (i.e. %p) instead
of using %i (Thanks to Max Horn for fixing this)
-Also apr was looking for db-4.0 by default. Patched to use db-4.1.
+Also apr was looking for db-4.0 by default. Patched to use db-4.2
<<
Homepage: http://apr.apache.org/
Index: apache2-ssl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.2-gcc3.3/unstable/crypto/finkinfo/apache2-ssl.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- apache2-ssl.info 18 Nov 2003 10:00:19 -0000 1.3
+++ apache2-ssl.info 24 Mar 2004 18:22:05 -0000 1.4
@@ -1,11 +1,11 @@
Package: apache2-ssl
Version: 2.0.48
-Revision: 2
+Revision: 5
###
Conflicts: apache, apache2
Replaces: apache, apache2
Provides: httpd
-BuildDepends: gawk, apr-ssl (>= 0.9.5-1), cyrus-sasl2-dev (>= 2.1.15-11), db41-ssl
(>= 4.1.25-15), expat (>= 1.95.6-2), gdbm3, openldap-ssl (>= 2.1.22-13), dlcompat-dev
+BuildDepends: gawk, apr-ssl (>= 0.9.5-2), cyrus-sasl2-dev (>= 2.1.15-13), db42-ssl
(>= 4.2.52-2), expat (>= 1.95.6-2), gdbm3, openldap-ssl (>= 2.1.22-14), dlcompat-dev
Depends: %N-mpm-worker (= %v-%r) | %N-mpm-perchild (= %v-%r) | %N-mpm-prefork (=
%v-%r) | %N-mpm-leader (= %v-%r) | %N-mpm-threadpool (= %v-%r), %N-common (= %v-%r)
###
CustomMirror: <<
@@ -86,6 +86,7 @@
install -m 664 httpd.conf.fink %i/etc/apache2/httpd.conf
rm -rf %i/etc/apche2/httpd-std.conf
install -m 664 httpd-std.conf.fink %i/etc/apache2/httpd-std.conf
+ install -m 664 httpd-server.conf.fink %i/etc/apache2/httpd-server.conf
install -d -m 755 %i/var/apache2/conf/ssl.crt
install -m 644 ../mod_ssl-2.8.15-1.3.28/pkg.sslcfg/*.c* %i/var/apache2/conf/ssl.crt/
install -m 644 ../mod_ssl-2.8.15-1.3.28/pkg.sslcfg/*.C* %i/var/apache2/conf/ssl.crt/
@@ -103,7 +104,7 @@
SplitOff: <<
Package: %N-common
Description: Apache2 Common Files (conf, icon, etc)
- Depends: daemonic, cyrus-sasl2-shlibs (>= 2.1.15-11), db41-ssl-shlibs (>=
4.1.25-15), expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, apr-ssl-shlibs (>= 0.9.5-1),
openldap-ssl-shlibs (>= 2.1.22-13), dlcompat-shlibs
+ Depends: daemonic, cyrus-sasl2-shlibs (>= 2.1.15-13), db42-ssl-shlibs (>=
4.2.52-2), expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, apr-ssl-shlibs (>= 0.9.5-2),
openldap-ssl-shlibs (>= 2.1.22-14), dlcompat-shlibs
Replaces: apache2 (<= 2.0.47-1), apache, apache2-common, apache2-ssl-dev (<=
2.0.47-4)
Conflicts: apache2 (<= 2.0.47-1), apache, apache2-common
Files: <<
@@ -169,6 +170,7 @@
%p/etc/apache2/highperformance-std.conf
%p/etc/apache2/highperformance.conf
%p/etc/apache2/httpd-std.conf
+ %p/etc/apache2/httpd-server.conf
%p/etc/apache2/httpd.conf
%p/etc/apache2/magic
%p/etc/apache2/mime.types
@@ -189,7 +191,6 @@
<<
PreInstScript: <<
if [ -f %p/etc/apache2/httpd.conf ]; then
- a=foo
echo ""
echo "WARNING: the modules and base directory have changed. This will"
echo " affect the logs, htdocs, cgi-bin, etc directories. You"
@@ -197,25 +198,19 @@
echo " conf file update prompt, or by updating your current conf"
echo " conf files to reflect the changes."
echo ""
- while [ "$a" = "foo" ]; do
- echo -n "Do you want to continue [Y/n] ? "
- read a
- case $a in
- Y*) a=y;;
- y*) a=y;;
- N*) a=n;;
- n*) a=n;;
- *) a=foo
- echo "===> Try again!";;
- esac
- done
- if [ "$a" = "n" ]; then
- exit 1
- fi
+ echo -n "Do you want to continue [Y/n] ? ";
+ read CONTINUECHOICE
+ case $CONTINUECHOICE in
+ y|Y|'' ) ;;
+ * ) exit 1 ;;
+ esac
fi
-
exit 0
<<
+ DescPort: <<
+ If you are running OSX Server copy %p/etc/apache2/httpd-server.conf to
+ %p/etc/apache2/httpd.conf.
+ <<
<<
###
SplitOff2: <<
@@ -1049,6 +1044,7 @@
###
SplitOff25: <<
Package: %N-mpm-prefork
+ Provides: %N-nothread
Description: Apache2 Server Binary - [MPM PREFORK]
DescDetail: <<
Implements a non-threaded, pre-forking web server
@@ -1060,7 +1056,7 @@
non-thread-safe libraries. It is also the best MPM for isolating each
request, so that a problem with a single request will not affect any other.
<<
- Depends: cyrus-sasl2-shlibs (>= 2.1.15-11), db41-ssl-shlibs (>= 4.1.25-15),
apr-ssl-shlibs (>= 0.9.5-1), openldap-ssl-shlibs (>= 2.1.22-13), %N-common (= %v-%r),
expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, dlcompat-shlibs
+ Depends: cyrus-sasl2-shlibs (>= 2.1.15-13), db42-ssl-shlibs (>= 4.2.52-2),
apr-ssl-shlibs (>= 0.9.5-2), openldap-ssl-shlibs (>= 2.1.22-14), %N-common (= %v-%r),
expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, dlcompat-shlibs
Replaces: apache2 (<= 2.0.47-1), apache, %N-mpm-worker, %N-mpm-perchild,
%N-mpm-leader, %N-mpm-threadpool, apache2-mpm-worker, apache2-mpm-perchild,
apache2-mpm-leader, apache2-mpm-threadpool, apache2-mpm-prefork
Conflicts: apache2 (<= 2.0.47-1), apache, %N-mpm-worker, %N-mpm-perchild,
%N-mpm-leader, %N-mpm-threadpool, apache2-mpm-worker, apache2-mpm-perchild,
apache2-mpm-leader, apache2-mpm-threadpool, apache2-mpm-prefork
Files: <<
@@ -1108,7 +1104,7 @@
This mpm is still highly experimental, and should be used with care.
<<
- Depends: cyrus-sasl2-shlibs (>= 2.1.15-11), db41-ssl-shlibs (>= 4.1.25-15),
apr-ssl-shlibs (>= 0.9.5-1), openldap-ssl-shlibs (>= 2.1.22-13), %N-common (= %v-%r),
expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, dlcompat-shlibs
+ Depends: cyrus-sasl2-shlibs (>= 2.1.15-13), db42-ssl-shlibs (>= 4.2.52-2),
apr-ssl-shlibs (>= 0.9.5-2), openldap-ssl-shlibs (>= 2.1.22-14), %N-common (= %v-%r),
expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, dlcompat-shlibs
Replaces: apache2 (<= 2.0.47-1), apache, %N-mpm-worker, %N-mpm-prefork,
%N-mpm-leader, %N-mpm-threadpool, apache2-mpm-worker, apache2-mpm-perchild,
apache2-mpm-leader, apache2-mpm-threadpool, apache2-mpm-prefork
Conflicts: apache2 (<= 2.0.47-1), apache, %N-mpm-worker, %N-mpm-perfork,
%N-mpm-leader, %N-mpm-threadpool, apache2-mpm-worker, apache2-mpm-perchild,
apache2-mpm-leader, apache2-mpm-threadpool, apache2-mpm-prefork
Files: <<
@@ -1143,7 +1139,7 @@
process-based server by keeping multiple processes available, each with
many threads.
<<
- Depends: cyrus-sasl2-shlibs (>= 2.1.15-11), db41-ssl-shlibs (>= 4.1.25-15),
apr-ssl-shlibs (>= 0.9.5-1), openldap-ssl-shlibs (>= 2.1.22-13), %N-common (= %v-%r),
expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, dlcompat-shlibs
+ Depends: cyrus-sasl2-shlibs (>= 2.1.15-13), db42-ssl-shlibs (>= 4.2.52-2),
apr-ssl-shlibs (>= 0.9.5-2), openldap-ssl-shlibs (>= 2.1.22-14), %N-common (= %v-%r),
expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, dlcompat-shlibs
Replaces: apache2 (<= 2.0.47-1), apache, %N-mpm-prefork, %N-mpm-perchild,
%N-mpm-leader, %N-mpm-threadpool, apache2-mpm-worker, apache2-mpm-perchild,
apache2-mpm-leader, apache2-mpm-threadpool, apache2-mpm-prefork
Conflicts: apache2 (<= 2.0.47-1), apache, %N-mpm-prefork, %N-mpm-perchild,
%N-mpm-leader, %N-mpm-threadpool, apache2-mpm-worker, apache2-mpm-perchild,
apache2-mpm-leader, apache2-mpm-threadpool, apache2-mpm-prefork
Files: <<
@@ -1175,7 +1171,7 @@
received as much testing. An experimental variant of the standard worker
MPM.
<<
- Depends: cyrus-sasl2-shlibs (>= 2.1.15-11), db41-ssl-shlibs (>= 4.1.25-15),
apr-ssl-shlibs (>= 0.9.5-1), openldap-ssl-shlibs (>= 2.1.22-13), %N-common (= %v-%r),
expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, dlcompat-shlibs
+ Depends: cyrus-sasl2-shlibs (>= 2.1.15-13), db42-ssl-shlibs (>= 4.2.52-2),
apr-ssl-shlibs (>= 0.9.5-2), openldap-ssl-shlibs (>= 2.1.22-14), %N-common (= %v-%r),
expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, dlcompat-shlibs
Replaces: apache2 (<= 2.0.47-1), apache, %N-mpm-worker, %N-mpm-perchild,
%N-mpm-prefork, %N-mpm-threadpool, apache2-mpm-worker, apache2-mpm-perchild,
apache2-mpm-leader, apache2-mpm-threadpool, apache2-mpm-prefork
Conflicts: apache2 (<= 2.0.47-1), apache, %N-mpm-worker, %N-mpm-perchild,
%N-mpm-prefork, %N-mpm-threadpool, apache2-mpm-worker, apache2-mpm-perchild,
apache2-mpm-leader, apache2-mpm-threadpool, apache2-mpm-prefork
Files: <<
@@ -1218,7 +1214,7 @@
threadpool code is useful primarily as a research platform. For
general-purpose use and for any production environments, use worker instead.
<<
- Depends: cyrus-sasl2-shlibs (>= 2.1.15-11), db41-ssl-shlibs (>= 4.1.25-15),
apr-ssl-shlibs (>= 0.9.5-1), openldap-ssl-shlibs (>= 2.1.22-13), %N-common (= %v-%r),
expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, dlcompat-shlibs
+ Depends: cyrus-sasl2-shlibs (>= 2.1.15-13), db42-ssl-shlibs (>= 4.2.52-2),
apr-ssl-shlibs (>= 0.9.5-2), openldap-ssl-shlibs (>= 2.1.22-14), %N-common (= %v-%r),
expat-shlibs (>= 1.95.6-2), gdbm3-shlibs, dlcompat-shlibs
Replaces: apache2 (<= 2.0.47-1), apache, %N-mpm-worker, %N-mpm-perchild,
%N-mpm-leader, %N-mpm-prefork, apache2-mpm-worker, apache2-mpm-perchild,
apache2-mpm-leader, apache2-mpm-threadpool, apache2-mpm-prefork
Conflicts: apache2 (<= 2.0.47-1), apache, %N-mpm-worker, %N-mpm-perchild,
%N-mpm-leader, %N-mpm-prefork, apache2-mpm-worker, apache2-mpm-perchild,
apache2-mpm-leader, apache2-mpm-threadpool, apache2-mpm-prefork
Files: <<
@@ -1384,4 +1380,4 @@
<<
License: BSD
Homepage: http://www.apache.org
-Maintainer: Sonic McTails <[EMAIL PROTECTED]>, Dustin Sias <[EMAIL PROTECTED]>
+Maintainer: None <[EMAIL PROTECTED]>
Index: apache2-ssl.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.2-gcc3.3/unstable/crypto/finkinfo/apache2-ssl.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- apache2-ssl.patch 18 Nov 2003 10:00:20 -0000 1.3
+++ apache2-ssl.patch 24 Mar 2004 18:22:05 -0000 1.4
@@ -2449,3 +2449,1115 @@
fi
if test -n "$old_archive_from_expsyms_cmds"; then
+diff -ruN httpd-2.0.48.orig/httpd-server.conf.fink httpd-2.0.48/httpd-server.conf.fink
+--- httpd-2.0.48.orig/httpd-server.conf.fink Wed Dec 31 17:00:00 1969
++++ httpd-2.0.48/httpd-server.conf.fink Fri Oct 31 10:33:25 2003
+@@ -0,0 +1,1108 @@
++#
++# Based upon the NCSA server configuration files originally by Rob McCool.
++#
++# This is the main Apache server configuration file. It contains the
[...1084 lines suppressed...]
++# configuration.
++
++#
++# Use name-based virtual hosting.
++#
++#NameVirtualHost *
++
++#
++# VirtualHost example:
++# Almost any Apache directive may go into a VirtualHost container.
++# The first VirtualHost section is used for requests without a known
++# server name.
++#
++#<VirtualHost *>
++# ServerAdmin [EMAIL PROTECTED]
++# DocumentRoot /www/docs/dummy-host.example.com
++# ServerName dummy-host.example.com
++# ErrorLog logs/dummy-host.example.com-error_log
++# CustomLog logs/dummy-host.example.com-access_log common
++#</VirtualHost>
Index: php4-apache2-ssl.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.2-gcc3.3/unstable/crypto/finkinfo/php4-apache2-ssl.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- php4-apache2-ssl.info 31 Dec 2003 16:33:14 -0000 1.6
+++ php4-apache2-ssl.info 24 Mar 2004 18:22:06 -0000 1.7
@@ -1,9 +1,9 @@
Package: php4-apache2-ssl
-Version: 4.3.3
-Revision: 12
+Version: 4.3.4
+Revision: 3
###
Depends: libapache2-ssl-mod-php4 | %N-cgi
-BuildDepends: apr-ssl (>= 0.9.4-4), libtool14, gettext-dev, libiconv-dev,
dlcompat-dev, gd2, mysql12-dev, postgresql73-ssl-dev, curl-ssl-dev, expat, libmhash
(>= 0.8.18-2), libmcve (>= 3.2-1), libmcrypt, libxml2, libxslt, openldap-ssl-dev (>=
2.1.22-3), uw-imap-c-client-ssl (>= 2002d-3), libsablot-dev, ming, t1lib1, pcre (>=
4.3-1), libpng3, freetype2 | freetype2-hinting, apache2-ssl-dev (>= 2.0.47-5),
unixodbc2 | unixodbc2-nox, gdbm3, net-snmp-ssl (>= 5.0.7-2), net-snmp-ssl-dev (>=
5.0.7-2), db3, libtiff, pdflib, x11-dev
+BuildDepends: apr-ssl (>= 0.9.5-2), libtool14, gettext-dev, libiconv-dev, gd2,
mysql12-dev, postgresql73-ssl-dev, curl-ssl-dev, expat, libmhash (>= 0.8.18-2),
libmcve (>= 3.2.2-1), libmcrypt, libxml2, libxslt, openldap-ssl-dev (>= 2.1.22-14),
uw-imap-c-client-ssl (>= 2002d-3), libsablot-dev, ming, t1lib1, pcre (>= 4.3-1),
libpng3, apache2-ssl-dev (>= 2.0.48-5), unixodbc2 | unixodbc2-nox, gdbm3, net-snmp-ssl
(>= 5.0.7-2), net-snmp-ssl-dev (>= 5.0.7-2), db42-ssl, libtiff, pdflib, x11-dev,
system-java13-dev, gmp, mnogosearch-dev, dlcompat-dev, freetype2 | freetype2-hinting
Replaces: php4-apache2, php4-apache, php4-apache-ssl
Conflicts: php4-apache2, php4-apache, php4-apache-ssl
Provides: php4-ssl
@@ -68,22 +68,55 @@
<<
###
Source: mirror:custom:distributions/php-%v.tar.bz2
-Source-MD5: 1171d96104e2ff2cff9e19789a4a1536
+Source-MD5: b9dd601863e08e52e3c4d5e02c2627cf
+Source2: ftp://ftp.cac.washington.edu/imap/old/imap-2002d.tar.Z
+Source2-MD5: 64e82a195d21481fc4c54c4ed9fe0527
###
PatchScript: <<
- ### Fix for gd/freetype and to make shared imap module
+ ### Fix c-client
+ ### Remove interactive question
+ cd ../imap-2002d; perl -pi -e 's,[EMAIL PROTECTED] Do you want to continue this
build anyway\? Type y or n please\:,[EMAIL PROTECTED] Do you want to continue this
build anyway\? Type y or n please\:\nnone:\n,g' Makefile
+ ### use Fink's spools
+ cd ../imap-2002d; perl -pi -e 's,SPOOLDIR=/var/spool
MAILSPOOL=/var/mail,SPOOLDIR=%p/var/spool MAILSPOOL=%p/var/mail,g'
src/osdep/unix/Makefile
+
+ ### Fix php4
+ ### Fix for gd/freetype
sed 's|@FINKPREFIX@|%p|g' < %a/%n.patch | patch -p1
+ ### Add c-client objects to imap module
+
+ ### Fix php-config for php4 dir structure
+ perl -pi -e 's,php,php4,g' scripts/php-config.in
+ ### Fix for bison
+ perl -pi -e 's,bison -,/usr/bin/bison -,g' configure
+ perl -pi -e 's,bison -,/usr/bin/bison -,g' genfiles
+ perl -pi -e 's,bison -,/usr/bin/bison -,g' run-tests.php
+ perl -pi -e 's,bison -,/usr/bin/bison -,g' run-tests2.php
+ perl -pi -e 's,bison -,/usr/bin/bison -,g' makedist
+ perl -pi -e 's,bison -,/usr/bin/bison -,g' Zend/Zend.dsp
+ perl -pi -e 's,bison -,/usr/bin/bison -,g' Zend/Zend.m4
+ perl -pi -e 's,bison -,/usr/bin/bison -,g' Zend/ZendTS.dsp
+ perl -pi -e 's,bison -,/usr/bin/bison -,g' ext/w32api/w32api.dsp
+ perl -pi -e 's,bison -,/usr/bin/bison -,g' win32/php4dll.dsp
+ perl -pi -e 's,bison -,/usr/bin/bison -,g' win32/php4dllts.dsp
+ perl -pi -e 's,YACC=\"yacc\",YACC=\"/usr/bin/yacc\",g' configure
### Fix to allow finks xft2 or xfree4.3
- perl -pi -e 's,for i in /usr /usr/local \$PHP_FREETYPE_DIR; do,for i in /usr
/usr/local \$PHP_FREETYPE_DIR %p /usr/X11R6; do,g' configure
+ perl -pi -e 's,for i in \$PHP_FREETYPE_DIR /usr/local /usr; do,for i in
\$PHP_FREETYPE_DIR %p /usr/X11R6 /usr/local /usr; do,g' configure
### Fix relink
perl -pi -e 's,need_relink=yes,need_relink=no,g' ltmain.sh
### Fix for Java module
- perl -pi -e 's,\\\$\(JAVA_SHARED_LIBADD\),\\\$\(PHP_FRAMEWORKS\)
\\\$\(JAVA_SHARED_LIBADD\),g' configure
- perl -pi -e 's,DL_FETCH_SYMBOL\(dl_handle\,
\"JNI_CreateJavaVM\"\),DL_FETCH_SYMBOL\(dl_handle\, \"_JNI_CreateJavaVM_Impl\"\),g'
ext/java/java.c
- perl -pi -e 's,DL_FETCH_SYMBOL\(dl_handle\,
\"JNI_GetDefaultJavaVMInitArgs\"\),DL_FETCH_SYMBOL\(dl_handle\,
\"_JNI_GetDefaultJavaVMInitArgs_Impl\"\),g' ext/java/java.c
+ perl -pi -e 's;-framework (.+);-Wl,-framework -Wl,$1;g' configure
+ perl -pi -e 's,library=php_java,library=java,g' ext/java/Makefile.frag
+ perl -pi -e 's,\\\$\(JAVA_SHARED_LIBADD\),\\\$\(PHP_FRAMEWORKS\)
\\\$\(JAVA_SHARED_LIBADD\) -ldl,g' configure
+# perl -pi -e 's,DL_FETCH_SYMBOL\(dl_handle\,
\"JNI_CreateJavaVM\"\),DL_FETCH_SYMBOL\(dl_handle\, \"JNI_CreateJavaVM_Impl\"\),g'
ext/java/java.c
+# perl -pi -e 's,DL_FETCH_SYMBOL\(dl_handle\,
\"JNI_GetDefaultJavaVMInitArgs\"\),DL_FETCH_SYMBOL\(dl_handle\,
\"JNI_GetDefaultJavaVMInitArgs_Impl\"\),g' ext/java/java.c
+ ### Add db-4.2 support
+ perl -pi -e 's,db-4.1,db-4.2,g' configure
+ ### Fix for PEAR
+ perl -pi -e 's,PHP=php,PHP=php4,g' pear/scripts/pear.in
+ perl -pi -e 's,PHP=php,PHP=php4,g' pear/scripts/pear.sh
<<
### Fix for 10.3 dns stuff & apr & snmp & java
-SetCFLAGS: -DBIND_8_COMPAT -I%p/include/apr-0
-I/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Headers
+SetCFLAGS: -DBIND_8_COMPAT -I%p/include/apr-0
### Fix to directly link dlcompat
SetLIBS: -ldl
###
@@ -94,24 +127,34 @@
Zend/LICENSE:LICENSE.Zend TSRM/LICENSE:LICENSE.TSRM
<<
###
-ConfigureParams: --enable-debug --enable-memory-limit --with-layout=GNU
--enable-calendar --disable-sysvsem --disable-sysvshm --enable-track-vars
--enable-trans-sid --enable-bcmath --with-bz2=%p --enable-ctype --with-iconv=%p
--enable-exif --enable-flatfile --enable-filepro --enable-ftp --with-gettext=%p
--enable-mbstring --with-pcre-regex=%p --enable-shmop --enable-sockets --enable-wddx
--disable-xml --with-expat-dir=%p --enable-yp --with-zlib --with-kerberos=/usr
--with-openssl=%p --without-sybase-ct --with-regex=php --disable-rpath
--disable-static --with-exec-dir=%p/lib/php4/libexec --mandir=%i/share/man
+ConfigureParams: --enable-debug --enable-safe-mode --enable-memory-limit
--with-layout=GNU --enable-calendar --disable-sysvsem --disable-sysvshm
--enable-track-vars --enable-trans-sid --enable-bcmath --with-bz2=%p --enable-ctype
--with-iconv=%p --enable-exif --enable-flatfile --enable-filepro --enable-ftp
--with-gettext=%p --enable-mbstring --enable-shmop --enable-sockets --enable-wddx
--disable-xml --with-expat-dir=%p --enable-yp --with-zlib --with-kerberos=/usr
--with-openssl --without-sybase-ct --with-regex=php --disable-rpath --disable-static
--with-exec-dir=%p/lib/php4/libexec --mandir=%i/share/man
###
CompileScript: <<
-### Configure for apache2
+ ### Build c-client objects
+ cd ../imap-2002d; make osx SSLTYPE=unix SSLDIR=%p SSLCERTS=%p/etc/ssl
EXTRACFLAGS=-fno-common
+
+ ### Configure for apache2
if [ -d apache-build ]; then rm -rf apache-build; fi
mkdir -p apache-build
mkdir -p apache-build/ext/dba/libcdb
mkdir -p apache-build/ext/dba/libflatfile
- cd apache-build; ../configure %c --with-apxs2=%p/sbin/apxs
--with-config-file-path=%p/etc/php4/apache2 --with-imap-ssl=%p --enable-xslt
--with-db3=%p --enable-dba --with-gdbm=%p --enable-dbx --without-mm
--with-zlib-dir=/usr --with-mcve=shared,%p --with-curl=shared,%p --with-dom=shared,%p
--with-dom-xslt=%p --with-dom-exslt=%p --with-xslt-sablot=%p --with-gd=shared,%p
--with-tiff-dir=%p --with-jpeg-dir=%p --with-xpm-dir=shared,/usr/X11R6
--with-png-dir=%p --with-freetype-dir=shared --with-imap=shared,%p/share/c-client
--with-ldap=shared,%p --without-mcal --with-mhash=shared,%p --with-mcrypt=shared,%p
--with-ming=%p --with-mysql=shared,%p --with-pgsql=shared,%p --with-unixODBC=shared,%p
--without-recode --with-t1lib=%p --with-pdflib=shared,%p --with-ttf=%p
--with-snmp=shared,%p --enable-ucd-snmp-hack
--with-java=shared,/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home
+ cd apache-build; YACC="/usr/bin/bison -y" ../configure %c --with-apxs2=%p/sbin/apxs
--with-config-file-path=%p/etc/php4/apache2 --with-imap-ssl=%p --enable-xslt
--with-db4=%p --enable-dba --with-gdbm=%p --enable-dbx --without-mm
--with-zlib-dir=/usr --with-mnogosearch=shared,%p --with-gmp=shared,%p
--with-mcve=shared,%p --with-curl=shared,%p --with-dom=shared,%p --with-dom-xslt=%p
--with-dom-exslt=%p --with-xslt-sablot=%p --with-gd=shared,%p --with-tiff-dir=%p
--with-jpeg-dir=%p --with-xpm-dir=shared,/usr/X11R6 --with-png-dir=%p
--with-freetype-dir=shared --with-imap=shared,%p/share/c-client --with-ldap=shared,%p
--without-mcal --with-mhash=shared,%p --with-mcrypt=shared,%p --with-ming=%p
--with-mysql=shared,%p --with-pgsql=shared,%p --with-unixODBC=shared,%p
--without-recode --with-t1lib=%p --with-pdflib=shared,%p --with-ttf=%p
--with-snmp=shared,%p --enable-ucd-snmp-hack --with-java=shared
+
+ ### Fix for dlcompat
+ perl -pi -e 's,#define HAVE_MACH_O_DYLD_H 1,#undef HAVE_MACH_O_DYLD_H,g'
apache-build/main/php_config.h
### Configure for cgi
if [ -d cgi-build ]; then rm -rf cgi-build; fi
mkdir -p cgi-build
- cd cgi-build; ../configure %c --enable-force-cgi-redirect
--with-config-file-path=%p/etc/php4/cgi --without-mm --without-mysql --without-pgsql
+ cd cgi-build; YACC="/usr/bin/bison -y" ../configure %c --enable-force-cgi-redirect
--with-config-file-path=%p/etc/php4/cgi --without-mm --without-mysql --without-pgsql
- ### Fix for java build
- perl -pi -e 's,#define HAVE_JAVAVM_JAVAVM_H 1,#undef HAVE_JAVAVM_JAVAVM_H,g'
apache-build/main/php_config.h
- cp -R ext/java/* apache-build/ext/java
+ ### Fix for dlcompat
+ perl -pi -e 's,#define HAVE_MACH_O_DYLD_H 1,#undef HAVE_MACH_O_DYLD_H,g'
cgi-build/main/php_config.h
+
+ ### copy objects to ext/imap dir for linking
+ for i in dummy fdstring flstring imap4r1 mail mbox mbx mh misc mmdf mtx mx netmsg
news newsrc nntp osdep phile pop3 pseudo rfc822 siglocal smanager smtp tenex unix
utf8; do ln -s %b/../imap-2002d/c-client/$i.o %b/apache-build/ext/imap/$i.lo; done
+
+ perl -pi -e 's,-lc-client,ext/imap/osdep.lo ext/imap/mail.lo ext/imap/misc.lo
ext/imap/newsrc.lo ext/imap/smanager.lo ext/imap/utf8.lo ext/imap/siglocal.lo
ext/imap/dummy.lo ext/imap/pseudo.lo ext/imap/netmsg.lo ext/imap/flstring.lo
ext/imap/fdstring.lo ext/imap/rfc822.lo ext/imap/nntp.lo ext/imap/smtp.lo
ext/imap/imap4r1.lo ext/imap/pop3.lo ext/imap/unix.lo ext/imap/mbox.lo ext/imap/mbx.lo
ext/imap/mmdf.lo ext/imap/tenex.lo ext/imap/mtx.lo ext/imap/news.lo ext/imap/phile.lo
ext/imap/mh.lo ext/imap/mx.lo,g' apache-build/Makefile
### Make for apache2
cd apache-build; make
@@ -136,8 +179,8 @@
### Added java config to php.ini
perl -pi -e 's,;java.class.path = .\\php_java.jar,java.class.path =
%p/share/java/%N-java/php_java.jar,g' php.ini-dist
- perl -pi -e 's,;java.home = c:\\jdk,java.home =
/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home,g' php.ini-dist
- perl -pi -e 's,;java.library = c:\\jdk\\jre\\bin\\hotspot\\jvm.dll,java.library =
/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Libraries/libjvm.dylib,g'
php.ini-dist
+ perl -pi -e 's,;java.home = c:\\jdk,java.home =
/System/Library/Frameworks/JavaVM.framework/Home,g' php.ini-dist
+ perl -pi -e 's,;java.library = c:\\jdk\\jre\\bin\\hotspot\\jvm.dll,java.library =
/System/Library/Frameworks/JavaVM.framework/Libraries/libjvm_compat.dylib,g'
php.ini-dist
perl -pi -e 's,;java.library.path = .\\,java.library.path = %p/share/java,g'
php.ini-dist
<<
###
@@ -180,11 +223,14 @@
### Remove un needed files
rm %i/lib/php4/20020429/*.a
+
+ ### Fix pear
+ perl -pi -e 's,bin/php,bin/php4,g' %i/bin/pear
<<
###
SplitOff: <<
Package: libapache2-ssl-mod-php4
- Depends: apache2-ssl (>= 2.0.47-5), libsablot-shlibs, pcre-shlibs (>= 4.3-1),
ming-shlibs, bzip2-shlibs, openssl097-shlibs, dlcompat-shlibs, db3-shlibs
+ Depends: apache2-ssl (>= 2.0.48-5), apache2-ssl-nothread, libsablot-shlibs,
pcre-shlibs (>= 4.3-1), ming-shlibs, bzip2-shlibs, openssl097-shlibs, db42-ssl-shlibs,
dlcompat-shlibs
Replaces: libapache2-mod-php4, libapache-ssl-mod-php4, libapache-mod-php4
Conflicts: libapache2-mod-php4, libapache-ssl-mod-php4, libapache-mod-php4
ConfFiles: %p/etc/php4/apache2/php.ini
@@ -237,7 +283,7 @@
<<
SplitOff2: <<
Package: %N-cgi
- Depends: expat-shlibs, pcre-shlibs (>= 4.3-1), bzip2-shlibs, openssl097-shlibs,
dlcompat-shlibs, db3-shlibs
+ Depends: expat-shlibs, pcre-shlibs (>= 4.3-1), bzip2-shlibs, openssl097-shlibs,
db42-ssl-shlibs, dlcompat-shlibs
Conflicts: php4-apache2-cgi, php4-apache-ssl-cgi, php4-apache-cgi
Replaces: php4-apache2-cgi, php4-apache-ssl-cgi, php4-apache-cgi
Provides: php4-ssl-cgi
@@ -459,7 +505,7 @@
<<
SplitOff7: <<
Package: %N-gd
- Depends: %N, gd2-shlibs, t1lib1-shlibs, freetype2-shlibs |
freetype2-hinting-shlibs, libpng3-shlibs, libjpeg-shlibs, x11
+ Depends: %N, gd2-shlibs, t1lib1-shlibs, libpng3-shlibs, libjpeg-shlibs, x11,
freetype2-shlibs | freetype2-hinting-shlibs
Conflicts: php4-apache2-gd, php4-apache-ssl-gd, php4-apache-gd
Replaces: php4-apache2-gd, php4-apache-ssl-gd, php4-apache-gd
Provides: php4-ssl-gd
@@ -537,7 +583,7 @@
Provides: php4-ssl-imap
Files: lib/php4/20020429/imap.so
DocFiles: LICENSE
- Description: IMAP module for php4 (EXPERIMENTAL - does not work)
+ Description: IMAP module for php4
DescDetail: <<
This package provides a module for IMAP functions in PHP scripts.
.
@@ -602,7 +648,7 @@
<<
SplitOff9: <<
Package: %N-ldap
- Depends: %N, openldap-ssl-shlibs (>= 2.1.22-3), db41-ssl-shlibs
+ Depends: %N, openldap-ssl-shlibs (>= 2.1.22-14), db42-ssl-shlibs
Conflicts: php4-apache2-ldap, php4-apache-ssl-ldap, php4-apache-ldap
Replaces: php4-apache2-ldap, php4-apache-ssl-ldap, php4-apache-ldap
Provides: php4-ssl-ldap
@@ -887,7 +933,7 @@
<<
SplitOff13: <<
Package: %N-odbc
- Depends: %N
+ Depends: %N, unixodbc2-shlibs
Conflicts: php4-apache2-odbc, php4-apache-ssl-odbc, php4-apache-odbc
Replaces: php4-apache2-odbc, php4-apache-ssl-odbc, php4-apache-odbc
Provides: php4-ssl-odbc
@@ -1037,7 +1083,7 @@
Provides: php4-ssl-snmp
Files: lib/php4/20020429/snmp.so
DocFiles: LICENSE
- Description: SNMP module for php4 (EXPERIMENTAL)
+ Description: SNMP module for php4
DescDetail: <<
This package provides a module for SNMP functions in PHP scripts.
.
@@ -1102,7 +1148,7 @@
<<
SplitOff16: <<
Package: %N-java
- Depends: %N
+ Depends: %N, system-java13
Conflicts: php4-apache2-java, php4-apache-ssl-java, php4-apache-java
Replaces: php4-apache2-java, php4-apache-ssl-java, php4-apache-java
Provides: php4-ssl-java
@@ -1177,7 +1223,7 @@
<<
SplitOff17: <<
Package: %N-mcve
- Depends: %N, libmcve-shlibs (>= 3.2-1)
+ Depends: %N, libmcve-shlibs (>= 3.2.2-1)
Conflicts: php4-apache2-mcve, php4-apache-ssl-mcve, php4-apache-mcve
Replaces: php4-apache2-mcve, php4-apache-ssl-mcve, php4-apache-mcve
Provides: php4-ssl-mcve
@@ -1317,6 +1363,148 @@
exit 0
<<
<<
+SplitOff19: <<
+ Package: %N-gmp
+ Depends: %N, gmp-shlibs
+ Conflicts: php4-apache2-gmp, php4-apache-ssl-gmp, php4-apache-gmp
+ Replaces: php4-apache2-gmp, php4-apache-ssl-gmp, php4-apache-gmp
+ Provides: php4-ssl-gmp
+ Files: lib/php4/20020429/gmp.so
+ DocFiles: LICENSE
+ Description: GNU MP module for php4
+ DescDetail: <<
+ This package provides a module for GNU MP (gmp) functions in PHP scripts.
+ .
+ PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed
+ from C, Java and Perl with a couple of unique PHP-specific features thrown
+ in. The goal of the language is to allow web developers to write
+ dynamically generated pages quickly.
+ <<
+ PostInstScript: <<
+ module=gmp
+
+ for conf in apache apache2 cgi; do
+ if [ -f %p/etc/php4/$conf/php.ini ]; then
+ if ! grep -q
"^[[:space:]]*extension[[:space:]]*=[[:space:]]*%p/lib/php4/libexec/$module.so"
%p/etc/php4/$conf/php.ini; then
+ echo "You are installing \"$module\" support for php4, but it's not"
+ echo "enabled in your %p/etc/php4/$conf/php.ini."
+ echo
+ echo "To enable it you need to add this line:"
+ echo
+ echo "extension=%p/lib/php4/libexec/$module.so"
+ echo
+ echo -n "Do you want me to add it now [Y/n] ?"
+ read a
+ if ! echo $a | grep -iq ^n; then
+ echo "extension=%p/lib/php4/libexec/$module.so" >>
%p/etc/php4/$conf/php.ini
+ fi
+ fi
+ fi
+ done
+
+ exit 0
+ <<
+ PreRmScript: <<
+ module=gmp
+
+ if [ "$1" != "remove" -a "$1" != "purge" ]; then
+ exit 0
+ fi
+
+ for conf in apache apache2 cgi; do
+ if [ -f %p/etc/php4/$conf/php.ini ]; then
+ if grep -q
"^[[:space:]]*extension[[:space:]]*=[[:space:]]*%p/lib/php4/libexec/$module.so"
%p/etc/php4/$conf/php.ini; then
+ echo "You are removing \"$module\" support for php4, but it is still"
+ echo "enabled in your %p/etc/php4/$conf/php.ini."
+ echo
+ echo "You should remove this line:"
+ echo
+ echo "extension=%p/lib/php4/libexec/$module.so"
+ echo
+ echo -n "Do you want me to do it now [Y/n] ?"
+ read a
+ if ! echo $a | grep -iq ^n; then
+ cat %p/etc/php4/$conf/php.ini | grep -v
"^[[:space:]]*extension[[:space:]]*=[[:space:]]*%p/lib/php4/libexec/$module.so" >
%p/etc/php4/$conf/php.ini.$moduleremove
+ mv %p/etc/php4/$conf/php.ini.$moduleremove %p/etc/php4/$conf/php.ini
+ fi
+ fi
+ fi
+ done
+
+ exit 0
+ <<
+<<
+SplitOff20: <<
+ Package: %N-mnogosearch
+ Depends: %N, mnogosearch1-shlibs
+ Conflicts: php4-apache2-mnogosearch, php4-apache-ssl-mnogosearch,
php4-apache-mnogosearch
+ Replaces: php4-apache2-mnogosearch, php4-apache-ssl-mnogosearch,
php4-apache-mnogosearch
+ Provides: php4-ssl-mnogosearch
+ Files: lib/php4/20020429/mnogosearch.so
+ DocFiles: LICENSE
+ Description: Mnogosearch module for php4
+ DescDetail: <<
+ This package provides a module for mnogosearch functions in PHP scripts.
+ .
+ PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed
+ from C, Java and Perl with a couple of unique PHP-specific features thrown
+ in. The goal of the language is to allow web developers to write
+ dynamically generated pages quickly.
+ <<
+ PostInstScript: <<
+ module=mnogosearch
+
+ for conf in apache apache2 cgi; do
+ if [ -f %p/etc/php4/$conf/php.ini ]; then
+ if ! grep -q
"^[[:space:]]*extension[[:space:]]*=[[:space:]]*%p/lib/php4/libexec/$module.so"
%p/etc/php4/$conf/php.ini; then
+ echo "You are installing \"$module\" support for php4, but it's not"
+ echo "enabled in your %p/etc/php4/$conf/php.ini."
+ echo
+ echo "To enable it you need to add this line:"
+ echo
+ echo "extension=%p/lib/php4/libexec/$module.so"
+ echo
+ echo -n "Do you want me to add it now [Y/n] ?"
+ read a
+ if ! echo $a | grep -iq ^n; then
+ echo "extension=%p/lib/php4/libexec/$module.so" >>
%p/etc/php4/$conf/php.ini
+ fi
+ fi
+ fi
+ done
+
+ exit 0
+ <<
+ PreRmScript: <<
+ module=mnogosearch
+
+ if [ "$1" != "remove" -a "$1" != "purge" ]; then
+ exit 0
+ fi
+
+ for conf in apache apache2 cgi; do
+ if [ -f %p/etc/php4/$conf/php.ini ]; then
+ if grep -q
"^[[:space:]]*extension[[:space:]]*=[[:space:]]*%p/lib/php4/libexec/$module.so"
%p/etc/php4/$conf/php.ini; then
+ echo "You are removing \"$module\" support for php4, but it is still"
+ echo "enabled in your %p/etc/php4/$conf/php.ini."
+ echo
+ echo "You should remove this line:"
+ echo
+ echo "extension=%p/lib/php4/libexec/$module.so"
+ echo
+ echo -n "Do you want me to do it now [Y/n] ?"
+ read a
+ if ! echo $a | grep -iq ^n; then
+ cat %p/etc/php4/$conf/php.ini | grep -v
"^[[:space:]]*extension[[:space:]]*=[[:space:]]*%p/lib/php4/libexec/$module.so" >
%p/etc/php4/$conf/php.ini.$moduleremove
+ mv %p/etc/php4/$conf/php.ini.$moduleremove %p/etc/php4/$conf/php.ini
+ fi
+ fi
+ fi
+ done
+
+ exit 0
+ <<
+<<
###
Description: HTML-embedded server-side scripting language
DescDetail: <<
@@ -1350,4 +1538,4 @@
###
License: GPL
Homepage: http://www.php.net/
-Maintainer: Dustin Sias <[EMAIL PROTECTED]>
+Maintainer: None <[EMAIL PROTECTED]>
Index: php4-apache2-ssl.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.2-gcc3.3/unstable/crypto/finkinfo/php4-apache2-ssl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- php4-apache2-ssl.patch 26 Oct 2003 11:34:42 -0000 1.2
+++ php4-apache2-ssl.patch 24 Mar 2004 18:22:06 -0000 1.3
@@ -1,7 +1,7 @@
diff -ruN php-4.3.3.orig/configure php-4.3.3/configure
--- php-4.3.3.orig/configure Sun Aug 24 17:15:34 2003
+++ php-4.3.3/configure Thu Aug 28 21:30:26 2003
-@@ -88776,10 +88776,10 @@
+@@ -91109,10 +91109,10 @@
# cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes. Also zsh mangles
# `"' quotes if we put them in here... so don't!
@@ -49,467 +49,3 @@
/*********************************************************/
-diff -ruN php-4.3.3.orig/ext/pcre/php_pcre.c php-4.3.3/ext/pcre/php_pcre.c
---- php-4.3.3.orig/ext/pcre/php_pcre.c Sat Jun 28 18:08:29 2003
-+++ php-4.3.3/ext/pcre/php_pcre.c Thu Sep 4 19:46:47 2003
-@@ -2,7 +2,7 @@
- +----------------------------------------------------------------------+
- | PHP Version 4 |
- +----------------------------------------------------------------------+
-- | Copyright (c) 1997-2003 The PHP Group |
-+ | Copyright (c) 1997-2002 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 2.02 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
-@@ -16,7 +16,7 @@
- +----------------------------------------------------------------------+
- */
-
--/* $Id$ */
-+/* $Id$ */
-
- #ifdef HAVE_CONFIG_H
- #include "config.h"
-@@ -56,7 +56,6 @@
-
- static void php_pcre_free(void *ptr)
- {
-- if (ptr)
- pefree(ptr, 1);
- }
-
-@@ -64,7 +63,6 @@
- static void php_free_pcre_cache(void *data)
- {
- pcre_cache_entry *pce = (pcre_cache_entry *) data;
-- if (!pce) return;
- pefree(pce->re, 1);
- #if HAVE_SETLOCALE
- if ((void*)pce->tables) pefree((void*)pce->tables, 1);
-@@ -318,7 +316,7 @@
- /* }}} */
-
- /* {{{ add_offset_pair */
--static inline void add_offset_pair(zval *result, char *str, int len, int offset,
char *name)
-+static inline void add_offset_pair(zval *result, char *str, int len, int offset)
- {
- zval *match_pair;
-
-@@ -330,10 +328,6 @@
- add_next_index_stringl(match_pair, str, len, 1);
- add_next_index_long(match_pair, offset);
-
-- if (name) {
-- zval_add_ref(&match_pair);
-- zend_hash_update(Z_ARRVAL_P(result), name, strlen(name)+1,
&match_pair, sizeof(zval *), NULL);
-- }
- zend_hash_next_index_insert(Z_ARRVAL_P(result), &match_pair, sizeof(zval *),
NULL);
- }
- /* }}} */
-@@ -342,15 +336,11 @@
- */
- static void php_pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global)
- {
-- /* parameters */
-- char *regex; /* Regular expression
*/
-- char *subject; /* String to match against */
-- int regex_len;
-- int subject_len;
-- zval *subpats = NULL; /* Array for subpatterns */
-- int flags; /* Match
control flags */
--
-- zval *result_set, /* Holds a set of subpatterns
after
-+ zval **regex, /* Regular expression
*/
-+ **subject, /* String to
match against */
-+ **subpats = NULL, /* Array for
subpatterns */
-+ **flags, /* Match
control flags */
-+ *result_set, /* Holds a set of
subpatterns after
- a
global match */
- **match_sets = NULL; /* An array of sets of matches
for each
-
subpattern after a global match */
-@@ -362,56 +352,63 @@
- int *offsets; /* Array of
subpattern offsets */
- int num_subpats; /* Number of captured
subpatterns */
- int size_offsets; /* Size of the offsets
array */
-- int start_offset = 0; /* Where the new
search starts */
-+ int start_offset; /* Where the new
search starts */
- int matched; /* Has
anything matched */
-- int subpats_order = 0; /* Order of subpattern
matches */
-+ int i;
-+ int subpats_order = 0; /* Order of subpattern
matches */
- int offset_capture = 0;/* Capture match offsets:
yes/no */
- int g_notempty = 0; /* If the match should
not be empty */
-- const char **stringlist; /* Holds list of subpatterns */
-+ const char **stringlist; /* Used to hold list of
subpatterns */
- char *match; /* The current match */
-- char **subpat_names = NULL;/* Array for named subpatterns */
-- int i;
-
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|zll", ®ex,
®ex_len,
-- &subject, &subject_len,
&subpats, &flags, &start_offset) == FAILURE) {
-- RETURN_FALSE;
-- }
-
-- if (global)
-- subpats_order = PREG_PATTERN_ORDER;
--
-- if (ZEND_NUM_ARGS() > 3) {
-- offset_capture = flags & PREG_OFFSET_CAPTURE;
-- /*
-- * subpats_order is pre-set to pattern mode so we change it only if
-- * necessary.
-- */
-- if (flags & 0xff) {
-- subpats_order = flags & 0xff;
-- }
-- if ((global && (subpats_order < PREG_PATTERN_ORDER || subpats_order >
PREG_SET_ORDER)) ||
-- (!global && subpats_order != 0)) {
-- zend_error(E_WARNING, "Wrong value for parameter 4 in call to
%s()", get_active_function_name(TSRMLS_C));
-- return;
-- }
-+ /* Get function parameters and do error-checking. */
-+ switch(ZEND_NUM_ARGS()) {
-+ case 2:
-+ if (global || zend_get_parameters_ex(2, ®ex, &subject) ==
FAILURE) {
-+ WRONG_PARAM_COUNT;
-+ }
-+ break;
-+
-+ case 3:
-+ if (zend_get_parameters_ex(3, ®ex, &subject, &subpats) ==
FAILURE) {
-+ WRONG_PARAM_COUNT;
-+ }
-+ if (global)
-+ subpats_order = PREG_PATTERN_ORDER;
-+ break;
-+
-+ case 4:
-+ if (zend_get_parameters_ex(4, ®ex, &subject, &subpats,
&flags) == FAILURE) {
-+ WRONG_PARAM_COUNT;
-+ }
-+
-+ convert_to_long_ex(flags);
-+ offset_capture = Z_LVAL_PP(flags) & PREG_OFFSET_CAPTURE;
-+ subpats_order = Z_LVAL_PP(flags) & 0xff;
-+ if ((global && (subpats_order < PREG_PATTERN_ORDER ||
subpats_order > PREG_SET_ORDER)) ||
-+ (!global && subpats_order != 0)) {
-+ zend_error(E_WARNING, "Wrong value for parameter 4 in
call to %s()", get_active_function_name(TSRMLS_C));
-+ return;
-+ }
-+ break;
-+
-+ default:
-+ WRONG_PARAM_COUNT;
- }
-
-- /* Overwrite the passed-in value for subpatterns with an empty array. */
-- if (subpats != NULL) {
-- zval_dtor(subpats);
-- array_init(subpats);
-- }
-+ /* Make sure we're dealing with strings. */
-+ convert_to_string_ex(regex);
-+ convert_to_string_ex(subject);
-
-- /* Negative offset counts from the end of the string. */
-- if (start_offset < 0) {
-- start_offset = subject_len + start_offset;
-- if (start_offset < 0) {
-- start_offset = 0;
-- }
-+ /* Make sure to clean up the passed array and initialize it. */
-+ if (subpats != NULL) {
-+ zval_dtor(*subpats);
-+ array_init(*subpats);
- }
-
- /* Compile regex or get it from cache. */
-- if ((re = pcre_get_compiled_regex(regex, &extra, &preg_options)) == NULL) {
-+ if ((re = pcre_get_compiled_regex(Z_STRVAL_PP(regex), &extra, &preg_options))
== NULL) {
- RETURN_FALSE;
- }
-
-@@ -419,36 +416,11 @@
- pcre_fullinfo(re, extra, PCRE_INFO_CAPTURECOUNT, &num_subpats);
- num_subpats++;
- size_offsets = num_subpats * 3;
-- offsets = (int *)safe_emalloc(size_offsets, sizeof(int), 0);
-+ offsets = (int *)emalloc(size_offsets * sizeof(int));
-
-- /*
-- * Build a mapping from subpattern numbers to their names. We will always
-- * allocate the table, even though they may be no named subpatterns. This
-- * avoids somewhat more complicated logic in the inner loops.
-- */
-- subpat_names = (char **)safe_emalloc(num_subpats, sizeof(char *), 0);
-- memset(subpat_names, 0, sizeof(char *) * num_subpats);
-- {
-- int name_cnt, name_size, ni = 0;
-- char *name_table;
-- unsigned short name_idx;
--
-- pcre_fullinfo(re, extra, PCRE_INFO_NAMECOUNT, &name_cnt);
-- if (name_cnt > 0) {
-- pcre_fullinfo(re, extra, PCRE_INFO_NAMETABLE, &name_table);
-- pcre_fullinfo(re, extra, PCRE_INFO_NAMEENTRYSIZE, &name_size);
--
-- while (ni++ < name_cnt) {
-- name_idx = 0xff * name_table[0] + name_table[1];
-- subpat_names[name_idx] = name_table + 2;
-- name_table += name_size;
-- }
-- }
-- }
--
-- /* Allocate match sets array and initialize the values. */
-+ /* Allocate match sets array and initialize the values */
- if (global && subpats_order == PREG_PATTERN_ORDER) {
-- match_sets = (zval **)safe_emalloc(num_subpats, sizeof(zval *), 0);
-+ match_sets = (zval **)emalloc(num_subpats * sizeof(zval *));
- for (i=0; i<num_subpats; i++) {
- ALLOC_ZVAL(match_sets[i]);
- array_init(match_sets[i]);
-@@ -456,12 +428,15 @@
- }
- }
-
-+ /* Start from the beginning of the string */
-+ start_offset = 0;
- match = NULL;
- matched = 0;
-
- do {
- /* Execute the regular expression. */
-- count = pcre_exec(re, extra, subject, subject_len, start_offset,
-+ count = pcre_exec(re, extra, Z_STRVAL_PP(subject),
-+ Z_STRLEN_PP(subject), start_offset,
- exoptions|g_notempty, offsets,
size_offsets);
-
- /* Check for too many substrings condition. */
-@@ -473,13 +448,13 @@
- /* If something has matched */
- if (count >= 0) {
- matched++;
-- match = subject + offsets[0];
-+ match = Z_STRVAL_PP(subject) + offsets[0];
-
- /* If subpatterns array has been passed, fill it in with
values. */
- if (subpats != NULL) {
- /* Try to get the list of substrings and display a
warning if failed. */
-- if (pcre_get_substring_list(subject, offsets, count,
&stringlist) < 0) {
-- efree(subpat_names);
-+ if (pcre_get_substring_list(Z_STRVAL_PP(subject),
-+
offsets, count, &stringlist) < 0) {
- efree(offsets);
- efree(re);
- zend_error(E_WARNING, "Get subpatterns list
failed");
-@@ -492,7 +467,7 @@
- for (i = 0; i < count; i++) {
- if (offset_capture) {
-
add_offset_pair(match_sets[i], (char *)stringlist[i],
--
offsets[(i<<1)+1] - offsets[i<<1], offsets[i<<1], NULL);
-+
offsets[(i<<1)+1] - offsets[i<<1], offsets[i<<1]);
- } else {
-
add_next_index_stringl(match_sets[i], (char *)stringlist[i],
-
offsets[(i<<1)+1] - offsets[i<<1], 1);
-@@ -518,32 +493,24 @@
- for (i = 0; i < count; i++) {
- if (offset_capture) {
-
add_offset_pair(result_set, (char *)stringlist[i],
--
offsets[(i<<1)+1] - offsets[i<<1], offsets[i<<1], subpat_names[i]);
-+
offsets[(i<<1)+1] - offsets[i<<1], offsets[i<<1]);
- } else {
-- if (subpat_names[i]) {
--
add_assoc_stringl(result_set, subpat_names[i], (char *)stringlist[i],
--
offsets[(i<<1)+1] - offsets[i<<1], 1);
-- }
-
add_next_index_stringl(result_set, (char *)stringlist[i],
-
offsets[(i<<1)+1] - offsets[i<<1], 1);
- }
- }
- /* And add it to the output array */
--
zend_hash_next_index_insert(Z_ARRVAL_P(subpats), &result_set, sizeof(zval *), NULL);
-+
zend_hash_next_index_insert(Z_ARRVAL_PP(subpats), &result_set,
-+
sizeof(zval *), NULL);
- }
- } else { /* single pattern
matching */
- /* For each subpattern, insert it into the
subpatterns array. */
- for (i = 0; i < count; i++) {
- if (offset_capture) {
-- add_offset_pair(subpats, (char
*)stringlist[i],
--
offsets[(i<<1)+1] - offsets[i<<1],
--
offsets[i<<1], subpat_names[i]);
-+ add_offset_pair(*subpats,
(char *)stringlist[i],
-+
offsets[(i<<1)+1] - offsets[i<<1], offsets[i<<1]);
- } else {
-- if (subpat_names[i]) {
--
add_assoc_stringl(subpats, subpat_names[i], (char *)stringlist[i],
--
offsets[(i<<1)+1] - offsets[i<<1], 1);
-- }
--
add_next_index_stringl(subpats, (char *)stringlist[i],
-+
add_next_index_stringl(*subpats, (char *)stringlist[i],
-
offsets[(i<<1)+1] - offsets[i<<1], 1);
- }
- }
-@@ -557,7 +524,7 @@
- this is not necessarily the end. We need to advance
- the start offset, and continue. Fudge the offset values
- to achieve this, unless we're already at the end of the
string. */
-- if (g_notempty != 0 && start_offset < subject_len) {
-+ if (g_notempty != 0 && start_offset < Z_STRLEN_PP(subject)) {
- offsets[0] = start_offset;
- offsets[1] = start_offset + 1;
- } else
-@@ -576,24 +543,19 @@
-
- /* Add the match sets to the output array and clean up */
- if (global && subpats_order == PREG_PATTERN_ORDER) {
-- for (i = 0; i < num_subpats; i++) {
-- if (subpat_names[i]) {
-- zend_hash_update(Z_ARRVAL_P(subpats), subpat_names[i],
--
strlen(subpat_names[i])+1, &match_sets[i], sizeof(zval *), NULL);
-- }
-- zend_hash_next_index_insert(Z_ARRVAL_P(subpats),
&match_sets[i], sizeof(zval *), NULL);
-+ for (i=0; i<num_subpats; i++) {
-+ zend_hash_next_index_insert(Z_ARRVAL_PP(subpats),
&match_sets[i], sizeof(zval *), NULL);
- }
- efree(match_sets);
- }
-
- efree(offsets);
-- efree(subpat_names);
-
- RETVAL_LONG(matched);
- }
- /* }}} */
-
--/* {{{ proto int preg_match(string pattern, string subject [, array subpatterns [,
int flags [, int offset ]]])
-+/* {{{ proto int preg_match(string pattern, string subject [, array subpatterns [,
int flags]])
- Perform a Perl-style regular expression match */
- PHP_FUNCTION(preg_match)
- {
-@@ -601,7 +563,7 @@
- }
- /* }}} */
-
--/* {{{ proto int preg_match_all(string pattern, string subject, array subpatterns [,
int flags [, int offset]])
-+/* {{{ proto int preg_match_all(string pattern, string subject, array subpatterns [,
int flags])
- Perform a Perl-style global regular expression match */
- PHP_FUNCTION(preg_match_all)
- {
-@@ -825,10 +787,10 @@
-
- /* Calculate the size of the offsets array, and allocate memory for it. */
- size_offsets = (pcre_info(re, NULL, NULL) + 1) * 3;
-- offsets = (int *)safe_emalloc(size_offsets, sizeof(int), 0);
-+ offsets = (int *)emalloc(size_offsets * sizeof(int));
-
- alloc_len = 2 * subject_len + 1;
-- result = safe_emalloc(alloc_len, sizeof(char), 0);
-+ result = emalloc(alloc_len * sizeof(char));
-
- /* Initialize */
- match = NULL;
-@@ -950,7 +912,7 @@
- new_len = *result_len + subject_len - start_offset;
- if (new_len + 1 > alloc_len) {
- alloc_len = new_len + 1; /* now we know
exactly how long it is */
-- new_buf = safe_emalloc(alloc_len,
sizeof(char), 0);
-+ new_buf = emalloc(alloc_len * sizeof(char));
- memcpy(new_buf, result, *result_len);
- efree(result);
- result = new_buf;
-@@ -1082,10 +1044,6 @@
- zend_get_parameters_ex(ZEND_NUM_ARGS(), ®ex, &replace, &subject,
&limit) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
-- if (!is_callable_replace && Z_TYPE_PP(replace) == IS_ARRAY && Z_TYPE_PP(regex)
!= IS_ARRAY) {
-- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parameter mismatch,
pattern is a string while replacement in an array.");
-- RETURN_FALSE;
-- }
-
- SEPARATE_ZVAL(replace);
- if (Z_TYPE_PP(replace) != IS_ARRAY)
-@@ -1121,7 +1079,6 @@
- /* For each subject entry, convert it to string, then perform
replacement
- and add the result to the return_value array. */
- while (zend_hash_get_current_data(Z_ARRVAL_PP(subject), (void
**)&subject_entry) == SUCCESS) {
-- SEPARATE_ZVAL(subject_entry);
- if ((result = php_replace_in_subject(*regex, *replace,
subject_entry, &result_len, limit_val, is_callable_replace TSRMLS_CC)) != NULL) {
- /* Add to return array */
- switch(zend_hash_get_current_key(Z_ARRVAL_PP(subject),
&string_key, &num_key, 0))
-@@ -1223,7 +1180,7 @@
-
- /* Calculate the size of the offsets array, and allocate memory for it. */
- size_offsets = (pcre_info(re, NULL, NULL) + 1) * 3;
-- offsets = (int *)safe_emalloc(size_offsets, sizeof(int), 0);
-+ offsets = (int *)emalloc(size_offsets * sizeof(int));
-
- /* Start at the beginning of the string */
- start_offset = 0;
-@@ -1251,7 +1208,7 @@
-
- if (offset_capture) {
- /* Add (match, offset) pair to the return
value */
-- add_offset_pair(return_value, last_match,
&Z_STRVAL_PP(subject)[offsets[0]]-last_match, next_offset, NULL);
-+ add_offset_pair(return_value, last_match,
&Z_STRVAL_PP(subject)[offsets[0]]-last_match, next_offset);
- } else {
- /* Add the piece to the return value */
- add_next_index_stringl(return_value,
last_match,
-@@ -1273,7 +1230,7 @@
- /* If we have matched a delimiter */
- if (!no_empty || match_len > 0) {
- if (offset_capture) {
-- add_offset_pair(return_value,
&Z_STRVAL_PP(subject)[offsets[i<<1]], match_len, offsets[i<<1], NULL);
-+ add_offset_pair(return_value,
&Z_STRVAL_PP(subject)[offsets[i<<1]], match_len, offsets[i<<1]);
- } else {
-
add_next_index_stringl(return_value,
-
&Z_STRVAL_PP(subject)[offsets[i<<1]],
-@@ -1309,7 +1266,7 @@
- {
- if (offset_capture) {
- /* Add the last (match, offset) pair to the return value */
-- add_offset_pair(return_value,
&Z_STRVAL_PP(subject)[start_offset], Z_STRLEN_PP(subject) - start_offset,
start_offset, NULL);
-+ add_offset_pair(return_value,
&Z_STRVAL_PP(subject)[start_offset], Z_STRLEN_PP(subject) - start_offset,
start_offset);
- } else {
- /* Add the last piece to the return value */
- add_next_index_stringl(return_value, last_match,
Z_STRVAL_PP(subject) + Z_STRLEN_PP(subject) - last_match, 1);
-@@ -1363,7 +1320,7 @@
-
- /* Allocate enough memory so that even if each character
- is quoted, we won't run out of room */
-- out_str = safe_emalloc(2, Z_STRLEN_PP(in_str_arg), 1);
-+ out_str = emalloc(2 * Z_STRLEN_PP(in_str_arg) + 1);
-
- /* Go through the string and quote necessary characters */
- for(p = in_str, q = out_str; p != in_str_end; p++) {
-@@ -1454,7 +1411,7 @@
-
- /* Calculate the size of the offsets array, and allocate memory for it. */
- size_offsets = (pcre_info(re, NULL, NULL) + 1) * 3;
-- offsets = (int *)safe_emalloc(size_offsets, sizeof(int), 0);
-+ offsets = (int *)emalloc(size_offsets * sizeof(int));
-
- /* Initialize return array */
- array_init(return_value);
-diff -ruN php-4.3.3.orig/ext/pcre/php_pcre.h php-4.3.3/ext/pcre/php_pcre.h
---- php-4.3.3.orig/ext/pcre/php_pcre.h Tue Dec 31 09:35:08 2002
-+++ php-4.3.3/ext/pcre/php_pcre.h Thu Sep 4 19:46:47 2003
-@@ -2,7 +2,7 @@
- +----------------------------------------------------------------------+
- | PHP Version 4 |
- +----------------------------------------------------------------------+
-- | Copyright (c) 1997-2003 The PHP Group |
-+ | Copyright (c) 1997-2002 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 2.02 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
-@@ -16,7 +16,7 @@
- +----------------------------------------------------------------------+
- */
-
--/* $Id$ */
-+/* $Id$ */
-
- #ifndef PHP_PCRE_H
- #define PHP_PCRE_H
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
