Add a snips user & group to the system and set permissions appropriately. Install 3 missing files.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc8-00204-gc461a97-dirty x86_64

5 files changed, 74 insertions, 9 deletions

diff --git a/net-analyzer/snips/ChangeLog b/net-analyzer/snips/ChangeLog
index a2a0e9497f13..5a2f4c8e4c6c 100644
--- a/net-analyzer/snips/ChangeLog
+++ b/net-analyzer/snips/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/snips
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snips/ChangeLog,v 1.2 2008/06/30 12:18:52 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snips/ChangeLog,v 1.3 2008/07/04 11:43:40 chainsaw Exp $
+
+*snips-1.2-r2 (04 Jul 2008)
+
+  04 Jul 2008; <chainsaw@gentoo.org> +files/snips-1.2-install-missing.patch,
+  -files/snips-1.2-r1-precache-config, +files/snips-1.2-r2-precache-config,
+  -snips-1.2-r1.ebuild, +snips-1.2-r2.ebuild:
+  Add a snips user & group to the system and set permissions appropriately.
+  Install 3 missing files.
 
 *snips-1.2-r1 (30 Jun 2008)
 
diff --git a/net-analyzer/snips/Manifest b/net-analyzer/snips/Manifest
index 42c32691ca57..824f7c89d293 100644
--- a/net-analyzer/snips/Manifest
+++ b/net-analyzer/snips/Manifest
@@ -5,16 +5,17 @@ AUX snips-1.2-code-ordering.patch 712 RMD160 61d0f7a70b4b95abb71d6f9a4998aa4f398
 AUX snips-1.2-conflicting-types.patch 1618 RMD160 ed0a6b38e021126fd8db6f3e248c7942289b94bb SHA1 3ebfef705a36b3866f396ca4f173890c7998c7cc SHA256 71912412ce76cf78f1214534618a4570dfa13779c4d8b7baf4f645c7de8ab4d5
 AUX snips-1.2-destdir-awareness.patch 17093 RMD160 d45b65d3b357dfc4f70443845526834beaadb669 SHA1 2b3904e5294eb9108ce028395e490c8e233719c1 SHA256 0896484b2bf1a792cd3d5d9ed7634c29e78bd873771ca079bd31d93d9f6f1a1e
 AUX snips-1.2-implicit-declarations.patch 3913 RMD160 35525b2ff863176c91be5d839a0e33f941099aa4 SHA1 74b61f727e39535a7260fa7c439b84e2f15149ff SHA256 5eb0e41b82cd1ef943b488e8e545c99e880bda07e238d920d987211518ae8dba
+AUX snips-1.2-install-missing.patch 1507 RMD160 ad6b072a0d5d67bb2ac5cc9841feeaa44fc71b79 SHA1 971e09166923a76b69b0b1cb25aec0922bc21dda SHA256 de5645a2be0d40c9c989290cd3d3818ae6d9db26f2afc2fed91a3207d715c8d1
 AUX snips-1.2-non-interactive.patch 3462 RMD160 82571f9b80e9a9c4297ce0b1cf2c9928128e29e6 SHA1 f4f58465e9c8d0ceedbb811609c643063c92463b SHA256 c06d66f13e95f4d4e57bb293f06fa2ff7d96631bf209d2978a97567419aec798
-AUX snips-1.2-r1-precache-config 460 RMD160 53a93828b13f6ad4c8b38ffaa172f42dd3abc2de SHA1 dce21e21f328aed047e41b99a5dc3da8be68368f SHA256 e4772928884425cedf710d6ed01d75278d2460c91d72fbccd08c444f1bee0918
+AUX snips-1.2-r2-precache-config 460 RMD160 53a93828b13f6ad4c8b38ffaa172f42dd3abc2de SHA1 dce21e21f328aed047e41b99a5dc3da8be68368f SHA256 e4772928884425cedf710d6ed01d75278d2460c91d72fbccd08c444f1bee0918
 DIST snips-1.2.tar.gz 1382731 RMD160 4ee9906558387545a0a02f8a6df7d3e119b1fc2e SHA1 3534c77a4b33aab3c9b49a8ad229d9263bb719a4 SHA256 2ca44a51251b569e9429ae404caccb3721a9697532e95c9ff0e6db9ef8e3cd28
