ports/80090: [maintainer update] Update port: mail/smc-milter - Update to 1.6
Andrey E. Shevtsov
nyxo at dnuc.polyn.kiae.su
Tue Apr 19 08:00:45 UTC 2005
>Number: 80090
>Category: ports
>Synopsis: [maintainer update] Update port: mail/smc-milter - Update to 1.6
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 19 08:00:44 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Andrey E. Shevtsov
>Release: FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD dnuc.polyn.kiae.su 4.10-STABLE FreeBSD 4.10-STABLE #1: Fri Feb 18 16:41:31 MSK 2005 nyxo at dnuc.polyn.kiae.su:/usr/src/sys/compile/DNUC i386
>Description:
Update to latest version - 1.6
>How-To-Repeat:
>Fix:
diff -ruN smc-milter.bak/Makefile smc-milter/Makefile
--- smc-milter.bak/Makefile Wed Apr 6 12:48:12 2005
+++ smc-milter/Makefile Tue Apr 19 11:11:59 2005
@@ -2,11 +2,11 @@
# Date created: 30 March 2005
# Whom: Andrey E. Shevtsov
#
-# $FreeBSD: ports/mail/smc-milter/Makefile,v 1.1 2005/04/06 08:48:12 pav Exp $
+# $FreeBSD$
#
PORTNAME= smc-milter
-PORTVERSION= 1.5
+PORTVERSION= 1.6
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= milter
@@ -15,7 +15,6 @@
COMMENT= A non-context email filter
BUILD_DEPENDS= ${LOCALBASE}/lib/libbind_r.a:${PORTSDIR}/dns/bind84
-LIB_DEPENDS= db-4.2.2:${PORTSDIR}/databases/db42
USE_GMAKE= yes
USE_REINPLACE= yes
@@ -23,12 +22,15 @@
NOMAN=
post-extract:
- @${REINPLACE_CMD} -e 's|\/opt\/SMC|\/usr\/local\/etc\/smc|g ; \
- s|aliases|mail\/aliases|g' \
+ @${REINPLACE_CMD} -e 's|\/opt\/SMC|${PREFIX}\/etc\/smc|g' \
${WRKSRC}/smc-milter.h
+post-patch:
+ @${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' \
+ ${WRKSRC}/Makefile
+
post-install:
- ${INSTALL_SCRIPT} ${FILESDIR}/smc-milter.sh \
- ${PREFIX}/etc/rc.d/smc-milter.sh
+ ${INSTALL_SCRIPT} ${WRKSRC}/smc-milter.sh \
+ ${PREFIX}/etc/rc.d/smc-milter.sh.sample
.include <bsd.port.mk>
diff -ruN smc-milter.bak/distinfo smc-milter/distinfo
--- smc-milter.bak/distinfo Wed Apr 6 12:48:12 2005
+++ smc-milter/distinfo Tue Apr 19 11:11:59 2005
@@ -1,2 +1,2 @@
-MD5 (smc-milter-1.5.tar.gz) = d772a8f0d2d6cfccd50ea8668a4881d0
-SIZE (smc-milter-1.5.tar.gz) = 96274
+MD5 (smc-milter-1.6.tar.gz) = 668719c377a5f29fb84ea2481732954b
+SIZE (smc-milter-1.6.tar.gz) = 97610
diff -ruN smc-milter.bak/files/patch-Makefile smc-milter/files/patch-Makefile
--- smc-milter.bak/files/patch-Makefile Wed Apr 6 12:48:12 2005
+++ smc-milter/files/patch-Makefile Tue Apr 19 11:11:59 2005
@@ -1,62 +1,45 @@
-*** Makefile.orig Mon Mar 14 08:27:09 2005
---- Makefile Sun Apr 3 17:28:21 2005
-***************
-*** 10,20 ****
- # CFLAGS = -g -O2 -Wall -D_GNU_SOURCE -D_REENTRANT -I/usr/lib/bind/include
- # LIBS = /usr/lib/bind/lib/libbind_r.a -lmilter -pthread -lssl -ldb
- # if glibc >= 2.2
-! CFLAGS = -g -O2 -Wall -D_GNU_SOURCE -D_REENTRANT
-! LIBS = -lmilter -pthread -lssl -ldb -lresolv
- MILTER = smc-milter
-! INSDIR = /opt/SMC
-! CC = gcc
-
- all: milter
-
---- 10,24 ----
- # CFLAGS = -g -O2 -Wall -D_GNU_SOURCE -D_REENTRANT -I/usr/lib/bind/include
- # LIBS = /usr/lib/bind/lib/libbind_r.a -lmilter -pthread -lssl -ldb
- # if glibc >= 2.2
-! CFLAGS += -g -O2 -Wall -D_GNU_SOURCE -D_REENTRANT \
-! -I/usr/local/include/bind -I/usr/local/include/db42
-! LIBS = -lmilter -pthread -lssl -L/usr/local/lib/db42 -ldb \
-! -L/usr/local/lib -lbind_r -lcrypto
- MILTER = smc-milter
-! BASEINSDIR = /usr/local
-! CONFINSDIR = $(BASEINSDIR)/etc/smc
-! BININSDIR = $(BASEINSDIR)/bin
-! CC ?= gcc
-
- all: milter
-
-***************
-*** 29,42 ****
-
-
- install:
-! [ -d "$(INSDIR)" ] || mkdir $(INSDIR)
- if [ -n "$(MILTER)" ]; then \
- strip $(MILTER) ; \
-! install -m 755 $(MILTER) $(INSDIR) ; \
- fi
-! install -m 644 $(MILTER).conf $(INSDIR)
-! install -m 644 $(MILTER).policy $(INSDIR)
-! install -m 644 $(MILTER).users $(INSDIR)
-
- remove:
- rm -f $(INSDIR)/$(MILTER)*
---- 33,46 ----
-
-
- install:
-! [ -d "$(CONFINSDIR)" ] || mkdir $(CONFINSDIR)
- if [ -n "$(MILTER)" ]; then \
- strip $(MILTER) ; \
-! install -m 755 $(MILTER) $(BININSDIR) ; \
- fi
-! install -m 644 $(MILTER).conf $(CONFINSDIR)
-! install -m 644 $(MILTER).policy $(CONFINSDIR)
-! install -m 644 $(MILTER).users $(CONFINSDIR)
-
- remove:
- rm -f $(INSDIR)/$(MILTER)*
+--- Makefile.orig Mon Apr 18 21:07:30 2005
++++ Makefile Mon Apr 18 21:07:36 2005
+@@ -5,8 +5,9 @@
+ SRCS = utils.c relay.c smtp.c regex.c
+ MILTER_OBJS = utils.o relay.o smtp.o regex.o
+ MILTER = smc-milter
+-INSDIR = /opt/SMC
+-CC = gcc
++BINDIR = @PREFIX@/bin
++ETCDIR = @PREFIX@/etc/smc
++CC ?= gcc
+
+ ifdef DEBUG
+ CFLAGS = -g -ggdb2
+@@ -18,8 +19,8 @@
+ CFLAGS += -Wall -D_GNU_SOURCE -D_REENTRANT -I/usr/lib/bind/include
+ LIBS = /usr/lib/bind/lib/libbind_r.a -lmilter -pthread -lssl
+ else
+- CFLAGS += -Wall -D_GNU_SOURCE -D_REENTRANT
+- LIBS = -lmilter -pthread -lssl -lresolv
++ CFLAGS += -Wall -D_GNU_SOURCE -D_REENTRANT -I/usr/local/include/bind
++ LIBS = -lmilter -pthread -lssl -lbind_r -lcrypto -L/usr/local/lib
+ endif
+
+ all: milter
+@@ -31,14 +32,14 @@
+ $(CC) $(CFLAGS) -c $<
+
+ install:
+- [ -d "$(INSDIR)" ] || mkdir $(INSDIR)
++ [ -d "$(ETCDIR)" ] || mkdir $(ETCDIR)
+ if [ -n "$(MILTER)" ]; then \
+ strip $(MILTER) ; \
+- install -m 755 $(MILTER) $(INSDIR) ; \
++ install -m 755 $(MILTER) $(BINDIR) ; \
+ fi
+- install -m 644 $(MILTER).conf $(INSDIR)
+- install -m 644 $(MILTER).policy $(INSDIR)
+- install -m 644 $(MILTER).users $(INSDIR)
++ install -m 644 $(MILTER).conf $(ETCDIR)
++ install -m 644 $(MILTER).policy $(ETCDIR)
++ install -m 644 $(MILTER).users $(ETCDIR)
+
+ remove:
+ rm -f $(INSDIR)/$(MILTER)*
diff -ruN smc-milter.bak/files/patch-regex.c smc-milter/files/patch-regex.c
--- smc-milter.bak/files/patch-regex.c Wed Apr 6 12:48:12 2005
+++ smc-milter/files/patch-regex.c Thu Jan 1 03:00:00 1970
@@ -1,36 +0,0 @@
-*** regex.c.orig Thu Mar 10 06:10:48 2005
---- regex.c Wed Mar 23 17:51:06 2005
-***************
-*** 58,64 ****
- # include <wctype.h>
- #endif
-
-! #include <malloc.h>
- #include "regex.h"
-
- /* This is for multi byte string support. */
---- 58,64 ----
- # include <wctype.h>
- #endif
-
-! #include <stdlib.h>
- #include "regex.h"
-
- /* This is for multi byte string support. */
-***************
-*** 148,159 ****
---- 148,161 ----
- even if config.h says that we can. */
- # undef REL_ALLOC
-
-+ #ifndef _STDLIB_H_
- # if defined STDC_HEADERS || defined _LIBC
- # include <stdlib.h>
- # else
- char *malloc ();
- char *realloc ();
- # endif
-+ #endif /* _STDLIB_H_ */
-
- /* When used in Emacs's lib-src, we need to get bzero and bcopy somehow.
- If nothing else has been done, use the method below. */
diff -ruN smc-milter.bak/files/patch-relay.c smc-milter/files/patch-relay.c
--- smc-milter.bak/files/patch-relay.c Wed Apr 6 12:48:12 2005
+++ smc-milter/files/patch-relay.c Thu Jan 1 03:00:00 1970
@@ -1,21 +0,0 @@
-*** relay.c.orig Thu Mar 10 06:23:13 2005
---- relay.c Thu Mar 24 11:23:49 2005
-***************
-*** 202,209 ****
- return -1;
- }
-
-! if (!(gethostbyname_r(host_name, &host_buf, buffer, sizeof(buffer),
-! &host, &ret))) {
- while (*host->h_addr_list) {
- if (host_addr == *(uint32_t *)(*host->h_addr_list)) {
- resolver_close(&res_local);
---- 202,209 ----
- return -1;
- }
-
-! host = gethostbyname_r(host_name, &host_buf, buffer, sizeof(buffer), &ret);
-! if (!ret) {
- while (*host->h_addr_list) {
- if (host_addr == *(uint32_t *)(*host->h_addr_list)) {
- resolver_close(&res_local);
diff -ruN smc-milter.bak/files/patch-smc-milter.c smc-milter/files/patch-smc-milter.c
--- smc-milter.bak/files/patch-smc-milter.c Wed Apr 6 12:48:12 2005
+++ smc-milter/files/patch-smc-milter.c Thu Jan 1 03:00:00 1970
@@ -1,45 +0,0 @@
-*** smc-milter.c.orig Thu Mar 10 06:10:48 2005
---- smc-milter.c Thu Mar 24 12:09:11 2005
-***************
-*** 65,70 ****
---- 65,74 ----
- #include "relay.h"
- #include "smtp.h"
-
-+ #if !defined O_SYNC && defined O_FSYNC
-+ #define O_SYNC O_FSYNC
-+ #endif
-+
- /* Static variables for config defaults, etc. */
- static int runmode = 0;
- static char *smfisock = NULL;
-***************
-*** 161,166 ****
---- 165,191 ----
- "<(i?frame|object|embed|applet)[^>]*>",
- "\\son(\\w+)=[^> ]+", NULL
- };
-+
-+ #ifndef strndup
-+ char *strndup(char const* s, size_t n)
-+ {
-+ void* voided = (void*)s;
-+ void* match;
-+ char *ret;
-+ size_t len;
-+
-+ if (!s || !n) return NULL;
-+ match = memchr(voided, 0, n);
-+ len =
-+ match
-+ ? (char*)match - s
-+ : n+1;
-+ ret = (char*)malloc(len);
-+ memcpy(ret, s, len-1);
-+ ret[len] = '\0';
-+ return ret;
-+ }
-+ #endif
-
- void
- signal_handler (int sig) {
diff -ruN smc-milter.bak/files/patch-smtp.c smc-milter/files/patch-smtp.c
--- smc-milter.bak/files/patch-smtp.c Wed Apr 6 12:48:12 2005
+++ smc-milter/files/patch-smtp.c Thu Jan 1 03:00:00 1970
@@ -1,35 +0,0 @@
-*** smtp.c.orig Thu Mar 10 06:10:48 2005
---- smtp.c Thu Mar 24 11:38:42 2005
-***************
-*** 50,55 ****
---- 50,59 ----
- #define SMTP_CMD_PERM(x) (500 <= (x) && (x) < 600)
- #define SMTP_DATA_OK(x) ((x) == 354)
-
-+ #ifndef MSG_NOSIGNAL
-+ #define MSG_NOSIGNAL 0
-+ #endif
-+
- typedef union {
- HEADER hdr;
- u_char buf[MAXPACKET];
-***************
-*** 326,333 ****
- int optval = 1;
- char buffer[8192];
-
-! if ((gethostbyname_r(mxhost, &host_buf, buffer, sizeof(buffer),
-! &host, &ret))) return -1;
-
- memset(&address, 0, sizeof(struct sockaddr));
- address.sin_addr.s_addr = *(uint32_t *)host->h_addr_list[0];
---- 330,338 ----
- int optval = 1;
- char buffer[8192];
-
-! host = gethostbyname_r(mxhost, &host_buf, buffer, sizeof(buffer), &ret);
-! if(ret)
-! return -1;
-
- memset(&address, 0, sizeof(struct sockaddr));
- address.sin_addr.s_addr = *(uint32_t *)host->h_addr_list[0];
diff -ruN smc-milter.bak/files/patch-utils.c smc-milter/files/patch-utils.c
--- smc-milter.bak/files/patch-utils.c Wed Apr 6 12:48:12 2005
+++ smc-milter/files/patch-utils.c Thu Jan 1 03:00:00 1970
@@ -1,15 +0,0 @@
-*** utils.c.orig Thu Mar 10 06:10:48 2005
---- utils.c Thu Mar 24 11:40:56 2005
-***************
-*** 32,37 ****
---- 32,41 ----
- #define MAXLINE 4096
- #endif
-
-+ #if !defined O_SYNC && defined O_FSYNC
-+ #define O_SYNC O_FSYNC
-+ #endif
-+
- typedef struct {
- char name[PATH_MAX+1];
- pthread_mutex_t lock;
diff -ruN smc-milter.bak/files/smc-milter.sh smc-milter/files/smc-milter.sh
--- smc-milter.bak/files/smc-milter.sh Wed Apr 6 12:48:12 2005
+++ smc-milter/files/smc-milter.sh Thu Jan 1 03:00:00 1970
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-case "$1" in
- start)
- /usr/local/bin/smc-milter
- echo ' smc-milter'
- ;;
- stop)
- if [ -f /var/run/smc-milter.pid ]; then
- kill `cat /var/run/smc-milter.pid`
- echo ' smc-milter'
- fi
- ;;
- *)
- echo ""
- echo "Usage: `basename $0` { start | stop }"
- echo ""
- exit 64
- ;;
-esac
diff -ruN smc-milter.bak/pkg-message smc-milter/pkg-message
--- smc-milter.bak/pkg-message Wed Apr 6 12:48:12 2005
+++ smc-milter/pkg-message Tue Apr 19 11:11:59 2005
@@ -1,9 +1,10 @@
-The start/stop script has been placed in $PREFIX/etc/rc.d/smc-milter.sh
+The start/stop script sample has been placed in
+$PREFIX/etc/rc.d/smc-milter.sh.sample
Configuration files has been placed in $PREFIX/etc/smc/
Add this lines to your sendmail's .mc file:
-define(`confMILTER_MACROS_CONNECT', `{client_addr}')dnl
+define(`confMILTER_MACROS_CONNECT', `{client_addr}', `{client_name}')dnl
INPUT_MAIL_FILTER(`SMC-milter', `S=local:/var/run/smc-milter.sock, F=T, T=C:30m;S:10m;R:10m;E:30m')dnl
Then generate new sendmail.cf, install it, start smc-milter and finally
diff -ruN smc-milter.bak/pkg-plist smc-milter/pkg-plist
--- smc-milter.bak/pkg-plist Wed Apr 6 12:48:12 2005
+++ smc-milter/pkg-plist Tue Apr 19 11:11:59 2005
@@ -3,4 +3,4 @@
etc/smc/smc-milter.policy
etc/smc/smc-milter.users
@dirrm etc/smc
-etc/rc.d/smc-milter.sh
+etc/rc.d/smc-milter.sh.sample
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list