commit mysql-router 2.0.3-1

5 files changed, 45 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 298edcab4916..43318b61e1fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,24 @@
+# Generated by mksrcinfo v8
+# Wed Mar 30 22:19:41 UTC 2016
 pkgbase = mysql-router
 	pkgdesc = Lightweight middleware that provides transparent routing between your application and any backend MySQL Servers
-	pkgver = 2.0.2
-	pkgrel = 2
+	pkgver = 2.0.3
+	pkgrel = 1
 	url = http://dev.mysql.com/downloads/router/
+	install = mysql-router.install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = cmake
 	makedepends = doxygen
+	makedepends = libmariadbclient
 	backup = etc/mysql/router.ini
-	source = http://cdn.mysql.com/Downloads/MySQL-Router/mysql-router-2.0.2.tar.gz
-	source = http://cdn.mysql.com/Downloads/MySQL-Router/mysql-router-2.0.2.tar.gz.asc
-	source = mysql-router.service
-	sha256sums = 7bfe805e740a843e2cb38b8449345b03d9a08a35854923a86bdc8ff6be8a7c68
+	source = http://cdn.mysql.com/Downloads/MySQL-Router/mysql-router-2.0.3.tar.gz
+	source = http://cdn.mysql.com/Downloads/MySQL-Router/mysql-router-2.0.3.tar.gz.asc
+	source = mysqlrouter.sysusers
+	sha256sums = a57ce397d9635ac5a3867e6fc77a6efa52cc7d0b35d796509967a1655a613e86
 	sha256sums = SKIP
-	sha256sums = 82de7f2a778c595bf53927fa20372dd8accdd2a708dbe710975c3f15883a7343
+	sha256sums = 8db8c99262320402b4c2e811c960291fec4a2c951bbdc0564e615f50b4f85cac
 
 pkgname = mysql-router
 
diff --git a/PKGBUILD b/PKGBUILD
index c00e25305c51..8f33cdcf8161 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,28 @@
 # Maintainer: Christian Hesse <mail@eworm.de>
 
 pkgname=mysql-router
-pkgver=2.0.2
-pkgrel=2
+pkgver=2.0.3
+pkgrel=1
 pkgdesc='Lightweight middleware that provides transparent routing between your application and any backend MySQL Servers'
 arch=('i686' 'x86_64')
 url='http://dev.mysql.com/downloads/router/'
 license=('GPL')
-makedepends=('cmake' 'doxygen')
+makedepends=('cmake' 'doxygen' 'libmariadbclient')
 backup=('etc/mysql/router.ini')
+install=mysql-router.install
 validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5')
 source=("http://cdn.mysql.com/Downloads/MySQL-Router/${pkgname}-${pkgver}.tar.gz"{,.asc}
-	'mysql-router.service')
-sha256sums=('7bfe805e740a843e2cb38b8449345b03d9a08a35854923a86bdc8ff6be8a7c68'
+        'mysqlrouter.sysusers')
+sha256sums=('a57ce397d9635ac5a3867e6fc77a6efa52cc7d0b35d796509967a1655a613e86'
             'SKIP'
-            '82de7f2a778c595bf53927fa20372dd8accdd2a708dbe710975c3f15883a7343')
+            '8db8c99262320402b4c2e811c960291fec4a2c951bbdc0564e615f50b4f85cac')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	sed -i '/^ExecStart/c ExecStart=/usr/bin/mysqlrouter --config /etc/mysql/router.ini' \
+		packaging/rpm-oel/mysqlrouter.service
+}
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
@@ -29,11 +37,14 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	make DESTDIR="${pkgdir}" install
+	chmod 0755 "${pkgdir}"/usr
 
 	# install config file
 	install -D -m0644 doc/sample_mysqlrouter.ini "${pkgdir}"/etc/mysql/router.ini
 
-	# install systemd service
-	install -D -m0644 "${srcdir}"/mysql-router.service "${pkgdir}"/usr/lib/systemd/system/mysql-router.service
+	# install systemd files
+	install -D -m0644 packaging/rpm-oel/mysqlrouter.service "${pkgdir}"/usr/lib/systemd/system/mysqlrouter.service
+	install -D -m0644 "${srcdir}"/mysqlrouter.sysusers "${pkgdir}"/usr/lib/sysusers.d/mysqlrouter.conf
+	install -D -m0644 packaging/rpm-oel/mysqlrouter.tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mysqlrouter.conf
 }
 
diff --git a/mysql-router.install b/mysql-router.install
new file mode 100644
index 000000000000..cefa0967ec95
--- /dev/null
+++ b/mysql-router.install
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+prepare() {
+	systemd-sysusers /usr/lib/sysusers.d/mysqlrouter.conf
+	systemd-tmpfiles --create
+}
+
+post_install() {
+	prepare
+}
+
+post_upgrade() {
+	prepare
+}
diff --git a/mysql-router.service b/mysql-router.service
deleted file mode 100644
index fb31835d7bef..000000000000
--- a/mysql-router.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=MySQL router
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/mysqlrouter --config /etc/mysql/router.ini
-ProtectSystem=full
-ProtectHome=on
-PrivateDevices=on
-NoNewPrivileges=on
-
-[Install]
-WantedBy=multi-user.target
diff --git a/mysqlrouter.sysusers b/mysqlrouter.sysusers
new file mode 100644
index 000000000000..571e456f695f
--- /dev/null
+++ b/mysqlrouter.sysusers
@@ -0,0 +1 @@
+u mysql - "MySQL Router" /var/run/mysqlrouter