-EBUILD snips-1.2-r1.ebuild 1525 RMD160 d628d2a63fa9498bdfa84dadb255209ee3a2326d SHA1 485a0221cb0622af091969f1d9ec6fc2aec06123 SHA256 18987c04f986bf287bea05bc9bb2680497044ef5d0b5b4ec4fc3e97742947354
-MISC ChangeLog 921 RMD160 a2d59d3021c6ed60891da9d9df7acaf800cf3b9d SHA1 cdab2b701aaa04cfb70f9192be5c1f4023c80d69 SHA256 a4f2fbff656c9a5c1780fb9324cb5bd7da9c4978f76a1be728d1aaff0075768a
+EBUILD snips-1.2-r2.ebuild 2392 RMD160 6305e1d77724dfdd069563d791077eb903a83c23 SHA1 0e90767f5de149f90eb8cd0d65c09f36123666e7 SHA256 a218e3a1ac4abcb0c4e0d6deb811fa083442bf78b93662880eb13490f053c3fa
+MISC ChangeLog 1253 RMD160 8f07b9285f03eb84c97b62818cc1c929d2bf22cb SHA1 300c2a37c3193bef6209dca4af67bcf324a4346b SHA256 cb33ad8e217530886d1f47f2d7a09c9f3cede7c6f2bd9c5896650f226d6af7d1
 MISC metadata.xml 229 RMD160 1addfe2dccbb5a6fb878fc690c2d3648882cbccc SHA1 18b53e1505d808f4418966964033347396b7652d SHA256 beb2126c45a8a8c781defad3afaae8986b5716c19c9d92489ac4b6e4a660e821
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhozvAACgkQp5vW4rUFj5o9AQCgkdFC2qkTDTIM11vbgTZPy90N
-zuMAoLRhHYrP1um4B+90H/dBHwpTTC1+
-=+7Qa
+iEYEARECAAYFAkhuDK0ACgkQp5vW4rUFj5qBSgCgm7mNBvOcYzBqbKj2wS2It55l
+dFUAoJCM5iFRzQMTgQC5wdOH4cVnAQ2E
+=im5N
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/snips/files/snips-1.2-install-missing.patch b/net-analyzer/snips/files/snips-1.2-install-missing.patch
new file mode 100644
index 000000000000..f9af70847494
--- /dev/null
+++ b/net-analyzer/snips/files/snips-1.2-install-missing.patch
@@ -0,0 +1,33 @@
+diff -uNr snips-1.2.ORIG/perl-monitors/Makefile.mid snips-1.2/perl-monitors/Makefile.mid
+--- snips-1.2.ORIG/perl-monitors/Makefile.mid	2008-07-04 11:24:23.000000000 +0100
++++ snips-1.2/perl-monitors/Makefile.mid	2008-07-04 11:28:02.000000000 +0100
+@@ -17,7 +17,7 @@
+ PROGS = apcmon armon bgpmon bpmon ciscomon modemmon novellmon nrmon \
+ 	hostmon hostmon-collector hostmon-osclients/hostmon-client \
+ 	smbmon sqlmon snmpmon snmpmon-collector snmpgeneric \
+-	syslogmon upsmon rcisco testlog
++	syslogmon upsmon rcisco testlog snmpgeneric2
+ 
+ # to create init files to start/stop programs
+ INITFILES = apcmon armon bgpmon bpmon ciscomon modemmon novellmon nrmon \
+@@ -89,7 +89,7 @@
+ 	@if [ -f $(DESTDIR)$(ETCDIR)/mibII.txt ]; then \
+ 		mv $(DESTDIR)$(ETCDIR)/mibII.txt $(DESTDIR)$(ETCDIR)/mibII.txt.old ;\
+ 	 fi 
+-	@echo  "See $(SRCDIR)/perl-monotors/README for further customizations"
++	@echo  "See $(SRCDIR)/perl-monitors/README for further customizations"
+ 
+ clean:
+ 	@-cd $(CMUSNMP)/snmpapps; make realclean
+diff -uNr snips-1.2.ORIG/utility/Makefile.mid snips-1.2/utility/Makefile.mid
+--- snips-1.2.ORIG/utility/Makefile.mid	2008-07-04 11:24:23.000000000 +0100
++++ snips-1.2/utility/Makefile.mid	2008-07-04 11:25:13.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ SHSCRIPTS = crontab.snips snipsprog.init
+ PERLSCRIPTS = keepalive_monitors.pl logstats.pl logmaint.pl \
+-		docrypt.pl notifier.pl
++		docrypt.pl notifier.pl snmpconf.pl
+ SCRIPTS = $(SHSCRIPTS) $(PERLSCRIPTS)
+ 
+ CPROGS = display_snips_datafile  eventselect
diff --git a/net-analyzer/snips/files/snips-1.2-r1-precache-config b/net-analyzer/snips/files/snips-1.2-r2-precache-config
index a5b695426c51..a5b695426c51 100644
--- a/net-analyzer/snips/files/snips-1.2-r1-precache-config
+++ b/net-analyzer/snips/files/snips-1.2-r2-precache-config
diff --git a/net-analyzer/snips/snips-1.2-r1.ebuild b/net-analyzer/snips/snips-1.2-r2.ebuild
index 5c9c520fda41..b7ada4165bdb 100644
--- a/net-analyzer/snips/snips-1.2-r1.ebuild
+++ b/net-analyzer/snips/snips-1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snips/snips-1.2-r1.ebuild,v 1.1 2008/06/30 12:18:52 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snips/snips-1.2-r2.ebuild,v 1.1 2008/07/04 11:43:40 chainsaw Exp $
 
 inherit eutils toolchain-funcs
 
