===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/Attic/spamd.conf,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/etc/Attic/spamd.conf	2007/02/22 23:11:19	1.21
--- src/etc/Attic/spamd.conf	2007/02/25 04:45:28	1.22
***************
*** 1,4 ****
! # $OpenBSD: spamd.conf,v 1.21 2007/02/22 23:11:19 beck Exp $
  #
  # spamd config file, read by spamd-setup(8) for spamd(8)
  #
--- 1,4 ----
! # $OpenBSD: spamd.conf,v 1.22 2007/02/25 04:45:28 marc Exp $
  #
  # spamd config file, read by spamd-setup(8) for spamd(8)
  #
***************
*** 28,48 ****
  # University of Alberta greytrap hits
  # Addresses stay in it for 24 hours from time they misbehave.
  uatraps:\
!         :black:\
!         :msg="Your address %A has sent mail to a ualberta.ca spamtrap\n\
!         within the last 24 hours":\
!         :method=http:\
!         :file=www.openbsd.org/spamd/traplist.gz
  
  # Nixspam recent sources list.
  # Mirrored from http://www.heise.de/ix/nixspam
  nixspam:\
!         :black:\
!         :msg="Your address %A is in the nixspam list\n\
  	See http://www.heise.de/ix/nixspam/dnsbl_en/ for details":\
!         :method=http:\
!         :file=www.openbsd.org/spamd/nixspam.gz
! 
  
  # Mirrored from http://www.okean.com/chinacidr.txt
  china:\
--- 28,47 ----
  # University of Alberta greytrap hits
  # Addresses stay in it for 24 hours from time they misbehave.
  uatraps:\
! 	:black:\
! 	:msg="Your address %A has sent mail to a ualberta.ca spamtrap\n\
! 	within the last 24 hours":\
! 	:method=http:\
! 	:file=www.openbsd.org/spamd/traplist.gz
  
  # Nixspam recent sources list.
  # Mirrored from http://www.heise.de/ix/nixspam
  nixspam:\
! 	:black:\
! 	:msg="Your address %A is in the nixspam list\n\
  	See http://www.heise.de/ix/nixspam/dnsbl_en/ for details":\
! 	:method=http:\
! 	:file=www.openbsd.org/spamd/nixspam.gz
  
  # Mirrored from http://www.okean.com/chinacidr.txt
  china:\