-
Committer:
Package Import Robot
-
Author(s):
Chuck Short
-
Date:
2011-07-25 19:14:12 UTC
-
mfrom:
(0.3.30 sid)
-
Revision ID:
package-import@ubuntu.com-20110725191412-yyekuownl96dqvqe
Tags: 5.3.6-13ubuntu1
* Merge from debian unstable. Remaining changes:
* Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe.
* Dropped libcurl-dev not in the archive.
* debian/control: replace build-depends on mysql-server with
mysql-server-core-5.1 and mysql-client-5.1 to avoid upstart and
mysql-server-5.1 postinst confusion with starting up multiple
mysqlds listening on the same port.
* Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions
already in universe.
* Suggest php5-suhosin rather than recommends.
* Dropped libonig-dev and libqgdbm since its in universe. (libonig MIR
has been declined due to an inactive upstream. So this is probably
a permanent change).
* modulelist: Drop imap, interbase, sybase, and mcrypt.
* debian/rules:
* Dropped building of mcrypt, imap, and interbase.
* Install apport hook for php5.
* stop mysql instance on clean just in case we failed in tests
* debian/control: Recommend php5-dev for php-pear.
* debian/rules: --enable-pcntl for cgi as well.
* debian/patches/temporary-path-fixes-for-multiarch.patch: as a stopgap
for natty, patch the various config.m4 files for modules whose
libraries have moved to the multiarch dir; we can't use --with-libdir
yet because that requires all the build-deps to have moved. Thanks to
Jonathan Marsden for preparing this patch.
* debian/patches/fpm-config.patch: Update php-fpm.conf(pool.d/con)
to do initial chdir to / as suggest by Olaf van van der Spek
to detect early problems if php5-fpm needs a write access to
initial chdir.
* SECURITY UPDATE: use-after-free vulnerability
- debian/patches/php5-CVE-2011-1148.patch: improve reference
counting
- CVE-2011-1148
* debian/rules: set DEB_HOST_MULTIARCH to enable 'debian/rules' for
building.