diff --git a/www/php5/core/patches/patch-ext_date_lib_parse_date_c b/www/php5/core/patches/patch-ext_date_lib_parse_date_c deleted file mode 100644 index 9d4af1d9758..00000000000 --- a/www/php5/core/patches/patch-ext_date_lib_parse_date_c +++ /dev/null @@ -1,29 +0,0 @@ -from upstream cvs, fixes bug 46889, memory leak in strtotime() - -$OpenBSD: patch-ext_date_lib_parse_date_c,v 1.1 2008/12/20 21:35:38 sthen Exp $ ---- ext/date/lib/parse_date.c.orig Sun Dec 7 19:31:16 2008 -+++ ext/date/lib/parse_date.c Fri Dec 19 20:42:27 2008 -@@ -1,4 +1,4 @@ --/* Generated by re2c 0.13.5 on Sun Oct 26 11:59:08 2008 */ -+/* Generated by re2c 0.13.5 on Thu Dec 18 15:52:22 2008 */ - /* - +----------------------------------------------------------------------+ - | PHP Version 5 | -@@ -22395,7 +22395,7 @@ timelib_time* timelib_strtotime(char *s, int len, stru - - void timelib_fill_holes(timelib_time *parsed, timelib_time *now, int options) - { -- if (!(options && TIMELIB_OVERRIDE_TIME) && parsed->have_date && !parsed->have_time) { -+ if (!(options & TIMELIB_OVERRIDE_TIME) && parsed->have_date && !parsed->have_time) { - parsed->h = 0; - parsed->i = 0; - parsed->s = 0; -@@ -22415,7 +22415,7 @@ void timelib_fill_holes(timelib_time *parsed, timelib_ - parsed->tz_abbr = now->tz_abbr ? strdup(now->tz_abbr) : NULL; - } - if (!parsed->tz_info) { -- parsed->tz_info = now->tz_info ? timelib_tzinfo_clone(now->tz_info) : NULL; -+ parsed->tz_info = now->tz_info ? (!(options & TIMELIB_NO_CLONE) ? timelib_tzinfo_clone(now->tz_info) : now->tz_info) : NULL; - } - if (parsed->zone_type == 0 && now->zone_type != 0) { - parsed->zone_type = now->zone_type; diff --git a/www/php5/core/patches/patch-ext_date_lib_parse_date_re b/www/php5/core/patches/patch-ext_date_lib_parse_date_re deleted file mode 100644 index c1d7465a865..00000000000 --- a/www/php5/core/patches/patch-ext_date_lib_parse_date_re +++ /dev/null @@ -1,23 +0,0 @@ -from upstream cvs, fixes bug 46889, memory leak in strtotime() - -$OpenBSD: patch-ext_date_lib_parse_date_re,v 1.1 2008/12/20 21:35:38 sthen Exp $ ---- ext/date/lib/parse_date.re.orig Sun Oct 26 11:27:32 2008 -+++ ext/date/lib/parse_date.re Fri Dec 19 20:42:27 2008 -@@ -1619,7 +1619,7 @@ timelib_time* timelib_strtotime(char *s, int len, stru - - void timelib_fill_holes(timelib_time *parsed, timelib_time *now, int options) - { -- if (!(options && TIMELIB_OVERRIDE_TIME) && parsed->have_date && !parsed->have_time) { -+ if (!(options & TIMELIB_OVERRIDE_TIME) && parsed->have_date && !parsed->have_time) { - parsed->h = 0; - parsed->i = 0; - parsed->s = 0; -@@ -1639,7 +1639,7 @@ void timelib_fill_holes(timelib_time *parsed, timelib_ - parsed->tz_abbr = now->tz_abbr ? strdup(now->tz_abbr) : NULL; - } - if (!parsed->tz_info) { -- parsed->tz_info = now->tz_info ? timelib_tzinfo_clone(now->tz_info) : NULL; -+ parsed->tz_info = now->tz_info ? (!(options & TIMELIB_NO_CLONE) ? timelib_tzinfo_clone(now->tz_info) : now->tz_info) : NULL; - } - if (parsed->zone_type == 0 && now->zone_type != 0) { - parsed->zone_type = now->zone_type; diff --git a/www/php5/core/patches/patch-ext_date_lib_timelib_h b/www/php5/core/patches/patch-ext_date_lib_timelib_h deleted file mode 100644 index 483c2d75381..00000000000 --- a/www/php5/core/patches/patch-ext_date_lib_timelib_h +++ /dev/null @@ -1,13 +0,0 @@ -from upstream cvs, fixes bug 46889, memory leak in strtotime() - -$OpenBSD: patch-ext_date_lib_timelib_h,v 1.1 2008/12/20 21:35:38 sthen Exp $ ---- ext/date/lib/timelib.h.orig Fri Feb 22 09:48:18 2008 -+++ ext/date/lib/timelib.h Fri Dec 19 20:42:27 2008 -@@ -28,6 +28,7 @@ - - #define TIMELIB_NONE 0x00 - #define TIMELIB_OVERRIDE_TIME 0x01 -+#define TIMELIB_NO_CLONE 0x02 - - #define TIMELIB_SPECIAL_WEEKDAY 0x01 - diff --git a/www/php5/core/patches/patch-ext_date_php_date_c b/www/php5/core/patches/patch-ext_date_php_date_c deleted file mode 100644 index d74bfeae97d..00000000000 --- a/www/php5/core/patches/patch-ext_date_php_date_c +++ /dev/null @@ -1,14 +0,0 @@ -from upstream cvs, fixes bug 46889, memory leak in strtotime() - -$OpenBSD: patch-ext_date_php_date_c,v 1.1 2008/12/20 21:35:38 sthen Exp $ ---- ext/date/php_date.c.orig Tue Dec 2 18:01:57 2008 -+++ ext/date/php_date.c Fri Dec 19 20:42:27 2008 -@@ -1143,7 +1143,7 @@ PHP_FUNCTION(strtotime) - t = timelib_strtotime(times, time_len, &error, DATE_TIMEZONEDB); - error1 = error->error_count; - timelib_error_container_dtor(error); -- timelib_fill_holes(t, now, 0); -+ timelib_fill_holes(t, now, TIMELIB_NO_CLONE); - timelib_update_ts(t, tzi); - ts = timelib_date_to_int(t, &error2); -