Fix keepdir /var/run wrt bug #449986. Include sample configuration file.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xD628E536

5 files changed, 114 insertions, 9 deletions

diff --git a/app-admin/swatch/ChangeLog b/app-admin/swatch/ChangeLog
index 3886f99bd909..ff681ff7dc19 100644
--- a/app-admin/swatch/ChangeLog
+++ b/app-admin/swatch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/swatch
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/swatch/ChangeLog,v 1.28 2013/01/05 18:51:20 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/swatch/ChangeLog,v 1.29 2013/01/07 16:42:42 nimiux Exp $
+
+*swatch-3.2.3-r2 (07 Jan 2013)
+
+  07 Jan 2013; Chema Alonso <nimiux@gentoo.org> +swatch-3.2.3-r2.ebuild,
+  +files/swatch-init, +files/swatchrc:
+  Revision bump to fix keepdir /var/run wrt bug #449986 and include sample
+  swatchrc file.
 
   05 Jan 2013; Chema Alonso <nimiux@gentoo.org> metadata.xml:
   Add longdescription to metadata
diff --git a/app-admin/swatch/Manifest b/app-admin/swatch/Manifest
index 5612af112906..6fb39705ad19 100644
--- a/app-admin/swatch/Manifest
+++ b/app-admin/swatch/Manifest
@@ -2,21 +2,24 @@
 Hash: SHA256
 
 AUX swatch-confd 634 SHA256 b427a48ae48ea5c357f07210f86cf7bd2d52b1db94633775fff7b3207d7f2cbd SHA512 7639260e73d20adae8649fd9648c339993b8867ec4309787157274d886ecda0edbb0028eb592d9eff1ac589f38e4251020553adea566b3cb29ee9d89fe7d76b4 WHIRLPOOL c7338eaa2967e28ff44c0877918e884c230f4860da20814af8a255ba58466ff5d05b2ebde9e85cb7c7cb4a78f5bd1965688129853f316a6ce1f366f016de0bb3
+AUX swatch-init 1410 SHA256 d44c0123fe01ef637bf45892aa1a65d3f3fefbdf847545ed2c9022a676722f4e SHA512 f15063fcbf2c479475e705635f5e1d122f93befaff1fc4b6b73b3b56c65bb748b0e162047b988f1a93f91258a376795d9bf267afae4512a5359de79a4fca0b39 WHIRLPOOL cbcdfdb6400b8c3c0c046eb0c89f87e0a9f05d406dc20827483494ecd5569abba33356041aaecaf4a3c550c377c89ac58affcbb673d166433d436c9ecd2d2be3
 AUX swatch-initd 1356 SHA256 05291a811e14b3c0cf7acb8795bee156f023bb93d1888c054d2c18589cb46aa3 SHA512 6ceacaa8989a27d7dc83f6e6e72aab6207ebf15cdd68721b483ecfc751405b70bc333b7665995d2875b51a332fbec1e5d15ca116fa3dc2448568906137282d1d WHIRLPOOL 775fdf782782495ed5fe607402a94c1ad488414ecddf1de270ecdc7a8e05be95bd5267f46c587a35be4e7670e9b67ccfcdc7e5468b02a594180bc21b09108006
