fix /var/run problem and init script #445694, thanks to flameeyes

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64

4 files changed, 105 insertions, 18 deletions

diff --git a/app-admin/sagan/ChangeLog b/app-admin/sagan/ChangeLog
index 6026fc87a8f7..cf2f748fdefa 100644
--- a/app-admin/sagan/ChangeLog
+++ b/app-admin/sagan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/sagan
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sagan/ChangeLog,v 1.16 2012/11/20 20:41:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sagan/ChangeLog,v 1.17 2012/12/25 20:01:33 qnikst Exp $
+
+*sagan-0.2.2_p2-r2 (25 Dec 2012)
+
+  25 Dec 2012;  <qnikst@gentoo.org> +sagan-0.2.2_p2-r2.ebuild, files/sagan.init:
+  fix /var/run problem and init script #445694, thanks to flameeyes
 
   20 Nov 2012; Agostino Sarubbo <ago@gentoo.org> sagan-0.2.1-r2.ebuild:
   Stable for x86, wrt bug #441048
@@ -74,4 +79,3 @@
   31 Aug 2011; Maxim Koltsov <maksbotan@gentoo.org> +sagan-0.2.0.ebuild,
   +files/sagan.confd, +files/sagan.init, +metadata.xml:
   Copy app-admin/sagan from rion-overlay, thanks to slepnoga. Bug 341461
-
diff --git a/app-admin/sagan/Manifest b/app-admin/sagan/Manifest
index b271d3f4d601..b5bb2fd95419 100644
--- a/app-admin/sagan/Manifest
+++ b/app-admin/sagan/Manifest
@@ -1,5 +1,5 @@
 AUX sagan.confd 239 SHA256 ef5a99015369648e88e32ec8325261b1bdf53900543f86b77fea5aeb6387de51 SHA512 7ee746984d3bb3361e3155860d54e307f9b94b9e3f98c09c29b4259cd37d7aefe969b5b942c04048328ec23265a2689b22403c32e3552b8062201aca2ef3ac34 WHIRLPOOL 0c0e580d220d5abec71d888531554f9b9a4848dc6bc21bff98931082618cf4b446197ec1a6a38c83d4950d878dfd87050ba8112468ec8d361b63a77541a47d8c
-AUX sagan.init 611 SHA256 7a9d6129d5225a25c1d5dc83675d9ce456b71d22cb9b7920b1b2b7742be02d34 SHA512 05e5891548468117c3ea862eefcb9426ce451f04623cced2a76586da76b8fe306044ace8deede21ad35b70102e7d2a13566fd491a88c5306f24c1fc762841106 WHIRLPOOL 1a3f683d6039abac00da5595a5589571904225ce21d59bac89668e092b9d9849a4238b1f8a8f9b01df500ed074135e8c041d3e314b48c2dd3a1e7abd61c9fd04
+AUX sagan.init 538 SHA256 8e92c2f337f0dad09c5380d0351ed53509da9d39ff37e3183af8eeef2feeed21 SHA512 caf31bfedf5880487049987a49e205f2fb5645fca8d3c1b9c1def7c1e05364ace1798a1d4e2195e8a884079bd4d713e4c76b0cff083fe2aad78bed00169d8655 WHIRLPOOL 93158d12bc7c096f3cbe2934e9c7a7796e5b6a6f242e4c47741c4bd1554f4be963fba9ebf1f61320e4fcaf6d47e1922dcfd81ced633f387c89e616ce549ce8eb
 DIST sagan-0.2.0.tar.gz 329728 SHA256 cda2d1e4c0e93403469d21af672957302eabebade346a1f67036ae7427f3e399 SHA512 1dcba5193398578f00de10f0487262017a4476fd61232ab5bc9198a759cc3afc25ef63b726b33bdacc2fcd2d21fffd241ae9fc2074db5894e2ba6d7f38055e6e WHIRLPOOL 6e6eaa7465c788ac0b8be2248e8e2a72db9b28e1fa18f95cd3a1e9a2736c6acc192db3bca0a5405f3da2f95c55d87a96b2bbe5ebcf55700fd5e5cdb3842a65c6
 DIST sagan-0.2.1.tar.gz 805823 SHA256 6c4fe7128a01c6f309bd181563c54cdf0abf2f623db78e0207f9c69176b15858 SHA512 fb2feded7bdc913ba5e7ffef6155c17811c2690fde44714674b555092fb96137acf3e4df2d72c3d96f9b80329f3af93e3b99874c34e9587bd1e6e3d89c8926c5 WHIRLPOOL c764dd48caaf12dff6273fcf0398aeeff748a636b8ebf9b460dc19b1f3bec600a2b3d4de9d2b638130499b9f011234b11638e76d651c2e5dc8cbf52714e5a2b9
 DIST sagan-0.2.2-r2.tar.gz 247104 SHA256 be6670e0348dc0beeeed08b50a5997ba69a5996bdbf2603dfb0c8f80c88c0065 SHA512 aa724386d42862329ca2f3b4ff1ffcd0f984e17161fbfa26d06343805d51b9504af076efc518b8b56bdfd75ca349387a777f5128a93dc42fb6ea793cee0d580b WHIRLPOOL 9bc8e011bde5e7eb1d588f45d9e0d8a23807094c9cdc6b75af65b07075054ff62549a92cda6a596e37de218ea24cda44519abc4134c4bef3b7511e838468de3d
