diff options
Diffstat (limited to 'sys-cluster/sanlock')
| -rw-r--r-- | sys-cluster/sanlock/Manifest | 8 | ||||
| -rw-r--r-- | sys-cluster/sanlock/sanlock-3.8.5-r1.ebuild | 4 | ||||
| -rw-r--r-- | sys-cluster/sanlock/sanlock-3.8.5.ebuild | 4 | ||||
| -rw-r--r-- | sys-cluster/sanlock/sanlock-4.0.0.ebuild (renamed from sys-cluster/sanlock/sanlock-3.8.4-r1.ebuild) | 43 |
4 files changed, 34 insertions, 25 deletions
diff --git a/sys-cluster/sanlock/Manifest b/sys-cluster/sanlock/Manifest index 223048e48442..4f99fc1c2576 100644 --- a/sys-cluster/sanlock/Manifest +++ b/sys-cluster/sanlock/Manifest @@ -2,9 +2,9 @@ AUX sanlock-3.8.4-implicit-func-decls.patch 730 BLAKE2B 76135073c217e914c5c9d89b 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.4.tar.gz 270031 BLAKE2B da011a15d488849d47fe1043df040580652558918dff9549bf4e6cb4077c03b4aaa8f8de5399dbb0e3f2301ae90c0d20599b25bd5e72bae5317b13f79a352333 SHA512 9fca2b18fd3bd504d5186de0b2626ea2c993997528de2384dc042afe52b2b68422a2e4bb79e2409c9e6eccbe5ea8d8939549eb25c5d16aa7fecf6c9a5798340c DIST sanlock-3.8.5.tar.gz 270911 BLAKE2B 7f8146d67c620d22ded5205c1c621f3bbb36256a4c80e866575d8f324ad0237cf8bc07579f3aeda393dd0db85e27fdaa1aab1b6d7b931d4416d13f82d560e22a SHA512 8131e0b37ac47052a29d4b3a3e4286b06b862f08e827d3307f179eadbe97e4bc3e10f5c93f35042c308435ee81546a813227bce665a9735cbbf2b5a4a1f4474a -EBUILD sanlock-3.8.4-r1.ebuild 1866 BLAKE2B 0a39d3e12287fc5fa0858ce9c7c7f518290b8d5962aad1ccc7d694c75302e3e7c542480cdd80b1aa635c075ad4c247a9da3257b4537cd5412d40824eee36a877 SHA512 9ffd5ba43d287f86ece8573936fd19a3976f8d09050a0b79de8269c631827bbcaee2c56e97fc30a33d6cba5d048b370a42875b04ab8c4859f64e220b678e52bd -EBUILD sanlock-3.8.5-r1.ebuild 2004 BLAKE2B 6933bf6cceff31ad02aaa4d68cb52b69350ef7b95a7e0e471132ad4a374680a2b931984ad6e93c56b6e9dd44ca0c712400d2d7eed432ff29756fe2e55d2fcaed SHA512 75c945a0655c14e13d29262c2c3f328693211d8c4f10f61f0c3bf2b3b2a2f31037e0e5a3cdaa5d79c917e41ca2801f472cde585967468fde805e5ae404925af9 -EBUILD sanlock-3.8.5.ebuild 1997 BLAKE2B f96215b0fa73721d18e9c18acec59952de516d19fcaacbe7e78f27967196bc44302563c27c7655db43cd45fa76ee1b4f1303dd75740a40b67c90e554fee85433 SHA512 5a3b4e38c9e6b92c1a02352cfa91600041531f81a8f6f727e87780daaa6e3504cbff0a4d21caf966e61d7d012eaac8b0fa5b824dd48cf054eed851556ea775da +DIST sanlock-4.0.0.tar.gz 288907 BLAKE2B e49037ff6976ae1912ceb1e345a65bf4e3689428309085d1e3c93cd6bad9ca816cabfb7c525cab2851870c4e8a96dd927934d1b0722cb5900d3cd0950e50075b SHA512 a478c8bbc09043d5dad18cc3ddbcaeefec0dd5587ab2807721424a1efc9d58ab82deacaa2f88289dc9990a2a6f95a80dabb727670e7aeaeba5ed0a57a3849c27 +EBUILD sanlock-3.8.5-r1.ebuild 1998 BLAKE2B 95c33ffeffd8ae7ee8c149024008fd4b3fd96c5957580d1b1be6e20917f91b172628bebe606cd9d4f6c0f39b8ba3e7921071c37bc27057f22a8abe1e21000246 SHA512 df664b3d938009406d3c57fb2886ff9392cfcbebdf23741de1ece19d1e0a0dd26a3b5452d2ad633c3ff50b967b70935575f2750c5356ff1e9bef011dde1ebf62 +EBUILD sanlock-3.8.5.ebuild 1997 BLAKE2B c4b44e47d2b575fce621554c4551c49ddfbfb47f4067d60ba5f7652ccd3f66747506d8f95b0896e421b79e094c01220f27e69fada25257e0c477d54a89a4a87a SHA512 4f098e8c01b0ba3be98d656fe5a05b5c9182c2b2ebae7ee9f6a6d267c7f064208710eb0a6a3085fa39e36b22c969d77016bc04641d3544d70a5bf86a45fe572e +EBUILD sanlock-4.0.0.ebuild 1837 BLAKE2B a83ecafbb6ffa61c6eb8ce7b8130b321b64bbdac2e23c8812b82ba84df733d6a01e8c1575db6258a1ce3bff1c33eebde44113244647031e7570b04626f0d6eff SHA512 623daa2f8f2be8cffea4c6ea2f1e9ed451ae9e3f3275d54107f6e89ea905eddfbfc5571b5fbf15f11c63939454251c0cd2a41590134b72eb94c91ff6eda78fae MISC metadata.xml 369 BLAKE2B a32cbc5e109bab37912ecc7efe951fcec96fb133b2861d3c38290e5f3aabe87e444d38bdbb18b711ba5836c43c7ac7ebcde3b5f23ec10df8c413cbd445c05ddf SHA512 ac7cb5f13743775baecae83e2c6beb6988b4c374db96217136cd68124e947890de32c9d7afecbdafbac32b0ac450ec2580b923f0e9fb63ef944463e879cd8283 diff --git a/sys-cluster/sanlock/sanlock-3.8.5-r1.ebuild b/sys-cluster/sanlock/sanlock-3.8.5-r1.ebuild index 69b184570572..a212980d7420 100644 --- a/sys-cluster/sanlock/sanlock-3.8.5-r1.ebuild +++ b/sys-cluster/sanlock/sanlock-3.8.5-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit flag-o-matic linux-info python-r1 systemd DESCRIPTION="shared storage lock manager" @@ -12,7 +12,7 @@ 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="python" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/sys-cluster/sanlock/sanlock-3.8.5.ebuild b/sys-cluster/sanlock/sanlock-3.8.5.ebuild index 3e4755ac7b9f..ccd70f099e6b 100644 --- a/sys-cluster/sanlock/sanlock-3.8.5.ebuild +++ b/sys-cluster/sanlock/sanlock-3.8.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{11..12} ) inherit flag-o-matic linux-info python-r1 systemd DESCRIPTION="shared storage lock manager" diff --git a/sys-cluster/sanlock/sanlock-3.8.4-r1.ebuild b/sys-cluster/sanlock/sanlock-4.0.0.ebuild index 4fbe42d16aa2..8bbee1672e3b 100644 --- a/sys-cluster/sanlock/sanlock-3.8.4-r1.ebuild +++ b/sys-cluster/sanlock/sanlock-4.0.0.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) -inherit linux-info python-r1 systemd +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{11..13} ) +inherit flag-o-matic linux-info distutils-r1 systemd DESCRIPTION="shared storage lock manager" HOMEPAGE="https://pagure.io/sanlock" @@ -12,45 +14,52 @@ 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 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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" +RDEPEND=" + acct-user/${PN} + acct-group/${PN} + ${DEPEND} +" 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 + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/863734 + # https://pagure.io/sanlock/issue/10 + filter-lto + + for d in wdmd src reset; do emake -C ${d} done if use python; then - python_foreach_impl emake -C python + pushd python + distutils-r1_src_compile + popd fi } src_install() { - for d in wdmd src fence_sanlock reset; do + for d in wdmd src 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 + distutils-r1_src_install fi # config @@ -65,12 +74,12 @@ src_install() { newinitd "${FILESDIR}"/sanlock.initd sanlock newinitd "${FILESDIR}"/wdmd.initd wdmd #doinitd ${FILESDIR}/sanlk-resetd.initd - #doinitd ${FILESDIR}/fence_sanlockd.initd # systemd + local utildir="$(systemd_get_utildir)" + exeinto "${utildir#"${EPREFIX}"}" + doexe init.d/systemd-wdmd 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/wdmd.service systemd_dounit init.d/sanlk-resetd.service - #systemd_dounit ${FILESDIR}/fence_sanlockd.service } |