summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debian/changelog15
-rw-r--r--debian/control33
-rw-r--r--debian/libapache-mod-php5.500mod_php5.info7
-rw-r--r--debian/libapache-mod-php5.conf4
-rw-r--r--debian/libapache-mod-php5.dirs3
-rw-r--r--debian/libapache-mod-php5.postinst45
-rw-r--r--debian/libapache-mod-php5.prerm17
-rw-r--r--debian/patches/006-debian_quirks.patch27
-rw-r--r--debian/patches/057-no_apache_installed.patch21
-rw-r--r--debian/php5-common.README.Debian31
-rwxr-xr-xdebian/rules55
11 files changed, 55 insertions, 203 deletions
diff --git a/debian/changelog b/debian/changelog
index 9799db936..4250682df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+php5 (5.2.2-2) unstable; urgency=low
+
+ [sean finney]
+ - build with --with-ldap-sasl and modify build-depends to include
+ libsasl2-dev in order to get the ldap_sasl_bind function (closes: #422490).
+ - the json extension is now on by default in php builds, so there's
+ no need for the php5-json package. added a Provides/Conflicts to
+ help set an upgrade path.
+ - apache 1.x support is soon disappearing. as a consequence we are
+ no longer building the libapache-mod-php5 module. the php5 metapackage
+ should as a result bring in libapache2-mod-php5 by default for those who
+ already have it installed.
+
+ -- sean finney <seanius@debian.org> Sun, 20 May 2007 21:59:56 +0200
+
php5 (5.2.2-1) unstable; urgency=low
[ sean finney ]
diff --git a/debian/control b/debian/control
index 0c3650faa..ea642cb8c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: web
Priority: optional
Maintainer: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
Uploaders: Adam Conrad <adconrad@0c3.net>, Steve Langasek <vorlon@debian.org>, Jeroen van Wolffelaar <jeroen@wolffelaar.nl>, Ondřej Surý <ondrej@debian.org>, sean finney <seanius@debian.org>
-Build-Depends: apache-dev (>= 1.3.23), apache2-prefork-dev (>= 2.0.53-3), autoconf, automake1.4, bison, chrpath, debhelper (>= 3), firebird2-dev [i386 amd64], flex (>= 2.5.4), freetds-dev, libapr1-dev (>= 1.2.7-8), libbz2-dev (>= 1.0.0), libc-client-dev, libcurl3-openssl-dev | libcurl3-dev, libdb4.4-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev (>= 2.0.28-3), libjpeg62-dev, libkrb5-dev, libldap2-dev, libmcrypt-dev, libmhash-dev (>= 0.8.8), libmysqlclient15-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 6.6), libpng12-dev, libpq-dev | postgresql-dev, libpspell-dev, librecode-dev, libsnmp10-dev | libsnmp-dev, libsqlite0-dev, libssl-dev (>= 0.9.6), libt1-dev, libtidy-dev, libtool (>= 1.4.2-4), libwrap0-dev, libxmltok1-dev, libxml2-dev (>= 2.4.14), libxslt1-dev (>= 1.0.18), quilt, re2c, unixodbc-dev, zlib1g-dev (>= 1.0.9)
+Build-Depends: apache2-prefork-dev (>= 2.0.53-3), autoconf, automake1.4, bison, chrpath, debhelper (>= 3), firebird2-dev [i386 amd64], flex (>= 2.5.4), freetds-dev, libapr1-dev (>= 1.2.7-8), libbz2-dev (>= 1.0.0), libc-client-dev, libcurl3-openssl-dev | libcurl3-dev, libdb4.4-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev (>= 2.0.28-3), libjpeg62-dev, libkrb5-dev, libldap2-dev, libmcrypt-dev, libmhash-dev (>= 0.8.8), libmysqlclient15-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 6.6), libpng12-dev, libpq-dev | postgresql-dev, libpspell-dev, librecode-dev, libsasl2-dev, libsnmp10-dev | libsnmp-dev, libsqlite0-dev, libssl-dev (>= 0.9.6), libt1-dev, libtidy-dev, libtool (>= 1.4.2-4), libwrap0-dev, libxmltok1-dev, libxml2-dev (>= 2.4.14), libxslt1-dev (>= 1.0.18), quilt, re2c, unixodbc-dev, zlib1g-dev (>= 1.0.9)
Build-Conflicts: bind-dev
Standards-Version: 3.7.2
Package: php5
Architecture: all
-Depends: libapache2-mod-php5 (>= ${Source-Version}) | libapache-mod-php5 (>= ${Source-Version}) | php5-cgi (>= ${Source-Version}), php5-common (>= ${Source-Version})
+Depends: libapache2-mod-php5 (>= ${Source-Version}) | php5-cgi (>= ${Source-Version}), php5-common (>= ${Source-Version})
Description: server-side, HTML-embedded scripting language (meta-package)
This package is a meta-package that, when installed, guarantees that you
have at least one of the four server-side versions of the PHP5 interpreter
@@ -26,6 +26,8 @@ Description: server-side, HTML-embedded scripting language (meta-package)
Package: php5-common
Architecture: any
Depends: sed (>= 4.1.1-1)
+Provides: php5-json
+Conflicts: php5-json
Description: Common files for packages built from the php5 source
This package contains the documentation and example files relevant to all
the other packages built from the php5 source.
@@ -37,26 +39,6 @@ Description: Common files for packages built from the php5 source
.
Homepage: http://www.php.net/
-Package: libapache-mod-php5
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), ${apache:Depends}, php5-common (= ${Source-Version}), libmagic1, ucf
-Conflicts: php3, php4 (<< 4:4.3.8-6), libapache-mod-php4
-Provides: ${php:Provides}
-Suggests: php-pear
-Description: server-side, HTML-embedded scripting language (apache 1.3 module)
- This package provides the PHP5 module for the Apache 1.3 webserver (as
- found in the apache, apache-ssl, and apache-perl packages). To use php5
- with Apache 2, you probably want libapache2-mod-php5 instead.
- .
- ${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: libapache2-mod-php5
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), ${apache2:Depends}, php5-common (= ${Source-Version}), libmagic1, ucf
@@ -67,7 +49,6 @@ Description: server-side, HTML-embedded scripting language (apache 2 module)
This package provides the PHP5 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.
- To use php5 with Apache 1.3, you probably want libapache-mod-php5 instead.
.
${php:Extensions}
.
@@ -86,9 +67,9 @@ Conflicts: php3 (<= 3.0.18-1)
Suggests: php-pear
Description: server-side, HTML-embedded scripting language (CGI binary)
This package provides the /usr/lib/cgi-bin/php5 CGI interpreter built
- for use in apache 1.3 or apache 2 with mod_actions, or any other CGI
- httpd that supports a similar mechanism. Note that MOST apache users
- probably want the libapache-mod-php5 or libapache2-mod-php5 packages.
+ for use in apache 2 with mod_actions, or any other CGI httpd that
+ supports a similar mechanism. Note that MOST apache users probably
+ want the libapache2-mod-php5 package.
.
${php:Extensions}
.
diff --git a/debian/libapache-mod-php5.500mod_php5.info b/debian/libapache-mod-php5.500mod_php5.info
deleted file mode 100644
index 6b9e0107d..000000000
--- a/debian/libapache-mod-php5.500mod_php5.info
+++ /dev/null
@@ -1,7 +0,0 @@
-LoadModule: php5_module /usr/lib/apache/1.3/libphp5.so
-Directives:
- php_value
- php_flag
- php_admin_value
- php_admin_flag
-Description: Support for the PHP5 HTML-embedded scripting language
diff --git a/debian/libapache-mod-php5.conf b/debian/libapache-mod-php5.conf
deleted file mode 100644
index 04fc35744..000000000
--- a/debian/libapache-mod-php5.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-<IfModule mod_php5.c>
- AddType application/x-httpd-php .php .phtml .php3
- AddType application/x-httpd-php-source .phps
-</IfModule>
diff --git a/debian/libapache-mod-php5.dirs b/debian/libapache-mod-php5.dirs
deleted file mode 100644
index 9803fb105..000000000
--- a/debian/libapache-mod-php5.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-/etc/php5/apache
-/etc/apache/conf.d
-/usr/lib/apache/1.3
diff --git a/debian/libapache-mod-php5.postinst b/debian/libapache-mod-php5.postinst
deleted file mode 100644
index 39d44162b..000000000
--- a/debian/libapache-mod-php5.postinst
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-
-if [ "$1" != "configure" ]; then
- exit 0
-fi
-
-phpini="/etc/php5/apache/php.ini"
-# LEGACY SUPPORT
-# previous versions of php did not ship $phpini as a conffile nor did
-# they use anything like ucf. as a result, we need to help transition
-# those files into ucf a little more easily by updating unmodified
-# ini files before registering them
-#
-# if we're upgrading from a pre-ucf version of php:
-if dpkg --compare-versions "$2" le-nl "5.1.6-4"; then
- # if the SAPI config file already exists and is unmodified
- if [ -f "$phpini" ]; then
- oldmd5=`md5sum $phpini | cut -d' ' -f1`
- if [ "$oldmd5" = "c85605baab79fbcd3c289e442eb3caa2" ]; then
- # then silently update it before registering via ucf
- cp /usr/share/php5/php.ini-dist $phpini
- fi
- fi
-fi
-# END LEGACY SUPPORT
-
-ucf /usr/share/php5/php.ini-dist $phpini
-
-if [ -n "$2" ]; then
-# we're upgrading. don't ask again
- exit 0
-fi
-
-for i in apache apache-ssl apache-perl; do
- if [ -e /etc/$i/httpd.conf ]; then
- apache-modconf $i enable mod_php5
- fi
-done
-
-exit 0
diff --git a/debian/libapache-mod-php5.prerm b/debian/libapache-mod-php5.prerm
deleted file mode 100644
index 52a3c9638..000000000
--- a/debian/libapache-mod-php5.prerm
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-if [ "$1" != "remove" -a "$1" != "purge" ]; then
- exit 0
-fi
-
-for i in apache apache-ssl apache-perl; do
- if [ -e /etc/$i/httpd.conf ]; then
- apache-modconf $i disable mod_php5 quiet
- fi
-done
-
-exit 0
diff --git a/debian/patches/006-debian_quirks.patch b/debian/patches/006-debian_quirks.patch
index d17f865c5..d144bb237 100644
--- a/debian/patches/006-debian_quirks.patch
+++ b/debian/patches/006-debian_quirks.patch
@@ -1,7 +1,7 @@
Index: php5-5.2.2/configure.in
===================================================================
---- php5-5.2.2.orig/configure.in 2007-05-04 17:00:49.000000000 +0200
-+++ php5-5.2.2/configure.in 2007-05-04 17:06:47.000000000 +0200
+--- php5-5.2.2.orig/configure.in 2007-05-20 21:13:15.000000000 +0200
++++ php5-5.2.2/configure.in 2007-05-20 21:13:26.000000000 +0200
@@ -968,7 +968,7 @@
fi
@@ -47,7 +47,7 @@ Index: php5-5.2.2/configure.in
Index: php5-5.2.2/ext/ext_skel
===================================================================
--- php5-5.2.2.orig/ext/ext_skel 2004-05-16 14:10:35.000000000 +0200
-+++ php5-5.2.2/ext/ext_skel 2007-05-04 17:06:47.000000000 +0200
++++ php5-5.2.2/ext/ext_skel 2007-05-20 21:13:26.000000000 +0200
@@ -70,7 +70,7 @@
fi
@@ -60,7 +60,7 @@ Index: php5-5.2.2/ext/ext_skel
Index: php5-5.2.2/ext/session/session.c
===================================================================
--- php5-5.2.2.orig/ext/session/session.c 2007-04-04 21:52:19.000000000 +0200
-+++ php5-5.2.2/ext/session/session.c 2007-05-04 17:06:47.000000000 +0200
++++ php5-5.2.2/ext/session/session.c 2007-05-20 21:13:26.000000000 +0200
@@ -180,11 +180,11 @@
PHP_INI_BEGIN()
STD_PHP_INI_BOOLEAN("session.bug_compat_42", "1", PHP_INI_ALL, OnUpdateBool, bug_compat, php_ps_globals, ps_globals)
@@ -78,7 +78,7 @@ Index: php5-5.2.2/ext/session/session.c
Index: php5-5.2.2/php.ini-dist
===================================================================
--- php5-5.2.2.orig/php.ini-dist 2007-04-12 14:31:39.000000000 +0200
-+++ php5-5.2.2/php.ini-dist 2007-05-04 17:07:30.000000000 +0200
++++ php5-5.2.2/php.ini-dist 2007-05-20 21:13:26.000000000 +0200
@@ -455,7 +455,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -180,7 +180,7 @@ Index: php5-5.2.2/php.ini-dist
Index: php5-5.2.2/php.ini-recommended
===================================================================
--- php5-5.2.2.orig/php.ini-recommended 2007-04-12 14:31:39.000000000 +0200
-+++ php5-5.2.2/php.ini-recommended 2007-05-04 17:07:50.000000000 +0200
++++ php5-5.2.2/php.ini-recommended 2007-05-20 21:13:26.000000000 +0200
@@ -500,7 +500,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -282,7 +282,7 @@ Index: php5-5.2.2/php.ini-recommended
Index: php5-5.2.2/sapi/caudium/config.m4
===================================================================
--- php5-5.2.2.orig/sapi/caudium/config.m4 2005-11-29 19:26:02.000000000 +0100
-+++ php5-5.2.2/sapi/caudium/config.m4 2007-05-04 17:06:47.000000000 +0200
++++ php5-5.2.2/sapi/caudium/config.m4 2007-05-20 21:13:26.000000000 +0200
@@ -24,8 +24,8 @@
AC_MSG_ERROR(Couldn't find a pike in $withval/bin/)
fi
@@ -308,8 +308,8 @@ Index: php5-5.2.2/sapi/caudium/config.m4
Index: php5-5.2.2/sapi/cli/php.1.in
===================================================================
--- php5-5.2.2.orig/sapi/cli/php.1.in 2007-04-23 22:54:22.000000000 +0200
-+++ php5-5.2.2/sapi/cli/php.1.in 2007-05-04 17:06:47.000000000 +0200
-@@ -306,13 +306,17 @@
++++ php5-5.2.2/sapi/cli/php.1.in 2007-05-20 21:13:49.000000000 +0200
+@@ -306,13 +306,14 @@
.B name
.SH FILES
.TP 15
@@ -324,9 +324,6 @@ Index: php5-5.2.2/sapi/cli/php.1.in
+.B /etc/php5/cgi/php.ini
+The configuration file for the CGI version of PHP.
+.TP
-+.B /etc/php5/apache/php.ini
-+The configuration file for the version of PHP that apache uses.
-+.TP
+.B /etc/php5/apache2/php.ini
+The configuration file for the version of PHP that apache2 uses.
.SH EXAMPLES
@@ -335,7 +332,7 @@ Index: php5-5.2.2/sapi/cli/php.1.in
Index: php5-5.2.2/scripts/Makefile.frag
===================================================================
--- php5-5.2.2.orig/scripts/Makefile.frag 2005-11-22 00:08:02.000000000 +0100
-+++ php5-5.2.2/scripts/Makefile.frag 2007-05-04 17:06:47.000000000 +0200
++++ php5-5.2.2/scripts/Makefile.frag 2007-05-20 21:13:26.000000000 +0200
@@ -3,8 +3,8 @@
# Build environment install
#
@@ -350,7 +347,7 @@ Index: php5-5.2.2/scripts/Makefile.frag
Index: php5-5.2.2/scripts/php-config.in
===================================================================
--- php5-5.2.2.orig/scripts/php-config.in 2006-07-27 10:53:16.000000000 +0200
-+++ php5-5.2.2/scripts/php-config.in 2007-05-04 17:06:47.000000000 +0200
++++ php5-5.2.2/scripts/php-config.in 2007-05-20 21:13:26.000000000 +0200
@@ -4,8 +4,8 @@
exec_prefix="@exec_prefix@"
version="@PHP_VERSION@"
@@ -365,7 +362,7 @@ Index: php5-5.2.2/scripts/php-config.in
Index: php5-5.2.2/scripts/phpize.in
===================================================================
--- php5-5.2.2.orig/scripts/phpize.in 2005-12-12 12:51:45.000000000 +0100
-+++ php5-5.2.2/scripts/phpize.in 2007-05-04 17:06:47.000000000 +0200
++++ php5-5.2.2/scripts/phpize.in 2007-05-20 21:13:26.000000000 +0200
@@ -3,8 +3,8 @@
# Variable declaration
prefix='@prefix@'
diff --git a/debian/patches/057-no_apache_installed.patch b/debian/patches/057-no_apache_installed.patch
index 4327988a8..2e35bcf7f 100644
--- a/debian/patches/057-no_apache_installed.patch
+++ b/debian/patches/057-no_apache_installed.patch
@@ -1,24 +1,3 @@
-Index: php5-5.2.0/sapi/apache/config.m4
-===================================================================
---- php5-5.2.0.orig/sapi/apache/config.m4 2007-03-18 22:56:59.000000000 +0100
-+++ php5-5.2.0/sapi/apache/config.m4 2007-03-18 22:58:44.000000000 +0100
-@@ -52,11 +52,11 @@
- APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
- APACHE_INCLUDE=-I$APXS_INCLUDEDIR
-
-- # Test that we're trying to configure with apache 1.x
-- PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
-- if test "$APACHE_VERSION" -ge 2000000; then
-- AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2])
-- fi
-+dnl # Test that we're trying to configure with apache 1.x
-+dnl PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
-+dnl if test "$APACHE_VERSION" -ge 2000000; then
-+dnl AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2])
-+dnl fi
-
- for flag in $APXS_CFLAGS; do
- case $flag in
Index: php5-5.2.0/sapi/apache2handler/config.m4
===================================================================
--- php5-5.2.0.orig/sapi/apache2handler/config.m4 2007-03-18 22:56:59.000000000 +0100
diff --git a/debian/php5-common.README.Debian b/debian/php5-common.README.Debian
index 807922dcb..7c8766a70 100644
--- a/debian/php5-common.README.Debian
+++ b/debian/php5-common.README.Debian
@@ -1,10 +1,10 @@
Table of Contents:
---------------------------------------------------------------------
* Using php5 with threaded webservers (eg. apache2-mpm-worker, caudium)
-* Problems starting apache with php5
+* Problems starting apache2 with php5
* Session storage
* Other caveats
-* php5-cgi and apache/apache2
+* php5-cgi and apache2
* Restarting your web server after installing modules
* Configuration layout
* Further documentation, errata, etc
@@ -23,7 +23,7 @@ Using php5 with threaded webservers (eg. apache2-mpm-worker, caudium)
Adam Conrad <adconrad@0c3.net> Sun, 06 Feb 2005 08:24:56 -0700
-Problems starting apache with php5
+Problems starting apache2 with php5
----------------------------------
At the time of writing, there are no *known* incompatibilities
@@ -31,7 +31,7 @@ Problems starting apache with php5
many bug reports in the past due to dynamically-loaded extensions,
and it's possible there are still bugs in the released packages. If
Apache fails to start after you install php5, check your list of
- enabled extensions at the bottom of /etc/php5/apache/php.ini (and in
+ enabled extensions at the bottom of /etc/php5/apache2/php.ini (and in
the per-sapi configuration directory), and try commenting out or
reordering the extensions until you find a combination that works.
@@ -53,7 +53,7 @@ Session storage
Session files are stored in /var/lib/php5. For security purposes, this
directory is unreadable by non-root users. This means that php5 running
- from apache, for example, will not be able to clean up stale session
+ from apache2, for example, will not be able to clean up stale session
files. Instead, we have a cron job run every 30 mins that cleans up
stale session files; /etc/cron.d/php5. You may need to modify how
often this runs, if you've modified session.gc_maxlifetime in your
@@ -70,28 +70,21 @@ Other caveats
special settings for them so php will look in compiled-in paths. If you set
them, you should also add appropriate php install directories there.
-php5-cgi and apache/apache2
+php5-cgi and apache2
---------------------------
In 99% of cases, what you probably want isn't php5-cgi at all, but rather
-the libapache-mod-php5 or libapache2-mod-php5 package, which will configure
-themselves on installation and Just Work(tm). If, however, you have a need
-to use the CGI version of php5 with apache/apache2, the following should
-help get you going, though there are dozens of different ways to do this.
+the libapache2-mod-php5 package, which will configure themselves on
+installation and Just Work(tm). If, however, you have a need to use
+the CGI version of php5 with apache2, the following should help
+get you going, though there are dozens of different ways to do this.
Please note that this process will never be made automatic, as php5-cgi
is meant to be a webserver-agnostic package that can be used with any
httpd, and we don't want it to conflict with the httpd-specific packages
-such as libapache-mod-php5. If both were installed side-by-side and both
+such as libapache2-mod-php5. If both were installed side-by-side and both
were automatically enabled, the results would be a bit confusing, obviously.
-If you want to use php5-cgi in apache
- 1) activate mod_action (apache-modconf apache enable mod_actions)
- 2) Add the following to a config snippet in /etc/apache/conf.d
- <IfModule mod_actions.c>
- Action application/x-httpd-php /cgi-bin/php5
- </IfModule>
-
To use php5-cgi with apache2
1) activate CGI (it's on by default in default debian setups)
a) If using the prefork MPM, use 'a2enmod cgi'
@@ -118,7 +111,7 @@ sean finney <seanius@debian.org> Sat, 09 Dec 2006 12:42:21 +0100
Configuration Layout
---------------------------------------------------------------------
-Each of the 4 SAPI's (apache/apache2/cgi/cli) have a different
+Each of the 3 SAPI's (apache2/cgi/cli) have a different
central configuration file /etc/php5/$SAPI/php.ini.
Additionally, each SAPI is configured with the compile-time option
diff --git a/debian/rules b/debian/rules
index 6fa7fb2d2..dc31ba81a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,6 @@ PHP5_SOURCE_VERSION = $(shell dpkg-parsechangelog | grep ^Version | sed "s/Ver
PHP5_UPSTREAM_VERSION = $(shell echo $(PHP5_SOURCE_VERSION) | sed -e "s/-.*//" -e "s/.*://")
PHP5_DEBIAN_REVISION = $(shell echo $(PHP5_SOURCE_VERSION) | sed "s/.*-//")
-APACHE_VERSION = $(shell dpkg -s apache-dev | grep ^Version | cut -d\ -f2 | cut -d- -f1)
PROG_SENDMAIL = /usr/sbin/sendmail
CFLAGS = -O2 -Wall -fsigned-char -fno-strict-aliasing
@@ -130,13 +129,7 @@ unprepared:
fi
rm -f prepared-stamp
-build: build-apache-stamp build-apache2-stamp build-cgi-stamp build-cli-stamp build-pear-stamp
-build-apache-stamp: configure-apache-stamp
- dh_testdir
- # Add here commands to compile the package.
- cd apache-build && $(MAKE)
-
- touch build-apache-stamp
+build: build-apache2-stamp build-cgi-stamp build-cli-stamp build-pear-stamp
build-apache2-stamp: configure-apache2-stamp
dh_testdir
@@ -180,27 +173,7 @@ build-pear-stamp: build-cgi-stamp
$(CURDIR)/pear-build/usr/bin/peardev
touch build-pear-stamp
-configure: configure-apache-stamp configure-apache2-stamp configure-cli-stamp configure-cgi-stamp
-configure-apache-stamp: prepared-stamp
- dh_testdir
- if [ -d apache-build ]; then rm -rf apache-build; fi
- -mkdir apache-build
- cd apache-build && \
- CFLAGS="$(CFLAGS)" PROG_SENDMAIL="$(PROG_SENDMAIL)" ../configure \
- --prefix=/usr --with-apxs=/usr/bin/apxs \
- --with-config-file-path=/etc/php5/apache \
- --with-config-file-scan-dir=/etc/php5/apache/conf.d \
- $(COMMON_CONFIG) \
- --without-mm \
- --disable-pdo \
- --without-mysql --without-sybase-ct --without-sqlite
- cd apache-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-apache-stamp
+configure: configure-apache2-stamp configure-cli-stamp configure-cgi-stamp
configure-apache2-stamp: prepared-stamp
dh_testdir
@@ -226,6 +199,7 @@ configure-apache2-stamp: prepared-stamp
--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 \
@@ -298,13 +272,11 @@ configure-cli-stamp: prepared-stamp
clean: unprepared
dh_testdir
dh_testroot
- rm -f configure-apache-stamp build-apache-stamp
rm -f configure-apache2-stamp build-apache2-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 apache-build
rm -rf apache2-build
rm -rf cgi-build
rm -rf cli-build
@@ -315,7 +287,7 @@ clean: unprepared
cat debian/modulelist | while read package extname dsoname; do \
rm -f debian/php5-$$package.postinst; \
done
- for sapi in libapache-mod-php5 libapache2-mod-php5 php5-cgi php5-cli; do \
+ for sapi in libapache2-mod-php5 php5-cgi php5-cli; do \
for cruft in postrm links; do \
rm -f debian/$${sapi}.$${cruft}; \
done; \
@@ -331,13 +303,6 @@ install: build
chmod 01733 debian/php5-common/var/lib/php5
# Add here commands to install the package into debian/php5.
- # install apache DSO module
- cp apache-build/.libs/libphp5.so debian/libapache-mod-php5/`apxs -q LIBEXECDIR`
- cp debian/libapache-mod-php5.500mod_php5.info \
- debian/libapache-mod-php5/`apxs -q LIBEXECDIR`/500mod_php5.info
- cp debian/libapache-mod-php5.conf \
- debian/libapache-mod-php5/etc/apache/conf.d/php5.conf
-
# install apache2 DSO module
cp apache2-build/.libs/libphp5.so \
debian/libapache2-mod-php5/`apxs2 -q LIBEXECDIR`/
@@ -369,7 +334,7 @@ install: build
# install extensions
ext=`./debian/libapache2-mod-php5/usr/bin/php-config --extension-dir`;\
- for i in libapache-mod-php5 libapache2-mod-php5 php5-cgi php5-cli; do \
+ for i in libapache2-mod-php5 php5-cgi php5-cli; do \
mkdir -p debian/$$i/$${ext}; \
done; \
cat debian/modulelist debian/extramodulelist | while read package extname dsoname; do \
@@ -474,12 +439,11 @@ binary-arch: build install
# likewise, for the different sapi implementations
for tmpl in postrm links; do \
- for sapi in apache apache2 cgi cli; do \
+ for sapi in apache2 cgi cli; do \
sed -e "s/@sapi@/$$sapi/g" \
< debian/php5-sapi.$$tmpl \
> debian/php5-$${sapi}.$$tmpl; \
done; \
- mv debian/php5-apache.$$tmpl debian/libapache-mod-php5.$$tmpl; \
mv debian/php5-apache2.$$tmpl debian/libapache2-mod-php5.$$tmpl; \
done
@@ -491,7 +455,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 libapache-mod-php5 libapache2-mod-php5; do \
+ for package in php5-dev php5-cgi php5-cli libapache2-mod-php5; do \
rm -rf debian/$$package/usr/share/doc/$$package; \
ln -s php5-common debian/$$package/usr/share/doc/$$package; \
done
@@ -510,7 +474,7 @@ binary-arch: build install
dh_shlibdeps -s
phpapi=`./debian/php5-dev/usr/bin/php-config5 --phpapi`; \
- for i in libapache-mod-php5 libapache2-mod-php5 php5-cgi php5-cli; do \
+ for i in libapache2-mod-php5 php5-cgi php5-cli; do \
echo "php:Provides=phpapi-$${phpapi}" >> debian/$$i.substvars; \
done; \
cat debian/modulelist | while read package extname dsoname; do \
@@ -521,12 +485,11 @@ binary-arch: build install
"$$i"-build/sapi/cli/php -n -r '$(BUILTIN_EXTENSION_CHECK)' \
>> debian/php5-"$$i".substvars; \
done
- for i in apache apache2; do \
+ for i in apache2; do \
"$$i"-build/sapi/cli/php -n -r '$(BUILTIN_EXTENSION_CHECK)' \
>> debian/lib"$$i"-mod-php5.substvars; \
done
- echo "apache:Depends=apache-common (>= $(APACHE_VERSION))" >>debian/libapache-mod-php5.substvars
echo "apache2:Depends=apache2-mpm-prefork (>> 2.0.52) | apache2-mpm-itk, apache2.2-common" >>debian/libapache2-mod-php5.substvars
dh_gencontrol -s
dh_md5sums -s
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-25 08:49:31 +0000