[Pkg-php-commits] [php/debian-sid] Add DEP-3-format metadata to some of the patches

Raphael Geissert geissert at debian.org
Sun Feb 7 23:17:14 UTC 2010 

---
 debian/patches/004-ldap_fix.patch              |    6 ++++++
 debian/patches/006-debian_quirks.patch         |    6 ++++++
 debian/patches/013-force_getaddrinfo.patch     |    7 +++++++
 debian/patches/017-pread_pwrite_disable.patch  |    8 ++++++++
 debian/patches/019-z_off_t_as_long.patch       |    9 +++++++++
 debian/patches/029-php.ini_paranoid.patch      |    5 +++++
 debian/patches/033-we_WANT_libtool.patch       |   19 ++++++++++++-------
 debian/patches/034-apache2_umask_fix.patch     |   10 ++++++++--
 debian/patches/036-fd_setsize_fix.patch        |    5 +++++
 debian/patches/043-recode_size_t.patch         |    6 ++++++
 debian/patches/045-exif_nesting_level.patch    |    5 +++++
 debian/patches/052-phpinfo_no_configure.patch  |   12 ++++++++++++
 debian/patches/053-extension_api.patch         |    7 +++++++
 debian/patches/057-no_apache_installed.patch   |    5 +++++
 debian/patches/100-recode_is_shared.patch      |    6 ++++++
 debian/patches/113-php.ini_securitynotes.patch |    5 +++++
 debian/patches/bad_whatis_entries.patch        |    5 +++++
 debian/patches/fix_broken_upstream_tests.patch |    5 +++++
 debian/patches/force_libmysqlclient_r.patch    |    8 ++++++++
 debian/patches/libdb_is_-ldb                   |    6 ++++++
 20 files changed, 136 insertions(+), 9 deletions(-)

diff --git a/debian/patches/004-ldap_fix.patch b/debian/patches/004-ldap_fix.patch
index 55e4177..6ab086f 100644
--- a/debian/patches/004-ldap_fix.patch
+++ b/debian/patches/004-ldap_fix.patch
@@ -1,3 +1,9 @@
+Description: Prevent null dereferencing in ldap_explode_dn()
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/205405
+Forwarded: no
+Last-Update: 2010-01-18
+
 --- a/ext/ldap/ldap.c
 +++ b/ext/ldap/ldap.c
 @@ -1211,7 +1211,7 @@ PHP_FUNCTION(ldap_explode_dn)
diff --git a/debian/patches/006-debian_quirks.patch b/debian/patches/006-debian_quirks.patch
index c61c3c0..6f43255 100644
--- a/debian/patches/006-debian_quirks.patch
+++ b/debian/patches/006-debian_quirks.patch
@@ -1,3 +1,9 @@
+Description: Changes to make php use versioned paths and other minor
+ cleanup changes.
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2010-01-18
+
 --- a/configure.in
 +++ b/configure.in
 @@ -1021,7 +1021,7 @@ if test "$PHP_CLI" = "no"; then
diff --git a/debian/patches/013-force_getaddrinfo.patch b/debian/patches/013-force_getaddrinfo.patch
index 22d4cb9..7c44219 100644
--- a/debian/patches/013-force_getaddrinfo.patch
+++ b/debian/patches/013-force_getaddrinfo.patch
@@ -1,3 +1,10 @@
+Description: Always use getaddrinfo
+ .
+ The patch should probably be dropped and the configure check verified.
+Origin: vendor
+Forwarded: no
+Last-Update: 2010-01-18
+
 --- a/configure.in
 +++ b/configure.in
 @@ -631,50 +631,50 @@ asprintf \
diff --git a/debian/patches/017-pread_pwrite_disable.patch b/debian/patches/017-pread_pwrite_disable.patch
index 051e5fa..704cab4 100644
--- a/debian/patches/017-pread_pwrite_disable.patch
+++ b/debian/patches/017-pread_pwrite_disable.patch
@@ -1,3 +1,11 @@
+Description: Completely disable the usage of pread/pwrite
+ .
+ This is an old patch and should be re-checked.
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/261311
+Forwarded: no
+Last-Update: 2010-01-18
+
 --- pkg-php.orig/acinclude.m4
 +++ pkg-php/acinclude.m4
 @@ -1219,7 +1219,7 @@ $1
