[arch-commits] Commit in perl-dbd-mysql/trunk (PKGBUILD mariadb-fix.patch)

[Felix Yan]

    Date: Sunday, December 30, 2018 @ 19:59:19
  Author: felixonmars
Revision: 342819

upgpkg: perl-dbd-mysql 4.049-1

Modified:
  perl-dbd-mysql/trunk/PKGBUILD
Deleted:
  perl-dbd-mysql/trunk/mariadb-fix.patch

-------------------+
 PKGBUILD          |   14 +++-----------
 mariadb-fix.patch |   19 -------------------
 2 files changed, 3 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-30 19:59:11 UTC (rev 342818)
+++ PKGBUILD	2018-12-30 19:59:19 UTC (rev 342819)
@@ -4,7 +4,7 @@
 # Contributor: Eric Johnson <eric at coding-zone.com>
 
 pkgname=perl-dbd-mysql
-pkgver=4.048
+pkgver=4.049
 pkgrel=1
 pkgdesc='Perl/CPAN DBD::mysql module for interacting with MySQL via DBD'
 arch=('x86_64')
@@ -14,17 +14,9 @@
 makedepends=('perl-devel-checklib')
 checkdepends=('mariadb' 'perl-test-deep')
 options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/M/MI/MICHIELB/DBD-mysql-${pkgver}.tar.gz
-        mariadb-fix.patch)
-sha512sums=('30a3c9d38f9331a20e2c4c65bfbb547443d888afb35c7fd42c8220797d8ecf79640d95736a6fb3ebc4df71c25366e93c19ba37b258aa17e7c5623a1404607e62'
-            '12a54c184240babe3d35391122dbdd37de34f673cf411ddaeb89d1d2eb4e5edf3c2a3b3bd01e79da8f11b90a8b77102f52505683eea293ff4b0b764ee427bcc3')
+source=(http://search.cpan.org/CPAN/authors/id/D/DV/DVEEDEN/DBD-mysql-${pkgver}.tar.gz)
+sha512sums=('e0e1376927be3afd366e3fff4e221e8ecc57339644c8e420e34b9e45a802e2a2a2c294fdd7ca0c59a84d6236f7d0e8fd2000b5da8f6839444d3318e3b7d9b422')
 
-prepare() {
-  cd DBD-mysql-$pkgver
-  # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=231271
-  patch -p0 -i ../mariadb-fix.patch
-}
-
 build() {
   cd DBD-mysql-$pkgver
   perl Makefile.PL INSTALLDIRS=vendor --testsocket=/tmp/socket.mysql

Deleted: mariadb-fix.patch
===================================================================
--- mariadb-fix.patch	2018-12-30 19:59:11 UTC (rev 342818)
+++ mariadb-fix.patch	2018-12-30 19:59:19 UTC (rev 342819)
@@ -1,19 +0,0 @@
---- dbdimp.c.orig       2018-09-08 20:02:03 UTC
-+++ dbdimp.c
-@@ -1907,14 +1907,14 @@ MYSQL *mysql_dr_connect(
-                          (SvTRUE(*svp) ? "utf8" : "latin1"));
-         }
- 
--#if (MYSQL_VERSION_ID >= 50723) && (MYSQL_VERSION_ID < MARIADB_BASE_VERSION)
-+#if (MYSQL_VERSION_ID >= 50723) && (MYSQL_VERSION_ID < MARIADB_VERSION_ID)
-         if ((svp = hv_fetch(hv, "mysql_get_server_pubkey", 23, FALSE)) && *svp && SvTRUE(*svp)) {
-           my_bool server_get_pubkey = 1;
-           mysql_options(sock, MYSQL_OPT_GET_SERVER_PUBLIC_KEY, &server_get_pubkey);
-         }
- #endif
- 
--#if (MYSQL_VERSION_ID >= 50600) && (MYSQL_VERSION_ID < MARIADB_BASE_VERSION)
-+#if (MYSQL_VERSION_ID >= 50600) && (MYSQL_VERSION_ID < MARIADB_VERSION_ID)
-         if ((svp = hv_fetch(hv, "mysql_server_pubkey", 19, FALSE)) && *svp) {
-           STRLEN plen;
-           char *server_pubkey = SvPV(*svp, plen);
\ No newline at end of file