@@ -8,5 +8,6 @@ EBUILD sagan-0.2.0-r3.ebuild 2152 SHA256 1383b2b42128361b2153cc0e1a88b7bdee1fad8
 EBUILD sagan-0.2.1-r2.ebuild 2227 SHA256 88763722e8417a05e9f74d8c9e3b12ade5e0e0036a2c6d6365fdce6bccfcebf6 SHA512 35c033c3d9fc7b14b45d0f3396a42ab8975c98e6f8f87bb7eed699b49aec61cde440e1c553fb8c36be4b7efa073625a501e15c3e9d05df660f1b7693f0dc2ea0 WHIRLPOOL bc2e4a102bfb5458fda9db2a01f4aa08da2385bc7f51142831fcef72243144b02c36d56fcc7566e2a0b1e18ea1ce1ec631d029fa2c15732c4d1d4d07d08e831a
 EBUILD sagan-0.2.1.ebuild 2247 SHA256 843261c2927e5aa77371e4a3f966272c4b506f06765a373d4dc39db3998fb997 SHA512 bb77a8c77de688749ed646ee5fc3c0320180508d782d6ddfc5e1a4c537d0c902bac3b734a3045218f215064b9cc0f092260b9f32e71cd42aa8f4648775fb2c2a WHIRLPOOL 91cfc5469b13ea23f0016ddbbfd89af4ce2ab29219cd79d9f396b50c20ec1321d0d9a650b177a9776d31ec63228b0a70dcdab8df7737289f569cc86b1316961b
 EBUILD sagan-0.2.2_p2-r1.ebuild 2294 SHA256 a099a9a90ddccce1190920d7d18dda8795f968a96fb7d33116b7dcac6a5dfb76 SHA512 1e2b3cd092070c0533d374e77991b362eddd3fd8c543d3e38080a5a1dba62e258a1ce8ee5b6fbb1642c9534c6869a68477f94aee0758481fb21c66822d0f715c WHIRLPOOL ef71b6506ebfa4e0b18376832cee3db831b47e6021bdaba14ef78026afeba9feb2741a352ebb58f8514bbeb65dd99aff00998a03472a7d6ae771f037504d3fcc
-MISC ChangeLog 2616 SHA256 420f58855954097e8a04a8a2894367034dc30bfdad39f982339c89e33599c842 SHA512 6fc568e74079e063925fd58f1693b9f1fc000fba9a5e75d0c266bb521301fadeb0b09f695f50ee6638cee4ad18a99851c2d972106f032a11d160d94d22a96e7a WHIRLPOOL 0e35f217c134b39df64f9ed932976323a7fb1505ec1fc74645a5bd552010987ddd6505941fb025977f086c9e3e585d1c5b4d5879d03f275eca7e2f8f986e2a87
+EBUILD sagan-0.2.2_p2-r2.ebuild 2173 SHA256 dfd68a3825f197effbdf49892feea6a82eb4fbf8030b3fcf305d8f0133bb68e7 SHA512 21ee68db40e5a34e86e84f8bf5b8520e61252045fc42799462e5a243d056db9ab2cc0cd17399000c41769f9581e59462700b2198304688f3af346a00e1b3146f WHIRLPOOL 6753755e81e4c510456de0dff89efba004fa43c9525bf22e7cb1fbfd260b0bb7168e1a7e0804b8a5131a82ffd1b899909614dbcdf45cd099e4120336e2d24ebd
+MISC ChangeLog 2802 SHA256 1fb1c12cf16e2f3d5c34d8002d856ae079e2a647517e5d9a73ed7d4d24c871f3 SHA512 71ae9bb3844a420846a6dabb1b76ff72fef40d4b74c1c849dede96fa31c38d7b9f87f2264c440f4e4b04408078e54f5538c60d36a54195493a5ad1d38f19030d WHIRLPOOL 5f9be1778e9591913523ff508ccc76461552c66b14d92b45876669278d3a8cf922d5ceb4fdaacd2c572588833564db718390240663e41e0d029b65bf60c6824c
 MISC metadata.xml 870 SHA256 e72e607644a8970834b579dfe1766ece03af33362c41b522a6d7cbcb1c31efa9 SHA512 b4dc456d9949d4c393d6c757f950b8081b88d3762523eac59a091315b6fa3c2719b1a6b871ea7442adca4ed480f671434ceff0c2b7a6a34f4949cae527ad2776 WHIRLPOOL 1bb8b06eb2313d9ee7f8932c23f093cc8b9b94252ec1e1140541ecaa22fbba7ff8b862ea7fbfec7f3476b59f1f5584e45139326b798e0110dbab0c13bf3d3e8e
