Attachment #166065 for bug #206575

View | Details | Raw Unified | Return to bug 206575
Collapse All | Expand All

Lines 2-8 Link Here

(-)mail/milter-greylist-devel/Makefile (-5 / +9 lines)
2	# $FreeBSD: head/mail/milter-greylist-devel/Makefile 385401 2015-05-04 12:58:51Z robak $	2	# $FreeBSD: head/mail/milter-greylist-devel/Makefile 385401 2015-05-04 12:58:51Z robak $
3		3
4	PORTNAME= milter-greylist	4	PORTNAME= milter-greylist
5	PORTVERSION= 4.5.12	5	PORTVERSION= 4.6.a1
		6	DISTNAME= ${PORTNAME}-4.6a1
6	CATEGORIES= mail	7	CATEGORIES= mail
7	MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/ \	8	MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/ \
8	http://fossies.org/unix/privat/ \	9	http://fossies.org/unix/privat/ \
Lines 21-32 Link Here
21		22
22	MAKE_JOBS_UNSAFE= yes	23	MAKE_JOBS_UNSAFE= yes
23		24
24	OPTIONS_DEFINE= SPF GEOIP CURL LDAP P0F POSTFIX DOCS EXAMPLES	25	OPTIONS_DEFINE= DKIM SPF GEOIP CURL LDAP P0F POSTFIX DOCS EXAMPLES
		26	OPTIONS_DEFAULT=DKIM SPF GEOIP CURL EXAMPLES
		27	DKIM_DESC= Include DKIM support
25	SPF_DESC= Include SPF support	28	SPF_DESC= Include SPF support
26	CURL_DESC= curl support	29	CURL_DESC= curl support
27	P0F_DESC= P0F support	30	P0F_DESC= P0F support
28	POSTFIX_DESC= Use Postfix instead of Sendmail	31	POSTFIX_DESC= Use Postfix instead of Sendmail
29		32
		33	DKIM_BUILD_DEPENDS+= opendkim>=0:${PORTSDIR}/mail/opendkim
30	P0F_RUN_DEPENDS+= p0f:${PORTSDIR}/net-mgmt/p0f	34	P0F_RUN_DEPENDS+= p0f:${PORTSDIR}/net-mgmt/p0f
31	SPF_BUILD_DEPENDS= libspf2>=1.2.5:${PORTSDIR}/mail/libspf2	35	SPF_BUILD_DEPENDS= libspf2>=1.2.5:${PORTSDIR}/mail/libspf2
32	CURL_BUILD_DEPENDS+= curl>=7.18:${PORTSDIR}/ftp/curl	36	CURL_BUILD_DEPENDS+= curl>=7.18:${PORTSDIR}/ftp/curl
Lines 48-56 Link Here
48	# installed port preference over it.	52	# installed port preference over it.
49	##	53	##
50		54
51	##	55	.if ${PORT_OPTIONS:MDKIM}
52	# If you have a reentrant resolver (starting with RELENG_5_2) you can use SPF	56	CONFIGURE_ARGS+= --with-libopendkim=${LOCALBASE}
53	##	57	.endif
54		58
55	.if ${PORT_OPTIONS:MSPF}	59	.if ${PORT_OPTIONS:MSPF}
56	CONFIGURE_ARGS+= --with-libspf2=${LOCALBASE}	60	CONFIGURE_ARGS+= --with-libspf2=${LOCALBASE}

Lines 1-2 Link Here

(-)mail/milter-greylist-devel/distinfo (-2 / +2 lines)
1	SHA256 (milter-greylist-4.5.12.tgz) = f5358f7dea2e768b69566ff27d0b5e6151a6ad5a15a29164f2447bbf834043e0	1	SHA256 (milter-greylist-4.6a1.tgz) = d6028b1c4c8e2d52776d8471edfc74e6692d7ef12a537f518d52caa9f7c4030c
2	SIZE (milter-greylist-4.5.12.tgz) = 251856	2	SIZE (milter-greylist-4.6a1.tgz) = 254153




--- greylist.conf.orig	2013-08-13 13:45:08.000000000 +0100
+++ greylist.conf	2015-07-21 22:04:55.635321889 +0100
@@ -9,8 +9,10 @@
 socket "/var/milter-greylist/milter-greylist.sock"
 dumpfile "/var/milter-greylist/greylist.db" 600
 dumpfreq 1
-user "smmsp"
-
+user "mailnull"
+# If you're using GeoIP, uncomment below to point to the GeoIP database to use
+# this one is from the net/GeoIP port/package:
+#geoipdb "/usr/local/share/GeoIP/GeoIP.dat"
 
 # Log milter-greylist activity to a file
 #stat ">>/var/milter-greylist/greylist.log" \