diff --git a/debian/patches/019-z_off_t_as_long.patch b/debian/patches/019-z_off_t_as_long.patch
index 3b4c2b3..38876b1 100644
--- a/debian/patches/019-z_off_t_as_long.patch
+++ b/debian/patches/019-z_off_t_as_long.patch
@@ -1,3 +1,12 @@
+Description: Include some zlib headers to make sure z_off_t is a long on
+ the gzip file functions. Issue caused by LFS support.
+ .
+ Needs to be re-checked.
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/208608
+Forwarded: no
+Last-Update: 2010-01-18
+
 --- /dev/null
 +++ pkg-php/ext/zlib/zconf.h
 @@ -0,0 +1,326 @@
diff --git a/debian/patches/029-php.ini_paranoid.patch b/debian/patches/029-php.ini_paranoid.patch
index fcb0b6d..e21d071 100644
--- a/debian/patches/029-php.ini_paranoid.patch
+++ b/debian/patches/029-php.ini_paranoid.patch
@@ -1,3 +1,8 @@
+Description: php.ini with paranoid settings
+Origin: other
+Forwarded: no
+Last-Update: 2010-01-18
+
 --- /dev/null
 +++ pkg-php/php.ini-paranoid
 @@ -0,0 +1,1504 @@
diff --git a/debian/patches/033-we_WANT_libtool.patch b/debian/patches/033-we_WANT_libtool.patch
index 25a27ad..a280a58 100644
--- a/debian/patches/033-we_WANT_libtool.patch
+++ b/debian/patches/033-we_WANT_libtool.patch
@@ -1,11 +1,16 @@
-upstream ships an out of date version of libtool.  this ensures that
-we build against an up-to-date version of libtool by running libtoolize
-as part of our build process (this is called indirectly via ./buildconf.sh
-from debian/rules)
+Description:
+ upstream ships an out of date version of libtool.  this ensures that
+ we build against an up-to-date version of libtool by running libtoolize
+ as part of our build process (this is called indirectly via ./buildconf.sh
+ from debian/rules)
+ .
+ note that we don't touch the libtool.m4 that they ship here, and this file
+ gets included in the build process as part of the phpize stuff.  however,
+ this is solved in ./debian/rules where it's overwritten with a symlink.
+Origin: vendor
+Forwarded: no
+Last-Update: 2010-01-18
 
-note that we don't touch the libtool.m4 that they ship here, and this file 
-gets included in the build process as part of the phpize stuff.  however,
-this is solved in ./debian/rules where it's overwritten with a symlink.
 --- pkg-php.orig/build/build2.mk
 +++ pkg-php/build/build2.mk
 @@ -52,7 +52,8 @@ $(TOUCH_FILES):
diff --git a/debian/patches/034-apache2_umask_fix.patch b/debian/patches/034-apache2_umask_fix.patch
index 7cc639b..30b4d95 100644
--- a/debian/patches/034-apache2_umask_fix.patch
+++ b/debian/patches/034-apache2_umask_fix.patch
@@ -1,5 +1,11 @@
-
-Save and restore umask across requests correctly.
+Description: Save and restore umask across requests correctly.
+ .
+ Check if this is still an issue not addressed by upstream in some
+ other way already.
+Origin: other
+Bug-Debian: http://bugs.debian.org/286225
+Forwarded: no
+Last-Update: 2010-01-18
 
 --- pkg-php.orig/sapi/apache2handler/sapi_apache2.c
 +++ pkg-php/sapi/apache2handler/sapi_apache2.c
