Release version 936 generated by do-release.sh

diff --git a/citadel/citadel.h b/citadel/citadel.h
index d0b1daae36cbe8f4ebc6ab308138d44de53f63c3..877077288e5c93bbcb2af1bd1061ab407958655a 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -32,7 +32,7 @@ extern "C" {
  */
 #define CITADEL        PACKAGE_STRING
 
-#define REV_LEVEL 935          // This version
+#define REV_LEVEL 936          // This version
 #define REV_MIN                591             // Oldest compatible database
 #define EXPORT_REV_MIN 931             // Oldest compatible export files
 #define LIBCITADEL_MIN 931             // Minimum required version of libcitadel

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index e1fcb1ba1512d6e4e729eda96564c719c0c90286..2e1dd06b4adc4a60e8434f5f644d9524c05bdbb1 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -470,7 +470,8 @@ Array *split_recps(char *addresses, Array *append_to) {
        } while (r > l);
 
        // Transform all qualifying delimiters to commas
-       for (char *t=a; t[0]; ++t) {
+       char *t;
+       for (t=a; t[0]; ++t) {
                if ((t[0]==';') || (t[0]=='|')) {
                        t[0]=',';
                }
@@ -486,7 +487,8 @@ Array *split_recps(char *addresses, Array *append_to) {
        }
 
        int num_addresses = num_tokens(a, ',');
-       for (int i=0; i<num_addresses; ++i) {
+       int i;
+       for (i=0; i<num_addresses; ++i) {
                char this_address[256];
                extract_token(this_address, a, i, ',', sizeof this_address);
                striplt(this_address);                          // strip leading and trailing whitespace
@@ -554,11 +556,13 @@ struct recptypes *validate_recipients(char *supplied_recipients, const char *Rem
 
        char *aliases = CtdlGetSysConfig(GLOBAL_ALIASES);                               // First hit the Global Alias Table
 
-       for (int r=0; (recp_array && r<array_len(recp_array)); ++r) {
+       int r;
+       for (r=0; (recp_array && r<array_len(recp_array)); ++r) {
                org_recp = (char *)array_get_element_at(recp_array, r);
                strncpy(this_recp, org_recp, sizeof this_recp);
 
-               for (int i=0; i<3; ++i) {                                               // pass three times through the aliaser
+               int i;
+               for (i=0; i<3; ++i) {                                           // pass three times through the aliaser
                        mailtype = expand_aliases(this_recp, aliases);
        
                        // If an alias expanded to multiple recipients, strip off those recipients and append them
@@ -569,7 +573,8 @@ struct recptypes *validate_recipients(char *supplied_recipients, const char *Rem
                }
 
                // This loop searches for duplicate recipients in the final list and marks them to be skipped.
-               for (int j=0; j<r; ++j) {
+               int j;
+               for (j=0; j<r; ++j) {
                        if (!strcasecmp(this_recp, (char *)array_get_element_at(recp_array, j) )) {
                                mailtype = EA_SKIP;
                        }

diff --git a/do-release.sh b/do-release.sh
index a981b9d6c661fa6c964ae64bdcc9d822ab0d3d2e..58e7efa60d3da34a8d0296f169905cd84f95ce55 100755 (executable)
--- a/do-release.sh
+++ b/do-release.sh
@@ -64,6 +64,7 @@ echo -e '\033[37m\033[1mUpdating release_version.txt to indicate version '${NEW_
 echo -e '\033[37m\033[1mGenerating a commit\033[0m'
 echo -e ''
 git commit -a -m "Release version ${NEW_VERSION} generated by do-release.sh"
+git tag -a v${NEW_VERSION}
 
 echo -e ''
 echo -e '\033[37m\033[1mFinished.  Remember to push this commit.\033[0m'

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index 144386cc414ec5ee106285fbea03a1544d1d386e..fc14796a739ba3d7b6ae9c52f02a186b8723ef27 100644 (file)
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 
-#define LIBCITADEL_VERSION_NUMBER 935
+#define LIBCITADEL_VERSION_NUMBER 936
 
 /*
  * Here's a bunch of stupid magic to make the MIME parser portable.

diff --git a/release_version.txt b/release_version.txt
index a5356d998d92a103f7646b03ff65cd6658ef2601..10c7f0b94545f269bfff6399fd9a89c225d4abf9 100644 (file)
--- a/release_version.txt
+++ b/release_version.txt
@@ -1 +1 @@
-935
+936

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 73ab855f4ddbe82406060e9e0a1fc3b0b72975e9..6f8c9cffe55a1c4579aa16e551434f378cbc282d 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -127,7 +127,7 @@ extern char *ssl_cipher_list;
 #define PORT_NUM               80              /* port number to listen on */
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
-#define CLIENT_VERSION 935             /* This version of WebCit */
+#define CLIENT_VERSION 936             /* This version of WebCit */
 #define MINIMUM_CIT_VERSION    931             /* Minimum required version of Citadel server */
 #define        LIBCITADEL_MIN          931             /* Minimum required version of libcitadel */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */