[Pkg-php-commits] r1012 - in php5/trunk/debian: . patches

[Sean Finney]

Author: seanius
Date: 2008-03-29 10:15:08 +0000 (Sat, 29 Mar 2008)
New Revision: 1012

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/copyright.header
   php5/trunk/debian/patches/suhosin.patch
   php5/trunk/debian/patches/use_embedded_timezonedb.patch
Log:
update copyright information for patches and package

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-03-28 19:15:03 UTC (rev 1011)
+++ php5/trunk/debian/changelog	2008-03-29 10:15:08 UTC (rev 1012)
@@ -6,6 +6,9 @@
     using the system provided timezone database instead of the one bundled 
     with PHP.  Many thanks to Joe Orten from Red Hat for the patch!
     closes: #447174.
+  * update copyright information to have information about non-trivial 
+    patches worthy of copyright attributions, and update information about
+    current debian maintainers.
 
  -- Sean Finney <seanius at debian.org>  Fri, 28 Mar 2008 20:02:42 +0100
 

Modified: php5/trunk/debian/copyright.header
===================================================================
--- php5/trunk/debian/copyright.header	2008-03-28 19:15:03 UTC (rev 1011)
+++ php5/trunk/debian/copyright.header	2008-03-29 10:15:08 UTC (rev 1012)
@@ -13,6 +13,17 @@
 It was downloaded from www.php.net/version5/downloads
 Changes: removed ext/dbase dir (non-free)
 
+Noteworthy/non-trivial patches:
+	patch: suhosin.patch
+	contributor: http://www.hardened-php.net/
+	copyright © 2006-2007 Stefan Esser <sesser at hardened-php.net>
+	may be used/modified/redistributed under the terms of PHP itself
+
+	patch: use_embedded_timezonedb.patch
+	contributor: Joe Orton <jorton at redhat.com>
+	copyright © 2008 Red Hat, Inc.
+	may be used/modified/redistributed under the terms of PHP itself
+
 Upstream Authors: The PHP group for PHP5, Andi Gutmans and Zeev Suraski
 for libzend
 

Modified: php5/trunk/debian/patches/suhosin.patch
===================================================================
--- php5/trunk/debian/patches/suhosin.patch	2008-03-28 19:15:03 UTC (rev 1011)
+++ php5/trunk/debian/patches/suhosin.patch	2008-03-29 10:15:08 UTC (rev 1012)
@@ -1,3 +1,8 @@
+suhosin hardening patch
+Copyright © 2006-2007 Stefan Esser <sesser at hardened-php.net>
+Suhosin is licensed under the PHP License Version 3.01
+downloaded from http://www.hardened-php.net/suhosin/download.html
+modified to not patch autofoo output scripts (configure/Makefile.in/etc)
 Index: php5-5.2.5/TSRM/TSRM.h
 ===================================================================
 --- php5-5.2.5.orig/TSRM/TSRM.h

Modified: php5/trunk/debian/patches/use_embedded_timezonedb.patch
===================================================================
--- php5/trunk/debian/patches/use_embedded_timezonedb.patch	2008-03-28 19:15:03 UTC (rev 1011)
+++ php5/trunk/debian/patches/use_embedded_timezonedb.patch	2008-03-29 10:15:08 UTC (rev 1012)
@@ -1,3 +1,7 @@
+use the system-provided timezonedb data instead of php's bundled data.
+patch by Joe Orton <jorton at redhat.com> Copyright © 2008 Red Hat, Inc.
+and may be used/redistributed/modified under the terms of the rest
+of the PHP source
 --- php-5.2.5/ext/date/lib/timelib.m4.systzdata
 +++ php-5.2.5/ext/date/lib/timelib.m4
 @@ -78,3 +78,17 @@ stdlib.h