Attachment 185624 Details for Bug 216669 – patch.txt

[patch] patch.txt

patch.txt (text/plain), 6.88 KB, created by Kan Sasaki on 2017-08-21 01:21:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kan Sasaki

Created: 2017-08-21 01:21:47 UTC

Size: 6.88 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 448443)
>+++ Makefile	(working copy)
>@@ -644,6 +644,7 @@
>     SUBDIR += slapd-cyrus
>     SUBDIR += sma
>     SUBDIR += smfsav
>+    SUBDIR += smfsav-devel
>     SUBDIR += smtp-cli
>     SUBDIR += smtp-gated
>     SUBDIR += smtpfeed
>Index: smfsav/Makefile
>===================================================================
>--- smfsav/Makefile	(revision 448443)
>+++ smfsav/Makefile	(working copy)
>@@ -29,6 +29,8 @@
> PLIST_SUB=	SMFSAV_RUN_DIR=${SMFSAV_RUN_DIR}
> SUB_FILES+=	pkg-message
> 
>+CONFLICTS=	smfsav-devel-[0-9]*
>+
> .include <bsd.port.pre.mk>
> .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
> 
>Index: smfsav-devel/Makefile
>===================================================================
>--- smfsav-devel/Makefile	(revision 448443)
>+++ smfsav-devel/Makefile	(working copy)
>@@ -2,12 +2,11 @@
> # $FreeBSD$
> 
> PORTNAME=	smfsav
>-PORTVERSION=	1.4.0
>-PORTREVISION=	3
>+PORTVERSION=	2.1
> CATEGORIES=	mail
>-MASTER_SITES=	SF/smfs
>-DISTNAME=	smf-sav-${PORTVERSION}
>-DIST_SUBDIR=	${PORTNAME}
>+MASTER_SITES=	http://smf-sav.anw.at/
>+PKGNAMESUFFIX=	-devel
>+DISTNAME=	smf-sav-reloaded-${PORTVERSION}
> 
> MAINTAINER=	sasaki@fcc.ad.jp
> COMMENT=	Sendmail Sender Address Validator
>@@ -28,14 +27,18 @@
> 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:
>-	@${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: smfsav-devel/distinfo
>===================================================================
>--- smfsav-devel/distinfo	(revision 448443)
>+++ smfsav-devel/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (smfsav/smf-sav-1.4.0.tar.gz) = 77a28d012330581b5ecaf126a153f049731c399e294aab0ded53c1b0abab68cc
>-SIZE (smfsav/smf-sav-1.4.0.tar.gz) = 21968
>+TIMESTAMP = 1503277712
>+SHA256 (smf-sav-reloaded-2.1.tar.gz) = 3e3fd5deed7ea30204b8ed1be0bba7da8bd0b5af055aa72e9094e2a6b5891760
>+SIZE (smf-sav-reloaded-2.1.tar.gz) = 23356
>Index: smfsav-devel/files/patch-readme
>===================================================================
>--- smfsav-devel/files/patch-readme	(revision 448443)
>+++ smfsav-devel/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	2012-04-08 16:07:48 UTC
>++++ readme
>+@@ -50,18 +50,18 @@ Under FreeBSD the BIND v8 is required (p
>  make
>  make install
>  
>@@ -15,3 +15,11 @@
>  
>    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.
>Index: smfsav-devel/files/patch-smf-sav.c
>===================================================================
>--- smfsav-devel/files/patch-smf-sav.c	(revision 448443)
>+++ smfsav-devel/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	2013-05-25 11:48:52 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: smfsav-devel/files/patch-smf-sav.conf
>===================================================================
>--- smfsav-devel/files/patch-smf-sav.conf	(revision 448443)
>+++ smfsav-devel/files/patch-smf-sav.conf	(working copy)
>@@ -1,8 +1,20 @@
>---- 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	2012-04-08 17:04:38 UTC
>++++ smf-sav.conf
> @@ -1,4 +1,4 @@
> -# /etc/mail/smfs/smf-sav.conf
> +# %%PREFIX%%/etc/smf-sav.conf
>  #
>- # smf-sav configuration file v1.4.0 (it's read at start)
>+ # smf-sav configuration file v2.0
>+ # pre initialisised with useful values
>+@@ -173,9 +173,9 @@ ToFailTTL	10h	# recipients that did not 
>+ 
>+ # 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: smfsav-devel/files/pkg-message.in
>===================================================================
>--- smfsav-devel/files/pkg-message.in	(revision 448443)
>+++ smfsav-devel/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`
> =====================================================================================
>Index: smfsav-devel/files/smfsav.in
>===================================================================
>Index: smfsav-devel/pkg-descr
>===================================================================
>--- smfsav-devel/pkg-descr	(revision 448443)
>+++ smfsav-devel/pkg-descr	(working copy)
>@@ -8,4 +8,8 @@
>   It's a lite alternative for the spamilter, milter-sender and milter-ahead
> milters.
> 
>-WWW: http://smfs.sourceforge.net/
>+This is a fork of smf-sav which was originally written by Eugene Kurmanin.
>+It is a "reloaded" version with heavy bugfixes maintained by Gabriele
>+Maria Plutzar.
>+
>+WWW: http://smf-sav.anw.at/
>Index: smfsav-devel/pkg-plist
>===================================================================

Actions: View | Diff

Attachments on bug 216669: 179466 | 179467 | 185624