Zimbra · umagmrit · Aug 4, 2021 · Aug 4, 2021 · Aug 4, 2021 · Aug 10, 2021
diff --git a/build-order b/build-order
@@ -11,6 +11,8 @@ zimbra/store-base
 zimbra/osl
 zimbra/os-requirements
 thirdparty/openssl
+thirdparty/erlang
+thirdparty/rabbitmq-server
 thirdparty/libxml2
 thirdparty/libltdl
 thirdparty/libbsd

diff --git a/perl-versions.def b/perl-versions.def
@@ -3,9 +3,9 @@ BERKELEYDB			:= 0.55
 BIT_VECTOR			:= 7.4
 CACHE_FASTMMAP			:= 1.43
 CANARY_STABILITY		:= 2006
-CARP_CLAN			:= 6.04
+CARP_CLAN			:= 6.08
 CLASS_INSPECTOR			:= 1.28
-COMPRESS_RAW_BZIP2		:= 2.069
+COMPRESS_RAW_BZIP2		:= 2.093
 COMPRESS_RAW_ZLIB		:= 2.103
 CONFIG_INIFILES			:= 2.86
 CONVERT_ASN1			:= 0.27
@@ -43,7 +43,7 @@ HTTP_DATE			:= 6.02
 HTTP_MESSAGE			:= 6.11
 HTTP_NEGOTIATE			:= 6.01
 INNOTOP				:= 1.9.1
-IO_COMPRESS			:= 2.069
+IO_COMPRESS			:= 2.093
 IO_HTML				:= 1.001
 IO_SESSIONDATA			:= 1.03
 IO_SOCKET_INET6			:= 2.72
@@ -53,7 +53,7 @@ IO_STRINGY			:= 2.111
 IP_COUNTRY			:= 2.28
 JSON_PP				:= 2.27300
 LIBWWW				:= 6.13
-LIST_MOREUTILS			:= 0.413
+LIST_MOREUTILS			:= 0.428
 LWP_MEDIATYPES			:= 6.02
 LWP_PROTOCOL_HTTPS		:= 6.10
 MAIL_DKIM			:= 0.43
@@ -73,7 +73,7 @@ NET_HTTP			:= 6.09
 NET_LDAP			:= 0.65
 NET_LDAPAPI			:= 3.0.3
 NET_LIBIDN			:= 0.12
-NET_SERVER			:= 2.008
+NET_SERVER			:= 2.009
 NET_SSLEAY			:= 1.92
 NETADDR_IP			:= 4.078
 PARENT				:= 0.234

