Attachment 179463 Details for Bug 216652 – update for mail/smfsav

[patch] update for mail/smfsav

patch.txt (text/plain), 4.53 KB, created by Kan Sasaki on 2017-01-31 04:25:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kan Sasaki

Created: 2017-01-31 04:25:23 UTC

Size: 4.53 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 432894)
>+++ Makefile	(working copy)
>@@ -28,14 +28,16 @@
> SMFSAV_RUN_DIR?=/var/run/smfs
> PLIST_SUB=	SMFSAV_RUN_DIR=${SMFSAV_RUN_DIR}
> SUB_FILES+=	pkg-message
>+SUB_LIST:=	${PLIST_SUB}
> 
> .include <bsd.port.pre.mk>
> .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/readme
>-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/smf-sav.c
>-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/smf-sav.conf
>+.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}
>Index: files/patch-readme
>===================================================================
>--- files/patch-readme	(revision 432894)
>+++ files/patch-readme	(working copy)
>@@ -1,6 +1,6 @@
>---- readme.orig	2006-10-26 05:15:10.000000000 +0900
>-+++ readme	2015-06-02 13:24:39.167974000 +0900
>-@@ -38,11 +38,11 @@
>+--- readme.orig	2006-10-25 20:15:10 UTC
>++++ readme
>+@@ -38,18 +38,18 @@ Under FreeBSD the BIND v8 is required (p
>  make
>  make install
>  
>@@ -15,3 +15,18 @@
>  
>    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.
>+@@ -145,4 +145,4 @@ SMFS development blog (opened for all):
>+ http://smfs.sourceforge.net/
>+ http://sourceforge.net/projects/smfs/
>+ http://kurmanin.info/
>+-    
>+\ No newline at end of file
>++    
>Index: files/patch-smf-sav.c
>===================================================================
>--- files/patch-smf-sav.c	(revision 432894)
>+++ files/patch-smf-sav.c	(working copy)
>@@ -1,5 +1,5 @@
>---- smf-sav.c.orig	2006-10-26 05:15:10.000000000 +0900
>-+++ smf-sav.c	2015-06-02 13:30:44.250725000 +0900
>+--- smf-sav.c.orig	2006-10-25 20:15:10 UTC
>++++ smf-sav.c
> @@ -20,11 +20,7 @@
>  #endif
>  
>@@ -42,3 +42,12 @@
>  #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"
>+ 
>Index: files/patch-smf-sav.conf
>===================================================================
>--- files/patch-smf-sav.conf	(revision 432894)
>+++ files/patch-smf-sav.conf	(working copy)
>@@ -1,5 +1,5 @@
>---- smf-sav.conf.orig	2006-10-26 05:15:10.000000000 +0900
>-+++ smf-sav.conf	2015-06-02 13:32:07.814150000 +0900
>+--- smf-sav.conf.orig	2006-10-25 20:15:10 UTC
>++++ smf-sav.conf
> @@ -1,4 +1,4 @@
> -# /etc/mail/smfs/smf-sav.conf
> +# %%PREFIX%%/etc/smf-sav.conf
>@@ -6,3 +6,15 @@
>  #
>  # smf-sav configuration file v1.4.0 (it's read at start)
>  #
>+@@ -103,9 +103,9 @@ SafeCallBack	postmaster@yourdomain.tld	#
>+ 
>+ # Socket used to communicate with a Sendmail daemon
>+ #
>+-# Default: unix:/var/run/smfs/smf-sav.sock
>++# Default: unix:%%SMFSAV_RUN_DIR%%/smf-sav.sock
>+ #
>+-#Socket		unix:/var/run/smfs/smf-sav.sock
>++#Socket		unix:%%SMFSAV_RUN_DIR%%/smf-sav.sock
>+ 
>+ # Facility for logging via a Syslog daemon
>+ #
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 432894)
>+++ files/pkg-message.in	(working copy)
>@@ -3,7 +3,7 @@
> 1. Inspect and edit the %%PREFIX%%/etc/smfsav.conf file
> 2. 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
> 3. Put line smfsav_enable="YES" to /etc/rc.conf file
> 4. Run `service smfsav start`
> =====================================================================================

Actions: View | Diff

Attachments on bug 216652: 179452 | 179463