From 49693f9f4fcb69ad312cd76ef71b4c989335d862 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Mon, 14 May 2012 16:58:46 +0000
Subject: [PATCH] remove korea and china examples, as these files don't mirror
 reliably and have been stubbed on openbsd.org anyway ok millert@ robert@
 otto@

---
 src/etc/mail/spamd.conf | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/etc/mail/spamd.conf b/src/etc/mail/spamd.conf
index a5b9697a..9618f263 100644
--- a/src/etc/mail/spamd.conf
+++ b/src/etc/mail/spamd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: spamd.conf,v 1.3 2007/05/12 00:43:41 cnst Exp $
+# $OpenBSD: spamd.conf,v 1.4 2012/05/14 16:58:46 beck Exp $
 #
 # spamd(8) configuration file, read by spamd-setup(8).
 # See also spamd.conf(5).
@@ -17,7 +17,7 @@
 #     http://spamlinks.net/filter-bl.htm
 
 all:\
-	:uatraps:nixspam:china:korea:
+	:uatraps:nixspam:
 
 # University of Alberta greytrap hits.
 # Addresses stay in it for 24 hours from time they misbehave.
@@ -37,22 +37,6 @@ nixspam:\
 	:method=http:\
 	:file=www.openbsd.org/spamd/nixspam.gz
 
-# Mirrored from http://www.okean.com/chinacidr.txt
-china:\
-	:black:\
-	:msg="SPAM. Your address %A appears to be from China\n\
-	See http://www.okean.com/asianspamblocks.html for more details":\
-	:method=http:\
-	:file=www.openbsd.org/spamd/chinacidr.txt.gz:
-
-# Mirrored from http://www.okean.com/koreacidr.txt
-korea:\
-	:black:\
-	:msg="SPAM. Your address %A appears to be from Korea\n\
-	See http://www.okean.com/asianspamblocks.html for more details":\
-	:method=http:\
-	:file=www.openbsd.org/spamd/koreacidr.txt.gz:
-
 # An example of a list containing addresses which should not talk to spamd.
 #
 #override:\