Skip to content

Commit

Permalink
ZCS-13919:Changes for Ubuntu22 support
Browse files Browse the repository at this point in the history
  • Loading branch information
umagmrit committed Sep 13, 2024
1 parent 624f83b commit 88a81bf
Show file tree
Hide file tree
Showing 195 changed files with 210 additions and 202 deletions.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/amavisd/zimbra-amavisd/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/apr-util/zimbra-apr-util/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/apr/zimbra-apr/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/aspell-ar/zimbra-aspell-ar/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/aspell-ca/zimbra-aspell-ca/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/aspell-da/zimbra-aspell-da/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/aspell-de/zimbra-aspell-de/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/aspell-en/zimbra-aspell-en/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/aspell-es/zimbra-aspell-es/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/aspell-fr/zimbra-aspell-fr/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/aspell-hi/zimbra-aspell-hi/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/aspell-hu/zimbra-aspell-hu/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/aspell-it/zimbra-aspell-it/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/aspell-nl/zimbra-aspell-nl/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/aspell-pl/zimbra-aspell-pl/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/aspell-pt-br/zimbra-aspell-pt-br/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/aspell-ru/zimbra-aspell-ru/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/aspell-sv/zimbra-aspell-sv/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/aspell/zimbra-aspell/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/bdb/zimbra-bdb/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/clamav-db/zimbra-clamav-db/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/clamav/zimbra-clamav/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/cluebringer/zimbra-cluebringer/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/curl/zimbra-curl/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/cyrus-sasl/zimbra-cyrus-sasl/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/erlang/zimbra-erlang/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/freetype/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pvers := $(FREETYPE_VERSION)
pname := freetype
pfile := $(pname)-$(pvers).tar.gz
psrc_file := $(SRC_DIR)/$(pfile)
purl := http://download.savannah.gnu.org/releases/freetype/$(pfile)
purl := http://download.savannah.gnu.org/releases/freetype/freetype-old/$(pfile)
zname := zimbra-$(pname)
zspec := $(pname).spec

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/freetype/zimbra-freetype/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/heimdal/zimbra-heimdal/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/heimdal/zimbra-heimdal/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export DEB_CXXFLAGS_MAINT_APPEND=-D_REENTRANT
export DEB_CPPFLAGS_MAINT_APPEND=-IOZCI

%:
dh $@
dh $@ --without autoreconf
override_dh_auto_configure:
./configure --prefix=OZC \
--sysconfdir=/etc \
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/httpd/zimbra-httpd/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/libart/zimbra-libart/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/libltdl/zimbra-libltdl/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/libltdl/zimbra-libltdl/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export DEB_BUILD_OPTIONS=nocheck
export DEB_LDFLAGS_MAINT_APPEND=-Wl,-rpath,OZCL

%:
dh $@
dh $@ --without autoreconf
override_dh_auto_configure:
./configure --prefix=OZC \
--disable-static --datarootdir=OZCS
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/libmilter/zimbra-libmilter/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/libpng/zimbra-libpng/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/libxml2/zimbra-libxml2/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/net-snmp/zimbra-net-snmp/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
zimbra-net-snmp (VERSION-1zimbra8.7b3ZAPPEND) unstable; urgency=medium
zimbra-net-snmp (VERSION-1zimbra8.7b4ZAPPEND) unstable; urgency=medium

* ZBUG-3355, Upgraded OpenSSL to 3.0.9

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/net-snmp/zimbra-net-snmp/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/net-snmp/zimbra-net-snmp/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export DEB_BUILD_OPTIONS=nocheck
export DEB_LDFLAGS_MAINT_APPEND=-Wl,-rpath,OZCL

%:
dh $@
dh $@ --without autoreconf

override_dh_auto_configure:
./configure --prefix=OZC \
Expand Down
4 changes: 2 additions & 2 deletions thirdparty/net-snmp/zimbra-net-snmp/rpm/SPECS/net-snmp.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Zimbra's NetSNMP build
Name: zimbra-net-snmp
Version: VERSION
Release: 1zimbra8.7b3ZAPPEND
Release: 1zimbra8.7b4ZAPPEND
License: BSD
Source: %{name}-%{version}.tar.gz
BuildRequires: zimbra-openssl-devel >= 3.0.9-1zimbra8.8b1ZAPPEND
Expand All @@ -17,7 +17,7 @@ The Zimbra NetSNMP build
%define debug_package %{nil}

%changelog
* Tue Jun 13 2023 Zimbra Packaging Services <[email protected]> - VERSION-1zimbra8.7b3ZAPPEND
* Tue Jun 13 2023 Zimbra Packaging Services <[email protected]> - VERSION-1zimbra8.7b4ZAPPEND
- ZBUG-3355, Upgraded OpenSSL to 3.0.9
* Tue Aug 10 2021 Zimbra Packaging Services <[email protected]> - VERSION-1zimbra8.7b3ZAPPEND
- Upgraded dependency openssl to 1.1.1k
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/nginx/zimbra-nginx/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/opendkim/zimbra-opendkim/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/openjdk/zimbra-openjdk/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/openldap/zimbra-openldap/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/openldap/zimbra-openldap/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export DEB_CPPFLAGS_MAINT_APPEND=-IOZCI
MAKEVARS := STRIP=

%:
dh $@
dh $@ --without autoreconf
override_dh_auto_configure:
./configure --prefix=OZC \
--with-cyrus-sasl \
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/openssl/zimbra-openssl/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/openssl/zimbra-openssl/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export DEB_LDFLAGS_MAINT_APPEND="-LOZCL -ROZCL -Wl,-rpath,OZCL"
# However, due to the above bug, we need to override LD_RUN_PATH as well, as seen below

%:
dh $@
dh $@ --without autoreconf
override_dh_auto_configure:
./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 \
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/perl-db-file/zimbra-perl-db-file/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/perl-dbi/zimbra-perl-dbi/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/perl-error/zimbra-perl-error/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion thirdparty/perl-innotop/zimbra-perl-innotop/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/make -f

%:
dh $@
dh $@ --without autoreconf

override_dh_auto_configure:
perl -I OZCL/perl5 Makefile.PL INSTALL_BASE=OZC \
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/perl-io-html/zimbra-perl-io-html/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/make -f

%:
dh $@
dh $@ --without autoreconf

override_dh_auto_configure:
perl -I OZCL/perl5 Makefile.PL INSTALL_BASE=OZC \
Expand All @@ -12,13 +12,13 @@ override_dh_auto_configure:
override_dh_perl:
dh_perl OZCL/perl5

override_dh_auto_test:
PERL5LIB=OZCL/perl5 dh_auto_test

# remove .packlist and perllocal.pod
# $(DESTINSTALLSITEARCH)/auto/$(FULLEXT)/.packlist
# $(DESTINSTALLSITEARCH)/perllocal.pod
PERL_ARCHNAME := $(shell perl -MConfig -e 'print $$Config{archname}')
override_dh_auto_install:
dh_auto_install
rm -rf $(CURDIR)/debian/$(shell dh_listpackages)/OZCL/perl5/$(PERL_ARCHNAME)

override_dh_auto_test:
true
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
Loading

0 comments on commit 88a81bf

Please sign in to comment.