Zimbra · umagmrit · Jul 27, 2023 · Jun 20, 2023 · Jun 20, 2023 · Jun 20, 2023
diff --git a/perl-versions.def b/perl-versions.def
@@ -13,7 +13,7 @@ CONVERT_BINHEX			:= 1.124
 CONVERT_TNEF			:= 0.18
 CONVERT_UULIB			:= 1.5
 CRYPT_OPENSSL_RANDOM		:= 0.11
-CRYPT_OPENSSL_RSA		:= 0.31
+CRYPT_OPENSSL_RSA		:= 0.33
 CRYPT_SALTEDHASH		:= 0.09
 DATA_UUID			:= 1.221
 DATE_CALC			:= 6.4
@@ -48,14 +48,14 @@ IO_HTML				:= 1.001
 IO_SESSIONDATA			:= 1.03
 IO_SOCKET_INET6			:= 2.72
 IO_SOCKET_IP			:= 0.37
-IO_SOCKET_SSL			:= 2.068
+IO_SOCKET_SSL			:= 2.083
 IO_STRINGY			:= 2.111
 IP_COUNTRY			:= 2.28
 JSON_PP				:= 2.27300
 LIBWWW				:= 6.13
 LIST_MOREUTILS			:= 0.413
 LWP_MEDIATYPES			:= 6.02
-LWP_PROTOCOL_HTTPS		:= 6.06
+LWP_PROTOCOL_HTTPS		:= 6.10
 MAIL_DKIM			:= 0.40
 MAIL_SPAMASSASSIN		:= 3.4.6
 MAIL_SPF			:= 2.9.0
@@ -74,7 +74,7 @@ NET_LDAP			:= 0.65
 NET_LDAPAPI			:= 3.0.3
 NET_LIBIDN			:= 0.12
 NET_SERVER			:= 2.008
-NET_SSLEAY			:= 1.88
+NET_SSLEAY			:= 1.92
 NETADDR_IP			:= 4.078
 PARENT				:= 0.234
 PROC_PROCESSTABLE		:= 0.53

