diff options
Diffstat (limited to 'source/d/perl')
| -rw-r--r-- | source/d/perl/DBD-mysql.net_buffer_length.diff | 35 | ||||
| -rwxr-xr-x | source/d/perl/perl.SlackBuild | 25 |
2 files changed, 20 insertions, 40 deletions
diff --git a/source/d/perl/DBD-mysql.net_buffer_length.diff b/source/d/perl/DBD-mysql.net_buffer_length.diff deleted file mode 100644 index cb88a951..00000000 --- a/source/d/perl/DBD-mysql.net_buffer_length.diff +++ /dev/null @@ -1,35 +0,0 @@ -From 0f0cebe87fab335873fd3701bc304922da826940 Mon Sep 17 00:00:00 2001 -From: Michiel Beijen <michiel.beijen@gmail.com> -Date: Fri, 23 Feb 2018 07:52:33 +0000 -Subject: [PATCH] Use net_buffer_length macro if available - ---- - mysql.xs | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/mysql.xs b/mysql.xs -index 3a9373d..0f97645 100644 ---- a/mysql.xs -+++ b/mysql.xs -@@ -840,15 +840,14 @@ dbd_mysql_get_info(dbh, sql_info_type) - retsv = newSVpvn("`", 1); - break; - case SQL_MAXIMUM_STATEMENT_LENGTH: --#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 -- /* MariaDB 10 is not MySQL source level compatible so this -- only applies to MySQL*/ -- /* mysql_get_option() was added in mysql 5.7.3 */ -- /* MYSQL_OPT_NET_BUFFER_LENGTH was added in mysql 5.7.9 */ -+ /* net_buffer_length macro is not defined in MySQL 5.7 and some MariaDB -+ versions - if it is not available, use newer mysql_get_option */ -+#if !defined(net_buffer_length) -+ ; -+ unsigned long buffer_len; - mysql_get_option(NULL, MYSQL_OPT_NET_BUFFER_LENGTH, &buffer_len); - retsv = newSViv(buffer_len); - #else -- /* before mysql 5.7.9 use net_buffer_length macro */ - retsv = newSViv(net_buffer_length); - #endif - break; - diff --git a/source/d/perl/perl.SlackBuild b/source/d/perl/perl.SlackBuild index 5607a1d8..a793b9f5 100755 --- a/source/d/perl/perl.SlackBuild +++ b/source/d/perl/perl.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=perl -VERSION=5.28.0 +VERSION=5.28.1 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -57,10 +57,12 @@ PKG=$TMP/package-perl # Additional required modules: # +# https://metacpan.org/release/Devel-CheckLib +DEVELCHECKLIB=1.13 # https://metacpan.org/release/DBD-mysql -DBDMYSQL=4.046 +DBDMYSQL=4.049 # https://metacpan.org/release/DBI -DBI=1.641 +DBI=1.642 # https://metacpan.org/release/gettext GETTEXT=1.07 # https://metacpan.org/release/TermReadKey @@ -76,7 +78,7 @@ AUTHENSASL=2.16 # https://metacpan.org/release/MIME-Base64 MIMEBASE64=3.15 # https://metacpan.org/release/IO-Socket-SSL -IOSOCKETSSL=2.056 +IOSOCKETSSL=2.060 # https://metacpan.org/release/Net-SSLeay NETSSLEAY=1.85 # https://metacpan.org/release/libnet @@ -192,6 +194,20 @@ make install DESTDIR=$PKG || exit 1 # Add additional modules: ( cd ext + ( tar xzvf $CWD/Devel-CheckLib-${DEVELCHECKLIB}.tar.gz + cd Devel-CheckLib-${DEVELCHECKLIB} + chown -R root:root . + perl Makefile.PL INSTALLDIRS=vendor + make || exit 1 + if [ "$MAKETEST" = "yes" ]; then + make test || exit 1 + fi + make install || exit 1 + make install DESTDIR=$PKG || exit 1 + mkdir -p $PKG/usr/doc/perl-$VERSION/Devel-CheckLib-${DEVELCHECKLIB} + cp -a README* $PKG/usr/doc/perl-$VERSION/Devel-CheckLib-${DEVELCHECKLIB} + chmod 644 $PKG/usr/doc/perl-$VERSION/Devel-CheckLib-${DEVELCHECKLIB}/README* + ) || exit 1 ( tar xzvf $CWD/DBI-${DBI}.tar.gz cd DBI-${DBI} chown -R root:root . @@ -208,7 +224,6 @@ make install DESTDIR=$PKG || exit 1 ) || exit 1 ( tar xzvf $CWD/DBD-mysql-${DBDMYSQL}.tar.gz cd DBD-mysql-${DBDMYSQL} - zcat $CWD/DBD-mysql.net_buffer_length.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . perl Makefile.PL INSTALLDIRS=vendor make || exit 1 |