diff --git a/thirdparty/altermime/patches/fix_compile_issues.patch b/thirdparty/altermime/patches/fix_compile_issues.patch
@@ -0,0 +1,164 @@
+From 4f89cd2aa95a553f1a84c00f0a83c98fc7867ae3 Mon Sep 17 00:00:00 2001
+From: Paul L Daniels <pldaniels@gmail.com>
+Date: Wed, 24 May 2023 22:11:46 +1000
+Subject: [PATCH] Modernisation of code; fixed up various compile issues.
+
+---
+ MIME_headers.c | 10 +++++-----
+ altermime.c    |  2 +-
+ mime_alter.c   | 15 ++++++++-------
+ mime_alter.h   |  6 ++++--
+ pldstr.c       |  2 +-
+ qpe.c          |  2 +-
+ 6 files changed, 20 insertions(+), 17 deletions(-)
+
+diff --git a/MIME_headers.c b/MIME_headers.c
+index db294d9..d2b9c77 100644
+--- a/MIME_headers.c
++++ b/MIME_headers.c
+@@ -785,7 +785,7 @@ int MIMEH_save_doubleCR( FFGET_FILE *f )
+
+ 	do {
+ 		glb.doubleCR_count++;
+-		snprintf(glb.doubleCRname,_MIMEH_STRLEN_MAX,"%s/doubleCR.%d",glb.output_dir,glb.doubleCR_count);
++		snprintf(glb.doubleCRname,_MIMEH_STRLEN_MAX,"%.*s/doubleCR.%d", _MIMEH_STRLEN_MAX -40, glb.output_dir,glb.doubleCR_count);
+ 	}
+ 	while (stat(glb.doubleCRname, &st) == 0);
+
+@@ -2012,7 +2012,7 @@ int MIMEH_parse_contenttype( char *header_name, char *header_value, struct MIMEH
+ 			{
+ 				if (strlen(glb.appledouble_filename)>0)
+ 				{
+-					snprintf(hinfo->filename, sizeof(hinfo->filename), "%s.applemeta", glb.appledouble_filename );
++					snprintf(hinfo->filename, sizeof(hinfo->filename), "%.*s.applemeta", _MIMEH_FILENAMELEN_MAX -12, glb.appledouble_filename );
+ 				} else {
+ 					snprintf(hinfo->filename, sizeof(hinfo->filename), "applefile");
+ 				}
+@@ -2921,8 +2921,8 @@ int MIMEH_headers_process( struct MIMEH_header_info *hinfo, char *headers )
+ 	// Final analysis on our headers:
+ 	if ( hinfo->content_type == _CTYPE_MULTIPART_APPLEDOUBLE )
+ 	{
+-		char tmp[128];
+-		snprintf( tmp, sizeof(tmp), "mac-%s", hinfo->filename );
++		char tmp[_MIMEH_FILENAMELEN_MAX +1];
++		snprintf( tmp, sizeof(tmp), "mac-%.*s", _MIMEH_FILENAMELEN_MAX -4, hinfo->filename );
+ 		snprintf( hinfo->filename, sizeof(hinfo->filename), "%s", tmp );
+ 		snprintf( hinfo->name, sizeof(hinfo->name), "%s", tmp );
+ 	}
+@@ -3034,7 +3034,7 @@ int MIMEH_headers_get( struct MIMEH_header_info *hinfo, FFGET_FILE *f )
+
+ 	// Initialise header defects array.
+ 	hinfo->header_defect_count = 0;
+-	memset(hinfo->defects, 0, _MIMEH_DEFECT_ARRAY_SIZE);
++	memset(hinfo->defects, 0, _MIMEH_DEFECT_ARRAY_SIZE *sizeof(int));
+
+ 	snprintf( hinfo->content_type_string, _MIMEH_CONTENT_TYPE_MAX , "text/plain" ); 
+
+diff --git a/altermime.c b/altermime.c
+index 49b46e8..dcbd599 100644
+--- a/altermime.c
++++ b/altermime.c
+@@ -375,7 +375,7 @@ int main( int argc, char **argv )
+
+ 		glb.input_is_stdin = 1;
+
+-		snprintf(scratch,sizeof(scratch),"%s/%ld%d.amtmp", glb.tmpdir, time(NULL), getpid());
++		snprintf(scratch,sizeof(scratch),"%.*s/%ld%d.amtmp", (int)(sizeof(scratch) -20), glb.tmpdir, time(NULL), getpid());
+ 		//		free(glb.input_file);
+
+ 		glb.input_file = strdup(scratch);
+diff --git a/mime_alter.c b/mime_alter.c
+index 01db5f7..1e638b4 100644
+--- a/mime_alter.c
++++ b/mime_alter.c
+@@ -1543,7 +1543,7 @@ int AM_add_disclaimer_insert_html( 	struct AM_disclaimer_details *dd, FFGET_FILE
+
+ 	if (dd->boundary_found == 1)
+ 	{
+-		snprintf(boundary, sizeof(boundary), "--%s", dd->boundary);
++		snprintf(boundary, sizeof(boundary), "--%.*s", AM_BOUNDARY_BUFFER_SIZE -2, dd->boundary);
+ 		boundary_length = strlen(boundary);
+ 	}
+
+@@ -3378,13 +3378,13 @@ int AM_insert_Xheader( char *fname, char *xheader)
+ 	snprintf(tpn, sizeof(tpn), "%s",fname);
+
+ 	do {
+-		if (strlen(tpn) < (sizeof(tpn) -2))
++		size_t tpn_len = strlen(tpn);
++		if (tpn_len < (sizeof(tpn) -2))
+ 		{
+ 			/** Changed the temp filename suffix chat to a hypen because under
+ 			 ** windows appending multiple .'s results in a filename that isn't
+ 			 ** acceptable - Thanks to Nico for bringing this to my attention **/
+-			//			LOGGER_log("%s:%d:AM_insert_Xheader:NOTICE: Adjusting temp file name for header insert",FL);
+-			snprintf(tpn, sizeof(tpn),"%sX", tpn);
++			strncat(tpn, "X", sizeof(tpn) -2);
+
+ 		} else {
+ 			LOGGER_log("%s:%d:AM_insert_Xheader:ERROR: Temporary file name string buffer out of space!",FL);
+@@ -3516,9 +3516,10 @@ int AM_alter_header( char *filename, char *header, char *change, int change_mode
+ 	snprintf(tpn, sizeof(tpn), "%s",filename);
+
+ 	do {
+-		if (strlen(tpn) < (sizeof(tpn) -2))
+-		{
+-			snprintf(tpn, sizeof(tpn),"%sX", tpn);
++		size_t tpn_len = strlen(tpn);
++
++		if (tpn_len < (sizeof(tpn) -2)) {
++			strncat(tpn, "X", sizeof(tpn) -2);
+ 		}
+ 		else
+ 		{
+diff --git a/mime_alter.h b/mime_alter.h
+index 933c657..c7e121b 100644
+--- a/mime_alter.h
++++ b/mime_alter.h
+@@ -23,6 +23,8 @@
+ #define AM_NULLIFY_MATCH_MODE_FILENAME 1
+ #define AM_NULLIFY_MATCH_MODE_CONTENT_TYPE 2
+
++#define AM_BOUNDARY_BUFFER_SIZE 1024
++
+ struct AM_disclaimer_details {
+
+ 	// File details
+@@ -33,7 +35,7 @@ struct AM_disclaimer_details {
+ 	int content_type;
+ 	int content_encoding;
+ 	int boundary_found;
+-	char boundary[1024];
++	char boundary[AM_BOUNDARY_BUFFER_SIZE];
+
+ 	//
+
+diff --git a/pldstr.c b/pldstr.c
+index fdacdd2..ca29de3 100644
+--- a/pldstr.c
++++ b/pldstr.c
+@@ -297,7 +297,7 @@ char *PLD_strtok( struct PLD_strtok *st, char *line, char *delimeters )
+
+ 	result = st->start;
+
+-	if ((st->start)&&(st->start != '\0'))
++	if ((st->start)&&(*(st->start) != '\0'))
+ 	{
+ 		stop = strpbrk( st->start, delimeters ); /* locate our next delimeter */
+
+diff --git a/qpe.c b/qpe.c
+index 249fb9d..8c2f461 100644
+--- a/qpe.c
++++ b/qpe.c
+@@ -106,7 +106,7 @@ int qp_encode( char *out, size_t out_size, char *in, size_t in_size, char *line_
+ 		char charout[4];
+ 		int charout_size=0;
+
+-		if (lineend != '\0') {
++		if (*lineend != '\0') {
+ 			if (linestart == NULL) {
+ 				linestart = in;
+ 			} else {
+-- 
+2.34.1
+
diff --git a/thirdparty/altermime/zimbra-altermime/debian/compat b/thirdparty/altermime/zimbra-altermime/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/thirdparty/altermime/zimbra-altermime/debian/patches/series b/thirdparty/altermime/zimbra-altermime/debian/patches/series
@@ -1 +1 @@
-qpe.patch
+fix_compile_issues.patch
diff --git a/thirdparty/amavis-logwatch/zimbra-amavis-logwatch/debian/compat b/thirdparty/amavis-logwatch/zimbra-amavis-logwatch/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/thirdparty/amavisd/zimbra-amavisd/debian/compat b/thirdparty/amavisd/zimbra-amavisd/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/thirdparty/apr-util/zimbra-apr-util/debian/compat b/thirdparty/apr-util/zimbra-apr-util/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/thirdparty/apr/zimbra-apr/debian/compat b/thirdparty/apr/zimbra-apr/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/thirdparty/aspell-ar/zimbra-aspell-ar/debian/changelog b/thirdparty/aspell-ar/zimbra-aspell-ar/debian/changelog
@@ -1,3 +1,9 @@
+zimbra-aspell-ar (VERSION-1zimbra8.7b2ZAPPEND) unstable; urgency=medium
+
+  * Updated dependency aspell to 0.60.8
+
+ -- Zimbra Packaging Services <packaging-devel@zimbra.com>  Tue, 10 Aug 2021 00:00:00 +0000
+
 zimbra-aspell-ar (VERSION-ITERATIONZAPPEND) unstable; urgency=medium
 
   * Initial Release.

diff --git a/thirdparty/aspell-ar/zimbra-aspell-ar/debian/compat b/thirdparty/aspell-ar/zimbra-aspell-ar/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/thirdparty/aspell-ar/zimbra-aspell-ar/debian/control b/thirdparty/aspell-ar/zimbra-aspell-ar/debian/control
@@ -1,5 +1,5 @@
 Source: zimbra-aspell-ar
-Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-aspell
+Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-aspell (>= 0.60.8-1zimbra8.7b1ZAPPEND)
 Section: utils
 Priority: optional
 Maintainer: Zimbra Packaging Services <packaging-devel@zimbra.com>
@@ -10,5 +10,5 @@ Homepage: http://aspell.net/
 Package: zimbra-aspell-ar
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, zimbra-aspell
+Depends: ${shlibs:Depends}, ${misc:Depends}, zimbra-aspell (>= 0.60.8-1zimbra8.7b1ZAPPEND)
 Description: Aspell Arabic Dictionary
diff --git a/thirdparty/aspell-ar/zimbra-aspell-ar/rpm/SPECS/aspell-ar.spec b/thirdparty/aspell-ar/zimbra-aspell-ar/rpm/SPECS/aspell-ar.spec
@@ -1,17 +1,21 @@
 Summary:            Zimbra's Aspell Arabic dictionary
 Name:               zimbra-aspell-ar
 Version:            VERSION
-Release:            ITERATIONZAPPEND
+Release:            1zimbra8.7b2ZAPPEND
 License:            GPL-2.0
 Source:             %{name}-%{version}.tar.bz2
-BuildRequires:      zimbra-aspell
-Requires:           zimbra-aspell
+BuildRequires:      zimbra-aspell >= 0.60.8-1zimbra8.7b1ZAPPEND
+Requires:           zimbra-aspell >= 0.60.8-1zimbra8.7b1ZAPPEND
 AutoReqProv:        no
 URL:                http://aspell.net/
 
 %description
 The Zimbra Aspell Arabic dictionary
 
+%changelog
+* Tue Aug 10 2021  Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.7b2ZAPPEND
+- Updated dependency aspell to 0.60.8
+
 %define debug_package %{nil}
 
 %prep

diff --git a/thirdparty/aspell-ca/zimbra-aspell-ca/debian/compat b/thirdparty/aspell-ca/zimbra-aspell-ca/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/thirdparty/aspell-da/zimbra-aspell-da/debian/changelog b/thirdparty/aspell-da/zimbra-aspell-da/debian/changelog
@@ -1,3 +1,9 @@
+zimbra-aspell-da (VERSION-1zimbra8.7b2ZAPPEND) unstable; urgency=medium
+
+  * Upgraded dependency aspell to 0.60.8
+
+ -- Zimbra Packaging Services <packaging-devel@zimbra.com>  Tue, 10 Aug 2021 00:00:00 +0000
+
 zimbra-aspell-da (VERSION-ITERATIONZAPPEND) unstable; urgency=medium
 
   * Initial Release.

diff --git a/thirdparty/aspell-da/zimbra-aspell-da/debian/compat b/thirdparty/aspell-da/zimbra-aspell-da/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/thirdparty/aspell-da/zimbra-aspell-da/debian/control b/thirdparty/aspell-da/zimbra-aspell-da/debian/control
@@ -1,5 +1,5 @@
 Source: zimbra-aspell-da
-Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-aspell
+Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-aspell (>= 0.60.8-1zimbra8.7b1ZAPPEND)
 Section: utils
 Priority: optional
 Maintainer: Zimbra Packaging Services <packaging-devel@zimbra.com>
@@ -10,5 +10,5 @@ Homepage: http://aspell.net/
 Package: zimbra-aspell-da
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, zimbra-aspell
+Depends: ${shlibs:Depends}, ${misc:Depends}, zimbra-aspell (>= 0.60.8-1zimbra8.7b1ZAPPEND)
 Description: Aspell Danish Dictionary
diff --git a/thirdparty/aspell-da/zimbra-aspell-da/rpm/SPECS/aspell-da.spec b/thirdparty/aspell-da/zimbra-aspell-da/rpm/SPECS/aspell-da.spec
@@ -1,17 +1,21 @@
 Summary:            Zimbra's Aspell Danish dictionary
 Name:               zimbra-aspell-da
 Version:            VERSION
-Release:            ITERATIONZAPPEND
+Release:            1zimbra8.7b2ZAPPEND
 License:            GPL-2.0
 Source:             %{name}-%{version}.tar.bz2
-BuildRequires:      zimbra-aspell
-Requires:           zimbra-aspell
+BuildRequires:      zimbra-aspell >= 0.60.8-1zimbra8.7b1ZAPPEND
+Requires:           zimbra-aspell >= 0.60.8-1zimbra8.7b1ZAPPEND
 AutoReqProv:        no
 URL:                http://aspell.net/
 
 %description
 The Zimbra Aspell Danish dictionary
 
+%changelog
+* Tue Aug 10 2021  Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.7b2ZAPPEND
+- Upgraded dependency aspell to 0.60.8
+
 %define debug_package %{nil}
 
 %prep

diff --git a/thirdparty/aspell-de/zimbra-aspell-de/debian/changelog b/thirdparty/aspell-de/zimbra-aspell-de/debian/changelog
@@ -1,3 +1,9 @@
+zimbra-aspell-de (VERSION-1zimbra8.7b2ZAPPEND) unstable; urgency=medium
+
+  * Upgraded dependency aspell to 0.60.8
+
+ -- Zimbra Packaging Services <packaging-devel@zimbra.com>  Tue, 10 Aug 2021 00:00:00 +0000
+
 zimbra-aspell-de (VERSION-ITERATIONZAPPEND) unstable; urgency=medium
 
   * Initial Release.

diff --git a/thirdparty/aspell-de/zimbra-aspell-de/debian/compat b/thirdparty/aspell-de/zimbra-aspell-de/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/thirdparty/aspell-de/zimbra-aspell-de/debian/control b/thirdparty/aspell-de/zimbra-aspell-de/debian/control
@@ -1,5 +1,5 @@
 Source: zimbra-aspell-de
-Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-aspell
+Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-aspell (>= 0.60.8-1zimbra8.7b1ZAPPEND)
 Section: utils
 Priority: optional
 Maintainer: Zimbra Packaging Services <packaging-devel@zimbra.com>
@@ -10,5 +10,5 @@ Homepage: http://aspell.net/
 Package: zimbra-aspell-de
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, zimbra-aspell
+Depends: ${shlibs:Depends}, ${misc:Depends}, zimbra-aspell (>= 0.60.8-1zimbra8.7b1ZAPPEND)
 Description: Aspell German Dictionary
diff --git a/thirdparty/aspell-de/zimbra-aspell-de/rpm/SPECS/aspell-de.spec b/thirdparty/aspell-de/zimbra-aspell-de/rpm/SPECS/aspell-de.spec
@@ -1,17 +1,21 @@
 Summary:            Zimbra's Aspell German dictionary
 Name:               zimbra-aspell-de
 Version:            VERSION
-Release:            ITERATIONZAPPEND
+Release:            1zimbra8.7b2ZAPPEND
 License:            GPL-2.0
 Source:             %{name}-%{version}.tar.bz2
-BuildRequires:      zimbra-aspell
-Requires:           zimbra-aspell
+BuildRequires:      zimbra-aspell >= 0.60.8-1zimbra8.7b1ZAPPEND
+Requires:           zimbra-aspell >= 0.60.8-1zimbra8.7b1ZAPPEND
 AutoReqProv:        no
 URL:                http://aspell.net/
 
 %description
 The Zimbra Aspell German dictionary
 
+%changelog
+* Tue Aug 10 2021  Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.7b2ZAPPEND
+- Upgraded dependency aspell to 0.60.8
+
 %define debug_package %{nil}
 
 %prep

diff --git a/thirdparty/aspell-en/zimbra-aspell-en/debian/changelog b/thirdparty/aspell-en/zimbra-aspell-en/debian/changelog
@@ -1,3 +1,9 @@
+zimbra-aspell-en (VERSION-1zimbra8.7b2ZAPPEND) unstable; urgency=medium
+
+  * Upgraded dependency aspell to 0.60.8
+
+ -- Zimbra Packaging Services <packaging-devel@zimbra.com>  Tue, 10 Aug 2021 00:00:00 +0000
+
 zimbra-aspell-en (VERSION-ITERATIONZAPPEND) unstable; urgency=medium
 
   * Initial Release.