Attachment #185624 for bug #216669

Lines 644-649 Link Here

(-)Makefile (+1 lines)
644	SUBDIR += slapd-cyrus	644	SUBDIR += slapd-cyrus
645	SUBDIR += sma	645	SUBDIR += sma
646	SUBDIR += smfsav	646	SUBDIR += smfsav
		647	SUBDIR += smfsav-devel
647	SUBDIR += smtp-cli	648	SUBDIR += smtp-cli
648	SUBDIR += smtp-gated	649	SUBDIR += smtp-gated
649	SUBDIR += smtpfeed	650	SUBDIR += smtpfeed

Lines 29-34 Link Here

(-)smfsav/Makefile (+2 lines)
29	PLIST_SUB= SMFSAV_RUN_DIR=${SMFSAV_RUN_DIR}	29	PLIST_SUB= SMFSAV_RUN_DIR=${SMFSAV_RUN_DIR}
30	SUB_FILES+= pkg-message	30	SUB_FILES+= pkg-message
31		31
		32	CONFLICTS= smfsav-devel-[0-9]*
		33
32	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
33	.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"	35	.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
34		36




# $FreeBSD$

PORTNAME=	smfsav
PORTVERSION=	2.1
PORTREVISION=	3
CATEGORIES=	mail
MASTER_SITES=	http://smf-sav.anw.at/
PKGNAMESUFFIX=	-devel
DISTNAME=	smf-sav-reloaded-${PORTVERSION}

MAINTAINER=	sasaki@fcc.ad.jp
COMMENT=	Sendmail Sender Address Validator

SMFSAV_RUN_DIR?=/var/run/smfs
PLIST_SUB=	SMFSAV_RUN_DIR=${SMFSAV_RUN_DIR}
SUB_FILES+=	pkg-message
SUB_LIST:=	${PLIST_SUB}

CONFLICTS=	smfsav-[0-9]*

.include <bsd.port.pre.mk>
.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"

post-patch:
.for f in readme smf-sav.c smf-sav.conf
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
		-e 's|%%SMFSAV_RUN_DIR%%|${SMFSAV_RUN_DIR}|g' ${WRKSRC}/${f}
.endfor

do-build:
	cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o smf-sav smf-sav.c ${LDFLAGS}

Lines 1-2 Link Here

(-)smfsav-devel/distinfo (-2 / +3 lines)
1	SHA256 (smfsav/smf-sav-1.4.0.tar.gz) = 77a28d012330581b5ecaf126a153f049731c399e294aab0ded53c1b0abab68cc	1	TIMESTAMP = 1503277712
2	SIZE (smfsav/smf-sav-1.4.0.tar.gz) = 21968	2	SHA256 (smf-sav-reloaded-2.1.tar.gz) = 3e3fd5deed7ea30204b8ed1be0bba7da8bd0b5af055aa72e9094e2a6b5891760
		3	SIZE (smf-sav-reloaded-2.1.tar.gz) = 23356