@@ -108,6 +110,13 @@
 	user3@example.com \
 }
 
+# Example GeoIP exceptions (remember to enable it in the access list section too)
+#list "whitelist_countries" geoip { \
+#	"GB" \
+#	"UK" \
+#	"IE" \
+#}
+
 # Give this a try if you enabled DNSRBL
 #dnsrbl "SORBS DUN" dnsbl.sorbs.net 127.0.0.10
 #dnsrbl "SBL" sbl-xbl.spamhaus.org 127.0.0.2
@@ -129,6 +138,9 @@
 # And here is the access list
 racl whitelist list "my network"
 racl whitelist list "broken mta"
+#racl whitelist list "whitelist_countries"
+# To disable greylisting for SPF pass emails, uncomment below:
+#racl whitelist spf pass
 #racl whitelist dnsrbl "MTAWL"
 #racl blacklist urlcheck "userpref" $usrRBL "CBL" dnsrbl "CBL" \
 #               msg "Sender IP caught in CBL blacklist"
@@ -143,3 +155,7 @@
 # Example of content filtering for fighting image SPAM
 #dacl blacklist body /src[:blank:]*=(3D)?[:blank:]*["']?[:blank:]*cid:/ \
 #     msg "Sorry, We do not accept images embedded in HTML"
+
+# Example whitelist for DKIM passed messages (uncomment below)
+#dacl whitelist dkim pass
+

Return to bug 206575

Lines 1-11 Link Here

(-)mail/milter-greylist-devel/files/patch-greylist.conf (-3 / +39 lines)
1	--- greylist.conf.orig 2009-02-13 01:39:01.000000000 +0300	1	--- greylist.conf.orig 2013-08-13 13:45:08.000000000 +0100
2	+++ greylist.conf 2009-04-22 09:10:46.000000000 +0400	2	+++ greylist.conf 2015-07-21 22:04:55.635321889 +0100
3	@@ -9,7 +9,7 @@	3	@@ -9,8 +9,10 @@
4	socket "/var/milter-greylist/milter-greylist.sock"	4	socket "/var/milter-greylist/milter-greylist.sock"
5	dumpfile "/var/milter-greylist/greylist.db" 600	5	dumpfile "/var/milter-greylist/greylist.db" 600
6	dumpfreq 1	6	dumpfreq 1
7	-user "smmsp"	7	-user "smmsp"
		8	-
8	+user "mailnull"	9	+user "mailnull"
		10	+# If you're using GeoIP, uncomment below to point to the GeoIP database to use
		11	+# this one is from the net/GeoIP port/package:
		12	+#geoipdb "/usr/local/share/GeoIP/GeoIP.dat"
9		13
10	# Log milter-greylist activity to a file	14	# Log milter-greylist activity to a file
11	#stat ">>/var/milter-greylist/greylist.log" \	15	#stat ">>/var/milter-greylist/greylist.log" \
		16	@@ -108,6 +110,13 @@
		17	user3@example.com \
		18	}
		19
		20	+# Example GeoIP exceptions (remember to enable it in the access list section too)
		21	+#list "whitelist_countries" geoip { \
		22	+# "GB" \
		23	+# "UK" \
		24	+# "IE" \
		25	+#}
		26	+
		27	# Give this a try if you enabled DNSRBL
		28	#dnsrbl "SORBS DUN" dnsbl.sorbs.net 127.0.0.10
		29	#dnsrbl "SBL" sbl-xbl.spamhaus.org 127.0.0.2
		30	@@ -129,6 +138,9 @@
		31	# And here is the access list
		32	racl whitelist list "my network"
		33	racl whitelist list "broken mta"
		34	+#racl whitelist list "whitelist_countries"
		35	+# To disable greylisting for SPF pass emails, uncomment below:
		36	+#racl whitelist spf pass
		37	#racl whitelist dnsrbl "MTAWL"
		38	#racl blacklist urlcheck "userpref" $usrRBL "CBL" dnsrbl "CBL" \
		39	# msg "Sender IP caught in CBL blacklist"
		40	@@ -143,3 +155,7 @@
		41	# Example of content filtering for fighting image SPAM
		42	#dacl blacklist body /src[:blank:]=(3D)?[:blank:]["']?[:blank:]*cid:/ \
		43	# msg "Sorry, We do not accept images embedded in HTML"
		44	+
		45	+# Example whitelist for DKIM passed messages (uncomment below)
		46	+#dacl whitelist dkim pass
		47	+