[arch-commits] Commit in perl-dbd-mysql/repos/extra-x86_64 (3 files)

[Felix Yan]

    Date: Monday, September 17, 2018 @ 09:32:34
  Author: felixonmars
Revision: 334680

archrelease: copy trunk to extra-x86_64

Added:
  perl-dbd-mysql/repos/extra-x86_64/PKGBUILD
    (from rev 334679, perl-dbd-mysql/trunk/PKGBUILD)
  perl-dbd-mysql/repos/extra-x86_64/mariadb-fix.patch
    (from rev 334679, perl-dbd-mysql/trunk/mariadb-fix.patch)
Deleted:
  perl-dbd-mysql/repos/extra-x86_64/PKGBUILD

-------------------+
 PKGBUILD          |   97 +++++++++++++++++++++++++++-------------------------
 mariadb-fix.patch |   19 ++++++++++
 2 files changed, 71 insertions(+), 45 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-17 09:32:00 UTC (rev 334679)
+++ PKGBUILD	2018-09-17 09:32:34 UTC (rev 334680)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: kevin <kevin at archlinux.org>
-# Contributor: Eric Johnson <eric at coding-zone.com>
-
-pkgname=perl-dbd-mysql
-pkgver=4.046
-pkgrel=2
-pkgdesc='Perl/CPAN DBD::mysql module for interacting with MySQL via DBD'
-arch=('x86_64')
-license=('GPL' 'PerlArtistic')
-url="http://search.cpan.org/dist/DBD-mysql/"
-depends=('libmariadbclient' 'perl-dbi')
-makedepends=('perl-devel-checklib')
-checkdepends=('mariadb' 'perl-test-deep')
-options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-${pkgver}.tar.gz)
-sha512sums=('57b3243a724ac21a11b6eea10aa1cfc821f295cb5bf44f9eaabeb979d3f8e1f7f5e00d40b144a16688d0a358c82c2bb00f630e925e176f29a9ca84b8ee7fb9cc')
-
-build() {
-  cd DBD-mysql-$pkgver
-  perl Makefile.PL INSTALLDIRS=vendor --testsocket=/tmp/socket.mysql
-  make
-}
-
-check() {
-  cd DBD-mysql-$pkgver
-  mkdir -p /tmp/mysql_test
-  mysql_install_db \
-     --basedir=/usr \
-     --datadir=/tmp/mysql_test
-  mysqld -P 17999 \
-     --socket=/tmp/socket.mysql \
-     --datadir=/tmp/mysql_test &
-  sleep 10
-  DAEMON_PORT=$!
-  make test
-  kill -9 $DAEMON_PORT
-}
-
-package() {
-  cd DBD-mysql-$pkgver
-  make install DESTDIR="$pkgdir"
-}

Copied: perl-dbd-mysql/repos/extra-x86_64/PKGBUILD (from rev 334679, perl-dbd-mysql/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-09-17 09:32:34 UTC (rev 334680)
@@ -0,0 +1,52 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: kevin <kevin at archlinux.org>
+# Contributor: Eric Johnson <eric at coding-zone.com>
+
+pkgname=perl-dbd-mysql
+pkgver=4.048
+pkgrel=1
+pkgdesc='Perl/CPAN DBD::mysql module for interacting with MySQL via DBD'
+arch=('x86_64')
+license=('GPL' 'PerlArtistic')
+url="http://search.cpan.org/dist/DBD-mysql/"
+depends=('libmariadbclient' 'perl-dbi')
+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')
+
+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
+  make
+}
+
+check() {
+  cd DBD-mysql-$pkgver
+  mkdir -p /tmp/mysql_test
+  mysql_install_db \
+     --basedir=/usr \
+     --datadir=/tmp/mysql_test
+  mysqld -P 17999 \
+     --socket=/tmp/socket.mysql \
+     --datadir=/tmp/mysql_test &
+  sleep 10
+  DAEMON_PORT=$!
+  make test
+  kill -9 $DAEMON_PORT
+}
+
+package() {
+  cd DBD-mysql-$pkgver
+  make install DESTDIR="$pkgdir"
+}

Copied: perl-dbd-mysql/repos/extra-x86_64/mariadb-fix.patch (from rev 334679, perl-dbd-mysql/trunk/mariadb-fix.patch)
===================================================================
--- mariadb-fix.patch	                        (rev 0)
+++ mariadb-fix.patch	2018-09-17 09:32:34 UTC (rev 334680)
@@ -0,0 +1,19 @@
+--- 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