Date: Wed, 14 Nov 2007 14:49:13 GMT From: Thomas Sandford <freebsduser@paradisegreen.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/118045: [PATCH] mail/smc-milter: unBREAK, update to 1.9, take maintainership Message-ID: <200711141449.lAEEnDNB059815@miriam.paradisegreen.co.uk> Resent-Message-ID: <200711141530.lAEFU38f055190@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 118045
>Category: ports
>Synopsis: [PATCH] mail/smc-milter: unBREAK, update to 1.9, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Nov 14 15:30:03 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Thomas Sandford
>Release: FreeBSD 7.0-BETA2 i386
>Organization:
Paradise Green Technical Services
>Environment:
System: FreeBSD miriam.paradisegreen.co.uk 7.0-BETA2 FreeBSD 7.0-BETA2 #0: Fri Nov 2 16:47:33 UTC
>Description:
- unBREAK
- Update to 1.9
- Take maintainership
Note: unBREAKing required an update to the latest version as it wasn't
worth spending time fixing the compilation problems with modern GCC in
an obsolete version of the source.
Added file(s):
- files/miltersmc.in
- files/patch-configure
- files/patch-smc_milter_c
Removed file(s):
- files/patch-Makefile
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- smc-milter-1.9.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/smc-milter_orig/Makefile /usr/ports/mail/smc-milter/Makefile
--- /usr/ports/mail/smc-milter_orig/Makefile 2007-11-14 13:01:30.000000000 +0000
+++ /usr/ports/mail/smc-milter/Makefile 2007-11-14 14:43:13.000000000 +0000
@@ -6,17 +6,18 @@
#
PORTNAME= smc-milter
-PORTVERSION= 1.6
+PORTVERSION= 1.9
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= milter
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= freebsduser@paradisegreen.co.uk
COMMENT= A non-context email filter
-BUILD_DEPENDS= ${LOCALBASE}/lib/libbind_r.a:${PORTSDIR}/dns/bind84
-
USE_GMAKE= yes
+GNU_CONFIGURE= yes
+
+USE_RC_SUBR= miltersmc
MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS}
@@ -24,16 +25,21 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 700042
-BROKEN= Does not compile with GCC 4.2
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|\/opt\/SMC|${PREFIX}\/etc\/smc|g' \
${WRKSRC}/smc-milter.h
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/smc-milter.sh \
- ${PREFIX}/etc/rc.d/smc-milter.sh.sample
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/smc-milter \
+ ${PREFIX}/sbin/miltersmc
+ ${MKDIR} ${PREFIX}/etc/smc
+ ${INSTALL_DATA} ${WRKSRC}/smc-milter.conf \
+ ${PREFIX}/etc/smc/miltersmc.conf.sample
+ ${INSTALL_DATA} ${WRKSRC}/smc-milter.hosts \
+ ${PREFIX}/etc/smc/miltersmc.hosts.sample
+ ${INSTALL_DATA} ${WRKSRC}/smc-milter.policy \
+ ${PREFIX}/etc/smc/miltersmc.policy.sample
+ ${INSTALL_DATA} ${WRKSRC}/smc-milter.users \
+ ${PREFIX}/etc/smc/miltersmc.users.sample
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/mail/smc-milter_orig/distinfo /usr/ports/mail/smc-milter/distinfo
--- /usr/ports/mail/smc-milter_orig/distinfo 2007-11-14 13:01:30.000000000 +0000
+++ /usr/ports/mail/smc-milter/distinfo 2007-11-14 13:02:52.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (smc-milter-1.6.tar.gz) = 668719c377a5f29fb84ea2481732954b
-SHA256 (smc-milter-1.6.tar.gz) = 494f59b73a5dc7db44eae6a9320fd1da8fc7e5f3bca8c476e191cf5de0d9301d
-SIZE (smc-milter-1.6.tar.gz) = 97610
+MD5 (smc-milter-1.9.tar.gz) = 297f6908c82822f85223dc6f58dffe64
+SHA256 (smc-milter-1.9.tar.gz) = 2dfee697bb4a510e5f341d81846819b3887c2993d0d68177c8ded4436e6adcc3
+SIZE (smc-milter-1.9.tar.gz) = 94804
diff -ruN --exclude=CVS /usr/ports/mail/smc-milter_orig/files/miltersmc.in /usr/ports/mail/smc-milter/files/miltersmc.in
--- /usr/ports/mail/smc-milter_orig/files/miltersmc.in 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/mail/smc-milter/files/miltersmc.in 2007-11-14 14:21:50.000000000 +0000
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# PROVIDE: miltersmc
+# REQUIRE: DAEMON
+# BEFORE: mail
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# miltersmc_enable (bool): Set to NO by default.
+# Set it to YES to enable miltersmc.
+#
+
+. %%RC_SUBR%%
+
+name="miltersmc"
+rcvar=${name}_enable
+
+command=%%PREFIX%%/sbin/${name}
+pidfile=/var/run/${name}.pid
+
+load_rc_config $name
+
+: ${miltersmc_enable="NO"}
+
+command_args=""
+
+run_rc_command "$1"
diff -ruN --exclude=CVS /usr/ports/mail/smc-milter_orig/files/patch-Makefile /usr/ports/mail/smc-milter/files/patch-Makefile
--- /usr/ports/mail/smc-milter_orig/files/patch-Makefile 2007-11-14 13:01:30.000000000 +0000
+++ /usr/ports/mail/smc-milter/files/patch-Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
---- 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${LOCALBASE}/include/bind
-+ LIBS = -lmilter ${PTHREAD_LIBS} -lssl -lbind_r -lcrypto -L${LOCALBASE}/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 --exclude=CVS /usr/ports/mail/smc-milter_orig/files/patch-configure /usr/ports/mail/smc-milter/files/patch-configure
--- /usr/ports/mail/smc-milter_orig/files/patch-configure 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/mail/smc-milter/files/patch-configure 2007-11-14 14:34:55.000000000 +0000
@@ -0,0 +1,24 @@
+--- configure.orig 2007-11-14 14:33:32.000000000 +0000
++++ configure 2007-11-14 14:34:49.000000000 +0000
+@@ -6425,14 +6425,14 @@
+
+
+ if test "$prefix" = "NONE"; then prefix=""; fi
+-eval CONFIG_FILE="${sysconfdir}/smc-milter.conf"
+-eval USERS_FILE="${sysconfdir}/smc-milter.users"
+-eval POLICY_FILE="${sysconfdir}/smc-milter.policy"
+-eval HOSTS_FILE="${sysconfdir}/smc-milter.hosts"
+-eval SOCKET_FILE="${localstatedir}/run/smc-milter.sock"
+-eval PID_FILE="${localstatedir}/run/smc-milter.pid"
++eval CONFIG_FILE="${sysconfdir}/smcmilter.conf"
++eval USERS_FILE="${sysconfdir}/smcmilter.users"
++eval POLICY_FILE="${sysconfdir}/smcmilter.policy"
++eval HOSTS_FILE="${sysconfdir}/smcmilter.hosts"
++eval SOCKET_FILE="${localstatedir}/run/smcmilter.sock"
++eval PID_FILE="${localstatedir}/run/smcmilter.pid"
+ eval TMP_FILE="${localstatedir}/tmp/smc-file.XXXXXX"
+-eval CACHE_FILE="${localstatedir}/tmp/smc-milter.dat"
++eval CACHE_FILE="${localstatedir}/tmp/smcmilter.dat"
+
+
+ cat >>confdefs.h <<_ACEOF
diff -ruN --exclude=CVS /usr/ports/mail/smc-milter_orig/files/patch-smc_milter_c /usr/ports/mail/smc-milter/files/patch-smc_milter_c
--- /usr/ports/mail/smc-milter_orig/files/patch-smc_milter_c 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/mail/smc-milter/files/patch-smc_milter_c 2007-11-14 13:04:50.000000000 +0000
@@ -0,0 +1,11 @@
+--- smc-milter.c.orig 2007-11-14 13:03:57.000000000 +0000
++++ smc-milter.c 2007-11-14 13:04:25.000000000 +0000
+@@ -52,7 +52,7 @@
+ #include <resolv.h>
+ #include <netdb.h>
+ #include <openssl/md5.h>
+-#include <regex.h>
++#include <gnu/posix/regex.h>
+ #include "libmilter/mfapi.h"
+ #include "smc-milter.h"
+ #include "utils.h"
diff -ruN --exclude=CVS /usr/ports/mail/smc-milter_orig/pkg-message /usr/ports/mail/smc-milter/pkg-message
--- /usr/ports/mail/smc-milter_orig/pkg-message 2007-11-14 13:01:30.000000000 +0000
+++ /usr/ports/mail/smc-milter/pkg-message 2007-11-14 14:41:20.000000000 +0000
@@ -1,12 +1,17 @@
-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/
+The start/stop script has been placed in
+$PREFIX/etc/rc.d/
-Add this lines to your sendmail's .mc file:
+Sample configuration files have been placed in $PREFIX/etc/smc/ - copy
+these and edit to suit your local configuration.
+
+Add this line to /etc/rc.conf or /etc/rc.conf.local
+
+miltersmc="YES"
+
+Add this line to your sendmail's .mc file:
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
+INPUT_MAIL_FILTER(`SMC-milter', `S=local:/var/run/miltersmc.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
+Then generate new sendmail.cf, install it, start miltersmc and finally
restart sendmail.
-
diff -ruN --exclude=CVS /usr/ports/mail/smc-milter_orig/pkg-plist /usr/ports/mail/smc-milter/pkg-plist
--- /usr/ports/mail/smc-milter_orig/pkg-plist 2007-11-14 13:01:30.000000000 +0000
+++ /usr/ports/mail/smc-milter/pkg-plist 2007-11-14 14:23:07.000000000 +0000
@@ -1,6 +1,6 @@
-bin/smc-milter
-etc/smc/smc-milter.conf
-etc/smc/smc-milter.policy
-etc/smc/smc-milter.users
+sbin/miltersmc
+etc/smc/miltersmc.conf.sample
+etc/smc/miltersmc.policy.sample
+etc/smc/miltersmc.users.sample
+etc/smc/miltersmc.hosts.sample
@dirrm etc/smc
-etc/rc.d/smc-milter.sh.sample
--- smc-milter-1.9.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711141449.lAEEnDNB059815>