From 931eab0541560d407709634c674d72e7def96b93 Mon Sep 17 00:00:00 2001
From: Georg Lauterbach <44545919+aendeavor@users.noreply.github.com>
Date: Sun, 31 Jan 2021 16:05:05 +0100
Subject: [PATCH] removing bl.spamcop.net for 8.0.1

---
 target/postfix/main.cf             | 3 +--
 target/scripts/start-mailserver.sh | 9 +++++++--
 test/mail_with_postgrey.bats       | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/target/postfix/main.cf b/target/postfix/main.cf
index 99be7f15..33934854 100644
--- a/target/postfix/main.cf
+++ b/target/postfix/main.cf
@@ -47,7 +47,7 @@ smtpd_helo_required = yes
 smtpd_delay_reject = yes
 smtpd_helo_restrictions = permit_mynetworks, reject_invalid_helo_hostname, permit
 smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
-smtpd_recipient_restrictions = permit_sasl_authenticated, permit_mynetworks, reject_unauth_destination, check_policy_service unix:private/policyd-spf, reject_unauth_pipelining, reject_invalid_helo_hostname, reject_non_fqdn_helo_hostname, reject_unknown_recipient_domain, reject_rbl_client zen.spamhaus.org, reject_rbl_client bl.spamcop.net
+smtpd_recipient_restrictions = permit_sasl_authenticated, permit_mynetworks, reject_unauth_destination, check_policy_service unix:private/policyd-spf, reject_unauth_pipelining, reject_invalid_helo_hostname, reject_non_fqdn_helo_hostname, reject_unknown_recipient_domain, reject_rbl_client zen.spamhaus.org
 smtpd_client_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, reject_unauth_pipelining
 smtpd_sender_restrictions = permit_sasl_authenticated, permit_mynetworks, reject_unknown_sender_domain
 disable_vrfy_command = yes
@@ -58,7 +58,6 @@ postscreen_dnsbl_sites = zen.spamhaus.org*3
 	bl.mailspike.net
 	b.barracudacentral.org*2
 	bl.spameatingmonkey.net
-	bl.spamcop.net
 	dnsbl.sorbs.net
 	psbl.surriel.com
 	list.dnswl.org=127.0.[0..255].0*-2
diff --git a/target/scripts/start-mailserver.sh b/target/scripts/start-mailserver.sh
index dd199572..ac4c7da4 100755
--- a/target/scripts/start-mailserver.sh
+++ b/target/scripts/start-mailserver.sh
@@ -846,8 +846,13 @@ function _setup_postgrey
 {
   _notify 'inf' "Configuring postgrey"
 
-  sed -i -e 's/, reject_rbl_client bl.spamcop.net$/, reject_rbl_client bl.spamcop.net, check_policy_service inet:127.0.0.1:10023/' /etc/postfix/main.cf
-  sed -i -e "s/\"--inet=127.0.0.1:10023\"/\"--inet=127.0.0.1:10023 --delay=${POSTGREY_DELAY} --max-age=${POSTGREY_MAX_AGE} --auto-whitelist-clients=${POSTGREY_AUTO_WHITELIST_CLIENTS}\"/" /etc/default/postgrey
+  sed -i -E \
+    's+, reject_rbl_client zen.spamhaus.org$+, reject_rbl_client zen.spamhaus.org, check_policy_service inet:127.0.0.1:10023+' \
+    /etc/postfix/main.cf
+
+  sed -i -e \
+    "s/\"--inet=127.0.0.1:10023\"/\"--inet=127.0.0.1:10023 --delay=${POSTGREY_DELAY} --max-age=${POSTGREY_MAX_AGE} --auto-whitelist-clients=${POSTGREY_AUTO_WHITELIST_CLIENTS}\"/" \
+    /etc/default/postgrey
 
   TEXT_FOUND=$(grep -c -i "POSTGREY_TEXT" /etc/default/postgrey)
 
diff --git a/test/mail_with_postgrey.bats b/test/mail_with_postgrey.bats
index 26090a1a..dbc93199 100644
--- a/test/mail_with_postgrey.bats
+++ b/test/mail_with_postgrey.bats
@@ -34,7 +34,7 @@ function teardown_file() {
 }
 
 @test "checking postgrey: /etc/postfix/main.cf correctly edited" {
-  run docker exec mail_with_postgrey /bin/bash -c "grep 'bl.spamcop.net, check_policy_service inet:127.0.0.1:10023' /etc/postfix/main.cf | wc -l"
+  run docker exec mail_with_postgrey /bin/bash -c "grep 'zen.spamhaus.org, check_policy_service inet:127.0.0.1:10023' /etc/postfix/main.cf | wc -l"
   assert_success
   assert_output 1
 }