+AUX swatchrc 293 SHA256 dba3a3e3008ea9a22484f01b2c1df1c823e04fa6f2b7969ac491b9dea9da8bb5 SHA512 da3101e9c95b111baeaf46d7cd3e81e46ee8b3c866963adac17c1c562f4d360b6aae960a067f2ee8b53c8c824b353fbd7793bef1e9084019c3a6e07b3d005dc6 WHIRLPOOL d597c5f7c12c1a4256e5e36184cb60256fdc6cffb456215ec8759ca02789fe0c77ba46b01c80b981110e5cde0408666cfe6d52773af7066097d0e5f441f03ab9
 DIST swatch-3.1.tar.gz 30008 SHA256 3cc2f0cd3889bb03629139d046dc76d1d87902e20d8a7bdba995d6f0afa69a7f SHA512 fc8ff2c44b90c0b81b56aa258f68cd009ceac3a453e44e6afeba5184921a14e6e5b27fdd6251aea00eb48af0f9f96ac61a2f7c2889e9c8446ee58437810840dd WHIRLPOOL 50ef13f60a4e8f19fcc48a0d5285ad675c98105a26161f91e802ef243b3cdb7745dfd8197d7989ad1826050370328b5720e80ae044e1aa82dacc1e833f91b35f
 DIST swatch-3.2.3.tar.gz 31199 SHA256 e29480993e52f245f3abec079b3103d8e97244dafe754f8c2d37e7b0b3b58077 SHA512 8020fb99b7acfc322b2a80d8fd9669fc97f272c33b19a36ef1be025ffd1a463658e9b0cc5ddbac02b12a68db9e148da53734beb632677ef88337848bbd60e90f WHIRLPOOL 2fa2ff6dacec9bb527814b041951cfd5c48760cad3a94afcfe362bd13b38f0ea9b970aa7ff4882b30a5dabd79a552ea6e0ac8397e350ef88aa6569cdd7369bf3
 EBUILD swatch-3.1.ebuild 558 SHA256 2ab6b47e1db8e5aae03eca2cbbe5ec3e917c844875c839d647a8c6520ef003c8 SHA512 faaeda8bb042eedea2cb48e72a098b04f7cf45842b42f4a4f55b1bb99ea345839bf663835b15b24a6490be412eb94c0e8dc2f91a302ffd6084e6748751ec58c5 WHIRLPOOL d6914a6f5db90f53ece86a775ff69abc53a7dd7eeae101f6f119571607518537565e615a4b20bcf573ade3143e88b62f3de54fc08f8b243b9ae82392416f2849
 EBUILD swatch-3.2.3-r1.ebuild 711 SHA256 f98d920efc71c789e60ebad3169d7551e512d6ba596774f25d764becb99e7192 SHA512 c4efc9978745e19b3227fec778be7244dc6474b0b60fd678c4bf582c07fa7a72cc469c9e252e43c80eee71ac5d69b964e9e52c0ba9e84f2e747102e771bf7d28 WHIRLPOOL 8789dfbce3ae38f992d3aaf3ae05da9d7361af7bb580f2745d3a1b40b7fc328942d0e8a0d542962a84fb18c02617569368c0f407cea875bdb2de39f921e7771c
-MISC ChangeLog 3245 SHA256 daa4644c92b3bca48dd6ca43bf6fb5423f8e938ebcc7e288f4d8a56052bad239 SHA512 103d20e728b73d8cd9c3d24510a81852ff89a86a18f0f0172c2fae6b41325e60080be35f4db2cc60e77691c6ba4b44daeda9ce5576548058474aff196288cb9f WHIRLPOOL 2fb594f27b41340df35d8870c0fa0afe75878d6af5a8c62742d58a4482f33c6e165959b82b58dbaad066261d556a68a6d2fc5ece785fb81490c8cc02040e5e83
+EBUILD swatch-3.2.3-r2.ebuild 743 SHA256 da2b9e5abf84a96c7f32052bede161b979f7e8d124e4ac5bbf234bebfda8f753 SHA512 b62596b28cf7f99da9480c16d115e400b422f56cbce0e54a40a76f6dc90f2cb145b22469cc20392eea17841c0bb67561f3d5c142fe16a1d184f3ecebfd91ca0d WHIRLPOOL 8b243a29ace66552ecc0b7f4c8e06879f2e4f5150e16efd49249592272d7e64f0041a7d25086d3a8294fb715b5c29d7985e0b46b053516b13e15bae119dce1c3
+MISC ChangeLog 3482 SHA256 eab1d12cfae1a761923a7b84695fba0b4e979392a88ecfe1e347caa5e8c5033b SHA512 eff543c10f5648d81a85dee23adc54d5ea5f49291be906dadebece4a993b2e78b223c72f8154ff0907967e711c0614197e1c3529dd9f1494b5c1ae0d5dc03d81 WHIRLPOOL ba928fa245959c49318dd385a9d2777d324f47a0a221b35e986a746d1a58d8ace900859f507994d5e130807be74bff0752a3e225d0848b98a51525f87ec6bf30
 MISC metadata.xml 810 SHA256 1139a17506b0ce4af66714fd514665425fda51086372f028abfc3973460f7e2c SHA512 842a95e5679855fa419e605fe93b6f62348ed8ed136e360872357c38584d9dd19b7127a057c2e76f97e429a2b831fcd5fbe5b9022140dcbc13ca0ea3a615d2c3 WHIRLPOOL bf9883e881ba0c249561c3da478fa8155a57361831d7e3615774c04faa8082b97a258a765d4e66c9bbcf06cc125e29fec75e5177b5c3aafda85cf7fced712bf1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ6HZwAAoJEA2sAkrWKOU2aZ8IAIcrpCvrvz9v9NRtz/N8ysJo
