update version to v2.0.7

Signed-off-by: Matthew McGinn <mamcgi@gmail.com>

6 files changed, 27 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 78ad62e8cf0f..cebb297e7d96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Wed Jun 20 22:58:41 UTC 2018
 pkgbase = proxysql
 	pkgdesc = High-performance MySQL proxy with a GPL license
-	pkgver = 1.4.9
-	pkgrel = 2
+	pkgver = 2.0.7
+	pkgrel = 1
 	url = http://proxysql.com
 	arch = x86_64
 	arch = amd64
@@ -18,10 +16,12 @@ pkgbase = proxysql
 	makedepends = patch
 	depends = openssl
 	provides = proxysql
-	source = https://github.com/sysown/proxysql/archive/v1.4.9.tar.gz
-	source = curl.patch
-	sha256sums = 28ee75735716ab2e882b377466f37f5836ce108cfcfe4cf36f31574f81cce401
-	sha256sums = dda1b8905f6192917b7b1d73148580d3f8c31a3011cc2699ef48189cc981d5fa
+	source = https://github.com/sysown/proxysql/archive/v2.0.7.tar.gz
+	source = proxysql.sysusers
+	source = proxysql.tmpfiles
+	sha256sums = 2340dfe14946b2057bebeaacf6b9e149e28fb397bd4f658f9a49b3f2241f6207
+	sha256sums = 8b074c0d72e4b66349a84a13fdb65918145fcaf6a8697ba99304bd603d097735
+	sha256sums = 6f48bd54c6b8592cd84006e991d3cbd8b38a460c6e72091acdca05f6781ae380
 
 pkgname = proxysql
 
diff --git a/.gitignore b/.gitignore
index 26ea83fd2ca2..0327ea44c21b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,8 @@
 !LICENSE
 !.SRCINFO
 !*.patch
-!*.desktop
+!*.sysusers
+!*.tmpfiles
 !*.install
 !*.service
 !*.sh
diff --git a/PKGBUILD b/PKGBUILD
index b337daa498da..ddd6013e4377 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,32 @@
 # Maintainer: Matthew McGinn <mamcgi@gmail.com>
 pkgname=proxysql
-pkgver=1.4.9
-pkgrel=2
+pkgver=2.0.7
+pkgrel=1
 pkgdesc="High-performance MySQL proxy with a GPL license"
 arch=('x86_64' 'amd64')
 url="http://proxysql.com"
+_github_url="https://github.com/sysown/${pkgname}"
 license=('GPL')
 makedepends=('cmake' 'automake' 'bzip2' 'make' 'gcc' 'git' 'openssl' 'patch')
 depends=('openssl')
 provides=('proxysql')
 source=("https://github.com/sysown/${pkgname}/archive/v${pkgver}.tar.gz"
-        "curl.patch")
-sha256sums=('28ee75735716ab2e882b377466f37f5836ce108cfcfe4cf36f31574f81cce401'
-            'dda1b8905f6192917b7b1d73148580d3f8c31a3011cc2699ef48189cc981d5fa')
+	"proxysql.sysusers"
+	"proxysql.tmpfiles")
+sha256sums=('2340dfe14946b2057bebeaacf6b9e149e28fb397bd4f658f9a49b3f2241f6207'
+            '8b074c0d72e4b66349a84a13fdb65918145fcaf6a8697ba99304bd603d097735'
+            '6f48bd54c6b8592cd84006e991d3cbd8b38a460c6e72091acdca05f6781ae380')
 
 build() {
 	cd "${pkgname}-${pkgver}"
-        patch -p1 "./deps/Makefile" < "${srcdir}/curl.patch"
-        make cleanall
-        make
+	make cleanall
+	make
 }
 
 package() {
-        useradd mysql
-        groupadd mysql
-        install -Dm 0755 "${srcdir}/${pkgname}-${pkgver}/src/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-        install -Dm 0600 "${srcdir}/${pkgname}-${pkgver}/etc/${pkgname}.cnf" "${pkgdir}/etc/${pkgname}.cnf"
-        mkdir -p "${pkgdir}/var/lib/${pkgname}" 
-        install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+	install -Dm 0755 "${pkgname}-${pkgver}/src/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+	install -o "${pkgname}" -g "${pkgname}" -Dm 0600 "${pkgname}-${pkgver}/etc/${pkgname}.cnf" "${pkgdir}/etc/${pkgname}.cnf"
+	install -Dm 0644 "${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+	install -Dm 0644 "${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+	install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/systemd/system/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
 }
diff --git a/curl.patch b/curl.patch
deleted file mode 100644
index 8b79c30ff3c9..000000000000
--- a/curl.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-23c23
-< 	cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli && CC=${CC} CXX=${CXX} ${MAKE}
----
-> 	cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --without-libpsl --without-librtmp && CC=${CC} CXX=${CXX} ${MAKE}
diff --git a/proxysql.sysusers b/proxysql.sysusers
new file mode 100644
index 000000000000..7dde84fd44cc
--- /dev/null
+++ b/proxysql.sysusers
@@ -0,0 +1 @@
+u proxysql - - /var/lib/proxysql
diff --git a/proxysql.tmpfiles b/proxysql.tmpfiles
new file mode 100644
index 000000000000..3aaf659a035e
--- /dev/null
+++ b/proxysql.tmpfiles
@@ -0,0 +1 @@
+d /var/lib/proxysql 0750 proxysql proxysql -