mail/spamassassin-dqs: upgrade to 1.1.0.

Various fixes, including support for the HBL (Hash Block List).

Added an option for HBL

Added the README.md file to the docs installed by the port to help explain HBL.

3 files changed, 33 insertions, 8 deletions

diff --git a/mail/spamassassin-dqs/Makefile b/mail/spamassassin-dqs/Makefile
index 86ad1a42e021..5e1d2b22f821 100644
--- a/mail/spamassassin-dqs/Makefile
+++ b/mail/spamassassin-dqs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		spamassassin-dqs
 DISTVERSIONPREFIX=	v
-DISTVERSION=		1.0.4
+DISTVERSION=		1.1.0
 CATEGORIES=		mail
 
 MAINTAINER=	ler@FreeBSD.org
@@ -20,11 +20,18 @@ SUB_FILES=	pkg-message
 PLIST_FILES=	etc/mail/spamassassin/SH.pm \
 		"@sample etc/mail/spamassassin/sh.cf.sample" \
 		etc/mail/spamassassin/sh_scores.cf \
-		etc/mail/spamassassin/sh.pre
+		etc/mail/spamassassin/sh.pre \
+		share/doc/spamassassin-dqs/README.md
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
+OPTIONS_DEFINE=	HBL
+HBL_DESC=	enable HBL lookups (PAID OPTION)
+
+HBL_PLIST_FILES=	"@sample etc/mail/spamassassin/sh_hbl.cf.sample" \
+			etc/mail/spamassassin/sh_hbl_scores.cf
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|<config_directory>|${PREFIX}/etc/mail/spamassassin|' ${WRKSRC}/sh.pre
 
@@ -34,4 +41,12 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/sh.pre ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/
 	${INSTALL_DATA} ${WRKSRC}/SH.pm ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/
 	${INSTALL_DATA} ${WRKSRC}/sh_scores.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN}  ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
+	
+
+do-install-HBL-on:
+	${INSTALL_DATA} ${WRKSRC}/sh_hbl.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/sh_hbl.cf.sample
+	${INSTALL_DATA} ${WRKSRC}/sh_hbl_scores.cf ${STAGEDIR}${PREFIX}/etc/mail/spamassassin/
+
 .include <bsd.port.mk>
diff --git a/mail/spamassassin-dqs/distinfo b/mail/spamassassin-dqs/distinfo
index 10dd03de033f..84347cad6cb7 100644
--- a/mail/spamassassin-dqs/distinfo
+++ b/mail/spamassassin-dqs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563548664
-SHA256 (spamhaus-spamassassin-dqs-v1.0.4_GH0.tar.gz) = f97cdbfffa58c8c7b0c271b6073f04ef936a00a3b4dd83c3034df52192b6f46e
-SIZE (spamhaus-spamassassin-dqs-v1.0.4_GH0.tar.gz) = 13846
+TIMESTAMP = 1590002953
+SHA256 (spamhaus-spamassassin-dqs-v1.1.0_GH0.tar.gz) = 052ab88fe50da89882bc99fad320ec554d717d88517162b86c60f26d9e89ed1c
+SIZE (spamhaus-spamassassin-dqs-v1.1.0_GH0.tar.gz) = 21322
diff --git a/mail/spamassassin-dqs/files/pkg-message.in b/mail/spamassassin-dqs/files/pkg-message.in
index bd0d76a56c49..7fae23421068 100644
--- a/mail/spamassassin-dqs/files/pkg-message.in
+++ b/mail/spamassassin-dqs/files/pkg-message.in
@@ -7,14 +7,19 @@ DQS key.
 Follow the instructions at:
 https://www.spamhaustech.com/dqs/
 to get a key, then go to:
-https://portal.spamhaustech.com/src/manual/dqs/
-and note your key. 
+https://portal.spamhaustech.com/manuals/dqs/
+and note the DQS key under section "1.0 Datafeed Query Service".
 
 Once you have it, run the following as root:
 
 cd %%PREFIX%%/etc/mail/spamassassin
 sed -e 's/your_DQS_key/<your key from above>/g' sh.cf.sample >sh.cf
 
+if the HBL option is selected, issue the following as well:
+sed -e 's/your_DQS_key/<your key from above>/g' sh_hbl.cf.sample >sh_hbl.cf
+
+(for more information on HBL, see %%DOCSDIR%%/README.md)
+
 then restart spamassassin.
 EOM
   type: install
@@ -26,10 +31,15 @@ You will need to re-run this as root:
 cd %%PREFIX%%/etc/mail/spamassassin
 sed -e 's/your_DQS_key/<your key from above>/g' sh.cf.sample >sh.cf
 
+if the HBL option is selected, issue the following as well:
+sed -e 's/your_DQS_key/<your key from above>/g' sh_hbl.cf.sample >sh_hbl.cf
+
+(for more information on HBL, see %%DOCSDIR%%/README.md)
+
 and restart spamassassin
 EOM
    type: upgrade
-   maximum_version: "1.0.3"
+   maximum_version: "1.1.0"
 }
 ]