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

[Sean Finney]

Author: seanius
Date: 2008-11-06 07:31:46 +0000 (Thu, 06 Nov 2008)
New Revision: 1170

Removed:
   php5/trunk/debian/patches/tzdb-nofree_ents_ifnotzdata.patch
Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/patches/series
Log:
incorporated into official patch

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-11-06 07:25:13 UTC (rev 1169)
+++ php5/trunk/debian/changelog	2008-11-06 07:31:46 UTC (rev 1170)
@@ -2,6 +2,8 @@
 
   * Not released yet.
   * Updated system tzdata patch from Joe Orton.
+  * Removed tzdb-nofree_ents_ifnotzdata.patch, which is now incorporated 
+    into Joe's patch.
 
  -- Sean Finney <seanius at debian.org>  Thu, 06 Nov 2008 08:23:12 +0100
 

Modified: php5/trunk/debian/patches/series
===================================================================
--- php5/trunk/debian/patches/series	2008-11-06 07:25:13 UTC (rev 1169)
+++ php5/trunk/debian/patches/series	2008-11-06 07:31:46 UTC (rev 1170)
@@ -30,7 +30,6 @@
 use_embedded_timezonedb.patch
 manpage_spelling.patch
 force_libmysqlclient_r.patch
-tzdb-nofree_ents_ifnotzdata.patch
 CVE-2008-2829.patch
 libedit_is_editline.patch
 bad_whatis_entries.patch

Deleted: php5/trunk/debian/patches/tzdb-nofree_ents_ifnotzdata.patch
===================================================================
--- php5/trunk/debian/patches/tzdb-nofree_ents_ifnotzdata.patch	2008-11-06 07:25:13 UTC (rev 1169)
+++ php5/trunk/debian/patches/tzdb-nofree_ents_ifnotzdata.patch	2008-11-06 07:31:46 UTC (rev 1170)
@@ -1,13 +0,0 @@
-Index: php5-5.2.6/ext/date/lib/parse_tz.c
-===================================================================
---- php5-5.2.6.orig/ext/date/lib/parse_tz.c
-+++ php5-5.2.6/ext/date/lib/parse_tz.c
-@@ -311,7 +311,7 @@ static void create_zone_index(timelib_tz
- 			free(ents[--count]);
- 		}
- 		
--		free(ents);
-+		if (count != -1) free(ents);
- 		free(top);
- 	} while (dirstack_top);
-