Added upstream patches.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 79 insertions, 2 deletions

diff --git a/net-analyzer/cacti-spine/ChangeLog b/net-analyzer/cacti-spine/ChangeLog
index 4d3d8f764436..ad4ca18aeebe 100644
--- a/net-analyzer/cacti-spine/ChangeLog
+++ b/net-analyzer/cacti-spine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/cacti-spine
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/ChangeLog,v 1.14 2009/10/06 18:07:29 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/ChangeLog,v 1.15 2009/10/06 18:31:04 pva Exp $
+
+*cacti-spine-0.8.7e-r1 (06 Oct 2009)
+
+  06 Oct 2009; Peter Volkov <pva@gentoo.org> +cacti-spine-0.8.7e-r1.ebuild:
+  Added upstream patches.
 
   06 Oct 2009; Peter Volkov <pva@gentoo.org>
   -cacti-spine-0.8.7a_p4650.ebuild:
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 1d089bafa0a0..de296a300546 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,8 +1,12 @@
 DIST cacti-spine-0.8.7a.tar.gz 364746 RMD160 77e0487817e34b286e1fcc2574939b6da92e52d7 SHA1 b4ad837bf2ef777fe739712209b681491d308ead SHA256 8b6b082333fb91872be0da4c1498926fe1da7c9802662433f4ea7304eb4ae6f9
 DIST cacti-spine-0.8.7c.tar.gz 368272 RMD160 f9352f52fadd990a3495043c9977813c19f5f8da SHA1 4eb2c40fccc5cdcca517c2e1b352b66fd0ad7e5e SHA256 44fdaf572559f192d6e2dc14e649450879770cace710f17eee6d563e2e5a0ea3
 DIST cacti-spine-0.8.7e.tar.gz 782735 RMD160 fb711786631d1630e0f2dbdce5bee44b7c645976 SHA1 cfa468e37495746ac5cd8ad9aa8a7354ecb9650b SHA256 6f0b19deea0ab29a553d53f1d356ff68f19144205e4e5649596d95c6174d2150
+DIST mysql_client_reconnect.patch 436 RMD160 55bd62f9fb1d1d73a36cccc12326c4f3ca509504 SHA1 527daeed3842cfe5bffa540a196c6c2e31ec23db SHA256 b60c7679362a4e110e36bfc7cf569b292fa2e8ca7b130d8e5e48fdd29826a936
+DIST ping_reliability.patch 1642 RMD160 cbfdac7bcad16063d3a23dd827b71791e73585cd SHA1 a0295066259283eb3df5dc2ecb06482c6b8dca41 SHA256 9516c701f0174bf75af83cb8a1e3ef24d2bd4222c6a337093efec13136d3293d
+DIST snmp_v3_fix.patch 4300 RMD160 ace13023874080d85f683e6ce47f08891438a598 SHA1 c7dd4377c59b7a5f9ca6435bc8db793128071a07 SHA256 7e74a5f58f2fd1448360d84bd3be551f5ca791e5ea012ff395ad3461e0eab0d8
 EBUILD cacti-spine-0.8.7a.ebuild 1681 RMD160 dfa7c421c4344b51991d0f8f15e229a1366ec016 SHA1 d9f6dc03803f9eda4ec450d86e97316bc2586b30 SHA256 75bb0746aaec334c504920934d8e6e7b38f78dc6e1e70dcd77f652d99df0e37c
 EBUILD cacti-spine-0.8.7c.ebuild 1732 RMD160 129dfbc0a23b86ca652469717d73e3eb6b402d33 SHA1 c90d5c8eecf492afd7ed3899ec11fb5a7ed4d60f SHA256 43910115a48cf70d4a27d35d8e8072e6e5befe9f647ecaf77d73c6935dd84272
+EBUILD cacti-spine-0.8.7e-r1.ebuild 1776 RMD160 3c2669063eee4e3ff4f2db81120a92f6b76d5ce7 SHA1 6e346189d617ad37e8aa83ebdd90e0fca7af6392 SHA256 86e4538d77f93c8fc35ff613d085f809b9c97f299f77dc52b1ddee2ea835eacf
 EBUILD cacti-spine-0.8.7e.ebuild 1727 RMD160 dde2d6be4858d9d83d7687603a09baf3028b5d21 SHA1 15cff9618db8fb5ce54598298c67519a5896af14 SHA256 7b99701fc427dcff6268522d8bbde7a401adbe8ef29eb351d33c75abb450c284
-MISC ChangeLog 2206 RMD160 b43e5270de8496445e69e36e68d2ea0cbece4fa1 SHA1 9a2860f11ac1bf772d2e72a558986341841d9cd4 SHA256 26bcd305b4107f602df00e223967401f7ee85052969cbc01779f04363e65c23b
+MISC ChangeLog 2347 RMD160 478b01bf220c334e5ca60f4485d39d67d06828a3 SHA1 665f25b7ab5310c460b09b5454cb25463872dba2 SHA256 515a37eb630be42f500763811446b57b4ddcb56b05a43f01c4316e5b5b4ab0b1
 MISC metadata.xml 795 RMD160 6496692432dfda95180e8d7506af90ebd79b2172 SHA1 2e929eeb09763b10b746c6b0384acd4197051c85 SHA256 a1ee2fa5779e21ff428e18a563360a7d81e383345d867cfa27046614fc18e466
diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.7e-r1.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.7e-r1.ebuild
new file mode 100644
index 000000000000..9c6ec8c71a0c
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-0.8.7e-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/cacti-spine-0.8.7e-r1.ebuild,v 1.1 2009/10/06 18:31:04 pva Exp $
+
+inherit autotools
+
+UPSTREAM_PATCHES="snmp_v3_fix
+	mysql_client_reconnect
+	ping_reliability"
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="http://cacti.net/spine_info.php"
+SRC_URI="http://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="net-analyzer/net-snmp
+	dev-libs/openssl
+	virtual/mysql"
+RDEPEND="${DEPEND}
+	>net-analyzer/cacti-0.8.7"
+
+if [[ -n ${UPSTREAM_PATCHES} ]]; then
+	for i in ${UPSTREAM_PATCHES}; do
+		SRC_URI="${SRC_URI} http://www.cacti.net/downloads/spine/patches/${i}.patch"
+	done
+fi
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd "${S}"
+	if [[ -n ${UPSTREAM_PATCHES} ]]; then
+		for i in ${UPSTREAM_PATCHES} ; do
+			EPATCH_OPTS="-p1 -N" epatch "${DISTDIR}"/${i}.patch
+		done
+	fi
+
+	sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
+	AT_M4DIR="config" eautoreconf
+}
+
+src_install() {
+	dosbin spine || die
+	insinto /etc/
+	insopts -m0640 -o root
+	doins spine.conf || die
+	dodoc ChangeLog README || die
+}
+
+pkg_postinst() {
+	ewarn "NOTE: If you upgraded from cactid, do not forgive to setup spine"
+	ewarn "instead of cactid through web interface."
+	ewarn
+	elog "Please see the cacti's site for installation instructions:"
+	elog
+	elog "http://cacti.net/spine_install.php"
+	echo
+	ewarn "/etc/spine.conf should be readable by webserver, thus after you"
+	ewarn "decide on webserver do not forget to run the following command:"
+	ewarn
+	ewarn " # chown root:wwwgroup /etc/spine.conf"
+	echo
+}