app-admin/swatch: Revision bump. Add init and conf scripts. Update maintainer info.

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

6 files changed, 141 insertions, 8 deletions

diff --git a/app-admin/swatch/ChangeLog b/app-admin/swatch/ChangeLog
index dc447d7c97f7..aa0d6aa2408c 100644
--- a/app-admin/swatch/ChangeLog
+++ b/app-admin/swatch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/swatch
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/swatch/ChangeLog,v 1.21 2011/06/16 17:09:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/swatch/ChangeLog,v 1.22 2011/07/06 12:23:00 c1pher Exp $
+
+*swatch-3.2.3-r1 (06 Jul 2011)
+
+  06 Jul 2011; Dane Smith <c1pher@gentoo.org> +swatch-3.2.3-r1.ebuild,
+  +files/swatch-confd, +files/swatch-initd, metadata.xml:
+  Revision bump. Add init script and conf script.
+  Update maintainer info. Adopted by Chema Alonso with me as Proxy.
 
 *swatch-3.2.3 (16 Jun 2011)
 
diff --git a/app-admin/swatch/Manifest b/app-admin/swatch/Manifest
index 3f0377c91d98..40a9db73ad3e 100644
--- a/app-admin/swatch/Manifest
+++ b/app-admin/swatch/Manifest
@@ -1,6 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX swatch-confd 634 RMD160 9c810eb9450ab826a17638da3c5c81c9080e1e1b SHA1 1044982f4392881a4b57d9102de35e991dd640d8 SHA256 b427a48ae48ea5c357f07210f86cf7bd2d52b1db94633775fff7b3207d7f2cbd
+AUX swatch-initd 1356 RMD160 f50c934bc8af302ca465783216de92aef6e76c20 SHA1 6dc18fc5ce9507a0a35729f443ab001d8c7b18de SHA256 05291a811e14b3c0cf7acb8795bee156f023bb93d1888c054d2c18589cb46aa3
 DIST swatch-3.1.1.tar.gz 29568 RMD160 9a65522006607bcd569dcebfeb46027fddff4c60 SHA1 c8e4ccaf74bc63119662d685866b1ea2d2b8cea3 SHA256 e6874cc6d8441d0a4c065c625ab04b2d19c7aff7b83ce5f2260d2c2ccea3f903
 DIST swatch-3.1.tar.gz 30008 RMD160 1d95d4abf86ecd10dd84ee036caf09c58b978816 SHA1 4ba41a8404ca1ac2b2bfb700d81700acb1cc65e3 SHA256 3cc2f0cd3889bb03629139d046dc76d1d87902e20d8a7bdba995d6f0afa69a7f
 DIST swatch-3.2.1.tar.gz 31039 RMD160 7bbe75f6c6c6f08b60c6e77cdddfb96881d5ae4b SHA1 e3117104947a7f3ee26e26ea691f7942cbb8ec67 SHA256 9f05c0f051505d7eafd9170942129ebcec89521c68c1f0e349c43d01a89a9aeb
@@ -8,13 +10,24 @@ DIST swatch-3.2.3.tar.gz 31199 RMD160 09692c0c889ff9c5a1af50a5e5272a177130bc31 S
 EBUILD swatch-3.1.1.ebuild 569 RMD160 883890182a22e31162f3efdb3ee22ee4e8298ce2 SHA1 3bfb7d8cd6c103578f51a260bad413838caf2974 SHA256 dcbb06638a2a79cc0b6e112132d76b87659852e80e4d9ceac600f30cd8f755b2
 EBUILD swatch-3.1.ebuild 558 RMD160 f78823e6d0fce6c03b1edb41b2a1b89705c1cf49 SHA1 f75adbd49b4e2d35cab0390e4140006864347eda SHA256 2ab6b47e1db8e5aae03eca2cbbe5ec3e917c844875c839d647a8c6520ef003c8
 EBUILD swatch-3.2.1.ebuild 568 RMD160 ee9c32dc0db5e567677d01bf9120c73e1cf06706 SHA1 965b64b16db1f6ed279070a229f35bac0111b64a SHA256 2e3a9a5f5829a713920b7bbaa1ff43eff16a628b99246e50811d69d12676abe3
