diff -pru php5.orig/php5-5.2.3/debian/control php5/php5-5.2.3/debian/control --- php5.orig/php5-5.2.3/debian/control 2007-08-15 15:08:32.000000000 +0000 +++ php5/php5-5.2.3/debian/control 2007-08-15 12:22:26.114959500 +0000 @@ -42,7 +42,7 @@ Description: Common files for packages b Package: libapache2-mod-php5 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), ${apache2:Depends}, php5-common (= ${Source-Version}), libmagic1, ucf -Conflicts: libapache2-mod-php4 +Conflicts: libapache2-mod-php4, libapache2-mod-php5filter Provides: ${php:Provides} Suggests: php-pear Description: server-side, HTML-embedded scripting language (apache 2 module) @@ -59,6 +59,26 @@ Description: server-side, HTML-embedded . Homepage: http://www.php.net/ +Package: libapache2-mod-php5filter +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), ${apache2:Depends}, php5-common (= ${Source-Version}), libmagic1, ucf +Conflicts: libapache2-mod-php4, libapache2-mod-php5 +Provides: ${php:Provides} +Suggests: php-pear +Description: server-side, HTML-embedded scripting language (apache 2 filter module) + This package provides the PHP5 Filter module for the Apache 2 webserver (as + found in the apache2-mpm-prefork package). Please note that this package + ONLY works with Apache's prefork MPM, as it is not compiled thread-safe. + . + ${php:Extensions} + . + PHP5 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. + . + Homepage: http://www.php.net/ + Package: php5-cgi Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), php5-common (= ${Source-Version}), libmagic1, ucf diff -pru php5.orig/php5-5.2.3/debian/rules php5/php5-5.2.3/debian/rules --- php5.orig/php5-5.2.3/debian/rules 2007-08-15 15:08:32.000000000 +0000 +++ php5/php5-5.2.3/debian/rules 2007-08-15 14:56:28.108548000 +0000 @@ -143,7 +143,7 @@ unprepared: fi rm -f prepared-stamp -build: build-apache2-stamp build-cgi-stamp build-cli-stamp build-pear-stamp +build: build-apache2-stamp build-apache2filter-stamp build-cgi-stamp build-cli-stamp build-pear-stamp build-apache2-stamp: configure-apache2-stamp dh_testdir @@ -151,6 +151,12 @@ build-apache2-stamp: configure-apache2-s touch build-apache2-stamp +build-apache2filter-stamp: configure-apache2filter-stamp + dh_testdir + cd apache2filter-build && $(MAKE) + + touch build-apache2filter-stamp + build-cli-stamp: configure-cli-stamp dh_testdir cd cli-build && $(MAKE) @@ -187,7 +193,7 @@ build-pear-stamp: build-cgi-stamp $(CURDIR)/pear-build/usr/bin/peardev touch build-pear-stamp -configure: configure-apache2-stamp configure-cli-stamp configure-cgi-stamp +configure: configure-apache2-stamp configure-apache2filter-stamp configure-cli-stamp configure-cgi-stamp configure-apache2-stamp: prepared-stamp dh_testdir @@ -241,6 +247,58 @@ configure-apache2-stamp: prepared-stamp Zend/ touch configure-apache2-stamp +configure-apache2filter-stamp: prepared-stamp + dh_testdir + if [ -d apache2filter-build ]; then rm -rf apache2filter-build; fi + -mkdir apache2filter-build + cd apache2filter-build && \ + CFLAGS="$(CFLAGS)" PROG_SENDMAIL="$(PROG_SENDMAIL)" ../configure \ + --prefix=/usr --with-apxs2filter=/usr/bin/apxs2 \ + --with-config-file-path=/etc/php5/apache2filter \ + --with-config-file-scan-dir=/etc/php5/apache2filter/conf.d \ + $(COMMON_CONFIG) \ + --without-mm \ + --with-curl=shared,/usr \ + --with-zlib-dir=/usr \ + --with-gd=shared,/usr --enable-gd-native-ttf \ + --with-jpeg-dir=shared,/usr \ + --with-xpm-dir=shared,/usr/X11R6 \ + --with-png-dir=shared,/usr \ + --with-freetype-dir=shared,/usr \ + --with-imap=shared,/usr \ + --with-imap-ssl \ + $(IBFLAGS) \ + --with-ttf=shared,/usr \ + --with-t1lib=shared,/usr \ + --with-ldap=shared,/usr \ + --with-ldap-sasl=/usr \ + --with-mcrypt=shared,/usr \ + --with-mhash=shared,/usr \ + --with-mysql=shared,/usr \ + --with-mysqli=shared,/usr/bin/mysql_config \ + --with-pspell=shared,/usr \ + --with-unixODBC=shared,/usr \ + --with-recode=shared,/usr \ + --with-xsl=shared,/usr \ + --with-snmp=shared,/usr \ + --with-sqlite=shared,/usr \ + --with-sybase-ct=shared,/usr \ + --with-tidy=shared,/usr \ + --with-xmlrpc=shared \ + --with-pgsql=shared,/usr PGSQL_INCLUDE=`pg_config --includedir` \ + --enable-pdo=shared \ + --without-pdo-dblib \ + --with-pdo-mysql=shared,/usr \ + --with-pdo-odbc=shared,unixODBC,/usr \ + --with-pdo-pgsql=shared,/usr/bin/pg_config \ + --with-pdo-sqlite=shared,/usr + cd apache2filter-build && \ + cp ../Zend/zend_ini_scanner.c ../Zend/zend_language_scanner.c \ + ../Zend/zend_ini_parser.h ../Zend/zend_language_parser.h \ + ../Zend/zend_ini_parser.c ../Zend/zend_language_parser.c \ + Zend/ + touch configure-apache2filter-stamp + configure-cgi-stamp: prepared-stamp dh_testdir if [ -d cgi-build ]; then rm -rf cgi-build; fi @@ -287,11 +345,13 @@ clean: unprepared dh_testdir dh_testroot rm -f configure-apache2-stamp build-apache2-stamp + rm -f configure-apache2filter-stamp build-apache2filter-stamp rm -f configure-cgi-stamp build-cgi-stamp rm -f configure-cli-stamp build-cli-stamp rm -f build-pear-stamp rm -f install-stamp rm -rf apache2-build + rm -rf apache2filter-build rm -rf cgi-build rm -rf cli-build rm -rf pear-build @@ -301,7 +361,7 @@ clean: unprepared cat debian/modulelist | while read package extname dsoname; do \ rm -f debian/php5-$$package.postinst; \ done - for sapi in libapache2-mod-php5 php5-cgi php5-cli; do \ + for sapi in libapache2-mod-php5 libapache2-mod-php5filter php5-cgi php5-cli; do \ for cruft in postrm links; do \ rm -f debian/$${sapi}.$${cruft}; \ done; \ @@ -331,6 +391,15 @@ install: build cp debian/libapache2-mod-php5.conf \ debian/libapache2-mod-php5/etc/apache2/mods-available/php5.conf + # Add here commands to install the package into debian/php5. + # install apache2 DSO filter module + cp apache2filter-build/.libs/libphp5.so \ + debian/libapache2-mod-php5filter/`apxs2 -q LIBEXECDIR`/ + cp debian/libapache2-mod-php5filter.load \ + debian/libapache2-mod-php5filter/etc/apache2/mods-available/php5.load + cp debian/libapache2-mod-php5filter.conf \ + debian/libapache2-mod-php5filter/etc/apache2/mods-available/php5.conf + # sanitize php.ini file cat php.ini-dist | tr "\t" " " > debian/php5-common/usr/share/php5/php.ini-dist cat php.ini-dist | tr "\t" " " | sed -e'/memory_limit =/ s/8M/32M/g' > debian/php5-common/usr/share/php5/php.ini-dist.cli @@ -349,12 +418,23 @@ install: build main/config.{nw,w32}.h \ main/win95nt.h + # install the apache filter modules' files + cd apache2filter-build && make install-headers install-build install-modules install-programs INSTALL_ROOT=$(CURDIR)/debian/libapache2-mod-php5filter + # remove netware and win32 headers that we don't want + cd debian/libapache2-mod-php5filter/usr/include/php5/ && \ + rm -f TSRM/readdir.h \ + TSRM/tsrm_config.{nw,w32}.h \ + TSRM/tsrm_{nw,win32}.h \ + Zend/zend_config.{nw,w32}.h \ + main/config.{nw,w32}.h \ + main/win95nt.h + # install PEAR cp -r pear-build/* debian/php-pear/ # install extensions ext=`./debian/libapache2-mod-php5/usr/bin/php-config --extension-dir`;\ - for i in libapache2-mod-php5 php5-cgi php5-cli; do \ + for i in libapache2-mod-php5 libapache2-mod-php5filter php5-cgi php5-cli; do \ mkdir -p debian/$$i/$${ext}; \ done; \ cat debian/modulelist debian/extramodulelist | while read package extname dsoname; do \ @@ -366,6 +446,7 @@ install: build debian/libapache2-mod-php5/$${ext}/$$dsoname.so \ debian/php5-$$package$${ext}/$$dsoname.so; \ rm debian/libapache2-mod-php5/$${ext}/$$dsoname.so; \ + rm debian/libapache2-mod-php5filter/$${ext}/$$dsoname.so; \ done # install CGI @@ -382,6 +463,9 @@ install: build rm -rf debian/libapache2-mod-php5/usr/lib/php5/build/ \ debian/libapache2-mod-php5/usr/include/ \ debian/libapache2-mod-php5/usr/bin/ + rm -rf debian/libapache2-mod-php5filter/usr/lib/php5/build/ \ + debian/libapache2-mod-php5filter/usr/include/ \ + debian/libapache2-mod-php5filter/usr/bin/ for i in Makefile.global acinclude.m4 mkdep.awk phpize.m4 scan_makefile_in.awk; do \ chmod 644 debian/php5-dev/usr/lib/php5/build/$$i; \ done @@ -459,12 +543,13 @@ binary-arch: build install # likewise, for the different sapi implementations for tmpl in postrm links; do \ - for sapi in apache2 cgi cli; do \ + for sapi in apache2 apache2filter cgi cli; do \ sed -e "s/@sapi@/$$sapi/g" \ < debian/php5-sapi.$$tmpl \ > debian/php5-$${sapi}.$$tmpl; \ done; \ mv debian/php5-apache2.$$tmpl debian/libapache2-mod-php5.$$tmpl; \ + mv debian/php5-apache2filter.$$tmpl debian/libapache2-mod-php5filter.$$tmpl; \ done cat debian/copyright.header LICENSE Zend/LICENSE > debian/copyright @@ -475,7 +560,7 @@ binary-arch: build install ln -s php5-common debian/php5-$$package/usr/share/doc/php5-$$package; \ done - for package in php5-dev php5-cgi php5-cli libapache2-mod-php5; do \ + for package in php5-dev php5-cgi php5-cli libapache2-mod-php5 libapache2-mod-php5filter; do \ rm -rf debian/$$package/usr/share/doc/$$package; \ ln -s php5-common debian/$$package/usr/share/doc/$$package; \ done @@ -494,7 +579,7 @@ binary-arch: build install dh_shlibdeps -s phpapi=`./debian/php5-dev/usr/bin/php-config5 --phpapi`; \ - for i in libapache2-mod-php5 php5-cgi php5-cli; do \ + for i in libapache2-mod-php5 libapache2-mod-php5filter php5-cgi php5-cli; do \ echo "php:Provides=phpapi-$${phpapi}" >> debian/$$i.substvars; \ done; \ cat debian/modulelist | while read package extname dsoname; do \ @@ -508,9 +593,12 @@ binary-arch: build install for i in apache2; do \ "$$i"-build/sapi/cli/php -n -r '$(BUILTIN_EXTENSION_CHECK)' \ >> debian/lib"$$i"-mod-php5.substvars; \ + "$$i"-build/sapi/cli/php -n -r '$(BUILTIN_EXTENSION_CHECK)' \ + >> debian/lib"$$i"-mod-php5filter.substvars; \ done echo "apache2:Depends=apache2-mpm-prefork (>> 2.0.52) | apache2-mpm-itk, apache2.2-common" >>debian/libapache2-mod-php5.substvars + echo "apache2:Depends=apache2-mpm-prefork (>> 2.0.52) | apache2-mpm-itk, apache2.2-common" >>debian/libapache2-mod-php5filter.substvars dh_gencontrol -s dh_md5sums -s dh_builddeb -s