--- readme.orig	2012-04-08 16:07:48 UTC
+++ readme
@@ -50,18 +50,18 @@ Under FreeBSD the BIND v8 is required (p
 make
 make install
 

 
   Add this milter to start-up scripts before starting a Sendmail daemon.
 Look at the contributed samples of start-up scripts.
 
   Add these lines to your Sendmail configuration file (usually sendmail.mc):
 define(`confMILTER_MACROS_HELO', confMILTER_MACROS_HELO`, {verify}')dnl
-INPUT_MAIL_FILTER(`smf-sav', `S=unix:/var/run/smfs/smf-sav.sock, T=S:30s;R:4m')dnl
+INPUT_MAIL_FILTER(`smf-sav', `S=unix:%%SMFSAV_RUN_DIR%%/smf-sav.sock, T=S:30s;R:4m')dnl
 
 IMPORTANT: make sure that /var/run is not a group writable directory! If so,
 or chmod 755 /var/run, or if it's impossible switch to another directory.




--- smf-sav.c.orig	2013-05-25 11:48:52 UTC
+++ smf-sav.c
@@ -20,11 +20,7 @@
 #endif
 

 #define PUBLIC_NAME		"yourhost.yourdomain.tld"
 #define SAFE_CALLBACK		"postmaster@yourdomain.tld"
 #define SYSLOG_FACILITY		LOG_MAIL
@@ -81,7 +69,7 @@
 #define TO_PASS_TTL		3600
 #define TO_TEMPFAIL_TTL		300
 #define TO_FAIL_TTL		3600
-#define WORK_SPACE		"/var/run/smfs"
+#define WORK_SPACE		"%%SMFSAV_RUN_DIR%%"
 #define OCONN			"unix:" WORK_SPACE "/smf-sav.sock"
 #define USER			"smfs"
 

Lines 1-8 Link Here

(-)smfsav-devel/files/patch-smf-sav.conf (-3 / +15 lines)
1	--- smf-sav.conf.orig 2006-10-26 05:15:10.000000000 +0900	1	--- smf-sav.conf.orig 2012-04-08 17:04:38 UTC
2	+++ smf-sav.conf 2015-06-02 13:32:07.814150000 +0900	2	+++ smf-sav.conf
3	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
4	-# /etc/mail/smfs/smf-sav.conf	4	-# /etc/mail/smfs/smf-sav.conf
5	+# %%PREFIX%%/etc/smf-sav.conf	5	+# %%PREFIX%%/etc/smf-sav.conf
6	#	6	#
7	# smf-sav configuration file v1.4.0 (it's read at start)	7	# smf-sav configuration file v2.0
		8	# pre initialisised with useful values
		9	@@ -173,9 +173,9 @@ ToFailTTL 10h # recipients that did not
		10
		11	# Socket used to communicate with a Sendmail daemon
8	#	12	#
		13	-# Default: unix:/var/run/smfs/smf-sav.sock
		14	+# Default: unix:%%SMFSAV_RUN_DIR%%/smf-sav.sock
		15	#
		16	-Socket unix:/var/run/smfs/smf-sav.sock
		17	+Socket unix:%%SMFSAV_RUN_DIR%%/smf-sav.sock
		18
		19	# Facility for logging via a Syslog daemon
		20	#

Lines 3-9 Link Here

(-)smfsav-devel/files/pkg-message.in (-1 / +1 lines)
3	1. Inspect and edit the %%PREFIX%%/etc/smfsav.conf file	3	1. Inspect and edit the %%PREFIX%%/etc/smfsav.conf file
4	2. Add these lines to your Sendmail configuration file (usually sendmail.mc):	4	2. Add these lines to your Sendmail configuration file (usually sendmail.mc):
5	define(`confMILTER_MACROS_HELO', confMILTER_MACROS_HELO`, {verify}')dnl	5	define(`confMILTER_MACROS_HELO', confMILTER_MACROS_HELO`, {verify}')dnl
6	INPUT_MAIL_FILTER(`smf-sav', `S=unix:/var/run/smfs/smf-sav.sock, T=S:30s;R:4m')dnl	6	INPUT_MAIL_FILTER(`smf-sav', `S=unix:%%SMFSAV_RUN_DIR%%/smf-sav.sock, T=S:30s;R:4m')dnl
7	3. Put line smfsav_enable="YES" to /etc/rc.conf file	7	3. Put line smfsav_enable="YES" to /etc/rc.conf file
8	4. Run `service smfsav start`	8	4. Run `service smfsav start`
9	=====================================================================================	9	=====================================================================================

Lines 8-11 Link Here

(-)smfsav-devel/pkg-descr (-1 / +5 lines)
8	It's a lite alternative for the spamilter, milter-sender and milter-ahead	8	It's a lite alternative for the spamilter, milter-sender and milter-ahead
9	milters.	9	milters.
10		10
11	WWW: http://smfs.sourceforge.net/	11	This is a fork of smf-sav which was originally written by Eugene Kurmanin.
		12	It is a "reloaded" version with heavy bugfixes maintained by Gabriele
		13	Maria Plutzar.
		14
		15	WWW: http://smf-sav.anw.at/

Return to bug 216669

Lines 2-13 Link Here

(-)smfsav-devel/Makefile (-8 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= smfsav	4	PORTNAME= smfsav
5	PORTVERSION= 1.4.0	5	PORTVERSION= 2.1
6	PORTREVISION= 3
7	CATEGORIES= mail	6	CATEGORIES= mail
8	MASTER_SITES= SF/smfs	7	MASTER_SITES= http://smf-sav.anw.at/
9	DISTNAME= smf-sav-${PORTVERSION}	8	PKGNAMESUFFIX= -devel
10	DIST_SUBDIR= ${PORTNAME}	9	DISTNAME= smf-sav-reloaded-${PORTVERSION}
11		10
12	MAINTAINER= sasaki@fcc.ad.jp	11	MAINTAINER= sasaki@fcc.ad.jp
13	COMMENT= Sendmail Sender Address Validator	12	COMMENT= Sendmail Sender Address Validator
Lines 28-41 Link Here
28	SMFSAV_RUN_DIR?=/var/run/smfs	27	SMFSAV_RUN_DIR?=/var/run/smfs
29	PLIST_SUB= SMFSAV_RUN_DIR=${SMFSAV_RUN_DIR}	28	PLIST_SUB= SMFSAV_RUN_DIR=${SMFSAV_RUN_DIR}
30	SUB_FILES+= pkg-message	29	SUB_FILES+= pkg-message
		30	SUB_LIST:= ${PLIST_SUB}
31		31
		32	CONFLICTS= smfsav-[0-9]*
		33
32	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
33	.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"	35	.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
34		36
35	post-patch:	37	post-patch:
36	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/readme	38	.for f in readme smf-sav.c smf-sav.conf
37	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/smf-sav.c	39	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' \
38	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/smf-sav.conf	40	-e 's\|%%SMFSAV_RUN_DIR%%\|${SMFSAV_RUN_DIR}\|g' ${WRKSRC}/${f}
		41	.endfor
39		42
40	do-build:	43	do-build:
41	cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o smf-sav smf-sav.c ${LDFLAGS}	44	cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o smf-sav smf-sav.c ${LDFLAGS}

Lines 1-6 Link Here

(-)smfsav-devel/files/patch-readme (-3 / +11 lines)
1	--- readme.orig 2006-10-26 05:15:10.000000000 +0900	1	--- readme.orig 2012-04-08 16:07:48 UTC
2	+++ readme 2015-06-02 13:24:39.167974000 +0900	2	+++ readme
3	@@ -38,11 +38,11 @@	3	@@ -50,18 +50,18 @@ Under FreeBSD the BIND v8 is required (p
4	make	4	make
5	make install	5	make install
6		6
Lines 15-17 Link Here
15		15
16	Add this milter to start-up scripts before starting a Sendmail daemon.	16	Add this milter to start-up scripts before starting a Sendmail daemon.
17	Look at the contributed samples of start-up scripts.	17	Look at the contributed samples of start-up scripts.
		18
		19	Add these lines to your Sendmail configuration file (usually sendmail.mc):
		20	define(`confMILTER_MACROS_HELO', confMILTER_MACROS_HELO`, {verify}')dnl
		21	-INPUT_MAIL_FILTER(`smf-sav', `S=unix:/var/run/smfs/smf-sav.sock, T=S:30s;R:4m')dnl
		22	+INPUT_MAIL_FILTER(`smf-sav', `S=unix:%%SMFSAV_RUN_DIR%%/smf-sav.sock, T=S:30s;R:4m')dnl
		23
		24	IMPORTANT: make sure that /var/run is not a group writable directory! If so,
		25	or chmod 755 /var/run, or if it's impossible switch to another directory.

Lines 1-5 Link Here

(-)smfsav-devel/files/patch-smf-sav.c (-2 / +11 lines)
1	--- smf-sav.c.orig 2006-10-26 05:15:10.000000000 +0900	1	--- smf-sav.c.orig 2013-05-25 11:48:52 UTC
2	+++ smf-sav.c 2015-06-02 13:30:44.250725000 +0900	2	+++ smf-sav.c
3	@@ -20,11 +20,7 @@	3	@@ -20,11 +20,7 @@
4	#endif	4	#endif
5		5
Lines 42-44 Link Here
42	#define PUBLIC_NAME "yourhost.yourdomain.tld"	42	#define PUBLIC_NAME "yourhost.yourdomain.tld"
43	#define SAFE_CALLBACK "postmaster@yourdomain.tld"	43	#define SAFE_CALLBACK "postmaster@yourdomain.tld"
44	#define SYSLOG_FACILITY LOG_MAIL	44	#define SYSLOG_FACILITY LOG_MAIL
		45	@@ -81,7 +69,7 @@
		46	#define TO_PASS_TTL 3600
		47	#define TO_TEMPFAIL_TTL 300
		48	#define TO_FAIL_TTL 3600
		49	-#define WORK_SPACE "/var/run/smfs"
		50	+#define WORK_SPACE "%%SMFSAV_RUN_DIR%%"
		51	#define OCONN "unix:" WORK_SPACE "/smf-sav.sock"
		52	#define USER "smfs"
		53