Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix/zcs 5928 #84

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Bugfix/zcs 5928 #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
249964a
MariaDb version update to 10.3.9
srivastava-ami Sep 6, 2018
8c16101
Updated the dependency for mariadb
Sep 14, 2018
4c035c0
Debian control update
Sep 14, 2018
5fece60
Fix the bug of missing soft link issue
Sep 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions thirdparty/mariadb/zimbra-mariadb/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please include some evidence of the issue. The commit comment describes the fix not why it was done. What breaks if this is not done?

As an aside, it seems odd to have different versions on the shared libraries (but clearly if it is necessary, then fine)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue was following with the MTA restart. I added it as a comment in ZCS-5928 already.

Starting saslauthd...done.
/opt/zimbra/common/sbin/postalias: error while loading shared libraries: libmysqlclient.so.18: cannot open shared object file: No
such file or directory
/opt/zimbra/common/sbin/postfix: error while loading shared libraries: libmysqlclient.so.18: cannot open shared object file: No such file or directory

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

Expand Down
2 changes: 2 additions & 0 deletions thirdparty/mariadb/zimbra-mariadb/rpm/SPECS/mariadb.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion versions.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions zimbra/store-components/zimbra-store-components/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
zimbra-store-components (1.0.2-1zimbra8.7b1ZAPPEND) unstable; urgency=low

* Updated zimbra-mariadb package.

-- Zimbra Packaging Services <[email protected]> Fri, 14 Sep 2018 00:00:00 +0000
zimbra-store-components (1.0.1-1zimbra8.7b1ZAPPEND) unstable; urgency=low

* Updated zimbra-mariadb package.
Expand Down
2 changes: 1 addition & 1 deletion zimbra/store-components/zimbra-store-components/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 deletions zimbra/store-components/zimbra-store-components/rpm/SPECS/store-components.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
Group: Development/Languages
AutoReqProv: no
Expand All @@ -15,6 +15,8 @@ Zimbra store components pulls in all the packages used by
zimbra-store

%changelog
* Mon Sep 14 2018 Zimbra Packaging Services <[email protected]> - 1.0.2
- Updated zimbra-mariadb package
* Mon Jul 24 2017 Zimbra Packaging Services <[email protected]> - 1.0.1
- Updated zimbra-mariadb package
* Wed Sep 09 2015 Zimbra Packaging Services <[email protected]> - 1.0.0
Expand Down