-AdDpxCgkYdq0WQE3xPR8C/74vPfWYXb+7G5VNMR6fgOMzHbnT7W09KvkoxfKFN5a
-1tPMr33P7wZXu/8H65NJmhvxxa8pt2kZ8doSPTw/yBekMHc3h+8bHJHL+T6vB8fM
-Z4TsNaV9g+CijOL1WCe/LkCI7sEpe0WrdQS9aWQr0HlNF12Poxne5A+mVO7EsdOE
-RE0jjmYa3AKvXoaldBvVrfuv0IQ87b7XXg2wuPqnoZFgIOlYhfh6YzyZNPTH5nGL
-qO6tCNCJY/c7fnGceznNDdICmxlYoMcqQnF6P9xpYizCqnvWWhzl5FQOrYcM0Ks=
-=2+BL
+iQEcBAEBCAAGBQJQ6vtJAAoJEA2sAkrWKOU2GE8IAKHjfGuQpAmzQWeu0suHBZdb
+qhy85NSUVJXi31YQ6mDJytvNssowlG7pJfNeXrDVl8lsPnrqQiTBFGGU88RobjtT
+BfN2mhLjilyBzFyEZcru6Q6ynzVF7n1luiU9Ncq+wis4IIgOqkykufEQDrUp1xlu
+ZkuqIu8OlJUHL9XVCn+VhxMkdts0cBowVTdoZQ8YJ3/ZRoFDIHUoUcjVGLXtOJM3
+IcDhkvM/W/2wKWjG+3y+cqEfzimQYHVevFakQEC8Q7lZzFoDuyIshVgTRXlvYETz
++0B4ohbUup9JTjkiXfZKg/UgdHXjhnVG14aE4Eo29G3CBMvIH7lyMB407kEVwjs=
+=Xx9R
 -----END PGP SIGNATURE-----
diff --git a/app-admin/swatch/files/swatch-init b/app-admin/swatch/files/swatch-init
new file mode 100644
index 000000000000..cd622de5e59d
--- /dev/null
+++ b/app-admin/swatch/files/swatch-init
@@ -0,0 +1,53 @@
+#!/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() {
+	checkpath -d -q -m 0750 -o root:root /var/run/swatch
+	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/files/swatchrc b/app-admin/swatch/files/swatchrc
new file mode 100644
index 000000000000..92e88ded1ef5
--- /dev/null
+++ b/app-admin/swatch/files/swatchrc
@@ -0,0 +1,10 @@
+#
+# A sample configuration file for swatch.
+#
+# See "man swatch" for details.
+
+# Mails root when invalid remote login attempted.
+watchfor /(.*) (.*) (.*) (.*) (.*):( [iI]nvalid [uU]ser )(.*)( from )(.*)$/
+	threshold track_by=$9,type=limit,count=3,seconds=30
+	mail root,subject="Invalid user"
+
diff --git a/app-admin/swatch/swatch-3.2.3-r2.ebuild b/app-admin/swatch/swatch-3.2.3-r2.ebuild
new file mode 100644
index 000000000000..40825e701a33
--- /dev/null
+++ b/app-admin/swatch/swatch-3.2.3-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 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-r2.ebuild,v 1.1 2013/01/07 16:42:42 nimiux Exp $
+
+EAPI=5
+
+inherit perl-app
+
+DESCRIPTION="Perl-based system log watcher"
+HOMEPAGE="http://sourceforge.net/projects/swatch/"
+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
+	newinitd "${FILESDIR}/${PN}-init" "${PN}"
+	newconfd "${FILESDIR}/${PN}-confd" "${PN}"
+	insinto /etc
+	doins "${FILESDIR}/swatchrc"
+}