lp:~clint-fewbar/ubuntu/natty/php5/merge-5.3.3-3

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/natty/php5

Clint Byrum (community): Disapprove on 2010-12-03

Chuck Short: Pending requested 2010-11-18

Diff: 925 lines (+381/-160)

11 files modified

debian/changelog (+63/-0)
debian/control (+140/-113)
debian/maxlifetime (+1/-1)
debian/patches/CVE-2010-2950.patch (+2/-7)
debian/patches/CVE-2010-3710.patch (+35/-0)
debian/patches/fix-ftbfs-and-dso.patch (+55/-0)
debian/patches/php-5.3.4-ini.patch (+30/-0)
debian/patches/php_crypt_revamped.patch (+37/-23)
debian/patches/series (+5/-4)
debian/patches/use_system_crypt_fixes.patch (+11/-8)
debian/rules (+2/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #564920: PHP5 under Apache2 on 64 bit system is not completely 64 bit	Low	Fix Released
Bug #591286: PHP Deprecated: Comments starting with '#' are deprecated in[...] on line 1 in Unknown on line 0	Low	Fix Released
Bug #638401: automated tests run during build fail due to apparmor protections for mysqld unless build is done in /tmp	High	Fix Released
Bug #676672: FTBFS on natty: SASL LDAP check fails (and other DSO problems)	Undecided	Fix Released

Link a bug report

Related blueprints

78. By Clint Byrum on 2010-11-20

adding back in php5-fpm

77. By Clint Byrum on 2010-11-18

debian/patches/fix-ftbfs-and-dso.patch: Adjusts build system to
link directly to libs containing symbols. (LP: #676672)

76. By Clint Byrum on 2010-11-15

* Merge from debian unstable. Remaining changes:
  - debian/control:
    * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe.
    * Dropped libmysqlclient15-dev, build against mysql 5.1.
    * Dropped libcurl-dev not in the archive.
    * Suggest php5-suhosin rather than recommends.
    * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions already in
      universe.
    * Dropped locales-all.
    * Dropped libqdbm since its in universe. -- And should stay there
    * Use netcat rather than netcat-traditional.
    * Build-depend on netcat-openbsd | netcat, instead of just netcat (only
      in universe).
  - modulelist: Drop imap, interbase, 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/patches/lp564920-fix-big-files.patch: Fix downloading of large
    files (LP: #564920)
  - debian/php5-module.ini: # replaced with ; (LP: #591286)
  - debian/setup-mysql.sh: Copy mysqld to local dir during build to avoid
    apparmor restrictions (LP: #638401)
* Changes no longer included after merge:
    * debian/control: libonig-dev added back in (libonig MIR filed)
    * debian/patches/CVE-2010-2950.patch: synced with Debian
* debian/rules, debian/control, debian/php5-fpm.*:
  Re-adding php5-fpm build that were dropped in 5.3.3-2
* Fix segfault in filter_var with FILTER_VALIDATE_EMAIL with large
  amount of data (CVE-2010-3710, Closes: #601619)
* Upload 5.3.3 to unstable
  + Fixes CVE-2010-2225, CVE-2010-2094, CVE-2010-1917, CVE-2010-1866,
    CVE-2010-2531, CVE-2010-3065.
* Don't build FPM SAPI now
* Bump standards version to 3.9.1
* Synchronize system crypt patch
* Cherry pick upstream fix for format vulnerability in phar/stream.c
  + Fixes CVE-2010-2950.
* Set explicit error level to hide warnings on systems with modified
  php.ini (Closes: #590485)
* Apply patch to fix loading of extensions without [PHP] section
  (Closes: #595761)
* Set session.gc_probability back to 0 (Closes: #595706)
* Update PHP5 description to not include references to C, Java and
  Perl (Closes: #351032)

75. By Clint Byrum on 2010-10-14

debian/patches/php52389-pgsql-segfault.patch: removing,
causes error handling to fail (LP: #660227)

74. By Marc Deslauriers on 2010-09-20

* SECURITY UPDATE: arbitrary memory disclosure and possible code
  execution via phar extension
  - debian/patches/CVE-2010-2950.patch: use correct format string in
    ext/phar/stream.c.
  - CVE-2010-2094
  - CVE-2010-2950

73. By Matthias Klose on 2010-09-17

Build-depend on netcat-openbsd | netcat, instead of just netcat (only
in universe).

72. By Clint Byrum on 2010-09-15

* debian/setup-mysql.sh: Copy mysqld to local dir during build to avoid
  apparmor restrictions (LP: #638401)
* debian/rules: stop mysql instance on clean just in case we failed in tests

71. By Mathias Gug on 2010-08-25

Undo sybase debugging libraries split: keeping a smaller delta with Debian
is more important than demoting sybase to universe.

70. By Mathias Gug on 2010-08-20

* Drop sybase libraries to universe:
  Move debugging libraries to php5-sybase-dbg:
  - debian/control:
    + create php5-sybase-dbg package.
    + drop php5-sybase as php5-dbg dependency.
  - debian/rules: move sybase debugging libraries to php5-sybase-dbg.

69. By Clint Byrum on 2010-08-13

* debian/php5-module.ini: # replaced with ; (LP: #591286)
* debian/patches/php52389-pgsql-segfault.patch (LP: #607646)
  - Applying patch for upstream bug that causes segfaults in pgsql