Commit b3463363 authored by Sean Finney's avatar Sean Finney Committed by Mark A. Hershberger

Imported Debian patch 5.2.0-4

parent 9c59b564
php5 (5.2.0-4) unstable; urgency=high
* Re-re-enable LFS support, forward-porting vorlon's fixes in
the php4 tree.
* Add a bit of support in upgrade scripts to avoid unnecessary
ucf prompting during upgrades (closes: #398363).
* Update build-dependencies to reflect that libpcre3-dev >= 6.6
is required. Thanks to Jan Wagner for pointing this out.
* loosen dependencys for libapache2-mod-php5 to allow usage with
apache2-mpm-itk as an alternative to prefork.
Closes: #398580, #398481.
-- sean finney <seanius@debian.org> Wed, 15 Nov 2006 08:33:28 +0100
php5 (5.2.0-3) unstable; urgency=high
* Unify PHP options for pear binaries to:
-d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit="-1"
(Closes: #397625)
* [debian/rules]: Enable PDO building only in apache2 build.
-- Ondřej Surý <ondrej@debian.org> Fri, 10 Nov 2006 14:09:00 +0100
php5 (5.2.0-2) unstable; urgency=high
[ Ondřej Surý ]
* Revert Large File Support for this moment. We will try to found
root of the problem for etch, but we do not promise anything.
(Closes: #397465)
-- Ondřej Surý <ondrej@debian.org> Wed, 8 Nov 2006 01:13:48 +0100
php5 (5.2.0-1) unstable; urgency=high
[ sean finney ]
* new upstream release. since this means the 5.1 series is deadware
in the eyes of its developers, we better get on this train before
it's too late. Note: this also fixes the htmlentities() exploit.
Reference: CVE-2006-5465.
Closes: #396766.
* s/postinst/postrm/ on one critical line in debian/rules. whoops.
Thanks to Bart Martens for finding this (closes: #396873).
* as a pennance i've enabled LFS support (closes: #359686).
* new version now includes all mbstring headers (closes: #391368).
* enable new built-in zip support.
* enable pdo support for currently supported db types, and place the
extensions in the respective extension packages. future db
types will be added, but probably post-etch as they will probably
introduce new packages/dependencies (closes: #348882).
* move the mysqli module into the mysql module's package, and remove
the no longer necessary mysqli package.
* massaging/removal of various patches to upstream changes:
D patches/106-strptime_xopen.patch
D patches/110-CVE-2006-4812_zend_alloc.patch
M patches/006-debian_quirks.patch
D patches/111-mbstring-headers.patch
M patches/053-extension_api.patch
[ Ondřej Surý ]
* Package checked, upload to unstable.
-- Ondřej Surý <ondrej@debian.org> Tue, 7 Nov 2006 09:26:51 +0100
php5 (5.1.6-6) unstable; urgency=high
[ sean finney ]
* add notes to php.ini(-dist) about "unsupported" security features.
patch: 113-php.ini_securitynotes.patch
[ Ondřej Surý ]
* SECURITY: include patch for html buffer overflows in ext/standard/html.c
Reference: CVE-2006-5465
Patch: 114-CVE-2006-5465_htmlentities.patch
Closes: #396766
-- Ondřej Surý <ondrej@debian.org> Fri, 3 Nov 2006 12:32:50 +0100
php5 (5.1.6-5) unstable; urgency=high
[sean finney]
......
......@@ -3,7 +3,7 @@ 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), flex (>= 2.5.4), freetds-dev, libbz2-dev (>= 1.0.0), 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, libmhash-dev (>= 0.8.8), libmysqlclient15-dev | libmysqlclient12-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 4.3-1), libpng12-dev, libpq-dev | postgresql-dev, librecode-dev, libsnmp9-dev | libsnmp-dev, libsqlite0-dev, libssl-dev (>= 0.9.6), libt1-dev, libtool (>= 1.4.2-4), libwrap0-dev, libxmltok1-dev, libxml2-dev (>= 2.4.14), libxslt1-dev (>= 1.0.18), re2c, unixodbc-dev, zlib1g-dev (>= 1.0.9)
Build-Depends: apache-dev (>= 1.3.23), apache2-prefork-dev (>= 2.0.53-3), autoconf, automake1.4, bison, chrpath, debhelper (>= 3), flex (>= 2.5.4), freetds-dev, libapr1-dev (>= 1.2.7-8), libbz2-dev (>= 1.0.0), 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, libmhash-dev (>= 0.8.8), libmysqlclient15-dev | libmysqlclient12-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 6.6), libpng12-dev, libpq-dev | postgresql-dev, librecode-dev, libsnmp9-dev | libsnmp-dev, libsqlite0-dev, libssl-dev (>= 0.9.6), libt1-dev, libtool (>= 1.4.2-4), libwrap0-dev, libxmltok1-dev, libxml2-dev (>= 2.4.14), libxslt1-dev (>= 1.0.18), re2c, unixodbc-dev, zlib1g-dev (>= 1.0.9)
Build-Conflicts: bind-dev
Standards-Version: 3.7.2
......@@ -196,26 +196,14 @@ Description: MHASH module for php5
Package: php5-mysql
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
Conflicts: php5-mysqli
Replaces: php5-mysqli
Description: MySQL module for php5
This package provides a module for MySQL database connections directly from
PHP scripts. This generic module can be used to connect to all versions of
MySQL, however when connecting to MySQL servers greater than version 4.1,
you may want to consider using the interface provided by the php5-mysqli
extension.
.
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.
Package: php5-mysqli
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
Description: MySQL Improved module for php5
This package provides a module for MySQL database connections directly from
PHP scripts. This new "Improved" interface should only be used to connect
to MySQL databases greater than version 4.1. For older MySQL servers,
please use the functions from the php5-mysql extension instead.
This package provides modules for MySQL database connections directly from
PHP scripts. It includes the generic "mysql" module which can be used
to connect to all versions of MySQL, an improved "mysqli" module for
MySQL version 4.1 or later, and the pdo_mysql module for use with
the PHP Data Object extension.
.
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
......@@ -227,7 +215,8 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
Description: ODBC module for php5
This package provides a module for database access through ODBC drivers.
It uses the unixODBC library as an ODBC provider.
It uses the unixODBC library as an ODBC provider. It also contains the
pdo_odbc module, for use with the PHP Data Object extension.
.
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
......@@ -239,7 +228,8 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
Description: PostgreSQL module for php5
This package provides a module for PostgreSQL database connections
directly from PHP scripts.
directly from PHP scripts. It also includes the pdo_pgsql module for
use with the PHP Data Object extension.
.
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
......@@ -274,7 +264,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${So
Description: SQLite module for php5
This package provides a module allowing you to use the SQLite self-contained
database engine from within your PHP scripts, eliminating the need for a full
SQL server installation like MySQL or PostgreSQL.
SQL server installation like MySQL or PostgreSQL. It also includes the
pdo_sqlite module, for use with the PHP Data Object extension.
.
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
......
mysql MySQL mysqli
mysql MySQL pdo_mysql
common PHP5Common pdo
odbc ODBC pdo_odbc
pgsql PostgreSQL pdo_pgsql
sqlite SQLite pdo_sqlite
#!/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
#!/bin/sh
set -e
#DEBHELPER#
if [ "$1" != "configure" ]; then
exit 0
fi
phpini="/etc/php5/apache2/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
reload_apache()
{
if apache2ctl configtest 2>/dev/null; then
invoke-rc.d apache2 force-reload || true
else
echo "Your apache2 configuration is broken, so we're not restarting it for you."
fi
}
if [ -n "$2" ]; then
# we're upgrading. test if we're enabled, and if so, restart to reload the module.
if [ -e /etc/apache2/mods-enabled/php5.load ]; then
reload_apache
fi
exit 0
fi
if [ -e /etc/apache2/apache2.conf ]; then
# Enable the module, but hide a2enmod's misleading message about apachectl
# and force-reload the thing ourselves.
a2enmod php5 >/dev/null || true
reload_apache
fi
exit 0
......@@ -3,7 +3,6 @@ gd GD
ldap LDAP
mhash MHASH
mysql MySQL
mysqli MySQLi
odbc ODBC
pgsql PostgreSQL
recode recode
......
......@@ -325,15 +325,17 @@ diff -uNr php-5.0.4.orig/scripts/Makefile.frag php-5.0.4/scripts/Makefile.frag
diff -uNr php-5.0.4.orig/scripts/php-config.in php-5.0.4/scripts/php-config.in
--- php-5.0.4.orig/scripts/php-config.in 2005-03-16 07:36:54.000000000 +0100
+++ php-5.0.4/scripts/php-config.in 2005-04-27 11:14:32.936964136 +0200
@@ -3,7 +3,7 @@
prefix="@prefix@"
@@ -3,8 +3,8 @@
exec_prefix="@exec_prefix@"
version="@PHP_VERSION@"
version_id="@PHP_VERSION_ID@"
-includedir="@includedir@/php"
+includedir="@includedir@/php5"
includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend -I$includedir/ext"
-includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend -I$includedir/ext -I$includedir/ext/date/lib"
+includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend -I$includedir/ext -I$includedir/ext/date/lib $(getconf LFS_CFLAGS)"
ldflags="@PHP_LDFLAGS@"
libs="@EXTRA_LIBS@"
extension_dir='@EXTENSION_DIR@'
diff -uNr php-5.0.4.orig/scripts/phpize.in php-5.0.4/scripts/phpize.in
--- php-5.0.4.orig/scripts/phpize.in 2005-01-25 13:54:57.000000000 +0100
+++ php-5.0.4/scripts/phpize.in 2005-04-27 11:14:32.943963072 +0200
......
diff -ur php-5.0.4/configure.in php5-5.0.4/configure.in
--- php-5.0.4/configure.in 2005-03-31 07:43:12.000000000 +1000
+++ php5-5.0.4/configure.in 2005-07-31 02:35:46.000000000 +1000
@@ -1039,8 +1039,10 @@
@@ -1039,8 +1039,13 @@
ZEND_MODULE_API_NO=`$EGREP '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|$SED 's/#define ZEND_MODULE_API_NO //'`
+DEBIAN_PHP_API=`egrep -h '^#define ZEND_EXTENSION_API_NO|^#define ZEND_MODULE_API_NO|#define PHP_API_VERSION' $srcdir/Zend/zend_extensions.h $srcdir/Zend/zend_modules.h $srcdir/main/php.h | awk '{print $3}' | sed -e 's/^2200/200/' | sort -n | tail -n 1`
+if echo "$CPPFLAGS $CFLAGS" | grep -q -- -D_FILE_OFFSET_BITS=64; then
+ DEBIAN_PHP_API="${DEBIAN_PHP_API}+lfs"
+fi
+
if test -z "$EXTENSION_DIR"; then
- extbasedir=$ZEND_MODULE_API_NO
......@@ -32,7 +35,7 @@ diff -ur php-5.0.4/scripts/php-config.in php5-5.0.4/scripts/php-config.in
case "$1" in
--prefix)
@@ -28,10 +29,12 @@
@@ -28,12 +29,14 @@
echo $includedir;;
--php-binary)
echo $php_binary;;
......@@ -40,9 +43,11 @@ diff -ur php-5.0.4/scripts/php-config.in php5-5.0.4/scripts/php-config.in
+ echo $phpapi;;
--version)
echo $version;;
--vernum)
echo $version_id;;
*)
- echo "Usage: $0 [--prefix|--includes|--ldflags|--libs|--extension-dir|--include-dir|--php-binary|--version]"
+ echo "Usage: $0 [--prefix|--includes|--ldflags|--libs|--extension-dir|--include-dir|--php-binary|--phpapi|--version]"
- echo "Usage: $0 [--prefix|--includes|--ldflags|--libs|--extension-dir|--include-dir|--php-binary|--version|--vernum]"
+ echo "Usage: $0 [--prefix|--includes|--ldflags|--libs|--extension-dir|--include-dir|--php-binary|--phpapi|--version|--vernum]"
exit 1;;
esac
--- php5-5.1.1.0/ext/standard/datetime.c.orig 2005-08-04 00:07:57.000000000 +1000
+++ php5-5.1.1.0/ext/standard/datetime.c 2006-01-11 18:43:28.000000000 +1100
@@ -20,11 +20,11 @@
/* $Id: datetime.c,v 1.134.2.2 2006/01/01 12:50:14 sniper Exp $ */
+#include "php.h"
#if HAVE_STRPTIME
#define _XOPEN_SOURCE
#endif
-#include "php.h"
#include "zend_operators.h"
#include "datetime.h"
#include "php_globals.h"
--- php5.old/Zend/zend_alloc.c 2006/09/14 08:55:17 1.161
+++ php5/Zend/zend_alloc.c 2006/09/30 17:17:31 1.162
@@ -1730,15 +1730,14 @@
ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
{
void *p;
- int final_size = size*nmemb;
HANDLE_BLOCK_INTERRUPTIONS();
- p = _emalloc(final_size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+ p = _safe_emalloc(nmemb, size, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
if (!p) {
HANDLE_UNBLOCK_INTERRUPTIONS();
return (void *) p;
}
- memset(p, 0, final_size);
+ memset(p, 0, size * nmemb);
HANDLE_UNBLOCK_INTERRUPTIONS();
return p;
}
--- php5.old/ext/mbstring/config.m4 2006-10-27 15:58:10.000000000 +0200
+++ php5.new/ext/mbstring/config.m4 2006-10-27 15:59:09.000000000 +0200
@@ -293,7 +293,7 @@
dnl libmbfl is required
PHP_MBSTRING_SETUP_LIBMBFL
PHP_MBSTRING_EXTENSION
- PHP_INSTALL_HEADERS([ext/mbstring], [libmbfl/ libmbfl/mbfl])
+ PHP_INSTALL_HEADERS([ext/mbstring], [libmbfl/ libmbfl/mbfl/])
fi
# vim600: sts=2 sw=2 et
--- old/php.ini-dist 2006-10-30 18:39:00.000000000 +0100
+++ new/php.ini-dist 2006-10-30 18:40:49.000000000 +0100
@@ -165,6 +165,11 @@
;
; Safe Mode
;
+; NOTE: this is considered a "broken" security measure.
+; Applications relying on this feature will not recieve full
+; support by the security team. For more information please
+; see /usr/share/doc/php5-common/README.Debian.security
+;
safe_mode = Off
; By default, Safe Mode does a UID compare check when
@@ -201,6 +206,13 @@
; and below. This directive makes most sense if used in a per-directory
; or per-virtualhost web server configuration file. This directive is
; *NOT* affected by whether Safe Mode is turned On or Off.
+
+; NOTE: this is considered a "broken" security measure.
+; Applications relying on this feature will not recieve full
+; support by the security team. For more information please
+; see /usr/share/doc/php5-common/README.Debian.security
+;
+
;open_basedir =
; This directive allows you to disable certain functions for security reasons.
@@ -396,6 +408,11 @@
; You should do your best to write your scripts so that they do not require
; register_globals to be on; Using form variables as globals can easily lead
; to possible security problems, if the code is not very well thought of.
+
+; NOTE: applications relying on this feature will not recieve full
+; support by the security team. For more information please
+; see /usr/share/doc/php5-common/README.Debian.security
+;
register_globals = Off
; Whether or not to register the old-style input arrays, HTTP_GET_VARS
#!/bin/sh
set -e
#DEBHELPER#
if [ "$1" != "configure" ]; then
exit 0
fi
phpini="/etc/php5/cgi/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
update-alternatives \
--install /usr/bin/php-cgi php-cgi /usr/bin/php5-cgi 50 \
--slave /usr/share/man/man1/php-cgi.1.gz php-cgi.1.gz /usr/share/man/man1/php5-cgi.1.gz
update-alternatives \
--install /usr/lib/cgi-bin/php php-cgi-bin /usr/lib/cgi-bin/php5 50
exit 0
#!/bin/sh
set -e
#DEBHELPER#
if [ "$1" != "configure" ]; then
exit 0
fi
phpini="/etc/php5/cli/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.cli $phpini
fi
fi
fi
# END LEGACY SUPPORT
ucf /usr/share/php5/php.ini-dist.cli $phpini
update-alternatives \
--install /usr/bin/php php /usr/bin/php5 50 \
--slave /usr/share/man/man1/php.1.gz php.1.gz /usr/share/man/man1/php5.1.gz
exit 0
......@@ -111,7 +111,7 @@ central configuration file /etc/php5/$SAPI/php.ini.
Additionally, each SAPI is configured with the compile-time option
--with-config-file-scan-dir=/etc/php5/SAPI/conf.d
--with-config-file-scan-dir=/etc/php5/$SAPI/conf.d
which for all SAPI's is actually a symlink pointing to a central
directory /etc/php5/conf.d. Any file found in this directory ending
......
......@@ -28,8 +28,9 @@ 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
LFSFLAGS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
CFLAGS = -O2 -Wall -fsigned-char -fno-strict-aliasing
# LFS support
CFLAGS += $(shell getconf LFS_CFLAGS)
# Enable IEEE-conformant floating point math on alphas (not the default)
ifeq (alpha-linux,$(PHP5_HOST_GNU_TYPE))
......@@ -89,8 +90,8 @@ COMMON_CONFIG=--build=$(PHP5_BUILD_GNU_TYPE)-gnu \
--with-kerberos=/usr \
--with-openssl=/usr \
--enable-dbx \
--disable-pdo \
--enable-soap \
--enable-zip \
--with-mime-magic=$(MAGIC_MIME) \
--with-exec-dir=/usr/lib/php5/libexec
......@@ -168,6 +169,13 @@ build-pear-stamp: build-cgi-stamp
dh_testdir
-mkdir pear-build
cd cgi-build && make install-pear PHP_PEAR_PHP_BIN=/usr/bin/php PHP_PEAR_INSTALL_DIR=/usr/share/php PHP_PEAR_SYSCONF_DIR=/etc/pear PHP_PEAR_SIG_BIN=/usr/bin/gpg INSTALL_ROOT=$(CURDIR)/pear-build
sed -i -e 's/-d output_buffering=1 -d open_basedir="" -d safe_mode=0/-d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit="-1"/' \
$(CURDIR)/pear-build/usr/bin/pear && \
sed -i -e 's/-d output_buffering=1 -d safe_mode=0/-d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit="-1"/' \
$(CURDIR)/pear-build/usr/bin/pecl && \
sed -i -e 's/-d memory_limit="-1"//' \
-e 's/-d output_buffering=1 -d open_basedir="" -d safe_mode=0/-d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit="-1"/' \
$(CURDIR)/pear-build/usr/bin/peardev
touch build-pear-stamp
configure: configure-apache-stamp configure-apache2-stamp configure-cli-stamp configure-cgi-stamp
......@@ -222,7 +230,14 @@ configure-apache2-stamp: patch-stamp
--with-sqlite=shared,/usr \
--with-sybase-ct=shared,/usr \
--with-xmlrpc=shared \
--with-pgsql=shared,/usr PGSQL_INCLUDE=`pg_config --includedir`
--with-pgsql=shared,/usr PGSQL_INCLUDE=`pg_config --includedir` \
--enable-pdo=shared \
--without-pdo-dblib \
--without-pdo-firebird \
--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 apache2-build && \
cp ../Zend/zend_ini_scanner.c ../Zend/zend_language_scanner.c \
../Zend/zend_ini_parser.h ../Zend/zend_language_parser.h \
......@@ -291,7 +306,7 @@ clean: unpatch
rm -f debian/php5-$$package.postinst; \
done
for sapi in libapache-mod-php5 libapache2-mod-php5 php5-cgi php5-cli; do \
for cruft in postinst links; do \
for cruft in postrm links; do \
rm -f debian/$${sapi}.$${cruft}; \
done; \
done
......@@ -347,7 +362,7 @@ install: build
for i in libapache-mod-php5 libapache2-mod-php5 php5-cgi php5-cli; do \
mkdir -p debian/$$i/$${ext}; \
done; \
cat debian/modulelist | while read package extname dsoname; do \
cat debian/modulelist debian/extramodulelist | while read package extname dsoname; do \
if [ -z "$$dsoname" ]; then dsoname=$$package; fi; \
mkdir -p debian/php5-$$package$${ext}; \
chrpath debian/libapache2-mod-php5/$${ext}/$$dsoname.so; \
......@@ -430,18 +445,25 @@ binary-arch: build install
dh_testroot
# Do this first so we don't overwrite any debhelper-generated files
#
# generate the config snippets and maintscripts for various php
# generate the maintscripts for various php
# modules from the templates.
cat debian/modulelist | while read package extname dsoname; do \
if [ -z "$$dsoname" ]; then dsoname=$$package; fi; \
mkdir -p debian/php5-$$package/etc/php5/conf.d; \
sed -e"s/@extname@/$$extname/g; s/@dsoname@/$$dsoname/g" \
< debian/php5-module.ini \
> debian/php5-$${package}/etc/php5/conf.d/$${package}.ini; \
sed -e"s/@extname@/$$extname/g; s/@dsoname@/$$dsoname/g" \
< debian/php5-module.postinst \
> debian/php5-$${package}.postinst; \
done
# generate the config snippets for various php
# modules from the templates.
cat debian/modulelist debian/extramodulelist | while read package extname dsoname; do \
if [ -z "$$dsoname" ]; then dsoname=$$package; fi; \
mkdir -p debian/php5-$$package/etc/php5/conf.d; \
sed -e"s/@extname@/$$extname/g; s/@dsoname@/$$dsoname/g" \
< debian/php5-module.ini \
> debian/php5-$${package}/etc/php5/conf.d/$${dsoname}.ini; \
done
# likewise, for the different sapi implementations
for tmpl in postrm links; do \
for sapi in apache apache2 cgi cli; do \
......@@ -497,7 +519,7 @@ binary-arch: build install
done
echo "apache:Depends=apache-common (>= $(APACHE_VERSION))" >>debian/libapache-mod-php5.substvars
echo "apache2:Depends=apache2-mpm-prefork (>> 2.0.52), 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-php5.substvars
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment