From e810ac4a0e6af9f763f4433863042b34609075a7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 Jul 2024 12:25:06 +0100 Subject: gentoo auto-resync : 10:07:2024 - 12:25:06 --- dev-db/mydumper/Manifest | 2 + .../files/mydumper-0.15-fix-call-to-open.patch | 42 ++++++++++++++++ dev-db/mydumper/mydumper-0.15.2.8-r1.ebuild | 57 ++++++++++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 dev-db/mydumper/files/mydumper-0.15-fix-call-to-open.patch create mode 100644 dev-db/mydumper/mydumper-0.15.2.8-r1.ebuild (limited to 'dev-db/mydumper') diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest index f59fd7744f33..9ca97e2bc965 100644 --- a/dev-db/mydumper/Manifest +++ b/dev-db/mydumper/Manifest @@ -1,8 +1,10 @@ AUX mydumper-0.13.1-atomic.patch 965 BLAKE2B 789b72fc49a8362466b7081ea6f112d373ebfb428959be96bbf4f9a7dc42366f90d574040a3aed9d32af29074fcda1da96850522d78f8f11c32d925a40d80348 SHA512 4bf764fb119a9c6fd2ab106e20259b48c526729a49ebbb93b3d27e483170ebbb849dcd2af1599ce41ee3ff26233735fbc02f39a8402b0d526f224cdb148663f8 AUX mydumper-0.14-Do-not-overwrite-the-user-CFLAGS.patch 1460 BLAKE2B d2b66719b9191a7f7580ceebec060949a9effdbe11c75d27120c0a7caa2ac1ca67365232b614ae5f9717c1d8b4e693fb5571456217fa807eb4fee5c791cd70ab SHA512 ed6162d0d70a0322ea5f27be1808b2dfe546632eb029aa8dc542b280cd99086f8b473d1cbcb2843b6a0c038cd391147627c11966d1730707af0a9998cb19ff7b AUX mydumper-0.15-Do-not-overwrite-the-user-CFLAGS.patch 984 BLAKE2B 6b47af57b37adf29e273c9ce4384e75efe9ad4ed89ff54bf93ac491d7149f240b4b67263886c30acc6f69c60fe05cdf14572da781614d7a2697ddd5defeb1d4d SHA512 959c56f38912844e7e10aced0e9bde14ea5db68962de83b0649647ebd348c94a0999e17845cd2b2f565f5e14c942930b9c7b7020247378d211d9894cb977a8ac +AUX mydumper-0.15-fix-call-to-open.patch 1341 BLAKE2B 8d7080f694fe99eb70c79519877873ce4e237015647b8997590df3dd95c3307e3b818ead2f8735405b3040049844b85d83d277b169a8662709a6199b6eb3f681 SHA512 e9baeeb10d61f129df457106be56ab379b9cf948aee2bf9f5f68cabf14a8876d749459ad6c42280e67ed5caf3ad6735bae39901a6c16cf93f65677b9d8e464c1 DIST mydumper-0.14.5-2.tar.gz 177402 BLAKE2B bcd2658e1d8e452803608f27ed1b2ccc6fe428fcb44117f88a5cb0e6de1536f89c1f0768020da2d954a95cc20fe1315af8a38f477aee7c394540fbb4f001ac8d SHA512 d19c22fb3932f7428f560dcd7cdafc92e035f924ee35320048eca2067e75a297a44aaf08c6f124ef55c604c34311be2eeb0858c6d41be5ea73a68c8c0afa66ab DIST mydumper-0.15.2-8.tar.gz 186389 BLAKE2B 84e08fa6460a156771f598a8a0c98c79089490f9f2fe3b90fa49efd519e2270468fe86287bab03612006489a3a1d5ab2442e76cc0f4825c8df95acec30a1c4ba SHA512 f6ca5c5756944bd2704e8a25432db1fbe14ed2a1e88b549c0799c3e0c251e524523ed39797b0b2c15c9d65c0e6e5ce3d93a60a17c77090732a8f909ab24a0126 EBUILD mydumper-0.14.5.2.ebuild 1213 BLAKE2B d00d9fbcf99d50e9956b4413158ac3f0de02d735a6f9518dc6dbf2e506cf8061060b97c0fe39d384f1d0347de8d2c7eec6da5c7d50d47e6c74eed20feb68ff48 SHA512 53d2b66901a3b42543f3f301769a4cfb1d5465e5e958c0a020452b50c1d906dd2211fca9892dc592212146b9c47b92b2f283744c0711755dfc579700b5058005 +EBUILD mydumper-0.15.2.8-r1.ebuild 1266 BLAKE2B 9bc3751f8b222c2db271a7ca62fe85bc5c4090692b340ce1205dd55c6d96e21d75124409a645e38f4ebcca630c2914d68454329722a11925dcbc01e53d12c2db SHA512 e2998aa2b6c82fc87854fb34e5ea7ad96150feb156ce844420fcb2a963a42f2ed2bd3c1085260ba9f03000317159cea18d8840da6f4b6da4720dc152c1cc2e88 EBUILD mydumper-0.15.2.8.ebuild 1216 BLAKE2B a07ac2f9da30457597d727251e08bacc383d0c46ba696895f4554d9741a3f23fe8b2187d739e47b9286024117ea7264494d94b38ac8d4f15270a5d8105e6482b SHA512 252dffa78f47c186eabc7122454d025cb2a50d230a4b79eb69b31620416d94e629bac9ea9fc2fa50f2325cae69727c476ba3557d5203e07e32d3bd20e770d65a MISC metadata.xml 480 BLAKE2B b046228a8aea053cdd034cb3ce0e28e3fd666fe9a600b7bb82a36083fff6686559a6746518ff8c41002476ac8214ff45376c5b08fa9e71c1e2ed1ed890b68091 SHA512 8d71ae229741c263328195baec3917d9c496d9afeff591e3c66ef8744776d8cbc53f17ff526255e61139338b03f5027e19142108dd9c37c0871a6510f72a8661 diff --git a/dev-db/mydumper/files/mydumper-0.15-fix-call-to-open.patch b/dev-db/mydumper/files/mydumper-0.15-fix-call-to-open.patch new file mode 100644 index 000000000000..46c7f6aea8c5 --- /dev/null +++ b/dev-db/mydumper/files/mydumper-0.15-fix-call-to-open.patch @@ -0,0 +1,42 @@ +From https://github.com/mydumper/mydumper/pull/1557 +From: Brahmajit Das +Date: Sun, 7 Jul 2024 20:40:30 +0000 +Subject: [PATCH] Fix building on musl libc + +On musl libc we are getting buid errors: +mydumper/src/mydumper_stream.c:100:9: error: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit- +function-declaration] + 100 | f=open(sf->filename,O_RDONLY); + | ^~~~ + | popen +mydumper/src/mydumper_stream.c:100:27: error: 'O_RDONLY' undeclared (first use in this function) + 100 | f=open(sf->filename,O_RDONLY); + | ^~~~~~~~ +This probably due to musl being more strict. Fix was to include the +fcntl.h header file as the Linux Manual Page suggests open should come +from fcntl.h + +First reported on Gentoo Linux with musl profile + +Bug: https://bugs.gentoo.org/935389 +Signed-off-by: Brahmajit Das +--- a/src/mydumper_common.c ++++ b/src/mydumper_common.c +@@ -20,6 +20,7 @@ + */ + #include "string.h" + #include ++#include + #include + #include + #include +--- a/src/mydumper_stream.c ++++ b/src/mydumper_stream.c +@@ -26,6 +26,7 @@ + #include "mydumper_stream.h" + #include + #include ++#include + + extern GAsyncQueue *stream_queue; + diff --git a/dev-db/mydumper/mydumper-0.15.2.8-r1.ebuild b/dev-db/mydumper/mydumper-0.15.2.8-r1.ebuild new file mode 100644 index 000000000000..388b59989451 --- /dev/null +++ b/dev-db/mydumper/mydumper-0.15.2.8-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +MY_PV="$(ver_rs 3 -)" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="A high-performance multi-threaded backup (and restore) toolset for MySQL" +HOMEPAGE="https://github.com/mydumper/mydumper" +SRC_URI="https://github.com/mydumper/mydumper/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +RDEPEND="app-arch/zstd + dev-db/mysql-connector-c:= + dev-libs/glib:2 + dev-libs/libpcre + dev-libs/openssl:= + sys-libs/zlib:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + doc? ( dev-python/sphinx )" + +PATCHES=( + "${FILESDIR}/${PN}-0.13.1-atomic.patch" #654314 + + "${FILESDIR}"/${PN}-0.15-Do-not-overwrite-the-user-CFLAGS.patch + + "${FILESDIR}"/${PN}-0.15-fix-call-to-open.patch +) + +src_prepare() { + # fix doc install path + sed -i -e "s|share/doc/mydumper|share/doc/${PF}|" docs/CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/855239 + # + # Fixed upstream in git master: + # https://github.com/mydumper/mydumper/pull/1413 + filter-lto + + local mycmakeargs=(-DBUILD_DOCS=$(usex doc)) + + cmake_src_configure +} -- cgit v1.2.3