From: Art Cancro Date: Mon, 27 Jan 2014 15:33:42 +0000 (-0500) Subject: Version 8.22 release X-Git-Tag: v8.24~2 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=e137e363d46b643035a61a239178919126140225 Version 8.22 release --- diff --git a/citadel/citadel.h b/citadel/citadel.h index a271e6f0f..fc3e9abd9 100644 --- a/citadel/citadel.h +++ b/citadel/citadel.h @@ -45,10 +45,10 @@ extern "C" { * usually more strict because you're not really supposed to dump/load and * upgrade at the same time. */ -#define REV_LEVEL 823 /* This version */ +#define REV_LEVEL 824 /* This version */ #define REV_MIN 591 /* Oldest compatible database */ #define EXPORT_REV_MIN 760 /* Oldest compatible export files */ -#define LIBCITADEL_MIN 823 /* Minimum required version of libcitadel */ +#define LIBCITADEL_MIN 824 /* Minimum required version of libcitadel */ #define SERVER_TYPE 0 /* zero for stock Citadel; other developers please obtain SERVER_TYPE codes for your implementations */ diff --git a/citadel/configure.ac b/citadel/configure.ac index ae6c81d45..67aa2ed16 100644 --- a/citadel/configure.ac +++ b/citadel/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -AC_INIT([Citadel], [8.23], [http://www.citadel.org/]) +AC_INIT([Citadel], [8.24], [http://www.citadel.org/]) AC_REVISION([$Revision: 5108 $]) AC_CONFIG_SRCDIR([citserver.c]) AC_CONFIG_HEADER(sysdep.h) diff --git a/citadel/debian/changelog b/citadel/debian/changelog index 2f49759c2..a2f2bd6bc 100644 --- a/citadel/debian/changelog +++ b/citadel/debian/changelog @@ -1,3 +1,9 @@ +citadel (8.24-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens Mon, 27 Jan 2014 10:23:16 -0500 + citadel (8.23-1) stable; urgency=low * new release diff --git a/libcitadel/configure.in b/libcitadel/configure.in index c58b37714..f0f673f3e 100755 --- a/libcitadel/configure.in +++ b/libcitadel/configure.in @@ -5,7 +5,7 @@ dnl dnl Ensure that libcitadel is configured with autoconf 2.52 or newer AC_PREREQ(2.52) -AC_INIT(libcitadel, 4.8.23, http://uncensored.citadel.org) +AC_INIT(libcitadel, 4.8.24, http://uncensored.citadel.org) AC_CONFIG_SRCDIR(Makefile.in) AC_CONFIG_AUX_DIR(conftools) @@ -23,7 +23,7 @@ dnl If the API changes incompatibly set LIBAGE back to 0 dnl LIBCURRENT=4 -LIBREVISION=823 +LIBREVISION=824 LIBAGE=0 sinclude(conftools/libtool.m4) diff --git a/libcitadel/debian/changelog b/libcitadel/debian/changelog index d9467bee8..569f09052 100644 --- a/libcitadel/debian/changelog +++ b/libcitadel/debian/changelog @@ -1,3 +1,9 @@ +libcitadel (8.24-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens Mon, 27 Jan 2014 10:23:16 -0500 + libcitadel (8.23-1) stable; urgency=low * new release diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h index 2c70cb8c4..15c941efb 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -28,7 +28,7 @@ #include #include -#define LIBCITADEL_VERSION_NUMBER 823 +#define LIBCITADEL_VERSION_NUMBER 824 /* * Here's a bunch of stupid magic to make the MIME parser portable. diff --git a/textclient/configure.ac b/textclient/configure.ac index a3a5fa3c7..29d3ee799 100644 --- a/textclient/configure.ac +++ b/textclient/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -AC_INIT([Citadel], [8.23], [http://www.citadel.org/]) +AC_INIT([Citadel], [8.24], [http://www.citadel.org/]) AC_REVISION([$Revision: 5108 $]) AC_CONFIG_HEADER(sysdep.h) diff --git a/textclient/debian/changelog b/textclient/debian/changelog index f0da060c5..d0f898402 100644 --- a/textclient/debian/changelog +++ b/textclient/debian/changelog @@ -1,3 +1,9 @@ +textclient (8.24-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens Mon, 27 Jan 2014 10:23:16 -0500 + textclient (8.23-1) stable; urgency=low * new release diff --git a/webcit/configure.ac b/webcit/configure.ac index af630a7fc..896dbb73d 100644 --- a/webcit/configure.ac +++ b/webcit/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl $Id$ -AC_INIT([WebCit], [8.23], [http://www.citadel.org/]) +AC_INIT([WebCit], [8.24], [http://www.citadel.org/]) AC_SUBST(PROG_SUBDIRS) diff --git a/webcit/debian/changelog b/webcit/debian/changelog index ac3de576a..bb350ef9f 100644 --- a/webcit/debian/changelog +++ b/webcit/debian/changelog @@ -1,3 +1,9 @@ +webcit (8.24-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens Mon, 27 Jan 2014 10:23:16 -0500 + webcit (8.23-1) stable; urgency=low * new release diff --git a/webcit/ical_subst.c b/webcit/ical_subst.c index 5f2393ff9..adb81f15a 100644 --- a/webcit/ical_subst.c +++ b/webcit/ical_subst.c @@ -272,8 +272,8 @@ void render_MIME_ICS_TPL(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundChar wc_mime_attachment *Mime = CTX(CTX_MIME_ATACH); icalproperty_method the_method = ICAL_METHOD_NONE; icalproperty *method = NULL; - icalcomponent *cal; - icalcomponent *c; + icalcomponent *cal = NULL; + icalcomponent *c = NULL; WCTemplputParams SubTP; WCTemplputParams SuperTP; @@ -538,7 +538,7 @@ int cond_ICalAttendeeState(StrBuf *Target, WCTemplputParams *TP) for (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT); (c != 0); c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)) { - /* Recursively process subcomponent * / + / * Recursively process subcomponent * / cal_process_object(Target, c, recursion_level+1, msgnum, cal_partnum); } */ diff --git a/webcit/webcit.h b/webcit/webcit.h index 74426d613..7ed202642 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -132,8 +132,8 @@ extern char *ssl_cipher_list; #define PORT_NUM 2000 /* port number to listen on */ #define DEVELOPER_ID 0 #define CLIENT_ID 4 -#define CLIENT_VERSION 823 /* This version of WebCit */ -#define MINIMUM_CIT_VERSION 823 /* Minimum required version of Citadel server */ +#define CLIENT_VERSION 824 /* This version of WebCit */ +#define MINIMUM_CIT_VERSION 824 /* Minimum required version of Citadel server */ #define LIBCITADEL_MIN 821 /* Minimum required version of libcitadel */ #define DEFAULT_HOST "localhost" /* Default Citadel server */ #define DEFAULT_PORT "504"