From 6a6e51e64721f9f8ea88272d75a6a25ea6223543 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Thu, 9 Sep 2021 21:03:47 +0000
Subject: [PATCH] Release version 936 generated by do-release.sh

---
 citadel/citadel.h             |  2 +-
 citadel/internet_addressing.c | 15 ++++++++++-----
 do-release.sh                 |  1 +
 libcitadel/lib/libcitadel.h   |  2 +-
 release_version.txt           |  2 +-
 webcit/webcit.h               |  2 +-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/citadel/citadel.h b/citadel/citadel.h
index d0b1daae3..877077288 100644
--- 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 e1fcb1ba1..2e1dd06b4 100644
--- 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 a981b9d6c..58e7efa60 100755
--- 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 144386cc4..fc14796a7 100644
--- 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 a5356d998..10c7f0b94 100644
--- a/release_version.txt
+++ b/release_version.txt
@@ -1 +1 @@
-935
+936
diff --git a/webcit/webcit.h b/webcit/webcit.h
index 73ab855f4..6f8c9cffe 100644
--- 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 */
-- 
2.30.2