Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, app-admin/swatchdog/files/, app-admin/swatchdog/, profiles/updates/
Date: Mon, 22 Nov 2021 09:14:27
Message-Id: 1637572421.936c013e070874119caed00e1ba96835001b793b.jsmolic@gentoo
1 commit: 936c013e070874119caed00e1ba96835001b793b
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 22 08:36:57 2021 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 22 09:13:41 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936c013e
7
8 app-admin/swatchdog: treeclean
9
10 Closes: https://bugs.gentoo.org/819693
11 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
12
13 app-admin/swatchdog/Manifest | 1 -
14 app-admin/swatchdog/files/swatchdog-confd | 25 -------------
15 app-admin/swatchdog/files/swatchdog-init | 53 ---------------------------
16 app-admin/swatchdog/files/swatchdogrc | 10 -----
17 app-admin/swatchdog/metadata.xml | 24 ------------
18 app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild | 34 -----------------
19 profiles/package.mask | 5 ---
20 profiles/updates/3Q-2016 | 1 -
21 8 files changed, 153 deletions(-)
22
23 diff --git a/app-admin/swatchdog/Manifest b/app-admin/swatchdog/Manifest
24 deleted file mode 100644
25 index 0ca2609642b9..000000000000
26 --- a/app-admin/swatchdog/Manifest
27 +++ /dev/null
28 @@ -1 +0,0 @@
29 -DIST swatchdog-3.2.4.tar.gz 30122 BLAKE2B 103491a231306cedad030fca8cc309ce89e8cbc8a3fcee63cd482efb733b91db8b29193bb1e9b9c5213261b150e3dc6be2b506dee83b2297d5af2f1451f596c8 SHA512 4e0a4e3feed00df0f0d04f94cc090e53e71fa9b20d46236ec41d63b98b5733d80a5941b491cffcbb0b655a9c7d2b5c9423ca7ae043346dbe1b05ee6ab24b9489
30
31 diff --git a/app-admin/swatchdog/files/swatchdog-confd b/app-admin/swatchdog/files/swatchdog-confd
32 deleted file mode 100644
33 index 13f8a0aed79e..000000000000
34 --- a/app-admin/swatchdog/files/swatchdog-confd
35 +++ /dev/null
36 @@ -1,25 +0,0 @@
37 -# /etc/conf.d/swatchdog: config file for /etc/init.d/swatchdog
38 -
39 -# Path to the swatchdog program.
40 -#SWATCHDOG_BINARY="/usr/bin/swatchdog"
41 -
42 -# Swatchrc to read patterns and actions from.
43 -#SWATCHDOGRC="/etc/swatchdogrc"
44 -
45 -# File to monitor
46 -#SWATCHDOG_TAILFILE="/var/log/syslog"
47 -
48 -# Arguments to tail program
49 -#SWATCHDOG_TAILARGS=""
50 -
51 -# Swatch log file
52 -#SWATCHDOG_LOGFILE="/var/log/swatchdog.log"
53 -
54 -# Swatch error file
55 -#SWATCHDOG_ERRFILE="/var/log/swatchdog-err.log"
56 -
57 -# Where to output the generated script to. Should not be writable by others.
58 -#SWATCHDOG_SCRIPT="/run/swatchdog/swatchdog_script.pl"
59 -
60 -# Whether to parse the complete file once at startup. Defaults to "NO".
61 -PARSE_FULL="NO"
62
63 diff --git a/app-admin/swatchdog/files/swatchdog-init b/app-admin/swatchdog/files/swatchdog-init
64 deleted file mode 100644
65 index d623070073f7..000000000000
66 --- a/app-admin/swatchdog/files/swatchdog-init
67 +++ /dev/null
68 @@ -1,53 +0,0 @@
69 -#!/sbin/openrc-run
70 -# This script is based on the one created by Phil (bug #255329).
71 -
72 -depend() {
73 - need logger
74 -}
75 -
76 -SWATCHDOG_BINARY=${SWATCHDOG_BINARY:-/usr/bin/swatchdog}
77 -SWATCHDOGRC=${SWATCHDOGRC:-/etc/swatchdogrc}
78 -SWATCHDOG_TAILFILE=${SWATCHDOG_TAILFILE:-/var/log/syslog}
79 -SWATCHDOG_LOGFILE=${SWATCHDOG_LOGFILE:-/var/log/swatchdog.log}
80 -SWATCHDOG_ERRFILE=${SWATCHDOG_ERRFILE:-/var/log/swatchdog-err.log}
81 -SWATCHDOG_SCRIPT=${SWATCHDOG_SCRIPT:-/run/swatchdog/swatchdog_script.pl}
82 -
83 -gen_script() {
84 - local tailargs=""
85 - if [ "${SWATCHDOG_TAILARGS}" ]; then
86 - tailargs="--tail-args=\"${SWATCHDOG_TAILARGS}\""
87 - fi
88 - ebegin "Generating swatchdog script from config"
89 - ${SWATCHDOG_BINARY} --dump-script="${SWATCHDOG_SCRIPT}" \
90 - --use-cpan-file-tail ${tailargs} \
91 - --config-file "${SWATCHDOGRC}" $1 "${SWATCHDOG_TAILFILE}"
92 - eend $?
93 -}
94 -
95 -parse_full() {
96 - gen_script --examine
97 - ebegin "Parsing complete file once"
98 - /usr/bin/perl ${SWATCHDOG_SCRIPT} 1>/dev/null
99 - eend $?
100 -}
101 -
102 -start() {
103 - checkpath -d -q -m 0750 -o root:root /run/swatchdog
104 - if [ "${PARSE_FULL}" = "YES" ]; then
105 - parse_full
106 - fi
107 - gen_script --tail-file
108 - ebegin "Starting swatchdog"
109 - start-stop-daemon --start --quiet --background \
110 - --make-pidfile --pidfile /run/swatchdog/swatchdog.pid \
111 - --stdout ${SWATCHDOG_LOGFILE} --stderr ${SWATCHDOG_ERRFILE} \
112 - --exec /usr/bin/perl -- ${SWATCHDOG_SCRIPT}
113 - eend $?
114 -}
115 -
116 -stop() {
117 - ebegin "Stopping swatchdog"
118 - start-stop-daemon --stop --exec /usr/bin/perl \
119 - --pidfile /run/swatchdog/swatchdog.pid --quiet
120 - eend $?
121 -}
122
123 diff --git a/app-admin/swatchdog/files/swatchdogrc b/app-admin/swatchdog/files/swatchdogrc
124 deleted file mode 100644
125 index 5132f855852b..000000000000
126 --- a/app-admin/swatchdog/files/swatchdogrc
127 +++ /dev/null
128 @@ -1,10 +0,0 @@
129 -#
130 -# A sample configuration file for swatchdog.
131 -#
132 -# See "man swatchdog" for details.
133 -
134 -# Mails root when invalid remote login attempted.
135 -watchfor /(.*) (.*) (.*) (.*) (.*):( [iI]nvalid [uU]ser )(.*)( from )(.*)$/
136 - threshold track_by=$9,type=limit,count=3,seconds=30
137 - mail root,subject="Invalid user"
138 -
139
140 diff --git a/app-admin/swatchdog/metadata.xml b/app-admin/swatchdog/metadata.xml
141 deleted file mode 100644
142 index 90990ad69a29..000000000000
143 --- a/app-admin/swatchdog/metadata.xml
144 +++ /dev/null
145 @@ -1,24 +0,0 @@
146 -<?xml version="1.0" encoding="UTF-8"?>
147 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
148 -<pkgmetadata>
149 - <!-- maintainer-needed -->
150 - <longdescription lang="en">
151 - swatchdog.pl started out as swatch, the "simple watchdog"
152 - for activity monitoring log files produced by UNIX's syslog
153 - facility. It has since been evolving into a utility that can
154 - monitor just about any type of log. The name has been changed
155 - to satisfy a request made by the old Swiss watch company.
156 - </longdescription>
157 - <longdescription lang="es">
158 - swatchdog.pl comenzó como swatch, el "simple perro guardián"
159 - para monitorizar la actividad en los ficheros de registro
160 - producidos por la característica syslog de los sistemas UNIX.
161 - Desde entonces ha evolucionado hacia una utilidad que puede
162 - monitorizar cualquier tipo de registro. Se ha cambiado el
163 - nombre del proyecto para satisfacer una petición realizada
164 - por la empresa de relojes suiza.
165 - </longdescription>
166 - <upstream>
167 - <remote-id type="sourceforge">swatch</remote-id>
168 - </upstream>
169 -</pkgmetadata>
170
171 diff --git a/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild b/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild
172 deleted file mode 100644
173 index d6766029f57a..000000000000
174 --- a/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild
175 +++ /dev/null
176 @@ -1,34 +0,0 @@
177 -# Copyright 1999-2019 Gentoo Authors
178 -# Distributed under the terms of the GNU General Public License v2
179 -
180 -EAPI=5
181 -
182 -inherit perl-module
183 -
184 -DESCRIPTION="Simple log watcher"
185 -HOMEPAGE="https://sourceforge.net/projects/swatch/"
186 -SRC_URI="mirror://sourceforge/swatch/${P}.tar.gz"
187 -
188 -LICENSE="GPL-2"
189 -SLOT="0"
190 -KEYWORDS="amd64 ppc x86"
191 -IUSE=""
192 -
193 -RDEPEND="dev-perl/Date-Manip
194 - dev-perl/Date-Calc
195 - dev-perl/File-Tail
196 - dev-perl/TimeDate
197 - >=virtual/perl-Time-HiRes-1.12
198 - !app-admin/swatch"
199 -
200 -src_install() {
201 - emake install
202 - newinitd "${FILESDIR}/${PN}-init" "${PN}"
203 - newconfd "${FILESDIR}/${PN}-confd" "${PN}"
204 - insinto /etc
205 - doins "${FILESDIR}/${PN}rc"
206 -
207 - # Clean up perl localpod and packlist (bug #620886)
208 - perl_delete_localpod
209 - perl_fix_packlist
210 -}
211
212 diff --git a/profiles/package.mask b/profiles/package.mask
213 index 996f424d2fb3..01744ec9249e 100644
214 --- a/profiles/package.mask
215 +++ b/profiles/package.mask
216 @@ -352,11 +352,6 @@ app-forensics/yasat
217 # Removal on 2021-11-22. Bug #819699.
218 app-admin/reportmagic
219
220 -# Jakov Smolić <jsmolic@g.o> (2021-10-23)
221 -# No maintainer, dead upstream, EAPI 5, no revdeps.
222 -# Removal on 2021-11-22. Bug #819693.
223 -app-admin/swatchdog
224 -
225 # Sergey Popov <pinkbyte@g.o> (2021-10-22)
226 # Upstream support discontinued, see https://bw.org/2019/03/19/bw-whois/
227 # Suggested replacement - net-misc/whois
228
229 diff --git a/profiles/updates/3Q-2016 b/profiles/updates/3Q-2016
230 index ca92a00e33c3..eaac5151829a 100644
231 --- a/profiles/updates/3Q-2016
232 +++ b/profiles/updates/3Q-2016
233 @@ -20,4 +20,3 @@ move dev-perl/data-buffer dev-perl/Data-Buffer
234 move dev-perl/dbix-searchbuilder dev-perl/DBIx-SearchBuilder
235 move dev-perl/digest-bubblebabble dev-perl/Digest-BubbleBabble
236 move dev-perl/digest-md2 dev-perl/Digest-MD2
237 -move app-admin/swatch app-admin/swatchdog