From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- net-analyzer/cacti-spine/Manifest | 4 +- .../cacti-spine/cacti-spine-1.2.5-r1.ebuild | 53 ++++++++++++++++++++++ net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild | 50 -------------------- net-analyzer/cacti-spine/cacti-spine-99999.ebuild | 52 +++++++++++++++++++++ .../files/cacti-spine-1.2.5-my_bool.patch | 11 +++++ 5 files changed, 119 insertions(+), 51 deletions(-) create mode 100644 net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild delete mode 100644 net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild create mode 100644 net-analyzer/cacti-spine/cacti-spine-99999.ebuild create mode 100644 net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch (limited to 'net-analyzer/cacti-spine') diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest index cc1d6e4b0505..6b61205378c7 100644 --- a/net-analyzer/cacti-spine/Manifest +++ b/net-analyzer/cacti-spine/Manifest @@ -1,9 +1,11 @@ AUX cacti-spine-0.8.8d-ping.patch 235 BLAKE2B ab0390faaa8cd7b473ae2341a0f80d4eb87678bcf219bdf6d35ac2e6885047c87a26454f5bf0d3bbf618fccfcec06c31639bdc9f35e4c0267cf8f4de5bc13cb9 SHA512 93ea39cefbe20741a372c644f79bc2bde80e8ba81cbdfa4425523a642c0853aafe12a46bfd84a5d2161a9afed4ff8fd933cf72adbabcd54e936da8dd7d89d265 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57 +AUX cacti-spine-1.2.5-my_bool.patch 208 BLAKE2B 001bedf38a4cf481aa451670f9e8712b11dcae4192b8517db6c44b060560afeb094d66410f7e42fcd3229f96490782f0bcf23c359010762d25a7879def3c3668 SHA512 c0e873444ae4f259786a3e2705a0e07485fd6676bf5024cc503a8b30285b3920322c57184105a75148d696a4e762d63ff29c260b855f9a0c3040afc8bd7ab548 DIST cacti-spine-1.1.38.tar.gz 805437 BLAKE2B 32d934f54e00d83e9807dd194a7cacf8d5526c8e5b84c44ffad201c07edcb117f862266843552299fe04cc780575b9b2dc7129a106a20bd709cb82844ade7812 SHA512 5409a690e89fcc74e1e87e34e1918cab27d1243825955eb8256a92f8e9658f312345c66b338a4a07a0e38c94e3275131cb4e58fb70e7b59837c0e6c47746e45e DIST cacti-spine-1.2.2.tar.gz 2310298 BLAKE2B 782fb21fda6acf06434c6e996863a235670970b19e5218624723df4736c388c2d9f00c1e3cc623dad7973bcbbe7ae5d4bbe89e366c1f47ce83eac9b416f88cb4 SHA512 ef2f839f7b247439a8576d49e311546cfd2346eea06cfb26b7a05d4757ae28334e6ed6ea00396027dc6c0c6e107121ed38f356ba62d8202003553fea3b5d139e DIST cacti-spine-1.2.5.tar.gz 105494 BLAKE2B 1bd2f33cee841fb7b05a1a32d3d0d2824c36ccdc69fbf52c48cfe2d7bdbface4c1925261c8643c19addde90346c5ecdee547d8014705dc34800f59eab6ac248c SHA512 5bbf5f68e0d3477d43afee57bc86bfeb61a3ddaa18f7c0e5e0c2413bde6646bcd662d93e4c124daa6eaef5bca5843fb359b733c5189d9f43a34a14fba7f03682 EBUILD cacti-spine-1.1.38-r2.ebuild 865 BLAKE2B d3ee48575e06d3936d7b05417549a6bbd0655f8b04f8e62b44f220615020016e373c9854b7b830efeda4fea76b0a133574a9e97f150ae6c62e029be6ec812147 SHA512 93a55f613d7f0be9301ab7d36e4bcbd9f518aa514bb43a70eec540848274b98574af5c8fb26ba8b21849c9c698005a7b7e404dfd29b2b04378308ca87cdda740 EBUILD cacti-spine-1.2.2-r1.ebuild 887 BLAKE2B d8680ed1e6ae3b749b5bcb3d0a37f7d52aed0bfdcb31072f38d604b6800317bfdb1f0da7758f9265b27f8c5b4a456ce97bc434cb7a0833a73a02988025bee152 SHA512 1c6116e9609629559fe8a8462f4449b8535ad44bd2e8d7212f119c179d7e21a2befd378bcaa5e0ee60e344b24acb31501ea41f984fdd92f9ce905f3978d8d335 -EBUILD cacti-spine-1.2.5.ebuild 887 BLAKE2B d8680ed1e6ae3b749b5bcb3d0a37f7d52aed0bfdcb31072f38d604b6800317bfdb1f0da7758f9265b27f8c5b4a456ce97bc434cb7a0833a73a02988025bee152 SHA512 1c6116e9609629559fe8a8462f4449b8535ad44bd2e8d7212f119c179d7e21a2befd378bcaa5e0ee60e344b24acb31501ea41f984fdd92f9ce905f3978d8d335 +EBUILD cacti-spine-1.2.5-r1.ebuild 977 BLAKE2B b95d683505702a0e4bb0e627c9d581e6668e5c97f6479d5e212ab60c0a079800f1c3cf77a15a24dec8076f0b65584ce4c14be4656717b2ec929f1b1f9c4da4dc SHA512 85dd5d7d273fab5cb939e95dc0eedd1f7e3ebf78faa4508f8211629e2f6ddd754fb138fefbe75f06a784f8f40172d70b6d1f4997e6eb97ecab91bfb397fa6b91 +EBUILD cacti-spine-99999.ebuild 884 BLAKE2B 5df3c6c34e5b6d1fdf833d49a5a4cd1e9c6137199bd54879f47f632059b8cfa1d836d68f3f0abf126f66a0f78e6c3166a322b86df6f1b8f2acd709691f1e22b1 SHA512 7d2dface1745bc2847de70b2b8067822438b4d51d0039e1e9a9e4599d2ff64cbdc2d2e431a7e6d81694c1c23158a2f1f99cada8f374eff60a31ef9da6e6c0566 MISC metadata.xml 728 BLAKE2B 5e36aa5717b3f0f72d1d5116e9df6223fe4d99040b970fd86baebbc6835fa0c673327114dd867a2e52822fa71731b3e1fc3e93b77344be89de8fe0b9b648286d SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38 diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild new file mode 100644 index 000000000000..752dc560a7cd --- /dev/null +++ b/net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools + +MY_P=${PN}-${PV/_p/-} + +DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)" +HOMEPAGE="https://cacti.net/spine_info.php" +SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="libressl" + +CDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + net-analyzer/net-snmp:= + dev-db/mysql-connector-c:0= +" +DEPEND=" + ${CDEPEND} + sys-apps/help2man +" +RDEPEND=" + ${CDEPEND} + >net-analyzer/cacti-0.8.8 +" +PATCHES=( + "${FILESDIR}"/${PN}-0.8.8d-ping.patch + "${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch + "${FILESDIR}"/${PN}-1.2.5-my_bool.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_install() { + dosbin spine + + insinto /etc/ + insopts -m0640 -o root + newins spine.conf{.dist,} + + doman spine.1 + dodoc CHANGELOG +} diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild deleted file mode 100644 index 9a49a5087926..000000000000 --- a/net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -MY_P=${PN}-${PV/_p/-} - -DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)" -HOMEPAGE="https://cacti.net/spine_info.php" -SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" - -CDEPEND=" - dev-libs/openssl:0= - net-analyzer/net-snmp:= - dev-db/mysql-connector-c:0= -" -DEPEND=" - ${CDEPEND} - sys-apps/help2man -" -RDEPEND=" - ${CDEPEND} - >net-analyzer/cacti-0.8.8 -" -PATCHES=( - "${FILESDIR}"/${PN}-0.8.8d-ping.patch - "${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch -) - -src_prepare() { - default - - AT_M4DIR="config" eautoreconf -} - -src_install() { - dosbin spine - - insinto /etc/ - insopts -m0640 -o root - newins spine.conf{.dist,} - - doman spine.1 - dodoc CHANGELOG -} diff --git a/net-analyzer/cacti-spine/cacti-spine-99999.ebuild b/net-analyzer/cacti-spine/cacti-spine-99999.ebuild new file mode 100644 index 000000000000..3eacb02e8472 --- /dev/null +++ b/net-analyzer/cacti-spine/cacti-spine-99999.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools git-r3 + +MY_P=${PN}-${PV/_p/-} + +DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)" +HOMEPAGE="https://cacti.net/spine_info.php" +EGIT_REPO_URI="https://github.com/Cacti/spine" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="" +IUSE="libressl" + +CDEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + net-analyzer/net-snmp:= + dev-db/mysql-connector-c:0= +" +DEPEND=" + ${CDEPEND} + sys-apps/help2man +" +RDEPEND=" + ${CDEPEND} + >net-analyzer/cacti-0.8.8 +" +PATCHES=( + "${FILESDIR}"/${PN}-0.8.8d-ping.patch + "${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_install() { + dosbin spine + + insinto /etc/ + insopts -m0640 -o root + newins spine.conf{.dist,} + + doman spine.1 + dodoc CHANGELOG +} diff --git a/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch b/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch new file mode 100644 index 000000000000..d9554bfa38c5 --- /dev/null +++ b/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch @@ -0,0 +1,11 @@ +--- a/sql.c ++++ b/sql.c +@@ -229,7 +229,7 @@ void db_connect(int type, MYSQL *mysql) { + timeout = 5; + rtimeout = 10; + wtimeout = 20; +- my_bool reconnect = 1; ++ _Bool reconnect = 1; + + mysql_init(mysql); + -- cgit v1.2.3