From 249964a52d0afdfb9aa4be0bd509949b013d65fd Mon Sep 17 00:00:00 2001 From: Amit Srivastava Date: Thu, 6 Sep 2018 13:29:41 +0530 Subject: [PATCH 1/4] MariaDb version update to 10.3.9 --- versions.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.def b/versions.def index 8a14466eb..1a3c22a5c 100644 --- a/versions.def +++ b/versions.def @@ -92,7 +92,7 @@ LOGWATCH_POSTFIX := 1.40.01 MEMCACHED_VERSION := 1.4.37 -MARIADB_VERSION := 10.1.25 +MARIADB_VERSION := 10.3.9 MAVEN_VERSION := 3.3.9 From 8c1610189b08e38d04329b4dc9b3958f5ec3e659 Mon Sep 17 00:00:00 2001 From: Amit Srivastava Date: Fri, 14 Sep 2018 14:13:11 +0530 Subject: [PATCH 2/4] Updated the dependency for mariadb --- .../zimbra-store-components/debian/changelog | 5 +++++ .../zimbra-store-components/rpm/SPECS/store-components.spec | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/zimbra/store-components/zimbra-store-components/debian/changelog b/zimbra/store-components/zimbra-store-components/debian/changelog index 36b0bf703..477f8e9b4 100644 --- a/zimbra/store-components/zimbra-store-components/debian/changelog +++ b/zimbra/store-components/zimbra-store-components/debian/changelog @@ -1,3 +1,8 @@ +zimbra-store-components (1.0.2-1zimbra8.7b1ZAPPEND) unstable; urgency=low + + * Updated zimbra-mariadb package. + + -- Zimbra Packaging Services Fri, 14 Sep 2018 00:00:00 +0000 zimbra-store-components (1.0.1-1zimbra8.7b1ZAPPEND) unstable; urgency=low * Updated zimbra-mariadb package. diff --git a/zimbra/store-components/zimbra-store-components/rpm/SPECS/store-components.spec b/zimbra/store-components/zimbra-store-components/rpm/SPECS/store-components.spec index 5f8e26f6a..3406c215c 100644 --- a/zimbra/store-components/zimbra-store-components/rpm/SPECS/store-components.spec +++ b/zimbra/store-components/zimbra-store-components/rpm/SPECS/store-components.spec @@ -1,9 +1,9 @@ Summary: Zimbra components for store package Name: zimbra-store-components -Version: 1.0.1 +Version: 1.0.2 Release: 1zimbra8.7b1ZAPPEND License: GPL-2 -Requires: zimbra-store-base, zimbra-mariadb >= 10.1.25-1zimbra8.7b1ZAPPEND +Requires: zimbra-store-base, zimbra-mariadb >= 10.3.9-1zimbra8.7b1ZAPPEND Packager: Zimbra Packaging Services Group: Development/Languages AutoReqProv: no @@ -15,6 +15,8 @@ Zimbra store components pulls in all the packages used by zimbra-store %changelog +* Mon Sep 14 2018 Zimbra Packaging Services - 1.0.2 +- Updated zimbra-mariadb package * Mon Jul 24 2017 Zimbra Packaging Services - 1.0.1 - Updated zimbra-mariadb package * Wed Sep 09 2015 Zimbra Packaging Services - 1.0.0 From 4c035c00c0504e334811d68f97f92f7d655eff8c Mon Sep 17 00:00:00 2001 From: Amit Srivastava Date: Fri, 14 Sep 2018 14:55:24 +0530 Subject: [PATCH 3/4] Debian control update --- zimbra/store-components/zimbra-store-components/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zimbra/store-components/zimbra-store-components/debian/control b/zimbra/store-components/zimbra-store-components/debian/control index 47108285b..4e0fe87d4 100644 --- a/zimbra/store-components/zimbra-store-components/debian/control +++ b/zimbra/store-components/zimbra-store-components/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.9.5 Package: zimbra-store-components Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, - zimbra-store-base, zimbra-mariadb (>= 10.1.25-1zimbra8.7b1ZAPPEND) + zimbra-store-base, zimbra-mariadb (>= 10.3.9-1zimbra8.7b1ZAPPEND) Description: Zimbra components for store package Zimbra store components pulls in all the packages used by zimbra-store From 5fece60750b5b7fd4c2c04cc34a86135c693b5a2 Mon Sep 17 00:00:00 2001 From: Amit Srivastava Date: Mon, 17 Sep 2018 13:36:24 +0530 Subject: [PATCH 4/4] Fix the bug of missing soft link issue --- thirdparty/mariadb/zimbra-mariadb/debian/rules | 2 ++ thirdparty/mariadb/zimbra-mariadb/rpm/SPECS/mariadb.spec | 2 ++ 2 files changed, 4 insertions(+) diff --git a/thirdparty/mariadb/zimbra-mariadb/debian/rules b/thirdparty/mariadb/zimbra-mariadb/debian/rules index 247a866bf..60caf664f 100755 --- a/thirdparty/mariadb/zimbra-mariadb/debian/rules +++ b/thirdparty/mariadb/zimbra-mariadb/debian/rules @@ -53,6 +53,8 @@ override_dh_auto_install: rm -f $$(pwd)/debian/tmpOZCL/libmysqlclient_r.so.18 rm -f $$(pwd)/debian/tmpOZCL/libmysqlclient_r.so.18.0.0 cd $$(pwd)/debian/tmpOZCL && \ + ln -s libmariadb.so.3 libmysqlclient.so.18 && \ + ln -s libmariadb.so.3 libmysqlclient.so.18.0.0 && \ ln -s libmysqlclient.so.18.0.0 libmysqlclient_r.so.18.0.0 && \ ln -s libmysqlclient.so.18 libmysqlclient_r.so.18 diff --git a/thirdparty/mariadb/zimbra-mariadb/rpm/SPECS/mariadb.spec b/thirdparty/mariadb/zimbra-mariadb/rpm/SPECS/mariadb.spec index 63c91dbe8..30a97d31c 100644 --- a/thirdparty/mariadb/zimbra-mariadb/rpm/SPECS/mariadb.spec +++ b/thirdparty/mariadb/zimbra-mariadb/rpm/SPECS/mariadb.spec @@ -69,6 +69,8 @@ rm -f ${RPM_BUILD_ROOT}OZC/sbin/rcmysql rm -f ${RPM_BUILD_ROOT}OZCL/libmysqlclient_r.so.18 rm -f ${RPM_BUILD_ROOT}OZCL/libmysqlclient_r.so.18.0.0 cd ${RPM_BUILD_ROOT}OZCL && \ +ln -s libmariadb.so.3 libmysqlclient.so.18 && \ +ln -s libmariadb.so.3 libmysqlclient.so.18.0.0 && \ ln -s libmysqlclient.so.18.0.0 libmysqlclient_r.so.18.0.0 && \ ln -s libmysqlclient.so.18 libmysqlclient_r.so.18