diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
commit | c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch) | |
tree | c44943ee0563a3fa957716de909fed683117fcb9 /sys-cluster/pacemaker | |
parent | 69051588e2f955485fe5d45d45e616bc60a2de57 (diff) |
gentoo (valentine's day) resync : 14.02.2021
Diffstat (limited to 'sys-cluster/pacemaker')
-rw-r--r-- | sys-cluster/pacemaker/Manifest | 6 | ||||
-rw-r--r-- | sys-cluster/pacemaker/files/pacemaker-1.1.24-python-fixes.patch | 26 | ||||
-rw-r--r-- | sys-cluster/pacemaker/files/pacemaker-1.1.24-qa-warnings.patch | 12 | ||||
-rw-r--r-- | sys-cluster/pacemaker/pacemaker-1.1.24.ebuild | 80 | ||||
-rw-r--r-- | sys-cluster/pacemaker/pacemaker-2.0.5.ebuild | 2 |
5 files changed, 2 insertions, 124 deletions
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest index 841d192bebfd..dd5d836ed139 100644 --- a/sys-cluster/pacemaker/Manifest +++ b/sys-cluster/pacemaker/Manifest @@ -1,10 +1,6 @@ -AUX pacemaker-1.1.24-python-fixes.patch 1097 BLAKE2B 0ae19b7c6110262728369f5368a80d2d80e1d2566cc7480a9419302c2e49d98d07df2d7222028076f517a7158ea8af6ea95e9c47b06881ee5140272203b3650a SHA512 d31f8a7ab06a6b0649bf5395bd722503ec58164f87db137cda7125e95cda4337cc754fce509d50706e9159e45b61e2593c2fd9cd132bd7e4467a077855308af5 -AUX pacemaker-1.1.24-qa-warnings.patch 492 BLAKE2B 9ff485f9d2af09d2ce736b4b8312a9ff9d799ad49db433c2353252fdfc6dc85d85fdf300127d35f2ce815770ff60ce0b8ac7536993841f8e0a962a685a00789c SHA512 736f13ddbe0013ad15c62acc469e97fb30eb12b9782e0c60338c5d8cfa87174e9c8e2b3b9d326b9228135709830749e4481a77bd088ca83027ba4472867147b3 AUX pacemaker-2.0.4-qa-warnings.patch 819 BLAKE2B 5de3717c80c6aa0d81b66c2b16e0b15a272f2a67549ef22288f4feddd34ca498dd797744a94ebe5a7b05cf515a3f42f78e0281dfc805724a7aed957d966f58f8 SHA512 fad606290261b996dc5ed9c29388c245e1247d9816ef843360e36fac4360de0c95eda17ec3e254e7cb67921ab60263ae2acda46874c6d722f13b2e025a98ac94 AUX pacemaker.initd 862 BLAKE2B 4da4af65887be567aa77fff2b3647b64fa86a9862a2269db1c27ab429759ac597f6eb5fcbadefc22ec64d0eb5983b3d7301c1867d056ef8332f241d967aae3c0 SHA512 9578a47ea9271a5b8b5939dc32ff49736504c2e6318f3e9f906b554b1b11a334c01cae8900e946318cdffd3cf9611d748013bdcc63b3ae68919709ebb12e7e7c AUX pacemaker.service 105 BLAKE2B 2b77b0c81427ab418bb5af372fb4938a7c630a9bb1e4128ed7335d9d1d11b5fbaf657e9ccabd6a7d4b1a120a00d7e46678f8a7a635b0dee7a2aa60559e78d50c SHA512 478e1040811f16c0c26fad8feb55cf803e5c4ec4a25e7c82ec771663f25270500fce2dd53622abd7126006c4629bdc3a82fb7f16361eb19543619824a56e848b -DIST Pacemaker-1.1.24.tar.gz 5765945 BLAKE2B cdbba75b640adf6962d00a13a12045bf5d1e34dbdaf34d53797e8fea4fff9368dd3d771fe2d7f70813bb3cfab87a7daca3af56f4f5b343fb3ac3aec649f32316 SHA512 6eb5996ae135970cb7a04b81ad43d060e898566d0addd70da61085d47da6d7dc752e8e9df580e18c295c8b373bab6b4574ddb3a34cb7a1e29b2ed768a4f916bd DIST Pacemaker-2.0.5.tar.gz 5434850 BLAKE2B 4e3d24746978fe0785dd9c415cc3779a2bd06f78d8bcd3353cdab8c93b192db8a017d404f6d5e27852369e8db2dc1ee4a2c4c7806ebb1aad5381d1c5b5a681dc SHA512 5fd3614f0284297babb66ea2dc567583315052fcf77f49107c52161e8e8c164ae3169d98528fdc1316d8eabaacc98ed24e9c6e6c90b3286f2f012a4ee874bbba -EBUILD pacemaker-1.1.24.ebuild 1674 BLAKE2B 6e607467e2c826b4c04f0d0c28fabd0869d9b8cafd74a0e2dfa4a7220300137a56c4fb16e757d7e0b086af138f729966e1a4712e72509aab59741e77ca86d298 SHA512 3c659b4c49adb1af40770fe1d9f1031e945560f22c180d22e283acdafcda515e3557c1068ab91a61335694a048e084c9cfed32c42b50a652c00e2d7fc4e9615d -EBUILD pacemaker-2.0.5.ebuild 1577 BLAKE2B 78d047e985ea580589b93a49ccac054c52ad19b7366ea6ac213ac08293df4b1891d3fc16045902f85056a42e991544c49ce24c2aa447015ce9db9190b167e91c SHA512 b78df7f28f6b991b12eccab1a03111f7a0f08f7235c6f65c6fcdf331f3003f82edb300184e6127a8ef60a3fbc93ad85d2bbd9f39b0e6aafb46a027363a78932b +EBUILD pacemaker-2.0.5.ebuild 1576 BLAKE2B 014f0d09c3c664a90e1ed6656fbf62aedee5b840a8ca092aba647f0e251cbb941a4cba778e2cf209a5555c60f4fb81ebd4ebb7ae0ed211eb76cb5e3a30c0751d SHA512 865d8da908694c7c799395f8d706cfc89508ce766854bfdcd2fa572c58818afc707fe8b4ee36e3a54c1a064b0c9d46d5fd00cbbf876505fa6a5270afe5190f6a MISC metadata.xml 808 BLAKE2B a4da9e3271b4b28e903675dafd9d7f89e04ba1f326a849bb61b74f9ee7a3d21acf32b64826752b5881e40a292e850242eb87d722a41caa2d6c5106fe7162a3d9 SHA512 a86d59e889206951e38efc0fb3ace9f54662abfc56edbf04e66f266e4d29c97bda968df5b16bc54150a5be24ccbb7f3ff3d04f8d527f12bc067fac02255b5119 diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.24-python-fixes.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.24-python-fixes.patch deleted file mode 100644 index 2428a399d5f0..000000000000 --- a/sys-cluster/pacemaker/files/pacemaker-1.1.24-python-fixes.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ur pacemaker-Pacemaker-1.1.24-rc1.orig/cts/remote.py pacemaker-Pacemaker-1.1.24-rc1/cts/remote.py ---- pacemaker-Pacemaker-1.1.24-rc1.orig/cts/remote.py 2020-10-30 18:35:13.000000000 +0100 -+++ pacemaker-Pacemaker-1.1.24-rc1/cts/remote.py 2020-11-10 22:47:21.600435423 +0100 -@@ -125,7 +125,7 @@ - ''' - - def __init__(self, rsh, silent=False): -- self.async = [] -+ self.hasync = [] - self.rsh = rsh - self.silent = silent - self.logger = LogFactory() -diff -ur pacemaker-Pacemaker-1.1.24-rc1.orig/cts/watcher.py pacemaker-Pacemaker-1.1.24-rc1/cts/watcher.py ---- pacemaker-Pacemaker-1.1.24-rc1.orig/cts/watcher.py 2020-10-30 18:35:13.000000000 +0100 -+++ pacemaker-Pacemaker-1.1.24-rc1/cts/watcher.py 2020-11-10 22:46:08.287258247 +0100 -@@ -140,8 +140,8 @@ - self.logger.debug(message) - - def harvest(self, delegate=None): -- async = self.harvest_async(delegate) -- async.join() -+ hasync = self.harvest_async(delegate) -+ hasync.join() - - def harvest_async(self, delegate=None): - self.log("Not implemented") diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.24-qa-warnings.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.24-qa-warnings.patch deleted file mode 100644 index 37346d6a396a..000000000000 --- a/sys-cluster/pacemaker/files/pacemaker-1.1.24-qa-warnings.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur pacemaker-Pacemaker-1.1.24-rc1.orig/configure.ac pacemaker-Pacemaker-1.1.24-rc1/configure.ac ---- pacemaker-Pacemaker-1.1.24-rc1.orig/configure.ac 2020-10-30 18:35:13.000000000 +0100 -+++ pacemaker-Pacemaker-1.1.24-rc1/configure.ac 2020-11-10 23:21:04.728714112 +0100 -@@ -2198,7 +2198,7 @@ - - dnl Put the above variables to use - LIBTOOL="${LIBTOOL} --tag=CC \$(QUIET_LIBTOOL_OPTS)" --MAKE="${MAKE} \$(QUIET_MAKE_OPTS)" -+MAKE="${MAKE} ${QUIET_MAKE_OPTS}" - - AC_SUBST(CC) - AC_SUBST(MAKE) diff --git a/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild deleted file mode 100644 index 994c508fc65a..000000000000 --- a/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit autotools python-single-r1 - -MY_PN="${PN^}" -MY_P="${MY_PN}-${PV/_/-}" - -DESCRIPTION="Pacemaker CRM" -HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker" -SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~hppa x86" -IUSE="acl smtp snmp" - -DEPEND="${PYTHON_DEPS} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - sys-cluster/cluster-glue - sys-cluster/corosync - >=sys-cluster/libqb-0.14.0 - sys-cluster/resource-agents - - smtp? ( net-libs/libesmtp ) - snmp? ( net-analyzer/net-snmp ) -" -RDEPEND="${DEPEND}" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.24-python-fixes.patch - "${FILESDIR}"/${PN}-1.1.24-qa-warnings.patch -) - -S="${WORKDIR}/${PN}-${MY_P}" - -src_prepare() { - default - sed -i -e "s/ -ggdb//g" configure.ac || die - eautoreconf - python_fix_shebang . -} - -src_configure() { - # appends lib to localstatedir automatically - local myconf=( - --localstatedir=/var - --disable-fatal-warnings - --disable-static - --without-cs-quorum - --without-cman - $(use_with acl) - --without-heartbeat - $(use_with smtp esmtp) - $(use_with snmp) - --with-ais - ) - - econf "${myconf[@]}" -} - -src_install() { - default - rm -rf "${D}/var/run" "${D}/etc/init.d" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - if has_version "<sys-cluster/corosync-2.0"; then - insinto /etc/corosync/service.d - newins "${FILESDIR}/${PN}.service" "${PN}" - fi - find "${D}" -name '*.la' -delete || die - - keepdir /var/lib/pacemaker/{blackbox,cib,cores,pengine} - python_optimize -} diff --git a/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild b/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild index 8dfa4cc494f8..262f0c975432 100644 --- a/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild +++ b/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~hppa ~x86" +KEYWORDS="amd64 ~hppa x86" IUSE="acl smtp snmp" DEPEND="${PYTHON_DEPS} |