cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to libical-0.48.

Browse Source
This commit is contained in:
ajacoutot 2012-03-23 11:58:23 +00:00
parent 783daaa564
commit 5ceafa9404
10 changed files with 48 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
textproc/libical/Makefile
View File

@ -1,14 +1,12 @@
# $OpenBSD: Makefile,v 1.10 2011/11/14 23:55:48 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.11 2012/03/23 11:58:23 ajacoutot Exp $
COMMENT= implementation of basic iCAL protocols
DISTNAME= libical-0.46
DISTNAME= libical-0.48
REVISION= 0
SHARED_LIBS += ical 2.0 # 46.0
SHARED_LIBS += icalss 2.0 # 46.0
SHARED_LIBS += icalvcal 1.0 # 46.0
SHARED_LIBS += ical 2.0 # 48.0
SHARED_LIBS += icalss 2.0 # 48.0
SHARED_LIBS += icalvcal 1.0 # 48.0
CATEGORIES= textproc
@ -22,28 +20,12 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += pthread
USE_LIBTOOL= Yes
AUTOCONF_VERSION= 2.60
AUTOMAKE_VERSION= 1.9
BUILD_DEPENDS= devel/autoconf/${AUTOCONF_VERSION} \
devel/automake/${AUTOMAKE_VERSION}
# needs the AM_PROG_LIBTOOL macro
BUILD_DEPENDS+= devel/libtool
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--without-builtintz
do-configure:
cd ${WRKSRC} && \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
./autogen.sh ${CONFIGURE_ARGS}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libical/
${INSTALL_DATA} ${WRKSRC}/doc/UsingLibical.txt \

10
textproc/libical/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libical-0.46.tar.gz) = nAj4iUW/1dB5HRAuSqQSXA==
RMD160 (libical-0.46.tar.gz) = 3i9j3S2ZeQ6+IX8CEuaQyVJFTEY=
SHA1 (libical-0.46.tar.gz) = oqnK0h4MM2JGEA7vjQecuv9QpvM=
SHA256 (libical-0.46.tar.gz) = AAdi77gVAUIdlOxWNDZIpis70ohOfN9vY44sIH3Y9qE=
SIZE (libical-0.46.tar.gz) = 1102093
MD5 (libical-0.48.tar.gz) = 5Un0NNX7+c0VbGDtSUNhjw==
RMD160 (libical-0.48.tar.gz) = AwALQL3QjhnOtrWDP6k3J+1YcF8=
SHA1 (libical-0.48.tar.gz) = RpPNBDi+nzcnFGrBpGqlsbk7jIY=
SHA256 (libical-0.48.tar.gz) = KueLB1fw3RNDGs9CqajQODOf1HZ/1RNOZQv2DuC03/A=
SIZE (libical-0.48.tar.gz) = 1173620

