dev-perl/DBD-mysql: Restore old versions (masked) for bug #604678

This reverts parts of "Security cleanup re bug #601144"
commit 19eeb140a84c8bb903b808bf7ea344a3c633857a

Bug: https://bugs.gentoo.org/604678
Bug: https://bugs.gentoo.org/601144
Package-Manager: Portage-2.3.3, Repoman-2.3.1

4 files changed, 141 insertions, 0 deletions

diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r2.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r2.ebuild
new file mode 100644
index 000000000000..b90befd2b5fb
--- /dev/null
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=CAPTTOFU
+MODULE_VERSION=4.032
+inherit eutils perl-module
+
+DESCRIPTION="The Perl DBD:mysql Module"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="embedded test"
+
+RDEPEND="dev-perl/DBI
+	dev-perl/Test-Deep
+	virtual/libmysqlclient:=
+	embedded? ( virtual/mysql[embedded] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-print_embedded_options.patch
+}
+
+src_configure() {
+	if use test; then
+		myconf="${myconf} --testdb=test \
+			--testhost=localhost \
+			--testuser=test \
+			--testpassword=test"
+	fi
+	use embedded && myconf="${myconf} --force-embedded --embedded=mysql_config"
+	perl-module_src_configure
+}
+
+src_test() {
+	einfo
+	einfo "If tests fail, you have to configure your MySQL instance to create"
+	einfo "and grant some privileges to the test user."
+	einfo "You can run the following commands at the MySQL prompt: "
+	einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';"
+	einfo "> CREATE DATABASE test;"
+	einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';"
+	einfo
+	sleep 5
+	perl-module_src_test
+}
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.37.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.37.0.ebuild
new file mode 100644
index 000000000000..2f762282ac1c
--- /dev/null
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.37.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=MICHIELB
+DIST_VERSION=4.037
+inherit eutils perl-module
+
+DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+# embedded=on disables ssl support
+# https://metacpan.org/source/MICHIELB/DBD-mysql-4.036/dbdimp.c#L1886
+REQUIRED_USE="?? ( embedded ssl )"
+IUSE="embedded test +ssl"
+
+RDEPEND=">=dev-perl/DBI-1.609.0
+	virtual/libmysqlclient:=
+	embedded? ( virtual/mysql[embedded] )
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-Data-Dumper
+	test? (
+		dev-perl/Test-Deep
+		>=virtual/perl-Test-Simple-0.900.0
+		virtual/perl-Time-HiRes
+	)
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-print_embedded_options.patch
+)
+
+src_configure() {
+	if use test; then
+		myconf="${myconf} --testdb=test \
+			--testhost=localhost \
+			--testuser=test \
+			--testpassword=test"
+	fi
+	myconf="${myconf} --$(usex ssl ssl nossl)"
+	use embedded && myconf="${myconf} --force-embedded --embedded=mysql_config"
+	perl-module_src_configure
+}
+
+# Parallel testing is broken as 2 tests create the same table
+# and mysql isn't acid compliant and can't limit visibility of tables
+# to a transaction...
+DIST_TEST="do"
+
+src_test() {
+	einfo
+	einfo "If tests fail, you have to configure your MySQL instance to create"
+	einfo "and grant some privileges to the test user."
+	einfo "You can run the following commands at the MySQL prompt: "
+	einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';"
+	einfo "> CREATE DATABASE test;"
+	einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';"
+	einfo
+	sleep 5
+	perl_rm_files t/pod.t t/manifest.t
+	# Don't be a hero and try to do EXTENDED_TESTING=1 unless you can figure
+	# out why 60leaks.t fails
+	perl-module_src_test
+}
diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest
index 4eb219705a20..3d190ff8cbd7 100644
--- a/dev-perl/DBD-mysql/Manifest
+++ b/dev-perl/DBD-mysql/Manifest
@@ -1 +1,3 @@
+DIST DBD-mysql-4.032.tar.gz 146476 SHA256 b8e681e719d8f2d1cecb9e8603e13483b09b56508629b079022778e7dfd7bfb6 SHA512 7e7ebaed07f0540079854294cc3ab4a4554fd0f850dd0927b2485cc985c2c9f5b70a650d971027c883cc4d8450020245656f6ff1f792a56d1a2d4b45402d73d0 WHIRLPOOL 79b94c7c85406e0f3a0469c8017594f81f6151eab3059d483c50326222fdb920d12db04a5382dbdc2862cf853e1c421fe0d7acc4a35b131a0f9d39c2d79f5d0b
+DIST DBD-mysql-4.037.tar.gz 146639 SHA256 df578acef28ed3f6aaae52dc98e6821a1407d3bfa88585255729bb0ebfed3cfc SHA512 3bda6ea18d29e32028b7eb93cd06fdbabbadafa66f982556298a68980c42a7b5236872113696e6d2df66a345049d1e63bc90ab358c8631f0cbea187780e514af WHIRLPOOL 2cd51fb258de4877010d6d5f88a27f8e251d86b311d5d7dc3b62a46e7d6ac87facaad7c2bbba6c7f306d91d106e7a713fb21c2f1b7d2934e989aa30794d38a7f
 DIST DBD-mysql-4.041.tar.gz 150508 SHA256 4777de11c464b515db9da95c08c225900d0594b65ba3256982dc21f9f9379040 SHA512 8663c58f1dec273869ef5d3ee663d80cb36fa87b1956318fff07a4a801aaecc395510a8f31b7a51b823f7e9d6a73ebf13894c1b7f7b27fdc3f3956e6aba34777 WHIRLPOOL 9440ce5e595091228512dbdc90f13dfa9fd0133ba82c96f2be993cec545479c89e362b923ca973829982aca0e81fede30833d32b3c02d4a25287caea31bce47e
diff --git a/dev-perl/DBD-mysql/files/DBD-mysql-print_embedded_options.patch b/dev-perl/DBD-mysql/files/DBD-mysql-print_embedded_options.patch
new file mode 100644
index 000000000000..d205b43f33ec
--- /dev/null
+++ b/dev-perl/DBD-mysql/files/DBD-mysql-print_embedded_options.patch
@@ -0,0 +1,20 @@
+diff -ubBr old/dbdimp.c new/dbdimp.c
+--- old/dbdimp.c	2015-09-12 17:52:41.328543844 -0400
++++ new/dbdimp.c	2015-09-12 23:21:52.848371578 -0400
+@@ -443,14 +443,14 @@
+  Print out embbedded option settings
+ 
+ */
+-int print_embedded_options(char ** options_list, int options_count)
++int print_embedded_options(PerlIOl ** Log, char ** options_list, int options_count)
+ {
+   int i;
+ 
+   for (i=0; i<options_count; i++)
+   {
+     if (options_list[i])
+-        PerlIO_printf(DBILOGFP,
++        PerlIO_printf(Log,
+                       "Embedded server, parameter[%d]=%s\n",
+                       i, options_list[i]);
+   }