@@ -23,12 +23,14 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	# Gentoo-specific non-interactive configure override
-	cp "${FILESDIR}/${PF}-precache-config" "${S}/Config.cache"
+	cp "${FILESDIR}/${PF}-precache-config" "${S}/Config.cache" \
+		|| die "Unable to precache configure script answers"
 	echo "CFLAGS=\"${CFLAGS} -fPIC\"" >> "${S}/Config.cache"
 	echo "CC=\"$(tc-getCC)\"" >> "${S}/Config.cache"
 	echo "SRCDIR=\"${S}\"" >> "${S}/Config.cache"
 	epatch "${FILESDIR}/${P}-non-interactive.patch"
 	# Applied to upstream CVS
+	epatch "${FILESDIR}/${P}-install-missing.patch"
 	epatch "${FILESDIR}/${P}-implicit-declarations.patch"
 	epatch "${FILESDIR}/${P}-conflicting-types.patch"
 	epatch "${FILESDIR}/${P}-code-ordering.patch"
@@ -46,3 +48,24 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 }
+
+pkg_preinst() {
+	enewgroup snips
+	enewuser snips -1 -1 /usr/snips snips
+}
+
+pkg_postinst() {
+	ebegin "Fixing permissions"
+	chown -R snips:snips "${ROOT}"usr/snips
+	for x in data logs msgs rrddata run web device-help etc; do
+		chmod -R g+w "${ROOT}usr/snips/${x}" \
+			|| die "Unable to chmod ${x}"
+	done
+	chown root:snips "${ROOT}usr/snips/bin/multiping" || die "chown root failed"
+	chown root:snips "${ROOT}usr/snips/bin/etherload" || die "chown root failed"
+	chown root:snips "${ROOT}usr/snips/bin/trapmon" || die "chown root failed"
+	chmod u+s "${ROOT}usr/snips/bin/multiping" || die "SetUID root failed"
+	chmod u+s "${ROOT}usr/snips/bin/etherload" || die "SetUID root failed"
+	chmod u+s "${ROOT}usr/snips/bin/trapmon" || die "SetUID root failed"
+	eend $?
+}