35
textproc/libical/patches/patch-configure
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure,v 1.3 2011/10/02 08:55:40 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.4 2012/03/23 11:58:23 ajacoutot Exp $
Don't use built-in timezone, but the system one.
--- configure.orig Mon Aug 30 22:09:44 2010
+++ configure Sat Oct 1 11:46:25 2011
@@ -19098,6 +19098,10 @@ case "$host" in
--- configure.orig Tue Dec 13 18:08:34 2011
+++ configure Fri Mar 23 12:42:47 2012
@@ -15760,6 +15760,10 @@ case "$host" in
use_builtin_timezone=no
os_win32=no
;;
@ -15,16 +15,27 @@ Don't use built-in timezone, but the system one.
*)
use_builtin_timezone=yes
os_win32=no
@@ -19581,13 +19585,13 @@ _ACEOF
@@ -16235,8 +16239,8 @@ _ACEOF
case "${host}" in
*-*-freebsdelf4* )
- { $as_echo "$as_me:$LINENO: result: checking for pthread_create in -lpthread... -pthread (FreeBSD 4.x style)" >&5
-$as_echo "checking for pthread_create in -lpthread... -pthread (FreeBSD 4.x style)" >&6; }
+ { $as_echo "$as_me:$LINENO: result: checking for pthread_create in -pthread... -pthread (FreeBSD 4.x style)" >&5
+$as_echo "checking for pthread_create in -pthread... -pthread (FreeBSD 4.x style)" >&6; }
cat >>confdefs.h <<\_ACEOF
#define HAVE_PTHREAD /**/
@@ -16245,13 +16249,13 @@ _ACEOF
PTHREAD_LIBS=-pthread;;
*)
- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6
- { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+ { $as_echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
+$as_echo_n "checking for pthread_create in -pthread... " >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
@ -32,8 +43,8 @@ Don't use built-in timezone, but the system one.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -19655,7 +19659,7 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_PTHREAD
@@ -16320,7 +16324,7 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_PTHREAD /**/
_ACEOF
- PTHREAD_LIBS=-lpthread

18
textproc/libical/patches/patch-scripts_mkderivedproperties_pl
View File

@ -1,18 +1,18 @@
$OpenBSD: patch-scripts_mkderivedproperties_pl,v 1.1 2011/06/20 18:15:29 sebastia Exp $
$OpenBSD: patch-scripts_mkderivedproperties_pl,v 1.2 2012/03/23 11:58:23 ajacoutot Exp $
fix for gcc-2.95
--- scripts/mkderivedproperties.pl.orig Mon Jun 20 18:55:19 2011
+++ scripts/mkderivedproperties.pl Mon Jun 20 18:55:42 2011
@@ -239,6 +239,7 @@ $type icalproperty_get_${lc}(const icalproperty* prop)
--- scripts/mkderivedproperties.pl.orig Tue Dec 13 18:08:14 2011
+++ scripts/mkderivedproperties.pl Fri Mar 23 12:41:17 2012
@@ -244,6 +244,7 @@ $type icalproperty_get_${lc}(const icalproperty* prop)
* it doesnot work automatically like in the other functions
* like icalproperty_get_dtstart().
*/
+ {
struct icaltimetype itt =
icalvalue_get_datetime(icalproperty_get_value(prop));
icalparameter* param = icalproperty_get_first_parameter(prop,
@@ -249,6 +250,7 @@ $type icalproperty_get_${lc}(const icalproperty* prop)
+ {
itt = icalvalue_get_datetime(icalproperty_get_value(prop));
param = icalproperty_get_first_parameter(prop, ICAL_TZID_PARAMETER);
if (param) {
@@ -251,6 +252,7 @@ $type icalproperty_get_${lc}(const icalproperty* prop)
icaltime_set_timezone(&itt, zone);
}
return itt;

34
textproc/libical/patches/patch-src_libical_autogenex_ical_h
View File

@ -1,34 +0,0 @@
$OpenBSD: patch-src_libical_autogenex_ical_h,v 1.2 2011/11/14 23:55:48 ajacoutot Exp $
Define ICAL_ERRORS_ARE_FATAL to unbreak ports using -Werror while
including ical.h since on OpenBSD undefined declarations will produce a
warning:
https://sourceforge.net/tracker/?func=detail&aid=3437953&group_id=16077&atid=116077
From upstream SVN:
http://freeassociation.svn.sourceforge.net/viewvc/freeassociation?view=revision&revision=1042
--- src/libical/autogenex/ical.h.orig Mon Aug 30 22:05:05 2010
+++ src/libical/autogenex/ical.h Tue Nov 15 00:12:18 2011
@@ -3272,7 +3272,11 @@ if(icalerror_get_error_state(x)==ICAL_ERROR_FATAL || \
void icalerror_set_errno(icalerrorenum x);
#endif
-#ifdef ICAL_ERRORS_ARE_FATAL
+#ifndef ICAL_ERRORS_ARE_FATAL
+#define ICAL_ERRORS_ARE_FATAL 0
+#endif
+
+#if ICAL_ERRORS_ARE_FATAL == 1
#undef NDEBUG
#endif
@@ -3282,7 +3286,7 @@ void icalerror_set_errno(icalerrorenum x);
#define icalerror_check_component_type(value,type);
/* Assert with a message */
-#ifdef ICAL_ERRORS_ARE_FATAL
+#if ICAL_ERRORS_ARE_FATAL == 1
#ifdef __GNUC__
#define icalerror_assert(test,message) if(!(test)){fprintf(stderr,"%s(), %s:%d: %s\n",__FUNCTION__,__FILE__,__LINE__,message);icalerror_stop_here(); abort();}

34
textproc/libical/patches/patch-src_libical_icalerror_h
View File

@ -1,34 +0,0 @@
$OpenBSD: patch-src_libical_icalerror_h,v 1.2 2011/11/14 23:55:48 ajacoutot Exp $
Define ICAL_ERRORS_ARE_FATAL to unbreak ports using -Werror while
including ical.h since on OpenBSD undefined declarations will produce a
warning:
https://sourceforge.net/tracker/?func=detail&aid=3437953&group_id=16077&atid=116077
From upstream SVN:
http://freeassociation.svn.sourceforge.net/viewvc/freeassociation?view=revision&revision=1042
--- src/libical/icalerror.h.orig Mon Aug 30 22:05:06 2010
+++ src/libical/icalerror.h Tue Nov 15 00:49:05 2011
@@ -121,7 +121,11 @@ if(icalerror_get_error_state(x)==ICAL_ERROR_FATAL || \
void icalerror_set_errno(icalerrorenum x);
#endif
-#ifdef ICAL_ERRORS_ARE_FATAL
+#ifndef ICAL_ERRORS_ARE_FATAL
+#define ICAL_ERRORS_ARE_FATAL 0
+#endif
+
+#if ICAL_ERRORS_ARE_FATAL == 1
#undef NDEBUG
#endif
@@ -131,7 +135,7 @@ void icalerror_set_errno(icalerrorenum x);
#define icalerror_check_component_type(value,type);
/* Assert with a message */
-#ifdef ICAL_ERRORS_ARE_FATAL
+#if ICAL_ERRORS_ARE_FATAL == 1
#ifdef __GNUC__
#define icalerror_assert(test,message) if(!(test)){fprintf(stderr,"%s(), %s:%d: %s\n",__FUNCTION__,__FILE__,__LINE__,message);icalerror_stop_here(); abort();}

56
textproc/libical/patches/patch-src_libical_icalparser_c
View File

@ -1,56 +0,0 @@
$OpenBSD: patch-src_libical_icalparser_c,v 1.2 2011/10/02 08:55:40 ajacoutot Exp $
SVN rev. 1062
In parser_get_next_char(), make sure we are on at least the second character
when testing if the current double-quote char is escaped.
Might fix the crash reported in ID: 2994723
From upstream SVN:
http://freeassociation.svn.sourceforge.net/viewvc/freeassociation?view=revision&revision=1042
--- src/libical/icalparser.c.orig Mon Aug 30 22:05:06 2010
+++ src/libical/icalparser.c Sat Oct 1 12:10:27 2011
@@ -192,18 +192,18 @@ char* parser_get_next_char(char c, char *str, int qm)
for(p=str; *p!=0; p++){
if (qm == 1) {
- if ( quote_mode == 0 && *p=='"' && *(p-1) != '\\' ){
+ if ( quote_mode == 0 && *p=='"' && p>str && *(p-1) != '\\' ){
quote_mode =1;
continue;
}
- if ( quote_mode == 1 && *p=='"' && *(p-1) != '\\' ){
+ if ( quote_mode == 1 && *p=='"' && p>str && *(p-1) != '\\' ){
quote_mode =0;
continue;
}
}
- if (quote_mode == 0 && *p== c && *(p-1) != '\\' ){
+ if (quote_mode == 0 && *p== c && p>str && *(p-1) != '\\' ){
return p;
}
@@ -930,10 +930,7 @@ icalcomponent* icalparser_add_line(icalparser* parser,
/* Change for mozilla */
/* have the option of being flexible towards unsupported parameters */
- #ifndef ICAL_ERRORS_ARE_FATAL
- continue;
- #endif
-
+ #if ICAL_ERRORS_ARE_FATAL == 1
insert_error(tail, str, "Cant parse parameter name",
ICAL_XLICERRORTYPE_PARAMETERNAMEPARSEERROR);
tail = 0;
@@ -947,6 +944,9 @@ icalcomponent* icalparser_add_line(icalparser* parser,
name = 0;
}
return 0;
+ #else
+ continue;
+ #endif
}
/* if (pvalue) {

96
textproc/libical/patches/patch-src_libical_icaltimezone_c
View File

@ -1,96 +0,0 @@
$OpenBSD: patch-src_libical_icaltimezone_c,v 1.1 2011/10/02 08:55:40 ajacoutot Exp $
From upstream SVN:
http://freeassociation.svn.sourceforge.net/viewvc/freeassociation?view=revision&revision=1039
--- src/libical/icaltimezone.c.orig Mon Aug 30 22:05:06 2010
+++ src/libical/icaltimezone.c Sat Oct 1 12:08:20 2011
@@ -45,6 +45,11 @@
#include <sys/stat.h>
+#ifdef HAVE_PTHREAD
+#include <pthread.h>
+static pthread_mutex_t builtin_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif
+
#ifdef WIN32
#include <mbstring.h>
#include <windows.h>
@@ -453,8 +458,7 @@ icaltimezone_ensure_coverage (icaltimezone *zone,
int changes_end_year;
- if (!zone->component)
- icaltimezone_load_builtin_timezone (zone);
+ icaltimezone_load_builtin_timezone (zone);
if (icaltimezone_minimum_expansion_year == -1) {
struct icaltimetype today = icaltime_today();
@@ -1140,8 +1144,7 @@ icaltimezone_get_tzid (icaltimezone *zone)
if (!zone)
return NULL;
- if (!zone->tzid)
- icaltimezone_load_builtin_timezone (zone);
+ icaltimezone_load_builtin_timezone (zone);
return zone->tzid;
}
@@ -1167,8 +1170,7 @@ icaltimezone_get_tznames (icaltimezone *zone)
if (!zone)
return NULL;
- if (!zone->component)
- icaltimezone_load_builtin_timezone (zone);
+ icaltimezone_load_builtin_timezone (zone);
return zone->tznames;
}
@@ -1210,8 +1212,7 @@ icaltimezone_get_component (icaltimezone *zone)
if (!zone)
return NULL;
- if (!zone->component)
- icaltimezone_load_builtin_timezone (zone);
+ icaltimezone_load_builtin_timezone (zone);
return zone->component;
}
@@ -1449,8 +1450,7 @@ icaltimezone_get_builtin_timezone_from_offset (int off
for (i=0; i<count; i++) {
int z_offset;
zone = icalarray_element_at (builtin_timezones, i);
- if (!zone->component)
- icaltimezone_load_builtin_timezone (zone);
+ icaltimezone_load_builtin_timezone (zone);
z_offset = get_offset(zone);
@@ -1745,6 +1745,12 @@ icaltimezone_load_builtin_timezone (icaltimezone *zone
if (!zone->location || !zone->location[0])
return;
+#ifdef HAVE_PTHREAD
+ pthread_mutex_lock(&builtin_mutex);
+ if (zone->component)
+ goto out;
+#endif
+
#ifdef USE_BUILTIN_TZDATA
{
char *filename;
@@ -1801,8 +1807,11 @@ icaltimezone_load_builtin_timezone (icaltimezone *zone
icalcomponent_remove_component(comp,subcomp);
icalcomponent_free(comp);
}
-#endif
-
+#endif
+#ifdef HAVE_PTHREAD
+ out:
+ pthread_mutex_unlock(&builtin_mutex);
+#endif
}

36
textproc/libical/patches/patch-src_libical_icaltz-util_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_libical_icaltz-util_c,v 1.2 2011/10/02 08:55:40 ajacoutot Exp $
--- src/libical/icaltz-util.c.orig Mon Aug 30 22:05:06 2010
+++ src/libical/icaltz-util.c Sat Oct 1 11:46:25 2011
@@ -31,6 +31,14 @@
$OpenBSD: patch-src_libical_icaltz-util_c,v 1.3 2012/03/23 11:58:23 ajacoutot Exp $
--- src/libical/icaltz-util.c.orig Tue Dec 13 18:08:18 2011
+++ src/libical/icaltz-util.c Fri Mar 23 12:40:27 2012
@@ -32,6 +32,14 @@
#if defined(sun) && defined(__SVR4)
#include <sys/types.h>
#include <sys/byteorder.h>
+#elif defined(__OpenBSD__)
+#include <sys/types.h>
@ -16,7 +16,7 @@ $OpenBSD: patch-src_libical_icaltz-util_c,v 1.2 2011/10/02 08:55:40 ajacoutot Ex
#else
# ifdef HAVE_BYTESWAP_H
# include <byteswap.h>
@@ -140,6 +148,8 @@ decode (const void *ptr)
@@ -144,6 +152,8 @@ decode (const void *ptr)
if (sizeof (int) == 4)
#ifdef _BIG_ENDIAN
return *(const int *) ptr;
@ -25,27 +25,3 @@ $OpenBSD: patch-src_libical_icaltz-util_c,v 1.2 2011/10/02 08:55:40 ajacoutot Ex
#else
return BSWAP_32 (*(const int *) ptr);
#endif
@@ -438,7 +448,10 @@ icaltzutil_fetch_timezone (const char *location)
else
zp_idx = zidx;
/* DTSTART localtime uses TZOFFSETFROM UTC offset */
- trans = transitions [stdidx] + types [zp_idx].gmtoff;
+ if (num_trans)
+ trans = transitions [stdidx] + types [zidx].gmtoff;
+ else
+ trans = types [zidx].gmtoff;
icaltime = icaltime_from_timet (trans, 0);
dtstart = icaltime;
dtstart.year = 1970;
@@ -477,7 +490,10 @@ icaltzutil_fetch_timezone (const char *location)
icalcomponent_add_property (dst_comp, icalprop);
/* DTSTART localtime uses TZOFFSETFROM UTC offset */
- trans = transitions [dstidx] + types [zp_idx].gmtoff;
+ if (num_trans)
+ trans = transitions [dstidx] + types [zidx].gmtoff;
+ else
+ trans = types [zidx].gmtoff;
icaltime = icaltime_from_timet (trans, 0);
dtstart = icaltime;
dtstart.year = 1970;

27
textproc/libical/patches/patch-src_libicalss_Makefile_am
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-src_libicalss_Makefile_am,v 1.3 2011/10/02 08:55:40 ajacoutot Exp $
--- src/libicalss/Makefile.am.orig Mon Aug 30 22:07:44 2010
+++ src/libicalss/Makefile.am Sat Oct 1 11:46:25 2011
@@ -29,11 +29,7 @@ LEX_OUTPUT_ROOT = lex.ss
BUILT_SOURCES = icalss.h
-# just to get it built
-$(srcdir)/icalgauge.c: icalssyacc.h
-$(srcdir)/icalsslexer.c: icalssyacc.h
-
if WITH_BDB4
BDB_INCLUDE=-I@BDB_DIR_INCLUDE@ -DWITH_BDB4
BDB_SOURCEFILES=icalbdbset.c icalbdbset.h icalbdbsetimpl.h
@@ -73,6 +69,11 @@ libicalss_la_LIBADD = $(BDB_LIBFILES) $(top_builddir)/
if DEV
libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y
+
+# just to get it built
+$(srcdir)/icalgauge.c: icalssyacc.h
+$(srcdir)/icalsslexer.c: icalssyacc.h
+
else
libicalss_la_DEVSOURCES = icalsslexer.c icalssyacc.c
endif