pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/spamdyke Update to 2.5.0. From the changelog:
details: https://anonhg.NetBSD.org/pkgsrc/rev/74a8a31b1f0b
branches: trunk
changeset: 528556:74a8a31b1f0b
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Mon May 07 19:43:43 2007 +0000
description:
Update to 2.5.0. From the changelog:
Moved portions of spamdyke's code from spamdyke.c into new .c and .h files to
make it a little easier to understand and maintain.
Added base64_encode() and base64_decode() to transfer data to/from base64
format.
Added md5() to produce an MD5 digest of a data block. Turns out this wasn't
necessary for spamdyke, only for test_smtpauth_crammd5. Oops.
Renamed the "make openbsd" command to "make bsd" since apparently all *BSD
distributions don't need -lresolv.
Renamed search_ip_file() to search_tcprules_file() and extended it to support
IP ranges, rDNS names and remote info like tcprules does (according to
http://cr.yp.to/ucspi-tcp/tcprules.html). This makes the IP black/
whitelist files much more flexible. This will be much handier in the next
version (AKA The Great Configuration Overhaul).
Modified middleman() and smtp_filter(), added exec_checkpassword() so spamdyke
can do SMTP AUTH, either by offering it itself or observing the qmail
traffic. LOGIN, PLAIN and CRAM-MD5 are supported.
Changed the STRLEN_ macros in spamdyke.h to use a single STRLEN() macro so the
preprocessor will count characters instead of doing it by hand. Much safer
this way.
Removed "-a"'s (max number of recipients per message) dependence on "-d"
(local domains file). With SMTP AUTH, the local access file and whitelists,
this shouldn't be necessary.
Added process_access() to process local access files (e.g. /etc/tcp.smtp) and
export environment variables based on the source of the incoming connection.
Added relay prevention based on the content of the local access file(s) and
the list(s) of local domains. Connections from remote sources that are
granted relay permission in the access file(s) are allowed to relay. Users
who authenticate with SMTP AUTH are allowed to relay. All others must send
to local addresses only.
Added a series of test scripts to exercise all of spamdyke's filters and
options. This should make it easier to regression test new versions.
Changed search_file() and search_tcprules_file() to compare domain names in a
case insensitive manner.
Changed canonicalize_path() to reduce all file paths to lowercase. This was
causing graylisting to be inconsistant. Reported by bcarr%purgatoire.org@localhost.
diffstat:
mail/spamdyke/Makefile | 13 ++++---------
mail/spamdyke/distinfo | 14 +++++++-------
mail/spamdyke/patches/patch-aa | 12 ++++++------
mail/spamdyke/patches/patch-ab | 13 +++++++++----
mail/spamdyke/patches/patch-ac | 12 ++++++------
5 files changed, 32 insertions(+), 32 deletions(-)
diffs (124 lines):
diff -r c68cc65dac98 -r 74a8a31b1f0b mail/spamdyke/Makefile
--- a/mail/spamdyke/Makefile Mon May 07 16:40:18 2007 +0000
+++ b/mail/spamdyke/Makefile Mon May 07 19:43:43 2007 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/04/18 15:36:18 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/05/07 19:43:43 schmonz Exp $
#
-DISTNAME= spamdyke-2.4.0
+DISTNAME= spamdyke-2.5.0
CATEGORIES= mail
-MASTER_SITES= http://freesoftware.silence.org/spamdyke/releases/
+MASTER_SITES= ${HOMEPAGE}releases/
EXTRACT_SUFX= .tgz
MAINTAINER= schmonz%NetBSD.org@localhost
@@ -11,6 +11,7 @@
COMMENT= Monitors and intercept incoming SMTP connections to qmail
BUILD_DIRS= ${PKGBASE} utils
+BUILD_TARGET= bsd
SUBST_CLASSES+= paths
SUBST_FILES.paths= ${PKGBASE}/spamdyke.c
@@ -19,12 +20,6 @@
INSTALLATION_DIRS= bin share/doc/${PKGBASE}
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly"
-BUILD_TARGET= openbsd
-.endif
-
do-install:
cd ${WRKSRC}/${PKGBASE}; \
for f in spamdyke; do \
diff -r c68cc65dac98 -r 74a8a31b1f0b mail/spamdyke/distinfo
--- a/mail/spamdyke/distinfo Mon May 07 16:40:18 2007 +0000
+++ b/mail/spamdyke/distinfo Mon May 07 19:43:43 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2007/04/11 14:50:37 schmonz Exp $
+$NetBSD: distinfo,v 1.3 2007/05/07 19:43:45 schmonz Exp $
-SHA1 (spamdyke-2.4.0.tgz) = 7ee1dd0af63dd89ad414a57ae6f1a79274116941
-RMD160 (spamdyke-2.4.0.tgz) = c539437dfc73aac2a5f0741de3b6709a88affd95
-Size (spamdyke-2.4.0.tgz) = 48762 bytes
-SHA1 (patch-aa) = ebf0b5218858a442aa68dc5d29d2420008ed63d3
-SHA1 (patch-ab) = 042c267945fc5e84cffb93eca108019b0aa16460
-SHA1 (patch-ac) = 3a4abfab8db4f5c362bd1dd5bedd5fed1b3a57a4
+SHA1 (spamdyke-2.5.0.tgz) = 3f10ed0b68685460098e74a6a79f46cb41a3af26
+RMD160 (spamdyke-2.5.0.tgz) = afdfee18de2cc59af2e4934e85836dd7782eec35
+Size (spamdyke-2.5.0.tgz) = 89150 bytes
+SHA1 (patch-aa) = e11c9ae13da56742acbfd02aff8bfd2ebc99b146
+SHA1 (patch-ab) = be3c21036ca5347f730fc1969c423d849cf9d64f
+SHA1 (patch-ac) = bc49c93a517631bc3af5125b93dc5528623f5a9c
diff -r c68cc65dac98 -r 74a8a31b1f0b mail/spamdyke/patches/patch-aa
--- a/mail/spamdyke/patches/patch-aa Mon May 07 16:40:18 2007 +0000
+++ b/mail/spamdyke/patches/patch-aa Mon May 07 19:43:43 2007 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2007/04/11 14:50:38 schmonz Exp $
+$NetBSD: patch-aa,v 1.3 2007/05/07 19:43:45 schmonz Exp $
---- spamdyke/spamdyke.c.orig 2007-04-02 15:16:20.000000000 -0400
-+++ spamdyke/spamdyke.c
-@@ -39,7 +39,7 @@ extern int opterr;
+--- spamdyke/spamdyke.h.orig 2007-05-04 18:18:03.000000000 -0400
++++ spamdyke/spamdyke.h
+@@ -22,7 +22,7 @@
- #define VERSION_STRING "2.4.0"
+ #define STRLEN(X) (sizeof(X) - 1)
-#define DEFAULT_PATH "/bin:/usr/bin:/usr/local/bin:/var/qmail/bin:/home/vpopmail/bin"
+#define DEFAULT_PATH "/bin:/usr/bin:@PREFIX@/bin:/var/qmail/bin:/home/vpopmail/bin"
#define DEFAULT_TIMEOUT_COMMAND_SECS 60
#define DEFAULT_TIMEOUT_CONNECTION_SECS 0
-
+ #define TIMEOUT_CHECKPASSWORD_SECS 30
diff -r c68cc65dac98 -r 74a8a31b1f0b mail/spamdyke/patches/patch-ab
--- a/mail/spamdyke/patches/patch-ab Mon May 07 16:40:18 2007 +0000
+++ b/mail/spamdyke/patches/patch-ab Mon May 07 19:43:43 2007 +0000
@@ -1,11 +1,16 @@
-$NetBSD: patch-ab,v 1.1 2007/04/11 14:50:38 schmonz Exp $
+$NetBSD: patch-ab,v 1.2 2007/05/07 19:43:52 schmonz Exp $
---- spamdyke/Makefile.orig 2007-04-02 15:53:22.000000000 -0400
+--- spamdyke/Makefile.orig 2007-05-04 18:22:40.000000000 -0400
+++ spamdyke/Makefile
-@@ -1,5 +1,5 @@
+@@ -1,8 +1,10 @@
#CFLAGS := -Wall -g -funsigned-char
-CFLAGS := -Wall -O2 -funsigned-char
+CFLAGS += -Wall -O2 -funsigned-char
LFLAGS := -lresolv
+ OFILES := spamdyke.o command_line.o dns.o environment.o usage.o search_fs.o exec.o base64.o
- all: spamdyke
++all: spamdyke
++
+ spamdyke: $(OFILES)
+ @echo -----------------------------------------
+ @echo NOTE: To compile on *BSD, run "make bsd".
diff -r c68cc65dac98 -r 74a8a31b1f0b mail/spamdyke/patches/patch-ac
--- a/mail/spamdyke/patches/patch-ac Mon May 07 16:40:18 2007 +0000
+++ b/mail/spamdyke/patches/patch-ac Mon May 07 19:43:43 2007 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.1 2007/04/11 14:50:38 schmonz Exp $
+$NetBSD: patch-ac,v 1.2 2007/05/07 19:43:52 schmonz Exp $
---- utils/Makefile.orig 2007-04-02 15:46:57.000000000 -0400
+--- utils/Makefile.orig 2007-05-04 10:28:13.000000000 -0400
+++ utils/Makefile
@@ -1,5 +1,5 @@
- #CFLAGS := -Wall -g -funsigned-char
--CFLAGS := -Wall -O2 -funsigned-char
-+CFLAGS += -Wall -O2 -funsigned-char
+ #CFLAGS := -Wall -g -funsigned-char -I../spamdyke
+-CFLAGS := -Wall -O2 -funsigned-char -I../spamdyke
++CFLAGS += -Wall -O2 -funsigned-char -I../spamdyke
LFLAGS := -lresolv
- all: domain2path domainsplit dnstxt dnsptr dnsmx
+ all: domain2path domainsplit dnstxt dnsptr dnsmx test_smtpauth_plain test_smtpauth_login test_smtpauth_crammd5
Home |
Main Index |
Thread Index |
Old Index