From 4ecdce07388e3d0430157335100b8dbc12302f5a Mon Sep 17 00:00:00 2001
From: David Beauchamp <david@archlinuxarm.org>
Date: Mon, 29 Apr 2024 15:29:17 -0400
Subject: [PATCH] extra/percona-server to 8.3.0_1-1

---
 extra/percona-server/.SRCINFO | 20 ++++++++------------
 extra/percona-server/PKGBUILD | 15 +++++----------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/extra/percona-server/.SRCINFO b/extra/percona-server/.SRCINFO
index c9502542f..463182ec3 100644
--- a/extra/percona-server/.SRCINFO
+++ b/extra/percona-server/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = percona-server
-	pkgver = 8.1.0_1
-	pkgrel = 3
+	pkgver = 8.3.0_1
+	pkgrel = 1
 	url = https://www.percona.com/software/mysql-database/percona-server
 	arch = x86_64
 	license = GPL
@@ -18,20 +18,17 @@ pkgbase = percona-server
 	makedepends = doxygen
 	makedepends = graphviz
 	makedepends = libevent
-	makedepends = protobuf
 	makedepends = libfido2
-	source = https://www.percona.com/downloads/Percona-Server-8.1/Percona-Server-8.1.0-1/source/tarball/percona-server-8.1.0-1.tar.gz
+	source = https://www.percona.com/downloads/Percona-Server-8.3/Percona-Server-8.3.0-1/source/tarball/percona-server-8.3.0-1.tar.gz
 	source = https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.gz
 	source = my.cnf
 	source = mysql-user.conf
 	source = mysqlrouter-user.conf
-	source = protobuf-23.patch
-	sha256sums = 9b85c50cc2e70cfbdb86da6ff2a7235413663f8619215a5a55831da0c3f0d8d3
+	sha256sums = 19eba27f3a82912b666f8a986bcd78ed7047bcca206307ec9f41721dd3b85848
 	sha256sums = 5347464af5b14ac54bb945dc68f1dd7c56f0dad7262816b956138fc53bcc0131
 	sha256sums = b467b04d6d06152b2abc33f2a6de63fef0fc922dd5119d2ee1d07d3c1a489731
 	sha256sums = 5d7710fe88ec6d298175a309c0b776142397b119c468830b2865980292ed5da6
 	sha256sums = 4ca7ffdcb2d1716d4f31e4c7dd314e5d76e64f13fdc67c5d81c53650b793f5e0
-	sha256sums = 2d73c79f355eaf3c0bced0f0da6ad099323f4f489d5cddb609cf01af5a617305
 
 pkgname = libperconaserverclient
 	pkgdesc = Percona Server client libraries
@@ -50,8 +47,8 @@ pkgname = percona-server-clients
 	depends = openssl
 	depends = jemalloc
 	depends = readline
-	provides = mysql-clients=8.1.0_1
-	provides = mariadb-clients=8.1.0_1
+	provides = mysql-clients=8.3.0_1
+	provides = mariadb-clients=8.3.0_1
 	conflicts = mysql-clients
 
 pkgname = percona-server
@@ -67,11 +64,10 @@ pkgname = percona-server
 	depends = libtirpc
 	depends = curl
 	depends = libevent
-	depends = protobuf
 	depends = icu
 	optdepends = perl-dbd-mysql
-	provides = mysql=8.1.0_1
-	provides = mariadb=8.1.0_1
+	provides = mysql=8.3.0_1
+	provides = mariadb=8.3.0_1
 	conflicts = mysql
 	options = emptydirs
 	backup = etc/mysql/my.cnf
diff --git a/extra/percona-server/PKGBUILD b/extra/percona-server/PKGBUILD
index 9fd088ddf..f4a6ff88c 100644
--- a/extra/percona-server/PKGBUILD
+++ b/extra/percona-server/PKGBUILD
@@ -6,14 +6,14 @@
 
 pkgbase=percona-server
 pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server')
-pkgver=8.1.0_1
+pkgver=8.3.0_1
 _boost_ver=1.77.0
 _pkgver=${pkgver/_/-}
 _myver=${pkgver/_rel*}
-pkgrel=3
+pkgrel=1
 arch=('x86_64')
 makedepends=('cmake' 'zlib' 'lz4' 'zstd' 'libaio' 'systemd-tools' 'pam' 'numactl' 'jemalloc' 'openssl'
-             'rpcsvc-proto' 'doxygen' 'graphviz' 'libevent' 'protobuf' 'libfido2') # 'boost'
+             'rpcsvc-proto' 'doxygen' 'graphviz' 'libevent' 'libfido2') # 'boost'
 license=('GPL')
 url="https://www.percona.com/software/mysql-database/percona-server"
 source=("https://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-$_pkgver/source/tarball/percona-server-$_pkgver.tar.gz"
@@ -21,22 +21,18 @@ source=("https://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona
         'my.cnf'
         'mysql-user.conf'
         'mysqlrouter-user.conf'
-        'protobuf-23.patch'
         '0001-fix-LF_PINS-padding-calculation.patch')
-sha256sums=('9b85c50cc2e70cfbdb86da6ff2a7235413663f8619215a5a55831da0c3f0d8d3'
+sha256sums=('19eba27f3a82912b666f8a986bcd78ed7047bcca206307ec9f41721dd3b85848'
             '5347464af5b14ac54bb945dc68f1dd7c56f0dad7262816b956138fc53bcc0131'
             'b467b04d6d06152b2abc33f2a6de63fef0fc922dd5119d2ee1d07d3c1a489731'
             '5d7710fe88ec6d298175a309c0b776142397b119c468830b2865980292ed5da6'
             '4ca7ffdcb2d1716d4f31e4c7dd314e5d76e64f13fdc67c5d81c53650b793f5e0'
-            '2d73c79f355eaf3c0bced0f0da6ad099323f4f489d5cddb609cf01af5a617305'
             'aa5e960625843b061f47c32b4a267fab1115667b8b7d1ce7ec952efe42eb77af')
 
 prepare() {
 	cd $pkgbase-$_pkgver
 	rm -v sql/sql_yacc.{cc,h}
 
-        patch -p1 -i ../protobuf-23.patch
-
 	sed -r -e s@/var/run/mysqlrouter@/run/mysqlrouter@ \
 	       -e s@lib64/mysql@lib/mysql@ \
 	       -i cmake/install_layout.cmake
@@ -93,7 +89,6 @@ build() {
 		-DWITH_SSL=system \
 		-DWITH_ICU=system \
 		-DWITH_LIBEVENT=system \
-		-DWITH_PROTOBUF=system \
 		-DWITH_FIDO=system \
 		-DWITH_ENCRYPTION_UDF=ON \
 		-DWITH_KEYRING_VAULT=ON \
@@ -163,7 +158,7 @@ package_percona-server() {
 	pkgdesc='Drop-in replacement for MySQL that provides improved performance, diagnostics, instrumentation and MyRocks storage engine'
 	backup=('etc/mysql/my.cnf' 'etc/mysqlrouter/mysqlrouter.conf')
 	depends=('libaio' 'systemd-tools' 'pam' 'jemalloc' 'numactl' 'lz4' 'zstd' 'openssl' 'libtirpc' 'curl'
-	         'libevent' 'protobuf' 'icu') # 'boost-libs'
+	         'libevent' 'icu') # 'boost-libs'
 	optdepends=('perl-dbd-mysql')
 	conflicts=('mysql')
 	provides=("mysql=$_myver" "mariadb=$_myver")