+EBUILD swatch-3.2.3-r1.ebuild 714 RMD160 946f077966a59be63d524c0acf20a11852f0a07e SHA1 df546fc50b23ed5da843352434f3734a5ab86dda SHA256 a47e2feafe571156147fc657848132d77ab0f3c77f5b7112f95949bd7d0650d9
 EBUILD swatch-3.2.3.ebuild 556 RMD160 2b3ceec6cd81bc9cfd4883e90ac51f43c6b79cbb SHA1 99c48d0e5a4a355133eb2b489ff5fa757ba5a179 SHA256 5b78e93725c76668830a7372547b479a4df3ca37c59d8a389bcea372be3f399e
-MISC ChangeLog 2187 RMD160 6aecf81f7ebf976f6c0646aace83dd80aecb37f9 SHA1 80dedab6a2770bb8c1a9baef9df5e76f1dde900a SHA256 c924fea3068d7013c52565a55a5fcd9a23080da79c344e9bd68e505e2c5cad12
-MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
+MISC ChangeLog 2470 RMD160 3865e91d30465c756b0657c155100a5a31f30733 SHA1 1a672c05742335408246d3ed9e1874a106803f1c SHA256 e5ec64e6e653522abdb711f4e90415e7d14950c8f8be653c277aef706c64e5c3
+MISC metadata.xml 334 RMD160 9d89b79611020aecd0e577d4b77d0598058723e6 SHA1 6059fa2744a02987512480e1eea243711bfa74f1 SHA256 646c7816586af9f714175f08d315b80f4c06fae4b3625060fc6b375269e0110f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk36OMMACgkQVWmRsqeSphNfHwCfRUIQSCDd+wi0VDggNiXX8doy
-Z4sAn0E/B85XqRFskGYN9Gy2jYY/QFjE
-=WSHl
+iQIcBAEBCAAGBQJOFFOkAAoJEEsurZwMLhUxDXAQAI2Y0ZuW0Di28OzNnzrzP6O8
+b5c1Ehi4Rf8haxqJ8xXjXuf9n2CxAPhNzTgmoXSCB1TLg/GS8H6053fbYMmeiCjq
+17uj8BS2mY3u0y6daKBLkwiuV+/rVmL9XBXzr9POMSG2gB+cyzOZeCiP8EJOupkE
+tsk+FK3o5ghtg2XeXttQLHsPIdh+yXN3mTVvqiJaj6456Y9tdaa+emDuQEJEwq9g
+laoodD2+LMU5fKPm09eprluRkRj3rcoTl9NjRHmWI7aQEsTaB5j2kXWeSNGlfmEt
+BfGcPj7OMG8mY8uSwkA8gZ+S5/cKbYP8O6An1dymVcfipXMsM2TLQoR6gTY4grj5
+quQGbsNnIfoANYbk7GY24W8eVCzE1CXQI8NkWQXd2onDWzoJLy085b/QViCQ2W2O
+uJq+0mIAC/KK57HmbbroauTP1y27RrC+nGWoaQxKo2BtQqdsMxa0cFBxW+YIV8sB
+Gv8dzeIkAx5FzKjT/GTHxzuMiuoQosiT3xJQRo9/hsY5g+QReDxhqHPs50nyqWcF
+FdVkvJd5+wjk9D5Ac1m7n0NxgaCDRN6dT9gbM4gjQlMuEEBX7MUGx9X9QVxQximQ
+wolIJjp6zgBBT6CjPk4Pu6myhScGHE3BpbbpakU7Unmjor1zOMvYgCvVVXbM97Ji
+UwtpRLnKDqT1SlwOhxDQ
+=yX+A
 -----END PGP SIGNATURE-----
