From owner-svn-ports-all@freebsd.org Wed May 20 20:28:17 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 677AB2F4297; Wed, 20 May 2020 20:28:17 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49S48121KHz3VJm; Wed, 20 May 2020 20:28:17 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4051121DB3; Wed, 20 May 2020 20:28:17 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04KKSHFR058636; Wed, 20 May 2020 20:28:17 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04KKSG33058633; Wed, 20 May 2020 20:28:16 GMT (envelope-from ler@FreeBSD.org) Message-Id: <202005202028.04KKSG33058633@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Wed, 20 May 2020 20:28:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536022 - in head/mail/spamassassin-dqs: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ler X-SVN-Commit-Paths: in head/mail/spamassassin-dqs: . files X-SVN-Commit-Revision: 536022 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2020 20:28:17 -0000 Author: ler Date: Wed May 20 20:28:16 2020 New Revision: 536022 URL: https://svnweb.freebsd.org/changeset/ports/536022 Log: 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. Modified: head/mail/spamassassin-dqs/Makefile head/mail/spamassassin-dqs/distinfo head/mail/spamassassin-dqs/files/pkg-message.in Modified: head/mail/spamassassin-dqs/Makefile ============================================================================== --- head/mail/spamassassin-dqs/Makefile Wed May 20 20:09:55 2020 (r536021) +++ head/mail/spamassassin-dqs/Makefile Wed May 20 20:28:16 2020 (r536022) @@ -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||${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 Modified: head/mail/spamassassin-dqs/distinfo ============================================================================== --- head/mail/spamassassin-dqs/distinfo Wed May 20 20:09:55 2020 (r536021) +++ head/mail/spamassassin-dqs/distinfo Wed May 20 20:28:16 2020 (r536022) @@ -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 Modified: head/mail/spamassassin-dqs/files/pkg-message.in ============================================================================== --- head/mail/spamassassin-dqs/files/pkg-message.in Wed May 20 20:09:55 2020 (r536021) +++ head/mail/spamassassin-dqs/files/pkg-message.in Wed May 20 20:28:16 2020 (r536022) @@ -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//g' sh.cf.sample >sh.cf +if the HBL option is selected, issue the following as well: +sed -e 's/your_DQS_key//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//g' sh.cf.sample >sh.cf +if the HBL option is selected, issue the following as well: +sed -e 's/your_DQS_key//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" } ]