Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-3]: src/dist/pf Pull up file removal (requested by peter in ticke...
details: https://anonhg.NetBSD.org/src/rev/21316a158cd7
branches: netbsd-3
changeset: 576456:21316a158cd7
user: tron <tron%NetBSD.org@localhost>
date: Sat Jul 02 23:41:26 2005 +0000
description:
Pull up file removal (requested by peter in ticket #519):
Remove the distribution files of spamd. Future imports of pf will not
include spamd anymore.
diffstat:
dist/pf/etc/spamd.conf | 87 --
dist/pf/libexec/spamd-setup/Makefile | 13 -
dist/pf/libexec/spamd-setup/spamd-setup.8 | 96 --
dist/pf/libexec/spamd-setup/spamd-setup.c | 866 --------------------
dist/pf/libexec/spamd/Makefile | 10 -
dist/pf/libexec/spamd/grey.c | 533 ------------
dist/pf/libexec/spamd/grey.h | 36 -
dist/pf/libexec/spamd/sdl.c | 272 ------
dist/pf/libexec/spamd/sdl.h | 69 -
dist/pf/libexec/spamd/spamd.8 | 381 --------
dist/pf/libexec/spamd/spamd.c | 1246 -----------------------------
dist/pf/libexec/spamlogd/Makefile | 10 -
dist/pf/libexec/spamlogd/spamlogd.8 | 115 --
dist/pf/libexec/spamlogd/spamlogd.c | 262 ------
dist/pf/share/man/man5/spamd.conf.5 | 191 ----
dist/pf/usr.sbin/spamdb/Makefile | 10 -
dist/pf/usr.sbin/spamdb/spamdb.8 | 109 --
dist/pf/usr.sbin/spamdb/spamdb.c | 248 -----
18 files changed, 0 insertions(+), 4554 deletions(-)
diffs (truncated from 4626 to 300 lines):
diff -r 27b95bf149d7 -r 21316a158cd7 dist/pf/etc/spamd.conf
--- a/dist/pf/etc/spamd.conf Sat Jul 02 23:38:41 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-# $NetBSD: spamd.conf,v 1.2 2004/11/14 11:26:47 yamt Exp $
-# $OpenBSD: spamd.conf,v 1.9 2004/01/21 08:07:39 deraadt Exp $
-#
-# spamd config file, read by spamd-setup(8) for spamd(8)
-#
-# See spamd.conf(5)
-#
-# Configures whitelists and blacklists for spamd
-#
-# Strings follow getcap(3) convention escapes, other than 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
-# whitelists apply to the previous blacklist. more than one whitelist
-# may be applied to each blacklist
-#
-# As of Aug 2003, a place to search for black lists is
-# http://spamlinks.port5.com/filter-bl.htm#ip
-#
-# Some of the URLs below point to www.openbsd.org locations. Those
-# files are likely to be mirrored to other OpenBSD www mirrors located
-# around the world. Hence, it is possible to edit this file and rewrite
-# www.openbsd.org with, for instance, to www.de.openbsd.org
-
-all:\
- :spamhaus:china:korea:
-
-# Mirrored from http://spfilter.openrbl.org/data/sbl/SBL.cidr.bz2
-spamhaus:\
- :black:\
- :msg="SPAM. Your address %A is in the Spamhaus Block List\n\
- 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:\
- :black:\
- :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:\
- :black:\
- :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:\
- :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
-
-
-# Whitelists are done like this, and must be added to "all" after each
-# blacklist from which you want the addresses in the whitelist removed.
-#
-#whitelist:\
-# :white:\
-# :file=/var/mail/whitelist.txt
-
-relaydb-black:\
- :black:\
- :msg="SPAM. Your address %A is in my relaydb list.":\
- :method=exec:\
- :file=relaydb -4lb:
-
-relaydb-white:\
- :white:\
- :method=exec:\
- :file=relaydb -4lw:
diff -r 27b95bf149d7 -r 21316a158cd7 dist/pf/libexec/spamd-setup/Makefile
--- a/dist/pf/libexec/spamd-setup/Makefile Sat Jul 02 23:38:41 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2004/06/22 16:04:40 itojun Exp $
-# $OpenBSD: Makefile,v 1.3 2004/01/21 08:07:41 deraadt Exp $
-
-PROG= spamd-setup
-SRCS= spamd-setup.c
-MAN= spamd-setup.8
-
-LDADD= -lz
-DPADD= ${LIBZ}
-
-CFLAGS+= -Wall -Wstrict-prototypes -ansi
-
-.include <bsd.prog.mk>
diff -r 27b95bf149d7 -r 21316a158cd7 dist/pf/libexec/spamd-setup/spamd-setup.8
--- a/dist/pf/libexec/spamd-setup/spamd-setup.8 Sat Jul 02 23:38:41 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-.\" $NetBSD: spamd-setup.8,v 1.3 2004/06/25 15:59:31 wiz Exp $
-.\" $OpenBSD: spamd-setup.8,v 1.9 2004/01/29 17:41:00 jmc Exp $
-.\"
-.\" Copyright (c) 2003 Jason L. Wright (jason%thought.net@localhost)
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-.\" DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd February 14, 2003
-.Dt SPAMD-SETUP 8
-.Os
-.Sh NAME
-.Nm spamd-setup
-.Nd parse and load file of spammer addresses
-.Sh SYNOPSIS
-.Nm spamd-setup
-.Op Fl dn
-.Sh DESCRIPTION
-The
-.Nm
-utility adds blacklists by adding addresses to the
-.Xr pf 4
-table
-.Em \*[Lt]spamd\*[Gt] ,
-as well as configuring mail rejection messages for
-the added list of addresses in
-.Xr spamd 8 .
-The
-.Em spamd
-table is used in conjunction with a
-.Xr pf 4
-redirection rule to selectively redirect mail connections
-to the
-.Xr spamd 8
-daemon.
-.Pp
-The options are as follows:
-.Bl -tag -width Ds
-.It Fl d
-Debug mode reports a few pieces of information.
-.It Fl n
-Dry-run mode.
-No data is shipped to
-.Xr pf 4 .
-.El
-.Pp
-Blacklists and whitelists are specified in the configuration file
-.Pa /etc/spamd.conf
-and are processed in the order specified in the
-.Ar all
-tag.
-Output is concatenated to build up a table for
-.Xr pf 4 .
-Then the blacklist addresses are sent to a running
-.Xr spamd 8
-along with the message spamd will give on mail rejection when a
-matching client connects.
-The configuration port for
-.Xr spamd 8
-is found from
-.Xr services 5 ,
-by looking for the named service
-.Em spamd-cfg .
-.Pp
-.Nm
-reads all configuration information from a
-.Xr spamd.conf 5
-file.
-.Sh FILES
-.Bd -literal
-/etc/spamd.conf
-.Ed
-.Sh SEE ALSO
-.Xr ftp 1 ,
-.Xr pf 4 ,
-.Xr services 5 ,
-.Xr spamd.conf 5 ,
-.Xr spamd 8
diff -r 27b95bf149d7 -r 21316a158cd7 dist/pf/libexec/spamd-setup/spamd-setup.c
--- a/dist/pf/libexec/spamd-setup/spamd-setup.c Sat Jul 02 23:38:41 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,866 +0,0 @@
-/* $NetBSD: spamd-setup.c,v 1.3.2.1 2005/04/13 16:22:29 tron Exp $ */
-/* $OpenBSD: spamd-setup.c,v 1.19 2004/06/29 11:19:07 mickey Exp $ */
-
-/*
- * Copyright (c) 2003 Bob Beck. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <err.h>
-#include <netdb.h>
-#include <zlib.h>
-
-#define PATH_FTP "/usr/bin/ftp"
-#define PATH_PFCTL "/sbin/pfctl"
-#ifndef PATH_SPAMD_CONF
-#define PATH_SPAMD_CONF "/etc/spamd.conf"
-#endif
-#define SPAMD_ARG_MAX 256 /* max # of args to an exec */
-
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-
-struct cidr {
- u_int32_t addr;
- u_int8_t bits;
-};
-
-struct bl {
- u_int32_t addr;
- int8_t b;
- int8_t w;
-};
-
-struct blacklist {
- char *name;
- char *message;
- struct bl *bl;
- size_t blc, bls;
- u_int8_t black;
- int count;
-};
-
-u_int32_t imask(u_int8_t b);
-u_int8_t maxblock(u_int32_t addr, u_int8_t bits);
-u_int8_t maxdiff(u_int32_t a, u_int32_t b);
-struct cidr *range2cidrlist(u_int32_t start, u_int32_t end);
-void cidr2range(struct cidr cidr, u_int32_t *start, u_int32_t *end);
-char *atop(u_int32_t addr);
-u_int32_t ptoa(char *cp);
-int parse_netblock(char *buf, struct bl *start, struct bl *end,
- int white);
-int open_child(char *file, char **argv);
-int fetch(char *url);
-int open_file(char *method, char *file);
-char *fix_quoted_colons(char *buf);
-void do_message(FILE *sdc, char *msg);
-struct bl *add_blacklist(struct bl *bl, int *blc, int *bls, gzFile gzf,
- int white);
-int cmpbl(const void *a, const void *b);
-struct cidr **collapse_blacklist(struct bl *bl, int blc);
Home |
Main Index |
Thread Index |
Old Index