diff options
| -rw-r--r-- | debian/changelog | 50 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 54 | ||||
| -rw-r--r-- | debian/patches/052-phpinfo_no_configure.patch | 18 | ||||
| -rw-r--r-- | debian/patches/fix_broken_upstream_tests.patch | 61 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/suhosin.patch | 46 | ||||
| -rw-r--r-- | debian/php5-common.dirs | 1 | ||||
| -rw-r--r-- | debian/php5-common.php5.cron.d | 2 | ||||
| -rw-r--r-- | debian/php5.lintian-overrides | 1 | ||||
| -rwxr-xr-x | debian/rules | 31 |
11 files changed, 173 insertions, 93 deletions
diff --git a/debian/changelog b/debian/changelog index 270284ff7..069ccb6d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,52 @@ +php5 (5.2.4-2) unstable; urgency=low + + [ sean finney ] + * for posterity revised previous changelog to reference the CVE id's + of security issues resolved by the latest upstream release. + * lintian: use debian/compat instead of DH_COMPAT in debian/rules. + * lintian: use source:Version and binary:Version where appropriate, + instead of Source-Version + * lintian: remove a couple pieces of cruft in the changelog that were causing + false-postive wrong-bug-number-in-closes, but were generally useless + anyway. + + [ Raphael Geissert ] + * Using test-results.txt as a target + * cronjob now checks for existance of /usr/lib/php5/maxlifetime (Closes: #439286) + * Fixed memory limit of 1232M in php.ini for cli (Closes: #440624) + * Build the interbase extension using firebird2.0-dev (Closes: #433736) + * Unapply patches with debian/rules clean + + [ Steve Langasek ] + * Don't patch configure or php_config.h.in in suhosin.patch, as these are + auto-generated and including them in the patch results in a race + condition for the necessary build-time regeneration. Thanks to Daniel + Schepler for reporting, and to Damyan Ivanov for helping to sort out the + fix. Closes: #443637. + * Also remove the modified auto-generated files in the clean target, + which triggers a warning about disappearing files when building the + source package but avoids carrying irrelevant diffs to these files + in the Debian diff. + * Now that the testsuite is being run at build time, test failures cause + a bunch of junk files to be left around in the Debian diff. So clean up + several false-positive failures: + - 052-phpinfo_no_configure.patch: we're patching the output of phpinfo(), + so patch the test as well + - fix_broken_upstream_tests.patch: use a local directory for tests that + use sessions, skip the phpinfo test after all because it doesn't appear + to be compatible with current testsuite behavior, and disable the + moneyformat test if en_US locale is not available. + There are still several other failing tests, but these are not false + positives and remain enabled pending investigation. + + -- sean finney <seanius@debian.org> Wed, 24 Oct 2007 21:51:14 +0200 + php5 (5.2.4-1) unstable; urgency=low * New upstream release. + * Security issues resolved in the latest release: + - CVE-2007-2519 - Directory traversal vulnerability in PEAR + [ sean finney ] * patch from Jan Wagner to be able to conditionally disable any @@ -2341,7 +2387,7 @@ php4 (4.0.2-3) unstable; urgency=low * Install not so many docs (only in -dev now). * Enable calendar and sockets modules. * Rearange package descriptions so module-specific comments - go first (closes: # oh great leader). + go first. * Create domxml module aka xmlv2. * Fix spelling wan't -> want (closes: #70544). * Add libraries for gd module only when linking this one @@ -2358,7 +2404,7 @@ php4 (4.0.2-2) unstable; urgency=low * Install not so many docs (only in -dev now). * Enable calendar and sockets modules. * Rearange package descriptions so module-specific comments - go first (closes: # oh great leader). + go first. * Create domxml module aka xmlv2. * Fix building (small typo). * Compile with libmysqlclient9-dev installed. diff --git a/debian/compat b/debian/compat new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control index 995a1b238..c124e13cf 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,13 @@ 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: apache2-prefork-dev (>= 2.0.53-3), autoconf, automake1.4, bison, chrpath, debhelper (>= 3), 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.4-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) +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.4-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) Build-Conflicts: bind-dev Standards-Version: 3.7.2 Package: php5 Architecture: all -Depends: libapache2-mod-php5 (>= ${Source-Version}) | php5-cgi (>= ${Source-Version}), php5-common (>= ${Source-Version}) +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 four server-side versions of the PHP5 interpreter @@ -41,7 +41,7 @@ Description: Common files for packages built from the php5 source Package: libapache2-mod-php5 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), ${apache2:Depends}, php5-common (= ${Source-Version}), libmagic1, ucf +Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), ${apache2:Depends}, php5-common (= ${binary:Version}), libmagic1, ucf Conflicts: libapache2-mod-php4 Provides: ${php:Provides} Suggests: php-pear @@ -61,7 +61,7 @@ Description: server-side, HTML-embedded scripting language (apache 2 module) Package: php5-cgi Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), php5-common (= ${Source-Version}), libmagic1, ucf +Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), php5-common (= ${binary:Version}), libmagic1, ucf Provides: ${php:Provides} Conflicts: php3 (<= 3.0.18-1) Suggests: php-pear @@ -82,7 +82,7 @@ Description: server-side, HTML-embedded scripting language (CGI binary) Package: php5-cli Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), php5-common (= ${Source-Version}), libmagic1, ucf +Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support (>= 2.03-1), php5-common (= ${binary:Version}), libmagic1, ucf Provides: ${php:Provides} Conflicts: php3 (<= 3.0.18-1) Suggests: php-pear @@ -101,7 +101,7 @@ Description: command-line interpreter for the php5 scripting language Homepage: http://www.php.net/ Package: php5-dev -Depends: autoconf, automake1.4, libssl-dev, libtool, shtool, php5-common (>= ${Source-Version}) +Depends: autoconf, automake1.4, libssl-dev, libtool, shtool, php5-common (>= ${binary:Version}) Section: devel Architecture: any Description: Files for PHP5 module development @@ -115,7 +115,7 @@ Description: Files for PHP5 module development Package: php-pear Architecture: all -Depends: php5-cli | php4-cli, php5-common (>= ${Source-Version}) +Depends: php5-cli | php4-cli, php5-common (>= ${source:Version}) Recommends: gnupg Suggests: php5-dev | php4-dev Replaces: php4-pear (<< 4:4.4.0-0) @@ -133,7 +133,7 @@ Description: PEAR - PHP Extension and Application Repository Package: php5-curl Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) Description: CURL module for php5 CURL is a library for getting files from FTP, GOPHER, HTTP server. . @@ -144,7 +144,7 @@ Description: CURL module for php5 Package: php5-gd Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) Description: GD module for php5 This package provides a module for handling graphics directly from PHP scripts. It supports the PNG, JPEG, XPM formats as well as Freetype/ttf fonts. @@ -156,7 +156,7 @@ Description: GD module for php5 Package: php5-gmp Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) Description: GMP module for php5 This package provides a module for arbitrary precision arithmetic via the GNU Multiple Precision (GMP) Arithmetic Library. @@ -168,7 +168,7 @@ Description: GMP module for php5 Package: php5-imap Architecture: any -Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${binary:Version}) Description: IMAP module for php5 This package provides a module for IMAP functions in PHP scripts. . @@ -178,8 +178,8 @@ Description: IMAP module for php5 dynamically generated pages quickly. Package: php5-interbase -Architecture: i386 amd64 -Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${Source-Version}) +Architecture: i386 amd64 powerpc sparc +Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${binary:Version}) Description: interbase/firebird module for php5 This package provides a module for interbase/firebird functions in PHP scripts. . @@ -190,7 +190,7 @@ Description: interbase/firebird module for php5 Package: php5-ldap Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) Description: LDAP module for php5 This package provides a module for LDAP functions in PHP scripts. . @@ -201,7 +201,7 @@ Description: LDAP module for php5 Package: php5-mcrypt Architecture: any -Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${binary:Version}) Description: MCrypt module for php5 This package provides a module for MCrypt functions in PHP scripts. . @@ -212,7 +212,7 @@ Description: MCrypt module for php5 Package: php5-mhash Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) Description: MHASH module for php5 This package provides a module for mhash functions in PHP scripts. . @@ -223,7 +223,7 @@ Description: MHASH module for php5 Package: php5-mysql Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) Conflicts: php5-mysqli Replaces: php5-mysqli Description: MySQL module for php5 @@ -240,7 +240,7 @@ Description: MySQL module for php5 Package: php5-odbc Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary: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 also contains the @@ -253,7 +253,7 @@ Description: ODBC module for php5 Package: php5-pgsql Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) Description: PostgreSQL module for php5 This package provides a module for PostgreSQL database connections directly from PHP scripts. It also includes the pdo_pgsql module for @@ -266,7 +266,7 @@ Description: PostgreSQL module for php5 Package: php5-pspell Architecture: any -Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${binary:Version}) Description: pspell module for php5 This package provides a module for pspell functions in PHP scripts. . @@ -277,7 +277,7 @@ Description: pspell module for php5 Package: php5-recode Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) Description: recode module for php5 This package provides a module for recode - character set recoding. . @@ -288,7 +288,7 @@ Description: recode module for php5 Package: php5-snmp Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) Description: SNMP module for php5 This package provides a module for SNMP functions in PHP scripts. . @@ -299,7 +299,7 @@ Description: SNMP module for php5 Package: php5-sqlite Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) 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 @@ -313,7 +313,7 @@ Description: SQLite module for php5 Package: php5-sybase Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) Provides: php5-mssql Description: Sybase / MS SQL Server module for php5 This package provides a module for Sybase and Microsoft SQL Server @@ -327,7 +327,7 @@ Description: Sybase / MS SQL Server module for php5 Package: php5-tidy Architecture: any -Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${binary:Version}) Description: tidy module for php5 This package provides a module for tidy functions in PHP scripts. . @@ -343,7 +343,7 @@ Description: tidy module for php5 Package: php5-xmlrpc Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) Description: XML-RPC module for php5 This package provides a module for XML-RPC functions in PHP scripts. . @@ -354,7 +354,7 @@ Description: XML-RPC module for php5 Package: php5-xsl Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version}) Description: XSL module for php5 This package provides a module for XSL using the libxslt XSL parser. . diff --git a/debian/patches/052-phpinfo_no_configure.patch b/debian/patches/052-phpinfo_no_configure.patch index 5df800fa8..7c7265826 100644 --- a/debian/patches/052-phpinfo_no_configure.patch +++ b/debian/patches/052-phpinfo_no_configure.patch @@ -1,7 +1,7 @@ -Index: php5-5.2.2/ext/standard/info.c +Index: php-5.2.4/ext/standard/info.c =================================================================== ---- php5-5.2.2.orig/ext/standard/info.c 2007-04-02 14:41:07.000000000 +0200 -+++ php5-5.2.2/ext/standard/info.c 2007-05-04 17:42:37.000000000 +0200 +--- php-5.2.4.orig/ext/standard/info.c ++++ php-5.2.4/ext/standard/info.c @@ -461,7 +461,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "System", php_uname ); @@ -11,3 +11,15 @@ Index: php5-5.2.2/ext/standard/info.c php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND ); #endif if (sapi_module.pretty_name) { +Index: php-5.2.4/ext/standard/tests/general_functions/phpinfo.phpt +=================================================================== +--- php-5.2.4.orig/ext/standard/tests/general_functions/phpinfo.phpt ++++ php-5.2.4/ext/standard/tests/general_functions/phpinfo.phpt +@@ -20,7 +20,6 @@ + + System => %s + Build Date => %s +-Configure Command => %s + Server API => Command Line Interface + Virtual Directory Support => %s + Configuration File (php.ini) Path => %s diff --git a/debian/patches/fix_broken_upstream_tests.patch b/debian/patches/fix_broken_upstream_tests.patch new file mode 100644 index 000000000..c876757d5 --- /dev/null +++ b/debian/patches/fix_broken_upstream_tests.patch @@ -0,0 +1,61 @@ +Index: php-5.2.4/tests/basic/bug20539.phpt +=================================================================== +--- php-5.2.4.orig/tests/basic/bug20539.phpt ++++ php-5.2.4/tests/basic/bug20539.phpt +@@ -3,6 +3,7 @@ + --INI-- + session.auto_start=1 + session.save_handler=files ++session.save_path=temp_session_store + --FILE-- + <?php + print "good :)\n"; +Index: php-5.2.4/ext/soap/tests/server009.phpt +=================================================================== +--- php-5.2.4.orig/ext/soap/tests/server009.phpt ++++ php-5.2.4/ext/soap/tests/server009.phpt +@@ -7,6 +7,10 @@ + die('skip this test needs session extension'); + } + ?> ++--INI-- ++session.auto_start=1 ++session.save_handler=files ++session.save_path=temp_session_store + --FILE-- + <?php + class foo { +Index: php-5.2.4/ext/standard/tests/general_functions/phpinfo.phpt +=================================================================== +--- php-5.2.4.orig/ext/standard/tests/general_functions/phpinfo.phpt ++++ php-5.2.4/ext/standard/tests/general_functions/phpinfo.phpt +@@ -1,5 +1,7 @@ + --TEST-- + phpinfo() ++--SKIPIF-- ++<?php die("SKIP phpinfo - test suite's handling of "%s" is incompatible with this test"); ?> + --FILE-- + <?php + var_dump(phpinfo()); +@@ -23,6 +25,8 @@ + Server API => Command Line Interface + Virtual Directory Support => %s + Configuration File (php.ini) Path => %s ++Loaded Configuration File => %s ++Scan this dir for additional .ini files => %s + PHP API => %d + PHP Extension => %d + Zend Extension => %d +Index: php-5.2.4/ext/standard/tests/strings/moneyformat.phpt +=================================================================== +--- php-5.2.4.orig/ext/standard/tests/strings/moneyformat.phpt ++++ php-5.2.4/ext/standard/tests/strings/moneyformat.phpt +@@ -5,6 +5,8 @@ + if (!function_exists('money_format') || !function_exists('setlocale')) { + die("SKIP money_format - not supported\n"); + } ++ if (!setlocale(LC_MONETARY, 'en_US')) ++ die("SKIP money_format - en_US locale not available\n"); + ?> + --FILE-- + <?php diff --git a/debian/patches/series b/debian/patches/series index 8b3238189..19dd2afbd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,3 +26,4 @@ 113-php.ini_securitynotes.patch disable_dl_by_default.patch suhosin.patch +fix_broken_upstream_tests.patch diff --git a/debian/patches/suhosin.patch b/debian/patches/suhosin.patch index 919415d4d..199606c4a 100644 --- a/debian/patches/suhosin.patch +++ b/debian/patches/suhosin.patch @@ -1,35 +1,3 @@ -Index: php5-5.2.4/configure -=================================================================== ---- php5-5.2.4.orig/configure 2007-09-16 14:45:09.000000000 +0200 -+++ php5-5.2.4/configure 2007-09-16 14:45:15.000000000 +0200 -@@ -18496,6 +18496,9 @@ - - fi - -+cat >> confdefs.h <<\EOF -+#define SUHOSIN_PATCH 1 -+EOF - - echo $ac_n "checking for declared timezone""... $ac_c" 1>&6 - echo "configure:18502: checking for declared timezone" >&5 -@@ -115678,7 +115681,7 @@ - php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ - strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \ - network.c php_open_temporary_file.c php_logos.c \ -- output.c ; do -+ output.c suhosin_patch.c ; do - - IFS=. - set $ac_src -@@ -115880,7 +115883,7 @@ - zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \ - zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \ - zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \ -- zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c; do -+ zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_canary.c; do - - IFS=. - set $ac_src Index: php5-5.2.4/configure.in =================================================================== --- php5-5.2.4.orig/configure.in 2007-09-16 14:45:15.000000000 +0200 @@ -347,20 +315,6 @@ Index: php5-5.2.4/main/main.c core_globals_dtor(&core_globals TSRMLS_CC); #else zend_ini_global_shutdown(TSRMLS_C); -Index: php5-5.2.4/main/php_config.h.in -=================================================================== ---- php5-5.2.4.orig/main/php_config.h.in 2007-09-16 14:45:09.000000000 +0200 -+++ php5-5.2.4/main/php_config.h.in 2007-09-16 14:45:15.000000000 +0200 -@@ -803,6 +803,9 @@ - /* Define if the target system has /dev/urandom device */ - #undef HAVE_DEV_URANDOM - -+/* Suhosin-Patch for PHP */ -+#undef SUHOSIN_PATCH -+ - /* Whether you have AOLserver */ - #undef HAVE_AOLSERVER - Index: php5-5.2.4/main/php.h =================================================================== --- php5-5.2.4.orig/main/php.h 2007-09-16 14:45:09.000000000 +0200 diff --git a/debian/php5-common.dirs b/debian/php5-common.dirs index 21e5e2b08..8c4dafeba 100644 --- a/debian/php5-common.dirs +++ b/debian/php5-common.dirs @@ -1,4 +1,5 @@ /usr/lib/php5/libexec +/usr/share/lintian/overrides /usr/share/doc/php5-common/examples /usr/share/doc/php5-common/PEAR /usr/share/php5 diff --git a/debian/php5-common.php5.cron.d b/debian/php5-common.php5.cron.d index 920503b94..f1d9c87c7 100644 --- a/debian/php5-common.php5.cron.d +++ b/debian/php5-common.php5.cron.d @@ -4,4 +4,4 @@ # files, or 24 minutes if not defined. See /usr/lib/php5/maxlifetime # Look for and purge old sessions every 30 minutes -09,39 * * * * root [ -d /var/lib/php5 ] && find /var/lib/php5/ -type f -cmin +$(/usr/lib/php5/maxlifetime) -print0 | xargs -r -0 rm +09,39 * * * * root [ -x /usr/lib/php5/maxlifetime ] && [ -d /var/lib/php5 ] && find /var/lib/php5/ -type f -cmin +$(/usr/lib/php5/maxlifetime) -print0 | xargs -r -0 rm diff --git a/debian/php5.lintian-overrides b/debian/php5.lintian-overrides new file mode 100644 index 000000000..fd2e2f42b --- /dev/null +++ b/debian/php5.lintian-overrides @@ -0,0 +1 @@ +php5-common: non-standard-dir-perm var/lib/php5/ 1733 != 0755 diff --git a/debian/rules b/debian/rules index 17f9b93da..3d679f113 100755 --- a/debian/rules +++ b/debian/rules @@ -9,9 +9,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatability version to use. -export DH_COMPAT=4 - # This has to be exported to make some magic below work. export DH_OPTIONS @@ -62,8 +59,8 @@ ifeq ($(wildcard /usr/share/file/magic.mime), /usr/share/file/magic.mime) MAGIC_MIME = /usr/share/file/magic.mime endif -# only enable interbase support for i386/amd64 -ifneq (,$(filter $(DEB_BUILD_ARCH),amd64 i386)) +# only enable interbase support for i386/amd64/powerpc/sparc +ifneq (,$(filter $(DEB_BUILD_ARCH),amd64 i386 powerpc sparc)) IBFLAGS=--with-interbase=shared,/usr \ --with-pdo-firebird=shared,/usr endif @@ -129,16 +126,18 @@ prepared-stamp: $(QUILT_STAMPFN) unprepared: dh_testdir sed -i -e 's/EXTRA_VERSION="-$(PHP5_DEBIAN_REVISION)"/EXTRA_VERSION=""/' configure.in - if [ -f prepared-stamp ]; then \ - rm -f aclocal.m4 config.sub config.guess ltmain.sh; \ - ./buildconf --force; \ - fi + rm -f configure aclocal.m4 config.sub config.guess ltmain.sh + rm -f build/libtool.m4 main/php_config.h.in rm -f prepared-stamp -build: build-apache2-stamp build-cgi-stamp build-cli-stamp build-pear-stamp +test-results.txt: + mkdir -p temp_session_store env NO_INTERACTION=1 TEST_PHP_CGI_EXECUTABLE=./cgi-build/sapi/cgi/cgi-bin.php5 TEST_PHP_EXECUTABLE=./apache2-build/sapi/cli/php ./apache2-build/sapi/cli/php run-tests.php > test-results.txt + rm -rf temp_session_store cat test-results.txt +build: build-apache2-stamp build-cgi-stamp build-cli-stamp build-pear-stamp test-results.txt + build-apache2-stamp: configure-apache2-stamp dh_testdir cd apache2-build && $(MAKE) @@ -280,9 +279,11 @@ configure-cli-stamp: prepared-stamp Zend/ touch configure-cli-stamp -clean: unprepared +clean: unprepared unpatch dh_testdir dh_testroot + + rm -f configure-apache2-stamp build-apache2-stamp rm -f configure-cgi-stamp build-cgi-stamp rm -f configure-cli-stamp build-cli-stamp @@ -293,6 +294,7 @@ clean: unprepared rm -rf cli-build rm -rf pear-build rm -f debian/copyright + rm -f test-results.txt dh_clean # clean up autogenerated cruft cat debian/modulelist | while read package extname dsoname; do \ @@ -324,7 +326,7 @@ install: build # 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/8M/32M/g' > debian/php5-common/usr/share/php5/php.ini-dist.cli + cat php.ini-dist | tr "\t" " " | sed -e'/memory_limit =/ s/128M/32M/g' > debian/php5-common/usr/share/php5/php.ini-dist.cli cat php.ini-dist | tr "\t" " " > debian/php5-common/usr/share/doc/php5-common/examples/php.ini-dist cat php.ini-recommended | tr "\t" " " > debian/php5-common/usr/share/doc/php5-common/examples/php.ini-recommended cat php.ini-paranoid | tr "\t" " " > debian/php5-common/usr/share/doc/php5-common/examples/php.ini-paranoid @@ -397,6 +399,9 @@ install: build # install common files install -m755 debian/maxlifetime debian/php5-common/usr/lib/php5 + # install lintian overrides + cp debian/php5.lintian-overrides $(CURDIR)/debian/php5-common/usr/share/lintian/overrides/php5-common + touch install-stamp # Build architecture-independent files here. @@ -479,8 +484,6 @@ binary-arch: build install dh_link -s dh_compress -s -Xphp.ini dh_fixperms -s -X /var/lib/php5 - mkdir -p debian/php5-common/usr/share/lintian/overrides - echo "php5-common: non-standard-dir-perm var/lib/php5/ 1733 != 0755" >> debian/php5-common/usr/share/lintian/overrides/php5-common mkdir -p debian/php5-common/usr/share/linda/overrides echo "Tag: non-standard-dir-perm" >> debian/php5-common/usr/share/linda/overrides/php5-common echo "Data: /var/lib/php5.*" >> debian/php5-common/usr/share/linda/overrides/php5-common |