Don't set apache group on cactid.conf as this is broken when user doesn't use apache...

Package-Manager: portage-2.1.2-r9

diff --git a/net-analyzer/cacti-cactid/ChangeLog b/net-analyzer/cacti-cactid/ChangeLog
index 6018db8c3e72a4ef7910bd8f26cbf3928c8d3ec1..196ca237acf184ccba9c73ea7af703e9ca5699ef 100644 (file)
--- a/net-analyzer/cacti-cactid/ChangeLog
+++ b/net-analyzer/cacti-cactid/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/cacti-cactid
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/ChangeLog,v 1.26 2007/01/30 18:44:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/ChangeLog,v 1.27 2007/02/26 07:12:50 pva Exp $
+
+*cacti-cactid-0.8.6i-r1 (26 Feb 2007)
+
+  26 Feb 2007; <pva@gentoo.org> -cacti-cactid-0.8.6e.ebuild,
+  -cacti-cactid-0.8.6f_p1.ebuild, -cacti-cactid-0.8.6i.ebuild,
+  +cacti-cactid-0.8.6i-r1.ebuild:
+  Don't set apache group on cactid.conf as this is broken when user doesn't use
+  apache webserver and apache group does not exist (bug #168362 reported by
+  David Maus <maus.david AT gmx.de>. Cleaning old broken with mysql-5 ebuilds.
 
   30 Jan 2007; Raúl Porcel <armin76@gentoo.org> cacti-cactid-0.8.6g.ebuild:
   x86 stable wrt bug 155147

diff --git a/net-analyzer/cacti-cactid/Manifest b/net-analyzer/cacti-cactid/Manifest
index bccbb81cc139aed0f2509ecdf382fc76ff3f5ecc..ec9f4223c909f7f20cf008cc49b71cfc8c1a5286 100644 (file)
--- a/net-analyzer/cacti-cactid/Manifest
+++ b/net-analyzer/cacti-cactid/Manifest
@@ -1,40 +1,24 @@
-DIST cacti-cactid-0.8.6e.tar.gz 132059 RMD160 af2c6131d41a0b609158ed1de184ea2fed0cfe00 SHA1 094d492fb4515049008aa6ba5f9a404036fe940f SHA256 7a9f0fb50adc0d6cf2a4d219d4497e796071592477767b60f654ffb3d6b2e507
-DIST cacti-cactid-0.8.6f-1.tar.gz 136217 RMD160 1ff88042395b3d0d5bb58765cbc6ca5c54c26084 SHA1 170acb42ce3d860601909431a4335e775779a26a SHA256 5ecc9c5d605b7daa18380fdc3ff951e42dd0652db4c5f1718c7607dfd0310e61
 DIST cacti-cactid-0.8.6g.tar.gz 148921 RMD160 359deb8077b8ec8cc8072982e477c5c0b3efa573 SHA1 29d9d264506dd75cbf25c113351c768e4a43858b SHA256 823d77fac9c7fd34d07004c7980bd621daaa1230c2e9c91fd9405a5bd05bfd80
 DIST cacti-cactid-0.8.6i.tar.gz 153534 RMD160 40975765cf5f4543ceb85a35c8ae905064c7f4d9 SHA1 82a14128780216ab8ae2a46f45fdecc9210b00f2 SHA256 6024ee5083a296ef3815ffa2294a9d0c1605aa8501e7114716675101db8bd841
-EBUILD cacti-cactid-0.8.6e.ebuild 1403 RMD160 223c209a91116b45b70bb59f066e3475c909d362 SHA1 4ddbb2f213b0130a88d0d50c9e6133414853422f SHA256 d048f551d9c0f82ca823daa569afc8b84266baa7ebae2f76ab94f91a49585036
-MD5 4fe12bf4f3ca7cbb0d29159f25e006f3 cacti-cactid-0.8.6e.ebuild 1403
-RMD160 223c209a91116b45b70bb59f066e3475c909d362 cacti-cactid-0.8.6e.ebuild 1403
-SHA256 d048f551d9c0f82ca823daa569afc8b84266baa7ebae2f76ab94f91a49585036 cacti-cactid-0.8.6e.ebuild 1403
-EBUILD cacti-cactid-0.8.6f_p1.ebuild 1515 RMD160 44172b91eb1ee8a8542b83eb3c4217ec071bc081 SHA1 303de88b7af61b4d71512d1e1c087e2fd956aa35 SHA256 746e1f29db92fc947ec9ef6b2ac4deb34aad3b261edd8846232905ef2e5c8679
-MD5 dcdaeaa23ec97b9ef071eaa3c89b69f7 cacti-cactid-0.8.6f_p1.ebuild 1515
-RMD160 44172b91eb1ee8a8542b83eb3c4217ec071bc081 cacti-cactid-0.8.6f_p1.ebuild 1515
-SHA256 746e1f29db92fc947ec9ef6b2ac4deb34aad3b261edd8846232905ef2e5c8679 cacti-cactid-0.8.6f_p1.ebuild 1515
 EBUILD cacti-cactid-0.8.6g.ebuild 1432 RMD160 96b05c6b0a0e67a55c4f2937ec39b88f9323c2eb SHA1 bfe817c0b864dca55fbbb2f51b23f5e8596a1f5a SHA256 1b083974d7eb3679af0ce61ad302dfe36e5e4ab5d7918c20797500b9f05de6fd
 MD5 59ccc62eac7a59981083cd666f7963eb cacti-cactid-0.8.6g.ebuild 1432
 RMD160 96b05c6b0a0e67a55c4f2937ec39b88f9323c2eb cacti-cactid-0.8.6g.ebuild 1432
 SHA256 1b083974d7eb3679af0ce61ad302dfe36e5e4ab5d7918c20797500b9f05de6fd cacti-cactid-0.8.6g.ebuild 1432
-EBUILD cacti-cactid-0.8.6i.ebuild 1381 RMD160 24463b6189224cf5ddf9d729913458b2b2b8b4b3 SHA1 991f68ae65ce9b4c95fb6ce9e692c298b3bd08a1 SHA256 2f977241dcd9cc5481ef3af0433c96c956feaa73e65e066e31aad3abfef9862c
-MD5 b2256145e2d801442e97d88092d2d4c3 cacti-cactid-0.8.6i.ebuild 1381
-RMD160 24463b6189224cf5ddf9d729913458b2b2b8b4b3 cacti-cactid-0.8.6i.ebuild 1381
-SHA256 2f977241dcd9cc5481ef3af0433c96c956feaa73e65e066e31aad3abfef9862c cacti-cactid-0.8.6i.ebuild 1381
-MISC ChangeLog 4137 RMD160 2e3b381654fc02b46a5d98ceb1782f60e5ce2bce SHA1 b67e23ae70a263dc04edd2a02e8e807e70fa3d40 SHA256 7190e0f20bfab6c5e18aff948c17931409597999a0a24858e373b5b4c719b055
-MD5 e9cc945ef50d46a8b0b691ecf5bb65e1 ChangeLog 4137
-RMD160 2e3b381654fc02b46a5d98ceb1782f60e5ce2bce ChangeLog 4137
-SHA256 7190e0f20bfab6c5e18aff948c17931409597999a0a24858e373b5b4c719b055 ChangeLog 4137
+EBUILD cacti-cactid-0.8.6i-r1.ebuild 1634 RMD160 eb4b2539b4892665a19f1c54edad83de12bca5f6 SHA1 843af288bafe3648cf7d3404639035ab123b0904 SHA256 fdd654391f9f63877b71e7a098cf51b81d943208143cfa60993133c4b619c475
+MD5 6afdd7f169591b5245c00fae0f93e1f1 cacti-cactid-0.8.6i-r1.ebuild 1634
+RMD160 eb4b2539b4892665a19f1c54edad83de12bca5f6 cacti-cactid-0.8.6i-r1.ebuild 1634
+SHA256 fdd654391f9f63877b71e7a098cf51b81d943208143cfa60993133c4b619c475 cacti-cactid-0.8.6i-r1.ebuild 1634
+MISC ChangeLog 4566 RMD160 3f6e432f619614defd08ed7824bec8e21519c139 SHA1 04d6e4a1e2aa425339a1be41867f15bba61472cd SHA256 8e092d4860eac8409ca446b354022cd292f8ae599cf5545b512f55372d902c67
+MD5 30a7e27fdf781f52f92f40a146f6791b ChangeLog 4566
+RMD160 3f6e432f619614defd08ed7824bec8e21519c139 ChangeLog 4566
+SHA256 8e092d4860eac8409ca446b354022cd292f8ae599cf5545b512f55372d902c67 ChangeLog 4566
 MISC metadata.xml 682 RMD160 6151c59b37c78fc476077aef062f78e1839575d7 SHA1 066f25955d4a474f6971b9963b86b304a92c6fa7 SHA256 920d0ffe4d80f62d59f06dfe513e27a9923a397d206c8b7ce67286efb00c78e1
 MD5 528bed3e0527d5e490f39fdd9c98daa6 metadata.xml 682
 RMD160 6151c59b37c78fc476077aef062f78e1839575d7 metadata.xml 682
 SHA256 920d0ffe4d80f62d59f06dfe513e27a9923a397d206c8b7ce67286efb00c78e1 metadata.xml 682
-MD5 769b12ad7beecc35830e412ff46cbe0a files/digest-cacti-cactid-0.8.6e 259
-RMD160 b7ee5cee5103a94ca0bfdc807a48efb575525a45 files/digest-cacti-cactid-0.8.6e 259
-SHA256 9ac88c5698007ee520fe3db74a24d7df3d1fa1f2359b0d18dd735d848c47eba6 files/digest-cacti-cactid-0.8.6e 259
-MD5 2becfabf78994f20413deacce888332c files/digest-cacti-cactid-0.8.6f_p1 265
-RMD160 d65b4957503c916a0b0705b87672f8b0e51c73a7 files/digest-cacti-cactid-0.8.6f_p1 265
-SHA256 a1887f9bfbbf657b2cb3354ac918edcc5503c7a361e3b5c740ae1a4af08240a0 files/digest-cacti-cactid-0.8.6f_p1 265
 MD5 0f86c7659315c591461979d6187ab808 files/digest-cacti-cactid-0.8.6g 259
 RMD160 b01baa4e580339fd853d4a878838f62af2393f8e files/digest-cacti-cactid-0.8.6g 259
 SHA256 75102a0a3ca46c22c14141cd8c91447b614f42af7099eb76112c2c66dfaea1a4 files/digest-cacti-cactid-0.8.6g 259
-MD5 d198e4485c523736100c656b2e9f8f92 files/digest-cacti-cactid-0.8.6i 259
-RMD160 c45337ad94a42fd381dc38c9f44f5200860f4ef6 files/digest-cacti-cactid-0.8.6i 259
-SHA256 3ff9004d6b265b75d02404b502ff2040bc2f00fbd0075b66b9e7f9d6661dc880 files/digest-cacti-cactid-0.8.6i 259
+MD5 d198e4485c523736100c656b2e9f8f92 files/digest-cacti-cactid-0.8.6i-r1 259
+RMD160 c45337ad94a42fd381dc38c9f44f5200860f4ef6 files/digest-cacti-cactid-0.8.6i-r1 259
+SHA256 3ff9004d6b265b75d02404b502ff2040bc2f00fbd0075b66b9e7f9d6661dc880 files/digest-cacti-cactid-0.8.6i-r1 259

diff --git a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild
deleted file mode 100644 (file)
index 9eb1028..0000000
--- a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild,v 1.6 2006/11/23 19:46:52 vivo Exp $
-
-WANT_AUTOCONF="latest"
-inherit autotools
-
-DESCRIPTION="Cactid is a poller for Cacti that primarily strives to be as fast
-as possible"
-HOMEPAGE="http://cacti.net/cactid_info.php"
-SRC_URI="http://www.cacti.net/downloads/cactid/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~sparc x86"
-IUSE=""
-
-DEPEND="net-analyzer/net-snmp
-               net-analyzer/rrdtool
-               !>=virtual/mysql-5.0
-               virtual/mysql
-               >=sys-devel/autoconf-2.53"
-RDEPEND="net-analyzer/cacti"
-
-src_unpack() {
-       unpack ${A} ; cd ${S}
-       sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
-       sed -i -e 's/mysqlclient/mysqlclient_r/g' configure.ac
-       sed -i -e 's/wwwroot\/cacti\/log/var\/log/g' cactid.h
-}
-
-src_compile() {
-       eaclocal
-       eautoconf
-       econf || die "econf failed"
-       emake || die "emake failed"
-}
-
-src_install() {
-       exeinto usr/sbin ; doexe ${S}/cactid
-       insinto etc/ ; insopts -m0640 -o root -g apache ; doins ${S}/cactid.conf
-       dodoc CHANGELOG INSTALL README
-}
-
-pkg_postinst() {
-       einfo "Please see cacti's site for installation instructions."
-       einfo "Theres no need to change the crontab for this, just"
-       einfo "read the instructions on how to implement it"
-       einfo
-       einfo "http://cacti.net/cactid_install.php"
-}

diff --git a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild
deleted file mode 100644 (file)
index ab4a790..0000000
--- a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild,v 1.11 2006/11/23 19:46:52 vivo Exp $
-
-WANT_AUTOCONF="latest"
-inherit autotools
-
-MY_PV=${PV/_p/-}
-DESCRIPTION="Cactid is a poller for Cacti that primarily strives to be as fast
-as possible"
-HOMEPAGE="http://cacti.net/cactid_info.php"
-SRC_URI="http://www.cacti.net/downloads/cactid/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="net-analyzer/net-snmp
-               !>=virtual/mysql-5.0
-               virtual/mysql
-               >=sys-devel/autoconf-2.59"
-RDEPEND="net-analyzer/cacti
-               net-analyzer/net-snmp
-               !>=virtual/mysql-5.0
-               virtual/mysql"
-
-src_unpack() {
-       unpack ${A} ; mv ${WORKDIR}/${PN}-${MY_PV} ${S} ; cd ${S}
-       sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
-       sed -i -e 's/mysqlclient/mysqlclient_r/g' configure.ac
-       sed -i -e 's/wwwroot\/cacti\/log/var\/log/g' cactid.h
-}
-
-src_compile() {
-       eaclocal
-       eautoconf
-       econf || die "econf failed"
-       emake || die "emake failed"
-}
-
-src_install() {
-       exeinto usr/sbin ; doexe ${S}/cactid
-       insinto etc/ ; insopts -m0640 -o root -g apache ; doins ${S}/cactid.conf
-       dodoc CHANGELOG INSTALL README
-}
-
-pkg_postinst() {
-       einfo "Please see cacti's site for installation instructions."
-       einfo "Theres no need to change the crontab for this, just"
-       einfo "read the instructions on how to implement it"
-       einfo
-       einfo "http://cacti.net/cactid_install.php"
-}

diff --git a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6i.ebuild b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6i-r1.ebuild
similarity index 74%
rename from net-analyzer/cacti-cactid/cacti-cactid-0.8.6i.ebuild
rename to net-analyzer/cacti-cactid/cacti-cactid-0.8.6i-r1.ebuild
index e4834c59db36462e3bfe78abbf0f0943219bb6ae..b4d25cdadfa8c83e07a5041abc57621cfd499782 100644 (file)
--- a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6i.ebuild
+++ b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6i-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/cacti-cactid-0.8.6i.ebuild,v 1.1 2007/01/28 15:26:30 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/cacti-cactid-0.8.6i-r1.ebuild,v 1.1 2007/02/26 07:12:50 pva Exp $
 
 WANT_AUTOCONF="latest"
 inherit autotools
@@ -37,8 +37,8 @@ src_compile() {
 
 src_install() {
        exeinto usr/sbin ; doexe "${S}"/cactid
-       insinto etc/ ; insopts -m0640 -o root -g apache ; doins "${S}"/cactid.conf
-       dodoc CHANGELOG INSTALL README
+       insinto etc/ ; insopts -m0640 -o root ; doins "${S}"/cactid.conf
+       dodoc ChangeLog INSTALL README
 }
 
 pkg_postinst() {
@@ -47,4 +47,11 @@ pkg_postinst() {
        einfo "read the instructions on how to implement it"
        einfo
        einfo "http://cacti.net/cactid_install.php"
+       echo
+       ewarn "/etc/cactid.conf should be readable by webserver, thus after you"
+       ewarn "decide on webserver/webserver group do not forgive to change it's"
+       ewarn "group with the following command:"
+       ewarn
+       ewarn " # chown root:wwwgroup /etc/cactid.conf"
+       echo
 }

diff --git a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6e b/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6e
deleted file mode 100644 (file)
index c020c6b..0000000
--- a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6e
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c63baf6be89ea3591e8aac0e44792cd2 cacti-cactid-0.8.6e.tar.gz 132059
-RMD160 af2c6131d41a0b609158ed1de184ea2fed0cfe00 cacti-cactid-0.8.6e.tar.gz 132059
-SHA256 7a9f0fb50adc0d6cf2a4d219d4497e796071592477767b60f654ffb3d6b2e507 cacti-cactid-0.8.6e.tar.gz 132059

diff --git a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6f_p1 b/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6f_p1
deleted file mode 100644 (file)
index 4972af4..0000000
--- a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6f_p1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 95fe2d67c630dca9fe64a27c6ab2aff1 cacti-cactid-0.8.6f-1.tar.gz 136217
-RMD160 1ff88042395b3d0d5bb58765cbc6ca5c54c26084 cacti-cactid-0.8.6f-1.tar.gz 136217
-SHA256 5ecc9c5d605b7daa18380fdc3ff951e42dd0652db4c5f1718c7607dfd0310e61 cacti-cactid-0.8.6f-1.tar.gz 136217

diff --git a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6i b/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6i-r1
similarity index 100%
rename from net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6i
rename to net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6i-r1