[142532] trunk/dports/devel/libical

[mk at macports.org]

Revision: 142532
          https://trac.macports.org/changeset/142532
Author:   mk at macports.org
Date:     2015-11-14 06:55:41 -0800 (Sat, 14 Nov 2015)
Log Message:
-----------
libical: added previously forgotten patch files

Added Paths:
-----------
    trunk/dports/devel/libical/files/
    trunk/dports/devel/libical/files/fix_timezone_crash.patch
    trunk/dports/devel/libical/files/make_recursive_mutex.patch

Added: trunk/dports/devel/libical/files/fix_timezone_crash.patch
===================================================================
--- trunk/dports/devel/libical/files/fix_timezone_crash.patch	                        (rev 0)
+++ trunk/dports/devel/libical/files/fix_timezone_crash.patch	2015-11-14 14:55:41 UTC (rev 142532)
@@ -0,0 +1,24 @@
+Description: work around heap corruption bug
+Author: Robie Basak <robie.basak at canonical.com>
+Last-Update: 2012-04-04
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_id=29084189
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/956843
+Bug: https://sourceforge.net/tracker/?func=detail&aid=3514871&group_id=16077&atid=116077
+
+---
+ src/libical/icaltimezone.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: libical-1.0/src/libical/icaltimezone.c
+===================================================================
+--- libical-1.0.orig/src/libical/icaltimezone.c	2013-06-11 15:34:23.913446943 +0100
++++ libical-1.0/src/libical/icaltimezone.c	2013-06-11 15:34:23.905446943 +0100
+@@ -1686,7 +1686,7 @@
+     icalerror_assert (builtin_timezones == NULL,
+ 		      "Parsing zones.tab file multiple times");
+ 
+-    builtin_timezones = icalarray_new (sizeof (icaltimezone), 32);
++    builtin_timezones = icalarray_new (sizeof (icaltimezone), 1024);
+ 
+ #ifndef USE_BUILTIN_TZDATA
+     filename_len = strlen ((char *) icaltzutil_get_zone_directory()) + strlen (ZONES_TAB_SYSTEM_FILENAME)

Added: trunk/dports/devel/libical/files/make_recursive_mutex.patch
===================================================================
--- trunk/dports/devel/libical/files/make_recursive_mutex.patch	                        (rev 0)
+++ trunk/dports/devel/libical/files/make_recursive_mutex.patch	2015-11-14 14:55:41 UTC (rev 142532)
@@ -0,0 +1,15 @@
+--- libical-1.0/src/libical/orig.icaltimezone.c 2014-07-28 17:05:08.000000000 +0200
++++ libical-1.0/src/libical/icaltimezone.c      2014-07-28 17:07:13.000000000 +0200
+@@ -47,7 +47,10 @@
+ 
+ #ifdef HAVE_PTHREAD
+ #include <pthread.h>
+-static pthread_mutex_t builtin_mutex = PTHREAD_MUTEX_INITIALIZER;
++// static pthread_mutex_t builtin_mutex = PTHREAD_MUTEX_INITIALIZER;
++// It seems the same thread can attempt to lock builtin_mutex multiple times
++// (at least when using builtin tzdata), so make it builtin_mutex recursive:
++static pthread_mutex_t builtin_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+ #endif
+ 
+ #ifdef WIN32
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/bddc5a83/attachment.html>