===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/Attic/spamd.conf,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/etc/Attic/spamd.conf	2004/11/06 22:14:37	1.11
--- src/etc/Attic/spamd.conf	2005/01/16 17:16:44	1.12
***************
*** 1,4 ****
! # $OpenBSD: spamd.conf,v 1.11 2004/11/06 22:14:37 david Exp $
  #
  # spamd config file, read by spamd-setup(8) for spamd(8)
  #
--- 1,4 ----
! # $OpenBSD: spamd.conf,v 1.12 2005/01/16 17:16:44 deraadt Exp $
  #
  # spamd config file, read by spamd-setup(8) for spamd(8)
  #
***************
*** 32,38 ****
  	See http://www.spamhaus.org/sbl and\
  	http://www.abuse.net/sbl.phtml?IP=%A for more details":\
  	:method=http:\
! 	:file=www.openbsd.org/spamd/SBL.cidr.gz
  
  # Mirrored from http://www.spews.org/spews_list_level1.txt
  spews1:\
--- 32,38 ----
  	See http://www.spamhaus.org/sbl and\
  	http://www.abuse.net/sbl.phtml?IP=%A for more details":\
  	:method=http:\
! 	:file=www.openbsd.org/spamd/SBL.cidr.gz:
  
  # Mirrored from http://www.spews.org/spews_list_level1.txt
  spews1:\
***************
*** 40,46 ****
  	:msg="SPAM. Your address %A is in the spews level 1 database\n\
  	See http://www.spews.org/ask.cgi?x=%A for more details":\
  	:method=http:\
! 	:file=www.openbsd.org/spamd/spews_list_level1.txt.gz
  
  # Mirrored from http://www.spews.org/spews_list_level2.txt
  spews2:\
--- 40,46 ----
  	:msg="SPAM. Your address %A is in the spews level 1 database\n\
  	See http://www.spews.org/ask.cgi?x=%A for more details":\
  	:method=http:\
! 	:file=www.openbsd.org/spamd/spews_list_level1.txt.gz:
  
  # Mirrored from http://www.spews.org/spews_list_level2.txt
  spews2:\
***************
*** 48,54 ****
  	:msg="SPAM. Your address %A is in the spews level 2 database\n\
  	See http://www.spews.org/ask.cgi?x=%A for more details":\
  	:method=http:\
! 	:file=www.openbsd.org/spamd/spews_list_level2.txt.gz
  
  # Mirrored from http://www.okean.com/chinacidr.txt
  china:\
--- 48,54 ----
  	:msg="SPAM. Your address %A is in the spews level 2 database\n\
  	See http://www.spews.org/ask.cgi?x=%A for more details":\
  	:method=http:\
! 	:file=www.openbsd.org/spamd/spews_list_level2.txt.gz:
  
  # Mirrored from http://www.okean.com/chinacidr.txt
  china:\
***************
*** 56,62 ****
  	: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:\
--- 56,62 ----
  	: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:\
***************
*** 64,70 ****
  	: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
  
  
  # Whitelists are done like this, and must be added to "all" after each
--- 64,70 ----
  	: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:
  
  
  # Whitelists are done like this, and must be added to "all" after each
***************
*** 72,78 ****
  #
  #whitelist:\
  #	:white:\
! #	:file=/var/mail/whitelist.txt
  
  relaydb-black:\
  	:black:\
--- 72,78 ----
  #
  #whitelist:\
  #	:white:\
! #	:file=/var/mail/whitelist.txt:
  
  relaydb-black:\
  	:black:\