diff --git a/app-admin/sagan/files/sagan.init b/app-admin/sagan/files/sagan.init
index 7f497d649814..62e973fd18c1 100644
--- a/app-admin/sagan/files/sagan.init
+++ b/app-admin/sagan/files/sagan.init
@@ -1,22 +1,18 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sagan/files/sagan.init,v 1.1 2011/08/31 08:36:54 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sagan/files/sagan.init,v 1.2 2012/12/25 20:01:33 qnikst Exp $
 
+pidfile="/var/run/sagan/sagan.pid"
+command="/usr/bin/sagan"
+command_args="-D \"${SAGAN_OPTS}\" -u \"${SAGAN_USER}\""
 
 depend() {
-        use logger mysql postgresql net
-        need localmount
+      use logger mysql postgresql
+      need localmount
 }
 
-start() {
-	ebegin "Starting sagan"
-    start-stop-daemon --start  --pidfile /var/run/sagan/sagan.pid /usr/bin/sagan -- -D  "${SAGAN_OPTS}"  -u "${SAGAN_USER}" 
-    eend $?
-}
-
-stop() {
-	ebegin " Stopping sagan"
-    start-stop-daemon --stop --quiet --pidfile /var/run/sagan/sagan.pid
-    eend $?
+start_pre() {
+    checkpath -d -o sagan /var/run/sagan
+    checkpath -p -o sagan -m 0644 /var/run/sagan/sagan.fifo
 }
diff --git a/app-admin/sagan/sagan-0.2.2_p2-r2.ebuild b/app-admin/sagan/sagan-0.2.2_p2-r2.ebuild
new file mode 100644
index 000000000000..0f9ff00249a7
--- /dev/null
+++ b/app-admin/sagan/sagan-0.2.2_p2-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sagan/sagan-0.2.2_p2-r2.ebuild,v 1.1 2012/12/25 20:01:33 qnikst Exp $
+
+EAPI=4
+
+MY_PV="0.2.2-r2"
+inherit eutils autotools-utils user
+
+DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
+HOMEPAGE="http://sagan.softwink.com/"
+SRC_URI="http://sagan.softwink.com/download/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="smtp mysql postgres prelude snort +lognorm +libdnet +pcap"
+
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+RDEPEND="dev-libs/libpcre
+	app-admin/sagan-rules[lognorm?]
+	smtp? ( net-libs/libesmtp )
+	pcap? ( net-libs/libpcap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	prelude? ( dev-libs/libprelude )
+	lognorm? ( dev-libs/liblognorm )
+	libdnet? ( dev-libs/libdnet )
+	snort? ( >=net-analyzer/snortsam-2.50 )
+	"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+DOCS=(AUTHORS ChangeLog FAQ INSTALL README NEWS TODO)
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+	enewgroup sagan
+	enewuser sagan -1 -1 /dev/null sagan
+}
+
+src_configure() {
+	 local myeconfargs=(
+		$(use_enable mysql)
+		$(use_enable postgres postgresql)
+		$(use_enable smtp esmtp)
+		$(use_enable prelude )
+		$(use_enable lognorm)
+		$(use_enable libdnet)
+		$(use_enable pcap libpcap)
+		$(use_enable snort snortsam)
+		)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	diropts -g sagan -o sagan -m 775
+
+	dodir /var/log/sagan
+
+	keepdir /var/log/sagan
+
+	touch "${ED}"/var/log/sagan/sagan.log
+	chown sagan.sagan "${ED}"/var/log/sagan/sagan.log
+
+	newinitd "${FILESDIR}"/sagan.init sagan
+	newconfd "${FILESDIR}"/sagan.confd sagan
+
+	insinto /usr/share/doc/${PF}/examples
+	doins -r extra/*
+}
+
+pkg_postinst() {
+	if use smtp; then
+		ewarn "You have enabled smtp use flag. If you plan on using Sagan with"
+		ewarn "email, create valid writable home directory for user 'sagan'"
+		ewarn "For security reasons it was created with /dev/null home directory"
+	fi
+
+	einfo "For configuration assistance see"
+	einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO"
+}