Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/, ...
Date: Tue, 18 Apr 2017 15:09:07
Message-Id: 1492528119.52c8ac4c90ed78a2aafba0e0da21e4c2dc33ef11.mgorny@gentoo
1 commit: 52c8ac4c90ed78a2aafba0e0da21e4c2dc33ef11
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 18 15:00:38 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 18 15:08:39 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52c8ac4c
7
8 dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing: Remove last-rited pkg, #336898
9
10 ...ssin-Plugin-GoogleSafeBrowsing-1.30.0-r1.ebuild | 48 ----------------------
11 .../Manifest | 1 -
12 .../files/24_google_safebrowsing.cf | 17 --------
13 .../files/init_google_safebrowsing.pre | 2 -
14 .../files/update_google_safebrowsing.cron | 4 --
15 .../files/update_google_safebrowsing.sh | 20 ---------
16 .../metadata.xml | 16 --------
17 profiles/package.mask | 1 -
18 8 files changed, 109 deletions(-)
19
20 diff --git a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing-1.30.0-r1.ebuild b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing-1.30.0-r1.ebuild
21 deleted file mode 100644
22 index 0533f35c930..00000000000
23 --- a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing-1.30.0-r1.ebuild
24 +++ /dev/null
25 @@ -1,48 +0,0 @@
26 -# Copyright 1999-2014 Gentoo Foundation
27 -# Distributed under the terms of the GNU General Public License v2
28 -
29 -EAPI=5
30 -
31 -MODULE_AUTHOR=DANBORN
32 -MODULE_VERSION=1.03
33 -inherit perl-module
34 -
35 -DESCRIPTION="SpamAssassin plugin to score mail based on Google blocklists"
36 -
37 -LICENSE="Apache-2.0"
38 -SLOT="0"
39 -KEYWORDS="~amd64 ~x86 ~ppc"
40 -IUSE="test"
41 -
42 -RDEPEND="dev-perl/Net-Google-SafeBrowsing-Blocklist
43 - dev-perl/Net-Google-SafeBrowsing-UpdateRequest
44 - mail-filter/spamassassin"
45 -DEPEND="${RDEPEND}
46 - test? ( dev-perl/Test-Pod )"
47 -
48 -SRC_TEST="do"
49 -
50 -src_install() {
51 - perl-module_src_install
52 - insinto /etc/mail/spamassassin
53 - doins "${FILESDIR}"/init_google_safebrowsing.pre
54 - doins "${FILESDIR}"/24_google_safebrowsing.cf
55 - insinto /etc/cron.d/
56 - newins "${FILESDIR}"/update_google_safebrowsing.cron update_google_safebrowsing
57 - dosbin "${FILESDIR}"/update_google_safebrowsing.sh
58 - keepdir /var/lib/spamassassin/google_safebrowsing/
59 -}
60 -
61 -pkg_postinst() {
62 - if [[ -f ${ROOT}/etc/cron.d/update_google_safebrowsing.sh ]]; then
63 - ewarn "You MUST remove ${ROOT}/etc/cron.d/update_google_safebrowsing.sh"
64 - fi
65 - elog "To use this package:"
66 - elog "1. You MUST apply for a free apikey at:"
67 - elog " https://code.google.com/apis/safebrowsing/key_signup.html"
68 - elog "2. Place the key into /etc/mail/spamassassin/24_google_safebrowsing.cf"
69 - elog "3. Manually run the script /usr/sbin/update_google_safebrowsing.sh"
70 - elog "4. Enable the plugin by uncommenting the loadplugin entry in"
71 - elog " /etc/mail/spamassassin/init_google_safebrowsing.pre"
72 - elog "5. Restart spamd"
73 -}
74
75 diff --git a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/Manifest b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/Manifest
76 deleted file mode 100644
77 index 8117645c933..00000000000
78 --- a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/Manifest
79 +++ /dev/null
80 @@ -1 +0,0 @@
81 -DIST Mail-SpamAssassin-Plugin-GoogleSafeBrowsing-1.03.tar.gz 4253 SHA256 39d1ddc4f539411a1c34cd96f6d0a84b4f4651c2aa08b7e596a09d4b1b718fa7 SHA512 aba284dd20d37ea502e30b9d1f2a83b3fc43749b5b2853d7fa3f651b9c406e6385d90dcaf12d8a632902aa6ffdb6ad627e4bf31a8cdd4ad850f7552d1ad7f14f WHIRLPOOL 231dbd88fca9ce61e5e6009837ed04c25454b9ce6b8d093cc12a69cf3f848ed7da1f1b32bf8f153f2d68d9f3f6256aff2b54f050bb3f599d940c23c4e283a942
82
83 diff --git a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/24_google_safebrowsing.cf b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/24_google_safebrowsing.cf
84 deleted file mode 100644
85 index b1c97973bab..00000000000
86 --- a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/24_google_safebrowsing.cf
87 +++ /dev/null
88 @@ -1,17 +0,0 @@
89 -ifplugin Mail::SpamAssassin::Plugin::GoogleSafeBrowsing
90 -
91 -# Replace DEADBEEF with your API key
92 -# from http://code.google.com/apis/safebrowsing/key_signup.html
93 -google_safebrowsing_apikey DEADBEEF
94 -
95 -# Change these scores if you want
96 -google_safebrowsing_blocklist goog-black-hash 0.2
97 -google_safebrowsing_blocklist goog-malware-hash 0.1
98 -
99 -# Do not change these two lines!
100 -body GOOGLE_SAFEBROWSING eval:check_google_safebrowsing_blocklists()
101 -google_safebrowsing_dir /var/lib/spamassassin/google_safebrowsing/
102 -
103 -endif # Mail::SpamAssassin::Plugin::GoogleSafeBrowsing
104 -
105 -# vim: ft=conf:
106
107 diff --git a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/init_google_safebrowsing.pre b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/init_google_safebrowsing.pre
108 deleted file mode 100644
109 index 67e76e3a5ac..00000000000
110 --- a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/init_google_safebrowsing.pre
111 +++ /dev/null
112 @@ -1,2 +0,0 @@
113 -# You need to uncomment this after you have an API key and the cronjob is active!
114 -#loadplugin Mail::SpamAssassin::Plugin::GoogleSafeBrowsing
115
116 diff --git a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/update_google_safebrowsing.cron b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/update_google_safebrowsing.cron
117 deleted file mode 100644
118 index 9450cb98100..00000000000
119 --- a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/update_google_safebrowsing.cron
120 +++ /dev/null
121 @@ -1,4 +0,0 @@
122 -# Copyright 1999-2007 Gentoo Foundation
123 -# Distributed under the terms of the GNU General Public License v2
124 -#
125 -*/30 * * * * root /usr/sbin/update_google_safebrowsing.sh
126
127 diff --git a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/update_google_safebrowsing.sh b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/update_google_safebrowsing.sh
128 deleted file mode 100644
129 index e645e3ceaf5..00000000000
130 --- a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/files/update_google_safebrowsing.sh
131 +++ /dev/null
132 @@ -1,20 +0,0 @@
133 -#!/bin/sh
134 -# Copyright 1999-2007 Gentoo Foundation
135 -# Distributed under the terms of the GNU General Public License v2
136 -# This cron script updates the Google SafeBrowsing lists for the use of the
137 -# Mail-SpamAssassin-Plugin-GoogleSafeBrowsing plugin.
138 -# It should be run every 25-30 minutes! http://code.google.com/apis/safebrowsing/developers_guide.html#AcceptableUsage
139 -CONFFILE="/etc/mail/spamassassin/24_google_safebrowsing.cf"
140 -OUTDIR="$(awk '/^google_safebrowsing_dir/{print $2}' "${CONFFILE}")"
141 -APIKEY="$(awk '/^google_safebrowsing_apikey/{print $2}' "${CONFFILE}")"
142 -LISTS="$(awk '/^google_safebrowsing_blocklist/{printf "%s ",$2}' "${CONFFILE}")"
143 -if [ "$APIKEY" == "DEADBEEF" ]; then
144 - echo "No API key!" 1>&2
145 - exit 1
146 -fi
147 -# Wait a little while, to avoid hammering the server
148 -sleep $(($RANDOM % 120))
149 -# Use LISTS unquoted!
150 -for LIST in ${LISTS}; do
151 - blocklist_updater --apikey "$APIKEY" --blocklist ${LIST} --dbfile ${OUTDIR}/${LIST}-db
152 -done
153
154 diff --git a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/metadata.xml b/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/metadata.xml
155 deleted file mode 100644
156 index 3338346420f..00000000000
157 --- a/dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing/metadata.xml
158 +++ /dev/null
159 @@ -1,16 +0,0 @@
160 -<?xml version="1.0" encoding="UTF-8"?>
161 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
162 -<pkgmetadata>
163 - <maintainer type="person">
164 - <email>robbat2@g.o</email>
165 - <description>Primary Maintainer</description>
166 - </maintainer>
167 - <maintainer type="project">
168 - <email>perl@g.o</email>
169 - <name>Gentoo Perl Project</name>
170 - </maintainer>
171 - <upstream>
172 - <remote-id type="cpan">Mail-SpamAssassin-Plugin-GoogleSafeBrowsing</remote-id>
173 - <remote-id type="cpan-module">Mail::SpamAssassin::Plugin::GoogleSafeBrowsing</remote-id>
174 - </upstream>
175 -</pkgmetadata>
176
177 diff --git a/profiles/package.mask b/profiles/package.mask
178 index 44429d48779..d4af5a1d891 100644
179 --- a/profiles/package.mask
180 +++ b/profiles/package.mask
181 @@ -210,7 +210,6 @@ dev-scheme/schoca
182 # Fails since upgrade to dev-lang/perl-5.12 (!).
183 # Removal in 30 days. Bug 336898.
184 dev-perl/Net-Google-SafeBrowsing-UpdateRequest
185 -dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing
186
187 # Gnome Team <gnome@g.o> (08 Mar 2017)
188 # GNOME 3.24 mask (#611270)