Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/assp/
Date: Sun, 03 Jun 2018 02:59:23
Message-Id: 1527994734.591a6deb45dfb31acdd7b8ede9e52b159055902f.bman@gentoo
1 commit: 591a6deb45dfb31acdd7b8ede9e52b159055902f
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 3 00:33:07 2018 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 3 02:58:54 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=591a6deb
7
8 mail-filter/assp: drop old EAPI
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 mail-filter/assp/Manifest | 2 -
13 mail-filter/assp/assp-1.9.4.7.ebuild | 179 -----------------------------------
14 mail-filter/assp/assp-1.9.4.8.ebuild | 179 -----------------------------------
15 3 files changed, 360 deletions(-)
16
17 diff --git a/mail-filter/assp/Manifest b/mail-filter/assp/Manifest
18 index 58a0a3c4b6e..061ebe43b4f 100644
19 --- a/mail-filter/assp/Manifest
20 +++ b/mail-filter/assp/Manifest
21 @@ -1,5 +1,3 @@
22 DIST ASSP_1.8.5.9-Install.zip 750552 BLAKE2B 6118ce4c66990632a7915a4fc9b13b89ec3aaf4893c911d87c9b541ea55d7d71ed97bdd5337128cba04e0e4f95eff824679dc792d2085633628cf9bb357965f9 SHA512 146f86b8ddd235cca784057a73ae45395d4dc81591001f28a63275e6cf0e234145086029f112953e26aa8433ba434002e5ca85acc2e63af1615e7b9f58764f1c
23 -DIST ASSP_1.9.4.7-Install.zip 1461151 BLAKE2B 243d7a9457c8562dcebd396d0c97697c36915fc741f287bb82df35e830d8346a8e48f7c7824428e915f55b2cf72715788af5bbb5681c223249777cbb9ef43b0a SHA512 02083320630831fee048e13d6101dd844aceadddf36a5f2b5bff6f203d67be2e456fb992a71e903a9dace48992962a6d26f90998025b8666e24f3f4aaec76cfc
24 -DIST ASSP_1.9.4.8-Install.zip 1462121 BLAKE2B 6f156a45c357fbebcbe180e90716c0c5ccb00c7633f3bf5c5db8da76763a2153b53d501d1152bff92f1bde2b16f1fc4bcdd9b682600d251ad35876e93e4099e8 SHA512 4888bfb4e8577608ee638391c6c9f38901f70e60fa29829d0f5a56102f13ba08b8363d9041bfb64d9d238526bc4051d5d97faddd6d819909d6dd4e6aa0a96225
25 DIST ASSP_1.9.4.9-Install.zip 1461140 BLAKE2B ce79146c42a2c48da125b603dc1084688baf4dc020a5fc4e8305a7afd5467f2e2a978d2fdc2e06055e8f7ab94a9a8b11b7ec40cf23f566dd8a76f9c8c21b2ccb SHA512 a049a8e36193aee12c7abc7bbfdc41a92a7a33f6f01f7e6cded406f1f84ddf3c514808ca1c4c6a25c3a441b3a2792b4451ca218021bb09dad508a56434c8656b
26 DIST ASSP_1.98_13030_install.zip 874117 BLAKE2B c23e51dea63a9ecfa94a4110dbe4cd7dee44faf89107a0f1ba72441acbd28cf7a09928c1a2f0b5e39f7e47d5a197651740c82e0a6ec8ddd61f7bd29b3354b954 SHA512 46c067c9ffe98f860669166fca69346c974bc82a1c0a5046f607aae8344fe18d41f7a87c2f79bdfcaa24c6233a88a590031deab66c76d42fee78fec64dc2a2a1
27
28 diff --git a/mail-filter/assp/assp-1.9.4.7.ebuild b/mail-filter/assp/assp-1.9.4.7.ebuild
29 deleted file mode 100644
30 index 28803fea46c..00000000000
31 --- a/mail-filter/assp/assp-1.9.4.7.ebuild
32 +++ /dev/null
33 @@ -1,179 +0,0 @@
34 -# Copyright 1999-2018 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=0
38 -
39 -inherit eutils user
40 -
41 -DESCRIPTION="Anti-Spam SMTP Proxy written in Perl"
42 -HOMEPAGE="http://assp.sourceforge.net/"
43 -MY_PN=ASSP_${PV}-Install
44 -SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip"
45 -LICENSE="GPL-2"
46 -SLOT="0"
47 -
48 -# this is a pre-release, so no keywords for now
49 -KEYWORDS="~amd64 ~x86"
50 -
51 -IUSE="ipv6 ldap sasl spf srs ssl syslog"
52 -
53 -DEPEND="app-arch/unzip"
54 -
55 -RDEPEND="dev-lang/perl
56 - dev-perl/Net-DNS
57 - dev-perl/File-ReadBackwards
58 - virtual/perl-IO-Compress
59 - dev-perl/Email-MIME
60 - dev-perl/Email-Send
61 - dev-perl/Email-Valid
62 - dev-perl/libwww-perl
63 - dev-perl/mime-construct
64 - dev-perl/Net-CIDR-Lite
65 - virtual/perl-Digest-MD5
66 - virtual/perl-Time-HiRes
67 - ipv6? ( dev-perl/IO-Socket-INET6 )
68 - sasl? ( dev-perl/Authen-SASL )
69 - spf? ( dev-perl/Mail-SPF )
70 - srs? ( dev-perl/Mail-SRS )
71 - ssl? ( dev-perl/IO-Socket-SSL )
72 - syslog? ( virtual/perl-Sys-Syslog )
73 - ldap? ( dev-perl/perl-ldap )"
74 -
75 -S=${WORKDIR}/${MY_PN}/ASSP
76 -
77 -pkg_setup() {
78 - enewgroup assp
79 - enewuser assp -1 -1 /dev/null assp
80 -}
81 -
82 -src_unpack() {
83 - unpack ${A}
84 - cd "${S}"
85 -
86 - local FILES="
87 - assp.pl
88 - rebuildspamdb.pl
89 - stat.pl
90 - "
91 - # just being safe
92 - for file in ${FILES}; do
93 - edos2unix ${file}
94 - done
95 -
96 - # portable changes via sed vs patch
97 - sed -i -e 's|file:files/|file:/etc/assp/|' \
98 - -e 's|$base/images|/usr/share/assp/images|' \
99 - -e 's|logs/maillog.txt|/var/log/assp/maillog.txt|' \
100 - -e 's|PID File'\'',40,textinput,'\''pid'\''|PID File'\'',40,textinput,'\''asspd.pid'\''|' \
101 - -e 's|Daemon\*\*'\'',0,checkbox,0|Daemon\*\*'\'',0,checkbox,1|' \
102 - -e 's|UID\*\*'\'',20,textinput,'\'''\''|UID\*\*'\'',20,textinput,'\''assp'\''|' \
103 - -e 's|GID\*\*'\'',20,textinput,'\'''\''|GID\*\*'\'',20,textinput,'\''assp'\''|' \
104 - -e 's|popFileEditor'\('\\'\''pb/pbdb\.\([^\.]*\)\.db\\'\'',|popFileEditor(\\'\''/var/lib/assp/pb/pbdb.\1.db\\'\'',|g' \
105 - -e 's|$base/assp.cfg|/etc/assp/assp.cfg|g' \
106 - -e 's|$base/$pidfile|/var/run/assp/asspd.pid|' \
107 - -e 's|mkdir "$base/$logdir",0700 if $logdir;||' \
108 - -e 's|mkdir "$base/$logdir",0700;||' \
109 - -e 's|$base/$logfile|$logfile|' \
110 - -e 's|$base/$logdir|$logdir|' \
111 - -e 's|"maillog.log"|"/var/log/assp/maillog.log"|' \
112 - -e 's|-d "$base/logs" or mkdir "$base/logs",0700;||' \
113 - -e 's|-d "$base/notes" or mkdir "$base/notes",0700;||' \
114 - -e 's|-d "$base/docs" or mkdir "$base/docs",0777;||' \
115 - -e 's|$base/$archivelogfile|$archivelogfile|' \
116 - -e 's|"$base/$file",$sub,"$this|"/etc/assp/$file",$sub,"$this|' \
117 - -e 's|"$base/$file",'\'''\'',"$this|"/etc/assp/$file",'\'''\'',"$this|' \
118 - -e 's|my $fil=$1; $fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|my $fil=$1;|' \
119 - -e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\/etc\\/assp\\/\|\\/var\\/lib\\/assp\\/\/i;|' \
120 - -e 's|$fil="$base/$fil" if $fil!~/^((\[a-z\]:)?\[\\/\\\\\]\|\\Q$base\\E)/;||' \
121 - -e 's|if ($fil !~ /^\\Q$base\\E/i) {|if ($fil !~ /^\\/usr\\/share\\/assp\\//i) {|' \
122 - -e 's|$fil = "$base/$fil";|$fil = "/usr/share/assp/$fil";|' \
123 - -e 's|Q$base\\E|Q\\/etc\\/assp\\/\\E|' \
124 - -e 's|$fil="$base/$fil"|$fil="/etc/assp/$fil"|' \
125 - -e 's|$base/$bf|/etc/assp/$bf|g' \
126 - -e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
127 - assp.pl || die
128 -
129 - # sed rebuildspamdb.pl
130 - sed -i -e 's|assp.cfg|/etc/assp/assp.cfg|' \
131 - -e 's|} && "$Config{base}/$Config{logfile}" \|\| '\''maillog.txt'\'';|};|' \
132 - -e 's|tmaxtick('\''rebuild'\'');|tmaxtick('\''/var/lib/assp/rebuild'\'');|' \
133 - -e 's|goodhosts|/var/lib/assp/goodhosts|g' \
134 - -e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
135 - -e 's|$base/$DropList|$DropList|' \
136 - -e 's|&fixPath($base) . "/|"|' \
137 - -e 's|= "/var/lib/assp/rebuildrun.txt";|= "/var/lib/assp/rebuildrun.txt";\n $RebuildLog = "/var/lib/assp/rebuild.log";|' \
138 - -e 's|"$base//|"/|g' \
139 - rebuildspamdb.pl || die
140 -
141 - # remove windows stuff
142 - rm "${S}/addservice.pl" || die "Could not remove ${S}/addservice.pl"
143 - rm -f "${S}/Win32-quickstart-guide.txt" || die "Could not remove ${S}/Win32-quickstart-guide.txt"
144 -}
145 -
146 -src_install() {
147 - # Configuration directory
148 - dodir /etc/assp/notes
149 -
150 - insinto /etc/assp
151 - # Installs files that are used by assp for black/gray lists,
152 - # and domain country lookup. To be changed by admin as needed.
153 - doins files/*.txt || die
154 -
155 - fowners assp:assp /etc/assp -R
156 - fperms 770 /etc/assp /etc/assp/notes
157 -
158 - # Setup directories for mail to be stored for filter
159 - keepdir /var/lib/assp/spam /var/lib/assp/notspam
160 - keepdir /var/lib/assp/errors/spam /var/lib/assp/errors/notspam
161 -
162 - # Logs directory
163 - keepdir /var/log/assp
164 - fowners assp:assp -R /var/log/assp
165 - fperms 770 /var/log/assp
166 -
167 - # Install the app
168 - exeinto /usr/share/assp
169 - doexe *.pl *.sh || die
170 - insinto /usr/share/assp
171 - doins -r images/ || die
172 -
173 - # Lock down the files/data
174 - fowners assp:assp -R /usr/share/assp
175 - fperms 770 /usr/share/assp
176 -
177 - # Data storage
178 - fowners assp:assp -R /var/lib/assp
179 - fperms 770 /var/lib/assp
180 -
181 - # PID directory
182 - dodir /var/run/assp
183 - keepdir /var/run/assp
184 - fowners assp:assp -R /var/run/assp
185 - fperms 770 /var/run/assp
186 -
187 - # Install the init.d script to listen
188 - newinitd "${FILESDIR}/asspd.init" asspd
189 -
190 - dohtml docs/*.htm || die "Failed to install html docs"
191 -}
192 -
193 -pkg_postinst() {
194 - elog
195 - elog "To configure ASSP, start /etc/init.d/asspd then point"
196 - elog "your browser to http://localhost:55555"
197 - elog "Username: admin Password: nospam4me (CHANGE ASAP!)"
198 - elog
199 - elog "File permissions have been set to use assp:assp"
200 - elog "with mode 770 on directories. When you configure"
201 - elog "ASSP, make sure and use the user assp."
202 - elog
203 - elog "Don't change any path related options."
204 - elog
205 - elog "See the on-line docs for a complete tutorial."
206 - elog "http://assp.sourceforge.net/docs.html"
207 - elog
208 - elog "If upgrading, please update your old config to set both"
209 - elog "redre.txt and nodelay.txt path of /etc/assp. There are"
210 - elog "also many new options that you should review."
211 - elog
212 -}
213
214 diff --git a/mail-filter/assp/assp-1.9.4.8.ebuild b/mail-filter/assp/assp-1.9.4.8.ebuild
215 deleted file mode 100644
216 index 28803fea46c..00000000000
217 --- a/mail-filter/assp/assp-1.9.4.8.ebuild
218 +++ /dev/null
219 @@ -1,179 +0,0 @@
220 -# Copyright 1999-2018 Gentoo Foundation
221 -# Distributed under the terms of the GNU General Public License v2
222 -
223 -EAPI=0
224 -
225 -inherit eutils user
226 -
227 -DESCRIPTION="Anti-Spam SMTP Proxy written in Perl"
228 -HOMEPAGE="http://assp.sourceforge.net/"
229 -MY_PN=ASSP_${PV}-Install
230 -SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip"
231 -LICENSE="GPL-2"
232 -SLOT="0"
233 -
234 -# this is a pre-release, so no keywords for now
235 -KEYWORDS="~amd64 ~x86"
236 -
237 -IUSE="ipv6 ldap sasl spf srs ssl syslog"
238 -
239 -DEPEND="app-arch/unzip"
240 -
241 -RDEPEND="dev-lang/perl
242 - dev-perl/Net-DNS
243 - dev-perl/File-ReadBackwards
244 - virtual/perl-IO-Compress
245 - dev-perl/Email-MIME
246 - dev-perl/Email-Send
247 - dev-perl/Email-Valid
248 - dev-perl/libwww-perl
249 - dev-perl/mime-construct
250 - dev-perl/Net-CIDR-Lite
251 - virtual/perl-Digest-MD5
252 - virtual/perl-Time-HiRes
253 - ipv6? ( dev-perl/IO-Socket-INET6 )
254 - sasl? ( dev-perl/Authen-SASL )
255 - spf? ( dev-perl/Mail-SPF )
256 - srs? ( dev-perl/Mail-SRS )
257 - ssl? ( dev-perl/IO-Socket-SSL )
258 - syslog? ( virtual/perl-Sys-Syslog )
259 - ldap? ( dev-perl/perl-ldap )"
260 -
261 -S=${WORKDIR}/${MY_PN}/ASSP
262 -
263 -pkg_setup() {
264 - enewgroup assp
265 - enewuser assp -1 -1 /dev/null assp
266 -}
267 -
268 -src_unpack() {
269 - unpack ${A}
270 - cd "${S}"
271 -
272 - local FILES="
273 - assp.pl
274 - rebuildspamdb.pl
275 - stat.pl
276 - "
277 - # just being safe
278 - for file in ${FILES}; do
279 - edos2unix ${file}
280 - done
281 -
282 - # portable changes via sed vs patch
283 - sed -i -e 's|file:files/|file:/etc/assp/|' \
284 - -e 's|$base/images|/usr/share/assp/images|' \
285 - -e 's|logs/maillog.txt|/var/log/assp/maillog.txt|' \
286 - -e 's|PID File'\'',40,textinput,'\''pid'\''|PID File'\'',40,textinput,'\''asspd.pid'\''|' \
287 - -e 's|Daemon\*\*'\'',0,checkbox,0|Daemon\*\*'\'',0,checkbox,1|' \
288 - -e 's|UID\*\*'\'',20,textinput,'\'''\''|UID\*\*'\'',20,textinput,'\''assp'\''|' \
289 - -e 's|GID\*\*'\'',20,textinput,'\'''\''|GID\*\*'\'',20,textinput,'\''assp'\''|' \
290 - -e 's|popFileEditor'\('\\'\''pb/pbdb\.\([^\.]*\)\.db\\'\'',|popFileEditor(\\'\''/var/lib/assp/pb/pbdb.\1.db\\'\'',|g' \
291 - -e 's|$base/assp.cfg|/etc/assp/assp.cfg|g' \
292 - -e 's|$base/$pidfile|/var/run/assp/asspd.pid|' \
293 - -e 's|mkdir "$base/$logdir",0700 if $logdir;||' \
294 - -e 's|mkdir "$base/$logdir",0700;||' \
295 - -e 's|$base/$logfile|$logfile|' \
296 - -e 's|$base/$logdir|$logdir|' \
297 - -e 's|"maillog.log"|"/var/log/assp/maillog.log"|' \
298 - -e 's|-d "$base/logs" or mkdir "$base/logs",0700;||' \
299 - -e 's|-d "$base/notes" or mkdir "$base/notes",0700;||' \
300 - -e 's|-d "$base/docs" or mkdir "$base/docs",0777;||' \
301 - -e 's|$base/$archivelogfile|$archivelogfile|' \
302 - -e 's|"$base/$file",$sub,"$this|"/etc/assp/$file",$sub,"$this|' \
303 - -e 's|"$base/$file",'\'''\'',"$this|"/etc/assp/$file",'\'''\'',"$this|' \
304 - -e 's|my $fil=$1; $fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|my $fil=$1;|' \
305 - -e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\/etc\\/assp\\/\|\\/var\\/lib\\/assp\\/\/i;|' \
306 - -e 's|$fil="$base/$fil" if $fil!~/^((\[a-z\]:)?\[\\/\\\\\]\|\\Q$base\\E)/;||' \
307 - -e 's|if ($fil !~ /^\\Q$base\\E/i) {|if ($fil !~ /^\\/usr\\/share\\/assp\\//i) {|' \
308 - -e 's|$fil = "$base/$fil";|$fil = "/usr/share/assp/$fil";|' \
309 - -e 's|Q$base\\E|Q\\/etc\\/assp\\/\\E|' \
310 - -e 's|$fil="$base/$fil"|$fil="/etc/assp/$fil"|' \
311 - -e 's|$base/$bf|/etc/assp/$bf|g' \
312 - -e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
313 - assp.pl || die
314 -
315 - # sed rebuildspamdb.pl
316 - sed -i -e 's|assp.cfg|/etc/assp/assp.cfg|' \
317 - -e 's|} && "$Config{base}/$Config{logfile}" \|\| '\''maillog.txt'\'';|};|' \
318 - -e 's|tmaxtick('\''rebuild'\'');|tmaxtick('\''/var/lib/assp/rebuild'\'');|' \
319 - -e 's|goodhosts|/var/lib/assp/goodhosts|g' \
320 - -e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
321 - -e 's|$base/$DropList|$DropList|' \
322 - -e 's|&fixPath($base) . "/|"|' \
323 - -e 's|= "/var/lib/assp/rebuildrun.txt";|= "/var/lib/assp/rebuildrun.txt";\n $RebuildLog = "/var/lib/assp/rebuild.log";|' \
324 - -e 's|"$base//|"/|g' \
325 - rebuildspamdb.pl || die
326 -
327 - # remove windows stuff
328 - rm "${S}/addservice.pl" || die "Could not remove ${S}/addservice.pl"
329 - rm -f "${S}/Win32-quickstart-guide.txt" || die "Could not remove ${S}/Win32-quickstart-guide.txt"
330 -}
331 -
332 -src_install() {
333 - # Configuration directory
334 - dodir /etc/assp/notes
335 -
336 - insinto /etc/assp
337 - # Installs files that are used by assp for black/gray lists,
338 - # and domain country lookup. To be changed by admin as needed.
339 - doins files/*.txt || die
340 -
341 - fowners assp:assp /etc/assp -R
342 - fperms 770 /etc/assp /etc/assp/notes
343 -
344 - # Setup directories for mail to be stored for filter
345 - keepdir /var/lib/assp/spam /var/lib/assp/notspam
346 - keepdir /var/lib/assp/errors/spam /var/lib/assp/errors/notspam
347 -
348 - # Logs directory
349 - keepdir /var/log/assp
350 - fowners assp:assp -R /var/log/assp
351 - fperms 770 /var/log/assp
352 -
353 - # Install the app
354 - exeinto /usr/share/assp
355 - doexe *.pl *.sh || die
356 - insinto /usr/share/assp
357 - doins -r images/ || die
358 -
359 - # Lock down the files/data
360 - fowners assp:assp -R /usr/share/assp
361 - fperms 770 /usr/share/assp
362 -
363 - # Data storage
364 - fowners assp:assp -R /var/lib/assp
365 - fperms 770 /var/lib/assp
366 -
367 - # PID directory
368 - dodir /var/run/assp
369 - keepdir /var/run/assp
370 - fowners assp:assp -R /var/run/assp
371 - fperms 770 /var/run/assp
372 -
373 - # Install the init.d script to listen
374 - newinitd "${FILESDIR}/asspd.init" asspd
375 -
376 - dohtml docs/*.htm || die "Failed to install html docs"
377 -}
378 -
379 -pkg_postinst() {
380 - elog
381 - elog "To configure ASSP, start /etc/init.d/asspd then point"
382 - elog "your browser to http://localhost:55555"
383 - elog "Username: admin Password: nospam4me (CHANGE ASAP!)"
384 - elog
385 - elog "File permissions have been set to use assp:assp"
386 - elog "with mode 770 on directories. When you configure"
387 - elog "ASSP, make sure and use the user assp."
388 - elog
389 - elog "Don't change any path related options."
390 - elog
391 - elog "See the on-line docs for a complete tutorial."
392 - elog "http://assp.sourceforge.net/docs.html"
393 - elog
394 - elog "If upgrading, please update your old config to set both"
395 - elog "redre.txt and nodelay.txt path of /etc/assp. There are"
396 - elog "also many new options that you should review."
397 - elog
398 -}