[Pkg-php-commits] r1178 - in php5/branches/lenny/debian: . patches
Sean Finney
seanius at alioth.debian.org
Sat Dec 6 14:01:05 UTC 2008
tags 243214 pending
tags 321460 pending
tags 331034 pending
tags 388808 pending
tags 413712 pending
tags 423296 pending
tags 429981 pending
tags 434351 pending
tags 459814 pending
tags 463979 pending
tags 471324 pending
tags 471548 pending
tags 478613 pending
tags 478995 pending
tags 481737 pending
tags 482517 pending
tags 483461 pending
tags 492025 pending
tags 494230 pending
tags 495575 pending
tags 498621 pending
tags 499987 pending
tags 499988 pending
tags 499989 pending
thanks
Author: seanius
Date: 2008-12-06 14:01:05 +0000 (Sat, 06 Dec 2008)
New Revision: 1178
Added:
php5/branches/lenny/debian/libapache2-mod-php5.postrm
php5/branches/lenny/debian/libapache2-mod-php5filter.postrm
php5/branches/lenny/debian/patches/CVE-2008-3658.patch
php5/branches/lenny/debian/patches/CVE-2008-3659.patch
php5/branches/lenny/debian/patches/CVE-2008-3660.patch
php5/branches/lenny/debian/patches/bad_whatis_entries.patch
php5/branches/lenny/debian/patches/deprecated_freetds_check.patch
php5/branches/lenny/debian/patches/libedit_is_editline.patch
php5/branches/lenny/debian/patches/snmp_leaks.patch
php5/branches/lenny/debian/php5-dev.lintian-overrides
Removed:
php5/branches/lenny/debian/patches/027-readline_is_editline.patch
php5/branches/lenny/debian/patches/118-simplexml-segv.patch
Modified:
php5/branches/lenny/debian/NEWS
php5/branches/lenny/debian/changelog
php5/branches/lenny/debian/control
php5/branches/lenny/debian/copyright.header
php5/branches/lenny/debian/libapache2-mod-php5.postinst
php5/branches/lenny/debian/libapache2-mod-php5.prerm
php5/branches/lenny/debian/patches/033-we_WANT_libtool.patch
php5/branches/lenny/debian/patches/CVE-2008-2829.patch
php5/branches/lenny/debian/patches/series
php5/branches/lenny/debian/patches/suhosin.patch
php5/branches/lenny/debian/php5-common.README.Debian
php5/branches/lenny/debian/php5-dev.dirs
php5/branches/lenny/debian/rules
Log:
merge from trunk
Modified: php5/branches/lenny/debian/NEWS
===================================================================
--- php5/branches/lenny/debian/NEWS 2008-11-29 18:48:20 UTC (rev 1177)
+++ php5/branches/lenny/debian/NEWS 2008-12-06 14:01:05 UTC (rev 1178)
@@ -1,3 +1,26 @@
+php5 (5.2.6-1) unstable; urgency=medium
+
+ * Now uses system timezone database.
+
+ Debian PHP now makes use of the system wide timezone database from the
+ tzdata package, making sure any updates there are automatically used
+ by PHP aswell. Note that this requires that the PHP process has access
+ to /etc/localtime and /usr/share/zoneinfo (this is usually the case).
+
+ * New php5-dbg package.
+
+ We are now shipping a php5-dgb package which will greatly aid in finding
+ the cause of many crashes that you may experience. So if you are going to
+ report a bug for a reproducible crash, please install this package before
+ sending a backtrace.
+
+ * New libapache2-mod-php5filter package.
+
+ We are now also shipping a new libapache2-mod-php5filter package which
+ uses the "Apache 2.0 filter-module support via DSO through APXS".
+
+ -- Thijs Kinkhorst <thijs at debian.org> Wed, 23 Jul 2008 17:42:06 +0200
+
php5 (5.2.3-2) unstable; urgency=low
The suhosin patch is now enabled by default!
Modified: php5/branches/lenny/debian/changelog
===================================================================
--- php5/branches/lenny/debian/changelog 2008-11-29 18:48:20 UTC (rev 1177)
+++ php5/branches/lenny/debian/changelog 2008-12-06 14:01:05 UTC (rev 1178)
@@ -1,9 +1,164 @@
-php5 (5.2.5-3+lenny3) UNRELEASED; urgency=low
+php5 (5.2.6-6) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ * Not released yet.
+ * Updated system tzdata patch from Joe Orton.
+ * Removed tzdb-nofree_ents_ifnotzdata.patch, which is now incorporated
+ into Joe's patch.
- -- Sean Finney <seanius at debian.org> Wed, 02 Jul 2008 08:05:05 +0200
+ -- Sean Finney <seanius at debian.org> Thu, 06 Nov 2008 08:23:12 +0100
+php5 (5.2.6-5) unstable; urgency=high
+
+ * Update debian/copyright to document that the DFSG-unfree email
+ requirement in ext/standard/rand.c has been rescinded by the
+ copyrightholder (Closes: #498621).
+
+ -- Thijs Kinkhorst <thijs at debian.org> Sun, 05 Oct 2008 11:32:35 +0200
+
+php5 (5.2.6-4) unstable; urgency=high
+
+ [ Sean Finney ]
+ * Take three unreleased fixes from upstream CVS:
+ - CVE-2008-3658: Buffer overflow in the imageloadfont function.
+ Patch: CVE-2008-3658.patch (closes: #499989)
+ - CVE-2008-3659: Buffer overflow in the memnstr function.
+ Patch: CVE-2008-3659.patch (closes: #499988)
+ - CVE-2008-3660: Remote DoS in fastcgi module
+ Patch: CVE-2008-3660.patch (closes: #499987)
+
+ [ Raphael Geissert ]
+ * snmp_leaks.patch: fixes memory leaks in the snmp extension (Closes: #423296)
+ - Thanks to Rodrigo Campos <rodrigocc at gmail.com> for the follow up
+ - Thanks to Federico Cuello for the original patch
+ * php5-dev.lintian-override: fix it so it actually works
+
+ -- Sean Finney <seanius at debian.org> Sun, 14 Sep 2008 14:25:11 +0200
+
+php5 (5.2.6-3) unstable; urgency=high
+
+ [ Thijs Kinkhorst ]
+ * Drop unneeded php5-timezonedb Suggests and obsolete php3 Conflicts.
+ * Add documentation about the timezonedb change (Closes: #492025).
+
+ [ Adam Conrad ]
+ * Modify 033-we_WANT_libtool.patch to cope with newer versions of
+ libtool that only copy auxilliary files when --install is used,
+ while still working with older versions that DTRT without.
+
+ [ Raphael Geissert ]
+ * debian/rules:
+ + Avoid installing useless test suites in php-pear (Closes: #478995)
+ + Remove any empty directory in php-pear
+ + Also get rid of usr/share/php/data/Structures_Graph/*
+ - Those were meant to be used by upstream maintainer
+ * debian/php5-dev.lintian-overrides:
+ - usr/lib/php5/build/run-tests.php is not meant to be used directly
+ * debian/control: bumped Standards Version to 3.8.0, no changes needed
+ * bad_whatis_entries.patch: fixes the whatis entries of all the manpages
+ * deprecated_freetds_check.patch: fixes the freetds detection routine
+ + Closes: #494230
+ - Thanks to jklowden at freetds.org and the Gentoo folks for the patch
+ (RC bugfix, upload urgency bumped)
+ * debian/libapache2-mod-php5*-{prerm,postinst}:
+ - Create a status file when removing the package (but not purging)
+ while having the mod enabled so reinstallation of the package
+ does not end up disabling the module (Closes: #471548)
+
+ [ Sean Finney ]
+ * Bump dependency on libmysqlclient15off to require the version from
+ lenny or later, in order to avoid subtle problems not previously detected
+ with libmysqlclient_r on mixed etch/lenny/sid systems (closes: #495575).
+
+ -- Sean Finney <seanius at debian.org> Wed, 20 Aug 2008 19:32:02 +0200
+
+php5 (5.2.6-2) unstable; urgency=high
+
+ [ Raphael Geissert ]
+ * Lintian-based changes:
+ - also install a lintian override for libapache2-mod-php5filter
+ - fixed the generic lintian overrides so they are meaningful
+ - dropping linda overrides, linda is gone now
+ - s/meta-package/metapackage
+ * debian/control:
+ - Updated php5's description so it mentions three instead of
+ only two server-side SAPIs
+ - Depend on php5-cli in php-pear (Closes: #482517)
+ + Previous change reverted because of PEAR packages FTBFS
+ - {B-,}Depend on tzdata to avoid crashes caused by the tz ext patch
+ - Dropped some versioned {b-,}dependencies that are satisified
+ even on sarge
+ * php.ini-*: state that when using a custom save_path,
+ gc_probability should also be set (Closes: #388808, #321460)
+ * tzdb-nofree_ents_ifnotzdata.patch: avoid free'ing ents when the tz dir does
+ not exist (Closes: #483461)
+
+php5 (5.2.6-1) unstable; urgency=medium
+
+ [ Sean Finney ]
+ * Fix for CVE-2008-2829: unsafe usage of deprecated imap functions
+ Patch: CVE-2008-2829.patch
+ * Modifications to suhosin.patch due to alignment problems on some
+ architectures. Thanks to Stefan Esser for the initial suggestion.
+ (Closes: #481737).
+ * Rename the apache2 filter module to libphp5filter.so, to prevent
+ conflicting filenames for symbols in the debug package.
+
+ [ Raphael Geissert ]
+ * Build a php5-dbg package with the debug symbols of the SAPIs & extensions
+ + Bump debhelper dependency to >= 5 as dh_strip behaves differently.
+ * debian/watch: refactored so it can actually be used to download the tarball
+ * debian/rules: removed bashisms (Closes: #478613)
+ * debian/control: add a notice about Suhosin being applied (Closes: #471324)
+ + Additionally make sure the PHP boilerplate is the same for each package
+ * debian/patches/manpage_spelling.patch:
+ - fix spelling mistakes in man page (Closes: #413712)
+ * debian/NEWS: s/suhosin/Suhosin (Closes: #434351)
+ * debian/control: removed ORed postgresql-dev build-dep (Closes: #429981)
+ + postgresql-dev is a transitional package since etch
+ * Override the following lintian messages:
+ + SAPI packages package-contains-empty-directory usr/lib/php5/20060613+lfs/
+ + php5-common package-contains-empty-directory usr/lib/php5/libexec/
+ * Set our custom PHP_PEAR_DOWNLOAD_DIR when building the pear stuff
+ + Avoids the creation of /tmp/pear (Closes: #463979)
+ * Replaced all 'make' with '$(MAKE)' so any extra flag is preserved
+ * debian/rules: s/DEB_BUILD_ARCH/DEB_HOST_ARCH
+ + HOST is the machine the package is built for.
+ * Recommend php5-cli instead of depending on it in php-pear (Closes: #243214)
+ + php5-cli is only needed by the, rearely used, pear installer
+ * debian/README.source: inform how to generate php5-dbg's Depends
+ * debian/patches/029-php.ini_paranoid.patch: updated (Closes: #459814)
+ + Thanks to Javier Fernández-Sanguino Peña <jfs at computer.org>
+ Changes:
+ - includes some variables which were no present in the first version and
+ removes modules not available in PHP5. Also fixes typos in comments which
+ have since been fixed in php.ini-dist
+ - adds notes (Debian-specific) of which security features applications
+ should not rely on
+ - add more information of why some variables were enabled
+ - reorder the description of changes to suit the location in the config file
+ - add notes of deprecated features in PHP6
+ - add more (suggested) changes to the session module to make a more secure
+ use and storage of session IDs.
+ - remove the 'include' function from the list of disabled functions as it
+ is quite common for most applications
+ - modify the valid 'include_path' to make it really paranoid ('.' is not
+ allowed anymore)
+ - adjust locations of directories, including the upload dir and session dir
+ - proper definition for sql.safe_mode and description (missing in
+ php.ini-dist of what it is really for)
+ - added session configuration variables which are not available in
+ php.ini-dist together with recommended paranoid values
+ (session.referer_check, session.entropy_file, session.entropy_length)
+ - added more information to session configuration (not available in php.ini)
+ based on the information at php.net
+ * Lintian-based changes:
+ - debian/php5-common.dirs: do NOT create usr/share/doc/php5-common/PEAR/
+ - fixed a hyphen-used-as-minus-sign in php5(1):319
+ - get rid of usr/share/php/data/Structures_Graph/LICENSE in php-pear
+ * Move /usr/share/php/docs to /usr/share/doc/pear-php/PEAR (Closes: #331034)
+
+ -- Sean Finney <seanius at debian.org> Thu, 03 Jul 2008 08:14:45 +0200
+
php5 (5.2.5-3+lenny2) testing-security; urgency=low
* Security upload for testing to bypass current blockage in unstable.
Modified: php5/branches/lenny/debian/control
===================================================================
--- php5/branches/lenny/debian/control 2008-11-29 18:48:20 UTC (rev 1177)
+++ php5/branches/lenny/debian/control 2008-12-06 14:01:05 UTC (rev 1178)
@@ -2,27 +2,27 @@
Section: web
Priority: optional
Maintainer: Debian PHP Maintainers <pkg-php-maint at lists.alioth.debian.org>
-Uploaders: Adam Conrad <adconrad at 0c3.net>, Steve Langasek <vorlon at debian.org>, Jeroen van Wolffelaar <jeroen at wolffelaar.nl>, Ondřej Surý <ondrej at debian.org>, Sean Finney <seanius at debian.org>
-Build-Depends: apache2-prefork-dev (>= 2.0.53-3), autoconf, automake1.4, bison, chrpath, debhelper (>= 3), firebird2.0-dev [i386 amd64 powerpc sparc] | firebird1.5-dev [i386 amd64] | firebird2-dev [i386 amd64], flex (>= 2.5.4), freetds-dev, libapr1-dev (>= 1.2.7-8), libbz2-dev (>= 1.0.0), libc-client-dev, libcurl4-openssl-dev | libcurl-dev, libdb4.6-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev (>= 2.0.28-3), libgmp3-dev, 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, 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)
+Uploaders: Adam Conrad <adconrad at 0c3.net>, Jeroen van Wolffelaar <jeroen at wolffelaar.nl>, Ondřej Surý <ondrej at debian.org>, Sean Finney <seanius at debian.org>, Thijs Kinkhorst <thijs at debian.org>
+Build-Depends: apache2-prefork-dev, autoconf, automake1.4, bison, chrpath, debhelper (>= 5), firebird2.0-dev [i386 amd64 powerpc sparc] | firebird1.5-dev [i386 amd64] | firebird2-dev [i386 amd64], flex, freetds-dev, libapr1-dev (>= 1.2.7-8), libbz2-dev, libc-client-dev, libcurl4-openssl-dev | libcurl-dev, libdb4.6-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev, libgmp3-dev, 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, libpspell-dev, librecode-dev, libsasl2-dev, libsnmp-dev, libsqlite0-dev, libssl-dev, libt1-dev, libtidy-dev, libtool, libwrap0-dev, libxmltok1-dev, libxml2-dev, libxslt1-dev (>= 1.0.18), quilt, re2c, unixodbc-dev, zlib1g-dev, tzdata
Build-Conflicts: bind-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/pkg-php/php5/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-php/php5/trunk
Homepage: http://www.php.net/
Package: php5
Architecture: all
-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 two server-side versions of the PHP5 interpreter
- installed. Removing this package won't remove PHP5 from your system, however
+Depends: libapache2-mod-php5 (>= ${source:Version}) | libapache2-mod-php5filter (>= ${source:Version}) | php5-cgi (>= ${source:Version}), php5-common (>= ${source:Version})
+Description: server-side, HTML-embedded scripting language (metapackage)
+ This package is a metapackage that, when installed, guarantees that you
+ have at least one of the three server-side versions of the PHP5 interpreter
+ installed. Removing this package won't remove PHP5 from your system, however
it may remove other packages that depend on this one.
.
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.
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-common
Architecture: any
@@ -36,14 +36,14 @@
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.
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: libapache2-mod-php5
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), ${apache2:Depends}, php5-common (= ${binary:Version}), libmagic1, ucf
-Conflicts: libapache2-mod-php4
+Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support, ${apache2:Depends}, php5-common (= ${binary:Version}), libmagic1, ucf, tzdata
+Conflicts: libapache2-mod-php4, libapache2-mod-php5filter
Provides: ${php:Provides}
-Suggests: php-pear, php5-timezonedb
+Suggests: php-pear
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
@@ -54,14 +54,34 @@
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.
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
+Package: libapache2-mod-php5filter
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support, ${apache2:Depends}, php5-common (= ${binary:Version}), libmagic1, ucf, tzdata
+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.
+ .
+ Unless you specifically need filter-module support, you most likely
+ should instead install libapache2-mod-php5.
+ .
+ ${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. This version of PHP5 was built with the Suhosin patch.
+
Package: php5-cgi
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), php5-common (= ${binary:Version}), libmagic1, ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support, php5-common (= ${binary:Version}), libmagic1, ucf, tzdata
Provides: ${php:Provides}
-Conflicts: php3 (<= 3.0.18-1)
-Suggests: php-pear, php5-timezonedb
+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 2 with mod_actions, or any other CGI httpd that
@@ -73,25 +93,24 @@
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.
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-cli
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), php5-common (= ${binary:Version}), libmagic1, ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support, php5-common (= ${binary:Version}), libmagic1, ucf, tzdata
Provides: ${php:Provides}
-Conflicts: php3 (<= 3.0.18-1)
-Suggests: php-pear, php5-timezonedb
+Suggests: php-pear
Description: command-line interpreter for the php5 scripting language
This package provides the /usr/bin/php5 command interpreter, useful for
testing PHP scripts from a shell, or perhaps even performing general
- shell scripting tasks, if you're frightened of perl and python.
+ shell scripting tasks, if you're frightened of Perl and Python.
.
${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.
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-dev
Depends: autoconf, automake1.4, libssl-dev, libtool, shtool, php5-common (>= ${binary:Version})
@@ -103,12 +122,27 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
+Package: php5-dbg
+Depends: php5-common (= ${binary:Version}), libapache2-mod-php5 (= ${binary:Version}) | libapache2-mod-php5filter (= ${binary:Version}) | php5-cgi (= ${binary:Version}) | php5-cli (= ${binary:Version}) | php5-curl (= ${binary:Version}) | php5-gd (= ${binary:Version}) | php5-gmp (= ${binary:Version}) | php5-imap (= ${binary:Version}) | php5-interbase (= ${binary:Version}) | php5-ldap (= ${binary:Version}) | php5-mcrypt (= ${binary:Version}) | php5-mhash (= ${binary:Version}) | php5-mysql (= ${binary:Version}) | php5-odbc (= ${binary:Version}) | php5-pgsql (= ${binary:Version}) | php5-pspell (= ${binary:Version}) | php5-recode (= ${binary:Version}) | php5-snmp (= ${binary:Version}) | php5-sqlite (= ${binary:Version}) | php5-sybase (= ${binary:Version}) | php5-tidy (= ${binary:Version}) | php5-xmlrpc (= ${binary:Version}) | php5-xsl (= ${binary:Version})
+Recommends: gdb
+Section: devel
+Priority: extra
+Architecture: any
+Description: Debug symbols for PHP5
+ This package provides the debug symbols for PHP5 needed for properly
+ debugging errors in PHP5 with gdb.
+ .
+ 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 dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
+
Package: php-pear
Architecture: all
-Depends: php5-cli | php4-cli, php5-common (>= ${source:Version})
+Depends: php5-common (>= ${source:Version}), php5-cli | php4-cli
Recommends: gnupg
Suggests: php5-dev | php4-dev
Replaces: php4-pear (<< 4:4.4.0-0)
@@ -121,8 +155,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-curl
Architecture: any
@@ -132,8 +166,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-gd
Architecture: any
@@ -144,8 +178,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-gmp
Architecture: any
@@ -156,8 +190,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-imap
Architecture: any
@@ -167,8 +201,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-interbase
Architecture: i386 amd64 powerpc sparc
@@ -178,8 +212,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-ldap
Architecture: any
@@ -189,8 +223,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-mcrypt
Architecture: any
@@ -200,8 +234,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-mhash
Architecture: any
@@ -211,12 +245,12 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-mysql
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
+Depends: libmysqlclient15off (>= 5.0.51a), ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
Conflicts: php5-mysqli
Replaces: php5-mysqli
Description: MySQL module for php5
@@ -228,8 +262,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-odbc
Architecture: any
@@ -241,8 +275,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-pgsql
Architecture: any
@@ -254,8 +288,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-pspell
Architecture: any
@@ -265,8 +299,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-recode
Architecture: any
@@ -276,8 +310,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-snmp
Architecture: any
@@ -287,8 +321,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-sqlite
Architecture: any
@@ -301,8 +335,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-sybase
Architecture: any
@@ -315,8 +349,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-tidy
Architecture: any
@@ -331,8 +365,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-xmlrpc
Architecture: any
@@ -342,8 +376,8 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Package: php5-xsl
Architecture: any
@@ -353,6 +387,6 @@
.
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.
+ in. The goal of the language is to allow web developers to write dinamically
+ generated pages quickly. This version of PHP5 was built with the Suhosin patch.
Modified: php5/branches/lenny/debian/copyright.header
===================================================================
--- php5/branches/lenny/debian/copyright.header 2008-11-29 18:48:20 UTC (rev 1177)
+++ php5/branches/lenny/debian/copyright.header 2008-12-06 14:01:05 UTC (rev 1178)
@@ -14,6 +14,16 @@
Upstream Authors: The PHP group for PHP5, Andi Gutmans and Zeev Suraski
for libzend
+The file ext/standard/rand.c contains the following clause with a statement
+that isn't compatible with the DFSG:
+ "The code as Shawn received it included the following notice:
+
+ Copyright (C) 1997 Makoto Matsumoto and Takuji Nishimura. When
+ you use this, send an e-mail to <matumoto at math.keio.ac.jp> with
+ an appropriate reference to your work."
+However, this requirement has been rescinded by the copyright holder in
+message <48E334A2.6050301 at math.sci.hiroshima-u.ac.jp> to bug #498621.
+
Two different licences apply to this package, one for PHP5, the other for
libzend. Both licences are shown here below.
Modified: php5/branches/lenny/debian/libapache2-mod-php5.postinst
===================================================================
--- php5/branches/lenny/debian/libapache2-mod-php5.postinst 2008-11-29 18:48:20 UTC (rev 1177)
+++ php5/branches/lenny/debian/libapache2-mod-php5.postinst 2008-12-06 14:01:05 UTC (rev 1178)
@@ -41,6 +41,10 @@
}
if [ -n "$2" ]; then
+ # recover the previous state
+ if [ -e /etc/php5/apache2/.start ]; then
+ a2enmod php5 >/dev/null || true
+ fi
# 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
Copied: php5/branches/lenny/debian/libapache2-mod-php5.postrm (from rev 1177, php5/trunk/debian/libapache2-mod-php5.postrm)
===================================================================
--- php5/branches/lenny/debian/libapache2-mod-php5.postrm (rev 0)
+++ php5/branches/lenny/debian/libapache2-mod-php5.postrm 2008-12-06 14:01:05 UTC (rev 1178)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" != "remove" -a "$1" != "purge" ]; then
+ exit 0
+fi
+
+if [ "$1" = "purge" ]; then
+ rm -f /etc/php5/apache2/.start
+fi
+
+exit 0
Modified: php5/branches/lenny/debian/libapache2-mod-php5.prerm
===================================================================
--- php5/branches/lenny/debian/libapache2-mod-php5.prerm 2008-11-29 18:48:20 UTC (rev 1177)
+++ php5/branches/lenny/debian/libapache2-mod-php5.prerm 2008-12-06 14:01:05 UTC (rev 1178)
@@ -9,6 +9,11 @@
fi
if [ -e /etc/apache2/apache2.conf ]; then
+ if [ -e /etc/apache2/mods-enabled/php5.load ]; then
+ # set a flag to remember the original state
+ # useful when reinstalling the same version.
+ touch /etc/php5/apache2/.start
+ fi
a2dismod php5 || true
fi
Copied: php5/branches/lenny/debian/libapache2-mod-php5filter.postrm (from rev 1177, php5/trunk/debian/libapache2-mod-php5filter.postrm)
===================================================================
--- php5/branches/lenny/debian/libapache2-mod-php5filter.postrm (rev 0)
+++ php5/branches/lenny/debian/libapache2-mod-php5filter.postrm 2008-12-06 14:01:05 UTC (rev 1178)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" != "remove" -a "$1" != "purge" ]; then
+ exit 0
+fi
+
+if [ "$1" = "purge" ]; then
+ rm -f /etc/php5/apache2/.start
+fi
+
+exit 0
Deleted: php5/branches/lenny/debian/patches/027-readline_is_editline.patch
===================================================================
--- php5/branches/lenny/debian/patches/027-readline_is_editline.patch 2008-11-29 18:48:20 UTC (rev 1177)
+++ php5/branches/lenny/debian/patches/027-readline_is_editline.patch 2008-12-06 14:01:05 UTC (rev 1178)
@@ -1,38 +0,0 @@
-Index: php5-5.2.0/ext/readline/config.m4
-===================================================================
---- php5-5.2.0.orig/ext/readline/config.m4 2007-03-18 22:57:00.000000000 +0100
-+++ php5-5.2.0/ext/readline/config.m4 2007-03-18 22:58:41.000000000 +0100
-@@ -12,7 +12,7 @@
-
- if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
- for i in $PHP_READLINE /usr/local /usr; do
-- test -f $i/include/readline/readline.h && READLINE_DIR=$i && break
-+ test -f $i/include/editline/readline.h && READLINE_DIR=$i && break
- done
-
- if test -z "$READLINE_DIR"; then
-@@ -64,7 +64,7 @@
- elif test "$PHP_LIBEDIT" != "no"; then
-
- for i in $PHP_LIBEDIT /usr/local /usr; do
-- test -f $i/include/readline/readline.h && LIBEDIT_DIR=$i && break
-+ test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break
- done
-
- if test -z "$LIBEDIT_DIR"; then
-Index: php5-5.2.0/ext/readline/readline.c
-===================================================================
---- php5-5.2.0.orig/ext/readline/readline.c 2007-03-18 22:57:00.000000000 +0100
-+++ php5-5.2.0/ext/readline/readline.c 2007-03-18 22:58:41.000000000 +0100
-@@ -33,9 +33,9 @@
- #define rl_completion_matches completion_matches
- #endif
-
--#include <readline/readline.h>
-+#include <editline/readline.h>
- #ifndef HAVE_LIBEDIT
--#include <readline/history.h>
-+#include <editline/history.h>
- #endif
-
- PHP_FUNCTION(readline);
Modified: php5/branches/lenny/debian/patches/033-we_WANT_libtool.patch
===================================================================
--- php5/branches/lenny/debian/patches/033-we_WANT_libtool.patch 2008-11-29 18:48:20 UTC (rev 1177)
+++ php5/branches/lenny/debian/patches/033-we_WANT_libtool.patch 2008-12-06 14:01:05 UTC (rev 1178)
@@ -1,13 +1,17 @@
-Index: php5-5.2.0/build/build2.mk
+Index: php5-5.2.6/build/build2.mk
===================================================================
---- php5-5.2.0.orig/build/build2.mk 2007-03-18 22:57:00.000000000 +0100
-+++ php5-5.2.0/build/build2.mk 2007-03-18 22:58:41.000000000 +0100
-@@ -52,6 +52,11 @@
+--- php5-5.2.6.orig/build/build2.mk
++++ php5-5.2.6/build/build2.mk
+@@ -52,6 +52,15 @@ $(TOUCH_FILES):
aclocal.m4: configure.in acinclude.m4
@echo rebuilding $@
+ @libtoolize=`./build/shtool path glibtoolize libtoolize`; \
-+ $$libtoolize --copy --automake --force; \
++ if $$libtoolize --help | grep -q -- --install; then \
++ $$libtoolize --copy --install --automake --force; \
++ else \
++ $$libtoolize --copy --automake --force; \
++ fi; \
+ ltpath=`dirname $$libtoolize`; \
+ ltfile=`cd $$ltpath/../share/aclocal; pwd`/libtool.m4; \
+ cp $$ltfile ./build/libtool.m4
Deleted: php5/branches/lenny/debian/patches/118-simplexml-segv.patch
===================================================================
--- php5/branches/lenny/debian/patches/118-simplexml-segv.patch 2008-11-29 18:48:20 UTC (rev 1177)
+++ php5/branches/lenny/debian/patches/118-simplexml-segv.patch 2008-12-06 14:01:05 UTC (rev 1178)
@@ -1,51 +0,0 @@
-Index: ext/simplexml/simplexml.c
-===================================================================
-RCS file: /repository/php-src/ext/simplexml/simplexml.c,v
-retrieving revision 1.151.2.22.2.21
-diff -u -p -d -r1.151.2.22.2.21 simplexml.c
---- old/ext/simplexml/simplexml.c 12 Feb 2007 21:06:29 -0000 1.151.2.22.2.21
-+++ new/ext/simplexml/simplexml.c 20 Feb 2007 12:47:46 -0000
-@@ -56,6 +56,7 @@ static php_sxe_object* php_sxe_object_ne
- static zend_object_value php_sxe_register_object(php_sxe_object * TSRMLS_DC);
- static xmlNodePtr php_sxe_reset_iterator(php_sxe_object *sxe, int use_data TSRMLS_DC);
- static xmlNodePtr php_sxe_iterator_fetch(php_sxe_object *sxe, xmlNodePtr node, int use_data TSRMLS_DC);
-+static zval *sxe_get_value(zval *z TSRMLS_DC);
-
- /* {{{ _node_as_zval()
- */
-@@ -427,6 +428,7 @@ static void sxe_prop_dim_write(zval *obj
- int is_attr = 0;
- int nodendx = 0;
- int test = 0;
-+ int new_value = 0;
- long cnt;
- zval tmp_zv, trim_zv, value_copy;
-
-@@ -504,8 +506,17 @@ static void sxe_prop_dim_write(zval *obj
- break;
- case IS_STRING:
- break;
-+ case IS_OBJECT:
-+ if (Z_OBJCE_P(value) == sxe_class_entry) {
-+ value = sxe_get_value(value TSRMLS_CC);
-+ INIT_PZVAL(value);
-+ new_value = 1;
-+ break;
-+ }
-+ /* break is missing intentionally */
- default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "It is not yet possible to assign complex types to %s", attribs ? "attributes" : "properties");
-+ return;
- }
- }
-
-@@ -594,6 +605,9 @@ next_iter:
- if (value && value == &value_copy) {
- zval_dtor(value);
- }
-+ if (new_value) {
-+ zval_ptr_dtor(&value);
-+ }
- }
- /* }}} */
-
Modified: php5/branches/lenny/debian/patches/CVE-2008-2829.patch
===================================================================
--- php5/branches/lenny/debian/patches/CVE-2008-2829.patch 2008-11-29 18:48:20 UTC (rev 1177)
+++ php5/branches/lenny/debian/patches/CVE-2008-2829.patch 2008-12-06 14:01:05 UTC (rev 1178)
@@ -1,5 +1,5 @@
---- php5-5.2.5.orig/ext/imap/php_imap.c
-+++ php5-5.2.5/ext/imap/php_imap.c
+--- php5-5.2.6.orig/ext/imap/php_imap.c
++++ php5-5.2.6/ext/imap/php_imap.c
@@ -70,6 +70,7 @@ static void _php_make_header_object(zval
static void _php_imap_add_body(zval *arg, BODY *body TSRMLS_DC);
static void _php_imap_parse_address(ADDRESS *addresslist, char **fulladdress, zval *paddress TSRMLS_DC);
@@ -8,7 +8,7 @@
/* the gets we use */
static char *php_mail_gets(readfn_t f, void *stream, unsigned long size, GETS_DATA *md);
-@@ -2137,7 +2138,7 @@ PHP_FUNCTION(imap_rfc822_write_address)
+@@ -2142,7 +2143,7 @@ PHP_FUNCTION(imap_rfc822_write_address)
}
string[0]='\0';
@@ -17,7 +17,7 @@
RETVAL_STRING(string, 1);
}
/* }}} */
-@@ -2906,13 +2907,13 @@ PHP_FUNCTION(imap_fetch_overview)
+@@ -2911,13 +2912,13 @@ PHP_FUNCTION(imap_fetch_overview)
if (env->from && _php_imap_address_size(env->from) < MAILTMPLEN) {
env->from->next=NULL;
address[0] = '\0';
@@ -33,7 +33,7 @@
add_property_string(myoverview, "to", address, 1);
}
if (env->date) {
-@@ -3883,6 +3884,34 @@ static int _php_imap_address_size (ADDRE
+@@ -3888,6 +3889,34 @@ static int _php_imap_address_size (ADDRE
/* }}} */
@@ -68,7 +68,7 @@
/* {{{ _php_imap_parse_address
*/
static void _php_imap_parse_address (ADDRESS *addresslist, char **fulladdress, zval *paddress TSRMLS_DC)
-@@ -3897,7 +3926,7 @@ static void _php_imap_parse_address (ADD
+@@ -3902,7 +3931,7 @@ static void _php_imap_parse_address (ADD
if ((len = _php_imap_address_size(addresstmp))) {
tmpstr = (char *) pemalloc(len + 1, 1);
tmpstr[0] = '\0';
Copied: php5/branches/lenny/debian/patches/CVE-2008-3658.patch (from rev 1177, php5/trunk/debian/patches/CVE-2008-3658.patch)
===================================================================
--- php5/branches/lenny/debian/patches/CVE-2008-3658.patch (rev 0)
+++ php5/branches/lenny/debian/patches/CVE-2008-3658.patch 2008-12-06 14:01:05 UTC (rev 1178)
@@ -0,0 +1,27 @@
+CVE-2008-3658
+http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.35&r2=1.312.2.20.2.36&view=patch
+--- old/ext/gd/gd.c 2008/05/04 21:19:17 1.312.2.20.2.35
++++ new/ext/gd/gd.c 2008/07/17 22:58:23 1.312.2.20.2.36
+@@ -1636,6 +1636,22 @@
+ font->nchars = FLIPWORD(font->nchars);
+ body_size = font->w * font->h * font->nchars;
+ }
++
++ if (overflow2(font->nchars, font->h)) {
++ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error reading font, invalid font header");
++ efree(font);
++ php_stream_close(stream);
++ RETURN_FALSE;
++ }
++ if (overflow2(font->nchars * font->h, font->w )) {
++ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error reading font, invalid font header");
++ efree(font);
++ php_stream_close(stream);
++ RETURN_FALSE;
++ }
++
++
++
+
+ if (body_size != body_size_check) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error reading font");
Copied: php5/branches/lenny/debian/patches/CVE-2008-3659.patch (from rev 1177, php5/trunk/debian/patches/CVE-2008-3659.patch)
===================================================================
--- php5/branches/lenny/debian/patches/CVE-2008-3659.patch (rev 0)
+++ php5/branches/lenny/debian/patches/CVE-2008-3659.patch 2008-12-06 14:01:05 UTC (rev 1178)
@@ -0,0 +1,14 @@
+fix for CVE-2008-3659
+http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.h?r1=1.94.2.4.2.11&r2=1.94.2.4.2.12&view=patch
+--- old/Zend/zend_operators.h 2007/12/31 07:20:03 1.94.2.4.2.11
++++ new/Zend/zend_operators.h 2008/08/05 20:11:17 1.94.2.4.2.12
+@@ -220,6 +220,9 @@
+ char *p = haystack;
+ char ne = needle[needle_len-1];
+
++ if(needle_len > end-haystack) {
++ return NULL;
++ }
+ end -= needle_len;
+
+ while (p <= end) {
Copied: php5/branches/lenny/debian/patches/CVE-2008-3660.patch (from rev 1177, php5/trunk/debian/patches/CVE-2008-3660.patch)
===================================================================
--- php5/branches/lenny/debian/patches/CVE-2008-3660.patch (rev 0)
+++ php5/branches/lenny/debian/patches/CVE-2008-3660.patch 2008-12-06 14:01:05 UTC (rev 1178)
@@ -0,0 +1,75 @@
+--- php5-5.2.6.orig/sapi/cgi/cgi_main.c
++++ php5-5.2.6/sapi/cgi/cgi_main.c
+@@ -765,6 +765,39 @@ static void php_cgi_usage(char *argv0)
+ }
+ /* }}} */
+
++/* {{{ is_valid_path
++ *
++ * some server configurations allow '..' to slip through in the
++ * translated path. We'll just refuse to handle such a path.
++ */
++static int is_valid_path(const char *path)
++{
++ const char *p;
++
++ if (!path) {
++ return 0;
++ }
++ p = strstr(path, "..");
++ if (p) {
++ if ((p == path || IS_SLASH(*(p-1))) &&
++ (*(p+2) == 0 || IS_SLASH(*(p+2)))) {
++ return 0;
++ }
++ while (1) {
++ p = strstr(p+1, "..");
++ if (!p) {
++ break;
++ }
++ if (IS_SLASH(*(p-1)) &&
++ (*(p+2) == 0 || IS_SLASH(*(p+2)))) {
++ return 0;
++ }
++ }
++ }
++ return 1;
++}
++/* }}} */
++
+ /* {{{ init_request_info
+
+ initializes request_info structure
+@@ -1061,9 +1094,7 @@ static void init_request_info(TSRMLS_D)
+ if (pt) {
+ efree(pt);
+ }
+- /* some server configurations allow '..' to slip through in the
+- translated path. We'll just refuse to handle such a path. */
+- if (script_path_translated && !strstr(script_path_translated, "..")) {
++ if (is_valid_path(script_path_translated)) {
+ SG(request_info).path_translated = estrdup(script_path_translated);
+ }
+ } else {
+@@ -1094,9 +1125,7 @@ static void init_request_info(TSRMLS_D)
+ } else {
+ SG(request_info).request_uri = env_script_name;
+ }
+- /* some server configurations allow '..' to slip through in the
+- translated path. We'll just refuse to handle such a path. */
+- if (script_path_translated && !strstr(script_path_translated, "..")) {
++ if (is_valid_path(script_path_translated)) {
+ SG(request_info).path_translated = estrdup(script_path_translated);
+ }
+ free(real_path);
+@@ -1114,9 +1143,7 @@ static void init_request_info(TSRMLS_D)
+ script_path_translated = env_path_translated;
+ }
+ #endif
+- /* some server configurations allow '..' to slip through in the
+- translated path. We'll just refuse to handle such a path. */
+- if (script_path_translated && !strstr(script_path_translated, "..")) {
++ if (is_valid_path(script_path_translated)) {
+ SG(request_info).path_translated = estrdup(script_path_translated);
+ }
+ #if ENABLE_PATHINFO_CHECK
Copied: php5/branches/lenny/debian/patches/bad_whatis_entries.patch (from rev 1177, php5/trunk/debian/patches/bad_whatis_entries.patch)
===================================================================
--- php5/branches/lenny/debian/patches/bad_whatis_entries.patch (rev 0)
+++ php5/branches/lenny/debian/patches/bad_whatis_entries.patch 2008-12-06 14:01:05 UTC (rev 1178)
@@ -0,0 +1,35 @@
+Index: php5-5.2.6/sapi/cli/php.1.in
+===================================================================
+--- php5-5.2.6.orig/sapi/cli/php.1.in
++++ php5-5.2.6/sapi/cli/php.1.in
+@@ -1,6 +1,5 @@
+ .TH PHP 1 "2008" "The PHP Group" "Scripting Language"
+ .SH NAME
+-.TP 15
+ php \- PHP Command Line Interface 'CLI'
+ .SH SYNOPSIS
+ .B php
+Index: php5-5.2.6/scripts/man1/php-config.1.in
+===================================================================
+--- php5-5.2.6.orig/scripts/man1/php-config.1.in
++++ php5-5.2.6/scripts/man1/php-config.1.in
+@@ -1,6 +1,5 @@
+ .TH php\-config 1 "2006" "The PHP Group" "Scripting Language"
+ .SH NAME
+-.TP 15
+ php\-config \- get information about PHP configuration and compile options
+ .SH SYNOPSIS
+ .B php\-config
+Index: php5-5.2.6/scripts/man1/phpize.1.in
+===================================================================
+--- php5-5.2.6.orig/scripts/man1/phpize.1.in
++++ php5-5.2.6/scripts/man1/phpize.1.in
+@@ -1,7 +1,6 @@
+ .TH phpize 1 "2006" "The PHP Group" "Scripting Language"
+ .SH NAME
+-.TP 15
+-phpize - prepare a PHP extension for compiling
++phpize \- prepare a PHP extension for compiling
+ .SH SYNOPSIS
+ .B phpize
+ [options]
Copied: php5/branches/lenny/debian/patches/deprecated_freetds_check.patch (from rev 1177, php5/trunk/debian/patches/deprecated_freetds_check.patch)
===================================================================
--- php5/branches/lenny/debian/patches/deprecated_freetds_check.patch (rev 0)
+++ php5/branches/lenny/debian/patches/deprecated_freetds_check.patch 2008-12-06 14:01:05 UTC (rev 1178)
@@ -0,0 +1,88 @@
+Allow ext/mssql and ext/pdo_dblib to build with >=freetds-0.82
+Original patch by jklowden at freetds dot org
+ext/pdo_dblib patch by matthias at dsx ado at
+Rediffed for Gentoo (wrong direction)
+http://bugs.php.net/bug.php?id=44991
+
+diff -r 57e37b68a255 -r f1222f67e562 ext/mssql/config.m4
+--- a/ext/mssql/config.m4 Tue Jul 01 19:37:24 2008 +0200
++++ b/ext/mssql/config.m4 Thu Jul 17 11:35:57 2008 +0200
+@@ -10,11 +10,11 @@
+
+ if test "$PHP_MSSQL" = "yes"; then
+ for i in /usr/local /usr; do
+- if test -f $i/include/tds.h; then
++ if test -f $i/include/sybdb.h; then
+ FREETDS_INSTALLATION_DIR=$i
+ FREETDS_INCLUDE_DIR=$i/include
+ break
+- elif test -f $i/include/freetds/tds.h; then
++ elif test -f $i/include/freetds/sybdb.h; then
+ FREETDS_INSTALLATION_DIR=$i
+ FREETDS_INCLUDE_DIR=$i/include/freetds
+ break
+@@ -27,10 +27,10 @@
+
+ elif test "$PHP_MSSQL" != "no"; then
+
+- if test -f $PHP_MSSQL/include/tds.h; then
++ if test -f $PHP_MSSQL/include/sybdb.h; then
+ FREETDS_INSTALLATION_DIR=$PHP_MSSQL
+ FREETDS_INCLUDE_DIR=$PHP_MSSQL/include
+- elif test -f $PHP_MSSQL/include/freetds/tds.h; then
++ elif test -f $PHP_MSSQL/include/freetds/sybdb.h; then
+ FREETDS_INSTALLATION_DIR=$PHP_MSSQL
+ FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds
+ else
+@@ -38,8 +38,8 @@
+ fi
+ fi
+
+- if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then
+- AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
++ if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
++ AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so])
+ fi
+
+ PHP_ADD_INCLUDE($FREETDS_INCLUDE_DIR)
+diff -r 57e37b68a255 -r f1222f67e562 ext/pdo_dblib/config.m4
+--- a/ext/pdo_dblib/config.m4 Tue Jul 01 19:37:24 2008 +0200
++++ b/ext/pdo_dblib/config.m4 Thu Jul 17 11:35:57 2008 +0200
+@@ -13,11 +13,11 @@
+ if test "$PHP_PDO_DBLIB" = "yes"; then
+
+ for i in /usr/local /usr; do
+- if test -f $i/include/tds.h; then
++ if test -f $i/include/sybdb.h; then
+ PDO_FREETDS_INSTALLATION_DIR=$i
+ PDO_FREETDS_INCLUDE_DIR=$i/include
+ break
+- elif test -f $i/include/freetds/tds.h; then
++ elif test -f $i/include/freetds/sybdb.h; then
+ PDO_FREETDS_INSTALLATION_DIR=$i
+ PDO_FREETDS_INCLUDE_DIR=$i/include/freetds
+ break;
+@@ -30,10 +30,10 @@
+
+ elif test "$PHP_PDO_DBLIB" != "no"; then
+
+- if test -f $PHP_PDO_DBLIB/include/tds.h; then
++ if test -f $PHP_PDO_DBLIB/include/sybdb.h; then
+ PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
+ PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include
+- elif test -f $PHP_PDO_DBLIB/include/freetds/tds.h; then
++ elif test -f $PHP_PDO_DBLIB/include/freetds/sybdb.h; then
+ PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
+ PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds
+ else
+@@ -45,8 +45,8 @@
+ PHP_LIBDIR=lib
+ fi
+
+- if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then
+- AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
++ if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
++ AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so])
+ fi
+
+ PHP_ADD_INCLUDE($PDO_FREETDS_INCLUDE_DIR)
Copied: php5/branches/lenny/debian/patches/libedit_is_editline.patch (from rev 1177, php5/trunk/debian/patches/libedit_is_editline.patch)
===================================================================
--- php5/branches/lenny/debian/patches/libedit_is_editline.patch (rev 0)
+++ php5/branches/lenny/debian/patches/libedit_is_editline.patch 2008-12-06 14:01:05 UTC (rev 1178)
@@ -0,0 +1,29 @@
+Index: php5-5.2.6/ext/readline/config.m4
+===================================================================
+--- php5-5.2.6.orig/ext/readline/config.m4
++++ php5-5.2.6/ext/readline/config.m4
+@@ -64,7 +64,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
+ elif test "$PHP_LIBEDIT" != "no"; then
+
+ for i in $PHP_LIBEDIT /usr/local /usr; do
+- test -f $i/include/readline/readline.h && LIBEDIT_DIR=$i && break
++ test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break
+ done
+
+ if test -z "$LIBEDIT_DIR"; then
+Index: php5-5.2.6/ext/readline/readline.c
+===================================================================
+--- php5-5.2.6.orig/ext/readline/readline.c
++++ php5-5.2.6/ext/readline/readline.c
+@@ -33,8 +33,10 @@
+ #define rl_completion_matches completion_matches
+ #endif
+
++#ifdef HAVE_LIBEDIT
++#include <editline/readline.h>
++#else
+ #include <readline/readline.h>
+-#ifndef HAVE_LIBEDIT
+ #include <readline/history.h>
+ #endif
+
Modified: php5/branches/lenny/debian/patches/series
===================================================================
--- php5/branches/lenny/debian/patches/series 2008-11-29 18:48:20 UTC (rev 1177)
+++ php5/branches/lenny/debian/patches/series 2008-12-06 14:01:05 UTC (rev 1178)
@@ -5,7 +5,6 @@
013-force_getaddrinfo.patch
017-pread_pwrite_disable.patch
019-z_off_t_as_long.patch
-027-readline_is_editline.patch
029-php.ini_paranoid.patch
033-we_WANT_libtool.patch
034-apache2_umask_fix.patch
@@ -28,8 +27,14 @@
libdb_is_-ldb
suhosin.patch
fix_broken_upstream_tests.patch
-CVE-2008-1384.patch
-CVE-2008-2050.patch
-CVE-2008-2051.patch
-CVE-2008-0599.patch
+use_embedded_timezonedb.patch
+manpage_spelling.patch
+force_libmysqlclient_r.patch
CVE-2008-2829.patch
+libedit_is_editline.patch
+bad_whatis_entries.patch
+deprecated_freetds_check.patch
+snmp_leaks.patch
+CVE-2008-3658.patch
+CVE-2008-3659.patch
+CVE-2008-3660.patch
Copied: php5/branches/lenny/debian/patches/snmp_leaks.patch (from rev 1177, php5/trunk/debian/patches/snmp_leaks.patch)
===================================================================
--- php5/branches/lenny/debian/patches/snmp_leaks.patch (rev 0)
+++ php5/branches/lenny/debian/patches/snmp_leaks.patch 2008-12-06 14:01:05 UTC (rev 1178)
@@ -0,0 +1,79 @@
+Index: php5-5.2.6/ext/snmp/snmp.c
+===================================================================
+--- php5-5.2.6.orig/ext/snmp/snmp.c
++++ php5-5.2.6/ext/snmp/snmp.c
+@@ -20,7 +20,7 @@
+ +----------------------------------------------------------------------+
+ */
+
+-/* $Id: snmp.c,v 1.106.2.2.2.6 2007/12/31 07:20:11 sebastian Exp $ */
++/* $Id: snmp.c,v 1.106.2.2.2.7 2008/09/06 08:18:38 indeyets Exp $ */
+
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+@@ -417,13 +417,13 @@ static void php_snmp_internal(INTERNAL_F
+ while (keepwalking) {
+ keepwalking = 0;
+ if ((st == SNMP_CMD_GET) || (st == SNMP_CMD_GETNEXT)) {
+- pdu = snmp_pdu_create((st == SNMP_CMD_GET) ? SNMP_MSG_GET : SNMP_MSG_GETNEXT);
+ name_length = MAX_OID_LEN;
+ if (!snmp_parse_oid(objid, name, &name_length)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid object identifier: %s", objid);
+ snmp_close(ss);
+ RETURN_FALSE;
+ }
++ pdu = snmp_pdu_create((st == SNMP_CMD_GET) ? SNMP_MSG_GET : SNMP_MSG_GETNEXT);
+ snmp_add_null_var(pdu, name, name_length);
+ } else if (st == SNMP_CMD_SET) {
+ pdu = snmp_pdu_create(SNMP_MSG_SET);
+@@ -434,6 +434,7 @@ static void php_snmp_internal(INTERNAL_F
+ sprint_objid(buf, name, name_length);
+ #endif
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not add variable: %s %c %s", buf, type, value);
++ snmp_free_pdu(pdu);
+ snmp_close(ss);
+ RETURN_FALSE;
+ }
+@@ -467,11 +468,13 @@ retry:
+ *return_value = *snmpval;
+ zval_copy_ctor(return_value);
+ zval_ptr_dtor(&snmpval);
++ snmp_free_pdu(response);
+ snmp_close(ss);
+ return;
+ } else if (st == SNMP_CMD_GETNEXT) {
+ *return_value = *snmpval;
+ zval_copy_ctor(return_value);
++ snmp_free_pdu(response);
+ snmp_close(ss);
+ return;
+ } else if (st == SNMP_CMD_WALK) {
+@@ -510,23 +513,28 @@ retry:
+ }
+ if (st == SNMP_CMD_GET) {
+ if ((pdu = snmp_fix_pdu(response, SNMP_MSG_GET)) != NULL) {
++ snmp_free_pdu(response);
+ goto retry;
+ }
+ } else if (st == SNMP_CMD_SET) {
+ if ((pdu = snmp_fix_pdu(response, SNMP_MSG_SET)) != NULL) {
++ snmp_free_pdu(response);
+ goto retry;
+ }
+ } else if (st == SNMP_CMD_GETNEXT) {
+ if ((pdu = snmp_fix_pdu(response, SNMP_MSG_GETNEXT)) != NULL) {
++ snmp_free_pdu(response);
+ goto retry;
+ }
+ } else if (st >= SNMP_CMD_WALK) { /* Here we do walks. */
+ if ((pdu = snmp_fix_pdu(response, ((session->version == SNMP_VERSION_1)
+ ? SNMP_MSG_GETNEXT
+ : SNMP_MSG_GETBULK))) != NULL) {
++ snmp_free_pdu(response);
+ goto retry;
+ }
+ }
++ snmp_free_pdu(response);
+ snmp_close(ss);
+ if (st == SNMP_CMD_WALK || st == SNMP_CMD_REALWALK) {
+ zval_dtor(return_value);
Modified: php5/branches/lenny/debian/patches/suhosin.patch
===================================================================
--- php5/branches/lenny/debian/patches/suhosin.patch 2008-11-29 18:48:20 UTC (rev 1177)
+++ php5/branches/lenny/debian/patches/suhosin.patch 2008-12-06 14:01:05 UTC (rev 1178)
@@ -448,7 +448,7 @@
+#if SUHOSIN_PATCH
+
+# define SUHOSIN_MM_CHECK_CANARIES(block, MFUNCTION) do { \
-+ size_t *p = SUHOSIN_MM_END_CANARY_PTR(block), check; \
++ char *p = SUHOSIN_MM_END_CANARY_PTR(block); size_t check; \
+ if (((block)->info.canary_1 != heap->canary_1) || ((block)->info.canary_2 != heap->canary_2)) { \
+ canary_mismatch: \
+ zend_suhosin_log(S_MEMORY, "canary mismatch on " MFUNCTION " - heap overflow detected"); \
@@ -468,10 +468,10 @@
+ } while (0)
+
+# define SUHOSIN_MM_END_CANARY_PTR(block) \
-+ (size_t*)(((char*)(ZEND_MM_DATA_OF(block))) + ((zend_mm_block*)(block))->info.size + END_MAGIC_SIZE)
++ (char*)(((char*)(ZEND_MM_DATA_OF(block))) + ((zend_mm_block*)(block))->info.size + END_MAGIC_SIZE)
+
+# define SUHOSIN_MM_SET_END_CANARY(block) do { \
-+ size_t *p = SUHOSIN_MM_END_CANARY_PTR(block); \
++ char *p = SUHOSIN_MM_END_CANARY_PTR(block); \
+ memcpy(p, &heap->canary_3, CANARY_SIZE); \
+ } while (0)
+
Modified: php5/branches/lenny/debian/php5-common.README.Debian
===================================================================
--- php5/branches/lenny/debian/php5-common.README.Debian 2008-11-29 18:48:20 UTC (rev 1177)
+++ php5/branches/lenny/debian/php5-common.README.Debian 2008-12-06 14:01:05 UTC (rev 1178)
@@ -7,6 +7,7 @@
* php5-cgi and apache2
* Restarting your web server after installing modules
* Configuration layout
+* Timezone data from system timezone database
* Further documentation, errata, etc
@@ -129,6 +130,21 @@
sean finney <seanius at debian.org> Thu, 19 Oct 2006 23:33:05 +0200
+Timezone data from system timezone database
+---------------------------------------------------------------------
+
+Debian PHP has been patched to use of the system wide timezone database
+from the tzdata package, making sure any updates there are automatically
+used by PHP aswell.
+
+Note that this requires that the PHP process has access to /etc/localtime
+and /usr/share/zoneinfo. For any regular installation this should be the
+case, but in specific secured environments when reading the timezone
+database is impossible PHP will give a "Timezone database is corrupt -
+this should *never* happen!" error.
+
+Thijs Kinkhorst <thijs at debian.org> Wed, 23 Jul 2008 17:42:06 +0200
+
Further documentation, errata, etc
---------------------------------------------------------------------
Modified: php5/branches/lenny/debian/php5-dev.dirs
===================================================================
--- php5/branches/lenny/debian/php5-dev.dirs 2008-11-29 18:48:20 UTC (rev 1177)
+++ php5/branches/lenny/debian/php5-dev.dirs 2008-12-06 14:01:05 UTC (rev 1178)
@@ -1 +1,2 @@
/usr/bin
+/usr/share/lintian/overrides
Copied: php5/branches/lenny/debian/php5-dev.lintian-overrides (from rev 1177, php5/trunk/debian/php5-dev.lintian-overrides)
===================================================================
--- php5/branches/lenny/debian/php5-dev.lintian-overrides (rev 0)
+++ php5/branches/lenny/debian/php5-dev.lintian-overrides 2008-12-06 14:01:05 UTC (rev 1178)
@@ -0,0 +1 @@
+php5-dev: script-not-executable ./usr/lib/php5/build/run-tests.php
Modified: php5/branches/lenny/debian/rules
===================================================================
--- php5/branches/lenny/debian/rules 2008-11-29 18:48:20 UTC (rev 1177)
+++ php5/branches/lenny/debian/rules 2008-12-06 14:01:05 UTC (rev 1178)
@@ -26,7 +26,7 @@
PROG_SENDMAIL = /usr/sbin/sendmail
-CFLAGS = -O2 -Wall -fsigned-char -fno-strict-aliasing
+CFLAGS += -O2 -Wall -fsigned-char -fno-strict-aliasing
# LFS support
ifneq (yes,$(PHP5_COMPAT))
CFLAGS += $(shell getconf LFS_CFLAGS)
@@ -325,6 +325,15 @@
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`/libphp5filter.so
+ cp debian/libapache2-mod-php5filter.load \
+ debian/libapache2-mod-php5filter/etc/apache2/mods-available/php5filter.load
+ cp debian/libapache2-mod-php5filter.conf \
+ debian/libapache2-mod-php5filter/etc/apache2/mods-available/php5filter.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/128M/32M/g' > debian/php5-common/usr/share/php5/php.ini-dist.cli
@@ -345,8 +354,27 @@
main/win95nt.h
# install PEAR
- cp -r pear-build/* debian/php-pear/
+ cp -a pear-build/* debian/php-pear/
+ # everything under usr/share/php/data except 'PEAR' is b0rken
+ # and actually needs to be fixed
+ [ ! -f debian/php-pear/usr/share/php/data/Structures_Graph/LICENSE ] || \
+ $(RM) debian/php-pear/usr/share/php/data/Structures_Graph/LICENSE
+ [ ! -f debian/php-pear/usr/share/php/doc/PEAR/INSTALL ] || \
+ $(RM) debian/php-pear/usr/share/php/doc/PEAR/INSTALL
+ for f in Structures_Graph/publish.sh Structures_Graph/package.sh \
+ Structures_Graph/genpackage.xml.pl; do \
+ $(RM) debian/php-pear/usr/share/php/data/$$f; \
+ done
+ # we don't want test suites
+ $(RM) -r debian/php-pear/usr/share/php/test/
+ [ -d debian/php-pear/usr/share/php/doc ] && { \
+ mv debian/php-pear/usr/share/php/doc/* \
+ debian/php-pear/usr/share/doc/php-pear/PEAR/; \
+ $(RM) -r debian/php-pear/usr/share/php/doc; \
+ ln -s ../doc/php-pear/PEAR debian/php-pear/usr/share/php/doc; \
+ }
+
# install extensions
ext=`./debian/libapache2-mod-php5/usr/bin/php-config --extension-dir`;\
for i in libapache2-mod-php5 php5-cgi php5-cli; do \
@@ -402,7 +430,21 @@
# install lintian overrides
cp debian/php5.lintian-overrides $(CURDIR)/debian/php5-common/usr/share/lintian/overrides/php5-common
+ cp debian/php5-dev.lintian-overrides $(CURDIR)/debian/php5-dev/usr/share/lintian/overrides/php5-dev
+ # install some generic lintian overrides
+ ext=`debian/php5-dev/usr/bin/php-config5 --extension-dir | cut -b2- `; \
+ for sapi in php5-cli php5-cgi libapache2-mod-php5 libapache2-mod-php5filter; do \
+ mkdir -p $(CURDIR)/debian/"$$sapi"/usr/share/lintian/overrides/; \
+ printf "%s: package-contains-empty-directory %s/\n" \
+ "$$sapi" "$${ext}" \
+ >> $(CURDIR)/debian/"$$sapi"/usr/share/lintian/overrides/"$$sapi"; \
+ done
+
+ # directories cleanup:
+ -rmdir -p debian/libapache2-mod-php5/usr/share/man/man1
+ -find debian/php-pear -type d -exec rmdir --ignore-fail-on-non-empty -p '{}' \; >/dev/null 2>&1
+
touch install-stamp
# Build architecture-independent files here.
More information about the Pkg-php-commits
mailing list