Branches for Quantal

Author: Clint Byrum
Revision Date: 2012-08-22 13:40:18 UTC

* Merge from Debian experimental (LP: #1006738 , LP: #1040212)
  Remaining changes:
  - d/rules: Simplify apache config settings since we never build
    interbase or firebird.
  - debian/rules: export DEB_HOST_MULTIARCH properly.
  - Add build-dependency on lemon, which we now need.
  - 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.5 and mysql-client-5.5 to avoid upstart and
    mysql-server-5.5 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.
  - 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, debian/rules: Re-enable libedit-dev.
* Dropped Changes:
  - debian/rules: change memory limits on example .ini files.

Author: Robie Basak
Revision Date: 2012-10-24 10:04:51 UTC

Re-add logic to guess default timezone from system to fix default timezone
regression (LP: #1069529). Cherry-picked from Debian 5.4.4-6 (also in
Debian 5.4.6-2).

Author: Marc Deslauriers
Revision Date: 2013-03-08 16:18:48 UTC

* SECURITY UPDATE: arbitrary file disclosure via XML External Entity
  - debian/patches/CVE-2013-1643.patch: disable the entity loader in
    ext/libxml/libxml.c, ext/libxml/php_libxml.h, ext/soap/php_xml.c.
  - CVE-2013-1643

Author: Marc Deslauriers
Revision Date: 2013-03-08 16:18:48 UTC

* SECURITY UPDATE: arbitrary file disclosure via XML External Entity
  - debian/patches/CVE-2013-1643.patch: disable the entity loader in
    ext/libxml/libxml.c, ext/libxml/php_libxml.h, ext/soap/php_xml.c.
  - CVE-2013-1643