From fa62485aa6760b2b176d0f5d2ae58e6e24e974c2 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 09:40:24 +0000 Subject: [PATCH 01/48] ZBUG-3355 : Upgraded OpenSSL to 3.0.9 --- thirdparty/openssl/Makefile | 2 + thirdparty/openssl/openssl-fips.cnf | 396 ++++++++++++++++++ .../openssl/zimbra-openssl/debian/changelog | 6 + .../zimbra-openssl/debian/patches/series | 16 - .../openssl/zimbra-openssl/debian/rules | 12 +- .../debian/zimbra-openssl-lib.install | 5 +- .../debian/zimbra-openssl.postinst | 6 + .../zimbra-openssl/rpm/SPECS/openssl.spec | 65 +-- versions.def | 2 +- 9 files changed, 434 insertions(+), 76 deletions(-) create mode 100644 thirdparty/openssl/openssl-fips.cnf create mode 100644 thirdparty/openssl/zimbra-openssl/debian/zimbra-openssl.postinst diff --git a/thirdparty/openssl/Makefile b/thirdparty/openssl/Makefile index 01105c11e..b1a1bafeb 100644 --- a/thirdparty/openssl/Makefile +++ b/thirdparty/openssl/Makefile @@ -32,6 +32,7 @@ build_rpm: $(MKDIR) BUILD BUILDROOT RPMS SOURCES SRPMS && \ $(CP) $(psrc_file) SOURCES/$(zname)-$(pvers).tar.gz && \ $(CP) $(PKG_ROOT)/patches/*.patch SOURCES/ && \ + $(CP) $(PKG_ROOT)/openssl-fips.cnf SOURCES/ && \ $(PKG_BUILD) $(specfile) build_deb: z_tgz = $(zname)_$(pvers).orig.tar.gz @@ -42,6 +43,7 @@ build_deb: $(replace-pathinfo) debian/rules && \ $(CP) $(psrc_file) ../$(z_tgz) && \ $(CP) $(PKG_ROOT)/patches/*.patch debian/patches/ && \ + $(CP) $(PKG_ROOT)/openssl-fips.cnf debian/ && \ $(TAR) xfz ../$(z_tgz) --strip-components=1 && \ $(PKG_BUILD) diff --git a/thirdparty/openssl/openssl-fips.cnf b/thirdparty/openssl/openssl-fips.cnf new file mode 100644 index 000000000..78b2d3055 --- /dev/null +++ b/thirdparty/openssl/openssl-fips.cnf @@ -0,0 +1,396 @@ +# OpenSSL example configuration file. +# See doc/man5/config.pod for more info. +# +# This is mostly being used for generation of certificate requests, +# but may be used for auto loading of providers + +# Note that you can include other files from the main configuration +# file using the .include directive. +#.include filename + +# This definition stops the following lines choking if HOME isn't +# defined. +HOME = . + + # Use this in order to automatically load providers. +openssl_conf = openssl_init + +# Comment out the next line to ignore configuration errors +config_diagnostics = 1 + +# Extra OBJECT IDENTIFIER info: +# oid_file = $ENV::HOME/.oid +oid_section = new_oids + +# To use this configuration file with the "-extfile" option of the +# "openssl x509" utility, name here the section containing the +# X.509v3 extensions to use: +# extensions = +# (Alternatively, use a configuration file that has only +# X.509v3 extensions in its main [= default] section.) + +[ new_oids ] +# We can add new OIDs in here for use by 'ca', 'req' and 'ts'. +# Add a simple OID like this: +# testoid1=1.2.3.4 +# Or use config file substitution like this: +# testoid2=${testoid1}.5.6 + +# Policies used by the TSA examples. +tsa_policy1 = 1.2.3.4.1 +tsa_policy2 = 1.2.3.4.5.6 +tsa_policy3 = 1.2.3.4.5.7 + +# For FIPS +# Optionally include a file that is generated by the OpenSSL fipsinstall +# application. This file contains configuration data required by the OpenSSL +# fips provider. It contains a named section e.g. [fips_sect] which is +# referenced from the [provider_sect] below. +# Refer to the OpenSSL security policy for more information. +.include /opt/zimbra/common/etc/ssl/fipsmodule.cnf + +[openssl_init] +providers = provider_sect +alg_section = algorithm_sect + +# List of providers to load +[provider_sect] +fips = fips_sect +default = default_sect + +# The fips section name should match the section name inside the +# included fipsmodule.cnf. +# fips = fips_sect + +# If no providers are activated explicitly, the default one is activated implicitly. +# See man 7 OSSL_PROVIDER-default for more details. +# +# If you add a section explicitly activating any other provider(s), you most +# probably need to explicitly activate the default provider, otherwise it +# becomes unavailable in openssl. As a consequence applications depending on +# OpenSSL may not work correctly which could lead to significant system +# problems including inability to remotely access the system. +[default_sect] +activate = 1 + +[algorithm_sect] +default_properties = fips=yes + + +#################################################################### +[ ca ] +default_ca = CA_default # The default ca section + +#################################################################### +[ CA_default ] + +dir = ./demoCA # Where everything is kept +certs = $dir/certs # Where the issued certs are kept +crl_dir = $dir/crl # Where the issued crl are kept +database = $dir/index.txt # database index file. +#unique_subject = no # Set to 'no' to allow creation of + # several certs with same subject. +new_certs_dir = $dir/newcerts # default place for new certs. + +certificate = $dir/cacert.pem # The CA certificate +serial = $dir/serial # The current serial number +crlnumber = $dir/crlnumber # the current crl number + # must be commented out to leave a V1 CRL +crl = $dir/crl.pem # The current CRL +private_key = $dir/private/cakey.pem# The private key + +x509_extensions = usr_cert # The extensions to add to the cert + +# Comment out the following two lines for the "traditional" +# (and highly broken) format. +name_opt = ca_default # Subject Name options +cert_opt = ca_default # Certificate field options + +# Extension copying option: use with caution. +# copy_extensions = copy + +# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs +# so this is commented out by default to leave a V1 CRL. +# crlnumber must also be commented out to leave a V1 CRL. +# crl_extensions = crl_ext + +default_days = 365 # how long to certify for +default_crl_days= 30 # how long before next CRL +default_md = default # use public key default MD +preserve = no # keep passed DN ordering + +# A few difference way of specifying how similar the request should look +# For type CA, the listed attributes must be the same, and the optional +# and supplied fields are just that :-) +policy = policy_match + +# For the CA policy +[ policy_match ] +countryName = match +stateOrProvinceName = match +organizationName = match +organizationalUnitName = optional +commonName = supplied +emailAddress = optional + +# For the 'anything' policy +# At this point in time, you must list all acceptable 'object' +# types. +[ policy_anything ] +countryName = optional +stateOrProvinceName = optional +localityName = optional +organizationName = optional +organizationalUnitName = optional +commonName = supplied +emailAddress = optional + +#################################################################### +[ req ] +default_bits = 2048 +default_keyfile = privkey.pem +distinguished_name = req_distinguished_name +attributes = req_attributes +x509_extensions = v3_ca # The extensions to add to the self signed cert + +# Passwords for private keys if not present they will be prompted for +# input_password = secret +# output_password = secret + +# This sets a mask for permitted string types. There are several options. +# default: PrintableString, T61String, BMPString. +# pkix : PrintableString, BMPString (PKIX recommendation before 2004) +# utf8only: only UTF8Strings (PKIX recommendation after 2004). +# nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings). +# MASK:XXXX a literal mask value. +# WARNING: ancient versions of Netscape crash on BMPStrings or UTF8Strings. +string_mask = utf8only + +# req_extensions = v3_req # The extensions to add to a certificate request + +[ req_distinguished_name ] +countryName = Country Name (2 letter code) +countryName_default = AU +countryName_min = 2 +countryName_max = 2 + +stateOrProvinceName = State or Province Name (full name) +stateOrProvinceName_default = Some-State + +localityName = Locality Name (eg, city) + +0.organizationName = Organization Name (eg, company) +0.organizationName_default = Internet Widgits Pty Ltd + +# we can do this but it is not needed normally :-) +#1.organizationName = Second Organization Name (eg, company) +#1.organizationName_default = World Wide Web Pty Ltd + +organizationalUnitName = Organizational Unit Name (eg, section) +#organizationalUnitName_default = + +commonName = Common Name (e.g. server FQDN or YOUR name) +commonName_max = 64 + +emailAddress = Email Address +emailAddress_max = 64 + +# SET-ex3 = SET extension number 3 + +[ req_attributes ] +challengePassword = A challenge password +challengePassword_min = 4 +challengePassword_max = 20 + +unstructuredName = An optional company name + +[ usr_cert ] + +# These extensions are added when 'ca' signs a request. + +# This goes against PKIX guidelines but some CAs do it and some software +# requires this to avoid interpreting an end user certificate as a CA. + +basicConstraints=CA:FALSE + +# This is typical in keyUsage for a client certificate. +# keyUsage = nonRepudiation, digitalSignature, keyEncipherment + +# PKIX recommendations harmless if included in all certificates. +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid,issuer + +# This stuff is for subjectAltName and issuerAltname. +# Import the email address. +# subjectAltName=email:copy +# An alternative to produce certificates that aren't +# deprecated according to PKIX. +# subjectAltName=email:move + +# Copy subject details +# issuerAltName=issuer:copy + +# This is required for TSA certificates. +# extendedKeyUsage = critical,timeStamping + +[ v3_req ] + +# Extensions to add to a certificate request + +basicConstraints = CA:FALSE +keyUsage = nonRepudiation, digitalSignature, keyEncipherment + +[ v3_ca ] + + +# Extensions for a typical CA + + +# PKIX recommendation. + +subjectKeyIdentifier=hash + +authorityKeyIdentifier=keyid:always,issuer + +basicConstraints = critical,CA:true + +# Key usage: this is typical for a CA certificate. However since it will +# prevent it being used as an test self-signed certificate it is best +# left out by default. +# keyUsage = cRLSign, keyCertSign + +# Include email address in subject alt name: another PKIX recommendation +# subjectAltName=email:copy +# Copy issuer details +# issuerAltName=issuer:copy + +# DER hex encoding of an extension: beware experts only! +# obj=DER:02:03 +# Where 'obj' is a standard or added object +# You can even override a supported extension: +# basicConstraints= critical, DER:30:03:01:01:FF + +[ crl_ext ] + +# CRL extensions. +# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL. + +# issuerAltName=issuer:copy +authorityKeyIdentifier=keyid:always + +[ proxy_cert_ext ] +# These extensions should be added when creating a proxy certificate + +# This goes against PKIX guidelines but some CAs do it and some software +# requires this to avoid interpreting an end user certificate as a CA. + +basicConstraints=CA:FALSE + +# This is typical in keyUsage for a client certificate. +# keyUsage = nonRepudiation, digitalSignature, keyEncipherment + +# PKIX recommendations harmless if included in all certificates. +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid,issuer + +# This stuff is for subjectAltName and issuerAltname. +# Import the email address. +# subjectAltName=email:copy +# An alternative to produce certificates that aren't +# deprecated according to PKIX. +# subjectAltName=email:move + +# Copy subject details +# issuerAltName=issuer:copy + +# This really needs to be in place for it to be a proxy certificate. +proxyCertInfo=critical,language:id-ppl-anyLanguage,pathlen:3,policy:foo + +#################################################################### +[ tsa ] + +default_tsa = tsa_config1 # the default TSA section + +[ tsa_config1 ] + +# These are used by the TSA reply generation only. +dir = ./demoCA # TSA root directory +serial = $dir/tsaserial # The current serial number (mandatory) +crypto_device = builtin # OpenSSL engine to use for signing +signer_cert = $dir/tsacert.pem # The TSA signing certificate + # (optional) +certs = $dir/cacert.pem # Certificate chain to include in reply + # (optional) +signer_key = $dir/private/tsakey.pem # The TSA private key (optional) +signer_digest = sha256 # Signing digest to use. (Optional) +default_policy = tsa_policy1 # Policy if request did not specify it + # (optional) +other_policies = tsa_policy2, tsa_policy3 # acceptable policies (optional) +digests = sha1, sha256, sha384, sha512 # Acceptable message digests (mandatory) +accuracy = secs:1, millisecs:500, microsecs:100 # (optional) +clock_precision_digits = 0 # number of digits after dot. (optional) +ordering = yes # Is ordering defined for timestamps? + # (optional, default: no) +tsa_name = yes # Must the TSA name be included in the reply? + # (optional, default: no) +ess_cert_id_chain = no # Must the ESS cert id chain be included? + # (optional, default: no) +ess_cert_id_alg = sha1 # algorithm to compute certificate + # identifier (optional, default: sha1) + +[insta] # CMP using Insta Demo CA +# Message transfer +server = pki.certificate.fi:8700 +# proxy = # set this as far as needed, e.g., http://192.168.1.1:8080 +# tls_use = 0 +path = pkix/ + +# Server authentication +recipient = "/C=FI/O=Insta Demo/CN=Insta Demo CA" # or set srvcert or issuer +ignore_keyusage = 1 # potentially needed quirk +unprotected_errors = 1 # potentially needed quirk +extracertsout = insta.extracerts.pem + +# Client authentication +ref = 3078 # user identification +secret = pass:insta # can be used for both client and server side + +# Generic message options +cmd = ir # default operation, can be overridden on cmd line with, e.g., kur + +# Certificate enrollment +subject = "/CN=openssl-cmp-test" +newkey = insta.priv.pem +out_trusted = apps/insta.ca.crt # does not include keyUsage digitalSignature +certout = insta.cert.pem + +[pbm] # Password-based protection for Insta CA +# Server and client authentication +ref = $insta::ref # 3078 +secret = $insta::secret # pass:insta + +[signature] # Signature-based protection for Insta CA +# Server authentication +trusted = $insta::out_trusted # apps/insta.ca.crt + +# Client authentication +secret = # disable PBM +key = $insta::newkey # insta.priv.pem +cert = $insta::certout # insta.cert.pem + +[ir] +cmd = ir + +[cr] +cmd = cr + +[kur] +# Certificate update +cmd = kur +oldcert = $insta::certout # insta.cert.pem + +[rr] +# Certificate revocation +cmd = rr +oldcert = $insta::certout # insta.cert.pem + diff --git a/thirdparty/openssl/zimbra-openssl/debian/changelog b/thirdparty/openssl/zimbra-openssl/debian/changelog index f7d66cf48..b24bce9ba 100644 --- a/thirdparty/openssl/zimbra-openssl/debian/changelog +++ b/thirdparty/openssl/zimbra-openssl/debian/changelog @@ -1,3 +1,9 @@ +zimbra-openssl (VERSION-1zimbra8.8b1ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Upgraded OpenSSL to 3.0.9 + + -- Zimbra Packaging Services Mon, 12 Jun 2023 05:12:55 +0000 + zimbra-openssl (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium * Fix ZBUG-3278, Upgraded OpenSSL to 1.1.1t diff --git a/thirdparty/openssl/zimbra-openssl/debian/patches/series b/thirdparty/openssl/zimbra-openssl/debian/patches/series index 43bf990dd..e69de29bb 100644 --- a/thirdparty/openssl/zimbra-openssl/debian/patches/series +++ b/thirdparty/openssl/zimbra-openssl/debian/patches/series @@ -1,16 +0,0 @@ -openssl-1.1.1-fips.patch -openssl-1.1.1-version-override.patch -openssl-1.1.1-seclevel.patch -openssl-1.1.1-fips-post-rand.patch -openssl-1.1.1-evp-kdf.patch -openssl-1.1.1-ssh-kdf.patch -openssl-1.1.1-krb5-kdf.patch -openssl-1.1.1-edk2-build.patch -openssl-1.1.1-ec-curve.patch -openssl-1.1.1-fips-curves.patch -openssl-1.1.1-fips-drbg-selftest.patch -openssl-1.1.1-fips-dh.patch -openssl-1.1.1-kdf-selftest.patch -openssl-1.1.1-rewire-fips-drbg.patch -openssl-1.1.1-fips-crng-test.patch -openssl-1.1.1-linux-random.patch diff --git a/thirdparty/openssl/zimbra-openssl/debian/rules b/thirdparty/openssl/zimbra-openssl/debian/rules index 61e1ef596..18041cad9 100755 --- a/thirdparty/openssl/zimbra-openssl/debian/rules +++ b/thirdparty/openssl/zimbra-openssl/debian/rules @@ -9,8 +9,8 @@ export DEB_LDFLAGS_MAINT_APPEND="-LOZCL -ROZCL -Wl,-rpath,OZCL" %: dh $@ override_dh_auto_configure: - ./Configure no-idea enable-ec_nistp_64_gcc_128 no-mdc2 no-rc5 no-ssl2 \ - no-hw --prefix=OZC --with-rand-seed=devrandom,rdcpu,os,getrandom --libdir=lib --openssldir=OZCE/ssl \ + ./Configure no-idea enable-fips enable-ec_nistp_64_gcc_128 no-mdc2 no-rc5 \ + --prefix=OZC --with-rand-seed=devrandom,rdcpu,os,getrandom --libdir=lib --openssldir=OZCE/ssl \ shared linux-x86_64 -g -O2 -DOPENSSL_NO_HEARTBEATS override_dh_auto_build: @@ -21,15 +21,11 @@ override_dh_strip: dh_strip -pzimbra-openssl-lib --dbg-package=zimbra-openssl-lib-dbg dh_strip -pzimbra-openssl --dbg-package=zimbra-openssl-dbg dh_strip -Nzimbra-openssl-lib -Nzimbra-openssl - export LD_LIBRARY_PATH="$$(pwd)/debian/tmpOZCL" && crypto/fips/fips_standalone_hmac $$(pwd)/debian/zimbra-openssl-lib/opt/zimbra/common/lib/libcrypto.so.1.1 >$$(pwd)/debian/tmpOZCL/.libcrypto.so.1.1.hmac - export LD_LIBRARY_PATH="$$(pwd)/debian/tmpOZCL" && crypto/fips/fips_standalone_hmac $$(pwd)/debian/zimbra-openssl-lib/opt/zimbra/common/lib/libssl.so.1.1 >$$(pwd)/debian/tmpOZCL/.libssl.so.1.1.hmac - cp -r $$(pwd)/debian/tmpOZCL/.libssl.so.1.1.hmac $$(pwd)/debian/zimbra-openssl-lib/opt/zimbra/common/lib/.libssl.so.1.1.hmac - cp -r $$(pwd)/debian/tmpOZCL/.libcrypto.so.1.1.hmac $$(pwd)/debian/zimbra-openssl-lib/opt/zimbra/common/lib/.libcrypto.so.1.1.hmac override_dh_shlibdeps: dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info override_dh_auto_install: LD_RUN_PATH=OZCL $(MAKE) DESTDIR=$$(pwd)/debian/tmp MANDIR="OZCS/man" LIBS="" install - export LD_LIBRARY_PATH="$$(pwd)/debian/tmpOZCL" && crypto/fips/fips_standalone_hmac $$(pwd)/debian/tmpOZCL/libcrypto.so.1.1 >$$(pwd)/debian/tmpOZCL/.libcrypto.so.1.1.hmac - export LD_LIBRARY_PATH="$$(pwd)/debian/tmpOZCL" && crypto/fips/fips_standalone_hmac $$(pwd)/debian/tmpOZCL/libssl.so.1.1 >$$(pwd)/debian/tmpOZCL/.libssl.so.1.1.hmac + cp $$(pwd)/debian/tmp/opt/zimbra/common/etc/ssl/openssl.cnf $$(pwd)/debian/tmp/opt/zimbra/common/etc/ssl/openssl-source.cnf + cp -af debian/openssl-fips.cnf $$(pwd)/debian/tmp/opt/zimbra/common/etc/ssl/openssl-fips.cnf diff --git a/thirdparty/openssl/zimbra-openssl/debian/zimbra-openssl-lib.install b/thirdparty/openssl/zimbra-openssl/debian/zimbra-openssl-lib.install index d7617c20d..05f9d6a2d 100644 --- a/thirdparty/openssl/zimbra-openssl/debian/zimbra-openssl-lib.install +++ b/thirdparty/openssl/zimbra-openssl/debian/zimbra-openssl-lib.install @@ -1,6 +1,5 @@ opt/zimbra/common/lib/*.so.* -opt/zimbra/common/lib/engines-1.1 +opt/zimbra/common/lib/engines-3 opt/zimbra/common/lib/libcrypto.a opt/zimbra/common/lib/libssl.a -opt/zimbra/common/lib/.libcrypto.so.*.hmac -opt/zimbra/common/lib/.libssl.so.*.hmac +opt/zimbra/common/lib/ossl-modules/*.so diff --git a/thirdparty/openssl/zimbra-openssl/debian/zimbra-openssl.postinst b/thirdparty/openssl/zimbra-openssl/debian/zimbra-openssl.postinst new file mode 100644 index 000000000..c71f4cce6 --- /dev/null +++ b/thirdparty/openssl/zimbra-openssl/debian/zimbra-openssl.postinst @@ -0,0 +1,6 @@ +#!/bin/bash +if [ "$1" = configure ]; then + /opt/zimbra/common/bin/openssl fipsinstall -quiet -out /opt/zimbra/common/etc/ssl/fipsmodule.cnf -module /opt/zimbra/common/lib/ossl-modules/fips.so + cp -af /opt/zimbra/common/etc/ssl/openssl-fips.cnf /opt/zimbra/common/etc/ssl/openssl.cnf +fi +exit 0 diff --git a/thirdparty/openssl/zimbra-openssl/rpm/SPECS/openssl.spec b/thirdparty/openssl/zimbra-openssl/rpm/SPECS/openssl.spec index fccc6cede..235bfcde3 100644 --- a/thirdparty/openssl/zimbra-openssl/rpm/SPECS/openssl.spec +++ b/thirdparty/openssl/zimbra-openssl/rpm/SPECS/openssl.spec @@ -1,25 +1,10 @@ Summary: Zimbra's Secure Socket Layer build Name: zimbra-openssl Version: VERSION -Release: 1zimbra8.7b4ZAPPEND +Release: 1zimbra8.8b1ZAPPEND License: OpenSSL Source: %{name}-%{version}.tar.gz -Patch0: openssl-1.1.1-fips.patch -Patch1: openssl-1.1.1-version-override.patch -Patch2: openssl-1.1.1-seclevel.patch -Patch3: openssl-1.1.1-fips-post-rand.patch -Patch4: openssl-1.1.1-evp-kdf.patch -Patch5: openssl-1.1.1-ssh-kdf.patch -Patch6: openssl-1.1.1-krb5-kdf.patch -Patch7: openssl-1.1.1-edk2-build.patch -patch8: openssl-1.1.1-ec-curve.patch -Patch9: openssl-1.1.1-fips-curves.patch -Patch10: openssl-1.1.1-fips-drbg-selftest.patch -Patch11: openssl-1.1.1-fips-dh.patch -Patch12: openssl-1.1.1-kdf-selftest.patch -Patch13: openssl-1.1.1-rewire-fips-drbg.patch -Patch14: openssl-1.1.1-fips-crng-test.patch -Patch15: openssl-1.1.1-linux-random.patch +Source1: openssl-fips.cnf Requires: zimbra-openssl-libs = %{version}-%{release}, perl, perl-core AutoReqProv: no URL: https://www.openssl.org/source @@ -30,6 +15,8 @@ The Zimbra OpenSSL build allows for secure communication between various process %define debug_package %{nil} %changelog +* Mon Jun 12 2023 Zimbra Packaging Services - VERSION-1zimbra8.8b1ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 * Fri Feb 10 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND - Fix ZBUG-3278, Upgraded OpenSSL to 1.1.1t * Mon Jul 11 2022 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND @@ -53,41 +40,19 @@ The Zimbra OpenSSL build allows for secure communication between various process %prep %setup -n openssl-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 %build -./Configure no-idea enable-ec_nistp_64_gcc_128 no-mdc2 no-rc5 no-ssl2 \ - no-hw --prefix=OZC --with-rand-seed=devrandom,rdcpu,os,getrandom --libdir=lib --openssldir=OZCE/ssl \ +./Configure enable-fips no-idea enable-ec_nistp_64_gcc_128 no-mdc2 no-rc5 \ + --prefix=OZC --with-rand-seed=devrandom,rdcpu,os,getrandom --libdir=lib --openssldir=OZCE/ssl \ shared linux-x86_64 -g -O2 -DOPENSSL_NO_HEARTBEATS LD_RUN_PATH=OZCL make depend LD_RUN_PATH=OZCL make all -%define __spec_install_post \ - %{?__debug_package:%{__debug_install_post}} \ - %{__arch_install_post} \ - %{__os_install_post} \ - export LD_LIBRARY_PATH="${RPM_BUILD_ROOT}OZCL" && crypto/fips/fips_standalone_hmac ${RPM_BUILD_ROOT}OZCL/libcrypto.so.1.1 >${RPM_BUILD_ROOT}OZCL/.libcrypto.so.1.1.hmac \ - export LD_LIBRARY_PATH="${RPM_BUILD_ROOT}OZCL" && crypto/fips/fips_standalone_hmac ${RPM_BUILD_ROOT}OZCL/libssl.so.1.1 >${RPM_BUILD_ROOT}OZCL/.libssl.so.1.1.hmac \ - unset LD_LIBRARY_PATH \ -%{nil} %install LD_RUN_PATH=OZCL make DESTDIR=${RPM_BUILD_ROOT} MANDIR="OZCS/man" LIBS="" install -chmod u+w ${RPM_BUILD_ROOT}OZCL/lib* ${RPM_BUILD_ROOT}OZCL/engines-1.1/*.so +chmod u+w ${RPM_BUILD_ROOT}OZCL/lib* ${RPM_BUILD_ROOT}OZCL/engines-3/*.so +cp %{buildroot}/opt/zimbra/common/etc/ssl/openssl.cnf %{buildroot}/opt/zimbra/common/etc/ssl/openssl-source.cnf +cp -af %{SOURCE1} %{buildroot}/opt/zimbra/common/etc/ssl/openssl-fips.cnf %package libs Summary: SSL Libaries @@ -116,17 +81,21 @@ OZCS %dir /opt/zimbra %dir OZC %dir OZCL -%dir OZCL/engines-1.1 +%dir OZCL/engines-3 +%dir OZCL/ossl-modules %attr(555,-,-) OZCL/libssl.so.* %attr(555,-,-) OZCL/libcrypto.so.* -%attr(555,-,-) OZCL/engines-1.1/*.so +%attr(555,-,-) OZCL/engines-3/*.so +%attr(555,-,-) OZCL/ossl-modules/*.so %attr(555,-,-) OZCL/libcrypto.a %attr(555,-,-) OZCL/libssl.a -%attr(0644,-,-) OZCL/.libcrypto.so.*.hmac -%attr(0644,-,-) OZCL/.libssl.so.*.hmac %files devel %defattr(-,root,root) OZCL/*.so OZCI OZCL/pkgconfig + +%post -p /bin/bash +/opt/zimbra/common/bin/openssl fipsinstall -quiet -out /opt/zimbra/common/etc/ssl/fipsmodule.cnf -module /opt/zimbra/common/lib/ossl-modules/fips.so +cp -af /opt/zimbra/common/etc/ssl/openssl-fips.cnf /opt/zimbra/common/etc/ssl/openssl.cnf diff --git a/versions.def b/versions.def index 9073f5ff3..15412a95c 100644 --- a/versions.def +++ b/versions.def @@ -101,7 +101,7 @@ MAVEN_VERSION := 3.3.9 NGINX_VERSION := 1.20.0 NGINX_HTTP_KEEPALIVE := 19755fc0e22aa7d7ac2198f78b297951d31ea1dc -OPENSSL_VERSION := 1.1.1t +OPENSSL_VERSION := 3.0.9 PFLOGSUMM_VERSION := 1.1.5 From 620f4549a88f7470e11952a446705adbc659e610 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 09:42:39 +0000 Subject: [PATCH 02/48] ZBUG-3355 :Updated dependency openssl-3.0.9 for heimdal --- thirdparty/heimdal/Makefile | 2 +- thirdparty/heimdal/zimbra-heimdal/debian/changelog | 6 ++++++ thirdparty/heimdal/zimbra-heimdal/debian/control | 2 +- thirdparty/heimdal/zimbra-heimdal/rpm/SPECS/heimdal.spec | 8 +++++--- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/thirdparty/heimdal/Makefile b/thirdparty/heimdal/Makefile index 3dbd4b0bd..67d0c429d 100644 --- 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 index 214c47cbd..29acfd21d 100644 --- 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 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 index 4ce768d20..ca98d4e53 100644 --- 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 diff --git a/thirdparty/heimdal/zimbra-heimdal/rpm/SPECS/heimdal.spec b/thirdparty/heimdal/zimbra-heimdal/rpm/SPECS/heimdal.spec index bde4d5153..eec31b749 100644 --- a/thirdparty/heimdal/zimbra-heimdal/rpm/SPECS/heimdal.spec +++ b/thirdparty/heimdal/zimbra-heimdal/rpm/SPECS/heimdal.spec @@ -1,12 +1,12 @@ Summary: Zimbra's Heimdal Kerberos build Name: zimbra-heimdal Version: VERSION -Release: 1zimbra8.7b3ZAPPEND +Release: 1zimbra8.7b4ZAPPEND License: BSD Source: %{name}-%{version}.tar.gz -BuildRequires: zimbra-openssl-devel >= 1.1.1h-1zimbra8.7b3ZAPPEND +BuildRequires: zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND BuildRequires: ncurses-devel -Requires: zimbra-openssl-libs >= 1.1.1h-1zimbra8.7b3ZAPPEND, zimbra-heimdal-libs = %{version}-%{release}, ncurses-libs +Requires: zimbra-openssl-libs >= 3.0.9-1zimbra8.8b1ZAPPEND, zimbra-heimdal-libs = %{version}-%{release}, ncurses-libs AutoReqProv: no URL: http://www.h5l.org/ @@ -102,6 +102,8 @@ OZCL/*.so OZCI %changelog +* Mon Jun 12 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 * Fri Dec 02 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND - Upgraded dependency openssl to 1.1.1h * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND From 8be21372749feb7e373306d16df8b43f06e87add Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 09:46:52 +0000 Subject: [PATCH 03/48] ZBUG-3355:Upgraded NET_SSLEAY for OpenSSL-3.0.9 --- perl-versions.def | 2 +- .../zimbra-perl-net-ssleay/debian/changelog | 8 +++++++- .../zimbra-perl-net-ssleay/debian/control | 2 +- .../zimbra-perl-net-ssleay/rpm/SPECS/net-ssleay.spec | 10 ++++++---- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/perl-versions.def b/perl-versions.def index 216286442..188d1094e 100644 --- a/perl-versions.def +++ b/perl-versions.def @@ -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/perl-net-ssleay/zimbra-perl-net-ssleay/debian/changelog b/thirdparty/perl-net-ssleay/zimbra-perl-net-ssleay/debian/changelog index ea25ddfaa..8a6a62d39 100644 --- a/thirdparty/perl-net-ssleay/zimbra-perl-net-ssleay/debian/changelog +++ b/thirdparty/perl-net-ssleay/zimbra-perl-net-ssleay/debian/changelog @@ -1,8 +1,14 @@ +zimbra-perl-net-ssleay (VERSION-1zimbra8.8b1ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Upgraded OpenSSL to 3.0.9 + + -- Zimbra Packaging Services Mon, 12 Jun 2023 05:12:55 +0000 + zimbra-perl-net-ssleay (VERSION-1zimbra8.7b2ZAPPEND) unstable; urgency=medium * Updated dependency openssl to 1.1.1h - -- Zimbra Packaging Services Fri, 02 Dec 2020 22:26:24 +0000 + -- Zimbra Packaging Services Wed, 02 Dec 2020 22:26:24 +0000 zimbra-perl-net-ssleay (VERSION-ITERATIONZAPPEND) unstable; urgency=medium diff --git a/thirdparty/perl-net-ssleay/zimbra-perl-net-ssleay/debian/control b/thirdparty/perl-net-ssleay/zimbra-perl-net-ssleay/debian/control index b0b809bda..34d0ba9e0 100644 --- a/thirdparty/perl-net-ssleay/zimbra-perl-net-ssleay/debian/control +++ b/thirdparty/perl-net-ssleay/zimbra-perl-net-ssleay/debian/control @@ -2,7 +2,7 @@ Source: zimbra-perl-net-ssleay Section: perl Priority: optional Maintainer: Zimbra Packaging Services -Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-openssl-dev (>= 1.1.1h-1zimbra8.7b3ZAPPEND) +Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-openssl-dev (>= 3.0.9-1zimbra8.8b1ZAPPEND) Standards-Version: 3.9.5 Homepage: https://metacpan.org/release/Net-SSLeay diff --git a/thirdparty/perl-net-ssleay/zimbra-perl-net-ssleay/rpm/SPECS/net-ssleay.spec b/thirdparty/perl-net-ssleay/zimbra-perl-net-ssleay/rpm/SPECS/net-ssleay.spec index fb018be2b..71c5ca6bd 100644 --- a/thirdparty/perl-net-ssleay/zimbra-perl-net-ssleay/rpm/SPECS/net-ssleay.spec +++ b/thirdparty/perl-net-ssleay/zimbra-perl-net-ssleay/rpm/SPECS/net-ssleay.spec @@ -1,13 +1,13 @@ Summary: Perl extension for using OpenSSL Name: zimbra-perl-net-ssleay Version: VERSION -Release: 1zimbra8.7b2ZAPPEND +Release: 1zimbra8.8b1ZAPPEND License: Artistic 2.0 Source: %{name}-%{version}.tar.gz Packager: Zimbra Packaging Services Group: Development/Languages -BuildRequires: zimbra-perl-base, zimbra-openssl-devel >= 1.1.1h-1zimbra8.7b3ZAPPEND -Requires: zimbra-perl-base, zimbra-openssl-libs >= 1.1.1h-1zimbra8.7b3ZAPPEND +BuildRequires: zimbra-perl-base, zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND +Requires: zimbra-perl-base, zimbra-openssl-libs >= 3.0.9-1zimbra8.8b1ZAPPEND AutoReqProv: no URL: https://metacpan.org/release/Net-SSLeay @@ -22,7 +22,9 @@ The Net::SSLeay module basically comprises: %define debug_package %{nil} %changelog -* Fri Dec 02 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND +* Mon Jun 12 2023 Zimbra Packaging Services - VERSION-1zimbra8.8b1ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 +* Wed Dec 02 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND - Upgraded dependency openssl to 1.1.1h * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-ITERATIONZAPPEND - Upgraded to 1.88 and updated dependency openssl to 1.1.1g From c07b85d65cbc037d48bc11f43257115a3404cc34 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 09:48:21 +0000 Subject: [PATCH 04/48] Updated dependency openssl-3.0.9 for curl --- thirdparty/curl/zimbra-curl/debian/changelog | 6 ++++++ thirdparty/curl/zimbra-curl/debian/control | 4 ++-- thirdparty/curl/zimbra-curl/rpm/SPECS/curl.spec | 10 ++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/thirdparty/curl/zimbra-curl/debian/changelog b/thirdparty/curl/zimbra-curl/debian/changelog index e8fcb03f1..4e54c79a4 100644 --- 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 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 index cf6440ac4..da79f8f35 100644 --- 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 diff --git a/thirdparty/curl/zimbra-curl/rpm/SPECS/curl.spec b/thirdparty/curl/zimbra-curl/rpm/SPECS/curl.spec index c24b3c492..2467ace23 100644 --- 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 - VERSION-1zimbra8.7b4ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 and updated dependency heimdal * Fri Dec 02 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND - Upgraded dependency openssl to 1.1.1h and updated dependency heimdal * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND From 41c6663c0d08911c6962b18a398cec953bdc21d4 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 09:50:01 +0000 Subject: [PATCH 05/48] ZBUG-3355:Upgraded unbound for OpenSSL-3.0.9 --- thirdparty/unbound/zimbra-unbound/debian/changelog | 6 ++++++ thirdparty/unbound/zimbra-unbound/debian/control | 2 +- thirdparty/unbound/zimbra-unbound/rpm/SPECS/unbound.spec | 8 +++++--- versions.def | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/thirdparty/unbound/zimbra-unbound/debian/changelog b/thirdparty/unbound/zimbra-unbound/debian/changelog index a96973fff..b372a4555 100644 --- a/thirdparty/unbound/zimbra-unbound/debian/changelog +++ b/thirdparty/unbound/zimbra-unbound/debian/changelog @@ -1,3 +1,9 @@ +zimbra-unbound (VERSION-1zimbra8.8b1ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Upgraded OpenSSL to 3.0.9 and upgraded unbound to 1.17.1 + + -- Zimbra Packaging Services Mon, 12 Jun 2023 05:12:55 +0000 + zimbra-unbound (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium * Fix ZCS-11941, remove anchor key generation diff --git a/thirdparty/unbound/zimbra-unbound/debian/control b/thirdparty/unbound/zimbra-unbound/debian/control index 1960ddbe7..486dbceba 100644 --- a/thirdparty/unbound/zimbra-unbound/debian/control +++ b/thirdparty/unbound/zimbra-unbound/debian/control @@ -1,6 +1,6 @@ Source: zimbra-unbound Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), libexpat1-dev, - zimbra-openssl-dev (>= 1.1.1h-1zimbra8.7b3ZAPPEND) + zimbra-openssl-dev (>= 3.0.9-1zimbra8.8b1ZAPPEND) Section: utils Priority: optional Maintainer: Zimbra Packaging Services diff --git a/thirdparty/unbound/zimbra-unbound/rpm/SPECS/unbound.spec b/thirdparty/unbound/zimbra-unbound/rpm/SPECS/unbound.spec index 3aaf0ab5b..871da4bb8 100644 --- a/thirdparty/unbound/zimbra-unbound/rpm/SPECS/unbound.spec +++ b/thirdparty/unbound/zimbra-unbound/rpm/SPECS/unbound.spec @@ -1,12 +1,12 @@ Summary: Zimbra's Unbound build Name: zimbra-unbound Version: VERSION -Release: 1zimbra8.7b4ZAPPEND +Release: 1zimbra8.8b1ZAPPEND License: BSD Source: %{name}-%{version}.tar.gz Patch0: log-facility.patch -BuildRequires: expat-devel, zimbra-openssl-devel >= 1.1.1h-1zimbra8.7b3ZAPPEND -Requires: expat, zimbra-openssl-libs >= 1.1.1h-1zimbra8.7b3ZAPPEND +BuildRequires: expat-devel, zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND +Requires: expat, zimbra-openssl-libs >= 3.0.9-1zimbra8.8b1ZAPPEND Requires: zimbra-unbound-libs = %{version}-%{release} AutoReqProv: no URL: https://www.unbound.net/ @@ -17,6 +17,8 @@ The Zimbra Unbound build %define debug_package %{nil} %changelog +* Mon Jun 12 2023 Zimbra Packaging Services - VERSION-1zimbra8.8b1ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 and upgraded unbound to 1.17.1 * Sat Aug 20 2022 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND - Fix ZCS-11941, remove anchor key generation * Tue Apr 12 2022 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND diff --git a/versions.def b/versions.def index 15412a95c..a7d744fd4 100644 --- a/versions.def +++ b/versions.def @@ -131,7 +131,7 @@ SNMP_VERSION := 5.8 TCMALLOC_VERSION := 2.4 -UNBOUND_VERSION := 1.11.0 +UNBOUND_VERSION := 1.17.1 XML_VERSION := 2.9.4 From 938e244a451089a16c1112bd3c90017855384864 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 09:51:14 +0000 Subject: [PATCH 06/48] ZBUG-3355:Updated dependency openssl-3.0.9 for apr-util --- thirdparty/apr-util/zimbra-apr-util/debian/changelog | 6 ++++++ thirdparty/apr-util/zimbra-apr-util/debian/control | 2 +- thirdparty/apr-util/zimbra-apr-util/rpm/SPECS/apr-util.spec | 6 ++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/thirdparty/apr-util/zimbra-apr-util/debian/changelog b/thirdparty/apr-util/zimbra-apr-util/debian/changelog index 16af4fa48..78672ec37 100644 --- 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 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 index 5cc8255b2..deb4b1933 100644 --- 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 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 index ea4290662..a15491f4c 100644 --- 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 - VERSION-1zimbra8.7b3ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 * Fri Dec 02 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND - Upgraded dependency openssl to 1.1.1h * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-ITERATIONZAPPEND From ca1f2117c551dede96a2816b99c3a9492aa741a6 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 09:52:21 +0000 Subject: [PATCH 07/48] ZBUG-3355:Updated dependency openssl-3.0.9 for perl-dbd-mysql --- .../perl-dbd-mysql/zimbra-perl-dbd-mysql/debian/changelog | 6 ++++++ .../perl-dbd-mysql/zimbra-perl-dbd-mysql/debian/control | 2 +- .../zimbra-perl-dbd-mysql/rpm/SPECS/dbd-mysql.spec | 8 +++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/thirdparty/perl-dbd-mysql/zimbra-perl-dbd-mysql/debian/changelog b/thirdparty/perl-dbd-mysql/zimbra-perl-dbd-mysql/debian/changelog index f1b41b8ef..546b94b21 100644 --- a/thirdparty/perl-dbd-mysql/zimbra-perl-dbd-mysql/debian/changelog +++ b/thirdparty/perl-dbd-mysql/zimbra-perl-dbd-mysql/debian/changelog @@ -1,3 +1,9 @@ +zimbra-perl-MODNORMNAME (VERSION-1zimbra8.7b5ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Upgraded OpenSSL to 3.0.9 + + -- Zimbra Packaging Services Mon, 12 Jun 2023 05:12:55 +0000 + zimbra-perl-MODNORMNAME (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium * Upgraded dependency openssl to 1.1.1h diff --git a/thirdparty/perl-dbd-mysql/zimbra-perl-dbd-mysql/debian/control b/thirdparty/perl-dbd-mysql/zimbra-perl-dbd-mysql/debian/control index 89df1fc68..fafca04ec 100644 --- a/thirdparty/perl-dbd-mysql/zimbra-perl-dbd-mysql/debian/control +++ b/thirdparty/perl-dbd-mysql/zimbra-perl-dbd-mysql/debian/control @@ -2,7 +2,7 @@ Source: zimbra-perl-MODNORMNAME Section: perl Priority: optional Maintainer: Zimbra Packaging Services -Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-openssl-dev (>= 1.1.1h-1zimbra8.7b3ZAPPEND), +Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-openssl-dev (>= 3.0.9-1zimbra8.8b1ZAPPEND), zimbra-mariadb-dev, zimbra-perl-dbi Standards-Version: 3.9.5 Homepage: https://metacpan.org/release/MODNAME diff --git a/thirdparty/perl-dbd-mysql/zimbra-perl-dbd-mysql/rpm/SPECS/dbd-mysql.spec b/thirdparty/perl-dbd-mysql/zimbra-perl-dbd-mysql/rpm/SPECS/dbd-mysql.spec index 09d0faf08..7004f2e54 100644 --- a/thirdparty/perl-dbd-mysql/zimbra-perl-dbd-mysql/rpm/SPECS/dbd-mysql.spec +++ b/thirdparty/perl-dbd-mysql/zimbra-perl-dbd-mysql/rpm/SPECS/dbd-mysql.spec @@ -1,13 +1,13 @@ Summary: DBD::mysql - MySQL driver for the Perl5 Database Interface (DBI) Name: zimbra-perl-MODNORMNAME Version: VERSION -Release: 1zimbra8.7b4ZAPPEND +Release: 1zimbra8.7b5ZAPPEND License: GPL+ or Artistic Source: %{name}-%{version}.tar.gz Packager: Zimbra Packaging Services Group: Development/Languages BuildRequires: zimbra-perl-base, zimbra-perl-dbi, zimbra-mariadb-devel -BuildRequires: zimbra-openssl-devel >= 1.1.1h-1zimbra8.7b3ZAPPEND +BuildRequires: zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND Requires: zimbra-perl-base, zimbra-perl-dbi, zimbra-mariadb-libs >= 10.1.25-1zimbra8.7b3ZAPPEND AutoReqProv: no URL: https://metacpan.org/release/MODNAME @@ -20,7 +20,9 @@ database management system. Most functions provided by this programming API are supported. %changelog -* Fri Dec 02 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND +* Mon Jun 12 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b5ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 +* Wed Dec 02 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND - Upgraded dependency openssl to 1.1.1h * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND - Upgraded perl-dbd-mysql to 4.050 From bb0c1751ef78e9e4fc137c0be749be50b090151a Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 09:53:10 +0000 Subject: [PATCH 08/48] ZBUG-3355:Updated dependency openssl-3.0.9 for perl-crypt-openssl-random --- .../zimbra-perl-crypt-openssl-random/debian/changelog | 6 ++++++ .../zimbra-perl-crypt-openssl-random/debian/control | 2 +- .../rpm/SPECS/crypt-openssl-random.spec | 8 +++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/thirdparty/perl-crypt-openssl-random/zimbra-perl-crypt-openssl-random/debian/changelog b/thirdparty/perl-crypt-openssl-random/zimbra-perl-crypt-openssl-random/debian/changelog index 497e665fb..37495fac5 100644 --- a/thirdparty/perl-crypt-openssl-random/zimbra-perl-crypt-openssl-random/debian/changelog +++ b/thirdparty/perl-crypt-openssl-random/zimbra-perl-crypt-openssl-random/debian/changelog @@ -1,3 +1,9 @@ +zimbra-perl-crypt-openssl-random (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Upgraded OpenSSL to 3.0.9 + + -- Zimbra Packaging Services Mon, 12 Jun 2023 05:12:55 +0000 + zimbra-perl-crypt-openssl-random (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium * Upgraded dependency openssl to 1.1.1h diff --git a/thirdparty/perl-crypt-openssl-random/zimbra-perl-crypt-openssl-random/debian/control b/thirdparty/perl-crypt-openssl-random/zimbra-perl-crypt-openssl-random/debian/control index 3193785e3..7aabce542 100644 --- a/thirdparty/perl-crypt-openssl-random/zimbra-perl-crypt-openssl-random/debian/control +++ b/thirdparty/perl-crypt-openssl-random/zimbra-perl-crypt-openssl-random/debian/control @@ -2,7 +2,7 @@ Source: zimbra-perl-crypt-openssl-random Section: perl Priority: optional Maintainer: Zimbra -Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-openssl-dev (>= 1.1.1h-1zimbra8.7b3ZAPPEND) +Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-openssl-dev (>= 3.0.9-1zimbra8.8b1ZAPPEND) Standards-Version: 3.9.5 Homepage: https://metacpan.org/release/Crypt-OpenSSL-Random diff --git a/thirdparty/perl-crypt-openssl-random/zimbra-perl-crypt-openssl-random/rpm/SPECS/crypt-openssl-random.spec b/thirdparty/perl-crypt-openssl-random/zimbra-perl-crypt-openssl-random/rpm/SPECS/crypt-openssl-random.spec index 80ad639de..b15325c0b 100644 --- a/thirdparty/perl-crypt-openssl-random/zimbra-perl-crypt-openssl-random/rpm/SPECS/crypt-openssl-random.spec +++ b/thirdparty/perl-crypt-openssl-random/zimbra-perl-crypt-openssl-random/rpm/SPECS/crypt-openssl-random.spec @@ -1,11 +1,11 @@ Summary: Zimbra's Crypt::OpenSSL::Random build Name: zimbra-perl-crypt-openssl-random Version: VERSION -Release: 1zimbra8.7b3ZAPPEND +Release: 1zimbra8.7b4ZAPPEND License: GPL-2 Source: %{name}-%{version}.tar.gz -BuildRequires: zimbra-perl-base, zimbra-openssl-devel >= 1.1.1h-1zimbra8.7b3ZAPPEND -Requires: zimbra-perl-base, zimbra-openssl-libs >= 1.1.1h-1zimbra8.7b3ZAPPEND +BuildRequires: zimbra-perl-base, zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND +Requires: zimbra-perl-base, zimbra-openssl-libs >= 3.0.9-1zimbra8.8b1ZAPPEND AutoReqProv: no URL: http://search.cpan.org/dist/Crypt-OpenSSL-Random/ @@ -17,6 +17,8 @@ The Zimbra Crypt::OpenSSL::Random build %define debug_package %{nil} %changelog +* Mon Jun 12 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 * Fri Dec 02 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND - Upgraded dependency openssl to 1.1.1h * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND From 0f55c979fae63e30b188a78e08599c2ca4b4f079 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 09:54:56 +0000 Subject: [PATCH 09/48] ZBUG-3355:Upgraded perl-crypt-openssl-rsa for OpenSSL-3.0.9 --- perl-versions.def | 2 +- .../zimbra-perl-crypt-openssl-rsa/debian/changelog | 6 ++++++ .../zimbra-perl-crypt-openssl-rsa/debian/control | 2 +- .../rpm/SPECS/crypt-openssl-rsa.spec | 10 ++++++---- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/perl-versions.def b/perl-versions.def index 188d1094e..198d4eb92 100644 --- 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 diff --git a/thirdparty/perl-crypt-openssl-rsa/zimbra-perl-crypt-openssl-rsa/debian/changelog b/thirdparty/perl-crypt-openssl-rsa/zimbra-perl-crypt-openssl-rsa/debian/changelog index d4aeffac8..1c89bb781 100644 --- a/thirdparty/perl-crypt-openssl-rsa/zimbra-perl-crypt-openssl-rsa/debian/changelog +++ b/thirdparty/perl-crypt-openssl-rsa/zimbra-perl-crypt-openssl-rsa/debian/changelog @@ -1,3 +1,9 @@ +zimbra-perl-crypt-openssl-rsa (VERSION-1zimbra8.8b1ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Upgraded OpenSSL to 3.0.9 and Upgraded Crypt::OpenSSL::RSA to 0.33 + + -- Zimbra Packaging Services Mon, 12 Jun 2023 05:12:55 +0000 + zimbra-perl-crypt-openssl-rsa (VERSION-1zimbra8.7b2ZAPPEND) unstable; urgency=medium * Upgraded dependency openssl to 1.1.1h diff --git a/thirdparty/perl-crypt-openssl-rsa/zimbra-perl-crypt-openssl-rsa/debian/control b/thirdparty/perl-crypt-openssl-rsa/zimbra-perl-crypt-openssl-rsa/debian/control index 8a2c3f5fe..61316c25f 100644 --- a/thirdparty/perl-crypt-openssl-rsa/zimbra-perl-crypt-openssl-rsa/debian/control +++ b/thirdparty/perl-crypt-openssl-rsa/zimbra-perl-crypt-openssl-rsa/debian/control @@ -2,7 +2,7 @@ Source: zimbra-perl-crypt-openssl-rsa Section: perl Priority: optional Maintainer: Zimbra -Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-openssl-dev (>= 1.1.1h-1zimbra8.7b3ZAPPEND) +Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-openssl-dev (>= 3.0.9-1zimbra8.8b1ZAPPEND) Standards-Version: 3.9.5 Homepage: https://metacpan.org/release/Crypt-OpenSSL-RSA diff --git a/thirdparty/perl-crypt-openssl-rsa/zimbra-perl-crypt-openssl-rsa/rpm/SPECS/crypt-openssl-rsa.spec b/thirdparty/perl-crypt-openssl-rsa/zimbra-perl-crypt-openssl-rsa/rpm/SPECS/crypt-openssl-rsa.spec index fa33b2931..1d1f736af 100644 --- a/thirdparty/perl-crypt-openssl-rsa/zimbra-perl-crypt-openssl-rsa/rpm/SPECS/crypt-openssl-rsa.spec +++ b/thirdparty/perl-crypt-openssl-rsa/zimbra-perl-crypt-openssl-rsa/rpm/SPECS/crypt-openssl-rsa.spec @@ -1,11 +1,11 @@ Summary: Zimbra's Crypt::OpenSSL::RSA build Name: zimbra-perl-crypt-openssl-rsa Version: VERSION -Release: 1zimbra8.7b2ZAPPEND +Release: 1zimbra8.8b1ZAPPEND License: GPL-2 Source: %{name}-%{version}.tar.gz -BuildRequires: zimbra-perl-base, zimbra-openssl-devel >= 1.1.1h-1zimbra8.7b3ZAPPEND -Requires: zimbra-perl-base, zimbra-openssl-libs >= 1.1.1h-1zimbra8.7b3ZAPPEND +BuildRequires: zimbra-perl-base, zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND +Requires: zimbra-perl-base, zimbra-openssl-libs >= 3.0.9-1zimbra8.8b1ZAPPEND AutoReqProv: no URL: http://search.cpan.org/dist/Crypt-OpenSSL-RSA/ @@ -17,7 +17,9 @@ The Zimbra Crypt::OpenSSL::RSA build %define debug_package %{nil} %changelog -* Fri Dec 02 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND +* Mon Jun 12 2023 Zimbra Packaging Services - VERSION-1zimbra8.8b1ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 and Upgraded Crypt::OpenSSL::RSA to 0.33 +* Wed Dec 02 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND - Upgraded dependency openssl to 1.1.1h * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-ITERATIONZAPPEND - Upgraded perl-crypt-openssl-rsa to 0.31 From 0612f8b5e029c0bbd46c4316306d3b5648c0059a Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 09:56:00 +0000 Subject: [PATCH 10/48] ZBUG-3355:Updated dependency openssl-3.0.9 for cyrus-sasl --- .../cyrus-sasl/zimbra-cyrus-sasl/debian/changelog | 6 ++++++ .../cyrus-sasl/zimbra-cyrus-sasl/debian/control | 4 ++-- .../zimbra-cyrus-sasl/rpm/SPECS/cyrus-sasl.spec | 14 ++++++++------ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/thirdparty/cyrus-sasl/zimbra-cyrus-sasl/debian/changelog b/thirdparty/cyrus-sasl/zimbra-cyrus-sasl/debian/changelog index d575af7d1..83e303f65 100644 --- 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 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 index e79a6aa6f..11eddda9f 100644 --- 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 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 index 9685de198..70f77ccc0 100644 --- 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,7 +1,7 @@ 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 @@ -9,12 +9,12 @@ 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 - VERSION-1zimbra8.7b4ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 * Tue Jun 21 2022 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND - Upgraded cyrus-sasl to 2.1.28 * Sat Dec 05 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND From 6a8a3f434fe92ed46936d8bb9c0bdc027b360762 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 09:57:23 +0000 Subject: [PATCH 11/48] ZBUG-3355:Updated dependency openssl-3.0.9 for openldap --- thirdparty/openldap/zimbra-openldap/debian/changelog | 6 ++++++ thirdparty/openldap/zimbra-openldap/debian/control | 4 ++-- .../openldap/zimbra-openldap/rpm/SPECS/openldap.spec | 8 +++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/thirdparty/openldap/zimbra-openldap/debian/changelog b/thirdparty/openldap/zimbra-openldap/debian/changelog index acf32e3a9..4c4012169 100644 --- a/thirdparty/openldap/zimbra-openldap/debian/changelog +++ b/thirdparty/openldap/zimbra-openldap/debian/changelog @@ -1,3 +1,9 @@ +zimbra-openldap (VERSION-1zimbra8.8b6ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Upgraded OpenSSL to 3.0.9 + + -- Zimbra Packaging Services Mon, 12 Jun 2023 05:12:55 +0000 + zimbra-openldap (VERSION-1zimbra8.8b5ZAPPEND) unstable; urgency=medium * Add fix for OpenLDAP ITS#9608 diff --git a/thirdparty/openldap/zimbra-openldap/debian/control b/thirdparty/openldap/zimbra-openldap/debian/control index 88bfaa434..aa06db051 100644 --- a/thirdparty/openldap/zimbra-openldap/debian/control +++ b/thirdparty/openldap/zimbra-openldap/debian/control @@ -1,6 +1,6 @@ Source: zimbra-openldap -Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-openssl-dev (>= 1.1.1h-1zimbra8.7b3ZAPPEND), - zimbra-cyrus-sasl-dev (>= 2.1.26-1zimbra8.7b3ZAPPEND), zimbra-libltdl-dev +Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-openssl-dev (>= 3.0.9-1zimbra8.8b1ZAPPEND), + zimbra-cyrus-sasl-dev (>= 2.1.28-1zimbra8.7b4ZAPPEND), zimbra-libltdl-dev Section: utils Priority: optional Maintainer: Zimbra Packaging Services diff --git a/thirdparty/openldap/zimbra-openldap/rpm/SPECS/openldap.spec b/thirdparty/openldap/zimbra-openldap/rpm/SPECS/openldap.spec index aab1c90f5..c5aa35563 100644 --- a/thirdparty/openldap/zimbra-openldap/rpm/SPECS/openldap.spec +++ b/thirdparty/openldap/zimbra-openldap/rpm/SPECS/openldap.spec @@ -1,7 +1,7 @@ Summary: Zimbra's openldap build Name: zimbra-openldap Version: VERSION -Release: 1zimbra8.8b5ZAPPEND +Release: 1zimbra8.8b6ZAPPEND License: BSD Source: %{name}-%{version}.tgz Patch0: ITS5037.patch @@ -12,8 +12,8 @@ Patch4: liblmdb-soname.patch Patch5: multival.patch Patch6: liblmdb-keysize.patch Patch7: ITS9608.patch -BuildRequires: zimbra-openssl-devel >= 1.1.1h-1zimbra8.7b3ZAPPEND -BuildRequires: zimbra-cyrus-sasl-devel >= 2.1.26-1zimbra8.7b3ZAPPEND +BuildRequires: zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND +BuildRequires: zimbra-cyrus-sasl-devel >= 2.1.28-1zimbra8.7b4ZAPPEND BuildRequires: zimbra-libltdl-devel AutoReqProv: no URL: http://www.openldap.org @@ -24,6 +24,8 @@ The Zimbra openldap build %define debug_package %{nil} %changelog +* Mon Jun 12 2023 Zimbra Packaging Services - VERSION-1zimbra8.8b6ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 * Tue Jul 07 2021 Zimbra Packaging Services - VERSION-1zimbra8.8b5ZAPPEND - Add fix for OpenLDAP ITS#9608 * Sat Dec 05 2020 Zimbra Packaging Services - VERSION-1zimbra8.8b4ZAPPEND From 868dbb116c328ae7ceeb94b4797a96d1cadd7813 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 09:58:15 +0000 Subject: [PATCH 12/48] ZBUG-3355:Updated dependency openssl-3.0.9 for postfix --- .../postfix/zimbra-postfix/debian/changelog | 6 ++++++ .../postfix/zimbra-postfix/debian/control | 4 ++-- .../zimbra-postfix/rpm/SPECS/postfix.spec | 18 ++++++++++-------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/thirdparty/postfix/zimbra-postfix/debian/changelog b/thirdparty/postfix/zimbra-postfix/debian/changelog index a599b720d..5abc588cd 100644 --- a/thirdparty/postfix/zimbra-postfix/debian/changelog +++ b/thirdparty/postfix/zimbra-postfix/debian/changelog @@ -1,3 +1,9 @@ +zimbra-postfix (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Upgraded OpenSSL to 3.0.9 and updated openldap, cyrus-sasl, lmdb + + -- Zimbra Packaging Services Mon, 12 Jun 2023 05:12:55 +0000 + zimbra-postfix (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium * Upgraded postfix to 3.6.1 diff --git a/thirdparty/postfix/zimbra-postfix/debian/control b/thirdparty/postfix/zimbra-postfix/debian/control index c13824ed0..9a526ac76 100644 --- a/thirdparty/postfix/zimbra-postfix/debian/control +++ b/thirdparty/postfix/zimbra-postfix/debian/control @@ -1,7 +1,7 @@ Source: zimbra-postfix Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), - zimbra-openldap-dev (>= 2.4.59-1zimbra8.8b4ZAPPEND), zimbra-cyrus-sasl-dev (>= 2.1.26-1zimbra8.7b3ZAPPEND), zimbra-openssl-dev (>= 1.1.1h-1zimbra8.7b3ZAPPEND), - zimbra-mariadb-dev, zimbra-lmdb-dev (>= 2.4.59-1zimbra8.8b4ZAPPEND), libpcre3-dev + zimbra-openldap-dev (>= 2.4.59-1zimbra8.8b6ZAPPEND), zimbra-cyrus-sasl-dev (>= 2.1.28-1zimbra8.7b4ZAPPEND), zimbra-openssl-dev (>= 3.0.9-1zimbra8.8b1ZAPPEND), + zimbra-mariadb-dev, zimbra-lmdb-dev (>= 2.4.59-1zimbra8.8b6ZAPPEND), libpcre3-dev Section: utils Priority: optional Maintainer: Zimbra Packaging Services diff --git a/thirdparty/postfix/zimbra-postfix/rpm/SPECS/postfix.spec b/thirdparty/postfix/zimbra-postfix/rpm/SPECS/postfix.spec index 2d32b25d8..27430c0c5 100644 --- a/thirdparty/postfix/zimbra-postfix/rpm/SPECS/postfix.spec +++ b/thirdparty/postfix/zimbra-postfix/rpm/SPECS/postfix.spec @@ -1,19 +1,19 @@ Summary: Zimbra's Postfix build Name: zimbra-postfix Version: VERSION -Release: 1zimbra8.7b3ZAPPEND +Release: 1zimbra8.7b4ZAPPEND License: IPL-1.0 Source: %{name}-%{version}.tar.gz -BuildRequires: zimbra-openldap-devel >= 2.4.59-1zimbra8.8b4ZAPPEND -BuildRequires: zimbra-cyrus-sasl-devel >= 2.1.26-1zimbra8.7b3ZAPPEND -BuildRequires: zimbra-openssl-devel >= 1.1.1h-1zimbra8.7b3ZAPPEND +BuildRequires: zimbra-openldap-devel >= 2.4.59-1zimbra8.8b6ZAPPEND +BuildRequires: zimbra-cyrus-sasl-devel >= 2.1.28-1zimbra8.7b4ZAPPEND +BuildRequires: zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND BuildRequires: zimbra-mariadb-devel -BuildRequires: zimbra-lmdb-devel >= 2.4.59-1zimbra8.8b4ZAPPEND +BuildRequires: zimbra-lmdb-devel >= 2.4.59-1zimbra8.8b6ZAPPEND BuildRequires: pcre-devel Requires: pcre, libicu -Requires: zimbra-openldap-libs >= 2.4.59-1zimbra8.8b4ZAPPEND, zimbra-mta-base -Requires: zimbra-cyrus-sasl >= 2.1.26-1zimbra8.7b3ZAPPEND, zimbra-mariadb -Requires: zimbra-lmdb-libs >= 2.4.59-1zimbra8.8b4ZAPPEND, zimbra-openssl-libs >= 1.1.1h-1zimbra8.7b3ZAPPEND +Requires: zimbra-openldap-libs >= 2.4.59-1zimbra8.8b6ZAPPEND, zimbra-mta-base +Requires: zimbra-cyrus-sasl >= 2.1.28-1zimbra8.7b4ZAPPEND, zimbra-mariadb +Requires: zimbra-lmdb-libs >= 2.4.59-1zimbra8.8b6ZAPPEND, zimbra-openssl-libs >= 3.0.9-1zimbra8.8b1ZAPPEND Patch0: postfix-main-cf-zimbra.patch Patch1: stop-warning.patch Patch2: postfix-ldap.patch @@ -27,6 +27,8 @@ The Zimbra Postfix build %define debug_package %{nil} %changelog +* Mon Jun 12 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 and updated openldap, cyrus-sasl, lmdb * Wed Jun 30 2021 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND - Upgraded postfix to 3.6.1 * Sat Dec 05 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND From 4e837d1c9bc617d9269a54b3baf0b5999870ec88 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 09:59:32 +0000 Subject: [PATCH 13/48] ZBUG-3355:Updated dependency openssl-3.0.9 for opendkim --- .../opendkim/zimbra-opendkim/debian/changelog | 6 ++++++ thirdparty/opendkim/zimbra-opendkim/debian/control | 4 ++-- .../zimbra-opendkim/rpm/SPECS/opendkim.spec | 14 ++++++++------ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/thirdparty/opendkim/zimbra-opendkim/debian/changelog b/thirdparty/opendkim/zimbra-opendkim/debian/changelog index bf0601b6d..4e8a41995 100644 --- a/thirdparty/opendkim/zimbra-opendkim/debian/changelog +++ b/thirdparty/opendkim/zimbra-opendkim/debian/changelog @@ -1,3 +1,9 @@ +zimbra-opendkim (VERSION-1zimbra8.7b6ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Upgraded OpenSSL to 3.0.9 + + -- Zimbra Packaging Services Mon, 12 Jun 2023 05:12:55 +0000 + zimbra-opendkim (VERSION-1zimbra8.7b5ZAPPEND) unstable; urgency=medium * Add patch for ZBUG-2140 diff --git a/thirdparty/opendkim/zimbra-opendkim/debian/control b/thirdparty/opendkim/zimbra-opendkim/debian/control index 73e5bb890..53c29fce9 100644 --- a/thirdparty/opendkim/zimbra-opendkim/debian/control +++ b/thirdparty/opendkim/zimbra-opendkim/debian/control @@ -1,6 +1,6 @@ Source: zimbra-opendkim -Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-openssl-dev (>= 1.1.1h-1zimbra8.7b3ZAPPEND), zimbra-libbsd-dev, - zimbra-openldap-dev (>= 2.4.49-1zimbra8.8b4ZAPPEND), zimbra-libmilter-dev, zimbra-cyrus-sasl-dev (>= 2.1.26-1zimbra8.7b3ZAPPEND) +Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-openssl-dev (>= 3.0.9-1zimbra8.8b1ZAPPEND), zimbra-libbsd-dev, + zimbra-openldap-dev (>= 2.4.59-1zimbra8.8b6ZAPPEND), zimbra-libmilter-dev, zimbra-cyrus-sasl-dev (>= 2.1.28-1zimbra8.7b4ZAPPEND) Section: utils Priority: optional Maintainer: Zimbra Packaging Services diff --git a/thirdparty/opendkim/zimbra-opendkim/rpm/SPECS/opendkim.spec b/thirdparty/opendkim/zimbra-opendkim/rpm/SPECS/opendkim.spec index 5c47ec7f0..4c04d0bc3 100644 --- a/thirdparty/opendkim/zimbra-opendkim/rpm/SPECS/opendkim.spec +++ b/thirdparty/opendkim/zimbra-opendkim/rpm/SPECS/opendkim.spec @@ -1,21 +1,21 @@ Summary: Zimbra's OpenDKIM build Name: zimbra-opendkim Version: VERSION -Release: 1zimbra8.7b5ZAPPEND +Release: 1zimbra8.7b6ZAPPEND License: OpenDKIM Source: %{name}-%{version}.tar.gz Patch0: ticket226.patch Patch1: opendkim-2.10.3.patch BuildRequires: zlib-devel -BuildRequires: zimbra-openssl-devel >= 1.1.1h-1zimbra8.7b3ZAPPEND +BuildRequires: zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND BuildRequires: zimbra-libbsd-devel -BuildRequires: zimbra-openldap-devel >= 2.4.49-1zimbra8.8b4ZAPPEND +BuildRequires: zimbra-openldap-devel >= 2.4.59-1zimbra8.8b6ZAPPEND BuildRequires: zimbra-libmilter-devel -BuildRequires: zimbra-cyrus-sasl-devel >= 2.1.26-1zimbra8.7b3ZAPPEND +BuildRequires: zimbra-cyrus-sasl-devel >= 2.1.28-1zimbra8.7b4ZAPPEND Requires: zlib, zimbra-opendkim-libs = %{version}-%{release} -Requires: zimbra-openssl-libs >= 1.1.1h-1zimbra8.7b3ZAPPEND +Requires: zimbra-openssl-libs >= 3.0.9-1zimbra8.8b1ZAPPEND Requires: zimbra-libbsd-libs -Requires: zimbra-openldap-libs >= 2.4.49-1zimbra8.8b4ZAPPEND +Requires: zimbra-openldap-libs >= 2.4.59-1zimbra8.8b6ZAPPEND AutoReqProv: no URL: http://www.opendkim.org/ @@ -25,6 +25,8 @@ The Zimbra OpenDKIM build %define debug_package %{nil} %changelog +* Mon Jun 12 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b6ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 * Tue Mar 16 2021 Zimbra Packaging Services - VERSION-1zimbra8.7b5ZAPPEND - add patch for ZBUG-2140 * Sat Dec 05 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND From f7868cacc540836d991188bec42ca8904c76a393 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:01:40 +0000 Subject: [PATCH 14/48] ZBUG-3355:Updated dependency openssl-3.0.9 for clamav --- thirdparty/clamav/Makefile | 2 + thirdparty/clamav/patches/clamav-fips.patch | 66 +++++++++++++++++++ .../clamav/zimbra-clamav/debian/changelog | 6 ++ .../clamav/zimbra-clamav/debian/control | 2 +- .../zimbra-clamav/debian/patches/series | 1 + .../zimbra-clamav/rpm/SPECS/clamav.spec | 10 ++- 6 files changed, 83 insertions(+), 4 deletions(-) create mode 100644 thirdparty/clamav/patches/clamav-fips.patch create mode 100644 thirdparty/clamav/zimbra-clamav/debian/patches/series diff --git a/thirdparty/clamav/Makefile b/thirdparty/clamav/Makefile index c57e5a83a..72ab92bfe 100644 --- 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 new file mode 100644 index 000000000..00b51ba10 --- /dev/null +++ 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 index 0f576e8be..97e39e44e 100644 --- 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 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 index d2c948dcb..7c72ae55f 100644 --- 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 new file mode 100644 index 000000000..ccefb2d5a --- /dev/null +++ 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 index 919add23a..9b4600f96 100644 --- 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 - VERSION-1zimbra8.8b4ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 * Wed Feb 22 2023 Zimbra Packaging Services - VERSION-1zimbra8.8b3ZAPPEND - Upgraded ClamAV to 0.105.2 * Wed Nov 02 2022 Zimbra Packaging Services - 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; \ From 3b6bb90a03fc2a9b4515c9d4ceb1a89e297526b4 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:03:10 +0000 Subject: [PATCH 15/48] ZBUG-3355:Updated dependency openssl-3.0.9 for net-snmp --- thirdparty/net-snmp/Makefile | 2 +- thirdparty/net-snmp/zimbra-net-snmp/debian/changelog | 6 ++++++ thirdparty/net-snmp/zimbra-net-snmp/debian/control | 2 +- thirdparty/net-snmp/zimbra-net-snmp/rpm/SPECS/net-snmp.spec | 6 ++++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/thirdparty/net-snmp/Makefile b/thirdparty/net-snmp/Makefile index 946bda5e2..d065329c6 100644 --- a/thirdparty/net-snmp/Makefile +++ b/thirdparty/net-snmp/Makefile @@ -6,7 +6,7 @@ pvers := $(SNMP_VERSION) pname := net-snmp pfile := $(pname)-$(pvers).tar.gz psrc_file := $(SRC_DIR)/$(pfile) -purl := http://iweb.dl.sourceforge.net/project/net-snmp/net-snmp/$(pvers)/$(pfile) +purl := https://sourceforge.net/projects/net-snmp/files/net-snmp/$(pvers)/$(pfile) zname := zimbra-$(pname) zspec := $(pname).spec diff --git a/thirdparty/net-snmp/zimbra-net-snmp/debian/changelog b/thirdparty/net-snmp/zimbra-net-snmp/debian/changelog index ab122acaf..7e03de237 100644 --- a/thirdparty/net-snmp/zimbra-net-snmp/debian/changelog +++ b/thirdparty/net-snmp/zimbra-net-snmp/debian/changelog @@ -1,3 +1,9 @@ +zimbra-net-snmp (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Upgraded OpenSSL to 3.0.9 + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-net-snmp (VERSION-1zimbra8.7b2ZAPPEND) unstable; urgency=medium * Upgraded dependency openssl to 1.1.1h diff --git a/thirdparty/net-snmp/zimbra-net-snmp/debian/control b/thirdparty/net-snmp/zimbra-net-snmp/debian/control index 4cc29c484..e27436971 100644 --- a/thirdparty/net-snmp/zimbra-net-snmp/debian/control +++ b/thirdparty/net-snmp/zimbra-net-snmp/debian/control @@ -1,6 +1,6 @@ Source: zimbra-net-snmp Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), - zimbra-openssl-dev (>= 1.1.1h-1zimbra8.7b3ZAPPEND) + zimbra-openssl-dev (>= 3.0.9-1zimbra8.8b1ZAPPEND) Section: utils Priority: optional Maintainer: Zimbra Packaging Services diff --git a/thirdparty/net-snmp/zimbra-net-snmp/rpm/SPECS/net-snmp.spec b/thirdparty/net-snmp/zimbra-net-snmp/rpm/SPECS/net-snmp.spec index f156d889b..9f8481939 100644 --- a/thirdparty/net-snmp/zimbra-net-snmp/rpm/SPECS/net-snmp.spec +++ b/thirdparty/net-snmp/zimbra-net-snmp/rpm/SPECS/net-snmp.spec @@ -1,10 +1,10 @@ Summary: Zimbra's NetSNMP build Name: zimbra-net-snmp Version: VERSION -Release: 1zimbra8.7b2ZAPPEND +Release: 1zimbra8.7b3ZAPPEND License: BSD Source: %{name}-%{version}.tar.gz -BuildRequires: zimbra-openssl-devel >= 1.1.1h-1zimbra8.7b3ZAPPEND +BuildRequires: zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND BuildRequires: perl-devel Requires: perl, perl-core Requires: zimbra-net-snmp-libs = %{version}-%{release} @@ -17,6 +17,8 @@ The Zimbra NetSNMP build %define debug_package %{nil} %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 * Fri Dec 02 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND - Upgraded dependency openssl to 1.1.1h * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-ITERATIONZAPPEND From aa9d9d2a2b6ec39ee60578311e0a7d61a9e9f9e2 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:04:52 +0000 Subject: [PATCH 16/48] ZBUG-3355:Upgraded perl-io-socket-ssl for OpenSSL-3.0.9 --- perl-versions.def | 2 +- .../zimbra-perl-io-socket-ssl/debian/changelog | 6 ++++++ .../zimbra-perl-io-socket-ssl/debian/control | 4 ++-- .../rpm/SPECS/io-socket-ssl.spec | 8 +++++--- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/perl-versions.def b/perl-versions.def index 198d4eb92..3fd025932 100644 --- a/perl-versions.def +++ b/perl-versions.def @@ -48,7 +48,7 @@ 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 diff --git a/thirdparty/perl-io-socket-ssl/zimbra-perl-io-socket-ssl/debian/changelog b/thirdparty/perl-io-socket-ssl/zimbra-perl-io-socket-ssl/debian/changelog index d9faa93ba..2e151ef69 100644 --- a/thirdparty/perl-io-socket-ssl/zimbra-perl-io-socket-ssl/debian/changelog +++ b/thirdparty/perl-io-socket-ssl/zimbra-perl-io-socket-ssl/debian/changelog @@ -1,3 +1,9 @@ +zimbra-perl-io-socket-ssl (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Upgraded OpenSSL to 3.0.9, Updated dependency zimbra-perl-net-ssleay, Upgraded IO::Socket::SSL to 2.083 + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-perl-io-socket-ssl (VERSION-1zimbra8.7b2ZAPPEND) unstable; urgency=medium * Updated dependency zimbra-perl-net-ssleay diff --git a/thirdparty/perl-io-socket-ssl/zimbra-perl-io-socket-ssl/debian/control b/thirdparty/perl-io-socket-ssl/zimbra-perl-io-socket-ssl/debian/control index 0ce23046f..35b389f2e 100644 --- a/thirdparty/perl-io-socket-ssl/zimbra-perl-io-socket-ssl/debian/control +++ b/thirdparty/perl-io-socket-ssl/zimbra-perl-io-socket-ssl/debian/control @@ -2,7 +2,7 @@ Source: zimbra-perl-io-socket-ssl Section: perl Priority: optional Maintainer: Zimbra Packaging Services -Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-perl-mozilla-ca, zimbra-perl-net-ssleay (>= 1.88-1zimbra8.7b2ZAPPEND), +Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-perl-mozilla-ca, zimbra-perl-net-ssleay (>= 1.92-1zimbra8.8b1ZAPPEND), zimbra-perl-io-socket-ip Standards-Version: 3.9.5 Homepage: https://metacpan.org/release/IO-Socket-SSL @@ -10,7 +10,7 @@ Homepage: https://metacpan.org/release/IO-Socket-SSL Package: zimbra-perl-io-socket-ssl Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-perl-base, zimbra-perl-mozilla-ca, - zimbra-perl-net-ssleay (>= 1.88-1zimbra8.7b2ZAPPEND), zimbra-perl-io-socket-ip + zimbra-perl-net-ssleay (>= 1.92-1zimbra8.8b1ZAPPEND), zimbra-perl-io-socket-ip Description: SSL sockets with IO::Socket interface IO::Socket::SSL makes using SSL/TLS much easier by wrapping the necessary functionality into the familiar IO::Socket interface and diff --git a/thirdparty/perl-io-socket-ssl/zimbra-perl-io-socket-ssl/rpm/SPECS/io-socket-ssl.spec b/thirdparty/perl-io-socket-ssl/zimbra-perl-io-socket-ssl/rpm/SPECS/io-socket-ssl.spec index c4a480812..4f25b9ec6 100644 --- a/thirdparty/perl-io-socket-ssl/zimbra-perl-io-socket-ssl/rpm/SPECS/io-socket-ssl.spec +++ b/thirdparty/perl-io-socket-ssl/zimbra-perl-io-socket-ssl/rpm/SPECS/io-socket-ssl.spec @@ -1,14 +1,14 @@ Summary: SSL sockets with IO::Socket interface Name: zimbra-perl-io-socket-ssl Version: VERSION -Release: 1zimbra8.7b2ZAPPEND +Release: 1zimbra8.7b3ZAPPEND License: GPL+ or Artistic Source: %{name}-%{version}.tar.gz Packager: Zimbra Packaging Services Group: Development/Languages -BuildRequires: zimbra-perl-base, zimbra-perl-mozilla-ca, zimbra-perl-net-ssleay >= 1.88-1zimbra8.7b2ZAPPEND +BuildRequires: zimbra-perl-base, zimbra-perl-mozilla-ca, zimbra-perl-net-ssleay >= 1.92-1zimbra8.8b1ZAPPEND BuildRequires: zimbra-perl-io-socket-ip -Requires: zimbra-perl-base, zimbra-perl-mozilla-ca, zimbra-perl-net-ssleay >= 1.88-1zimbra8.7b2ZAPPEND +Requires: zimbra-perl-base, zimbra-perl-mozilla-ca, zimbra-perl-net-ssleay >= 1.92-1zimbra8.8b1ZAPPEND Requires: zimbra-perl-io-socket-ip AutoReqProv: no URL: https://metacpan.org/release/IO-Socket-SSL @@ -23,6 +23,8 @@ you do blocking I/O and don't use select or poll. %define debug_package %{nil} %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9, Updated dependency zimbra-perl-net-ssleay, Upgraded IO::Socket::SSL to 2.083 * Sat Dec 05 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND - Updated dependency zimbra-perl-net-ssleay * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-ITERATIONZAPPEND From 5f3d82cd65a7be1763e833c57d20a053d70e0525 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:05:42 +0000 Subject: [PATCH 17/48] ZBUG-3355:Updated dependency openssl-3.0.9 for perl-net-http --- .../perl-net-http/zimbra-perl-net-http/debian/changelog | 6 ++++++ .../perl-net-http/zimbra-perl-net-http/debian/control | 4 ++-- .../zimbra-perl-net-http/rpm/SPECS/net-http.spec | 8 +++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/thirdparty/perl-net-http/zimbra-perl-net-http/debian/changelog b/thirdparty/perl-net-http/zimbra-perl-net-http/debian/changelog index 95670bf1f..34592946e 100644 --- a/thirdparty/perl-net-http/zimbra-perl-net-http/debian/changelog +++ b/thirdparty/perl-net-http/zimbra-perl-net-http/debian/changelog @@ -1,3 +1,9 @@ +zimbra-perl-net-http (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium + + * Updated dependency perl-io-socket-ssl for perl-net-http + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-perl-net-http (VERSION-1zimbra8.7b2ZAPPEND) unstable; urgency=medium * Updated dependency perl-io-socket-ssl for perl-net-http diff --git a/thirdparty/perl-net-http/zimbra-perl-net-http/debian/control b/thirdparty/perl-net-http/zimbra-perl-net-http/debian/control index 41d9ba0ef..8265a1c8a 100644 --- a/thirdparty/perl-net-http/zimbra-perl-net-http/debian/control +++ b/thirdparty/perl-net-http/zimbra-perl-net-http/debian/control @@ -2,13 +2,13 @@ Source: zimbra-perl-net-http Section: perl Priority: optional Maintainer: Zimbra Packaging Services -Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-perl-uri, zimbra-perl-io-socket-ssl (>= 2.068-1zimbra8.7b1ZAPPEND) +Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-perl-uri, zimbra-perl-io-socket-ssl (>= 2.083-1zimbra8.7b3ZAPPEND) Standards-Version: 3.9.5 Homepage: https://metacpan.org/release/Net-HTTP Package: zimbra-perl-net-http Architecture: all -Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-perl-base, zimbra-perl-uri, zimbra-perl-io-socket-ssl (>= 2.068-1zimbra8.7b1ZAPPEND) +Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-perl-base, zimbra-perl-uri, zimbra-perl-io-socket-ssl (>= 2.083-1zimbra8.7b3ZAPPEND) Description: Net::HTTP - Low-level HTTP connection (client) The Net::HTTP class is a low-level HTTP client. An instance of the Net::HTTP class represents a connection to an HTTP server. The HTTP diff --git a/thirdparty/perl-net-http/zimbra-perl-net-http/rpm/SPECS/net-http.spec b/thirdparty/perl-net-http/zimbra-perl-net-http/rpm/SPECS/net-http.spec index 105f31525..3dc3a8466 100644 --- a/thirdparty/perl-net-http/zimbra-perl-net-http/rpm/SPECS/net-http.spec +++ b/thirdparty/perl-net-http/zimbra-perl-net-http/rpm/SPECS/net-http.spec @@ -1,13 +1,13 @@ Summary: Net::HTTP - Low-level HTTP connection (client) Name: zimbra-perl-net-http Version: VERSION -Release: 1zimbra8.7b2ZAPPEND +Release: 1zimbra8.7b4ZAPPEND License: GPL+ or Artistic Source: %{name}-%{version}.tar.gz Packager: Zimbra Packaging Services Group: Development/Languages -BuildRequires: zimbra-perl-base, zimbra-perl-uri, zimbra-perl-io-socket-ssl >= 2.068-1zimbra8.7b1ZAPPEND -Requires: zimbra-perl-base, zimbra-perl-uri, zimbra-perl-io-socket-ssl >= 2.068-1zimbra8.7b1ZAPPEND +BuildRequires: zimbra-perl-base, zimbra-perl-uri, zimbra-perl-io-socket-ssl >= 2.083-1zimbra8.7b3ZAPPEND +Requires: zimbra-perl-base, zimbra-perl-uri, zimbra-perl-io-socket-ssl >= 2.083-1zimbra8.7b3ZAPPEND AutoReqProv: no URL: https://metacpan.org/release/Net-HTTP @@ -20,6 +20,8 @@ HTTP/1.0 and HTTP/1.1 %define debug_package %{nil} %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND +- Updated dependency perl-io-socket-ssl for perl-net-http * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND - Updated dependency perl-io-socket-ssl for perl-net-http From 606aca1abf5a4bf5016fa557073f3c6e870b341c Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:06:24 +0000 Subject: [PATCH 18/48] ZBUG-3355:Updated dependency openssl-3.0.9 for perl-libwww --- .../perl-libwww/zimbra-perl-libwww/debian/changelog | 6 ++++++ thirdparty/perl-libwww/zimbra-perl-libwww/debian/control | 4 ++-- .../perl-libwww/zimbra-perl-libwww/rpm/SPECS/libwww.spec | 8 +++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/thirdparty/perl-libwww/zimbra-perl-libwww/debian/changelog b/thirdparty/perl-libwww/zimbra-perl-libwww/debian/changelog index 0aea4484d..162789c4f 100644 --- a/thirdparty/perl-libwww/zimbra-perl-libwww/debian/changelog +++ b/thirdparty/perl-libwww/zimbra-perl-libwww/debian/changelog @@ -1,3 +1,9 @@ +zimbra-perl-libwww (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium + + * Updated dependency perl-net-http + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-perl-libwww (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium * Updated dependency perl-net-http diff --git a/thirdparty/perl-libwww/zimbra-perl-libwww/debian/control b/thirdparty/perl-libwww/zimbra-perl-libwww/debian/control index 7ad72fd83..ed8ee8400 100644 --- a/thirdparty/perl-libwww/zimbra-perl-libwww/debian/control +++ b/thirdparty/perl-libwww/zimbra-perl-libwww/debian/control @@ -5,7 +5,7 @@ Maintainer: Zimbra Packaging Services Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-perl-encode-locale, zimbra-perl-file-listing, zimbra-perl-http-cookies, zimbra-perl-http-daemon, zimbra-perl-http-date, zimbra-perl-http-negotiate, zimbra-perl-http-message, zimbra-perl-lwp-mediatypes, - zimbra-perl-uri, zimbra-perl-net-http (>= 6.09-1zimbra8.7b3ZAPPEND), zimbra-perl-www-robotrules, zimbra-perl-html-parser + zimbra-perl-uri, zimbra-perl-net-http (>= 6.09-1zimbra8.7b4ZAPPEND), zimbra-perl-www-robotrules, zimbra-perl-html-parser Standards-Version: 3.9.5 Homepage: https://metacpan.org/release/libwww-perl @@ -14,7 +14,7 @@ Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-perl-base, zimbra-perl-encode-locale, zimbra-perl-file-listing, zimbra-perl-http-cookies, zimbra-perl-http-daemon, zimbra-perl-http-date, zimbra-perl-http-negotiate, zimbra-perl-http-message, - zimbra-perl-lwp-mediatypes, zimbra-perl-uri, zimbra-perl-net-http (>= 6.09-1zimbra8.7b3ZAPPEND), + zimbra-perl-lwp-mediatypes, zimbra-perl-uri, zimbra-perl-net-http (>= 6.09-1zimbra8.7b4ZAPPEND), zimbra-perl-www-robotrules, zimbra-perl-html-parser Description: libwww - The World-Wide Web library for Perl The libwww-perl collection is a set of Perl modules which provides a diff --git a/thirdparty/perl-libwww/zimbra-perl-libwww/rpm/SPECS/libwww.spec b/thirdparty/perl-libwww/zimbra-perl-libwww/rpm/SPECS/libwww.spec index cb16a72fb..01806b95f 100644 --- a/thirdparty/perl-libwww/zimbra-perl-libwww/rpm/SPECS/libwww.spec +++ b/thirdparty/perl-libwww/zimbra-perl-libwww/rpm/SPECS/libwww.spec @@ -1,7 +1,7 @@ Summary: libwww - The World-Wide Web library for Perl Name: zimbra-perl-libwww Version: VERSION -Release: 1zimbra8.7b3ZAPPEND +Release: 1zimbra8.7b4ZAPPEND License: GPL+ or Artistic Source: %{name}-%{version}.tar.gz Packager: Zimbra Packaging Services @@ -9,11 +9,11 @@ Group: Development/Languages BuildRequires: zimbra-perl-base, zimbra-perl-encode-locale, zimbra-perl-file-listing BuildRequires: zimbra-perl-http-cookies, zimbra-perl-http-daemon, zimbra-perl-http-date BuildRequires: zimbra-perl-http-negotiate, zimbra-perl-http-message, zimbra-perl-lwp-mediatypes -BuildRequires: zimbra-perl-uri, zimbra-perl-net-http >= 6.09-1zimbra8.7b3ZAPPEND, zimbra-perl-www-robotrules, zimbra-perl-html-parser +BuildRequires: zimbra-perl-uri, zimbra-perl-net-http >= 6.09-1zimbra8.7b4ZAPPEND, zimbra-perl-www-robotrules, zimbra-perl-html-parser Requires: zimbra-perl-base, zimbra-perl-encode-locale, zimbra-perl-file-listing Requires: zimbra-perl-http-cookies, zimbra-perl-http-daemon, zimbra-perl-http-date Requires: zimbra-perl-http-negotiate, zimbra-perl-http-message, zimbra-perl-lwp-mediatypes -Requires: zimbra-perl-uri, zimbra-perl-net-http >= 6.09-1zimbra8.7b3ZAPPEND, zimbra-perl-www-robotrules, zimbra-perl-html-parser +Requires: zimbra-perl-uri, zimbra-perl-net-http >= 6.09-1zimbra8.7b4ZAPPEND, zimbra-perl-www-robotrules, zimbra-perl-html-parser AutoReqProv: no URL: https://metacpan.org/release/libwww-perl @@ -28,6 +28,8 @@ help you implement simple HTTP servers. %define debug_package %{nil} %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND +- Updated dependency zimbra-perl-net-http * Sat Dec 05 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND - Updated dependency zimbra-perl-net-http * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND From af13611a31f9cbe70792793c2ba93a1e7679f6fd Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:08:18 +0000 Subject: [PATCH 19/48] ZBUG-3355:Upgraded perl-lwp-protocol-https for OpenSSL-3.0.9 --- perl-versions.def | 2 +- thirdparty/perl-lwp-protocol-https/Makefile | 2 +- .../zimbra-perl-lwp-protocol-https/debian/changelog | 8 +++++++- .../zimbra-perl-lwp-protocol-https/debian/control | 8 ++++---- .../rpm/SPECS/lwp-protocol-https.spec | 10 ++++++---- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/perl-versions.def b/perl-versions.def index 3fd025932..18c016b59 100644 --- a/perl-versions.def +++ b/perl-versions.def @@ -55,7 +55,7 @@ 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 diff --git a/thirdparty/perl-lwp-protocol-https/Makefile b/thirdparty/perl-lwp-protocol-https/Makefile index c52784527..c00cfac20 100644 --- a/thirdparty/perl-lwp-protocol-https/Makefile +++ b/thirdparty/perl-lwp-protocol-https/Makefile @@ -8,7 +8,7 @@ pname_lc := lwp-protocol-https pfile := $(pname)-$(pvers).tar.gz psrc_file := $(SRC_DIR)/$(pfile) -purl := https://cpan.metacpan.org/authors/id/M/MS/MSCHILLI/$(pfile) +purl := https://cpan.metacpan.org/authors/id/O/OA/OALDERS/$(pfile) zname := zimbra-perl-$(pname_lc) zspec := $(pname_lc).spec diff --git a/thirdparty/perl-lwp-protocol-https/zimbra-perl-lwp-protocol-https/debian/changelog b/thirdparty/perl-lwp-protocol-https/zimbra-perl-lwp-protocol-https/debian/changelog index 94da0dfbc..e1b8c39b3 100644 --- a/thirdparty/perl-lwp-protocol-https/zimbra-perl-lwp-protocol-https/debian/changelog +++ b/thirdparty/perl-lwp-protocol-https/zimbra-perl-lwp-protocol-https/debian/changelog @@ -1,6 +1,12 @@ zimbra-perl-lwp-protocol-https (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium - * Updated Updated dependencies zimbra-perl-libwww,zimbra-perl-net-http,zimbra-perl-io-socket-ssl + * Updated dependencies zimbra-perl-libwww,zimbra-perl-net-http,zimbra-perl-io-socket-ssl and upgraded LWP::Protocol::https to 6.10 + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + +zimbra-perl-lwp-protocol-https (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium + + * Updated dependencies zimbra-perl-libwww,zimbra-perl-net-http,zimbra-perl-io-socket-ssl -- Zimbra Packaging Services Sat, 05 Dec 2020 22:26:24 +0000 diff --git a/thirdparty/perl-lwp-protocol-https/zimbra-perl-lwp-protocol-https/debian/control b/thirdparty/perl-lwp-protocol-https/zimbra-perl-lwp-protocol-https/debian/control index 64b5464fd..e1636c0e5 100644 --- a/thirdparty/perl-lwp-protocol-https/zimbra-perl-lwp-protocol-https/debian/control +++ b/thirdparty/perl-lwp-protocol-https/zimbra-perl-lwp-protocol-https/debian/control @@ -2,15 +2,15 @@ Source: zimbra-perl-lwp-protocol-https Section: perl Priority: optional Maintainer: Zimbra Packaging Services -Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-perl-libwww (>= 6.13-1zimbra8.7b3ZAPPEND), zimbra-perl-net-http (>= 6.09-1zimbra8.7b3ZAPPEND), - zimbra-perl-io-socket-ssl (>= 2.068-1zimbra8.7b2ZAPPEND), zimbra-perl-mozilla-ca +Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-perl-libwww (>= 6.13-1zimbra8.7b4ZAPPEND), zimbra-perl-net-http (>= 6.09-1zimbra8.7b4ZAPPEND), + zimbra-perl-io-socket-ssl (>= 2.083-1zimbra8.7b3ZAPPEND), zimbra-perl-mozilla-ca Standards-Version: 3.9.5 Homepage: https://metacpan.org/release/LWP-Protocol-https Package: zimbra-perl-lwp-protocol-https Architecture: all -Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-perl-base, zimbra-perl-libwww (>= 6.13-1zimbra8.7b3ZAPPEND), - zimbra-perl-net-http (>= 6.09-1zimbra8.7b3ZAPPEND), zimbra-perl-io-socket-ssl (>= 2.068-1zimbra8.7b2ZAPPEND), zimbra-perl-mozilla-ca +Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-perl-base, zimbra-perl-libwww (>= 6.13-1zimbra8.7b4ZAPPEND), + zimbra-perl-net-http (>= 6.09-1zimbra8.7b4ZAPPEND), zimbra-perl-io-socket-ssl (>= 2.083-1zimbra8.7b3ZAPPEND), zimbra-perl-mozilla-ca Description: LWP::Protocol::https - Provide https support for LWP::UserAgent The LWP::Protocol::https module provides support for using https schemed URLs with LWP. This module is a plug-in to the LWP protocol handling, so diff --git a/thirdparty/perl-lwp-protocol-https/zimbra-perl-lwp-protocol-https/rpm/SPECS/lwp-protocol-https.spec b/thirdparty/perl-lwp-protocol-https/zimbra-perl-lwp-protocol-https/rpm/SPECS/lwp-protocol-https.spec index b88305a34..8601b6064 100644 --- a/thirdparty/perl-lwp-protocol-https/zimbra-perl-lwp-protocol-https/rpm/SPECS/lwp-protocol-https.spec +++ b/thirdparty/perl-lwp-protocol-https/zimbra-perl-lwp-protocol-https/rpm/SPECS/lwp-protocol-https.spec @@ -6,10 +6,10 @@ License: GPL+ or Artistic Source: %{name}-%{version}.tar.gz Packager: Zimbra Packaging Services Group: Development/Languages -BuildRequires: zimbra-perl-base, zimbra-perl-libwww >= 6.13-1zimbra8.7b3ZAPPEND, zimbra-perl-net-http >= 6.09-1zimbra8.7b3ZAPPEND -BuildRequires: zimbra-perl-io-socket-ssl >= 2.068-1zimbra8.7b2ZAPPEND, zimbra-perl-mozilla-ca -Requires: zimbra-perl-base, zimbra-perl-libwww >= 6.13-1zimbra8.7b3ZAPPEND, zimbra-perl-net-http >= 6.09-1zimbra8.7b3ZAPPEND -Requires: zimbra-perl-io-socket-ssl >= 2.068-1zimbra8.7b2ZAPPEND, zimbra-perl-mozilla-ca +BuildRequires: zimbra-perl-base, zimbra-perl-libwww >= 6.13-1zimbra8.7b4ZAPPEND, zimbra-perl-net-http >= 6.09-1zimbra8.7b4ZAPPEND +BuildRequires: zimbra-perl-io-socket-ssl >= 2.083-1zimbra8.7b3ZAPPEND, zimbra-perl-mozilla-ca +Requires: zimbra-perl-base, zimbra-perl-libwww >= 6.13-1zimbra8.7b4ZAPPEND, zimbra-perl-net-http >= 6.09-1zimbra8.7b4ZAPPEND +Requires: zimbra-perl-io-socket-ssl >= 2.083-1zimbra8.7b3ZAPPEND, zimbra-perl-mozilla-ca AutoReqProv: no URL: https://metacpan.org/release/LWP-Protocol-https @@ -22,6 +22,8 @@ access sites using HTTP over SSL/TLS. %define debug_package %{nil} %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND +- Updated dependencies zimbra-perl-libwww,zimbra-perl-net-http,zimbra-perl-io-socket-ssl and upgraded LWP::Protocol::https to 6.10 * Sat Dec 05 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND - Updated dependencies zimbra-perl-libwww,zimbra-perl-net-http,zimbra-perl-io-socket-ssl * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND From a6cca80741c00461966fcfdf99031a5494b2e5db Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:09:36 +0000 Subject: [PATCH 20/48] ZBUG-3355:Updated dependency openssl-3.0.9 for perl-xml-parser --- .../zimbra-perl-xml-parser/debian/changelog | 6 ++++++ .../perl-xml-parser/zimbra-perl-xml-parser/debian/control | 4 ++-- .../zimbra-perl-xml-parser/rpm/SPECS/xml-parser.spec | 8 +++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/thirdparty/perl-xml-parser/zimbra-perl-xml-parser/debian/changelog b/thirdparty/perl-xml-parser/zimbra-perl-xml-parser/debian/changelog index a7cca8e98..022e8cf3e 100644 --- a/thirdparty/perl-xml-parser/zimbra-perl-xml-parser/debian/changelog +++ b/thirdparty/perl-xml-parser/zimbra-perl-xml-parser/debian/changelog @@ -1,3 +1,9 @@ +zimbra-perl-MODNORMNAME (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium + + * Updated dependency zimbra-perl-libwww + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-perl-MODNORMNAME (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium * Updated dependency zimbra-perl-libwww diff --git a/thirdparty/perl-xml-parser/zimbra-perl-xml-parser/debian/control b/thirdparty/perl-xml-parser/zimbra-perl-xml-parser/debian/control index c4d673d5b..49ef4947c 100644 --- a/thirdparty/perl-xml-parser/zimbra-perl-xml-parser/debian/control +++ b/thirdparty/perl-xml-parser/zimbra-perl-xml-parser/debian/control @@ -2,13 +2,13 @@ Source: zimbra-perl-MODNORMNAME Section: perl Priority: optional Maintainer: Zimbra Packaging Services -Build-Depends: debhelper (>= 9), zimbra-perl-base, libexpat1-dev, zimbra-perl-libwww (>= 6.13-1zimbra8.7b3ZAPPEND) +Build-Depends: debhelper (>= 9), zimbra-perl-base, libexpat1-dev, zimbra-perl-libwww (>= 6.13-1zimbra8.7b4ZAPPEND) Standards-Version: 3.9.5 Homepage: https://metacpan.org/release/MODNAME Package: zimbra-perl-MODNORMNAME Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-perl-base, libexpat1, - zimbra-perl-libwww (>= 6.13-1zimbra8.7b3ZAPPEND) + zimbra-perl-libwww (>= 6.13-1zimbra8.7b4ZAPPEND) Description: XML::Parser - A perl module for parsing XML documents This is a Perl extension interface to James Clark's XML parser, expat diff --git a/thirdparty/perl-xml-parser/zimbra-perl-xml-parser/rpm/SPECS/xml-parser.spec b/thirdparty/perl-xml-parser/zimbra-perl-xml-parser/rpm/SPECS/xml-parser.spec index 926f7fc75..c96403221 100644 --- a/thirdparty/perl-xml-parser/zimbra-perl-xml-parser/rpm/SPECS/xml-parser.spec +++ b/thirdparty/perl-xml-parser/zimbra-perl-xml-parser/rpm/SPECS/xml-parser.spec @@ -1,13 +1,13 @@ Summary: XML::Parser - A perl module for parsing XML documents Name: zimbra-perl-MODNORMNAME Version: VERSION -Release: 1zimbra8.7b3ZAPPEND +Release: 1zimbra8.7b4ZAPPEND License: GPL+ or Artistic Source: %{name}-%{version}.tar.gz Packager: Zimbra Packaging Services Group: Development/Languages -BuildRequires: zimbra-perl-base, expat-devel, zimbra-perl-libwww >= 6.13-1zimbra8.7b3ZAPPEND -Requires: zimbra-perl-base, expat, zimbra-perl-libwww >= 6.13-1zimbra8.7b3ZAPPEND +BuildRequires: zimbra-perl-base, expat-devel, zimbra-perl-libwww >= 6.13-1zimbra8.7b4ZAPPEND +Requires: zimbra-perl-base, expat, zimbra-perl-libwww >= 6.13-1zimbra8.7b4ZAPPEND AutoReqProv: no URL: https://metacpan.org/release/MODNAME @@ -17,6 +17,8 @@ This is a Perl extension interface to James Clark's XML parser, expat %define debug_package %{nil} %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND +- Updated zimbra-perl-libwww * Sat Dec 05 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND - Updated zimbra-perl-libwww * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND From 57f20771bc19b7e036d634aba9ffba0ed0ee3ab1 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:10:21 +0000 Subject: [PATCH 21/48] ZBUG-3355:Updated dependency openssl-3.0.9 for perl-soap-lite --- .../zimbra-perl-soap-lite/debian/changelog | 6 ++++++ .../zimbra-perl-soap-lite/debian/control | 10 +++++----- .../rpm/SPECS/soap-lite.spec | 16 +++++++++------- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/thirdparty/perl-soap-lite/zimbra-perl-soap-lite/debian/changelog b/thirdparty/perl-soap-lite/zimbra-perl-soap-lite/debian/changelog index 6fbc9a810..ba44bfb76 100644 --- a/thirdparty/perl-soap-lite/zimbra-perl-soap-lite/debian/changelog +++ b/thirdparty/perl-soap-lite/zimbra-perl-soap-lite/debian/changelog @@ -1,3 +1,9 @@ +zimbra-perl-MODNORMNAME (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium + + * Updated dependencies perl-io-socket-ssl, perl-lwp-protocol-https, perl-libwww, perl-xml-parser + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-perl-MODNORMNAME (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium * Updated dependencies perl-io-socket-ssl, perl-lwp-protocol-https, perl-libwww, perl-xml-parser diff --git a/thirdparty/perl-soap-lite/zimbra-perl-soap-lite/debian/control b/thirdparty/perl-soap-lite/zimbra-perl-soap-lite/debian/control index 09240ce10..f88c0bcd7 100644 --- a/thirdparty/perl-soap-lite/zimbra-perl-soap-lite/debian/control +++ b/thirdparty/perl-soap-lite/zimbra-perl-soap-lite/debian/control @@ -3,9 +3,9 @@ Section: perl Priority: optional Maintainer: Zimbra Packaging Services Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-perl-class-inspector, - zimbra-perl-io-compress, zimbra-perl-io-sessiondata, zimbra-perl-io-socket-ssl (>= 2.068-1zimbra8.7b2ZAPPEND), - zimbra-perl-lwp-protocol-https (>= 6.06-1zimbra8.7b3ZAPPEND), zimbra-perl-libwww (>= 6.13-1zimbra8.7b3ZAPPEND), zimbra-perl-task-weaken, - zimbra-perl-uri, zimbra-perl-xml-parser (>= 2.44-1zimbra8.7b3ZAPPEND), zimbra-perl-mime-tools + zimbra-perl-io-compress, zimbra-perl-io-sessiondata, zimbra-perl-io-socket-ssl (>= 2.083-1zimbra8.7b3ZAPPEND), + zimbra-perl-lwp-protocol-https (>= 6.10-1zimbra8.7b3ZAPPEND), zimbra-perl-libwww (>= 6.13-1zimbra8.7b4ZAPPEND), zimbra-perl-task-weaken, + zimbra-perl-uri, zimbra-perl-xml-parser (>= 2.44-1zimbra8.7b4ZAPPEND), zimbra-perl-mime-tools Standards-Version: 3.9.5 Homepage: https://metacpan.org/release/MODNAME @@ -13,8 +13,8 @@ Package: zimbra-perl-MODNORMNAME Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-perl-base, zimbra-perl-class-inspector, zimbra-perl-io-compress, zimbra-perl-io-sessiondata, - zimbra-perl-io-socket-ssl (>= 2.068-1zimbra8.7b2ZAPPEND), zimbra-perl-lwp-protocol-https (>= 6.06-1zimbra8.7b3ZAPPEND), zimbra-perl-libwww (>= 6.13-1zimbra8.7b3ZAPPEND), - zimbra-perl-task-weaken, zimbra-perl-uri, zimbra-perl-xml-parser (>= 2.44-1zimbra8.7b3ZAPPEND), zimbra-perl-mime-tools + zimbra-perl-io-socket-ssl (>= 2.083-1zimbra8.7b3ZAPPEND), zimbra-perl-lwp-protocol-https (>= 6.10-1zimbra8.7b3ZAPPEND), zimbra-perl-libwww (>= 6.13-1zimbra8.7b4ZAPPEND), + zimbra-perl-task-weaken, zimbra-perl-uri, zimbra-perl-xml-parser (>= 2.44-1zimbra8.7b4ZAPPEND), zimbra-perl-mime-tools Description: SOAP::Lite - Perl's Web Services Toolkit SOAP::Lite is a collection of Perl modules which provides a simple and lightweight interface to the Simple Object Access Protocol (SOAP) both diff --git a/thirdparty/perl-soap-lite/zimbra-perl-soap-lite/rpm/SPECS/soap-lite.spec b/thirdparty/perl-soap-lite/zimbra-perl-soap-lite/rpm/SPECS/soap-lite.spec index bbf2b9f9a..4629cc825 100644 --- a/thirdparty/perl-soap-lite/zimbra-perl-soap-lite/rpm/SPECS/soap-lite.spec +++ b/thirdparty/perl-soap-lite/zimbra-perl-soap-lite/rpm/SPECS/soap-lite.spec @@ -1,20 +1,20 @@ Summary: SOAP::Lite - Perl's Web Services Toolkit Name: zimbra-perl-MODNORMNAME Version: VERSION -Release: 1zimbra8.7b3ZAPPEND +Release: 1zimbra8.7b4ZAPPEND License: GPL+ or Artistic Source: %{name}-%{version}.tar.gz Packager: Zimbra Packaging Services Group: Development/Languages BuildRequires: zimbra-perl-base, zimbra-perl-class-inspector, zimbra-perl-io-compress -BuildRequires: zimbra-perl-io-sessiondata, zimbra-perl-io-socket-ssl >= 2.068-1zimbra8.7b2ZAPPEND -BuildRequires: zimbra-perl-lwp-protocol-https >= 6.06-1zimbra8.7b3ZAPPEND, zimbra-perl-libwww >= 6.13-1zimbra8.7b3ZAPPEND -BuildRequires: zimbra-perl-task-weaken, zimbra-perl-uri, zimbra-perl-xml-parser >= 2.44-1zimbra8.7b3ZAPPEND +BuildRequires: zimbra-perl-io-sessiondata, zimbra-perl-io-socket-ssl >= 2.083-1zimbra8.7b3ZAPPEND +BuildRequires: zimbra-perl-lwp-protocol-https >= 6.10-1zimbra8.7b3ZAPPEND, zimbra-perl-libwww >= 6.13-1zimbra8.7b4ZAPPEND +BuildRequires: zimbra-perl-task-weaken, zimbra-perl-uri, zimbra-perl-xml-parser >= 2.44-1zimbra8.7b4ZAPPEND BuildRequires: zimbra-perl-mime-tools, zimbra-perl-xml-parser-lite Requires: zimbra-perl-base, zimbra-perl-class-inspector, zimbra-perl-io-compress -Requires: zimbra-perl-io-sessiondata, zimbra-perl-io-socket-ssl >= 2.068-1zimbra8.7b2ZAPPEND -Requires: zimbra-perl-lwp-protocol-https >= 6.06-1zimbra8.7b3ZAPPEND, zimbra-perl-libwww >= 6.13-1zimbra8.7b3ZAPPEND -Requires: zimbra-perl-task-weaken, zimbra-perl-uri, zimbra-perl-xml-parser >= 2.44-1zimbra8.7b3ZAPPEND +Requires: zimbra-perl-io-sessiondata, zimbra-perl-io-socket-ssl >= 2.083-1zimbra8.7b3ZAPPEND +Requires: zimbra-perl-lwp-protocol-https >= 6.10-1zimbra8.7b3ZAPPEND, zimbra-perl-libwww >= 6.13-1zimbra8.7b4ZAPPEND +Requires: zimbra-perl-task-weaken, zimbra-perl-uri, zimbra-perl-xml-parser >= 2.44-1zimbra8.7b4ZAPPEND Requires: zimbra-perl-mime-tools, zimbra-perl-xml-parser-lite AutoReqProv: no URL: https://metacpan.org/release/MODNAME @@ -27,6 +27,8 @@ on client and server side. %define debug_package %{nil} %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND +- Updated dependencies perl-io-socket-ssl, perl-lwp-protocol-https, perl-libwww, perl-xml-parser * Sat Dec 05 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND - Updated dependencies perl-io-socket-ssl, perl-lwp-protocol-https, perl-libwww, perl-xml-parser * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND From 1140c9e2844f2011647672c4c8361315973ceaa1 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:10:58 +0000 Subject: [PATCH 22/48] ZBUG-3355:Updated dependency openssl-3.0.9 for perl-xml-sax-expat --- .../zimbra-perl-xml-sax-expat/debian/changelog | 6 ++++++ .../zimbra-perl-xml-sax-expat/debian/control | 4 ++-- .../rpm/SPECS/xml-sax-expat.spec | 8 +++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/thirdparty/perl-xml-sax-expat/zimbra-perl-xml-sax-expat/debian/changelog b/thirdparty/perl-xml-sax-expat/zimbra-perl-xml-sax-expat/debian/changelog index 401976b67..94f59b670 100644 --- a/thirdparty/perl-xml-sax-expat/zimbra-perl-xml-sax-expat/debian/changelog +++ b/thirdparty/perl-xml-sax-expat/zimbra-perl-xml-sax-expat/debian/changelog @@ -1,3 +1,9 @@ +zimbra-perl-MODNORMNAME (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium + + * Updated dependency zimbra-perl-xml-parser + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-perl-MODNORMNAME (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium * Updated dependency zimbra-perl-xml-parser diff --git a/thirdparty/perl-xml-sax-expat/zimbra-perl-xml-sax-expat/debian/control b/thirdparty/perl-xml-sax-expat/zimbra-perl-xml-sax-expat/debian/control index 4c8509ca1..92b15198b 100644 --- a/thirdparty/perl-xml-sax-expat/zimbra-perl-xml-sax-expat/debian/control +++ b/thirdparty/perl-xml-sax-expat/zimbra-perl-xml-sax-expat/debian/control @@ -3,14 +3,14 @@ Section: perl Priority: optional Maintainer: Zimbra Packaging Services Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-perl-xml-sax, - zimbra-perl-xml-parser (>= 2.44-1zimbra8.7b3ZAPPEND) + zimbra-perl-xml-parser (>= 2.44-1zimbra8.7b4ZAPPEND) Standards-Version: 3.9.5 Homepage: https://metacpan.org/release/MODNAME Package: zimbra-perl-MODNORMNAME Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-perl-base, - zimbra-perl-xml-sax, zimbra-perl-xml-parser (>= 2.44-1zimbra8.7b3ZAPPEND) + zimbra-perl-xml-sax, zimbra-perl-xml-parser (>= 2.44-1zimbra8.7b4ZAPPEND) Description: XML::SAX::Expat - SAX2 Driver for Expat (XML::Parser) This is an implementation of a SAX2 driver sitting on top of Expat (XML::Parser) diff --git a/thirdparty/perl-xml-sax-expat/zimbra-perl-xml-sax-expat/rpm/SPECS/xml-sax-expat.spec b/thirdparty/perl-xml-sax-expat/zimbra-perl-xml-sax-expat/rpm/SPECS/xml-sax-expat.spec index 80d75831b..a6e93e10e 100644 --- a/thirdparty/perl-xml-sax-expat/zimbra-perl-xml-sax-expat/rpm/SPECS/xml-sax-expat.spec +++ b/thirdparty/perl-xml-sax-expat/zimbra-perl-xml-sax-expat/rpm/SPECS/xml-sax-expat.spec @@ -1,13 +1,13 @@ Summary: XML::SAX::Expat - SAX2 Driver for Expat (XML::Parser) Name: zimbra-perl-MODNORMNAME Version: VERSION -Release: 1zimbra8.7b3ZAPPEND +Release: 1zimbra8.7b4ZAPPEND License: GPL+ or Artistic Source: %{name}-%{version}.tar.gz Packager: Zimbra Packaging Services Group: Development/Languages -BuildRequires: zimbra-perl-base, zimbra-perl-xml-sax, zimbra-perl-xml-parser >= 2.44-1zimbra8.7b3ZAPPEND -Requires: zimbra-perl-base, zimbra-perl-xml-sax, zimbra-perl-xml-parser >= 2.44-1zimbra8.7b3ZAPPEND +BuildRequires: zimbra-perl-base, zimbra-perl-xml-sax, zimbra-perl-xml-parser >= 2.44-1zimbra8.7b4ZAPPEND +Requires: zimbra-perl-base, zimbra-perl-xml-sax, zimbra-perl-xml-parser >= 2.44-1zimbra8.7b4ZAPPEND AutoReqProv: no URL: https://metacpan.org/release/MODNAME @@ -18,6 +18,8 @@ Expat (XML::Parser) %define debug_package %{nil} %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND +- Updated dependency zimbra-perl-xml-parser * Sat Dec 05 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND - Updated dependency zimbra-perl-xml-parser * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND From a64131d69a9eabf3d5c7f0003f5686e1ef2c08f2 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:11:29 +0000 Subject: [PATCH 23/48] ZBUG-3355:Updated dependency openssl-3.0.9 for perl-xml-simple --- .../zimbra-perl-xml-simple/debian/changelog | 6 ++++++ .../perl-xml-simple/zimbra-perl-xml-simple/debian/control | 4 ++-- .../zimbra-perl-xml-simple/rpm/SPECS/xml-simple.spec | 8 +++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/thirdparty/perl-xml-simple/zimbra-perl-xml-simple/debian/changelog b/thirdparty/perl-xml-simple/zimbra-perl-xml-simple/debian/changelog index b6e018750..b0e782cab 100644 --- a/thirdparty/perl-xml-simple/zimbra-perl-xml-simple/debian/changelog +++ b/thirdparty/perl-xml-simple/zimbra-perl-xml-simple/debian/changelog @@ -1,3 +1,9 @@ +zimbra-perl-MODNORMNAME (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium + + * Updated dependency zimbra-perl-xml-sax-expat + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-perl-MODNORMNAME (VERSION-1zimbra8.7b2ZAPPEND) unstable; urgency=medium * Updated dependency zimbra-perl-xml-sax-expat diff --git a/thirdparty/perl-xml-simple/zimbra-perl-xml-simple/debian/control b/thirdparty/perl-xml-simple/zimbra-perl-xml-simple/debian/control index f91091547..ae3d86515 100644 --- a/thirdparty/perl-xml-simple/zimbra-perl-xml-simple/debian/control +++ b/thirdparty/perl-xml-simple/zimbra-perl-xml-simple/debian/control @@ -2,13 +2,13 @@ Source: zimbra-perl-MODNORMNAME Section: perl Priority: optional Maintainer: Zimbra Packaging Services -Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-perl-xml-sax-expat (>= 0.51-1zimbra8.7b3ZAPPEND) +Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-perl-xml-sax-expat (>= 0.51-1zimbra8.7b4ZAPPEND) Standards-Version: 3.9.5 Homepage: https://metacpan.org/release/MODNAME Package: zimbra-perl-MODNORMNAME Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-perl-base, - zimbra-perl-xml-sax-expat (>= 0.51-1zimbra8.7b3ZAPPEND) + zimbra-perl-xml-sax-expat (>= 0.51-1zimbra8.7b4ZAPPEND) Description: XML::Simple - Easily read/write XML (esp config files) Easily read/write XML (esp config files) diff --git a/thirdparty/perl-xml-simple/zimbra-perl-xml-simple/rpm/SPECS/xml-simple.spec b/thirdparty/perl-xml-simple/zimbra-perl-xml-simple/rpm/SPECS/xml-simple.spec index 526fa477c..9c6321949 100644 --- a/thirdparty/perl-xml-simple/zimbra-perl-xml-simple/rpm/SPECS/xml-simple.spec +++ b/thirdparty/perl-xml-simple/zimbra-perl-xml-simple/rpm/SPECS/xml-simple.spec @@ -1,13 +1,13 @@ Summary: XML::Simple - Easily read/write XML (esp config files) Name: zimbra-perl-MODNORMNAME Version: VERSION -Release: 1zimbra8.7b2ZAPPEND +Release: 1zimbra8.7b3ZAPPEND License: GPL+ or Artistic Source: %{name}-%{version}.tar.gz Packager: Zimbra Packaging Services Group: Development/Languages -BuildRequires: zimbra-perl-base, zimbra-perl-xml-sax-expat >= 0.51-1zimbra8.7b3ZAPPEND -Requires: zimbra-perl-base, zimbra-perl-xml-sax-expat >= 0.51-1zimbra8.7b3ZAPPEND +BuildRequires: zimbra-perl-base, zimbra-perl-xml-sax-expat >= 0.51-1zimbra8.7b4ZAPPEND +Requires: zimbra-perl-base, zimbra-perl-xml-sax-expat >= 0.51-1zimbra8.7b4ZAPPEND AutoReqProv: no URL: https://metacpan.org/release/MODNAME @@ -17,6 +17,8 @@ Easily read/write XML (esp config files) %define debug_package %{nil} %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND +- Updated dependency zimbra-perl-xml-sax-expat * Sat Dec 05 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND - Updated dependency zimbra-perl-xml-sax-expat * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND From d7e3f56dcdd39a1b5f1afc848af6b4f3ab989810 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:12:13 +0000 Subject: [PATCH 24/48] ZBUG-3355:Updated dependency openssl-3.0.9 for perl-mail-dkim --- .../perl-mail-dkim/zimbra-perl-mail-dkim/debian/changelog | 6 ++++++ .../perl-mail-dkim/zimbra-perl-mail-dkim/debian/control | 4 ++-- .../zimbra-perl-mail-dkim/rpm/SPECS/mail-dkim.spec | 8 +++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/debian/changelog b/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/debian/changelog index 0d0b195d9..d50dfafa4 100644 --- a/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/debian/changelog +++ b/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/debian/changelog @@ -1,3 +1,9 @@ +zimbra-perl-MODNORMNAME (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium + + * Updated dependency zimbra-perl-crypt-openssl-rsa + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-perl-MODNORMNAME (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium * Updated dependency zimbra-perl-crypt-openssl-rsa diff --git a/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/debian/control b/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/debian/control index 1a94cd742..636d45063 100644 --- a/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/debian/control +++ b/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/debian/control @@ -2,14 +2,14 @@ Source: zimbra-perl-MODNORMNAME Section: perl Priority: optional Maintainer: Zimbra Packaging Services -Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-perl-crypt-openssl-rsa (>= 0.31-1zimbra8.7b2ZAPPEND), +Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-perl-crypt-openssl-rsa (>= 0.33-1zimbra8.8b1ZAPPEND), zimbra-perl-digest-sha1, zimbra-perl-net-dns, zimbra-perl-mailtools Standards-Version: 3.9.5 Homepage: https://metacpan.org/release/MODNAME Package: zimbra-perl-MODNORMNAME Architecture: all -Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-perl-base, zimbra-perl-crypt-openssl-rsa (>= 0.31-1zimbra8.7b2ZAPPEND), +Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-perl-base, zimbra-perl-crypt-openssl-rsa (>= 0.33-1zimbra8.8b1ZAPPEND), zimbra-perl-digest-sha1, zimbra-perl-net-dns, zimbra-perl-mailtools Description: Mail::DKIM - Signs/verifies Internet mail with DKIM/DomainKey signatures This module implements the various components of the DKIM and DomainKeys diff --git a/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/rpm/SPECS/mail-dkim.spec b/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/rpm/SPECS/mail-dkim.spec index 09bcd326b..751f6c645 100644 --- a/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/rpm/SPECS/mail-dkim.spec +++ b/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/rpm/SPECS/mail-dkim.spec @@ -1,15 +1,15 @@ Summary: Mail::DKIM - Signs/verifies Internet mail with DKIM/DomainKey signatures Name: zimbra-perl-MODNORMNAME Version: VERSION -Release: 1zimbra8.7b3ZAPPEND +Release: 1zimbra8.7b4ZAPPEND License: GPL+ or Artistic Source: %{name}-%{version}.tar.gz Patch0: public_key.patch Packager: Zimbra Packaging Services Group: Development/Languages -BuildRequires: zimbra-perl-base, zimbra-perl-crypt-openssl-rsa >= 0.31-1zimbra8.7b2ZAPPEND, zimbra-perl-digest-sha1 +BuildRequires: zimbra-perl-base, zimbra-perl-crypt-openssl-rsa >= 0.33-1zimbra8.8b1ZAPPEND, zimbra-perl-digest-sha1 BuildRequires: zimbra-perl-net-dns zimbra-perl-mailtools -Requires: zimbra-perl-base, zimbra-perl-crypt-openssl-rsa >= 0.31-1zimbra8.7b2ZAPPEND, zimbra-perl-digest-sha1 +Requires: zimbra-perl-base, zimbra-perl-crypt-openssl-rsa >= 0.33-1zimbra8.8b1ZAPPEND, zimbra-perl-digest-sha1 Requires: zimbra-perl-net-dns zimbra-perl-mailtools AutoReqProv: no URL: https://metacpan.org/release/MODNAME @@ -24,6 +24,8 @@ RFC4870, for DomainKeys %define debug_package %{nil} %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND +- Updated dependency zimbra-perl-crypt-openssl-rsa * Sat Dec 05 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND - Updated dependency zimbra-perl-crypt-openssl-rsa * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND From 060d62acdc180821a5dccffc0ed26c2cb3a95908 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:13:02 +0000 Subject: [PATCH 25/48] ZBUG-3355:Updated dependency openssl-3.0.9 for perl-mail-spamassassin --- .../zimbra-perl-mail-spamassassin/debian/changelog | 6 ++++++ .../zimbra-perl-mail-spamassassin/debian/control | 4 ++-- .../rpm/SPECS/mail-spamassassin.spec | 8 +++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/debian/changelog b/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/debian/changelog index ba35739e2..cc40fbe27 100644 --- a/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/debian/changelog +++ b/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/debian/changelog @@ -1,3 +1,9 @@ +zimbra-perl-MODNORMNAME (VERSION-1zimbra8.8b4ZAPPEND) unstable; urgency=medium + + * Updated dependency zimbra-perl-mail-dkim + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-perl-MODNORMNAME (VERSION-1zimbra8.8b3ZAPPEND) unstable; urgency=medium * Fix ZCS-11117, Upgraded spamassassin to 3.4.6 diff --git a/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/debian/control b/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/debian/control index 53b5903ca..691b34c8b 100644 --- a/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/debian/control +++ b/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Zimbra Packaging Services Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-perl-digest-sha1, zimbra-perl-net-dns, zimbra-perl-html-parser, zimbra-perl-io-compress, - zimbra-perl-mail-spf, zimbra-perl-mail-dkim (>= 0.40-1zimbra8.7b3ZAPPEND), zimbra-perl-netaddr-ip, + zimbra-perl-mail-spf, zimbra-perl-mail-dkim (>= 0.40-1zimbra8.7b4ZAPPEND), zimbra-perl-netaddr-ip, zimbra-perl-net-cidr-lite, zimbra-perl-encode-detect Standards-Version: 3.9.5 Homepage: https://metacpan.org/release/MODNAME @@ -14,7 +14,7 @@ Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-perl-base, zimbra-perl-digest-sha1, zimbra-perl-net-dns, zimbra-perl-html-parser, zimbra-perl-io-compress, - zimbra-perl-mail-spf, zimbra-perl-mail-dkim (>= 0.40-1zimbra8.7b3ZAPPEND), zimbra-perl-netaddr-ip, + zimbra-perl-mail-spf, zimbra-perl-mail-dkim (>= 0.40-1zimbra8.7b4ZAPPEND), zimbra-perl-netaddr-ip, zimbra-perl-net-cidr-lite, zimbra-perl-encode-detect, zimbra-mta-base Description: Mail::SpamAssassin - Spam detector and markup engine Mail::SpamAssassin is a module to identify spam using several methods diff --git a/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/rpm/SPECS/mail-spamassassin.spec b/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/rpm/SPECS/mail-spamassassin.spec index ceb030ac4..0119e5c23 100644 --- a/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/rpm/SPECS/mail-spamassassin.spec +++ b/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/rpm/SPECS/mail-spamassassin.spec @@ -1,18 +1,18 @@ Summary: Mail::SpamAssassin - Spam detector and markup engine Name: zimbra-perl-MODNORMNAME Version: VERSION -Release: 1zimbra8.8b3ZAPPEND +Release: 1zimbra8.8b4ZAPPEND License: Apache-2.0 Source: %{name}-%{version}.tar.gz Packager: Zimbra Packaging Services Group: Development/Languages BuildRequires: zimbra-perl-base, zimbra-perl-digest-sha1, zimbra-perl-net-dns BuildRequires: zimbra-perl-html-parser, zimbra-perl-io-compress, zimbra-perl-mail-spf -BuildRequires: zimbra-perl-mail-dkim >= 0.40-1zimbra8.7b3ZAPPEND, zimbra-perl-netaddr-ip, zimbra-perl-net-cidr-lite +BuildRequires: zimbra-perl-mail-dkim >= 0.40-1zimbra8.7b4ZAPPEND, zimbra-perl-netaddr-ip, zimbra-perl-net-cidr-lite BuildRequires: zimbra-perl-encode-detect Requires: zimbra-perl-base, zimbra-perl-digest-sha1, zimbra-perl-net-dns Requires: zimbra-perl-html-parser, zimbra-perl-io-compress, zimbra-perl-mail-spf -Requires: zimbra-perl-mail-dkim >= 0.40-1zimbra8.7b3ZAPPEND, zimbra-perl-netaddr-ip, zimbra-perl-net-cidr-lite +Requires: zimbra-perl-mail-dkim >= 0.40-1zimbra8.7b4ZAPPEND, zimbra-perl-netaddr-ip, zimbra-perl-net-cidr-lite Requires: zimbra-perl-encode-detect, zimbra-mta-base AutoReqProv: no URL: https://metacpan.org/release/MODNAME @@ -23,6 +23,8 @@ including text analysis, internet-based realtime blacklists, statistical analysis, and internet-based hashing algorithms. %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - VERSION-1zimbra8.8b4ZAPPEND +- Updated dependency zimbra-perl-mail-dkim * Mon Mar 28 2022 Zimbra Packaging Services - VERSION-1zimbra8.8b3ZAPPEND - Fix ZCS-11117, Upgraded spamassassin to 3.4.6 * Thu Apr 08 2021 Zimbra Packaging Services - VERSION-1zimbra8.8b3ZAPPEND From 8cf76b427f0ccab9ecbd8ea5b4a9cb1d324e84a8 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:14:00 +0000 Subject: [PATCH 26/48] ZBUG-3355:Updated spamassassin-rules --- .../zimbra-spamassassin-rules/debian/changelog | 6 ++++++ .../zimbra-spamassassin-rules/debian/control | 2 +- .../rpm/SPECS/spamassassin-rules.spec | 6 ++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/thirdparty/spamassassin-rules/zimbra-spamassassin-rules/debian/changelog b/thirdparty/spamassassin-rules/zimbra-spamassassin-rules/debian/changelog index de8cd94bb..cb76f231c 100644 --- a/thirdparty/spamassassin-rules/zimbra-spamassassin-rules/debian/changelog +++ b/thirdparty/spamassassin-rules/zimbra-spamassassin-rules/debian/changelog @@ -1,3 +1,9 @@ +zimbra-spamassassin-rules (1.0.0-1zimbra8.8b6ZAPPEND) unstable; urgency=low + + * Updated spamassassin + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-spamassassin-rules (1.0.0-1zimbra8.8b5ZAPPEND) unstable; urgency=low * Fix ZCS-11117, Upgraded spamassassin to 3.4.6 diff --git a/thirdparty/spamassassin-rules/zimbra-spamassassin-rules/debian/control b/thirdparty/spamassassin-rules/zimbra-spamassassin-rules/debian/control index 2d0ff0bd5..a36112d22 100644 --- a/thirdparty/spamassassin-rules/zimbra-spamassassin-rules/debian/control +++ b/thirdparty/spamassassin-rules/zimbra-spamassassin-rules/debian/control @@ -8,6 +8,6 @@ Standards-Version: 3.9.5 Package: zimbra-spamassassin-rules Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, - zimbra-mta-base, zimbra-perl-mail-spamassassin (>= 3.4.6-1zimbra8.8b3ZAPPEND) + zimbra-mta-base, zimbra-perl-mail-spamassassin (>= 3.4.6-1zimbra8.8b4ZAPPEND) Description: Default ruleset for SpamAssassin Default ruleset for SpamAssassin diff --git a/thirdparty/spamassassin-rules/zimbra-spamassassin-rules/rpm/SPECS/spamassassin-rules.spec b/thirdparty/spamassassin-rules/zimbra-spamassassin-rules/rpm/SPECS/spamassassin-rules.spec index 8b2291d9a..151cfff24 100644 --- a/thirdparty/spamassassin-rules/zimbra-spamassassin-rules/rpm/SPECS/spamassassin-rules.spec +++ b/thirdparty/spamassassin-rules/zimbra-spamassassin-rules/rpm/SPECS/spamassassin-rules.spec @@ -1,9 +1,9 @@ Summary: Default ruleset for SpamAssassin Name: zimbra-spamassassin-rules Version: 1.0.0 -Release: 1zimbra8.8b5ZAPPEND +Release: 1zimbra8.8b6ZAPPEND License: Apache-2.0 -Requires: zimbra-mta-base, zimbra-perl-mail-spamassassin >= 3.4.6-1zimbra8.8b3ZAPPEND +Requires: zimbra-mta-base, zimbra-perl-mail-spamassassin >= 3.4.6-1zimbra8.8b4ZAPPEND Packager: Zimbra Packaging Services Group: Development/Languages AutoReqProv: no @@ -14,6 +14,8 @@ AutoReqProv: no Default ruleset for SpamAssassin %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - VERSION-1zimbra8.8b6ZAPPEND +- Updated spamassassin * Mon Mar 28 2022 Zimbra Packaging Services - VERSION-1zimbra8.8b5ZAPPEND - Fix ZCS-11117, Upgraded spamassassin to 3.4.6 * Wed Apr 08 2021 Zimbra Packaging Services - VERSION-1zimbra8.8b4ZAPPEND From 07360bb309a7d913076ffea62124e0d9771a101d Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:14:35 +0000 Subject: [PATCH 27/48] ZBUG-3355:Updated perl-innotop --- .../perl-innotop/zimbra-perl-innotop/debian/changelog | 6 ++++++ .../perl-innotop/zimbra-perl-innotop/debian/control | 4 ++-- .../zimbra-perl-innotop/rpm/SPECS/innotop.spec | 8 +++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/thirdparty/perl-innotop/zimbra-perl-innotop/debian/changelog b/thirdparty/perl-innotop/zimbra-perl-innotop/debian/changelog index b00e1bb58..e118b89a0 100644 --- a/thirdparty/perl-innotop/zimbra-perl-innotop/debian/changelog +++ b/thirdparty/perl-innotop/zimbra-perl-innotop/debian/changelog @@ -1,3 +1,9 @@ +zimbra-perl-MODNORMNAME (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium + + * Updated dependency perl-dbd-mysql + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-perl-MODNORMNAME (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium * Updated dependency perl-dbd-mysql diff --git a/thirdparty/perl-innotop/zimbra-perl-innotop/debian/control b/thirdparty/perl-innotop/zimbra-perl-innotop/debian/control index 329d91322..4c19cc8ba 100644 --- a/thirdparty/perl-innotop/zimbra-perl-innotop/debian/control +++ b/thirdparty/perl-innotop/zimbra-perl-innotop/debian/control @@ -2,7 +2,7 @@ Source: zimbra-perl-MODNORMNAME Section: perl Priority: optional Maintainer: Zimbra Packaging Services -Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-perl-dbd-mysql (>= 4.050-1zimbra8.7b4ZAPPEND), +Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-perl-dbd-mysql (>= 4.050-1zimbra8.7b5ZAPPEND), zimbra-perl-term-readkey Standards-Version: 3.9.5 Homepage: https://metacpan.org/release/MODNAME @@ -10,7 +10,7 @@ Homepage: https://metacpan.org/release/MODNAME Package: zimbra-perl-MODNORMNAME Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-perl-base, - zimbra-perl-dbd-mysql (>= 4.050-1zimbra8.7b4ZAPPEND), zimbra-perl-term-readkey + zimbra-perl-dbd-mysql (>= 4.050-1zimbra8.7b5ZAPPEND), zimbra-perl-term-readkey Description: innotop - mariadb monitor innotop monitors MySQL/MariaDB servers. Each of its modes shows you a different aspect of what's happening in the server. For example, there's a mode for monitoring diff --git a/thirdparty/perl-innotop/zimbra-perl-innotop/rpm/SPECS/innotop.spec b/thirdparty/perl-innotop/zimbra-perl-innotop/rpm/SPECS/innotop.spec index e97823f76..a040d5529 100644 --- a/thirdparty/perl-innotop/zimbra-perl-innotop/rpm/SPECS/innotop.spec +++ b/thirdparty/perl-innotop/zimbra-perl-innotop/rpm/SPECS/innotop.spec @@ -1,14 +1,14 @@ Summary: innotop - mariadb monitor Name: zimbra-perl-MODNORMNAME Version: VERSION -Release: 1zimbra8.7b3ZAPPEND +Release: 1zimbra8.7b4ZAPPEND License: GPL-2 Source: %{name}-%{version}.tar.gz Patch0: inno.patch Packager: Zimbra Packaging Services Group: Development/Languages -BuildRequires: zimbra-perl-base, zimbra-perl-dbd-mysql >= 4.050-1zimbra8.7b4ZAPPEND, zimbra-perl-term-readkey -Requires: zimbra-perl-base, zimbra-perl-dbd-mysql >= 4.050-1zimbra8.7b4ZAPPEND, zimbra-perl-term-readkey +BuildRequires: zimbra-perl-base, zimbra-perl-dbd-mysql >= 4.050-1zimbra8.7b5ZAPPEND, zimbra-perl-term-readkey +Requires: zimbra-perl-base, zimbra-perl-dbd-mysql >= 4.050-1zimbra8.7b5ZAPPEND, zimbra-perl-term-readkey AutoReqProv: no URL: https://github.com/innotop/innotop @@ -21,6 +21,8 @@ data periodically, so you see an updating view. %define debug_package %{nil} %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND +- Updated dependency perl-dbd-mysql * Sat Dec 05 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b3ZAPPEND - Updated dependency perl-dbd-mysql * Thu Sep 10 2020 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND From e9a5b7f6cf19c15838e5bdd9480d1ab68d543ef6 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:15:06 +0000 Subject: [PATCH 28/48] ZBUG-3355:Updated httpd --- thirdparty/httpd/zimbra-httpd/debian/changelog | 6 ++++++ thirdparty/httpd/zimbra-httpd/debian/control | 4 ++-- thirdparty/httpd/zimbra-httpd/rpm/SPECS/httpd.spec | 10 ++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/thirdparty/httpd/zimbra-httpd/debian/changelog b/thirdparty/httpd/zimbra-httpd/debian/changelog index 0191db401..1a63547fb 100644 --- a/thirdparty/httpd/zimbra-httpd/debian/changelog +++ b/thirdparty/httpd/zimbra-httpd/debian/changelog @@ -1,3 +1,9 @@ +zimbra-httpd (VERSION-1zimbra8.7b5ZAPPEND) unstable; urgency=medium + + * Updated dependency zimbra-apr-util + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-httpd (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium * ZBUG-3354, Upgraded Apache to 2.4.57 diff --git a/thirdparty/httpd/zimbra-httpd/debian/control b/thirdparty/httpd/zimbra-httpd/debian/control index c369e2cde..e0bb7ce48 100644 --- a/thirdparty/httpd/zimbra-httpd/debian/control +++ b/thirdparty/httpd/zimbra-httpd/debian/control @@ -1,6 +1,6 @@ Source: zimbra-httpd Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), - zimbra-apr-dev, zimbra-apr-util-dev (>= 1.6.1-1zimbra8.7b2ZAPPEND), + zimbra-apr-dev, zimbra-apr-util-dev (>= 1.6.1-1zimbra8.7b3ZAPPEND), libz-dev, libpcre2-dev Section: utils Priority: optional @@ -21,7 +21,7 @@ Priority: optional Architecture: any Multi-Arch: same Depends: zimbra-httpd (= ${binary:Version}), ${misc:Depends}, zimbra-apr-dev, - zimbra-apr-util-dev (>= 1.6.1-1zimbra8.7b2ZAPPEND) + zimbra-apr-util-dev (>= 1.6.1-1zimbra8.7b3ZAPPEND) Description: Apache HTTPD development pieces Package: zimbra-httpd-dbg diff --git a/thirdparty/httpd/zimbra-httpd/rpm/SPECS/httpd.spec b/thirdparty/httpd/zimbra-httpd/rpm/SPECS/httpd.spec index e679f73d9..5e67a6ab0 100644 --- a/thirdparty/httpd/zimbra-httpd/rpm/SPECS/httpd.spec +++ b/thirdparty/httpd/zimbra-httpd/rpm/SPECS/httpd.spec @@ -1,15 +1,15 @@ Summary: Zimbra's Apache HTTPD build Name: zimbra-httpd Version: VERSION -Release: 1zimbra8.7b4ZAPPEND +Release: 1zimbra8.7b5ZAPPEND License: Apache-2.0 Source: %{name}-%{version}.tar.bz2 BuildRequires: zimbra-apr-devel -BuildRequires: zimbra-apr-util-devel >= 1.6.1-1zimbra8.7b2ZAPPEND +BuildRequires: zimbra-apr-util-devel >= 1.6.1-1zimbra8.7b3ZAPPEND BuildRequires: zlib-devel BuildRequires: pcre2-devel Requires: zlib, pcre2 -Requires: zimbra-apr-libs, zimbra-apr-util-libs >= 1.6.1-1zimbra8.7b2ZAPPEND, zimbra-apache-base +Requires: zimbra-apr-libs, zimbra-apr-util-libs >= 1.6.1-1zimbra8.7b3ZAPPEND, zimbra-apache-base AutoReqProv: no URL: http://httpd.apache.org/ @@ -19,6 +19,8 @@ The Zimbra Apache HTTPD build %define debug_package %{nil} %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b5ZAPPEND +- Updated dependency zimbra-apr-util * Mon Apr 17 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND - ZBUG-3354, Upgraded Apache to 2.4.57 * Wed Nov 23 2022 Zimbra Packaging Services - VERSION-1zimbra8.7b4ZAPPEND @@ -68,7 +70,7 @@ mv ${RPM_BUILD_ROOT}/OZC/conf/magic ${RPM_BUILD_ROOT}/opt/zimbra/data/httpd/conf Summary: Apache HTTPD Development Requires: zimbra-httpd = %{version}-%{release} Requires: zimbra-apr-devel -Requires: zimbra-apr-util-devel >= 1.6.1-1zimbra8.7b2ZAPPEND +Requires: zimbra-apr-util-devel >= 1.6.1-1zimbra8.7b3ZAPPEND AutoReqProv: no %description devel From c5ae171cc08b5af31cff10f2b073bab758a8a12f Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:16:15 +0000 Subject: [PATCH 29/48] ZBUG-3355:Updated perl-net-ldapapi --- .../zimbra-perl-net-ldapapi/debian/changelog | 6 ++++++ .../zimbra-perl-net-ldapapi/debian/control | 6 +++--- .../rpm/SPECS/net-ldapapi.spec | 11 +++++++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/thirdparty/perl-net-ldapapi/zimbra-perl-net-ldapapi/debian/changelog b/thirdparty/perl-net-ldapapi/zimbra-perl-net-ldapapi/debian/changelog index 7c71debe7..afff68a51 100644 --- a/thirdparty/perl-net-ldapapi/zimbra-perl-net-ldapapi/debian/changelog +++ b/thirdparty/perl-net-ldapapi/zimbra-perl-net-ldapapi/debian/changelog @@ -1,3 +1,9 @@ +zimbra-perl-MODNORMNAME (VERSION-1zimbra8.7b2ZAPPEND) unstable; urgency=low + + * Updated openldap, cyrus-sasl + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-perl-MODNORMNAME (VERSION-ITERATIONZAPPEND) unstable; urgency=low * Initial Release. diff --git a/thirdparty/perl-net-ldapapi/zimbra-perl-net-ldapapi/debian/control b/thirdparty/perl-net-ldapapi/zimbra-perl-net-ldapapi/debian/control index 77f5295b2..cc1325023 100644 --- a/thirdparty/perl-net-ldapapi/zimbra-perl-net-ldapapi/debian/control +++ b/thirdparty/perl-net-ldapapi/zimbra-perl-net-ldapapi/debian/control @@ -2,15 +2,15 @@ Source: zimbra-perl-MODNORMNAME Section: perl Priority: optional Maintainer: Zimbra Packaging Services -Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-openldap-dev, - zimbra-cyrus-sasl-dev, zimbra-perl-convert-asn1 +Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-openldap-dev (>= 2.4.59-1zimbra8.8b6ZAPPEND), + zimbra-cyrus-sasl-dev (>= 2.1.28-1zimbra8.7b4ZAPPEND), zimbra-perl-convert-asn1 Standards-Version: 3.9.5 Homepage: https://metacpan.org/release/MODNAME Package: zimbra-perl-MODNORMNAME Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-perl-base, - zimbra-perl-convert-asn1, zimbra-openldap-lib + zimbra-perl-convert-asn1, zimbra-openldap-lib (>= 2.4.59-1zimbra8.8b6ZAPPEND) Description: Net::LDAPapi - Perl5 Module Supporting LDAP API This module allows Perl programmers to access and manipulate an LDAP based Directory. diff --git a/thirdparty/perl-net-ldapapi/zimbra-perl-net-ldapapi/rpm/SPECS/net-ldapapi.spec b/thirdparty/perl-net-ldapapi/zimbra-perl-net-ldapapi/rpm/SPECS/net-ldapapi.spec index d2cd23a09..8e2868ab3 100644 --- a/thirdparty/perl-net-ldapapi/zimbra-perl-net-ldapapi/rpm/SPECS/net-ldapapi.spec +++ b/thirdparty/perl-net-ldapapi/zimbra-perl-net-ldapapi/rpm/SPECS/net-ldapapi.spec @@ -1,14 +1,14 @@ Summary: Net::LDAPapi - Perl5 Module Supporting LDAP API Name: zimbra-perl-MODNORMNAME Version: VERSION -Release: ITERATIONZAPPEND +Release: 1zimbra8.7b2ZAPPEND License: GPL+ or Artistic Source: %{name}-%{version}.tar.gz Packager: Zimbra Packaging Services Group: Development/Languages -BuildRequires: zimbra-perl-base, zimbra-openldap-devel, zimbra-cyrus-sasl-devel +BuildRequires: zimbra-perl-base, zimbra-openldap-devel >= 2.4.59-1zimbra8.8b6ZAPPEND, zimbra-cyrus-sasl-devel >= 2.1.28-1zimbra8.7b4ZAPPEND BuildRequires: zimbra-perl-convert-asn1 -Requires: zimbra-perl-base, zimbra-openldap-libs, zimbra-perl-convert-asn1 +Requires: zimbra-perl-base, zimbra-openldap-libs >= 2.4.59-1zimbra8.8b6ZAPPEND, zimbra-perl-convert-asn1 AutoReqProv: no URL: https://metacpan.org/release/MODNAME @@ -17,6 +17,9 @@ This module allows Perl programmers to access and manipulate an LDAP based Directory. %define debug_package %{nil} +%changelog +* Tue Jun 13 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND +- Updated openldap, cyrus-sasl %prep %setup -n MODNAME-%{version} @@ -34,7 +37,7 @@ perl -I OZCL/perl5 Makefile.PL INSTALL_BASE=OZC \ # $(DESTINSTALLSITEARCH)/perllocal.pod %define perl_archname %(perl -MConfig -e 'print $Config{archname}') %install -make install DESTDIR=${RPM_BUILD_ROOT} +LD_RUN_PATH=OZCL make DESTDIR=${RPM_BUILD_ROOT} install rm -f %{buildroot}OZCL/perl5/%{perl_archname}/perllocal.pod rm -f %{buildroot}OZCL/perl5/%{perl_archname}/auto/*/*/.packlist From 5c677f73a835b5e8d8dcbd8bee6b62f32b1b2c3d Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:17:12 +0000 Subject: [PATCH 30/48] ZBUG-3355:updated perl to 1.0.8 --- zimbra/perl/zimbra-perl/debian/changelog | 9 ++++++ zimbra/perl/zimbra-perl/debian/control | 25 +++++++++-------- zimbra/perl/zimbra-perl/rpm/SPECS/perl.spec | 31 ++++++++++++--------- 3 files changed, 40 insertions(+), 25 deletions(-) diff --git a/zimbra/perl/zimbra-perl/debian/changelog b/zimbra/perl/zimbra-perl/debian/changelog index 8d324caf2..c1e0f9926 100644 --- a/zimbra/perl/zimbra-perl/debian/changelog +++ b/zimbra/perl/zimbra-perl/debian/changelog @@ -1,3 +1,12 @@ +zimbra-perl (1.0.8-1zimbra8.7b1ZAPPEND) unstable; urgency=medium + + * Updated perl-net-ssleay, perl-dbd-mysql, perl-crypt-openssl-random + * Updated perl-crypt-openssl-rsa, perl-io-socket-ssl, perl-net-http + * Updated perl-libwww, perl-lwp-protocol-https, perl-xml-parser + * Updated perl-soap-lite, perl-xml-sax-expat, perl-xml-simple, perl-mail-dkim, perl-innotop + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-perl (1.0.7-1zimbra8.7b1ZAPPEND) unstable; urgency=medium * Upgraded Date-Manip to 6.90 diff --git a/zimbra/perl/zimbra-perl/debian/control b/zimbra/perl/zimbra-perl/debian/control index 22c68bf6c..72492577b 100644 --- a/zimbra/perl/zimbra-perl/debian/control +++ b/zimbra/perl/zimbra-perl/debian/control @@ -12,30 +12,31 @@ Depends: zimbra-perl-base, zimbra-perl-archive-zip, zimbra-perl-berkeleydb, zimbra-perl-carp-clan, zimbra-perl-class-inspector, zimbra-perl-compress-raw-bzip2, zimbra-perl-compress-raw-zlib (>= 2.103-1zimbra8.7b1ZAPPEND), zimbra-perl-config-inifiles, zimbra-perl-convert-asn1, zimbra-perl-convert-binhex, zimbra-perl-convert-tnef, zimbra-perl-convert-uulib, - zimbra-perl-crypt-openssl-random (>= 0.11-1zimbra8.7b3ZAPPEND), zimbra-perl-crypt-openssl-rsa (>= 0.31-1zimbra8.7b2ZAPPEND), + zimbra-perl-crypt-openssl-random (>= 0.11-1zimbra8.7b4ZAPPEND), zimbra-perl-crypt-openssl-rsa (>= 0.33-1zimbra8.8b1ZAPPEND), zimbra-perl-crypt-saltedhash, - zimbra-perl-data-uuid, zimbra-perl-date-calc, zimbra-perl-date-manip (>= 6.90-1zimbra8.7b1ZAPPEND), zimbra-perl-dbd-mysql (>= 4.050-1zimbra8.7b4ZAPPEND), + zimbra-perl-data-uuid, zimbra-perl-date-calc, zimbra-perl-date-manip (>= 6.90-1zimbra8.7b1ZAPPEND), zimbra-perl-dbd-mysql (>= 4.050-1zimbra8.7b5ZAPPEND), zimbra-perl-dbd-sqlite, zimbra-perl-db-file, zimbra-perl-dbi, zimbra-perl-digest-hmac, zimbra-perl-digest-sha1, zimbra-perl-email-date-format, zimbra-perl-encode-detect, zimbra-perl-encode-locale, zimbra-perl-error, zimbra-perl-exporter-tiny, zimbra-perl-zmq-libzmq3, zimbra-perl-file-grep, zimbra-perl-file-libmagic, zimbra-perl-file-listing, zimbra-perl-filesys-df, zimbra-perl-file-tail, zimbra-perl-geography-countries, zimbra-perl-html-parser, zimbra-perl-http-cookies, zimbra-perl-http-daemon, - zimbra-perl-http-date, zimbra-perl-http-message, zimbra-perl-http-negotiate, zimbra-perl-innotop (>= 1.9.1-1zimbra8.7b3ZAPPEND), + zimbra-perl-http-date, zimbra-perl-http-message, zimbra-perl-http-negotiate, zimbra-perl-innotop (>= 1.9.1-1zimbra8.7b4ZAPPEND), zimbra-perl-io-compress, zimbra-perl-io-html, zimbra-perl-io-sessiondata, zimbra-perl-io-socket-inet6, - zimbra-perl-io-socket-ip, zimbra-perl-io-socket-ssl (>= 2.068-1zimbra8.7b2ZAPPEND), zimbra-perl-io-stringy, zimbra-perl-ip-country, + zimbra-perl-io-socket-ip, zimbra-perl-io-socket-ssl (>= 2.083-1zimbra8.7b3ZAPPEND), zimbra-perl-io-stringy, zimbra-perl-ip-country, zimbra-perl-json-pp, - zimbra-perl-libwww (>= 6.13-1zimbra8.7b3ZAPPEND), zimbra-perl-list-moreutils, zimbra-perl-lwp-mediatypes, - zimbra-perl-lwp-protocol-https (>= 6.06-1zimbra8.7b3ZAPPEND), - zimbra-perl-mail-dkim (>= 0.40-1zimbra8.7b3ZAPPEND), zimbra-perl-mail-spf, zimbra-perl-mailtools, zimbra-perl-math-bigint, zimbra-perl-mime-lite, + zimbra-perl-libwww (>= 6.13-1zimbra8.7b4ZAPPEND), zimbra-perl-list-moreutils, zimbra-perl-lwp-mediatypes, + zimbra-perl-lwp-protocol-https (>= 6.10-1zimbra8.7b3ZAPPEND), + zimbra-perl-mail-dkim (>= 0.40-1zimbra8.7b4ZAPPEND), zimbra-perl-mail-spf, zimbra-perl-mailtools, zimbra-perl-math-bigint, zimbra-perl-mime-lite, zimbra-perl-mime-tools, zimbra-perl-mime-types, zimbra-perl-mozilla-ca, zimbra-perl-netaddr-ip, zimbra-perl-net-cidr, zimbra-perl-net-cidr-lite, zimbra-perl-net-dns, zimbra-perl-net-dns-resolver-programmable, - zimbra-perl-net-http (>= 6.09-1zimbra8.7b3ZAPPEND), zimbra-perl-net-ldap, zimbra-perl-net-ldapapi, zimbra-perl-net-libidn, zimbra-perl-net-server, - zimbra-perl-net-ssleay (>= 1.88-1zimbra8.7b2ZAPPEND), zimbra-perl-parent, zimbra-perl-proc-processtable, - zimbra-perl-soap-lite (>= 1.19-1zimbra8.7b3ZAPPEND), zimbra-perl-socket, + zimbra-perl-net-http (>= 6.09-1zimbra8.7b4ZAPPEND), zimbra-perl-net-ldap, zimbra-perl-net-ldapapi (>= 3.0.3-1zimbra8.7b2ZAPPEND), zimbra-perl-net-libidn, + zimbra-perl-net-server, + zimbra-perl-net-ssleay (>= 1.92-1zimbra8.8b1ZAPPEND), zimbra-perl-parent, zimbra-perl-proc-processtable, + zimbra-perl-soap-lite (>= 1.19-1zimbra8.7b4ZAPPEND), zimbra-perl-socket, zimbra-perl-socket-linux, zimbra-perl-swatchdog, zimbra-perl-task-weaken, zimbra-perl-term-readkey, zimbra-perl-timedate, zimbra-perl-unix-getrusage, zimbra-perl-unix-syslog, zimbra-perl-uri, zimbra-perl-www-robotrules, - zimbra-perl-xml-namespacesupport, zimbra-perl-xml-parser (>= 2.44-1zimbra8.7b3ZAPPEND), zimbra-perl-xml-parser-lite, zimbra-perl-xml-sax, - zimbra-perl-xml-sax-base, zimbra-perl-xml-sax-expat (>= 0.51-1zimbra8.7b3ZAPPEND), zimbra-perl-xml-simple (>= 2.25-1zimbra8.7b2ZAPPEND), + zimbra-perl-xml-namespacesupport, zimbra-perl-xml-parser (>= 2.44-1zimbra8.7b4ZAPPEND), zimbra-perl-xml-parser-lite, zimbra-perl-xml-sax, + zimbra-perl-xml-sax-base, zimbra-perl-xml-sax-expat (>= 0.51-1zimbra8.7b4ZAPPEND), zimbra-perl-xml-simple (>= 2.25-1zimbra8.7b3ZAPPEND), zimbra-perl-zmq-constants Description: Zimbra Perl Zimbra Perl is a meta package that can be used to install most all diff --git a/zimbra/perl/zimbra-perl/rpm/SPECS/perl.spec b/zimbra/perl/zimbra-perl/rpm/SPECS/perl.spec index a7dd01056..f10c91cc4 100644 --- a/zimbra/perl/zimbra-perl/rpm/SPECS/perl.spec +++ b/zimbra/perl/zimbra-perl/rpm/SPECS/perl.spec @@ -1,6 +1,6 @@ Summary: Zimbra Perl Name: zimbra-perl -Version: 1.0.7 +Version: 1.0.8 Release: 1zimbra8.7b1ZAPPEND License: GPL-2 Packager: Zimbra Packaging Services @@ -10,34 +10,35 @@ Requires: zimbra-perl-bit-vector, zimbra-perl-cache-fastmmap, zimbra-perl- Requires: zimbra-perl-carp-clan, zimbra-perl-class-inspector, zimbra-perl-compress-raw-bzip2 Requires: zimbra-perl-compress-raw-zlib >= 2.103-1zimbra8.7b1ZAPPEND, zimbra-perl-config-inifiles, zimbra-perl-convert-asn1 Requires: zimbra-perl-convert-binhex, zimbra-perl-convert-tnef, zimbra-perl-convert-uulib -Requires: zimbra-perl-crypt-openssl-random >= 0.11-1zimbra8.7b3ZAPPEND, zimbra-perl-crypt-openssl-rsa >= 0.31-1zimbra8.7b2ZAPPEND +Requires: zimbra-perl-crypt-openssl-random >= 0.11-1zimbra8.7b4ZAPPEND, zimbra-perl-crypt-openssl-rsa >= 0.33-1zimbra8.8b1ZAPPEND Requires: zimbra-perl-crypt-saltedhash Requires: zimbra-perl-data-uuid, zimbra-perl-date-calc, zimbra-perl-date-manip >= 6.90-1zimbra8.7b1ZAPPEND -Requires: zimbra-perl-dbd-mysql >= 4.050-1zimbra8.7b4ZAPPEND +Requires: zimbra-perl-dbd-mysql >= 4.050-1zimbra8.7b5ZAPPEND Requires: zimbra-perl-dbd-sqlite, zimbra-perl-db-file, zimbra-perl-dbi, zimbra-perl-digest-hmac Requires: zimbra-perl-digest-sha1, zimbra-perl-email-date-format, zimbra-perl-encode-detect Requires: zimbra-perl-encode-locale, zimbra-perl-error, zimbra-perl-exporter-tiny, zimbra-perl-zmq-libzmq3 Requires: zimbra-perl-file-grep, zimbra-perl-file-libmagic, zimbra-perl-file-listing, zimbra-perl-filesys-df Requires: zimbra-perl-file-tail, zimbra-perl-geography-countries, zimbra-perl-html-parser, zimbra-perl-http-cookies Requires: zimbra-perl-http-daemon, zimbra-perl-http-date, zimbra-perl-http-message, zimbra-perl-http-negotiate -Requires: zimbra-perl-innotop >= 1.9.1-1zimbra8.7b3ZAPPEND +Requires: zimbra-perl-innotop >= 1.9.1-1zimbra8.7b4ZAPPEND Requires: zimbra-perl-io-compress, zimbra-perl-io-html, zimbra-perl-io-sessiondata, zimbra-perl-io-socket-inet6 -Requires: zimbra-perl-io-socket-ip, zimbra-perl-io-socket-ssl >= 2.068-1zimbra8.7b2ZAPPEND, zimbra-perl-io-stringy, zimbra-perl-ip-country +Requires: zimbra-perl-io-socket-ip, zimbra-perl-io-socket-ssl >= 2.083-1zimbra8.7b3ZAPPEND, zimbra-perl-io-stringy, zimbra-perl-ip-country Requires: zimbra-perl-json-pp -Requires: zimbra-perl-libwww >= 6.13-1zimbra8.7b3ZAPPEND, zimbra-perl-list-moreutils, zimbra-perl-lwp-mediatypes -Requires: zimbra-perl-lwp-protocol-https >= 6.06-1zimbra8.7b3ZAPPEND -Requires: zimbra-perl-mail-dkim >= 0.40-1zimbra8.7b3ZAPPEND, zimbra-perl-mail-spf, zimbra-perl-mailtools, zimbra-perl-math-bigint +Requires: zimbra-perl-libwww >= 6.13-1zimbra8.7b4ZAPPEND, zimbra-perl-list-moreutils, zimbra-perl-lwp-mediatypes +Requires: zimbra-perl-lwp-protocol-https >= 6.10-1zimbra8.7b3ZAPPEND +Requires: zimbra-perl-mail-dkim >= 0.40-1zimbra8.7b4ZAPPEND, zimbra-perl-mail-spf, zimbra-perl-mailtools, zimbra-perl-math-bigint Requires: zimbra-perl-mime-lite Requires: zimbra-perl-mime-tools, zimbra-perl-mime-types, zimbra-perl-mozilla-ca, zimbra-perl-netaddr-ip Requires: zimbra-perl-net-cidr, zimbra-perl-net-cidr-lite, zimbra-perl-net-dns, zimbra-perl-net-dns-resolver-programmable -Requires: zimbra-perl-net-http >= 6.09-1zimbra8.7b3ZAPPEND, zimbra-perl-net-ldap, zimbra-perl-net-ldapapi, zimbra-perl-net-libidn +Requires: zimbra-perl-net-http >= 6.09-1zimbra8.7b4ZAPPEND, zimbra-perl-net-ldap, zimbra-perl-net-ldapapi >= 3.0.3-1zimbra8.7b2ZAPPEND +Requires: zimbra-perl-net-libidn Requires: zimbra-perl-net-server -Requires: zimbra-perl-net-ssleay >= 1.88-1zimbra8.7b2ZAPPEND, zimbra-perl-parent, zimbra-perl-proc-processtable -Requires: zimbra-perl-soap-lite >= 1.19-1zimbra8.7b3ZAPPEND, zimbra-perl-socket +Requires: zimbra-perl-net-ssleay >= 1.92-1zimbra8.8b1ZAPPEND, zimbra-perl-parent, zimbra-perl-proc-processtable +Requires: zimbra-perl-soap-lite >= 1.19-1zimbra8.7b4ZAPPEND, zimbra-perl-socket Requires: zimbra-perl-socket-linux, zimbra-perl-swatchdog, zimbra-perl-task-weaken, zimbra-perl-term-readkey, zimbra-perl-timedate Requires: zimbra-perl-unix-getrusage, zimbra-perl-unix-syslog, zimbra-perl-uri, zimbra-perl-www-robotrules -Requires: zimbra-perl-xml-namespacesupport, zimbra-perl-xml-parser >= 2.44-1zimbra8.7b3ZAPPEND, zimbra-perl-xml-parser-lite, zimbra-perl-xml-sax -Requires: zimbra-perl-xml-sax-base, zimbra-perl-xml-sax-expat >= 0.51-1zimbra8.7b3ZAPPEND, zimbra-perl-xml-simple >= 2.25-1zimbra8.7b2ZAPPEND +Requires: zimbra-perl-xml-namespacesupport, zimbra-perl-xml-parser >= 2.44-1zimbra8.7b4ZAPPEND, zimbra-perl-xml-parser-lite, zimbra-perl-xml-sax +Requires: zimbra-perl-xml-sax-base, zimbra-perl-xml-sax-expat >= 0.51-1zimbra8.7b4ZAPPEND, zimbra-perl-xml-simple >= 2.25-1zimbra8.7b3ZAPPEND Requires: zimbra-perl-zmq-constants AutoReqProv: no @@ -49,6 +50,10 @@ of the Zimbra required perl modules. The current sole exception is the Mail::SpamAssassin module, as that is for MTA nodes only %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - 1.0.8 +- Updated perl-net-ssleay, perl-dbd-mysql, perl-crypt-openssl-random, perl-crypt-openssl-rsa, perl-io-socket-ssl +- Updated perl-net-http, perl-libwww, perl-lwp-protocol-https, perl-xml-parser, perl-soap-lite, perl-xml-sax-expat +- Updated perl-xml-simple, perl-mail-dkim, perl-innotop * Tue Feb 07 2023 Zimbra Packaging Services - 1.0.7 - Upgraded Date-Manip to 6.90 * Thu Jan 19 2023 Zimbra Packaging Services - 1.0.6 From e964bb36a2fa7dfbd9bf2459f077bf47dc05c087 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:17:49 +0000 Subject: [PATCH 31/48] ZBUG-3355:Updated dependency openssl-3.0.9 for nginx --- thirdparty/nginx/zimbra-nginx/debian/changelog | 6 ++++++ thirdparty/nginx/zimbra-nginx/debian/control | 2 +- thirdparty/nginx/zimbra-nginx/rpm/SPECS/nginx.spec | 12 +++++++----- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/thirdparty/nginx/zimbra-nginx/debian/changelog b/thirdparty/nginx/zimbra-nginx/debian/changelog index 8462abf7e..8a6c12723 100644 --- a/thirdparty/nginx/zimbra-nginx/debian/changelog +++ b/thirdparty/nginx/zimbra-nginx/debian/changelog @@ -1,3 +1,9 @@ +zimbra-nginx (VERSION-1zimbra8.8b4ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Upgraded OpenSSL to 3.0.9 + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-nginx (VERSION-1zimbra8.8b3ZAPPEND) unstable; urgency=medium * Fix ZBUG-2738 diff --git a/thirdparty/nginx/zimbra-nginx/debian/control b/thirdparty/nginx/zimbra-nginx/debian/control index 0f5dfed6f..905cde355 100644 --- a/thirdparty/nginx/zimbra-nginx/debian/control +++ b/thirdparty/nginx/zimbra-nginx/debian/control @@ -1,6 +1,6 @@ Source: zimbra-nginx Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), libpcre3-dev, libz-dev, - zimbra-openssl-dev (>= 1.1.1h-1zimbra8.7b3ZAPPEND), zimbra-cyrus-sasl-dev (>= 2.1.26-1zimbra8.7b3ZAPPEND) + zimbra-openssl-dev (>= 3.0.9-1zimbra8.8b1ZAPPEND), zimbra-cyrus-sasl-dev (>= 2.1.28-1zimbra8.7b4ZAPPEND) Section: utils Priority: optional Maintainer: Zimbra Packaging Services diff --git a/thirdparty/nginx/zimbra-nginx/rpm/SPECS/nginx.spec b/thirdparty/nginx/zimbra-nginx/rpm/SPECS/nginx.spec index a2a8440e0..706338689 100644 --- a/thirdparty/nginx/zimbra-nginx/rpm/SPECS/nginx.spec +++ b/thirdparty/nginx/zimbra-nginx/rpm/SPECS/nginx.spec @@ -1,15 +1,15 @@ Summary: Zimbra's nginx build Name: zimbra-nginx Version: VERSION -Release: 1zimbra8.8b3ZAPPEND +Release: 1zimbra8.8b4ZAPPEND License: MIT Source: %{name}-%{version}.tar.gz BuildRequires: pcre-devel, zlib-devel -BuildRequires: zimbra-openssl-devel >= 1.1.1h-1zimbra8.7b3ZAPPEND -BuildRequires: zimbra-cyrus-sasl-devel >= 2.1.26-1zimbra8.7b3ZAPPEND +BuildRequires: zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND +BuildRequires: zimbra-cyrus-sasl-devel >= 2.1.28-1zimbra8.7b4ZAPPEND Requires: pcre, zlib -Requires: zimbra-openssl-libs >= 1.1.1h-1zimbra8.7b3ZAPPEND -Requires: zimbra-cyrus-sasl-libs >= 2.1.26-1zimbra8.7b3ZAPPEND, zimbra-proxy-base +Requires: zimbra-openssl-libs >= 3.0.9-1zimbra8.8b1ZAPPEND +Requires: zimbra-cyrus-sasl-libs >= 2.1.28-1zimbra8.7b4ZAPPEND, zimbra-proxy-base AutoReqProv: no URL: http://nginx.org @@ -17,6 +17,8 @@ URL: http://nginx.org The Zimbra nginx build %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - VERSION-1zimbra8.8b4ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 * Fri May 06 2022 Zimbra Packaging Services - VERSION-1zimbra8.8b3ZAPPEND - Fix ZBUG-2738 * Wed Jul 07 2021 Zimbra Packaging Services - VERSION-1zimbra8.8b2ZAPPEND From c34909d63ed3c7f6f7662feebfe0388f6d08889a Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:18:35 +0000 Subject: [PATCH 32/48] ZBUG-3355:Updated dependency openssl-3.0.9 for erlang --- thirdparty/erlang/zimbra-erlang/debian/changelog | 6 ++++++ thirdparty/erlang/zimbra-erlang/debian/control | 4 ++-- thirdparty/erlang/zimbra-erlang/rpm/SPECS/erlang.spec | 8 +++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/thirdparty/erlang/zimbra-erlang/debian/changelog b/thirdparty/erlang/zimbra-erlang/debian/changelog index 09d02eb72..cee657e4c 100644 --- 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 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 index f834f5670..49a8fdee0 100644 --- 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 @@ -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 index 4a0331f22..a860a15ba 100644 --- 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 - VERSION-1zimbra8.8b2ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 * Mon Aug 08 2022 Zimbra Packaging Services - VERSION-1zimbra8.8b1ZAPPEND - Initial Release. From 05102a441bfbd39377ed1f598e925571b47964e9 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:19:16 +0000 Subject: [PATCH 33/48] ZBUG-3355:Updated dependency openssl-3.0.9 for rabbitmq-server --- .../zimbra-rabbitmq-server/debian/changelog | 6 ++++++ .../zimbra-rabbitmq-server/debian/control | 4 ++-- .../rpm/SPECS/rabbitmq-server.spec | 10 ++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/thirdparty/rabbitmq-server/zimbra-rabbitmq-server/debian/changelog b/thirdparty/rabbitmq-server/zimbra-rabbitmq-server/debian/changelog index 749da71c1..e875bf7c4 100644 --- a/thirdparty/rabbitmq-server/zimbra-rabbitmq-server/debian/changelog +++ b/thirdparty/rabbitmq-server/zimbra-rabbitmq-server/debian/changelog @@ -1,3 +1,9 @@ +zimbra-rabbitmq-server (VERSION-1zimbra8.8b2ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Upgraded OpenSSL to 3.0.9 + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-rabbitmq-server (VERSION-1zimbra8.8b1ZAPPEND) unstable; urgency=medium * Initial Release. diff --git a/thirdparty/rabbitmq-server/zimbra-rabbitmq-server/debian/control b/thirdparty/rabbitmq-server/zimbra-rabbitmq-server/debian/control index 996a7308e..709ac6f5f 100644 --- a/thirdparty/rabbitmq-server/zimbra-rabbitmq-server/debian/control +++ b/thirdparty/rabbitmq-server/zimbra-rabbitmq-server/debian/control @@ -1,5 +1,5 @@ Source: zimbra-rabbitmq-server -Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-erlang (>= 25.0.3-1zimbra8.8b1ZAPPEND), zimbra-openssl-dev (>= 1.1.1q-1zimbra8.7b4ZAPPEND), zip, rsync, gzip, sed +Build-Depends: debhelper (>= 9), m4, dpkg-dev (>= 1.15.7), zimbra-erlang (>= 25.0.3-1zimbra8.8b2ZAPPEND), zimbra-openssl-dev (>= 3.0.9-1zimbra8.8b1ZAPPEND), zip, rsync, gzip, sed Section: utils Priority: optional Maintainer: Zimbra Packaging Services @@ -10,5 +10,5 @@ Homepage: https://www.rabbitmq.com/ Package: zimbra-rabbitmq-server Priority: optional Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, zimbra-erlang (>= 25.0.3-1zimbra8.8b1ZAPPEND) +Depends: ${shlibs:Depends}, ${misc:Depends}, zimbra-erlang (>= 25.0.3-1zimbra8.8b2ZAPPEND) Description: The Zimbra's RabbitMQ server diff --git a/thirdparty/rabbitmq-server/zimbra-rabbitmq-server/rpm/SPECS/rabbitmq-server.spec b/thirdparty/rabbitmq-server/zimbra-rabbitmq-server/rpm/SPECS/rabbitmq-server.spec index 02f35a500..9ee8e9418 100644 --- a/thirdparty/rabbitmq-server/zimbra-rabbitmq-server/rpm/SPECS/rabbitmq-server.spec +++ b/thirdparty/rabbitmq-server/zimbra-rabbitmq-server/rpm/SPECS/rabbitmq-server.spec @@ -1,7 +1,7 @@ Summary: Zimbra's RabbitMQ server Name: zimbra-rabbitmq-server Version: VERSION -Release: 1zimbra8.8b1ZAPPEND +Release: 1zimbra8.8b2ZAPPEND License: MPLv2.0 and MIT and ASL 2.0 and BSD Source: %{name}-%{version}.tar.xz Source1: rabbitmq-env.conf @@ -9,10 +9,10 @@ Patch0: rabbitmq-script-wrapper.patch Packager: Zimbra Packaging Services AutoReqProv: no URL: https://github.com/rabbitmq/rabbitmq-server -BuildRequires: zimbra-erlang >= 25.0.3-1zimbra8.8b1ZAPPEND -BuildRequires: zimbra-openssl-devel >= 1.1.1q-1zimbra8.7b4ZAPPEND, zimbra-openssl-libs >= 1.1.1q-1zimbra8.7b4ZAPPEND +BuildRequires: zimbra-erlang >= 25.0.3-1zimbra8.8b2ZAPPEND +BuildRequires: zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND, zimbra-openssl-libs >= 3.0.9-1zimbra8.8b1ZAPPEND BuildRequires: gzip, sed, zip, rsync -Requires: zimbra-erlang >= 25.0.3-1zimbra8.8b1ZAPPEND +Requires: zimbra-erlang >= 25.0.3-1zimbra8.8b2ZAPPEND %description @@ -22,6 +22,8 @@ The Zimbra's RabbitMQ server %define debug_package %{nil} %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - VERSION-1zimbra8.8b2ZAPPEND +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 * Mon Aug 08 2022 Zimbra Packaging Services - VERSION-1zimbra8.8b1ZAPPEND - Initial Release. From 2216624ab1937c347ebd5ac83885017391974489 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 10:20:18 +0000 Subject: [PATCH 34/48] ZBUG-3355:updated core-components to 3.0.19 --- .../zimbra-core-components/debian/changelog | 6 ++++++ .../zimbra-core-components/debian/control | 8 ++++---- .../rpm/SPECS/core-components.spec | 14 ++++++++------ 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/zimbra/core-components/zimbra-core-components/debian/changelog b/zimbra/core-components/zimbra-core-components/debian/changelog index 5de53c70c..eb3afcb69 100644 --- a/zimbra/core-components/zimbra-core-components/debian/changelog +++ b/zimbra/core-components/zimbra-core-components/debian/changelog @@ -1,3 +1,9 @@ +zimbra-core-components (3.0.19-1zimbra8.8b1ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Upgraded OpenSSL to 3.0.9 and Updated core-components to 3.0.19 + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-core-components (3.0.18-1zimbra8.8b1ZAPPEND) unstable; urgency=medium * Fix ZBUG-3278, Upgraded OpenSSL to 1.1.1t diff --git a/zimbra/core-components/zimbra-core-components/debian/control b/zimbra/core-components/zimbra-core-components/debian/control index 012902cd6..160a1c360 100644 --- a/zimbra/core-components/zimbra-core-components/debian/control +++ b/zimbra/core-components/zimbra-core-components/debian/control @@ -8,11 +8,11 @@ Standards-Version: 3.9.5 Package: zimbra-core-components Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, - zimbra-base, zimbra-os-requirements (>= 1.0.2-1zimbra8.7b1ZAPPEND), zimbra-perl (>= 1.0.7-1zimbra8.7b1ZAPPEND), zimbra-pflogsumm, - zimbra-openssl (>= 1.1.1t-1zimbra8.7b4ZAPPEND), zimbra-curl (>= 7.49.1-1zimbra8.7b3ZAPPEND), zimbra-cyrus-sasl (>= 2.1.28-1zimbra8.7b3ZAPPEND), + zimbra-base, zimbra-os-requirements (>= 1.0.2-1zimbra8.7b1ZAPPEND), zimbra-perl (>= 1.0.8-1zimbra8.7b1ZAPPEND), zimbra-pflogsumm, + zimbra-openssl (>= 3.0.9-1zimbra8.8b1ZAPPEND), zimbra-curl (>= 7.49.1-1zimbra8.7b4ZAPPEND), zimbra-cyrus-sasl (>= 2.1.28-1zimbra8.7b4ZAPPEND), zimbra-rsync, - zimbra-mariadb-lib (>= 10.1.25-1zimbra8.7b3ZAPPEND), zimbra-openldap-client (>= 2.4.59-1zimbra8.8b5ZAPPEND), zimbra-prepflog, - zimbra-tcmalloc-lib, zimbra-perl-innotop (>= 1.9.1-1zimbra8.7b3ZAPPEND), zimbra-openjdk (>= 17.0.2-1zimbra8.8b1ZAPPEND), + zimbra-mariadb-lib (>= 10.1.25-1zimbra8.7b3ZAPPEND), zimbra-openldap-client (>= 2.4.59-1zimbra8.8b6ZAPPEND), zimbra-prepflog, + zimbra-tcmalloc-lib, zimbra-perl-innotop (>= 1.9.1-1zimbra8.7b4ZAPPEND), zimbra-openjdk (>= 17.0.2-1zimbra8.8b1ZAPPEND), zimbra-openjdk-cacerts (>= 1.0.8-1zimbra8.7b1ZAPPEND), zimbra-osl (>= 2.0.0-1zimbra9.0b1ZAPPEND), zimbra-amavis-logwatch, zimbra-postfix-logwatch (>= 1.40.03-1zimbra8.7b1ZAPPEND), zimbra-rrdtool Description: Zimbra components for core package diff --git a/zimbra/core-components/zimbra-core-components/rpm/SPECS/core-components.spec b/zimbra/core-components/zimbra-core-components/rpm/SPECS/core-components.spec index 7e7e695d8..349eed950 100644 --- a/zimbra/core-components/zimbra-core-components/rpm/SPECS/core-components.spec +++ b/zimbra/core-components/zimbra-core-components/rpm/SPECS/core-components.spec @@ -1,16 +1,16 @@ Summary: Zimbra components for core package Name: zimbra-core-components -Version: 3.0.18 +Version: 3.0.19 Release: 1zimbra8.8b1ZAPPEND License: GPL-2 -Requires: zimbra-base, zimbra-os-requirements >= 1.0.2-1zimbra8.7b1ZAPPEND, zimbra-perl >= 1.0.7-1zimbra8.7b1ZAPPEND +Requires: zimbra-base, zimbra-os-requirements >= 1.0.2-1zimbra8.7b1ZAPPEND, zimbra-perl >= 1.0.8-1zimbra8.7b1ZAPPEND Requires: zimbra-pflogsumm -Requires: zimbra-openssl >= 1.1.1t-1zimbra8.7b4ZAPPEND,zimbra-curl >= 7.49.1-1zimbra8.7b3ZAPPEND -Requires: zimbra-cyrus-sasl >= 2.1.28-1zimbra8.7b3ZAPPEND +Requires: zimbra-openssl >= 3.0.9-1zimbra8.8b1ZAPPEND,zimbra-curl >= 7.49.1-1zimbra8.7b4ZAPPEND +Requires: zimbra-cyrus-sasl >= 2.1.28-1zimbra8.7b4ZAPPEND Requires: zimbra-rsync -Requires: zimbra-mariadb-libs >= 10.1.25-1zimbra8.7b3ZAPPEND, zimbra-openldap-client >= 2.4.59-1zimbra8.8b5ZAPPEND +Requires: zimbra-mariadb-libs >= 10.1.25-1zimbra8.7b3ZAPPEND, zimbra-openldap-client >= 2.4.59-1zimbra8.8b6ZAPPEND Requires: zimbra-osl >= 2.0.0-1zimbra9.0b1ZAPPEND -Requires: zimbra-prepflog, zimbra-tcmalloc-libs, zimbra-perl-innotop >= 1.9.1-1zimbra8.7b3ZAPPEND +Requires: zimbra-prepflog, zimbra-tcmalloc-libs, zimbra-perl-innotop >= 1.9.1-1zimbra8.7b4ZAPPEND Requires: zimbra-openjdk >= 17.0.2-1zimbra8.8b1ZAPPEND, zimbra-openjdk-cacerts >= 1.0.8-1zimbra8.7b1ZAPPEND Requires: zimbra-amavis-logwatch Requires: zimbra-postfix-logwatch >= 1.40.03-1zimbra8.7b1ZAPPEND, zimbra-rrdtool @@ -21,6 +21,8 @@ AutoReqProv: no %define debug_package %{nil} %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - 3.0.19 +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 and Updated core-components to 3.0.19 * Fri Feb 10 2023 Zimbra Packaging Services - 3.0.18 - Fix ZBUG-3278, upgraded OpenSSL to 1.1.1t and updated core-components to 3.0.18 * Tue Feb 07 2023 Zimbra Packaging Services - 3.0.17 From 553b877a45d21e0c9c52b9bb6566fc6e8746daff Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 11:02:26 +0000 Subject: [PATCH 35/48] ZBUG-3355:updated ldap-components to 2.0.13 --- .../zimbra-ldap-components/debian/changelog | 6 ++++++ .../zimbra-ldap-components/debian/control | 2 +- .../rpm/SPECS/ldap-components.spec | 12 +++++++----- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/zimbra/ldap-components/zimbra-ldap-components/debian/changelog b/zimbra/ldap-components/zimbra-ldap-components/debian/changelog index 0a2013df2..ed1e5bc38 100644 --- a/zimbra/ldap-components/zimbra-ldap-components/debian/changelog +++ b/zimbra/ldap-components/zimbra-ldap-components/debian/changelog @@ -1,3 +1,9 @@ +zimbra-ldap-components (2.0.13-1zimbra8.8b1ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Upgraded OpenSSL to 3.0.9 and Updated core-components to 3.0.19 + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-ldap-components (2.0.12-1zimbra8.8b1ZAPPEND) unstable; urgency=medium * Fix ZBUG-3278, upgraded OpenSSL to 1.1.1t and updated core-components to 3.0.18 diff --git a/zimbra/ldap-components/zimbra-ldap-components/debian/control b/zimbra/ldap-components/zimbra-ldap-components/debian/control index 112e42fd5..0c0fe97ef 100644 --- a/zimbra/ldap-components/zimbra-ldap-components/debian/control +++ b/zimbra/ldap-components/zimbra-ldap-components/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.9.5 Package: zimbra-ldap-components Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, - zimbra-ldap-base, zimbra-lmdb (>= 2.4.59-1zimbra8.8b5ZAPPEND), zimbra-openldap-server (>= 2.4.59-1zimbra8.8b5ZAPPEND), zimbra-openssl (>= 1.1.1t-1zimbra8.7b4ZAPPEND), zimbra-openssl-lib (>= 1.1.1t-1zimbra8.7b4ZAPPEND), zimbra-core-components (>= 3.0.18-1zimbra8.8b1ZAPPEND) + zimbra-ldap-base, zimbra-lmdb (>= 2.4.59-1zimbra8.8b6ZAPPEND), zimbra-openldap-server (>= 2.4.59-1zimbra8.8b6ZAPPEND), zimbra-openssl (>= 3.0.9-1zimbra8.8b1ZAPPEND), zimbra-openssl-lib (>= 3.0.9-1zimbra8.8b1ZAPPEND), zimbra-core-components (>= 3.0.19-1zimbra8.8b1ZAPPEND) Description: Zimbra components for ldap package Zimbra ldap components pulls in all the packages used by zimbra-ldap diff --git a/zimbra/ldap-components/zimbra-ldap-components/rpm/SPECS/ldap-components.spec b/zimbra/ldap-components/zimbra-ldap-components/rpm/SPECS/ldap-components.spec index d704998f1..502cbdbab 100644 --- a/zimbra/ldap-components/zimbra-ldap-components/rpm/SPECS/ldap-components.spec +++ b/zimbra/ldap-components/zimbra-ldap-components/rpm/SPECS/ldap-components.spec @@ -1,12 +1,12 @@ Summary: Zimbra components for ldap package Name: zimbra-ldap-components -Version: 2.0.12 +Version: 2.0.13 Release: ITERATIONZAPPEND License: GPL-2 -Requires: zimbra-ldap-base, zimbra-lmdb >= 2.4.59-1zimbra8.8b5ZAPPEND -Requires: zimbra-openldap-server >= 2.4.59-1zimbra8.8b5ZAPPEND -Requires: zimbra-openssl >= 1.1.1t-1zimbra8.7b4ZAPPEND, zimbra-openssl-libs >= 1.1.1t-1zimbra8.7b4ZAPPEND -Requires: zimbra-core-components >= 3.0.18-1zimbra8.8b1ZAPPEND +Requires: zimbra-ldap-base, zimbra-lmdb >= 2.4.59-1zimbra8.8b6ZAPPEND +Requires: zimbra-openldap-server >= 2.4.59-1zimbra8.8b6ZAPPEND +Requires: zimbra-openssl >= 3.0.9-1zimbra8.8b1ZAPPEND, zimbra-openssl-libs >= 3.0.9-1zimbra8.8b1ZAPPEND +Requires: zimbra-core-components >= 3.0.19-1zimbra8.8b1ZAPPEND Packager: Zimbra Packaging Services Group: Development/Languages AutoReqProv: no @@ -18,6 +18,8 @@ Zimbra ldap components pulls in all the packages used by zimbra-ldap %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - 2.0.13 +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 and Updated core-components to 3.0.19 * Fri Feb 10 2023 Zimbra Packaging Services - 2.0.12 - Fix ZBUG-3278, upgraded OpenSSL to 1.1.1t and updated core-components to 3.0.18 * Tue Feb 07 2023 Zimbra Packaging Services - 2.0.11 From 31c02286e6a32c8af87f6d8d5a642e5f2ec34710 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 11:03:02 +0000 Subject: [PATCH 36/48] ZBUG-3355:updated apache-components to 2.0.11 --- .../zimbra-apache-components/debian/changelog | 6 ++++++ .../zimbra-apache-components/debian/control | 2 +- .../rpm/SPECS/apache-components.spec | 6 ++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/zimbra/apache-components/zimbra-apache-components/debian/changelog b/zimbra/apache-components/zimbra-apache-components/debian/changelog index d825c7afb..1e4285e86 100644 --- a/zimbra/apache-components/zimbra-apache-components/debian/changelog +++ b/zimbra/apache-components/zimbra-apache-components/debian/changelog @@ -1,3 +1,9 @@ +zimbra-apache-components (2.0.11-1zimbra8.8b1ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Upgraded OpenSSL to 3.0.9 and Updated zimbra-httpd + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-apache-components (2.0.10-1zimbra8.8b1ZAPPEND) unstable; urgency=medium * ZBUG-3354, Upgraded Apache to 2.4.57 diff --git a/zimbra/apache-components/zimbra-apache-components/debian/control b/zimbra/apache-components/zimbra-apache-components/debian/control index 8c9592c7a..f403281ac 100644 --- a/zimbra/apache-components/zimbra-apache-components/debian/control +++ b/zimbra/apache-components/zimbra-apache-components/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.9.5 Package: zimbra-apache-components Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, - zimbra-apache-base, zimbra-httpd (>= 2.4.57-1zimbra8.7b4ZAPPEND), zimbra-php (>= 7.4.27-1zimbra8.7b3ZAPPEND) + zimbra-apache-base, zimbra-httpd (>= 2.4.57-1zimbra8.7b5ZAPPEND), zimbra-php (>= 7.4.27-1zimbra8.7b3ZAPPEND) Description: Zimbra components for apache package Zimbra apache components pulls in all the packages used by zimbra-apache diff --git a/zimbra/apache-components/zimbra-apache-components/rpm/SPECS/apache-components.spec b/zimbra/apache-components/zimbra-apache-components/rpm/SPECS/apache-components.spec index 05d139046..5ed5ca9cd 100644 --- a/zimbra/apache-components/zimbra-apache-components/rpm/SPECS/apache-components.spec +++ b/zimbra/apache-components/zimbra-apache-components/rpm/SPECS/apache-components.spec @@ -1,9 +1,9 @@ Summary: Zimbra components for apache package Name: zimbra-apache-components -Version: 2.0.10 +Version: 2.0.11 Release: 1zimbra8.8b1ZAPPEND License: GPL-2 -Requires: zimbra-apache-base, zimbra-httpd >= 2.4.57-1zimbra8.7b4ZAPPEND, zimbra-php >= 7.4.27-1zimbra8.7b3ZAPPEND +Requires: zimbra-apache-base, zimbra-httpd >= 2.4.57-1zimbra8.7b5ZAPPEND, zimbra-php >= 7.4.27-1zimbra8.7b3ZAPPEND Packager: Zimbra Packaging Services Group: Development/Languages AutoReqProv: no @@ -15,6 +15,8 @@ Zimbra apache components pulls in all the packages used by zimbra-apache %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - 2.0.11 +- ZBUG-3355, Upgraded OpenSSL to 3.0.9 and Updated zimbra-httpd * Mon Apr 17 2023 Zimbra Packaging Services - 2.0.10 - ZBUG-3354, Upgraded Apache to 2.4.57 * Wed Nov 23 2022 Zimbra Packaging Services - 2.0.9 From 067854b43be7131c76da52b75b3a8ab7ac1e71d3 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 11:03:36 +0000 Subject: [PATCH 37/48] ZBUG-3355:updated dnscache-components to 1.0.5 --- .../zimbra-dnscache-components/debian/changelog | 6 ++++++ .../zimbra-dnscache-components/debian/control | 2 +- .../rpm/SPECS/dnscache-components.spec | 6 ++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/zimbra/dnscache-components/zimbra-dnscache-components/debian/changelog b/zimbra/dnscache-components/zimbra-dnscache-components/debian/changelog index e737fe3ac..401ff4a74 100644 --- a/zimbra/dnscache-components/zimbra-dnscache-components/debian/changelog +++ b/zimbra/dnscache-components/zimbra-dnscache-components/debian/changelog @@ -1,3 +1,9 @@ +zimbra-dnscache-components (1.0.5-1zimbra8.7b1ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Upgraded zimbra-unbound to 1.17.1 + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-dnscache-components (1.0.4-1zimbra8.7b1ZAPPEND) unstable; urgency=medium * Fix ZCS-11941, Updated zimbra-unbound diff --git a/zimbra/dnscache-components/zimbra-dnscache-components/debian/control b/zimbra/dnscache-components/zimbra-dnscache-components/debian/control index 67af168d8..ad19e5e80 100644 --- a/zimbra/dnscache-components/zimbra-dnscache-components/debian/control +++ b/zimbra/dnscache-components/zimbra-dnscache-components/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.9.5 Package: zimbra-dnscache-components Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, - zimbra-dnscache-base, zimbra-unbound (>= 1.11.0-1zimbra8.7b4ZAPPEND) + zimbra-dnscache-base, zimbra-unbound (>= 1.17.1-1zimbra8.8b1ZAPPEND) Description: Zimbra components for dnscache package Zimbra dnscache components pulls in all the packages used by zimbra-dnscache diff --git a/zimbra/dnscache-components/zimbra-dnscache-components/rpm/SPECS/dnscache-components.spec b/zimbra/dnscache-components/zimbra-dnscache-components/rpm/SPECS/dnscache-components.spec index 5fa3b0a45..72c9a8e3c 100644 --- a/zimbra/dnscache-components/zimbra-dnscache-components/rpm/SPECS/dnscache-components.spec +++ b/zimbra/dnscache-components/zimbra-dnscache-components/rpm/SPECS/dnscache-components.spec @@ -1,9 +1,9 @@ Summary: Zimbra components for dnscache package Name: zimbra-dnscache-components -Version: 1.0.4 +Version: 1.0.5 Release: 1zimbra8.7b1ZAPPEND License: GPL-2 -Requires: zimbra-dnscache-base, zimbra-unbound >= 1.11.0-1zimbra8.7b4ZAPPEND +Requires: zimbra-dnscache-base, zimbra-unbound >= 1.17.1-1zimbra8.8b1ZAPPEND Packager: Zimbra Packaging Services Group: Development/Languages AutoReqProv: no @@ -11,6 +11,8 @@ AutoReqProv: no %define debug_package %{nil} %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - 1.0.5 +- ZBUG-3355, Upgraded zimbra-unbound to 1.17.1 * Sat Aug 20 2022 Zimbra Packaging Services - 1.0.4 - Fix ZCS-11941, Updated zimbra-unbound * Fri May 20 2022 Zimbra Packaging Services - 1.0.3 From fe39fb0944715bc85b6dfb7083c9b3a6f2d8e572 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 11:04:16 +0000 Subject: [PATCH 38/48] ZBUG-3355:updated mta-components to 1.0.21 --- .../zimbra-mta-components/debian/changelog | 6 ++++++ .../zimbra-mta-components/debian/control | 8 ++++---- .../rpm/SPECS/mta-components.spec | 12 +++++++----- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/zimbra/mta-components/zimbra-mta-components/debian/changelog b/zimbra/mta-components/zimbra-mta-components/debian/changelog index 7e48726b1..e5c403915 100644 --- a/zimbra/mta-components/zimbra-mta-components/debian/changelog +++ b/zimbra/mta-components/zimbra-mta-components/debian/changelog @@ -1,3 +1,9 @@ +zimbra-mta-components (1.0.21-1zimbra8.8b1ZAPPEND) unstable; urgency=medium + + * Updated perl-mail-spamassassin,spamassassin-rules,opendkim,clamav,postfix + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-mta-components (1.0.20-1zimbra8.8b1ZAPPEND) unstable; urgency=medium * * ZBUG-3025: Upgrade amavis to 2.13.0 diff --git a/zimbra/mta-components/zimbra-mta-components/debian/control b/zimbra/mta-components/zimbra-mta-components/debian/control index 321dedfc8..d55123548 100644 --- a/zimbra/mta-components/zimbra-mta-components/debian/control +++ b/zimbra/mta-components/zimbra-mta-components/debian/control @@ -9,11 +9,11 @@ Package: zimbra-mta-components Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, sqlite3, zimbra-mta-base, zimbra-altermime, zimbra-amavisd (>= 2.13.0-1zimbra8.7b2ZAPPEND), - zimbra-clamav (>= 0.105.2-1zimbra8.8b3ZAPPEND), + zimbra-clamav (>= 0.105.2-1zimbra8.8b4ZAPPEND), zimbra-clamav-db, zimbra-cluebringer, zimbra-mariadb (>= 10.1.25-1zimbra8.7b3ZAPPEND), - zimbra-opendkim (>= 2.10.3-1zimbra8.7b5ZAPPEND), zimbra-perl-mail-spamassassin (>= 3.4.6-1zimbra8.8b3ZAPPEND), - zimbra-postfix (>= 3.6.1-1zimbra8.7b3ZAPPEND), - zimbra-spamassassin-rules (>= 1.0.0-1zimbra8.8b5ZAPPEND) + zimbra-opendkim (>= 2.10.3-1zimbra8.7b6ZAPPEND), zimbra-perl-mail-spamassassin (>= 3.4.6-1zimbra8.8b4ZAPPEND), + zimbra-postfix (>= 3.6.1-1zimbra8.7b4ZAPPEND), + zimbra-spamassassin-rules (>= 1.0.0-1zimbra8.8b6ZAPPEND) Description: Zimbra components for MTA package Zimbra mta components pulls in all the packages used by zimbra-mta diff --git a/zimbra/mta-components/zimbra-mta-components/rpm/SPECS/mta-components.spec b/zimbra/mta-components/zimbra-mta-components/rpm/SPECS/mta-components.spec index 6f0af9af7..402813a8b 100644 --- a/zimbra/mta-components/zimbra-mta-components/rpm/SPECS/mta-components.spec +++ b/zimbra/mta-components/zimbra-mta-components/rpm/SPECS/mta-components.spec @@ -1,14 +1,14 @@ Summary: Zimbra components for MTA package Name: zimbra-mta-components -Version: 1.0.20 +Version: 1.0.21 Release: 1zimbra8.8b1ZAPPEND License: GPL-2 Requires: sqlite, zimbra-mta-base, zimbra-altermime, zimbra-amavisd >= 2.13.0-1zimbra8.7b2ZAPPEND -Requires: zimbra-clamav >= 0.105.2-1zimbra8.8b3ZAPPEND, zimbra-clamav-db +Requires: zimbra-clamav >= 0.105.2-1zimbra8.8b4ZAPPEND, zimbra-clamav-db Requires: zimbra-cluebringer, zimbra-mariadb >= 10.1.25-1zimbra8.7b3ZAPPEND -Requires: zimbra-opendkim >= 2.10.3-1zimbra8.7b5ZAPPEND, zimbra-perl-mail-spamassassin >= 3.4.6-1zimbra8.8b3ZAPPEND -Requires: zimbra-postfix >= 3.6.1-1zimbra8.7b3ZAPPEND -Requires: zimbra-spamassassin-rules >= 1.0.0-1zimbra8.8b5ZAPPEND +Requires: zimbra-opendkim >= 2.10.3-1zimbra8.7b6ZAPPEND, zimbra-perl-mail-spamassassin >= 3.4.6-1zimbra8.8b4ZAPPEND +Requires: zimbra-postfix >= 3.6.1-1zimbra8.7b4ZAPPEND +Requires: zimbra-spamassassin-rules >= 1.0.0-1zimbra8.8b6ZAPPEND Packager: Zimbra Packaging Services Group: Development/Languages AutoReqProv: no @@ -20,6 +20,8 @@ Zimbra mta components pulls in all the packages used by zimbra-mta %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - 1.0.21 +- Updated perl-mail-spamassassin,spamassassin-rules,opendkim,clamav,postfix * Fri Mar 10 2023 Zimbra Packaging Services - 1.0.20 - ZBUG-3025: Upgrade amavis to 2.13.0 * Wed Feb 22 2023 Zimbra Packaging Services - 1.0.19 From d5257392936cbbcc4777b6d8c7c9b975ad17642c Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 11:05:05 +0000 Subject: [PATCH 39/48] ZBUG-3355:Updated snmp-components to 1.0.4 --- .../snmp-components/zimbra-snmp-components/debian/changelog | 6 ++++++ .../snmp-components/zimbra-snmp-components/debian/control | 2 +- .../zimbra-snmp-components/rpm/SPECS/snmp-components.spec | 6 ++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/zimbra/snmp-components/zimbra-snmp-components/debian/changelog b/zimbra/snmp-components/zimbra-snmp-components/debian/changelog index 32be791ed..4c810e69f 100644 --- a/zimbra/snmp-components/zimbra-snmp-components/debian/changelog +++ b/zimbra/snmp-components/zimbra-snmp-components/debian/changelog @@ -1,3 +1,9 @@ +zimbra-snmp-components (1.0.4-1zimbra8.7b1ZAPPEND) unstable; urgency=medium + + * Updated dependency zimbra-net-snmp + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-snmp-components (1.0.3-1zimbra8.7b1ZAPPEND) unstable; urgency=medium * Updated dependency zimbra-net-snmp diff --git a/zimbra/snmp-components/zimbra-snmp-components/debian/control b/zimbra/snmp-components/zimbra-snmp-components/debian/control index 9022644b8..dd28ecca1 100644 --- a/zimbra/snmp-components/zimbra-snmp-components/debian/control +++ b/zimbra/snmp-components/zimbra-snmp-components/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.9.5 Package: zimbra-snmp-components Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, - zimbra-snmp-base, zimbra-net-snmp (>= 5.8-1zimbra8.7b2ZAPPEND) + zimbra-snmp-base, zimbra-net-snmp (>= 5.8-1zimbra8.7b3ZAPPEND) Description: Zimbra components for snmp package Zimbra snmp components pulls in all the packages used by zimbra-snmp diff --git a/zimbra/snmp-components/zimbra-snmp-components/rpm/SPECS/snmp-components.spec b/zimbra/snmp-components/zimbra-snmp-components/rpm/SPECS/snmp-components.spec index 2c1a86de0..c3c5461dd 100644 --- a/zimbra/snmp-components/zimbra-snmp-components/rpm/SPECS/snmp-components.spec +++ b/zimbra/snmp-components/zimbra-snmp-components/rpm/SPECS/snmp-components.spec @@ -1,9 +1,9 @@ Summary: Zimbra components for snmp package Name: zimbra-snmp-components -Version: 1.0.3 +Version: 1.0.4 Release: 1zimbra8.7b1ZAPPEND License: GPL-2 -Requires: zimbra-snmp-base, zimbra-net-snmp >= 5.8-1zimbra8.7b2ZAPPEND +Requires: zimbra-snmp-base, zimbra-net-snmp >= 5.8-1zimbra8.7b3ZAPPEND Packager: Zimbra Packaging Services Group: Development/Languages AutoReqProv: no @@ -11,6 +11,8 @@ AutoReqProv: no %define debug_package %{nil} %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - 1.0.4 +- Updated zimbra-net-snmp * Sat Dec 05 2020 Zimbra Packaging Services - 1.0.3 - Updated zimbra-net-snmp * Thu Sep 10 2020 Zimbra Packaging Services - 1.0.2 From 2c20d21ed56201a1f889dd1b6021754cdcc50e95 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 11:06:02 +0000 Subject: [PATCH 40/48] ZBUG-3355:Updated spell-components to 2.0.12 --- .../zimbra-spell-components/debian/changelog | 6 ++++++ .../spell-components/zimbra-spell-components/debian/control | 2 +- .../zimbra-spell-components/rpm/SPECS/spell-components.spec | 6 ++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/zimbra/spell-components/zimbra-spell-components/debian/changelog b/zimbra/spell-components/zimbra-spell-components/debian/changelog index aaf00b005..d6a4bb02b 100644 --- a/zimbra/spell-components/zimbra-spell-components/debian/changelog +++ b/zimbra/spell-components/zimbra-spell-components/debian/changelog @@ -1,3 +1,9 @@ +zimbra-spell-components (2.0.12-1zimbra8.8b1ZAPPEND) unstable; urgency=medium + + * Updated zimbra-httpd + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-spell-components (2.0.11-1zimbra8.8b1ZAPPEND) unstable; urgency=medium * ZBUG-3354, Upgraded Apache to 2.4.57 diff --git a/zimbra/spell-components/zimbra-spell-components/debian/control b/zimbra/spell-components/zimbra-spell-components/debian/control index 528b417a8..24bc91752 100644 --- a/zimbra/spell-components/zimbra-spell-components/debian/control +++ b/zimbra/spell-components/zimbra-spell-components/debian/control @@ -11,7 +11,7 @@ Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-spell-base, zimbra-aspell-ar, zimbra-aspell-ca, zimbra-aspell-da, zimbra-aspell-de, zimbra-aspell-en, zimbra-aspell-es, zimbra-aspell-fr, zimbra-aspell-hi, zimbra-aspell-hu, zimbra-aspell-it, zimbra-aspell-nl, zimbra-aspell-pl, - zimbra-aspell-pt-br, zimbra-aspell-ru, zimbra-aspell-sv, zimbra-httpd (>= 2.4.57-1zimbra8.7b4ZAPPEND), + zimbra-aspell-pt-br, zimbra-aspell-ru, zimbra-aspell-sv, zimbra-httpd (>= 2.4.57-1zimbra8.7b5ZAPPEND), zimbra-php (>= 7.4.27-1zimbra8.7b3ZAPPEND), zimbra-aspell-zimbra Description: Zimbra components for spell package Zimbra spell components pulls in all the packages used by diff --git a/zimbra/spell-components/zimbra-spell-components/rpm/SPECS/spell-components.spec b/zimbra/spell-components/zimbra-spell-components/rpm/SPECS/spell-components.spec index bbee68b44..ed4c09fd5 100644 --- a/zimbra/spell-components/zimbra-spell-components/rpm/SPECS/spell-components.spec +++ b/zimbra/spell-components/zimbra-spell-components/rpm/SPECS/spell-components.spec @@ -1,12 +1,12 @@ Summary: Zimbra components for spell package Name: zimbra-spell-components -Version: 2.0.11 +Version: 2.0.12 Release: 1zimbra8.8b1ZAPPEND License: GPL-2 Requires: zimbra-spell-base, zimbra-aspell-ar, zimbra-aspell-ca, zimbra-aspell-da, zimbra-aspell-de Requires: zimbra-aspell-en, zimbra-aspell-es, zimbra-aspell-fr, zimbra-aspell-hi Requires: zimbra-aspell-hu, zimbra-aspell-it, zimbra-aspell-nl, zimbra-aspell-pl -Requires: zimbra-aspell-pt-br, zimbra-aspell-ru, zimbra-aspell-sv, zimbra-httpd >= 2.4.57-1zimbra8.7b4ZAPPEND +Requires: zimbra-aspell-pt-br, zimbra-aspell-ru, zimbra-aspell-sv, zimbra-httpd >= 2.4.57-1zimbra8.7b5ZAPPEND Requires: zimbra-php >= 7.4.27-1zimbra8.7b3ZAPPEND, zimbra-aspell-zimbra Packager: Zimbra Packaging Services Group: Development/Languages @@ -19,6 +19,8 @@ Zimbra spell components pulls in all the packages used by zimbra-spell %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - 2.0.12 +- Updated zimbra-httpd * Mon Apr 17 2023 Zimbra Packaging Services - 2.0.11 - ZBUG-3354, Upgraded Apache to 2.4.57 * Wed Nov 23 2022 Zimbra Packaging Services - 2.0.10 From b842155e9aec32f8ba8b2df9b0dd477ac66364e1 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Tue, 20 Jun 2023 11:06:43 +0000 Subject: [PATCH 41/48] ZBUG-3355:Updated proxy-components to 1.0.11 --- .../zimbra-proxy-components/debian/changelog | 6 ++++++ .../proxy-components/zimbra-proxy-components/debian/control | 2 +- .../zimbra-proxy-components/rpm/SPECS/proxy-components.spec | 6 ++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/zimbra/proxy-components/zimbra-proxy-components/debian/changelog b/zimbra/proxy-components/zimbra-proxy-components/debian/changelog index 37d802ec0..0d32e6035 100644 --- a/zimbra/proxy-components/zimbra-proxy-components/debian/changelog +++ b/zimbra/proxy-components/zimbra-proxy-components/debian/changelog @@ -1,3 +1,9 @@ +zimbra-proxy-components (1.0.11-1zimbra8.8b1ZAPPEND) unstable; urgency=low + + * Updated zimbra-nginx + + -- Zimbra Packaging Services Tue, 13 Jun 2023 05:12:55 +0000 + zimbra-proxy-components (1.0.10-1zimbra8.8b1ZAPPEND) unstable; urgency=low * Updated zimbra-nginx,Fix ZBUG-2738 diff --git a/zimbra/proxy-components/zimbra-proxy-components/debian/control b/zimbra/proxy-components/zimbra-proxy-components/debian/control index 5b0adfad7..892598175 100644 --- a/zimbra/proxy-components/zimbra-proxy-components/debian/control +++ b/zimbra/proxy-components/zimbra-proxy-components/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.9.5 Package: zimbra-proxy-components Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, - zimbra-proxy-base, zimbra-nginx (>= 1.20.0-1zimbra8.8b3ZAPPEND) + zimbra-proxy-base, zimbra-nginx (>= 1.20.0-1zimbra8.8b4ZAPPEND) Description: Zimbra components for proxy package Zimbra proxy components pulls in all the packages used by zimbra-proxy diff --git a/zimbra/proxy-components/zimbra-proxy-components/rpm/SPECS/proxy-components.spec b/zimbra/proxy-components/zimbra-proxy-components/rpm/SPECS/proxy-components.spec index 099e8e484..b29c1c9b6 100644 --- a/zimbra/proxy-components/zimbra-proxy-components/rpm/SPECS/proxy-components.spec +++ b/zimbra/proxy-components/zimbra-proxy-components/rpm/SPECS/proxy-components.spec @@ -1,9 +1,9 @@ Summary: Zimbra components for proxy package Name: zimbra-proxy-components -Version: 1.0.10 +Version: 1.0.11 Release: 1zimbra8.8b1ZAPPEND License: GPL-2 -Requires: zimbra-proxy-base, zimbra-nginx >= 1.20.0-1zimbra8.8b3ZAPPEND +Requires: zimbra-proxy-base, zimbra-nginx >= 1.20.0-1zimbra8.8b4ZAPPEND Packager: Zimbra Packaging Services Group: Development/Languages AutoReqProv: no @@ -11,6 +11,8 @@ AutoReqProv: no %define debug_package %{nil} %changelog +* Tue Jun 13 2023 Zimbra Packaging Services - 1.0.11 +- Updated zimbra-nginx * Fri May 06 2022 Zimbra Packaging Services - 1.0.10 - Updated zimbra-nginx,Fix ZBUG-2738 * Sun Jul 25 2021 Zimbra Packaging Services - 1.0.9 From 486be30412157ec8852d17c8154e1283a704b960 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Fri, 23 Jun 2023 09:06:19 +0000 Subject: [PATCH 42/48] ZBUG-3355:Upgraded perl-mail-dkim for OpenSSL-3.0.9 --- perl-versions.def | 2 +- thirdparty/perl-mail-dkim/Makefile | 2 +- .../perl-mail-dkim/patches/public_key_0.43.patch | 15 +++++++++++++++ .../zimbra-perl-mail-dkim/debian/changelog | 2 +- .../zimbra-perl-mail-dkim/debian/patches/series | 2 +- .../rpm/SPECS/mail-dkim.spec | 4 ++-- 6 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 thirdparty/perl-mail-dkim/patches/public_key_0.43.patch diff --git a/perl-versions.def b/perl-versions.def index 18c016b59..bec37255b 100644 --- a/perl-versions.def +++ b/perl-versions.def @@ -56,7 +56,7 @@ LIBWWW := 6.13 LIST_MOREUTILS := 0.413 LWP_MEDIATYPES := 6.02 LWP_PROTOCOL_HTTPS := 6.10 -MAIL_DKIM := 0.40 +MAIL_DKIM := 0.43 MAIL_SPAMASSASSIN := 3.4.6 MAIL_SPF := 2.9.0 MAILTOOLS := 2.14 diff --git a/thirdparty/perl-mail-dkim/Makefile b/thirdparty/perl-mail-dkim/Makefile index 64726e4b7..d623fe974 100644 --- a/thirdparty/perl-mail-dkim/Makefile +++ b/thirdparty/perl-mail-dkim/Makefile @@ -8,7 +8,7 @@ pname_lc := mail-dkim pfile := $(pname)-$(pvers).tar.gz psrc_file := $(SRC_DIR)/$(pfile) -purl := https://cpan.metacpan.org/authors/id/J/JA/JASLONG/$(pfile) +purl := https://cpan.metacpan.org/authors/id/M/MB/MBRADSHAW/$(pfile) zname := zimbra-perl-$(pname_lc) zspec := $(pname_lc).spec diff --git a/thirdparty/perl-mail-dkim/patches/public_key_0.43.patch b/thirdparty/perl-mail-dkim/patches/public_key_0.43.patch new file mode 100644 index 000000000..6402e67f6 --- /dev/null +++ b/thirdparty/perl-mail-dkim/patches/public_key_0.43.patch @@ -0,0 +1,15 @@ +diff -ruN a/t/public_key.t b/t/public_key.t +--- a/t/public_key.t 2023-06-21 09:47:35.518736184 +0000 ++++ b/t/public_key.t 2023-06-21 09:48:17.086737523 +0000 +@@ -25,8 +25,9 @@ + Selector => "nonexistent", + Domain => "test.authmilter.org", + ); +-ok(!$pubkey, "public key should not exist"); +-ok($@ =~ /^NODATA$/, "reason given is NODATA"); ++ok( !$pubkey, "public key should not exist" ); ++ok( $@ eq 'NODATA' || $@ eq 'NXDOMAIN', "reason given is NODATA or NXDOMAIN" ); ++ + + SKIP: + { diff --git a/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/debian/changelog b/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/debian/changelog index d50dfafa4..a4978409b 100644 --- a/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/debian/changelog +++ b/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/debian/changelog @@ -1,4 +1,4 @@ -zimbra-perl-MODNORMNAME (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium +zimbra-perl-MODNORMNAME (VERSION-1zimbra8.8b1ZAPPEND) unstable; urgency=medium * Updated dependency zimbra-perl-crypt-openssl-rsa diff --git a/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/debian/patches/series b/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/debian/patches/series index 175bbddc7..24774f0a5 100644 --- a/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/debian/patches/series +++ b/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/debian/patches/series @@ -1 +1 @@ -public_key.patch +public_key_0.43.patch diff --git a/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/rpm/SPECS/mail-dkim.spec b/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/rpm/SPECS/mail-dkim.spec index 751f6c645..0e21cd237 100644 --- a/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/rpm/SPECS/mail-dkim.spec +++ b/thirdparty/perl-mail-dkim/zimbra-perl-mail-dkim/rpm/SPECS/mail-dkim.spec @@ -1,10 +1,10 @@ Summary: Mail::DKIM - Signs/verifies Internet mail with DKIM/DomainKey signatures Name: zimbra-perl-MODNORMNAME Version: VERSION -Release: 1zimbra8.7b4ZAPPEND +Release: 1zimbra8.8b1ZAPPEND License: GPL+ or Artistic Source: %{name}-%{version}.tar.gz -Patch0: public_key.patch +Patch0: public_key_0.43.patch Packager: Zimbra Packaging Services Group: Development/Languages BuildRequires: zimbra-perl-base, zimbra-perl-crypt-openssl-rsa >= 0.33-1zimbra8.8b1ZAPPEND, zimbra-perl-digest-sha1 From efbfc6c211b2a30299ac21e58550bc95d27201b0 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Fri, 23 Jun 2023 09:08:16 +0000 Subject: [PATCH 43/48] ZBUG-3355:Updated perl-mail-dkim for perl-mail-spamassassin --- .../zimbra-perl-mail-spamassassin/debian/control | 4 ++-- .../rpm/SPECS/mail-spamassassin.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/debian/control b/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/debian/control index 691b34c8b..5bd8a0d7a 100644 --- a/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/debian/control +++ b/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Zimbra Packaging Services Build-Depends: debhelper (>= 9), zimbra-perl-base, zimbra-perl-digest-sha1, zimbra-perl-net-dns, zimbra-perl-html-parser, zimbra-perl-io-compress, - zimbra-perl-mail-spf, zimbra-perl-mail-dkim (>= 0.40-1zimbra8.7b4ZAPPEND), zimbra-perl-netaddr-ip, + zimbra-perl-mail-spf, zimbra-perl-mail-dkim (>= 0.43-1zimbra8.8b1ZAPPEND), zimbra-perl-netaddr-ip, zimbra-perl-net-cidr-lite, zimbra-perl-encode-detect Standards-Version: 3.9.5 Homepage: https://metacpan.org/release/MODNAME @@ -14,7 +14,7 @@ Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-perl-base, zimbra-perl-digest-sha1, zimbra-perl-net-dns, zimbra-perl-html-parser, zimbra-perl-io-compress, - zimbra-perl-mail-spf, zimbra-perl-mail-dkim (>= 0.40-1zimbra8.7b4ZAPPEND), zimbra-perl-netaddr-ip, + zimbra-perl-mail-spf, zimbra-perl-mail-dkim (>= 0.43-1zimbra8.8b1ZAPPEND), zimbra-perl-netaddr-ip, zimbra-perl-net-cidr-lite, zimbra-perl-encode-detect, zimbra-mta-base Description: Mail::SpamAssassin - Spam detector and markup engine Mail::SpamAssassin is a module to identify spam using several methods diff --git a/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/rpm/SPECS/mail-spamassassin.spec b/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/rpm/SPECS/mail-spamassassin.spec index 0119e5c23..4a10af31b 100644 --- a/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/rpm/SPECS/mail-spamassassin.spec +++ b/thirdparty/perl-mail-spamassassin/zimbra-perl-mail-spamassassin/rpm/SPECS/mail-spamassassin.spec @@ -8,11 +8,11 @@ Packager: Zimbra Packaging Services Group: Development/Languages BuildRequires: zimbra-perl-base, zimbra-perl-digest-sha1, zimbra-perl-net-dns BuildRequires: zimbra-perl-html-parser, zimbra-perl-io-compress, zimbra-perl-mail-spf -BuildRequires: zimbra-perl-mail-dkim >= 0.40-1zimbra8.7b4ZAPPEND, zimbra-perl-netaddr-ip, zimbra-perl-net-cidr-lite +BuildRequires: zimbra-perl-mail-dkim >= 0.43-1zimbra8.8b1ZAPPEND, zimbra-perl-netaddr-ip, zimbra-perl-net-cidr-lite BuildRequires: zimbra-perl-encode-detect Requires: zimbra-perl-base, zimbra-perl-digest-sha1, zimbra-perl-net-dns Requires: zimbra-perl-html-parser, zimbra-perl-io-compress, zimbra-perl-mail-spf -Requires: zimbra-perl-mail-dkim >= 0.40-1zimbra8.7b4ZAPPEND, zimbra-perl-netaddr-ip, zimbra-perl-net-cidr-lite +Requires: zimbra-perl-mail-dkim >= 0.43-1zimbra8.8b1ZAPPEND, zimbra-perl-netaddr-ip, zimbra-perl-net-cidr-lite Requires: zimbra-perl-encode-detect, zimbra-mta-base AutoReqProv: no URL: https://metacpan.org/release/MODNAME From 4a4c0e9c486635daeb97cdfde173318eac815c72 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Fri, 23 Jun 2023 09:08:50 +0000 Subject: [PATCH 44/48] ZBUG-3355:Updated perl-mail-dkim for perl --- zimbra/perl/zimbra-perl/debian/control | 2 +- zimbra/perl/zimbra-perl/rpm/SPECS/perl.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zimbra/perl/zimbra-perl/debian/control b/zimbra/perl/zimbra-perl/debian/control index 72492577b..53bf00820 100644 --- a/zimbra/perl/zimbra-perl/debian/control +++ b/zimbra/perl/zimbra-perl/debian/control @@ -26,7 +26,7 @@ Depends: zimbra-perl-base, zimbra-perl-archive-zip, zimbra-perl-berkeleydb, zimbra-perl-json-pp, zimbra-perl-libwww (>= 6.13-1zimbra8.7b4ZAPPEND), zimbra-perl-list-moreutils, zimbra-perl-lwp-mediatypes, zimbra-perl-lwp-protocol-https (>= 6.10-1zimbra8.7b3ZAPPEND), - zimbra-perl-mail-dkim (>= 0.40-1zimbra8.7b4ZAPPEND), zimbra-perl-mail-spf, zimbra-perl-mailtools, zimbra-perl-math-bigint, zimbra-perl-mime-lite, + zimbra-perl-mail-dkim (>= 0.43-1zimbra8.8b1ZAPPEND), zimbra-perl-mail-spf, zimbra-perl-mailtools, zimbra-perl-math-bigint, zimbra-perl-mime-lite, zimbra-perl-mime-tools, zimbra-perl-mime-types, zimbra-perl-mozilla-ca, zimbra-perl-netaddr-ip, zimbra-perl-net-cidr, zimbra-perl-net-cidr-lite, zimbra-perl-net-dns, zimbra-perl-net-dns-resolver-programmable, zimbra-perl-net-http (>= 6.09-1zimbra8.7b4ZAPPEND), zimbra-perl-net-ldap, zimbra-perl-net-ldapapi (>= 3.0.3-1zimbra8.7b2ZAPPEND), zimbra-perl-net-libidn, diff --git a/zimbra/perl/zimbra-perl/rpm/SPECS/perl.spec b/zimbra/perl/zimbra-perl/rpm/SPECS/perl.spec index f10c91cc4..ae916e847 100644 --- a/zimbra/perl/zimbra-perl/rpm/SPECS/perl.spec +++ b/zimbra/perl/zimbra-perl/rpm/SPECS/perl.spec @@ -26,7 +26,7 @@ Requires: zimbra-perl-io-socket-ip, zimbra-perl-io-socket-ssl >= 2.083-1zi Requires: zimbra-perl-json-pp Requires: zimbra-perl-libwww >= 6.13-1zimbra8.7b4ZAPPEND, zimbra-perl-list-moreutils, zimbra-perl-lwp-mediatypes Requires: zimbra-perl-lwp-protocol-https >= 6.10-1zimbra8.7b3ZAPPEND -Requires: zimbra-perl-mail-dkim >= 0.40-1zimbra8.7b4ZAPPEND, zimbra-perl-mail-spf, zimbra-perl-mailtools, zimbra-perl-math-bigint +Requires: zimbra-perl-mail-dkim >= 0.43-1zimbra8.8b1ZAPPEND, zimbra-perl-mail-spf, zimbra-perl-mailtools, zimbra-perl-math-bigint Requires: zimbra-perl-mime-lite Requires: zimbra-perl-mime-tools, zimbra-perl-mime-types, zimbra-perl-mozilla-ca, zimbra-perl-netaddr-ip Requires: zimbra-perl-net-cidr, zimbra-perl-net-cidr-lite, zimbra-perl-net-dns, zimbra-perl-net-dns-resolver-programmable From 4bad7dfb396c6ba6023667ff1b294031f34ce154 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Thu, 6 Jul 2023 09:44:09 +0000 Subject: [PATCH 45/48] ZBUG-3355:Updated OpenSSL License --- .../openssl/zimbra-openssl/debian/copyright | 295 +++++++++++------- .../zimbra-openssl/rpm/SPECS/openssl.spec | 2 +- 2 files changed, 180 insertions(+), 117 deletions(-) diff --git a/thirdparty/openssl/zimbra-openssl/debian/copyright b/thirdparty/openssl/zimbra-openssl/debian/copyright index 687022a97..533c443d8 100644 --- a/thirdparty/openssl/zimbra-openssl/debian/copyright +++ b/thirdparty/openssl/zimbra-openssl/debian/copyright @@ -3,7 +3,7 @@ Source: https://www.openssl.org/source Files: * Copyright: 1998-2004 The OpenSSL Project Copyright: 1995-1998 Eric A. Young, Tim J. Hudson -License: OpenSSL License +License: Apache License v2 Files: debian/* Copyright: 2015, Zimbra Packaging Services @@ -18,118 +18,181 @@ License: GPL-2 On Debian systems, the complete text of version 2 of the GNU General Public License can be found in usr/share/common-licenses/GPL-2. -License: Openssl License - /* ==================================================================== - * Copyright (c) 1998-2004 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - - Original SSLeay License - ----------------------- - - /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - +License: Apache License v2 + + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS diff --git a/thirdparty/openssl/zimbra-openssl/rpm/SPECS/openssl.spec b/thirdparty/openssl/zimbra-openssl/rpm/SPECS/openssl.spec index 235bfcde3..fe4118bcb 100644 --- a/thirdparty/openssl/zimbra-openssl/rpm/SPECS/openssl.spec +++ b/thirdparty/openssl/zimbra-openssl/rpm/SPECS/openssl.spec @@ -2,7 +2,7 @@ Summary: Zimbra's Secure Socket Layer build Name: zimbra-openssl Version: VERSION Release: 1zimbra8.8b1ZAPPEND -License: OpenSSL +License: Apache License v2 Source: %{name}-%{version}.tar.gz Source1: openssl-fips.cnf Requires: zimbra-openssl-libs = %{version}-%{release}, perl, perl-core From 5a50025888d7bece8af498a08f33a6b5a657ab66 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Fri, 7 Jul 2023 06:53:32 +0000 Subject: [PATCH 46/48] ZBUG-3355:Updated OpenSSL License and other 3rd party open source licenses --- zimbra/osl/zimbra-osl/debian/changelog | 6 + .../osl/zimbra-osl/open_source_licenses.txt | 650 ++++++------------ zimbra/osl/zimbra-osl/rpm/SPECS/osl.spec | 6 +- 3 files changed, 237 insertions(+), 425 deletions(-) diff --git a/zimbra/osl/zimbra-osl/debian/changelog b/zimbra/osl/zimbra-osl/debian/changelog index dc2d6ff59..07cbe66f4 100644 --- a/zimbra/osl/zimbra-osl/debian/changelog +++ b/zimbra/osl/zimbra-osl/debian/changelog @@ -1,3 +1,9 @@ +zimbra-osl (3.0.0-1zimbra10.0b1ZAPPEND) unstable; urgency=low + + * ZBUG-3355, Updated OpenSSL License and other 3rd party open source licenses + + -- Zimbra Packaging Services Fri, 07 Jul 2023 05:12:55 +0000 + zimbra-osl (2.0.0-1zimbra9.0b1ZAPPEND) unstable; urgency=low * Update modern webclient diff --git a/zimbra/osl/zimbra-osl/open_source_licenses.txt b/zimbra/osl/zimbra-osl/open_source_licenses.txt index 66a499ad5..3b8146341 100644 --- a/zimbra/osl/zimbra-osl/open_source_licenses.txt +++ b/zimbra/osl/zimbra-osl/open_source_licenses.txt @@ -73,7 +73,6 @@ SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES >>> nviennot-nginx-tcp-keepalive-4d7186d >>> opendkim-2.10.3 >>> openldap-2.4.59 - >>> openssl-1.1.1t >>> owasp-java-html-sanitizer.jar-20190610.5z >>> perl-data-uuid-1.221 >>> perl-geography-countries-2009041301 @@ -87,7 +86,7 @@ SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES >>> spymemcached-2.12.1 >>> sqlitejdbc-3.7.5-1 >>> tnef-1.8.0 - >>> unbound-1.11.0 + >>> unbound-1.17.1 >>> yui-compressor-2.4.2 >>> zeroclipboard-1.0.7 >>> 7zip-bin@5.0.3 @@ -5707,7 +5706,7 @@ SECTION 2: Apache License, V2.0 >>> apache-helix-0.6.1 >>> apache-httpasyncclient-4.1.4 >>> apache-httpcomponents-core-4.4.11 (httpcore, httpcore-nio) - >>> apache-httpd-2.4.54 + >>> apache-httpd-2.4.57 >>> apache-jcs-1.3 >>> apache-log4j-core-2.17.1 >>> apache-log4j-api-2.17.1 @@ -5734,6 +5733,7 @@ SECTION 2: Apache License, V2.0 >>> objenesis-2.1 >>> opencsv-1.8 >>> openfire-3.10.2 + >>> openssl-3.0.9 >>> org.apache.mina-2.1.6 >>> org.openid4java-1.0.0 >>> rabbitmq-server-3.10.7 @@ -5920,7 +5920,7 @@ SECTION 2: Apache License, V2.0 SECTION 3: Artistic License, V2.0 - >>> perl-net-ssleay-1.88 + >>> perl-net-ssleay-1.92 >>> perl-unix-syslog-1.1 @@ -5944,7 +5944,7 @@ SECTION 6: GNU General Public License, V1.0 >>> perl-canary-stability-2006 >>> perl-convert-asn1-0.27 - >>> perl-crypt-openssl-rsa-0.31 + >>> perl-crypt-openssl-rsa-0.33 >>> perl-dbd-sqlite-1.48 >>> perl-digest-hmac-1.03 >>> perl-email-date-format-1.005 @@ -5973,8 +5973,8 @@ SECTION 6: GNU General Public License, V1.0 SECTION 7: GNU General Public License, V2.0 - >>> amavisd-2.10.1 - >>> clamav-0.105.2 + >>> amavisd-2.13.0 + >>> clamav-1.0.1 >>> cluebringer-2.1.0.0.cf484f1b93cf9965886cc89d33bdeee9c26426cb >>> freetype-2.6.3 >>> innotop-1.9.1 @@ -6018,13 +6018,13 @@ SECTION 7: GNU General Public License, V2.0 >>> perl-http-negotiate-6.01 >>> perl-io-compress-2.069 >>> perl-io-socket-inet6-2.72 - >>> perl-io-socket-ssl-2.068 + >>> perl-io-socket-ssl-2.083 >>> perl-io-stringy-2.111 >>> perl-ip-country-2.28 >>> perl-ldap-0.65 >>> perl-lwp-mediatypes-6.02 - >>> perl-lwp-protocol-https-6.06 - >>> perl-mail-dkim-0.40 + >>> perl-lwp-protocol-https-6.10 + >>> perl-mail-dkim-0.43 >>> perl-mailtools-2.14 >>> perl-math-bigint-1.99708 >>> perl-mime-tools-5.507 @@ -8788,138 +8788,6 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >>> keyview-10.13.0.0 -> OpenSSL - -OpenSSL (1.0.0c 2 Dec 2010) - -http://www.openssl.org/ - -LICENSE: - -The OpenSSL toolkit stays under a dual license, i.e. both the conditions of -the OpenSSL License and the original SSLeay license apply to the toolkit. -See below for the actual license texts. Actually both licenses are BSD-style -Open Source licenses. In case of any license issues related to OpenSSL -please contact openssl-core@openssl.org. - -OpenSSL License ---------------- - -==================================================================== -Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in -the documentation and/or other materials provided with the -distribution. - -3. All advertising materials mentioning features or use of this -software must display the following acknowledgment: -"This product includes software developed by the OpenSSL Project -for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - -4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to -endorse or promote products derived from this software without -prior written permission. For written permission, please contact -openssl-core@openssl.org. - -5. Products derived from this software may not be called "OpenSSL" -nor may "OpenSSL" appear in their names without prior written -permission of the OpenSSL Project. - -6. Redistributions of any form whatsoever must retain the following -acknowledgment: -"This product includes software developed by the OpenSSL Project -for use in the OpenSSL Toolkit (http://www.openssl.org/)" - -THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY -EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR -ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. -==================================================================== - -This product includes cryptographic software written by Eric Young -(eay@cryptsoft.com). This product includes software written by Tim -Hudson (tjh@cryptsoft.com). - - -Original SSLeay License ------------------------ - -Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) -All rights reserved. - -This package is an SSL implementation written -by Eric Young (eay@cryptsoft.com). -The implementation was written so as to conform with Netscapes SSL. - -This library is free for commercial and non-commercial use as long as -the following conditions are aheared to. The following conditions -apply to all code found in this distribution, be it the RC4, RSA, -lhash, DES, etc., code; not just the SSL code. The SSL documentation -included with this distribution is covered by the same copyright terms -except that the holder is Tim Hudson (tjh@cryptsoft.com). - -Copyright remains Eric Young's, and as such any Copyright notices in -the code are not to be removed. -If this package is used in a product, Eric Young should be given attribution -as the author of the parts of the library used. -This can be in the form of a textual message at program startup or -in documentation (online or textual) provided with the package. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - "This product includes cryptographic software written by - Eric Young (eay@cryptsoft.com)" - The word 'cryptographic' can be left out if the rouines from the library - being used are not cryptographic related :-). -4. If you include any Windows specific code (or a derivative thereof) from - the apps directory (application code) you must include an acknowledgement: - "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - -THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - -The licence and distribution terms for any publically available version or -derivative of this code cannot be changed. i.e. this code cannot simply be -copied and put under another distribution licence -[including the GNU Public Licence.] - - - > LGPL 3.0 LibPff (libpff-alpha-20110413) @@ -10659,138 +10527,6 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -ADDITIONAL LICENSE INFORMATION: - -> OpenSSL - -nginx-1.7.1.zip\nginx-1.7.1\docs\OpenSSL LICENSE - - - LICENSE ISSUES - ============== - - The OpenSSL toolkit stays under a dual license, i.e. both the conditions of - the OpenSSL License and the original SSLeay license apply to the toolkit. - See below for the actual license texts. Actually both licenses are BSD-style - Open Source licenses. In case of any license issues related to OpenSSL - please contact openssl-core@openssl.org. - - OpenSSL License - --------------- - ==================================================================== - * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - - - Original SSLeay License - ----------------------- - -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - - > MIT nginx-1.7.1..zip\nginx-1.7.1.\docs\zlib.LICENSE @@ -11045,133 +10781,185 @@ California, USA. All Rights Reserved. Permission to copy and distribute verbatim copies of this document is granted. ->>> openssl-1.1.1t - -LICENSE ISSUES - ============== - - The OpenSSL toolkit stays under a dual license, i.e. both the conditions of - the OpenSSL License and the original SSLeay license apply to the toolkit. - See below for the actual license texts. Actually both licenses are BSD-style - Open Source licenses. In case of any license issues related to OpenSSL - please contact openssl-core@openssl.org. - - OpenSSL License - --------------- - -/* ==================================================================== - * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - - Original SSLeay License - ----------------------- - -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ +>>> openssl-3.0.9 + + + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS >>> owasp-java-html-sanitizer.jar-20190610.5z @@ -11831,7 +11619,7 @@ in courts and fora located in the State of New York, and you consent to such jurisdiction and venue. ->>> unbound-1.11.0 +>>> unbound-1.17.1 Copyright (c) 2007, NLnet Labs. All rights reserved. @@ -12927,7 +12715,7 @@ This project contains annotations derived from JCIP-ANNOTATIONS Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net ->>> apache-httpd-2.4.54 +>>> apache-httpd-2.4.57 copyright 2013 The Apache Software Foundation. @@ -18946,6 +18734,9 @@ laws of Oregon. If any provision of this License Agreement is held to be unenforceable, this License Agreement will remain in effect with the provision omitted. +>>> openssl-3.0.9 + +License : Apache 2.0 >>> org.apache.mina-2.1.6 @@ -19296,7 +19087,7 @@ The Apache Software Foundation (http://www.apache.org/). Artistic License, V2.0 is applicable to the following component(s). ->>> perl-net-ssleay-1.88 +>>> perl-net-ssleay-1.92 Copyright (c) 1996-2003 Sampo Kellomaki Copyright (C) 2005 Florian Ragwitz @@ -20810,7 +20601,7 @@ a) the GNU General Public License as published by the Free b) the "Artistic License" ->>> perl-crypt-openssl-rsa-0.31 +>>> perl-crypt-openssl-rsa-0.33 [PLEASE NOTE: ZIMBRA, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE GPL 1.0. PLEASE SEE THE APPENDIX TO REVIEW THE FULL TEXT OF THE GPL 1.0. THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.] @@ -21189,7 +20980,7 @@ b) the "Artistic License" GNU General Public License, V2.0 is applicable to the following component(s). ->>> amavisd-2.10.1 +>>> amavisd-2.13.0 GNU GENERAL PUBLIC LICENSE Version 2, June 1991 @@ -21249,7 +21040,7 @@ A copy of the license is included in the section entitled "GNU Free Documentation License". ->>> clamav-0.105.2 +>>> clamav-1.0.1 Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved. Copyright (C) 2007-2009 Sourcefire, Inc. @@ -24306,7 +24097,8 @@ modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. - + + Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a @@ -24362,7 +24154,8 @@ modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. - + + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -24409,7 +24202,8 @@ Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - + + 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 @@ -24467,7 +24261,8 @@ instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. - + + Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. @@ -24518,7 +24313,8 @@ Library will still fall under Section 6.) distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - + + 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work @@ -24580,7 +24376,8 @@ restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. - + + 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined @@ -24621,7 +24418,8 @@ subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. - + + 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or @@ -24673,7 +24471,8 @@ conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. - + + 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is @@ -24707,7 +24506,8 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest @@ -28033,7 +27833,7 @@ This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. ->>> perl-io-socket-ssl-2.068 +>>> perl-io-socket-ssl-2.083 [PLEASE NOTE: ZIMBRA, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE GPL 2.0. PLEASE SEE THE APPENDIX TO REVIEW THE FULL TEXT OF THE GPL 2.0. THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.] @@ -28094,7 +27894,7 @@ Copyright 1995-1999 Gisle Aas. This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. ->>> perl-lwp-protocol-https-6.06 +>>> perl-lwp-protocol-https-6.10 [PLEASE NOTE: ZIMBRA, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE GPL 2.0. PLEASE SEE THE APPENDIX TO REVIEW THE FULL TEXT OF THE GPL 2.0. THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.] @@ -28103,7 +27903,7 @@ Copyright 1997-2011 Gisle Aas. This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. ->>> perl-mail-dkim-0.40 +>>> perl-mail-dkim-0.43 [PLEASE NOTE: ZIMBRA, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE GPL 2.0. PLEASE SEE THE APPENDIX TO REVIEW THE FULL TEXT OF THE GPL 2.0. THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.] @@ -29712,7 +29512,8 @@ authors' reputations. The precise terms and conditions for copying, distribution and modification follow. - + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -29763,7 +29564,8 @@ it, and copy and distribute such modifications under the terms of Paragraph Mere aggregation of another independent work with the Program (or its derivative) on a volume of a storage or distribution medium does not bring the other work under the scope of these terms. - + + 3. You may copy and distribute the Program (or a portion or derivative of it, under Paragraph 2) in object code or executable form under the terms of Paragraphs 1 and 2 above provided that you also do one of the following: @@ -29809,7 +29611,8 @@ Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. - + + 7. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to @@ -29854,7 +29657,8 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + + Appendix: How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest diff --git a/zimbra/osl/zimbra-osl/rpm/SPECS/osl.spec b/zimbra/osl/zimbra-osl/rpm/SPECS/osl.spec index 42cf5b928..135e94ff0 100644 --- a/zimbra/osl/zimbra-osl/rpm/SPECS/osl.spec +++ b/zimbra/osl/zimbra-osl/rpm/SPECS/osl.spec @@ -1,7 +1,7 @@ Summary: Opensource Licenses Name: zimbra-osl -Version: 2.0.0 -Release: 1zimbra9.0b1ZAPPEND +Version: 3.0.0 +Release: 1zimbra10.0b1ZAPPEND License: GPL-2 Requires: zimbra-base Packager: Zimbra Packaging Services @@ -15,6 +15,8 @@ This file contains the licenses for the open source 3rd party software used by Zimbra %changelog +* Fri Jul 07 2023 Zimbra Packaging Services - 3.0.0-1zimbra10.0b1ZAPPEND +- ZBUG-3355, Updated OpenSSL License and other 3rd party open source licenses * Tue Mar 31 2020 Zimbra Packaging Services - 2.0.0-1zimbra9.0b1ZAPPEND - Update modern UI * Thu Jun 30 2016 Zimbra Packaging Services - 1.0.9-ITERATIONZAPPEND From 81114d5cbfb2b83eef4436c75959a30329cb73e0 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Fri, 7 Jul 2023 06:54:46 +0000 Subject: [PATCH 47/48] ZBUG-3355:Updated core-components for ZCS 10.0.0 --- .../zimbra-core-components/debian/changelog | 6 ++++++ .../core-components/zimbra-core-components/debian/control | 2 +- .../zimbra-core-components/rpm/SPECS/core-components.spec | 8 +++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/zimbra/core-components/zimbra-core-components/debian/changelog b/zimbra/core-components/zimbra-core-components/debian/changelog index eb3afcb69..8d9352859 100644 --- a/zimbra/core-components/zimbra-core-components/debian/changelog +++ b/zimbra/core-components/zimbra-core-components/debian/changelog @@ -1,3 +1,9 @@ +zimbra-core-components (4.0.0-1zimbra10.0b1ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Updated OpenSSL License and other 3rd party open source licenses + + -- Zimbra Packaging Services Fri, 07 Jul 2023 05:12:55 +0000 + zimbra-core-components (3.0.19-1zimbra8.8b1ZAPPEND) unstable; urgency=medium * ZBUG-3355, Upgraded OpenSSL to 3.0.9 and Updated core-components to 3.0.19 diff --git a/zimbra/core-components/zimbra-core-components/debian/control b/zimbra/core-components/zimbra-core-components/debian/control index 160a1c360..3a4b50e1f 100644 --- a/zimbra/core-components/zimbra-core-components/debian/control +++ b/zimbra/core-components/zimbra-core-components/debian/control @@ -13,7 +13,7 @@ Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, zimbra-rsync, zimbra-mariadb-lib (>= 10.1.25-1zimbra8.7b3ZAPPEND), zimbra-openldap-client (>= 2.4.59-1zimbra8.8b6ZAPPEND), zimbra-prepflog, zimbra-tcmalloc-lib, zimbra-perl-innotop (>= 1.9.1-1zimbra8.7b4ZAPPEND), zimbra-openjdk (>= 17.0.2-1zimbra8.8b1ZAPPEND), - zimbra-openjdk-cacerts (>= 1.0.8-1zimbra8.7b1ZAPPEND), zimbra-osl (>= 2.0.0-1zimbra9.0b1ZAPPEND), zimbra-amavis-logwatch, + zimbra-openjdk-cacerts (>= 1.0.8-1zimbra8.7b1ZAPPEND), zimbra-osl (>= 3.0.0-1zimbra10.0b1ZAPPEND), zimbra-amavis-logwatch, zimbra-postfix-logwatch (>= 1.40.03-1zimbra8.7b1ZAPPEND), zimbra-rrdtool Description: Zimbra components for core package Zimbra core components pulls in all the packages used by diff --git a/zimbra/core-components/zimbra-core-components/rpm/SPECS/core-components.spec b/zimbra/core-components/zimbra-core-components/rpm/SPECS/core-components.spec index 349eed950..9b0b25d61 100644 --- a/zimbra/core-components/zimbra-core-components/rpm/SPECS/core-components.spec +++ b/zimbra/core-components/zimbra-core-components/rpm/SPECS/core-components.spec @@ -1,7 +1,7 @@ Summary: Zimbra components for core package Name: zimbra-core-components -Version: 3.0.19 -Release: 1zimbra8.8b1ZAPPEND +Version: 4.0.0 +Release: 1zimbra10.0b1ZAPPEND License: GPL-2 Requires: zimbra-base, zimbra-os-requirements >= 1.0.2-1zimbra8.7b1ZAPPEND, zimbra-perl >= 1.0.8-1zimbra8.7b1ZAPPEND Requires: zimbra-pflogsumm @@ -9,7 +9,7 @@ Requires: zimbra-openssl >= 3.0.9-1zimbra8.8b1ZAPPEND,zimbra-curl >= 7 Requires: zimbra-cyrus-sasl >= 2.1.28-1zimbra8.7b4ZAPPEND Requires: zimbra-rsync Requires: zimbra-mariadb-libs >= 10.1.25-1zimbra8.7b3ZAPPEND, zimbra-openldap-client >= 2.4.59-1zimbra8.8b6ZAPPEND -Requires: zimbra-osl >= 2.0.0-1zimbra9.0b1ZAPPEND +Requires: zimbra-osl >= 3.0.0-1zimbra10.0b1ZAPPEND Requires: zimbra-prepflog, zimbra-tcmalloc-libs, zimbra-perl-innotop >= 1.9.1-1zimbra8.7b4ZAPPEND Requires: zimbra-openjdk >= 17.0.2-1zimbra8.8b1ZAPPEND, zimbra-openjdk-cacerts >= 1.0.8-1zimbra8.7b1ZAPPEND Requires: zimbra-amavis-logwatch @@ -21,6 +21,8 @@ AutoReqProv: no %define debug_package %{nil} %changelog +* Fri Jul 07 2023 Zimbra Packaging Services - 4.0.0 +- ZBUG-3355, Updated OpenSSL License and other 3rd party open source licenses * Tue Jun 13 2023 Zimbra Packaging Services - 3.0.19 - ZBUG-3355, Upgraded OpenSSL to 3.0.9 and Updated core-components to 3.0.19 * Fri Feb 10 2023 Zimbra Packaging Services - 3.0.18 From 9fb83d86a3017fe347bc00433fa0b9561a3c8153 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Fri, 7 Jul 2023 06:55:09 +0000 Subject: [PATCH 48/48] ZBUG-3355:Updated ldap-components for ZCS 10.0.0 --- .../zimbra-ldap-components/debian/changelog | 6 ++++++ .../ldap-components/zimbra-ldap-components/debian/control | 2 +- .../zimbra-ldap-components/rpm/SPECS/ldap-components.spec | 8 +++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/zimbra/ldap-components/zimbra-ldap-components/debian/changelog b/zimbra/ldap-components/zimbra-ldap-components/debian/changelog index ed1e5bc38..26938cfeb 100644 --- a/zimbra/ldap-components/zimbra-ldap-components/debian/changelog +++ b/zimbra/ldap-components/zimbra-ldap-components/debian/changelog @@ -1,3 +1,9 @@ +zimbra-ldap-components (3.0.0-1zimbra10.0b1ZAPPEND) unstable; urgency=medium + + * ZBUG-3355, Updated core-components, OpenSSL License and other 3rd party open source licenses + + -- Zimbra Packaging Services Fri, 07 Jul 2023 05:12:55 +0000 + zimbra-ldap-components (2.0.13-1zimbra8.8b1ZAPPEND) unstable; urgency=medium * ZBUG-3355, Upgraded OpenSSL to 3.0.9 and Updated core-components to 3.0.19 diff --git a/zimbra/ldap-components/zimbra-ldap-components/debian/control b/zimbra/ldap-components/zimbra-ldap-components/debian/control index 0c0fe97ef..8b26315a6 100644 --- a/zimbra/ldap-components/zimbra-ldap-components/debian/control +++ b/zimbra/ldap-components/zimbra-ldap-components/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.9.5 Package: zimbra-ldap-components Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, - zimbra-ldap-base, zimbra-lmdb (>= 2.4.59-1zimbra8.8b6ZAPPEND), zimbra-openldap-server (>= 2.4.59-1zimbra8.8b6ZAPPEND), zimbra-openssl (>= 3.0.9-1zimbra8.8b1ZAPPEND), zimbra-openssl-lib (>= 3.0.9-1zimbra8.8b1ZAPPEND), zimbra-core-components (>= 3.0.19-1zimbra8.8b1ZAPPEND) + zimbra-ldap-base, zimbra-lmdb (>= 2.4.59-1zimbra8.8b6ZAPPEND), zimbra-openldap-server (>= 2.4.59-1zimbra8.8b6ZAPPEND), zimbra-openssl (>= 3.0.9-1zimbra8.8b1ZAPPEND), zimbra-openssl-lib (>= 3.0.9-1zimbra8.8b1ZAPPEND), zimbra-core-components (>= 4.0.0-1zimbra10.0b1ZAPPEND) Description: Zimbra components for ldap package Zimbra ldap components pulls in all the packages used by zimbra-ldap diff --git a/zimbra/ldap-components/zimbra-ldap-components/rpm/SPECS/ldap-components.spec b/zimbra/ldap-components/zimbra-ldap-components/rpm/SPECS/ldap-components.spec index 502cbdbab..f5f0dd542 100644 --- a/zimbra/ldap-components/zimbra-ldap-components/rpm/SPECS/ldap-components.spec +++ b/zimbra/ldap-components/zimbra-ldap-components/rpm/SPECS/ldap-components.spec @@ -1,12 +1,12 @@ Summary: Zimbra components for ldap package Name: zimbra-ldap-components -Version: 2.0.13 -Release: ITERATIONZAPPEND +Version: 3.0.0 +Release: 1zimbra10.0b1ZAPPEND License: GPL-2 Requires: zimbra-ldap-base, zimbra-lmdb >= 2.4.59-1zimbra8.8b6ZAPPEND Requires: zimbra-openldap-server >= 2.4.59-1zimbra8.8b6ZAPPEND Requires: zimbra-openssl >= 3.0.9-1zimbra8.8b1ZAPPEND, zimbra-openssl-libs >= 3.0.9-1zimbra8.8b1ZAPPEND -Requires: zimbra-core-components >= 3.0.19-1zimbra8.8b1ZAPPEND +Requires: zimbra-core-components >= 4.0.0-1zimbra10.0b1ZAPPEND Packager: Zimbra Packaging Services Group: Development/Languages AutoReqProv: no @@ -18,6 +18,8 @@ Zimbra ldap components pulls in all the packages used by zimbra-ldap %changelog +* Fri Jul 07 2023 Zimbra Packaging Services - 3.0.0 +- ZBUG-3355, Updated core-components, OpenSSL License and other 3rd party open source licenses * Tue Jun 13 2023 Zimbra Packaging Services - 2.0.13 - ZBUG-3355, Upgraded OpenSSL to 3.0.9 and Updated core-components to 3.0.19 * Fri Feb 10 2023 Zimbra Packaging Services - 2.0.12