diff --git a/debian/patches/036-fd_setsize_fix.patch b/debian/patches/036-fd_setsize_fix.patch
index 30fd6f9..8f597d6 100644
--- a/debian/patches/036-fd_setsize_fix.patch
+++ b/debian/patches/036-fd_setsize_fix.patch
@@ -1,3 +1,8 @@
+Description: Fixes misuse of FD_SET()
+Origin: vendor
+Forwarded: no
+Last-Update: 2010-01-18
+
 --- a/ext/sockets/sockets.c
 +++ b/ext/sockets/sockets.c
 @@ -714,6 +714,7 @@ static int php_sock_array_to_fd_set(zval
diff --git a/debian/patches/043-recode_size_t.patch b/debian/patches/043-recode_size_t.patch
index eb57353..41e4047 100644
--- a/debian/patches/043-recode_size_t.patch
+++ b/debian/patches/043-recode_size_t.patch
@@ -1,3 +1,9 @@
+Description: Check for possible overflows in recode_string()
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/294986, http://bugs.debian.org/459020
+Forwarded: no
+Last-Update: 2010-01-18
+
 --- pkg-php.orig/ext/recode/recode.c
 +++ pkg-php/ext/recode/recode.c
 @@ -149,7 +149,7 @@ PHP_FUNCTION(recode_string)
diff --git a/debian/patches/045-exif_nesting_level.patch b/debian/patches/045-exif_nesting_level.patch
index 5e06edd..4cb20e6 100644
--- a/debian/patches/045-exif_nesting_level.patch
+++ b/debian/patches/045-exif_nesting_level.patch
@@ -1,3 +1,8 @@
+Description: Increase maximum exif nesting level.
+Origin: vendor
+Forwarded: no
+Last-Update: 2010-01-18
+
 --- pkg-php.orig/ext/exif/exif.c
 +++ pkg-php/ext/exif/exif.c
 @@ -99,7 +99,7 @@ typedef unsigned char uchar;
diff --git a/debian/patches/052-phpinfo_no_configure.patch b/debian/patches/052-phpinfo_no_configure.patch
index c1da78b..57c09c2 100644
--- a/debian/patches/052-phpinfo_no_configure.patch
+++ b/debian/patches/052-phpinfo_no_configure.patch
@@ -1,3 +1,15 @@
+Description: Disable configure parameters on phpinfo() output
+ .
+ Patch needs to be discussed with upstream and the issues that lead to
+ its addition re-checked.  Quoting changelog entry:
+ .
+ Add [...], which disables the display of our "Configure Command" in
+ phpinfo(), which was the source of many bogus bug reports over the
+ years, due to people misinterpreting its meaning.
+Origin: vendor
+Forwarded: no
+Last-Update: 2010-01-18
+
 --- a/ext/standard/info.c
 +++ b/ext/standard/info.c
 @@ -693,7 +693,7 @@ PHPAPI void php_print_info(int flag TSRM
diff --git a/debian/patches/053-extension_api.patch b/debian/patches/053-extension_api.patch
index 54aa511..fcdf9b5 100644
--- a/debian/patches/053-extension_api.patch
+++ b/debian/patches/053-extension_api.patch
@@ -1,3 +1,10 @@
+Description: Adds --phpapi argument to php-config(1)
+ .
+ TODO: make it more generic and add it to the man page.
+Origin: vendor
+Forwarded: no
+Last-Update: 2010-01-18
+
 --- a/configure.in
 +++ b/configure.in
 @@ -1130,8 +1130,13 @@ dnl Build extension directory path
diff --git a/debian/patches/057-no_apache_installed.patch b/debian/patches/057-no_apache_installed.patch
index ef8d60e..6937e0c 100644
--- a/debian/patches/057-no_apache_installed.patch
+++ b/debian/patches/057-no_apache_installed.patch
@@ -1,3 +1,8 @@
+Description: Disable installed-apache configure check
+Origin: vendor
+Forwarded: no
+Last-Update: 2010-01-18
+
 --- pkg-php.orig/sapi/apache2handler/config.m4
 +++ pkg-php/sapi/apache2handler/config.m4
 @@ -59,13 +59,13 @@ if test "$PHP_APXS2" != "no"; then
diff --git a/debian/patches/100-recode_is_shared.patch b/debian/patches/100-recode_is_shared.patch
index 234481e..f459d8c 100644
--- a/debian/patches/100-recode_is_shared.patch
+++ b/debian/patches/100-recode_is_shared.patch
@@ -1,3 +1,9 @@
+Description: Turn recode conflicts error message into a warning. The
+ recode extension is packaged as a shared library in Debian.
+Origin: vendor
+Forwarded: no
+Last-Update: 2010-01-18
+
 --- pkg-php.orig/ext/recode/config9.m4
 +++ pkg-php/ext/recode/config9.m4
 @@ -13,6 +13,6 @@ if test "$PHP_RECODE" != "no"; then
diff --git a/debian/patches/113-php.ini_securitynotes.patch b/debian/patches/113-php.ini_securitynotes.patch
index 9973751..730068c 100644
--- a/debian/patches/113-php.ini_securitynotes.patch
+++ b/debian/patches/113-php.ini_securitynotes.patch
@@ -1,3 +1,8 @@
+Description: Adds security notices to php.ini settings
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2010-01-18
+
 --- a/php.ini-development
 +++ b/php.ini-development
 @@ -335,6 +335,11 @@ allow_call_time_pass_reference = Off
diff --git a/debian/patches/bad_whatis_entries.patch b/debian/patches/bad_whatis_entries.patch
index b40e78a..5b1810c 100644
--- a/debian/patches/bad_whatis_entries.patch
+++ b/debian/patches/bad_whatis_entries.patch
@@ -1,3 +1,8 @@
+Description: Fix whatis entries of the man pages
+Origin: vendor
+Forwarded: no
+Last-Update: 2010-01-18
+
 --- pkg-php.orig/sapi/cli/php.1.in
 +++ pkg-php/sapi/cli/php.1.in
 @@ -1,6 +1,5 @@
diff --git a/debian/patches/fix_broken_upstream_tests.patch b/debian/patches/fix_broken_upstream_tests.patch
index 737b0d7..34e39b5 100644
--- a/debian/patches/fix_broken_upstream_tests.patch
+++ b/debian/patches/fix_broken_upstream_tests.patch
@@ -1,3 +1,8 @@
+Description: Add missing settings to fix upstream tests
+Origin: vendor
+Forwarded: no
+Last-Update: 2010-01-18
+
 --- pkg-php.orig/ext/soap/tests/server009.phpt
 +++ pkg-php/ext/soap/tests/server009.phpt
 @@ -7,6 +7,10 @@ SOAP Server 9: setclass and setpersisten
diff --git a/debian/patches/force_libmysqlclient_r.patch b/debian/patches/force_libmysqlclient_r.patch
index ce80f28..463b92d 100644
--- a/debian/patches/force_libmysqlclient_r.patch
+++ b/debian/patches/force_libmysqlclient_r.patch
@@ -1,3 +1,11 @@
+Description: Force linking to mysqlclient_r to avoid symbol conflicts.
+ apr-util's mysql driver is linked against that version of the library
+ but due to missing proper symbols versioning we are forced to link to
+ the re-entrant library too.
+Origin: other, http://bugs.debian.org/469081
+Forwarded: not-needed
+Last-Update: 2010-01-18
+
 --- pkg-php.orig/ext/mysql/config.m4
 +++ pkg-php/ext/mysql/config.m4
 @@ -90,7 +90,7 @@ elif test "$PHP_MYSQL" != "no"; then
diff --git a/debian/patches/libdb_is_-ldb b/debian/patches/libdb_is_-ldb
index b158557..f5cbcc3 100644
--- a/debian/patches/libdb_is_-ldb
+++ b/debian/patches/libdb_is_-ldb
@@ -1,3 +1,9 @@
+Description: Let configure check detect version-less libdbs to support
+ newer versions without patching the configure code.
+Origin: vendor
+Forwarded: no
+Last-Update: 2010-01-18
+
 --- pkg-php.orig/ext/dba/config.m4
 +++ pkg-php/ext/dba/config.m4
 @@ -306,7 +306,7 @@ if test "$PHP_DB4" != "no"; then
-- 
1.6.3.3

More information about the Pkg-php-commits mailing list