diff --git a/thirdparty/apr-util/zimbra-apr-util/debian/changelog b/thirdparty/apr-util/zimbra-apr-util/debian/changelog
@@ -1,3 +1,9 @@
+zimbra-apr-util (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium
+
+  * ZBUG-3355, Upgraded OpenSSL to 3.0.9
+
+ -- Zimbra Packaging Services <packaging-devel@zimbra.com>  Mon, 12 Jun 2023 05:12:55 +0000
+
 zimbra-apr-util (VERSION-1zimbra8.7b2ZAPPEND) unstable; urgency=medium
 
   * Upgraded dependency openssl to 1.1.1h

diff --git a/thirdparty/apr-util/zimbra-apr-util/debian/control b/thirdparty/apr-util/zimbra-apr-util/debian/control
@@ -1,6 +1,6 @@
 Source: zimbra-apr-util
 Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-apr-dev,
- libexpat1-dev, zimbra-openssl-dev (>= 1.1.1h-1zimbra8.7b3ZAPPEND)
+ libexpat1-dev, zimbra-openssl-dev (>= 3.0.9-1zimbra8.8b1ZAPPEND)
 Section: utils
 Priority: optional
 Maintainer: Zimbra Packaging Services <packaging-devel@zimbra.com>

diff --git a/thirdparty/apr-util/zimbra-apr-util/rpm/SPECS/apr-util.spec b/thirdparty/apr-util/zimbra-apr-util/rpm/SPECS/apr-util.spec
@@ -1,11 +1,11 @@
 Summary:            Zimbra's Apache Portable Runtime Utilities build
 Name:               zimbra-apr-util
 Version:            VERSION
-Release:            1zimbra8.7b2ZAPPEND
+Release:            1zimbra8.7b3ZAPPEND
 License:            Apache-2.0
 Source:             %{name}-%{version}.tar.bz2
 BuildRequires:      zimbra-apr-devel, expat-devel
-BuildRequires:      zimbra-openssl-devel >= 1.1.1h-1zimbra8.7b3ZAPPEND
+BuildRequires:      zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND
 Requires:           zimbra-apr-util-libs = %{version}-%{release}
 AutoReqProv:        no
 URL:                https://apr.apache.org/
@@ -16,6 +16,8 @@ The Zimbra Apache Portable Runtime Utilities build
 %define debug_package %{nil}
 
 %changelog
+* Mon Jun 12 2023 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.7b3ZAPPEND
+- ZBUG-3355, Upgraded OpenSSL to 3.0.9
 * Fri Dec 02 2020 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.7b2ZAPPEND
 - Upgraded dependency openssl to 1.1.1h
 * Thu Sep 10 2020 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-ITERATIONZAPPEND

diff --git a/thirdparty/clamav/Makefile b/thirdparty/clamav/Makefile
@@ -41,6 +41,7 @@ build_rpm:
 	$(replace-pathinfo) $(specfile) && \
 	$(MKDIR) BUILD BUILDROOT RPMS SOURCES SRPMS && \
 	$(CP) $(psrc_file) SOURCES/$(zname)-$(pvers).tar.gz && \
+	$(CP) $(PKG_ROOT)/patches/*.patch SOURCES/ && \
 	$(PKG_BUILD) $(specfile)
 
 build_deb: z_tgz = $(zname)_$(pvers).orig.tar.gz
@@ -50,6 +51,7 @@ build_deb:
 	$(replace-pkginfo) debian/changelog $(z_shlibs) && \
 	$(replace-pathinfo) debian/rules && \
 	$(CP) $(psrc_file) ../$(z_tgz) && \
+	$(CP) $(PKG_ROOT)/patches/*.patch debian/patches/ && \
 	$(TAR) xfz ../$(z_tgz) --strip-components=1 && \
 	$(PKG_BUILD)
 

diff --git a/thirdparty/clamav/patches/clamav-fips.patch b/thirdparty/clamav/patches/clamav-fips.patch
@@ -0,0 +1,66 @@
+diff -ruN a/libclamav/crypto.c b/libclamav/crypto.c
+--- a/libclamav/crypto.c	2023-06-19 11:20:46.996793622 +0000
++++ b/libclamav/crypto.c	2023-06-19 11:27:53.568952679 +0000
+@@ -170,7 +170,7 @@
+     size_t cur;
+     int winres = 0;
+
+-    md = EVP_get_digestbyname(alg);
++    md = EVP_MD_fetch(NULL, alg, "-fips");
+     if (!(md))
+         return NULL;
+
+@@ -260,7 +260,7 @@
+     const EVP_MD *md;
+     unsigned char *res;
+
+-    md = EVP_get_digestbyname(alg);
++    md = EVP_MD_fetch(NULL, alg, "-fips");
+     if (!(md))
+         return NULL;
+
+@@ -392,7 +392,7 @@
+     const EVP_MD *md;
+     size_t mdsz;
+
+-    md = EVP_get_digestbyname(alg);
++    md = EVP_MD_fetch(NULL, alg, "-fips");
+     if (!(md))
+         return -1;
+
+@@ -437,7 +437,7 @@
+     if (!(digest))
+         return -1;
+
+-    md = EVP_get_digestbyname(alg);
++    md = EVP_MD_fetch(NULL, alg, "-fips");
+     if (!(md)) {
+         free(digest);
+         return -1;
+@@ -506,7 +506,7 @@
+         return -1;
+     }
+
+-    md = EVP_get_digestbyname(alg);
++    md = EVP_MD_fetch(NULL, alg, "-fips");
+     if (!(md)) {
+         free(digest);
+         if (decode)
+@@ -725,7 +725,7 @@
+     unsigned int siglen;
+     unsigned char *sig;
+
+-    md = EVP_get_digestbyname(alg);
++    md = EVP_MD_fetch(NULL, alg, "-fips");
+     if (!(md))
+         return NULL;
+
+@@ -1148,7 +1148,7 @@
+     EVP_MD_CTX *ctx;
+     const EVP_MD *md;
+
+-    md = EVP_get_digestbyname(alg);
++    md = EVP_MD_fetch(NULL, alg, "-fips");
+     if (!(md))
+         return NULL;
+
diff --git a/thirdparty/clamav/zimbra-clamav/debian/changelog b/thirdparty/clamav/zimbra-clamav/debian/changelog
@@ -1,3 +1,9 @@
+zimbra-clamav (VERSION-1zimbra8.8b4ZAPPEND) unstable; urgency=medium
+
+  * ZBUG-3355, Upgraded OpenSSL to 3.0.9
+
+ -- Zimbra Packaging Services <packaging-devel@zimbra.com>  Mon, 12 Jun 2023 05:12:55 +0000
+
 zimbra-clamav (VERSION-1zimbra8.8b3ZAPPEND) unstable; urgency=medium
 
   * Upgraded ClamAV to 0.105.2

diff --git a/thirdparty/clamav/zimbra-clamav/debian/control b/thirdparty/clamav/zimbra-clamav/debian/control
@@ -1,5 +1,5 @@
 Source: zimbra-clamav
-Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-openssl-dev (>= 1.1.1h-1zimbra8.7b4ZAPPEND), zimbra-libxml2-dev,
+Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-openssl-dev (>= 3.0.9-1zimbra8.8b1ZAPPEND), zimbra-libxml2-dev,
  libz-dev, zimbra-libmilter-dev, libncurses5-dev, libpcre2-dev, libjson-c-dev, libbz2-dev, check
 Section: utils
 Priority: optional

diff --git a/thirdparty/clamav/zimbra-clamav/debian/patches/series b/thirdparty/clamav/zimbra-clamav/debian/patches/series
@@ -0,0 +1 @@
+clamav-fips.patch
diff --git a/thirdparty/clamav/zimbra-clamav/rpm/SPECS/clamav.spec b/thirdparty/clamav/zimbra-clamav/rpm/SPECS/clamav.spec
@@ -1,16 +1,17 @@
 Summary:            Zimbra's ClamAV build
 Name:               zimbra-clamav
 Version:            VERSION
-Release:            1zimbra8.8b3ZAPPEND
+Release:            1zimbra8.8b4ZAPPEND
 License:            GPL-2
 Source:             %{name}-%{version}.tar.gz
+Patch0:             clamav-fips.patch
 BuildRequires:      zlib-devel
 BuildRequires:      ncurses-devel
 BuildRequires:      bzip2-devel, check-devel, json-c-devel, pcre2-devel
-BuildRequires:      zimbra-openssl-devel >= 1.1.1h-1zimbra8.7b4ZAPPEND
+BuildRequires:      zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND
 BuildRequires:      zimbra-libxml2-devel
 BuildRequires:      zimbra-libmilter-devel
-Requires:           zlib, ncurses-libs, zimbra-clamav-libs = %{version}-%{release}, zimbra-openssl-libs >= 1.1.1h-1zimbra8.7b4ZAPPEND
+Requires:           zlib, ncurses-libs, zimbra-clamav-libs = %{version}-%{release}, zimbra-openssl-libs >= 3.0.9-1zimbra8.8b1ZAPPEND
 Requires:           zimbra-libxml2-libs, pcre2, json-c, bzip2-libs
 AutoReqProv:        no
 URL:                http://www.clamav.net/
@@ -21,6 +22,8 @@ The Zimbra ClamAV build
 %define debug_package %{nil}
 
 %changelog
+* Mon Jun 12 2023  Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.8b4ZAPPEND
+- ZBUG-3355, Upgraded OpenSSL to 3.0.9
 * Wed Feb 22 2023  Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.8b3ZAPPEND
 - Upgraded ClamAV to 0.105.2
 * Wed Nov 02 2022  Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.8b3ZAPPEND
@@ -40,6 +43,7 @@ The Zimbra ClamAV build
 
 %prep
 %setup -n clamav-%{version}
+%patch0 -p1
 
 %build
 LDFLAGS="-LOZCL -Wl,-rpath,OZCL"; export LDFLAGS; \

diff --git a/thirdparty/curl/zimbra-curl/debian/changelog b/thirdparty/curl/zimbra-curl/debian/changelog
@@ -1,3 +1,9 @@
+zimbra-curl (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium
+
+  * ZBUG-3355, Upgraded OpenSSL to 3.0.9 and updated dependency heimdal
+
+ -- Zimbra Packaging Services <packaging-devel@zimbra.com>  Mon, 12 Jun 2023 05:12:55 +0000
+
 zimbra-curl (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium
 
   * Upgraded dependency openssl to 1.1.1h and updated dependency heimdal

diff --git a/thirdparty/curl/zimbra-curl/debian/control b/thirdparty/curl/zimbra-curl/debian/control
@@ -1,6 +1,6 @@
 Source: zimbra-curl
-Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-openssl-dev (>= 1.1.1h-1zimbra8.7b3ZAPPEND),
- zimbra-heimdal-dev (>= 1.5.3-1zimbra8.7b3ZAPPEND), libz-dev
+Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-openssl-dev (>= 3.0.9-1zimbra8.8b1ZAPPEND),
+ zimbra-heimdal-dev (>= 1.5.3-1zimbra8.7b4ZAPPEND), libz-dev
 Section: utils
 Priority: optional
 Maintainer: Zimbra Packaging Services <packaging-devel@zimbra.com>

diff --git a/thirdparty/curl/zimbra-curl/rpm/SPECS/curl.spec b/thirdparty/curl/zimbra-curl/rpm/SPECS/curl.spec
@@ -1,13 +1,13 @@
 Summary:            Zimbra's Curl build
 Name:               zimbra-curl
 Version:            VERSION
-Release:            1zimbra8.7b3ZAPPEND
+Release:            1zimbra8.7b4ZAPPEND
 License:            MIT
 Source:             %{name}-%{version}.tar.gz
 BuildRequires:      zlib-devel
-BuildRequires:      zimbra-openssl-devel >= 1.1.1h-1zimbra8.7b3ZAPPEND
-BuildRequires:      zimbra-heimdal-devel >= 1.5.3-1zimbra8.7b3ZAPPEND
-Requires:           zlib, zimbra-curl-libs = %{version}-%{release}, zimbra-openssl-libs >= 1.1.1h-1zimbra8.7b3ZAPPEND, zimbra-heimdal-libs >= 1.5.3-1zimbra8.7b3ZAPPEND
+BuildRequires:      zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND
+BuildRequires:      zimbra-heimdal-devel >= 1.5.3-1zimbra8.7b4ZAPPEND
+Requires:           zlib, zimbra-curl-libs = %{version}-%{release}, zimbra-openssl-libs >= 3.0.9-1zimbra8.8b1ZAPPEND, zimbra-heimdal-libs >= 1.5.3-1zimbra8.7b4ZAPPEND
 AutoReqProv:        no
 URL:                http://curl.haxx.se/
 
@@ -17,6 +17,8 @@ The Zimbra Curl build
 %define debug_package %{nil}
 
 %changelog
+* Mon Jun 12 2023 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.7b4ZAPPEND
+- ZBUG-3355, Upgraded OpenSSL to 3.0.9 and updated dependency heimdal
 * Fri Dec 02 2020 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.7b3ZAPPEND
 - Upgraded dependency openssl to 1.1.1h and updated dependency heimdal
 * Thu Sep 10 2020 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.7b2ZAPPEND

diff --git a/thirdparty/cyrus-sasl/zimbra-cyrus-sasl/debian/changelog b/thirdparty/cyrus-sasl/zimbra-cyrus-sasl/debian/changelog
@@ -1,3 +1,9 @@
+zimbra-cyrus-sasl (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium
+
+  * ZBUG-3355, Upgraded OpenSSL to 3.0.9
+
+ -- Zimbra Packaging Services <packaging-devel@zimbra.com>  Mon, 12 Jun 2023 05:12:55 +0000
+
 zimbra-cyrus-sasl (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium
 
   * Upgraded cyrus-sasl to 2.1.28

diff --git a/thirdparty/cyrus-sasl/zimbra-cyrus-sasl/debian/control b/thirdparty/cyrus-sasl/zimbra-cyrus-sasl/debian/control
@@ -1,6 +1,6 @@
 Source: zimbra-cyrus-sasl
-Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-openssl-dev (>= 1.1.1h-1zimbra8.7b3ZAPPEND),
- zimbra-heimdal-dev (>= 1.5.3-1zimbra8.7b3ZAPPEND), zimbra-curl-dev (>= 7.49.1-1zimbra8.7b3ZAPPEND), zimbra-libxml2-dev
+Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-openssl-dev (>= 3.0.9-1zimbra8.8b1ZAPPEND),
+ zimbra-heimdal-dev (>= 1.5.3-1zimbra8.7b4ZAPPEND), zimbra-curl-dev (>= 7.49.1-1zimbra8.7b4ZAPPEND), zimbra-libxml2-dev
 Section: utils
 Priority: optional
 Maintainer: Zimbra Packaging Services <packaging-devel@zimbra.com>

diff --git a/thirdparty/cyrus-sasl/zimbra-cyrus-sasl/rpm/SPECS/cyrus-sasl.spec b/thirdparty/cyrus-sasl/zimbra-cyrus-sasl/rpm/SPECS/cyrus-sasl.spec
@@ -1,20 +1,20 @@
 Summary:            Zimbra's Cyrus-SASL build
 Name:               zimbra-cyrus-sasl
 Version:            VERSION
-Release:            1zimbra8.7b3ZAPPEND
+Release:            1zimbra8.7b4ZAPPEND
 License:            MIT
 Source:             %{name}-%{version}.tar.gz
 Patch0:             sasl-auth-zimbra-2.1.28.patch
 Patch1:             saslauthd-conf-2.1.28.patch
 Patch2:             auxprop.patch
 Patch3:             testsaslauthd.c.patch
 BuildRequires:      zlib-devel
-BuildRequires:      zimbra-openssl-devel >= 1.1.1h-1zimbra8.7b3ZAPPEND
-BuildRequires:      zimbra-heimdal-devel >= 1.5.3-1zimbra8.7b3ZAPPEND
+BuildRequires:      zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND
+BuildRequires:      zimbra-heimdal-devel >= 1.5.3-1zimbra8.7b4ZAPPEND
 BuildRequires:      zimbra-libxml2-devel
-BuildRequires:      zimbra-curl-devel >= 7.49.1-1zimbra8.7b3ZAPPEND
-Requires:           zlib, zimbra-cyrus-sasl-libs = %{version}-%{release}, zimbra-openssl-libs >= 1.1.1h-1zimbra8.7b3ZAPPEND, zimbra-heimdal-libs >= 1.5.3-1zimbra8.7b3ZAPPEND
-Requires:           zimbra-libxml2-libs, zimbra-curl-libs >= 7.49.1-1zimbra8.7b3ZAPPEND
+BuildRequires:      zimbra-curl-devel >= 7.49.1-1zimbra8.7b4ZAPPEND
+Requires:           zlib, zimbra-cyrus-sasl-libs = %{version}-%{release}, zimbra-openssl-libs >= 3.0.9-1zimbra8.8b1ZAPPEND, zimbra-heimdal-libs >= 1.5.3-1zimbra8.7b4ZAPPEND
+Requires:           zimbra-libxml2-libs, zimbra-curl-libs >= 7.49.1-1zimbra8.7b4ZAPPEND
 AutoReqProv:        no
 URL:                https://cyrusimap.org/
 
@@ -24,6 +24,8 @@ The Zimbra Cyrus-SASL build
 %define debug_package %{nil}
 
 %changelog
+* Mon Jun 12 2023 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.7b4ZAPPEND
+- ZBUG-3355, Upgraded OpenSSL to 3.0.9
 * Tue Jun 21 2022 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.7b3ZAPPEND
 - Upgraded cyrus-sasl to 2.1.28
 * Sat Dec 05 2020 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.7b3ZAPPEND

diff --git a/thirdparty/erlang/zimbra-erlang/debian/changelog b/thirdparty/erlang/zimbra-erlang/debian/changelog
@@ -1,3 +1,9 @@
+zimbra-erlang (VERSION-1zimbra8.8b2ZAPPEND) unstable; urgency=medium
+
+  * ZBUG-3355, Upgraded OpenSSL to 3.0.9
+
+ -- Zimbra Packaging Services <packaging-devel@zimbra.com>  Tue, 13 Jun 2023 05:12:55 +0000
+
 zimbra-erlang (VERSION-1zimbra8.8b1ZAPPEND) unstable; urgency=medium
 
   * Initial Release.

diff --git a/thirdparty/erlang/zimbra-erlang/debian/control b/thirdparty/erlang/zimbra-erlang/debian/control
@@ -1,5 +1,5 @@
 Source: zimbra-erlang
-Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-openssl-dev (>= 1.1.1q-1zimbra8.7b4ZAPPEND), libncurses5-dev, libz-dev
+Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-openssl-dev (>= 3.0.9-1zimbra8.8b1ZAPPEND), libncurses5-dev, libz-dev
 Section: utils
 Priority: optional
 Maintainer: Zimbra Packaging Services <packaging-devel@zimbra.com>
@@ -10,5 +10,5 @@ Homepage: https://github.com/erlang/otp
 Package: zimbra-erlang
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, zimbra-openssl (>= 1.1.1q-1zimbra8.7b4ZAPPEND)
+Depends: ${shlibs:Depends}, ${misc:Depends}, zimbra-openssl (>= 3.0.9-1zimbra8.8b1ZAPPEND)
 Description: The Zimbra erlang build
diff --git a/thirdparty/erlang/zimbra-erlang/rpm/SPECS/erlang.spec b/thirdparty/erlang/zimbra-erlang/rpm/SPECS/erlang.spec
@@ -1,7 +1,7 @@
 Summary:	Zimbra's erlang
 Name:		zimbra-erlang
 Version:	VERSION
-Release:	1zimbra8.8b1ZAPPEND
+Release:	1zimbra8.8b2ZAPPEND
 License:	ASL 2.0
 URL:		https://www.erlang.org
 Source:         %{name}-%{version}.tar.gz
@@ -10,8 +10,8 @@ Patch1:         otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.pa
 Patch2:         otp-0002-Do-not-install-C-sources.patch
 Patch3:         otp-0003-Do-not-install-erlang-sources.patch
 BuildRequires:	ncurses-devel, zlib-devel
-BuildRequires:	zimbra-openssl-devel >= 1.1.1q-1zimbra8.7b4ZAPPEND
-Requires:       zimbra-openssl-libs >= 1.1.1q-1zimbra8.7b4ZAPPEND
+BuildRequires:	zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND
+Requires:       zimbra-openssl-libs >= 3.0.9-1zimbra8.8b1ZAPPEND
 AutoReqProv:    no
 
 %description
@@ -202,5 +202,7 @@ OZCL/erlang/lib/tools-*/
 OZCL/erlang/lib/xmerl-*/
 
 %changelog
+* Tue Jun 13 2023 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.8b2ZAPPEND
+- ZBUG-3355, Upgraded OpenSSL to 3.0.9
 * Mon Aug 08 2022 Zimbra Packaging Services <packaging-devel@zimbra.com> - VERSION-1zimbra8.8b1ZAPPEND
 - Initial Release.
diff --git a/thirdparty/heimdal/Makefile b/thirdparty/heimdal/Makefile
@@ -6,7 +6,7 @@ pvers := $(HEIMDAL_VERSION)
 pname := heimdal
 pfile := $(pname)-$(pvers).tar.gz
 psrc_file := $(SRC_DIR)/$(pfile)
-purl := http://ftp.riken.jp/net/heimdal/src/$(pfile)
+purl := http://ftp.st.ryukoku.ac.jp/pub/security/tool/heimdal/$(pfile)
 zname := zimbra-$(pname)
 zspec := $(pname).spec
 

diff --git a/thirdparty/heimdal/zimbra-heimdal/debian/changelog b/thirdparty/heimdal/zimbra-heimdal/debian/changelog
@@ -1,3 +1,9 @@
+zimbra-heimdal (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium
+
+  * ZBUG-3355, Upgraded OpenSSL to 3.0.9
+
+ -- Zimbra Packaging Services <packaging-devel@zimbra.com>  Mon, 12 Jun 2023 05:12:55 +0000
+
 zimbra-heimdal (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium
 
   * Upgraded dependency openssl to 1.1.1h

diff --git a/thirdparty/heimdal/zimbra-heimdal/debian/control b/thirdparty/heimdal/zimbra-heimdal/debian/control
@@ -1,5 +1,5 @@
 Source: zimbra-heimdal
-Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-openssl-dev (>=1.1.1h-1zimbra8.7b3ZAPPEND), libncurses-dev
+Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-openssl-dev (>= 3.0.9-1zimbra8.8b1ZAPPEND), libncurses-dev
 Section: utils
 Priority: optional
 Maintainer: Zimbra Packaging Services <packaging-devel@zimbra.com>