Add build/compatibility patches (bug #552030 by Tomasz Chilinski).

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

8 files changed, 319 insertions, 25 deletions

diff --git a/net-analyzer/cacti-spine/ChangeLog b/net-analyzer/cacti-spine/ChangeLog
index 3ab0c67b2580..cbe66d07bcee 100644
--- a/net-analyzer/cacti-spine/ChangeLog
+++ b/net-analyzer/cacti-spine/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-analyzer/cacti-spine
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/ChangeLog,v 1.40 2015/06/12 05:47:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/ChangeLog,v 1.41 2015/06/14 08:00:16 jer Exp $
+
+*cacti-spine-0.8.8d-r1 (14 Jun 2015)
+
+  14 Jun 2015; Jeroen Roovers <jer@gentoo.org> -cacti-spine-0.8.8d.ebuild,
+  +cacti-spine-0.8.8d-r1.ebuild, +files/cacti-spine-0.8.8d-mysql.patch,
+  +files/cacti-spine-0.8.8d-net-snmp.patch,
+  +files/cacti-spine-0.8.8d-ping.patch,
+  +files/cacti-spine-0.8.8d-polling_time.patch,
+  +files/cacti-spine-0.8.8d-snmp_spine_close.patch:
+  Add build/compatibility patches (bug #552030 by Tomasz Chilinski).
 
 *cacti-spine-0.8.8d (12 Jun 2015)
 
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 2b917c3a188f..df58c036637d 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -3,6 +3,11 @@ Hash: SHA256
 
 AUX cacti-spine-0.8.8b-fix-ac-macro.patch 217 SHA256 90d6e6fc9ad65eac60dc3d07e8cd7f7b14166d1e22eb7bab90dc767bba6fd061 SHA512 525103019b824cf4213053a1a107d940996ac7a3fe29f1ed1a16f37109918001fc7d4beafe2894e3ada4fa2d118dec88d322ac75f1154fd32a5e8d108af03c99 WHIRLPOOL ec2bfe45bb3d2d7c69b807e8a1c045b0c3592138793b1e329f13eb4420e218c06ebba834902517d5c79225648b00c6af3d3bb72d2621976876209295a81321de
 AUX cacti-spine-0.8.8d-fix-ac-macro.patch 217 SHA256 a51b4a4d7573ac4dd3482d5ea0b5fd199cd795b691e92a3a1acf4b17f69c549c SHA512 aef082e19e043e107788447ca07fc02a5b46e14eac818e4cbe8d91ad6618addd4bbb2fcaca75846e459d9cd37b7776c2fa15caf91ba0947971f0dd69612b5d95 WHIRLPOOL f2a9414b6254b16a4c406b5d7037c352d45ffe78010e5cc51a3d27d5717f7250dfdc713cb04397aed58547de7762ea4e2e96931d09099e0bbd9a7c1deebd7911
+AUX cacti-spine-0.8.8d-mysql.patch 283 SHA256 bd99d14dcab780ff4fa01d85107d69c879faf1bdf113e1b38f3c7f9509823f40 SHA512 0291015f09a9f74cb3e9132c3fe751105928217d6f9c8e4312501d161ef30b6277114a3600c160704af7e43a75cea6c06f75dd6a8777fedee4b8d0909ef67642 WHIRLPOOL 34c3d743eb12db7286c7b7905b8433507f34e68b2ecf3cd9fbb0bd7b2b604aa67faddf4fcc818af009c5422c69363e5f6e5a1602bcaf601e9b7fe4519eb11bc0
+AUX cacti-spine-0.8.8d-net-snmp.patch 772 SHA256 ec5c71001f694c0f4cfcb5776e48aee223f71b95eecc8cf753202ca8b4368fee SHA512 6434bb3c588b8e83736eace7bb3d410444653578dfd54d073dfcc176dbc94a3c0533fa6818af43445262350f76df9619456cf12de2865cd5beedd4c100603923 WHIRLPOOL 805413dd35d24844958df978f5e24af2eaa6e045657dee6dad4ad0980aa743f7a0edc428c88ffc033068692dc50184ec9f369b38abecdf1a8a205cde3ed66f64
+AUX cacti-spine-0.8.8d-ping.patch 235 SHA256 be4b619c9a476759cd06f243641d6043a25345b6a2b3ac5dd16622d1463aff3d SHA512 93ea39cefbe20741a372c644f79bc2bde80e8ba81cbdfa4425523a642c0853aafe12a46bfd84a5d2161a9afed4ff8fd933cf72adbabcd54e936da8dd7d89d265 WHIRLPOOL 88b32e2229a5c8b1fd6c2a5c187af9a2372996b87ef4ef6837eee6f06b0de18a909d6d98dd521c2a762e76f8742e9d96f48a71efd3ad759db227e6da222be726
+AUX cacti-spine-0.8.8d-polling_time.patch 8890 SHA256 b8f9630f2a495f378372f624befaa370092c26fa77bcb39d60c334ecca7dea85 SHA512 cdcb353762cc3a67be3f5debdceb09f40e2990201825cfa36b7403bacc69303c85785f5094dca0337ef31dfa4790d5729708f0d6c48896ab633a8dacfc1157c2 WHIRLPOOL c17e733b759138b3b27d45e1ffec9ad88ee23e8666b648db1fe6d1e7d51d9512cc0e3a4a1962ddd5e71150a9c3f62e5fa2474b4f882c6dd01d509655193d0a6b
+AUX cacti-spine-0.8.8d-snmp_spine_close.patch 511 SHA256 47edea95aaa7d6018ae0f64aeb894b42607cccdfe062495afad1b358afcc76d1 SHA512 13e885421658e28ffe94530f0feccfa24020d1a2cef4115ab2d4390fcf557cd5224f89395ddeb24797d9556c4cd8a55a90c8ddf65341eeb642569498478c0ea9 WHIRLPOOL 5fc6cd5503b0b27f2a1d6d957740e5a93ae9cba33bddbaae85e236f3d3749bc3159313149064cab928878797455bd118653e395cd62fd1b54dd7cba0c1bc155c
 DIST cacti-spine-0.8.7i.tar.gz 623811 SHA256 94596d8f083666e5c9be12cc364418e31654b8ff29b6837b305009adcad91c6b SHA512 3ccca10cdd12672c37591579a9ce9e70a7b4a60c562904ed99c4f26bd73b9227421ea0ba3a87351629847fcf54fdc659404b6e0abaf97d4b63213de82703fabd WHIRLPOOL 992e07b6102dc8e505436240e545bd24cc119561a371d8e37a3630dd5c9b611c4b6ce96342be840f77e02704e2a43cb3ff6a4871c373e1c704cc15a48eba2075
 DIST cacti-spine-0.8.8a.tar.gz 623853 SHA256 2226070cd386a4955063a87e99df2fa861988a604a95f39bb8db2a301774b3ee SHA512 c6eb9492869488a5114cbfa2d372b1acb4bd1b0cecda2297f4b06cb1fe2fb95879b532923c230c72c9b50fbcfbf8f1d655c42075902c9f3a3ac4ee02d2e1913c WHIRLPOOL 080653346b698acff442c7d311ac805e6de410754a33dae698f6bd9328d3843734754fcf2eb417a870b1ac3d1effa5e830bec0d512b5f180da83b7c46ec2a74f
 DIST cacti-spine-0.8.8b.tar.gz 631603 SHA256 fc5d512c1de46db2b48422856e8c6a5816d110083d0bbbf7f9d660f0829912a6 SHA512 22be23012fbe165ea7d7097bbca1dda472bbe521f126e28e03f2faf394e67e050d95d88a878688b615dcdca2ec2b2166fdd48567503f1564f093797634a1809a WHIRLPOOL 86c065989fc58e926f4e76ec842dcaa276f4a8fc65ddbb0a7b2752cb6a52778464520b80a48fb612cece56600f03b5512ca5f01b97e9b58eb7f12cc6c62f49bb
@@ -10,13 +15,13 @@ DIST cacti-spine-0.8.8d.tar.gz 757454 SHA256 f3910d0022f6b70178bde99af683aab2968
 EBUILD cacti-spine-0.8.7i.ebuild 1587 SHA256 ff55190257c2cd1a42f430f447a6c6d6b840adad1243c2ea4414f36ee46f4984 SHA512 653cbc4baca7e8b5704584eeaa5d3ec45f620b9eefd50a6dbd9f0550956a999bf6ca56df7472c332ee812bed968d9eb09c9ed35c3243d1cbfb6be48d712220cf WHIRLPOOL 20decdee4404bf0ae2ea30729dc4fc29ffb446c41afef5c81f81ae94eb5697a8e3b0a22b65f6986f63151f59fd82c677b03ee2458df431abe4b114faae4f30fe
 EBUILD cacti-spine-0.8.8a.ebuild 1582 SHA256 cdfc79aa529baf6f45609511af96933fa976d9a31d6ba9191aedbcac212d9565 SHA512 acb2759484ab0479ef6e8554feaab1a0944c8c9c84178a2c89afb6767e33533ed75d823f27ba7732b5f5c43e0f703ce93e07b16f3cd320eb8c77ec45c429f742 WHIRLPOOL 668dfd56470ff9abc66ea0b78ca526076f8afd9ca50b66da593883ab97bf5fde96186b41d6674d9cfadd63c40979669b5692a6e371389068c08e76d4184c81e9
 EBUILD cacti-spine-0.8.8b.ebuild 1710 SHA256 28cb37d1775531cb0830e4c78c3f7eee691582a743d5eeb2f8e8c7de848189f8 SHA512 b21a45855ddeadf56356052e2a0efb71cc66b20eb09e8dfb166f0ac62e8d82f9634d66eac90f1853ebe0b8ff0af89a969beab0048a9bc497779e81cddc7be5ba WHIRLPOOL 8f9c2c6bfaa733783c022addcbe154c717c175df335919768689eb99a35a07cfe6acfe46d54244cd7a1b1afe4687ba6a0a5e6780a93bddd3b454adbfd7948470
-EBUILD cacti-spine-0.8.8d.ebuild 1351 SHA256 5d86e93761bc54e33831cb83e01f024cb5b55340b1e6a7e93f1184860a84cbf2 SHA512 bccc3dd7816398b4f61d5553751985e20146fb48f3765572d16daed7198c8740b8f4e7b8047f70e0318808186631e5097aed18e621dd290b1d29721278b4c6e8 WHIRLPOOL 5f5e8754ce480128147874d81ac4b6b76ac824e5fc87a4bb35e8f6bbbb0c68d464b6edfa5ba53175bee16228bef8fb1983000d7c9413c2f91a0da6c3e5c29318
-MISC ChangeLog 5746 SHA256 b4be93d7f0bc8df73f15a59ec7e662db27de89069628c42429cd619f0a046020 SHA512 3f255adf2ec7e75c626f0c5195cbbbfaf878e897e4c5c6123942f359ba3d6f84003500f94d8e642a0148f224bcf35c131148827437d694cea365c11c64157a18 WHIRLPOOL ca222b9bf7e28821cc643768f90c49dff2bc2728ef3404c2129f66280e571efd10c3d24e4a819be4df1c1d23a0c4d97f322909196af5445eff00c031e77aa3a1
+EBUILD cacti-spine-0.8.8d-r1.ebuild 1175 SHA256 0b2e7538f469b6edb3878f08db42ffb490b37f5c2e396d686fb00a722c22268c SHA512 b70b92671a37138761018be63845b40df94afea0ec5f321950e81c833ec2fc5eaeaf3b98db6aafef8b2e6bead3dc2cf44c326aeecefdffcea637925eda5d6a0a WHIRLPOOL d7a55e9553b5cbaee14ae8b23862ab754dde7602db21163037abd40b0f24be847f5a6225bb1b49ad1d2e40b161af80179655f240655e9b3049c1856852af2e9e
+MISC ChangeLog 6185 SHA256 413b6135fcd8b179bdaf6794561b30a671546a3939f4f08f6279588240f3b5b8 SHA512 37cc3f76ee8452b2b46ce2c8564b400cf95656070b92bfbcd2c4440352a3e04f0035085faf577b1f014d1e339922807838c37dadb5238b8a6a122ca2709748d4 WHIRLPOOL 46ada19fe04d4e311e901b073f2ca0a1b93345e74ad910118661bf90bba6dad4911c3cc88ca4e62fe3a150bcaabffb6e3d061235be0c61f630dfcddaa623b4b4
 MISC metadata.xml 609 SHA256 6ce745a690546641ddd769949d48fb9b30124f542b7efcd2ab6b4faea0064410 SHA512 9e949dde99ebbc17b1ba2e877e5cbffa4fae0f192d84cdce62992ee9065d4c91e20b4c173bc3a51e4c42695728bca0805c7835f10956f544a8b1a2695ee9e329 WHIRLPOOL 4eb83a74fc24080746118a5f319eeeea6bf5e2f9cfdb4ffacf2f3f485cec953c46f166f216cbd6e234559bcd9e5f9c8b0f0a28d5a80aeb9726b4eb678439cc38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV6cooACgkQVWmRsqeSphOrBQCeIXKuG1rY6rGLcZFZOVx+uxNx
-xP0AniYjVki2kQQBGWfdVDXdNE4Fkil2
-=GZ8N
+iEYEAREIAAYFAlV9NJIACgkQVWmRsqeSphPeVACfeLLMhlwcAXN23BE8WyvEtBpz
+AQkAn2d/3KKn56+YyhgXL3ZeJNBJ9C5I
+=L32U
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.8d.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.8d-r1.ebuild
index e16d95bb5411..8ed06131eb29 100644
--- a/net-analyzer/cacti-spine/cacti-spine-0.8.8d.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-0.8.8d-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.8d.ebuild,v 1.1 2015/06/12 05:47:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/cacti-spine-0.8.8d-r1.ebuild,v 1.1 2015/06/14 08:00:16 jer Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -15,15 +15,24 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-DEPEND="net-analyzer/net-snmp
+DEPEND="
 	dev-libs/openssl:*
-	virtual/mysql"
-RDEPEND="${DEPEND}
-	>net-analyzer/cacti-0.8.8"
+	net-analyzer/net-snmp
+	virtual/mysql
+"
+RDEPEND="
+	${DEPEND}
+	>net-analyzer/cacti-0.8.8
+"
 
 src_prepare() {
-	# Patch configure.ac to replace AM_CONFIG_HEADER with AC_CONFIG_HEADERS
-	epatch "${FILESDIR}/${PN}-0.8.8d-fix-ac-macro.patch"
+	epatch \
+		"${FILESDIR}"/${PN}-0.8.8d-fix-ac-macro.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-net-snmp.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-mysql.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-ping.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-polling_time.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-snmp_spine_close.patch
 
 	sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
 	AT_M4DIR="config" eautoreconf
@@ -36,15 +45,3 @@ src_install() {
 	newins spine.conf{.dist,}
 	dodoc ChangeLog README
 }
-
-pkg_postinst() {
-	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
-}
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-mysql.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-mysql.patch
new file mode 100644
index 000000000000..d60653678a2c
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-mysql.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -239,7 +239,7 @@
+ fi
+ CFLAGS="-I$MYSQL_INC_DIR $CFLAGS"
+ 
+-AC_CHECK_LIB(mysqlclient_r,mysql_init, LIBS="-lmysqlclient_r",
++AC_CHECK_LIB(mysqlclient_r,mysql_init, LIBS="$LIBS -lmysqlclient_r",
+   AC_MSG_ERROR([MySQL libraries not found])
+ )
+ 
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-net-snmp.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-net-snmp.patch
new file mode 100644
index 000000000000..43aa4d3f95df
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-net-snmp.patch
@@ -0,0 +1,30 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -254,14 +254,14 @@
+ )
+ 
+ AC_MSG_CHECKING([if Net-SNMP needs crypto support])
+-AC_TRY_COMPILE([#include <net-snmp-config.h>], [exit(USE_OPENSSL != 1);],
++AC_TRY_COMPILE([#include <net-snmp/net-snmp-config.h>], [exit(USE_OPENSSL != 1);],
+   [  AC_MSG_RESULT(yes)
+      SNMP_SSL=yes
+   ],
+   AC_MSG_RESULT(no)
+ )
+ 
+-AC_TRY_COMPILE([ #include <net-snmp-config.h> 
++AC_TRY_COMPILE([ #include <net-snmp/net-snmp-config.h> 
+   #include <net-snmp/utilities.h>
+   #include <net-snmp/net-snmp-includes.h>
+   #include <net-snmp/config_api.h>
+--- a/common.h
++++ b/common.h
+@@ -125,7 +125,7 @@
+ #  include <priv.h>
+ #endif
+ 
+-#ifdef USE_NET_SNMP
++#ifdef HAVE_LIBNETSNMP
+  #undef PACKAGE_NAME
+  #undef PACKAGE_VERSION
+  #undef PACKAGE_BUGREPORT
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-ping.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-ping.patch
new file mode 100644
index 000000000000..0d94674ce5a3
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-ping.patch
@@ -0,0 +1,11 @@
+--- a/ping.c
++++ b/ping.c
+@@ -813,7 +813,7 @@
+ 	int    rv;
+ 
+ 	buf = malloc(len*sizeof(char));
+-	memset(buf, 0, sizeof(buf));
++	memset(buf, 0, len*sizeof(char));
+ 
+ 	while (1) {
+ 		rv = gethostbyname_r(hostname, &result_buf, buf, len,
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-polling_time.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-polling_time.patch
new file mode 100644
index 000000000000..98fd8b68527b
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-polling_time.patch
@@ -0,0 +1,220 @@
+--- a/poller.c
++++ b/poller.c
+@@ -168,7 +168,6 @@
+ 	MYSQL     mysql;
+ 	MYSQL_RES *result;
+ 	MYSQL_ROW row;
+-	MYSQL_FIELD *field;
+ 
+ 	db_connect(set.dbdb, &mysql);
+ 
+@@ -218,8 +217,7 @@
+ 				"status, status_event_count, status_fail_date, "
+ 				"status_rec_date, status_last_error, "
+ 				"min_time, max_time, cur_time, avg_time, "
+-				"total_polls, failed_polls, availability, snmp_sysUptimeInstance, snmp_sysDescr, snmp_sysObjectID, "
+-                "snmp_sysContact, snmp_sysName, snmp_sysLocation"
++				"total_polls, failed_polls, availability "
+ 			" FROM host"
+ 			" WHERE id=%i", host_id);
+ 
+@@ -289,8 +287,7 @@
+ 				"status, status_event_count, status_fail_date, "
+ 				"status_rec_date, status_last_error, "
+ 				"min_time, max_time, cur_time, avg_time, "
+-				"total_polls, failed_polls, availability, snmp_sysUptimeInstance, snmp_sysDescr, snmp_sysObjectID, "
+-				"snmp_sysContact, snmp_sysName, snmp_sysLocation"
++				"total_polls, failed_polls, availability "
+ 			" FROM host"
+ 			" WHERE id=%i", host_id);
+ 
+@@ -379,44 +376,38 @@
+ 
+ 			if (row) {
+ 				/* initialize variables first */
+-				host->id                      = 0;					// 0
+-				host->hostname[0]             = '\0';				// 1
+-				host->snmp_session            = NULL;				// -
+-				host->snmp_community[0]       = '\0';				// 2
+-				host->snmp_version            = 1;					// 3
+-				host->snmp_username[0]        = '\0';				// 4
+-				host->snmp_password[0]        = '\0';				// 5
+-				host->snmp_auth_protocol[0]   = '\0';				// 6
+-				host->snmp_priv_passphrase[0] = '\0';				// 7
+-				host->snmp_priv_protocol[0]   = '\0';				// 8
+-				host->snmp_context[0]         = '\0';				// 9
+-				host->snmp_port               = 161;				// 10
+-				host->snmp_timeout            = 500;				// 11
+-				host->snmp_retries            = set.snmp_retries;	// -
+-				host->max_oids                = 10;					// 12
+-				host->availability_method     = 0;					// 13
+-				host->ping_method             = 0;					// 14
+-				host->ping_port               = 23;					// 15
+-				host->ping_timeout            = 500;				// 16
+-				host->ping_retries            = 2;					// 17
+-				host->status                  = HOST_UP;			// 18
+-				host->status_event_count      = 0;					// 19
+-				host->status_fail_date[0]     = '\0';				// 20
+-				host->status_rec_date[0]      = '\0';				// 21
+-				host->status_last_error[0]    = '\0';				// 22
+-				host->min_time                = 0;					// 23
+-				host->max_time                = 0;					// 24
+-				host->cur_time                = 0;					// 25
+-				host->avg_time                = 0;					// 26
+-				host->total_polls             = 0;					// 27
+-				host->failed_polls            = 0;					// 28
+-				host->availability            = 100;				// 29
+-				host->snmp_sysUpTimeInstance  = 0;					// 30
+-				host->snmp_sysDescr[0]        = '\0';				// 31
+-				host->snmp_sysObjectID[0]     = '\0';				// 32
+-				host->snmp_sysContact[0]      = '\0';				// 33
+-				host->snmp_sysName[0]         = '\0';				// 34
+-				host->snmp_sysLocation[0]     = '\0';				// 35
++				host->id                      = 0;
++				host->hostname[0]             = '\0';
++				host->snmp_session            = NULL;
++				host->snmp_community[0]       = '\0';
++				host->snmp_version            = 1;
++				host->snmp_username[0]        = '\0';
++				host->snmp_password[0]        = '\0';
++				host->snmp_auth_protocol[0]   = '\0';
++				host->snmp_priv_passphrase[0] = '\0';
++				host->snmp_priv_protocol[0]   = '\0';
++				host->snmp_context[0]         = '\0';
++				host->snmp_port               = 161;
++				host->snmp_timeout            = 500;
++				host->snmp_retries            = set.snmp_retries;
++				host->max_oids                = 10;
++				host->availability_method     = 0;
++				host->ping_method             = 0;
++				host->ping_port               = 23;
++				host->ping_timeout            = 500;
++				host->ping_retries            = 2;
++				host->status                  = HOST_UP;
++				host->status_event_count      = 0;
++				host->status_fail_date[0]     = '\0';
++				host->status_rec_date[0]      = '\0';
++				host->status_last_error[0]    = '\0';
++				host->min_time                = 0;
++				host->max_time                = 0;
++				host->cur_time                = 0;
++				host->avg_time                = 0;
++				host->total_polls             = 0;
++				host->failed_polls            = 0;
++				host->availability            = 100;
+ 
+ 				/* populate host structure */
+ 				host->ignore_host = FALSE;
+@@ -460,13 +451,6 @@
+ 				if (row[28] != NULL) host->failed_polls = atoi(row[28]);
+ 				if (row[29] != NULL) host->availability = atof(row[29]);
+ 
+-				if (row[30] != NULL) host->snmp_sysUpTimeInstance=atoi(row[30]);
+-				if (row[31] != NULL) STRNCOPY(host->snmp_sysDescr, row[31]);
+-				if (row[32] != NULL) STRNCOPY(host->snmp_sysObjectID, row[32]);
+-				if (row[33] != NULL) STRNCOPY(host->snmp_sysContact, row[33]);
+-				if (row[34] != NULL) STRNCOPY(host->snmp_sysName, row[34]);
+-				if (row[35] != NULL) STRNCOPY(host->snmp_sysLocation, row[35]);
+-
+ 				/* correct max_oid bounds issues */
+ 				if ((host->max_oids == 0) || (host->max_oids > 100)) {
+ 					SPINE_LOG(("Host[%i] TH[%i] WARNING: Max OIDS is out of range with value of '%i'.  Resetting to default of 5", host_id, host_thread, host->max_oids));
+@@ -510,12 +494,6 @@
+ 						host->ignore_host = FALSE;
+ 						if (host_thread == 1) {
+ 							update_host_status(HOST_UP, host, ping, host->availability_method);
+-
+-							if (host->availability_method == AVAIL_SNMP) {
+-								get_system_information(host, &mysql);
+-
+-								
+-							}
+ 						}
+ 					}else{
+ 						host->ignore_host = TRUE;
+@@ -531,9 +509,7 @@
+ 						"SET status='%i', status_event_count='%i', status_fail_date='%s',"
+ 							" status_rec_date='%s', status_last_error='%s', min_time='%f',"
+ 							" max_time='%f', cur_time='%f', avg_time='%f', total_polls='%i',"
+-							" failed_polls='%i', availability='%.4f', snmp_sysDescr='%s', "
+-							" snmp_sysObjectID='%s', snmp_sysUpTimeInstance='%i', "
+-							" snmp_sysContact='%s', snmp_sysName='%s', snmp_sysLocation='%s' "
++							" failed_polls='%i', availability='%.4f' "
+ 						"WHERE id='%i'",
+ 						host->status,
+ 						host->status_event_count,
+@@ -547,12 +523,6 @@
+ 						host->total_polls,
+ 						host->failed_polls,
+ 						host->availability,
+-						host->snmp_sysDescr,
+-						host->snmp_sysObjectID,
+-						host->snmp_sysUpTimeInstance,
+-						host->snmp_sysContact,
+-						host->snmp_sysName,
+-						host->snmp_sysLocation,
+ 						host->id);
+ 	
+ 					db_insert(&mysql, update_sql);
+@@ -1285,10 +1255,6 @@
+ 	poll_time = get_time_as_double() - poll_time;
+ 	SPINE_LOG_MEDIUM(("Host[%i] TH[%i] Total Time: %5.2g Seconds", host_id, host_thread, poll_time));
+ 
+-	query1[0] = '\0';
+-	snprintf(query1, BUFSIZE, "UPDATE host SET polling_time='%g' WHERE id=%i", poll_time, host_id);
+-	db_query(&mysql, query1);
+-
+ 	mysql_close(&mysql);
+ 
+ 	#ifndef OLD_MYSQL
+@@ -1343,50 +1309,6 @@
+ 
+ }
+ 
+-void get_system_information(host_t *host, MYSQL *mysql)  {
+-	snmp_oids_t *snmp_oids;
+-
+-	if (set.mibs) {
+-		int num_oids = 6;
+-
+-		/* create an array for snmp oids */
+-		snmp_oids = (snmp_oids_t *) calloc(num_oids, sizeof(snmp_oids_t));
+-
+-		/* initialize all the memory to insure we don't get issues */
+-		memset(snmp_oids, 0, sizeof(snmp_oids_t)*num_oids);
+-
+-		STRNCOPY(snmp_oids[0].oid, ".1.3.6.1.2.1.1.1.0");
+-		STRNCOPY(snmp_oids[1].oid, ".1.3.6.1.2.1.1.2.0");
+-		STRNCOPY(snmp_oids[2].oid, ".1.3.6.1.2.1.1.3.0");
+-		STRNCOPY(snmp_oids[3].oid, ".1.3.6.1.2.1.1.4.0");
+-		STRNCOPY(snmp_oids[4].oid, ".1.3.6.1.2.1.1.5.0");
+-		STRNCOPY(snmp_oids[5].oid, ".1.3.6.1.2.1.1.6.0");
+-		snmp_get_multi(host, snmp_oids, num_oids);
+-
+-		mysql_real_escape_string(mysql, host->snmp_sysDescr, snmp_oids[0].result, strlen(snmp_oids[0].result));
+-		mysql_real_escape_string(mysql, host->snmp_sysObjectID, snmp_oids[1].result, strlen(snmp_oids[1].result));
+-		host->snmp_sysUpTimeInstance = atoi(snmp_oids[2].result);
+-		mysql_real_escape_string(mysql, host->snmp_sysContact, snmp_oids[3].result, strlen(snmp_oids[3].result));
+-		mysql_real_escape_string(mysql, host->snmp_sysName, snmp_oids[4].result, strlen(snmp_oids[4].result));
+-		mysql_real_escape_string(mysql, host->snmp_sysLocation, snmp_oids[5].result, strlen(snmp_oids[5].result));
+-	}else{
+-		int num_oids = 1;
+-
+-		/* create an array for snmp oids */
+-		snmp_oids = (snmp_oids_t *) calloc(num_oids, sizeof(snmp_oids_t));
+-
+-		/* initialize all the memory to insure we don't get issues */
+-		memset(snmp_oids, 0, sizeof(snmp_oids_t)*num_oids);
+-
+-		STRNCOPY(snmp_oids[0].oid, ".1.3.6.1.2.1.1.3.0");
+-		snmp_get_multi(host, snmp_oids, num_oids);
+-
+-		host->snmp_sysUpTimeInstance = atoi(snmp_oids[2].result);
+-	}
+-
+-	free(snmp_oids);
+-}
+-
+ /*! \fn int validate_result(char *result)
+  *  \brief validates the output from the polling action is valid
+  *  \param result the value to be checked for legality
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-snmp_spine_close.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-snmp_spine_close.patch
new file mode 100644
index 000000000000..f39e8c6575e1
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-snmp_spine_close.patch
@@ -0,0 +1,10 @@
+--- a/snmp.h
++++ b/snmp.h
+@@ -32,6 +32,7 @@
+ */
+ 
+ extern void snmp_spine_init(void);
++extern void snmp_spine_close(void);
+ extern void *snmp_host_init(int host_id, char *hostname, int snmp_version, char *snmp_community, char *snmp_username, char *snmp_password, char *snmp_auth_protocol, char *snmp_priv_passphrase, char *snmp_priv_protocol, char *snmp_context, int snmp_port, int snmp_timeout);
+ extern void snmp_host_cleanup(void *snmp_session);
+ extern char *snmp_get(host_t *current_host, char *snmp_oid);