gentoo Easter resync : 12.04.2020

5 files changed, 0 insertions, 147 deletions

diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p1.patch b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p1.patch
deleted file mode 100644
index d0fe21bf9ef9..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Bug: https://bugs.gentoo.org/677250
-Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7623
-
---- a/sa-update.raw	2018/09/29 09:33:52	1842302
-+++ b/sa-update.raw	2018/09/29 09:41:24	1842303
-@@ -1659,6 +1659,7 @@
-     my($a_rr, $aaaa_rr);
-       # RFC 3986:  scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
-     $mirror =~ s{^[a-z][a-z0-9.+-]*://}{}si;  # strip scheme like http://
-+    $mirror =~ s{[:/].*}{}s;  # strip all starting from :port or /path
-     return 1 if $have_inet4 && do_dns_query($mirror, "A");
-     return 1 if $have_inet6 && do_dns_query($mirror, "AAAA");
-     return 0;
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p2.patch b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p2.patch
deleted file mode 100644
index 26d921a6e676..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7623_p2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug: https://bugs.gentoo.org/677250
-Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7623
-
---- a/sa-update.raw	2018/09/29 10:16:29	1842320
-+++ b/sa-update.raw	2018/09/29 10:20:26	1842321
-@@ -1659,6 +1659,9 @@
-     my($a_rr, $aaaa_rr);
-       # RFC 3986:  scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
-     $mirror =~ s{^[a-z][a-z0-9.+-]*://}{}si;  # strip scheme like http://
-+    # No DNS check needed for IPv4 or IPv6 address literal
-+    return 1 if $mirror =~ m{^\d+\.\d+\.\d+\.\d+(?:[:/]|$)};
-+    return 1 if $mirror =~ m{^\[};
-     $mirror =~ s{[:/].*}{}s;  # strip all starting from :port or /path
-     return 1 if $have_inet4 && do_dns_query($mirror, "A");
-     return 1 if $have_inet6 && do_dns_query($mirror, "AAAA");
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7631.patch b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7631.patch
deleted file mode 100644
index 3c4bf403dc2c..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7631.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-This upstream doc changes addresses 3.4.2 adding new rows to awl SQL
-tables.
-
-Upstream's UPGRADE diff is slightly different.  Their version is 
-applied to the 3.4.3 release notes (not yet released), ours applies
-to 3.4.2.
-
-Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7631
-Bug: https://bugs.gentoo.org/666576
-
---- a/UPGRADE	2018-10-28 15:43:45.744850026 -0400
-+++ b/UPGRADE	2018-10-28 15:47:52.805028626 -0400
-@@ -8,6 +8,13 @@
- 
- See https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7614
- 
-+- Added last_hit timestamp to Awl SQL schema.
-+  You should upgrade your sql database running the following command:
-+  MySQL:
-+  "ALTER TABLE `awl` ADD last_hit timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;"
-+  PostgreSQL:
-+  "ALTER TABLE awl ADD last_hit timestamp NOT NULL default CURRENT_TIMESTAMP;"
-+
- New plugins
- -----------
- 
---- a/sql/awl_mysql.sql	2018/10/21 12:10:09	1844484
-+++ b/sql/awl_mysql.sql	2018/10/21 12:10:40	1844485
-@@ -5,5 +5,6 @@
-   msgcount int(11) NOT NULL default '0',
-   totscore float NOT NULL default '0',
-   signedby varchar(255) NOT NULL default '',
-+  last_hit timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-   PRIMARY KEY (username,email,signedby,ip)
- ) ENGINE=InnoDB;
---- a/sql/awl_pg.sql	2018/10/21 12:10:09	1844484
-+++ b/sql/awl_pg.sql	2018/10/21 12:10:40	1844485
-@@ -5,8 +5,22 @@
-   msgcount bigint NOT NULL default '0',
-   totscore float NOT NULL default '0',
-   signedby varchar(255) NOT NULL default '',
-+  last_hit timestamp NOT NULL default CURRENT_TIMESTAMP,
-   PRIMARY KEY (username,email,signedby,ip)
- );
- 
--ALTER TABLE awl SET (fillfactor=95);
-+create index awl_last_hit on awl (last_hit);
-+
-+create OR REPLACE function update_awl_last_hit()
-+RETURNS TRIGGER AS $$
-+BEGIN
-+  NEW.last_hit = CURRENT_TIMESTAMP;
-+  RETURN NEW;
-+END;
-+$$ language 'plpgsql';
- 
-+create TRIGGER update_awl_update_last_hit BEFORE UPDATE
-+ON awl FOR EACH ROW EXECUTE PROCEDURE
-+update_awl_last_hit();
-+
-+ALTER TABLE awl SET (fillfactor=95);
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7632.patch b/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7632.patch
deleted file mode 100644
index a9a065abd817..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.2-bug_7632.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This upstream fix changes the informational message,
-
-  dns: new_dns_packet: domain is utf8 flagged...
-
-to a debug one. This should prevent it from being spammed in your logs
-a million times a day.
-
-Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7632
-
---- a/lib/Mail/SpamAssassin/DnsResolver.pm	2018/10/12 06:14:11	1843622
-+++ b/lib/Mail/SpamAssassin/DnsResolver.pm	2018/10/12 06:38:56	1843623
-@@ -547,7 +547,7 @@
-   eval {
- 
-     if (utf8::is_utf8($domain)) {  # since Perl 5.8.1
--      info("dns: new_dns_packet: domain is utf8 flagged: %s", $domain);
-+      dbg("dns: new_dns_packet: domain is utf8 flagged: %s", $domain);
-     }
- 
-     $domain =~ s/\.*\z/./s;
diff --git a/mail-filter/spamassassin/files/update-spamassassin-rules.cron b/mail-filter/spamassassin/files/update-spamassassin-rules.cron
deleted file mode 100644
index 1b36af0548db..000000000000
--- a/mail-filter/spamassassin/files/update-spamassassin-rules.cron
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-#
-# Update SpamAssassin rules and reload daemons that use them.
-#
-
-# First, redirect stdout to /dev/null.
-exec 1>/dev/null
-
-# Try to update the rules.
-sa-update
-
-# Exit code 0: all new updates were installed.
-# Exit code 1: we were already up-to-date.
-# Exit code 3: some updates were installed, but some weren't.
-# Any other exit code indicates failure.
-if (( $? == 0 || $? == 3 )); then
-    # Compilation spits out its progress onto stderr.
-    sa-compile 2>/dev/null
-
-    # Do you run spamd or amavisd? Both daemons need to be reloaded
-    # in order to pick up the newly-updated rules.
-    if command -v rc-service 2>/dev/null; then
-        # OpenRC is installed. These "status" checks should succeed
-        # only when the daemon is running under OpenRC. We redirect
-        # stderr to hide the lecture that OpenRC gives you if you
-        # try this on a system running systemd.
-        rc-service spamd status 2>/dev/null && rc-service spamd reload
-        rc-service amavisd status 2>/dev/null && rc-service amavisd reload
-    fi
-
-    if command -v systemctl 2>/dev/null; then
-        # The systemctl (systemd) executable is installed, so try to
-        # use it to restart spamd and amavisd. These are safe to run
-        # if systemd is installed but not in use.
-        systemctl try-restart spamassassin
-        systemctl try-restart amavisd
-    fi
-fi