diff --git a/app-admin/swatch/files/swatch-confd b/app-admin/swatch/files/swatch-confd
new file mode 100644
index 000000000000..813a2a084fc7
--- /dev/null
+++ b/app-admin/swatch/files/swatch-confd
@@ -0,0 +1,25 @@
+# /etc/conf.d/swatch: config file for /etc/init.d/swatch
+
+# Path to the swatch program.
+#SWATCH_BINARY="/usr/bin/swatch"
+
+# Swatchrc to read patterns and actions from.
+#SWATCHRC="/etc/swatchrc"
+
+# File to monitor
+#SWATCH_TAILFILE="/var/log/syslog"
+
+# Arguments to tail program
+#SWATCH_TAILARGS=""
+
+# Swatch log file
+#SWATCH_LOGFILE="/var/log/swatch.log"
+
+# Swatch error file
+#SWATCH_ERRFILE="/var/log/swatch-err.log"
+
+# Where to output the generated script to. Should not be writable by others.
+#SWATCH_SCRIPT="/var/run/swatch/swatch_script.pl"
+
+# Whether to parse the complete file once at startup. Defaults to "NO".
+PARSE_FULL="NO"
diff --git a/app-admin/swatch/files/swatch-initd b/app-admin/swatch/files/swatch-initd
new file mode 100644
index 000000000000..f1a25a66a209
--- /dev/null
+++ b/app-admin/swatch/files/swatch-initd
@@ -0,0 +1,52 @@
+#!/sbin/runscript
+# This script is based on the one created by Phil (bug #255329).
+
+depend() {
+	need logger
+}
+
+SWATCH_BINARY=${SWATCH_BINARY:-/usr/bin/swatch}
+SWATCHRC=${SWATCHRC:-/etc/swatchrc}
+SWATCH_TAILFILE=${SWATCH_TAILFILE:-/var/log/syslog}
+SWATCH_LOGFILE=${SWATCH_LOGFILE:-/var/log/swatch.log}
+SWATCH_ERRFILE=${SWATCH_ERRFILE:-/var/log/swatch-err.log}
+SWATCH_SCRIPT=${SWATCH_SCRIPT:-/var/run/swatch/swatch_script.pl}
+
+gen_script() {
+	local tailargs=""
+	if [ "${SWATCH_TAILARGS}" ]; then
+		tailargs="--tail-args=\"${SWATCH_TAILARGS}\""
+	fi
+	ebegin "Generating swatch script from config"
+	${SWATCH_BINARY} --dump-script="${SWATCH_SCRIPT}" \
+		--use-cpan-file-tail ${tailargs} \
+		--config-file "${SWATCHRC}" $1 "${SWATCH_TAILFILE}"
+	eend $?
+}
+
+parse_full() {
+	gen_script --examine
+	ebegin "Parsing complete file once"
+	/usr/bin/perl ${SWATCH_SCRIPT} 1>/dev/null
+	eend $?
+}
+
+start() {
+	if [ "${PARSE_FULL}" == "YES" ]; then
+		parse_full
+	fi
+	gen_script --tail-file
+	ebegin "Starting swatch"
+	start-stop-daemon --start --quiet --background \
+		--make-pidfile --pidfile /var/run/swatch/swatch.pid \
+		--stdout ${SWATCH_LOGFILE} --stderr ${SWATCH_ERRFILE} \
+		--exec /usr/bin/perl -- ${SWATCH_SCRIPT}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping swatch"
+	start-stop-daemon --stop --exec /usr/bin/perl \
+		--pidfile /var/run/swatch/swatch.pid --quiet
+	eend $?
+}
diff --git a/app-admin/swatch/metadata.xml b/app-admin/swatch/metadata.xml
index 73420b6cf0f0..133522523076 100644
--- a/app-admin/swatch/metadata.xml
+++ b/app-admin/swatch/metadata.xml
@@ -3,6 +3,11 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>maintainer-needed@gentoo.org</email>
+	<email>nimiux@gentoo.org</email>
+	<name>Chema Alonso</name>
+</maintainer>
+<maintainer>
+	<email>c1pher@gentoo.org</email>
+	<name>Dane Smith</name>
 </maintainer>
 </pkgmetadata>
diff --git a/app-admin/swatch/swatch-3.2.3-r1.ebuild b/app-admin/swatch/swatch-3.2.3-r1.ebuild
new file mode 100644
index 000000000000..3eeb331ee7e8
--- /dev/null
+++ b/app-admin/swatch/swatch-3.2.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/swatch/swatch-3.2.3-r1.ebuild,v 1.1 2011/07/06 12:23:00 c1pher Exp $
+
+EAPI="4"
+
+inherit perl-app
+
+DESCRIPTION="Perl-based system log watcher"
+HOMEPAGE="http://swatch.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-perl/DateManip
+	dev-perl/Date-Calc
+	dev-perl/File-Tail
+	dev-perl/TimeDate
+	>=virtual/perl-Time-HiRes-1.12
+"
+
+src_install() {
+	emake install
+	dodir "/var/run/swatch"
+	newinitd "${FILESDIR}"/${PN}-initd ${PN}
+	newconfd "${FILESDIR}"/${PN}-confd ${PN}
+}