[Pkg-php-commits] [php/debian-sid] New debian patch use_embedded_timezonedb_fixes.patch

[Sean Finney]

Author: Sean Finney <seanius at debian.org>
Forwarded: no (upstream doesn't want it)
Description: Silence warnings about using the default system timezone info
 In vanilla upstream php, this is considered an error (i.e. the user must
 set the timezone explicitly), though with our use of the system timezonedb
 patch, we actually feel quite comfortable using the default timezone info.
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571762

Closes: #571762
---
 debian/patches/series                              |    1 +
 debian/patches/use_embedded_timezonedb_fixes.patch |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/use_embedded_timezonedb_fixes.patch

diff --git a/debian/patches/series b/debian/patches/series
index e291780..06ad0df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -48,3 +48,4 @@ filter_validate_int.patch
 zend_int_overflow.patch
 fix_filter_var_email_test.patch
 fix_var_dump_64bit.phpt.patch
+use_embedded_timezonedb_fixes.patch
diff --git a/debian/patches/use_embedded_timezonedb_fixes.patch b/debian/patches/use_embedded_timezonedb_fixes.patch
new file mode 100644
index 0000000..2a10f82
--- /dev/null
+++ b/debian/patches/use_embedded_timezonedb_fixes.patch
@@ -0,0 +1,18 @@
+Author: Sean Finney <seanius at debian.org>
+Forwarded: no (upstream doesn't want it)
+Description: Silence warnings about using the default system timezone info
+ In vanilla upstream php, this is considered an error (i.e. the user must
+ set the timezone explicitly), though with our use of the system timezonedb
+ patch, we actually feel quite comfortable using the default timezone info.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571762
+--- php.orig/ext/date/php_date.c
++++ php/ext/date/php_date.c
+@@ -883,7 +883,7 @@ static char* guess_timezone(const timeli
+ 			tzid = "UTC";
+ 		}
+ 		
+-		php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG "We selected '%s' for '%s/%.1f/%s' instead", tzid, ta ? ta->tm_zone : "Unknown", ta ? (float) (ta->tm_gmtoff / 3600) : 0, ta ? (ta->tm_isdst ? "DST" : "no DST") : "Unknown");
++		// php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG "We selected '%s' for '%s/%.1f/%s' instead", tzid, ta ? ta->tm_zone : "Unknown", ta ? (float) (ta->tm_gmtoff / 3600) : 0, ta ? (ta->tm_isdst ? "DST" : "no DST") : "Unknown");
+ 		return tzid;
+ 	}
+ #endif
-- 
1.6.3.3