diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-10-08 12:03:01 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-10-08 12:03:01 +0100 |
commit | 522fa4e6f267ba688a264ceec8d6c79663b61219 (patch) | |
tree | 67895f3a8243148309fbd841dabba28c37f4ed4a /dev-perl/DBD-mysql | |
parent | 32c16465e56b0122cf6e5a4625e9c7b56b107b07 (diff) |
gentoo auto-resync : 08:10:2023 - 12:03:01
Diffstat (limited to 'dev-perl/DBD-mysql')
-rw-r--r-- | dev-perl/DBD-mysql/DBD-mysql-5.1.0.ebuild | 141 | ||||
-rw-r--r-- | dev-perl/DBD-mysql/Manifest | 3 | ||||
-rw-r--r-- | dev-perl/DBD-mysql/files/DBD-mysql-5.001-tests.patch | 39 |
3 files changed, 183 insertions, 0 deletions
diff --git a/dev-perl/DBD-mysql/DBD-mysql-5.1.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-5.1.0.ebuild new file mode 100644 index 000000000000..6c330056ca36 --- /dev/null +++ b/dev-perl/DBD-mysql/DBD-mysql-5.1.0.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DIST_AUTHOR=DVEEDEN +# 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" +DIST_WIKI=tests +DIST_VERSION=5.001 +inherit perl-module + +DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +IUSE="mariadb +mysql test" +RESTRICT="!test? ( test )" +REQUIRED_USE="^^ ( mysql mariadb )" + +DB_DEPENDS=" + mysql? ( >=dev-db/mysql-connector-c-8:= ) + mariadb? ( >=dev-db/mariadb-connector-c-3.1:=[ssl(+)] ) +" +RDEPEND=" + >=dev-perl/DBI-1.609.0 + >=dev-perl/Devel-CheckLib-1.109.0 + ${DB_DEPENDS} +" +DEPEND=" + ${DB_DEPENDS} +" +BDEPEND=" + ${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 + mariadb? ( dev-db/mariadb:* ) + mysql? ( >=dev-db/mysql-8:* ) + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-4.050-no-dot-inc.patch" + "${FILESDIR}/${PN}-5.001-tests.patch" +) + +PERL_RM_FILES=( + t/pod.t + t/manifest.t + + # Failed test 'USE is not supported with mysql_server_prepare_disable_fallback=1' + # at t/40server_prepare.t line 93. + t/40server_prepare.t +) + +src_configure() { + local impl=$(usex mariadb mariadb mysql) + local myconf=() + + if use test; then + myconf+=( + --testdb=test + --testhost=localhost + --testsocket="${T}"/mysqld.sock + --testuser=root + ) + fi + + myconf+=( --mysql_config="${EPREFIX}"/usr/bin/${impl}_config ) + + perl-module_src_configure +} + +src_test() { + local -x USER=$(whoami) + + einfo "Creating mysql test instance ..." + mkdir -p "${T}"/mysql || die + if use mariadb ; then + local -x PATH="${BROOT}/usr/share/mariadb/scripts:${PATH}" + + mysql_install_db \ + --no-defaults \ + --auth-root-authentication-method=normal \ + --basedir="${EPREFIX}/usr" \ + --datadir="${T}"/mysql 1>"${T}"/mysqld_install.log || die + else + mysqld \ + --no-defaults \ + --initialize-insecure \ + --user ${USER} \ + --basedir="${EPREFIX}/usr" \ + --datadir="${T}"/mysql 1>"${T}"/mysqld_install.log || die + fi + + einfo "Starting mysql test instance ..." + mysqld \ + --no-defaults \ + --character-set-server=utf8 \ + --bind-address=127.0.0.1 \ + --pid-file="${T}"/mysqld.pid \ + --socket="${T}"/mysqld.sock \ + --datadir="${T}"/mysql 1>"${T}"/mysqld.log 2>&1 & + + # Wait for it to start + local i + for (( i = 0; i < 10; i++ )); do + [[ -S ${T}/mysqld.sock ]] && break + sleep 1 + done + [[ ! -S ${T}/mysqld.sock ]] && die "mysqld failed to start" + + einfo "Configuring test mysql instance ..." + mysql -u root \ + -e 'CREATE DATABASE /*M!50701 IF NOT EXISTS */ test' \ + -S "${T}"/mysqld.sock || die "Failed to create test database" + + # Don't be a hero and try to do EXTENDED_TESTING=1 unless you can figure + # out why 60leaks.t fails + nonfatal perl-module_src_test + ret=$? + + einfo "Stopping mysql test instance ..." + pkill -F "${T}"/mysqld.pid || die + # wait for it to stop + local i + for (( i = 0; i < 10; i++ )); do + [[ -S ${T}/mysqld.sock ]] || break + sleep 1 + done + + rm -rf "${T}"/mysql || die + + [[ ${ret} -ne 0 ]] && die +} diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest index c486f46dcfb4..4efe27cd8d1d 100644 --- a/dev-perl/DBD-mysql/Manifest +++ b/dev-perl/DBD-mysql/Manifest @@ -1,6 +1,9 @@ AUX DBD-mysql-4.050-fix-float-type-conversion.patch 1627 BLAKE2B 466df4b1cb2419a30d58e7e2305f6370cf6279c77d6f0cf16e9b637136e45406f671bc1061d8e47bf3dba7e1156ea28f7ace2c9c04cfdf2afe752d9d50532f54 SHA512 94074573635f457deaace20c0166710f2ff2aed664eb4e49d57aea0de6cc9d933263cb8842cea1ff13e8907ff7e5c89b4a73dee8da9a56875798eb87d4dbad02 AUX DBD-mysql-4.050-fix-for-MariaDB-10.3.13-with-zerofil.patch 1217 BLAKE2B 928c53b8daabe7f750522ead8a79971662c8f7b1fc076a0a8d626b4e93536f08664420c9486c05fa4944a19e90b7389b65dc590cfe0b5f5149e01d802e0f3e9a SHA512 79c9c289665a5e28dab4f0b74f2c7cb5895109edbf2f2074f9d6116b6d57dee4ade7586309739356ab318005748194b30e352fb20f1f5341ffb077085b529c07 AUX DBD-mysql-4.050-no-dot-inc.patch 5470 BLAKE2B 09a9b2a3fe033c6ae68b949dfacf08dbc1fa6cce13369a982ad99ee0226dc2b84a8ba1f8f7384325eb5d51b663d11b6163694a19ec343bd16c2a12f74c83bab8 SHA512 795bb73dda37311b4df06ddb541c39cd924f59453d0618c5cae53ccfb698556bc0bea97a0c644546cb6285092fdf71ef04cccf8d4efa47d71a9f64eeb5c02e3f +AUX DBD-mysql-5.001-tests.patch 1356 BLAKE2B 7130a11c2c5a1502eb909cc1cd08a1ffb55b8c9a1cb818001684e0bbf447d9362293be6f40c80421761951fb236d3f2fa8d6420db4993f7395ad1391dcc9c532 SHA512 50a7d7f0e8104a6a98b35c99bd48732ef53e689a64638f90e7a5b5c4aa640c8a433a1f3ac634db2141ec164f7dd16c6a53a9397fec6cfb781f9b5d203b543a3c DIST DBD-mysql-4.050.tar.gz 161579 BLAKE2B fb17e151db730fd6955d3e4424dd495a9fcf5f3f4e2b6b79d9fdc86bc42c3314b68771f1d3c393fd80ea14aeda626a5c5d21f5b921d487350ffd79802edab1f6 SHA512 910f5b4ba7a7890d50a79f37d04ec8971a4f62acd0fe30bf3ab634f66e3128f0cd6513e5c9da8c807a0f4477d0cc766682ea8dd0d8072d02821b78df51f37879 +DIST DBD-mysql-5.001.tar.gz 151639 BLAKE2B 02edf5454d46ca16886c5fc559466f63c57352354983095feda7568822eb0cf4d87e44aa63754d873c6889d070b2108dc40e32a253532b893987a779d71808c9 SHA512 1aea86bba76f371ed11eb22e9fe1f99dfaefafd83dea69ee0ac5ea175c1328ff324934ad45bfa73851463931656471ca890b3d7656e9db3861a8465d6130d5c0 EBUILD DBD-mysql-4.50.0-r1.ebuild 2343 BLAKE2B 381b3b022026bcbb712814d61387a4bca5ebc30a52e626d74b741fb6736fa7e085666e730ef435c6170539411b5f5152dd7c0c7d6f0f589406b4b981dc9302a4 SHA512 12be879e29fb254784f4e7d7b5f0ebdebf85283dda5b27c648006d75e2c5ab12f1059567e7b3cdfcff4d652689474439b9f298e2ec6bedc8f2394574b195adf7 +EBUILD DBD-mysql-5.1.0.ebuild 3265 BLAKE2B 33d0666401d05b7fef70e46c101fcdb3723dd2c7f7fa691ee41081e6304a91cc4fd247a40c584f265568e690dec927be7c7346ea89d900d19dfbe74bc7524fa5 SHA512 1a46c21c06896b953f052e9434aa54ceedc5a8a0c05422bea90ace39d2f477e1b1c245ece7c09dec1e412c3798f10ff11aebb2b6650b453e36950440ab82afa6 MISC metadata.xml 996 BLAKE2B fb80c8139a09c9102c035e07ea5f474c1d7ad9753053e0e6d2a66c1b962f38f7ab834eada7f996ff3fe0003b217204bb4aa99c0dc8cbb69c07392c41c48207e7 SHA512 9d64da35493e309d9684d92c35dbf446d5143e30e1e6d18c8a4c6b7fb277343122df19867b00be00451dfe3496d008086c84db416428c99d46861c46dafb8c8e diff --git a/dev-perl/DBD-mysql/files/DBD-mysql-5.001-tests.patch b/dev-perl/DBD-mysql/files/DBD-mysql-5.001-tests.patch new file mode 100644 index 000000000000..71de32ef0af4 --- /dev/null +++ b/dev-perl/DBD-mysql/files/DBD-mysql-5.001-tests.patch @@ -0,0 +1,39 @@ +https://github.com/perl5-dbi/DBD-mysql/commit/18626cfefdc4568ed0de7129a1bfb5916c21f5e6 + +From 18626cfefdc4568ed0de7129a1bfb5916c21f5e6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= <git@myname.nl> +Date: Thu, 5 Oct 2023 09:45:44 +0200 +Subject: [PATCH] Update version test for v5.x + +--- + t/10connect.t | 2 +- + t/version.t | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/t/10connect.t b/t/10connect.t +index 6f36c4db..bfca3448 100644 +--- a/t/10connect.t ++++ b/t/10connect.t +@@ -45,7 +45,7 @@ like( + 'get_info SQL_DRIVER_VER like dd.dd.dddd' + ); + +-like($driver_ver, qr/^04\./, 'SQL_DRIVER_VER starts with "04." (update for 5.x)'); ++like($driver_ver, qr/^05\./, 'SQL_DRIVER_VER starts with "05." (update for 6.x)'); + + # storage engine function is @@storage_engine in up to 5.5.03 + # at that version, @@default_storage_engine is introduced +diff --git a/t/version.t b/t/version.t +index 47d1778f..87b0db04 100644 +--- a/t/version.t ++++ b/t/version.t +@@ -6,7 +6,7 @@ use Bundle::DBD::mysql; + use Test::More; + + like($DBD::mysql::VERSION, qr/^\d\.\d{2,3}(|_\d\d)$/, 'version format'); +-like($DBD::mysql::VERSION, qr/^4\./, 'version starts with "4." (update for 5.x)'); ++like($DBD::mysql::VERSION, qr/^5\./, 'version starts with "5." (update for 6.x)'); + is( + $DBD::mysql::VERSION, + $Bundle::DBD::mysql::VERSION, + |