Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/343602 )

Change subject: mariadb: update files for mariadb 10.0.30 and mariadb 10.1.22
......................................................................

mariadb: update files for mariadb 10.0.30 and mariadb 10.1.22

Change-Id: Ia6945f228da8e19a305711a3a640af515c9a2dcd
---
M dbtools/control-mariadb-10.0
M dbtools/control-mariadb-10.1
M dbtools/control-mariadb-client-10.1
M dbtools/mariadb-deb-postinst.tpl.sh
M dbtools/mariadb-deb-postrm.tpl.sh
5 files changed, 12 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/02/343602/1

diff --git a/dbtools/control-mariadb-10.0 b/dbtools/control-mariadb-10.0
index 1ab1805..4784899 100644
--- a/dbtools/control-mariadb-10.0
+++ b/dbtools/control-mariadb-10.0
@@ -1,12 +1,12 @@
 Package: wmf-mariadb10
-Version: 10.0.29-2
+Version: 10.0.30-1
 Section: misc
 Priority: optional
 Architecture: amd64
 Maintainer: Jaime Crespo <jcre...@wikimedia.org>
-Description: MariaDB plus patches.
+Description: MariaDB 10.0 with Wikimedia-specific patches.
 Depends: libaio1 (>= 0.3.93), libncurses5, libjemalloc1, libdbi-perl,
          perl (>= 5.6), psmisc, debconf (>= 0.5) | debconf-2.0,
          libaio1 (>= 0.3.93), libc6 (>= 2.17), libpam0g (>= 0.99.7.1),
-         libstdc++6 (>= 4.9), zlib1g (>= 1:1.2.0)
+         libstdc++6 (>= 4.9), libssl1.0.0, zlib1g (>= 1:1.2.0)
 
diff --git a/dbtools/control-mariadb-10.1 b/dbtools/control-mariadb-10.1
index 5d0d067..54b3a8d 100644
--- a/dbtools/control-mariadb-10.1
+++ b/dbtools/control-mariadb-10.1
@@ -1,11 +1,12 @@
 Package: wmf-mariadb101
-Version: 10.1.21-2
+Version: 10.1.22-1
 Section: misc
 Priority: optional
 Architecture: amd64
 Maintainer: Jaime Crespo <jcre...@wikimedia.org>
-Description: MariaDB plus patches.
+Description: MariaDB 10.0 with Wikimedia-specific patches.
 Depends: libaio1 (>= 0.3.93), libncurses5, libjemalloc1, libdbi-perl,
          perl (>= 5.6), psmisc, debconf (>= 0.5) | debconf-2.0,
          libaio1 (>= 0.3.93), libc6 (>= 2.17), libpam0g (>= 0.99.7.1),
-         libstdc++6 (>= 4.9), zlib1g (>= 1:1.2.0), liblz4-1
+         libstdc++6 (>= 4.9), libssl1.0.0, zlib1g (>= 1:1.2.0),
+         liblz4-1
diff --git a/dbtools/control-mariadb-client-10.1 
b/dbtools/control-mariadb-client-10.1
index 8cdd664..5f6645d 100644
--- a/dbtools/control-mariadb-client-10.1
+++ b/dbtools/control-mariadb-client-10.1
@@ -1,10 +1,11 @@
 Package: wmf-mariadb101-client
-Version: 10.1.21-1
+Version: 10.1.22-1
 Section: misc
 Priority: optional
 Architecture: amd64
 Maintainer: Jaime Crespo <jcre...@wikimedia.org>
-Description: MariaDB 10.1 client only.
+Depends: libssl1.0.0
+Description: MariaDB 10.1 client only with Wikimedia-spefic patches.
  This package installs all mysql client utilities, but not the
  mysql server. No need to install it if the server is already installed
  (the server already contains all clients).
diff --git a/dbtools/mariadb-deb-postinst.tpl.sh 
b/dbtools/mariadb-deb-postinst.tpl.sh
index 835f057..5d60e4d 100755
--- a/dbtools/mariadb-deb-postinst.tpl.sh
+++ b/dbtools/mariadb-deb-postinst.tpl.sh
@@ -11,5 +11,6 @@
 
 update-alternatives --install /usr/local/bin/mysqlbinlog mysqlbinlog 
$basedir/bin/mysqlbinlog 1
 update-alternatives --install /usr/local/bin/mysql_upgrade mysql_upgrade 
$basedir/bin/mysql_upgrade 1
+update-alternatives --install /usr/local/bin/mysqlcheck mysqlcheck 
$basedir/bin/mysqlcheck 1
 
 exit 0
diff --git a/dbtools/mariadb-deb-postrm.tpl.sh 
b/dbtools/mariadb-deb-postrm.tpl.sh
index 8492936..c35a46d 100755
--- a/dbtools/mariadb-deb-postrm.tpl.sh
+++ b/dbtools/mariadb-deb-postrm.tpl.sh
@@ -10,6 +10,7 @@
 
 update-alternatives --remove mysqlbinlog $basedir/bin/mysqlbinlog
 update-alternatives --remove mysql_upgrade $basedir/bin/mysql_upgrade
+update-alternatives --remove mysqlcheck $basedir/bin/mysqlcheck
 
 # Handled automatically
 # rmdir --ignore-fail-on-non-empty /usr/local/bin

-- 
To view, visit https://gerrit.wikimedia.org/r/343602
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6945f228da8e19a305711a3a640af515c9a2dcd
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Jcrespo <jcre...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to