diff options
| -rw-r--r-- | mail/mimedefang/Makefile | 7 | ||||
| -rw-r--r-- | mail/mimedefang/PLIST | 4 | ||||
| -rw-r--r-- | mail/mimedefang/distinfo | 9 | ||||
| -rw-r--r-- | mail/mimedefang/patches/patch-aa | 32 | ||||
| -rw-r--r-- | mail/mimedefang/patches/patch-ab | 25 |
5 files changed, 20 insertions, 57 deletions
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile index c7052a1a40d..6ca3288762e 100644 --- a/mail/mimedefang/Makefile +++ b/mail/mimedefang/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2002/09/26 02:03:40 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/10/30 09:50:24 markd Exp $ -DISTNAME= mimedefang-2.21 +DISTNAME= mimedefang-2.24 CATEGORIES= mail MASTER_SITES= http://www.roaringpenguin.com/mimedefang/ @@ -48,6 +48,7 @@ CONFIGURE_ARGS+= --with-milterinc=${BUILDLINK_PREFIX.libmilter}/include CONFIGURE_ARGS+= --with-milterlib=${BUILDLINK_PREFIX.libmilter}/lib CONFIGURE_ARGS+= --with-spooldir=${DEFANG_SPOOLDIR} CONFIGURE_ARGS+= --with-quarantinedir=${DEFANG_SPOOLDIR} +CONFIGURE_ARGS+= --disable-anti-virus do-install: ${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR} @@ -55,9 +56,11 @@ do-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA_DIR} ${SHAREDIR} ${INSTALL_DATA} ${WRKSRC}/gen-ip-validator.pl ${SHAREDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/md-mx-ctrl ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/mimedefang-multiplexor ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/mimedefang ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/mimedefang.pl ${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/md-mx-ctrl.8 ${PREFIX}/man/man8 ${INSTALL_DATA} ${WRKSRC}/mimedefang.8 ${PREFIX}/man/man8 ${INSTALL_DATA} ${WRKSRC}/mimedefang.pl.8 ${PREFIX}/man/man8 ${INSTALL_DATA} ${WRKSRC}/mimedefang-multiplexor.8 ${PREFIX}/man/man8 diff --git a/mail/mimedefang/PLIST b/mail/mimedefang/PLIST index d0031ef0f33..4d08153a30e 100644 --- a/mail/mimedefang/PLIST +++ b/mail/mimedefang/PLIST @@ -1,9 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/23 13:08:52 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/10/30 09:50:24 markd Exp $ +bin/md-mx-ctrl bin/mimedefang bin/mimedefang-multiplexor bin/mimedefang.pl man/man5/mimedefang-filter.5 man/man7/mimedefang-protocol.7 +man/man8/md-mx-ctrl.8 man/man8/mimedefang-multiplexor.8 man/man8/mimedefang.8 man/man8/mimedefang.pl.8 diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo index 6982f80959a..dbfb9f566db 100644 --- a/mail/mimedefang/distinfo +++ b/mail/mimedefang/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/09/23 13:08:52 markd Exp $ +$NetBSD: distinfo,v 1.2 2002/10/30 09:50:24 markd Exp $ -SHA1 (mimedefang-2.21.tar.gz) = 6103858e0691b8ad6db485895d2a969d40f313ff -Size (mimedefang-2.21.tar.gz) = 155058 bytes -SHA1 (patch-aa) = 7ab60d4658ff20d35855589b20ecbc3227d4f6b4 -SHA1 (patch-ab) = 5292221656aa46f49873ccfbadf3e7a95042baed +SHA1 (mimedefang-2.24.tar.gz) = e2475d5a7049112b03630465b92c09041fc5a472 +Size (mimedefang-2.24.tar.gz) = 186609 bytes +SHA1 (patch-ab) = 624a7e562c3d761069b0726e398852288d267937 diff --git a/mail/mimedefang/patches/patch-aa b/mail/mimedefang/patches/patch-aa deleted file mode 100644 index 59253380701..00000000000 --- a/mail/mimedefang/patches/patch-aa +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/09/23 13:08:52 markd Exp $ - ---- rm_r.c~ Sat Sep 7 01:43:35 2002 -+++ rm_r.c Mon Sep 23 16:57:39 2002 -@@ -24,6 +24,27 @@ - #include <syslog.h> - #include <string.h> - -+#ifdef __NetBSD__ -+/* -+ * Fake an readdir_r until such time as NetBSD has one -+ * think this should be good enough for the nonpreemptive thread packages -+ */ -+int -+readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result) -+{ -+ struct dirent *tmp_dirp; -+ -+ tmp_dirp = readdir(dirp); -+ if (!tmp_dirp) { -+ *result = NULL; -+ return -1; -+ } -+ memcpy (entry, tmp_dirp, sizeof(struct dirent)); -+ *result = entry; -+ return 0; -+} -+#endif -+ - /********************************************************************** - * %FUNCTION: rm_r - * %ARGUMENTS: diff --git a/mail/mimedefang/patches/patch-ab b/mail/mimedefang/patches/patch-ab index 85ad2586a7f..97b07b4ab3c 100644 --- a/mail/mimedefang/patches/patch-ab +++ b/mail/mimedefang/patches/patch-ab @@ -1,22 +1,13 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/09/23 13:08:52 markd Exp $ +$NetBSD: patch-ab,v 1.2 2002/10/30 09:50:25 markd Exp $ ---- Makefile.in~ Mon Sep 23 17:06:19 2002 -+++ Makefile.in Mon Sep 23 17:15:41 2002 -@@ -51,7 +51,7 @@ - all: mimedefang mimedefang-multiplexor - - mimedefang-multiplexor: mimedefang-multiplexor.o event.o event_tcp.o drop_privs.o -- @CC@ @CFLAGS@ -o mimedefang-multiplexor mimedefang-multiplexor.o event.o event_tcp.o drop_privs.o @LIBS@ -+ @CC@ @CFLAGS@ -o mimedefang-multiplexor mimedefang-multiplexor.o event.o event_tcp.o drop_privs.o @LDFLAGS@ @LIBS@ - -strip mimedefang-multiplexor - - rm_r.o: rm_r.c -@@ -70,7 +70,7 @@ +--- Makefile.in.orig Mon Oct 28 23:13:01 2002 ++++ Makefile.in +@@ -94,7 +94,7 @@ @CC@ @CFLAGS@ $(DEFS) $(MINCLUDE) -c -o mimedefang-multiplexor.o mimedefang-multiplexor.c - mimedefang: mimedefang.o drop_privs.o utils.o rm_r.o -- @CC@ @CFLAGS@ @PTHREAD_FLAG@ -o mimedefang mimedefang.o drop_privs.o utils.o rm_r.o @LIBMILTER@ @LIBS@ -+ @CC@ @CFLAGS@ @PTHREAD_FLAG@ -o mimedefang mimedefang.o drop_privs.o utils.o rm_r.o @LDFLAGS@ @LIBMILTER@ @LIBS@ - -strip mimedefang + mimedefang: mimedefang.o drop_privs_threaded.o utils.o rm_r.o +- @CC@ @CFLAGS@ @PTHREAD_FLAG@ -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o @LIBMILTER@ @LIBS@ ++ @CC@ @CFLAGS@ @PTHREAD_FLAG@ -o mimedefang mimedefang.o drop_privs_threaded.o utils.o rm_r.o @LDFLAGS@ @LIBMILTER@ @LIBS@ + -test "$(DONT_STRIP)" != "1" && strip mimedefang mimedefang.o: mimedefang.c mimedefang.h |