summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD37
-rw-r--r--deps-makefile.patch10
4 files changed, 42 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 42439ef4fbdf..766ffebaa384 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = proxysql
pkgdesc = High-performance MySQL proxy with a GPL license
- pkgver = 2.0.8
- pkgrel = 2
+ pkgver = 2.0.11
+ pkgrel = 1
url = http://proxysql.com
arch = x86_64
arch = amd64
@@ -12,16 +12,20 @@ pkgbase = proxysql
makedepends = make
makedepends = gcc
makedepends = git
- makedepends = openssl
makedepends = patch
depends = openssl
+ depends = gnutls
provides = proxysql
backup = etc/proxysql.cnf
- source = https://github.com/sysown/proxysql/archive/v2.0.8.tar.gz
+ source = https://github.com/sysown/proxysql/archive/v2.0.11.tar.gz
source = proxysql.sysusers
+ source = https://raw.githubusercontent.com/xginn8/aur-bldr/master/patches/proxysql/libinjection_python_port.patch
+ source = deps-makefile.patch
source = proxysql.tmpfiles
- sha256sums = 06493dce04e29e81c5e1085070e8c0762f6900b8ab7055b0f80dc78a038e0861
+ sha256sums = 4113659363f9bc0c8654414837852fe6f1b9c75ba271efce2edcc8cc47a3ffdc
sha256sums = 8b074c0d72e4b66349a84a13fdb65918145fcaf6a8697ba99304bd603d097735
+ sha256sums = fadc103f88e699d0920f617ad9982a76504673a00aba0e2d4c0223bbc9a1a4a6
+ sha256sums = 74c96841767a6b97d42e8abf13c21838602f20538d99f73bbd1971a5237ea3d1
sha256sums = 6f48bd54c6b8592cd84006e991d3cbd8b38a460c6e72091acdca05f6781ae380
pkgname = proxysql
diff --git a/.gitignore b/.gitignore
index ba3aea681b11..4ca598e5cf12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
!COPYRIGHT
!LICENSE
!PKGBUILD
+libinjection_python_port.patch
diff --git a/PKGBUILD b/PKGBUILD
index 9bde868ef99d..814f6a5add8d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,40 @@
# Maintainer: Matthew McGinn <mamcgi@gmail.com>
pkgname=proxysql
-pkgver=2.0.8
-pkgrel=2
+pkgver=2.0.11
+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/proxysql"
license=('GPL')
-makedepends=('cmake' 'automake' 'bzip2' 'make' 'gcc' 'git' 'openssl' 'patch')
-depends=('openssl')
+makedepends=('cmake' 'automake' 'bzip2' 'make' 'gcc' 'git' 'patch')
+depends=('openssl' 'gnutls')
provides=('proxysql')
backup=("etc/proxysql.cnf")
+# This patch pulled from GitHub is too big for the AUR, so need to pull it externally from author's GH.
+# Pending this issue: https://github.com/sysown/proxysql/issues/2561
source=("https://github.com/sysown/${pkgname}/archive/v${pkgver}.tar.gz"
- "proxysql.sysusers"
- "proxysql.tmpfiles")
-sha256sums=('06493dce04e29e81c5e1085070e8c0762f6900b8ab7055b0f80dc78a038e0861'
+ "proxysql.sysusers"
+ "https://raw.githubusercontent.com/xginn8/aur-bldr/master/patches/${pkgname}/libinjection_python_port.patch"
+ "deps-makefile.patch"
+ "proxysql.tmpfiles")
+sha256sums=('4113659363f9bc0c8654414837852fe6f1b9c75ba271efce2edcc8cc47a3ffdc'
'8b074c0d72e4b66349a84a13fdb65918145fcaf6a8697ba99304bd603d097735'
+ 'fadc103f88e699d0920f617ad9982a76504673a00aba0e2d4c0223bbc9a1a4a6'
+ '74c96841767a6b97d42e8abf13c21838602f20538d99f73bbd1971a5237ea3d1'
'6f48bd54c6b8592cd84006e991d3cbd8b38a460c6e72091acdca05f6781ae380')
build() {
- cd "${pkgname}-${pkgver}"
- make cleanall
- make
+ cd "${pkgname}-${pkgver}"
+ make cleanall
+ patch -p0 < "${srcdir}/deps-makefile.patch"
+ make
}
package() {
- install -Dm 0755 "${srcdir}/${pkgname}-${pkgver}/src/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
- 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"
- install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/etc/${pkgname}.cnf" "${pkgdir}/etc/${pkgname}.cnf"
+ install -Dm 0755 "${srcdir}/${pkgname}-${pkgver}/src/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+ 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"
+ install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/etc/${pkgname}.cnf" "${pkgdir}/etc/${pkgname}.cnf"
}
diff --git a/deps-makefile.patch b/deps-makefile.patch
new file mode 100644
index 000000000000..45b334da68e0
--- /dev/null
+++ b/deps-makefile.patch
@@ -0,0 +1,10 @@
+--- deps/Makefile 2020-02-25 09:30:39.000000000 -0500
++++ deps/Makefile.new 2020-05-08 10:30:36.885245685 -0400
+@@ -27,6 +27,7 @@
+ libinjection/libinjection/src/libinjection.a:
+ cd libinjection && rm -rf libinjection-3.10.0 || true
+ cd libinjection && tar -zxf libinjection-3.10.0.tar.gz
++ cd libinjection && patch -p0 < ../../../libinjection_python_port.patch
+ cd libinjection/libinjection && CC=${CC} CXX=${CXX} ${MAKE}
+ libinjection: libinjection/libinjection/src/libinjection.a
+