diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi index 3fec986b6e5..2be6c70eb62 100644 --- a/distrib/sets/lists/etc/mi +++ b/distrib/sets/lists/etc/mi @@ -13,7 +13,6 @@ ./etc/mail.rc ./etc/mail/aliases ./etc/mail/smtpd.conf -./etc/mail/spamd.conf ./etc/mailer.conf ./etc/master.passwd ./etc/motd diff --git a/etc/mail/Makefile b/etc/mail/Makefile index 1b619b34e01..beeacde405d 100644 --- a/etc/mail/Makefile +++ b/etc/mail/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2015/12/22 07:39:00 sunil Exp $ +# $OpenBSD: Makefile,v 1.14 2025/09/28 12:30:49 sthen Exp $ all clean: @@ -7,8 +7,6 @@ distribution: ${DESTDIR}/etc/mail/aliases ${INSTALL} -c -o root -g wheel -m 644 smtpd.conf \ ${DESTDIR}/etc/mail/smtpd.conf - ${INSTALL} -c -o root -g wheel -m 644 spamd.conf \ - ${DESTDIR}/etc/mail/spamd.conf .PHONY: distribution .include diff --git a/etc/mail/spamd.conf b/etc/mail/spamd.conf deleted file mode 100644 index 1334e041607..00000000000 --- a/etc/mail/spamd.conf +++ /dev/null @@ -1,38 +0,0 @@ -# $OpenBSD: spamd.conf,v 1.9 2018/07/22 17:09:43 jmc Exp $ -# -# spamd(8) configuration file, read by spamd-setup(8). -# See also spamd.conf(5). -# -# Configures lists for spamd(8). -# -# Strings follow getcap(3) convention escapes, except you -# can have a bare colon (:) inside a quoted string and it -# will deal with it. See spamd-setup(8) for more details. -# -# "all" must be here, and defines the order in which lists are applied. -# Lists specified with the :white: capability apply to the previous -# list with a :black: capability. -# -# As of June 2016, a place to search for blacklists is -# http://en.wikipedia.org/wiki/Comparison_of_DNS_blacklists -# - most of these are DNS-based only and cannot be used with spamd(8), -# but some of the lists also provide access to text files via rsync. - -all:\ - :nixspam: - -# 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=https:\ - :file=www.openbsd.org/spamd/nixspam.gz - -# An example of a list containing addresses which should not talk to spamd. -# -#override:\ -# :white:\ -# :method=file:\ -# :file=/var/db/override.txt: