Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/logwatch/files/, sys-apps/logwatch/
Date: Sun, 29 Jan 2017 21:59:29
Message-Id: 1485727157.9873906d501f95c2c33e293942656b66b4970dee.jer@gentoo
1 commit: 9873906d501f95c2c33e293942656b66b4970dee
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 29 21:55:11 2017 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 29 21:59:17 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9873906d
7
8 sys-apps/logwatch: Old.
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 sys-apps/logwatch/Manifest | 2 -
13 .../files/logwatch-7.4.0-openssh-hpn.patch | 19 -----
14 sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild | 87 ----------------------
15 sys-apps/logwatch/logwatch-7.4.2.ebuild | 85 ---------------------
16 4 files changed, 193 deletions(-)
17
18 diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
19 index a7e7022..2925647 100644
20 --- a/sys-apps/logwatch/Manifest
21 +++ b/sys-apps/logwatch/Manifest
22 @@ -1,3 +1 @@
23 -DIST logwatch-7.4.0_p170.tar.gz 455794 SHA256 27f4ae2692190aa96a3af997d66b39a595e9c72e4a078cbdfa7c13f5c885a42f SHA512 6c07cfb20c0bd121b698b48f060d50b45e018b81b2ed78c96d33c5b8cb43fd23a139cf95c64af9c3148c99fe1f9e9d2c0936e1d2ab6dfba105e4ad621db2fcdb WHIRLPOOL 6af221787ce7d71f0c238fbb18d3b272cfe42cb18a3a24a70fbf617f2a6d39fd41d4978dd2c8b67687fa003594300e4beb2fc0b2f0c2425cc1c6fd1d501cda50
24 -DIST logwatch-7.4.2.tar.gz 491073 SHA256 006e122a1973bb12b92eb79622ebc93716ec0766a6987e73b4ae5387509e5ade SHA512 aed19220ccbe70a39148e0cdcfe421e7cf744d06d01e4decc88980f3e9e97f85f1cc40aee9a8857fb123a41ffb001afa75eeccdfcdc001073057d39a01875cb2 WHIRLPOOL 1b05288e4af8f0a608aa658df43a351dec6b958f77b0646d2eb45d8349ad7c5030327745a2a8ebc1e2e432dc74abf20a1303f266ef97cf24f89b74bef5cb141f
25 DIST logwatch-7.4.3.tar.gz 462552 SHA256 1dbdc48d65e150f2dbb43f1e4f4700d94166e053b1c7bbbdedf4ad670283720e SHA512 716d87238f487010f2bdf230fc66c16f3c3fe769e6bef04b0e7881c6b0563e1a4b4741235b8a40a16ab21d3803562e87e6bcf5cfbd0ace42414f1d1feae7a13a WHIRLPOOL abe7870020029f86f037f4c96dff96b6c542eb36df9f110c755d6de28965c6418dd4d03a2e6932ff8db7079f22ea396d352aa6b8ebba81576b588017b4694d02
26
27 diff --git a/sys-apps/logwatch/files/logwatch-7.4.0-openssh-hpn.patch b/sys-apps/logwatch/files/logwatch-7.4.0-openssh-hpn.patch
28 deleted file mode 100644
29 index 4c87ade..00000000
30 --- a/sys-apps/logwatch/files/logwatch-7.4.0-openssh-hpn.patch
31 +++ /dev/null
32 @@ -1,19 +0,0 @@
33 -Add an 'ignore' line for the HPN patch that we enable on our openssh
34 -by default.
35 -
36 -https://sourceforge.net/tracker/?func=detail&aid=3257504&group_id=312875&atid=1316824
37 -
38 -diff --git a/scripts/services/sshd b/scripts/services/sshd
39 -index a4c3354..50e8cf2 100755
40 ---- a/scripts/services/sshd
41 -+++ b/scripts/services/sshd
42 -@@ -290,7 +290,8 @@ while (defined(my $ThisLine = <STDIN>)) {
43 - ($ThisLine =~ /^Failed keyboard-interactive for <invalid username> from/ ) or
44 - ($ThisLine =~ /^Keyboard-interactive \(PAM\) userauth failed/ ) or
45 - ($ThisLine =~ /^debug1: /) or
46 -- ($ThisLine =~ /Nasty PTR record .* is set up for [\da-fA-F.:]+, ignoring/)
47 -+ ($ThisLine =~ /Nasty PTR record .* is set up for [\da-fA-F.:]+, ignoring/) or
48 -+ ($ThisLine =~ /^SSH: Server;L[Tt]ype: /)
49 - ) {
50 - # Ignore these
51 - } elsif ( my ($Method,$User,$Host,$Port) = ($ThisLine =~ /^Accepted (\S+) for (\S+) from ([\d\.:a-f]+) port (\d+)/) ) {
52
53 diff --git a/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild b/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild
54 deleted file mode 100644
55 index 126299e..00000000
56 --- a/sys-apps/logwatch/logwatch-7.4.0_p170-r1.ebuild
57 +++ /dev/null
58 @@ -1,87 +0,0 @@
59 -# Copyright 1999-2016 Gentoo Foundation
60 -# Distributed under the terms of the GNU General Public License v2
61 -# $Id$
62 -
63 -EAPI=5
64 -
65 -inherit eutils
66 -
67 -DESCRIPTION="Analyzes and Reports on system logs"
68 -HOMEPAGE="http://www.logwatch.org/"
69 -#SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
70 -SRC_URI="https://dev.gentoo.org/~polynomial-c/${P}.tar.gz"
71 -
72 -LICENSE="MIT"
73 -SLOT="0"
74 -KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
75 -IUSE=""
76 -
77 -DEPEND=""
78 -RDEPEND="virtual/cron
79 - virtual/mta
80 - virtual/mailx
81 - dev-lang/perl
82 - dev-perl/Date-Calc
83 - dev-perl/Date-Manip
84 - dev-perl/Tie-IxHash
85 - dev-perl/Sys-CPU
86 - dev-perl/Sys-MemInfo"
87 -
88 -src_prepare() {
89 - epatch "${FILESDIR}/${P/_p*}-openssh-hpn.patch"
90 -}
91 -
92 -src_install() {
93 - dodir /usr/share/logwatch/lib
94 - dodir /usr/share/logwatch/scripts/services
95 - dodir /usr/share/logwatch/scripts/shared
96 - dodir /usr/share/logwatch/default.conf/logfiles
97 - dodir /usr/share/logwatch/default.conf/services
98 - dodir /usr/share/logwatch/default.conf/html
99 - keepdir /etc/logwatch
100 - keepdir /var/cache/logwatch
101 -
102 - newsbin scripts/logwatch.pl logwatch.pl
103 -
104 - for i in scripts/logfiles/* ; do
105 - exeinto /usr/share/logwatch/$i
106 - doexe $i/*
107 - done
108 -
109 - exeinto /usr/share/logwatch/lib
110 - doexe lib/*.pm
111 -
112 - exeinto /usr/share/logwatch/scripts/services
113 - doexe scripts/services/*
114 -
115 - exeinto /usr/share/logwatch/scripts/shared
116 - doexe scripts/shared/*
117 -
118 - insinto /usr/share/logwatch/default.conf
119 - doins conf/logwatch.conf
120 -
121 - insinto /usr/share/logwatch/default.conf/logfiles
122 - doins conf/logfiles/*
123 -
124 - insinto /usr/share/logwatch/default.conf/services
125 - doins conf/services/*
126 -
127 - insinto /usr/share/logwatch/default.conf/html
128 - doins conf/html/*
129 -
130 - # Make sure logwatch is run before anything else #100243
131 - exeinto /etc/cron.daily
132 - newexe "${FILESDIR}"/logwatch 00-logwatch
133 -
134 - doman logwatch.8
135 - dodoc README HOWTO-Customize-LogWatch
136 -}
137 -
138 -pkg_postinst() {
139 - if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
140 - local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
141 - [[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
142 - && rm -f "${ROOT}"/etc/cron.daily/logwatch \
143 - || ewarn "You have two logwatch files in /etc/cron.daily/"
144 - fi
145 -}
146
147 diff --git a/sys-apps/logwatch/logwatch-7.4.2.ebuild b/sys-apps/logwatch/logwatch-7.4.2.ebuild
148 deleted file mode 100644
149 index 454da10..00000000
150 --- a/sys-apps/logwatch/logwatch-7.4.2.ebuild
151 +++ /dev/null
152 @@ -1,85 +0,0 @@
153 -# Copyright 1999-2016 Gentoo Foundation
154 -# Distributed under the terms of the GNU General Public License v2
155 -# $Id$
156 -
157 -EAPI=5
158 -
159 -inherit eutils
160 -
161 -DESCRIPTION="Analyzes and Reports on system logs"
162 -HOMEPAGE="http://www.logwatch.org/"
163 -SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
164 -
165 -LICENSE="MIT"
166 -SLOT="0"
167 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
168 -IUSE=""
169 -
170 -DEPEND=""
171 -RDEPEND="virtual/cron
172 - virtual/mta
173 - virtual/mailx
174 - dev-lang/perl
175 - dev-perl/Date-Calc
176 - dev-perl/Date-Manip
177 - dev-perl/Tie-IxHash
178 - dev-perl/Sys-CPU
179 - dev-perl/Sys-MemInfo"
180 -
181 -src_prepare() {
182 - epatch "${FILESDIR}"/${PN}-7.4.2-openssh-hpn.patch
183 -}
184 -
185 -src_install() {
186 - dodir /usr/share/logwatch/lib
187 - dodir /usr/share/logwatch/scripts/services
188 - dodir /usr/share/logwatch/scripts/shared
189 - dodir /usr/share/logwatch/default.conf/logfiles
190 - dodir /usr/share/logwatch/default.conf/services
191 - dodir /usr/share/logwatch/default.conf/html
192 - keepdir /etc/logwatch
193 -
194 - newsbin scripts/logwatch.pl logwatch.pl
195 -
196 - exeinto /usr/share/logwatch/lib
197 - doexe lib/*.pm
198 -
199 - exeinto /usr/share/logwatch/scripts/services
200 - doexe scripts/services/*
201 -
202 - exeinto /usr/share/logwatch/scripts/shared
203 - doexe scripts/shared/*
204 -
205 - insinto /usr/share/logwatch/default.conf
206 - doins conf/logwatch.conf
207 -
208 - insinto /usr/share/logwatch/default.conf/logfiles
209 - doins conf/logfiles/*
210 -
211 - insinto /usr/share/logwatch/default.conf/services
212 - doins conf/services/*
213 -
214 - insinto /usr/share/logwatch/default.conf/html
215 - doins conf/html/*
216 -
217 - # Make sure logwatch is run before anything else #100243
218 - exeinto /etc/cron.daily
219 - newexe "${FILESDIR}"/logwatch 00-logwatch
220 -
221 - doman logwatch.8
222 - dodoc README HOWTO-Customize-LogWatch
223 -
224 - # Do last due to insopts modification.
225 - insinto /usr/share/logwatch/scripts/logfiles
226 - insopts -m755
227 - doins -r scripts/logfiles/*
228 -}
229 -
230 -pkg_postinst() {
231 - if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
232 - local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
233 - [[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
234 - && rm -f "${ROOT}"/etc/cron.daily/logwatch \
235 - || ewarn "You have two logwatch files in /etc/cron.daily/"
236 - fi
237 -}