From a0e773d57146b0a0ec25567af504a10e6f187811 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Sep 2022 10:35:35 +0100 Subject: gentoo auto-resync : 07:09:2022 - 10:35:34 --- sys-cluster/Manifest.gz | Bin 11542 -> 11543 bytes sys-cluster/sanlock/Manifest | 3 +- .../files/sanlock-3.8.4-implicit-func-decls.patch | 34 +++++++++ sys-cluster/sanlock/sanlock-3.8.4-r1.ebuild | 76 +++++++++++++++++++++ sys-cluster/sanlock/sanlock-3.8.4.ebuild | 74 -------------------- 5 files changed, 112 insertions(+), 75 deletions(-) create mode 100644 sys-cluster/sanlock/files/sanlock-3.8.4-implicit-func-decls.patch create mode 100644 sys-cluster/sanlock/sanlock-3.8.4-r1.ebuild delete mode 100644 sys-cluster/sanlock/sanlock-3.8.4.ebuild (limited to 'sys-cluster') diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz index a4730282c04f..87201e3822d2 100644 Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ diff --git a/sys-cluster/sanlock/Manifest b/sys-cluster/sanlock/Manifest index a444390ed2f7..e87eff63d8d2 100644 --- a/sys-cluster/sanlock/Manifest +++ b/sys-cluster/sanlock/Manifest @@ -1,8 +1,9 @@ +AUX sanlock-3.8.4-implicit-func-decls.patch 730 BLAKE2B 76135073c217e914c5c9d89b8940ea86d745646cdaa389480f5d332410eb9faf07e4f36ff6e54f3356c190dae178ba692c55123e1e8f5d279c4b92bf1b27d626 SHA512 f618e31dd3b6735dde48994f78eab9dec4c0281d66dfdabedfab3bdcb4ba8e2422db6d1e5566fa9554578809b3cbf2bfb8f67e3100a1d5f8058c25392a2abc7c AUX sanlock-fence_sanlock-LDFLAGS.patch 504 BLAKE2B 11176057304ee5f841500921f1fa1ee4e97777547f7318d192f1b5bd94bfdb145db4bdc6eb6ecede2f7c5d0d9f29e85506283119d904a65735e5152a07167c97 SHA512 2c7d7204e369449c23f4641fae27ecbb35d0f1f670a580feab7982514a90e60eec3bcdaf01cbd1cf88e7a39050026474553eb10a48d57ab8b4e6549d574bcebf AUX sanlock.initd 249 BLAKE2B 18bafba28ab4449c7f25ab2d14b4ac2d3cc89cf79bfb8f802fd180584becde8a5b9d919ac9ab887a4ebdfe8ea64e53f30b3785bc32875ccd2e25fa99a9278081 SHA512 5ed7b2d96cb875e2db0914ec7232fe8443c05de69e07d214ffc0adfafac5123694173373f831c5acf46d11aa4fca304b88e6e4c4ee2fbe5b033d173eea5aec36 AUX wdmd.initd 261 BLAKE2B 65b393f2f084896d3c17aa0345f9930badeec7a3ee4cc7e47bd0a35e47c18ea2bcf5afdc386c0da98988bc9fae479a68b504c244b55ab389ac7f5304c34282ae SHA512 9c7e980817c1c76868caff229b42a3d70e912abfd8c974bf5b856067bef79fbd3a5942b30bcb7d02869e2eba85e6f6ba3c861e9780046b01b25df1b39661b6c0 DIST sanlock-3.8.2.tar.gz 266780 BLAKE2B 5248d08225bcc2a19594a3dcd3872c8c69ca8b217d31f6263f2717e4594180d4ba4685c9679ce2f31b6a2dcb4fe9f3e6a5dd5ac3ed073aea02599e7bbc04390c SHA512 2fa92e16eee4d2f3dac452400522f7e90b93b71349d322564d5957e2d87fb4bd69f0b5617b05f4b296c272d6da9a404fccadbbfff106354a0e302c436593eaac DIST sanlock-3.8.4.tar.gz 270031 BLAKE2B da011a15d488849d47fe1043df040580652558918dff9549bf4e6cb4077c03b4aaa8f8de5399dbb0e3f2301ae90c0d20599b25bd5e72bae5317b13f79a352333 SHA512 9fca2b18fd3bd504d5186de0b2626ea2c993997528de2384dc042afe52b2b68422a2e4bb79e2409c9e6eccbe5ea8d8939549eb25c5d16aa7fecf6c9a5798340c EBUILD sanlock-3.8.2.ebuild 2165 BLAKE2B 0357ae6c8aabee20012ab4615be9dfc6c9716424e385f02e10caabfa273b3950d7f3637f4abe577d377085d5a7cac73af4e497922a21f35afae7aa297dfc0bee SHA512 6f1e33bfdde6412b3013d1fa0a436ae1501f8c6ad04923305b3f32fafbc114ed9d73fc9b8df9afb2053b9d0340518f1a274f38e16aa9ad418fcb75ef0eb61b78 -EBUILD sanlock-3.8.4.ebuild 1792 BLAKE2B 9748376f44a47d1e9da05c2409d38caeab690a750b7a23c5240d421181500ba03c618d8621e7d520652cd97f5adc6b8b4c2af753d73ca6cd87f68a34025d2568 SHA512 394054648234d0186bc26a19358433c190bd60d168ba43f23c883e07173f7015b528c4ec974a3b6353e3659242fb78b489b947a612b7f0341d2ca130f7c92aa6 +EBUILD sanlock-3.8.4-r1.ebuild 1872 BLAKE2B 6abc7157dfeba2c9ffe0a5f9aba31b288d8722dd6241848bfadb33d8aa4aec9d1eac2fa5fc37f1cf6b7ff9c511cbcd67c0df60acda5f5431adf7dec4e35d07c6 SHA512 449c9d2155a6c499273d5b996ce5a68bf466084fb3c76e8bacfe1f998ed360522d4f8ab95be600b8eab792d20084c0282ce5f4d63fcc6db353fed566e87d2fe4 MISC metadata.xml 369 BLAKE2B a32cbc5e109bab37912ecc7efe951fcec96fb133b2861d3c38290e5f3aabe87e444d38bdbb18b711ba5836c43c7ac7ebcde3b5f23ec10df8c413cbd445c05ddf SHA512 ac7cb5f13743775baecae83e2c6beb6988b4c374db96217136cd68124e947890de32c9d7afecbdafbac32b0ac450ec2580b923f0e9fb63ef944463e879cd8283 diff --git a/sys-cluster/sanlock/files/sanlock-3.8.4-implicit-func-decls.patch b/sys-cluster/sanlock/files/sanlock-3.8.4-implicit-func-decls.patch new file mode 100644 index 000000000000..7e99d9b1f939 --- /dev/null +++ b/sys-cluster/sanlock/files/sanlock-3.8.4-implicit-func-decls.patch @@ -0,0 +1,34 @@ +https://pagure.io/sanlock/issue/8 + +From 272f9838f3495f5e419f77e000762c420754c96d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sep 02 2022 22:58:56 +0000 +Subject: add missing system header string.h + + +This is needed for mem* function prototypes used in these sources + +Signed-off-by: Khem Raj + +--- a/src/sanlock_sock.c ++++ b/src/sanlock_sock.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include + +--- a/wdmd/wdmd_sock.c ++++ b/wdmd/wdmd_sock.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include + + + diff --git a/sys-cluster/sanlock/sanlock-3.8.4-r1.ebuild b/sys-cluster/sanlock/sanlock-3.8.4-r1.ebuild new file mode 100644 index 000000000000..d48b048e3ead --- /dev/null +++ b/sys-cluster/sanlock/sanlock-3.8.4-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit linux-info python-r1 systemd + +DESCRIPTION="shared storage lock manager" +HOMEPAGE="https://pagure.io/sanlock" +SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2+ GPL-2 GPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="python" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND=" + acct-user/${PN} + acct-group/${PN} + dev-libs/libaio + sys-apps/util-linux + python? ( ${PYTHON_DEPS} ) +" +RDEPEND="${DEPEND}" +BDEPEND="sys-apps/which" + +PATCHES=( + "${FILESDIR}/sanlock-fence_sanlock-LDFLAGS.patch" + "${FILESDIR}/sanlock-3.8.4-implicit-func-decls.patch" +) + +CONFIG_CHECK="~SOFT_WATCHDOG" + +src_compile() { + for d in wdmd src fence_sanlock reset; do + emake -C ${d} + done + + if use python; then + python_foreach_impl emake -C python + fi +} + +src_install() { + for d in wdmd src fence_sanlock reset; do + emake -C ${d} DESTDIR="${D}" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install + done + + if use python; then + python_foreach_impl emake -C python DESTDIR="${D}" install + fi + + # config + dodir /etc/wdmd.d + dodir /etc/sanlock + insinto /etc/sanlock + doins src/sanlock.conf + + # init + newconfd init.d/sanlock.sysconfig sanlock + newconfd init.d/wdmd.sysconfig wdmd + newinitd "${FILESDIR}"/sanlock.initd sanlock + newinitd "${FILESDIR}"/wdmd.initd wdmd + #doinitd ${FILESDIR}/sanlk-resetd.initd + #doinitd ${FILESDIR}/fence_sanlockd.initd + + # systemd + systemd_newunit init.d/sanlock.service.native sanlock.service + sed -i 's,^ExecStartPre=,#ExecStartPre=,' init.d/wdmd.service.native || die + systemd_newunit init.d/wdmd.service.native wdmd.service + systemd_dounit init.d/sanlk-resetd.service + #systemd_dounit ${FILESDIR}/fence_sanlockd.service +} diff --git a/sys-cluster/sanlock/sanlock-3.8.4.ebuild b/sys-cluster/sanlock/sanlock-3.8.4.ebuild deleted file mode 100644 index 638cec0ffefb..000000000000 --- a/sys-cluster/sanlock/sanlock-3.8.4.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit linux-info python-r1 systemd - -DESCRIPTION="shared storage lock manager" -HOMEPAGE="https://pagure.io/sanlock" -SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2+ GPL-2 GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="python" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND=" - acct-user/${PN} - acct-group/${PN} - dev-libs/libaio - sys-apps/util-linux - python? ( ${PYTHON_DEPS} ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/sanlock-fence_sanlock-LDFLAGS.patch" -) - -CONFIG_CHECK="~SOFT_WATCHDOG" - -src_compile() { - for d in wdmd src fence_sanlock reset; do - emake -C ${d} - done - - if use python; then - python_foreach_impl emake -C python - fi -} - -src_install() { - for d in wdmd src fence_sanlock reset; do - emake -C ${d} DESTDIR="${D}" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install - done - - if use python; then - python_foreach_impl emake -C python DESTDIR="${D}" install - fi - - # config - dodir /etc/wdmd.d - dodir /etc/sanlock - insinto /etc/sanlock - doins src/sanlock.conf - - # init - newconfd init.d/sanlock.sysconfig sanlock - newconfd init.d/wdmd.sysconfig wdmd - newinitd "${FILESDIR}"/sanlock.initd sanlock - newinitd "${FILESDIR}"/wdmd.initd wdmd - #doinitd ${FILESDIR}/sanlk-resetd.initd - #doinitd ${FILESDIR}/fence_sanlockd.initd - - # systemd - systemd_newunit init.d/sanlock.service.native sanlock.service - sed -i 's,^ExecStartPre=,#ExecStartPre=,' init.d/wdmd.service.native || die - systemd_newunit init.d/wdmd.service.native wdmd.service - systemd_dounit init.d/sanlk-resetd.service - #systemd_dounit ${FILESDIR}/fence_sanlockd.service -} -- cgit v1.2.3