From ebb204098f3a08058e4aa2710f13135c2cb8e12c Mon Sep 17 00:00:00 2001 From: Dima Panov Date: Thu, 23 Jun 2016 12:00:36 +0000 Subject: [PATCH] - Update OpenSMTPD-extras to 201606230001 snapshot - Consolidate all -extras under one maintainership NOTE: Author still warning everyone about experimental status of filters. All --with-filter-XXX replaced with --with-experimental-filter-XXX Approved by: adamw --- mail/opensmtpd-extras-filter-clamav/Makefile | 3 +-- mail/opensmtpd-extras-filter-dkim/Makefile | 3 +-- mail/opensmtpd-extras-filter-dnsbl/Makefile | 3 +-- mail/opensmtpd-extras-filter-lua/Makefile | 3 +-- mail/opensmtpd-extras-filter-monkey/Makefile | 5 ++--- mail/opensmtpd-extras-filter-pause/Makefile | 3 +-- mail/opensmtpd-extras-filter-perl/Makefile | 3 +-- mail/opensmtpd-extras-filter-python/Makefile | 3 +-- mail/opensmtpd-extras-filter-regex/Makefile | 5 ++--- mail/opensmtpd-extras-filter-spamassassin/Makefile | 3 +-- mail/opensmtpd-extras-queue-python/Makefile | 1 - mail/opensmtpd-extras-queue-ram/Makefile | 1 - mail/opensmtpd-extras-scheduler-python/Makefile | 1 - mail/opensmtpd-extras-scheduler-ram/Makefile | 1 - mail/opensmtpd-extras-table-ldap/Makefile | 1 - mail/opensmtpd-extras-tool-stats/Makefile | 1 - mail/opensmtpd-extras/Makefile | 8 +++++--- mail/opensmtpd-extras/distinfo | 6 +++--- 18 files changed, 20 insertions(+), 34 deletions(-) diff --git a/mail/opensmtpd-extras-filter-clamav/Makefile b/mail/opensmtpd-extras-filter-clamav/Makefile index fd3325c877b8..2367800e1544 100644 --- a/mail/opensmtpd-extras-filter-clamav/Makefile +++ b/mail/opensmtpd-extras-filter-clamav/Makefile @@ -5,14 +5,13 @@ PKGNAMESUFFIX= -filter-clamav PORTREVISION= 0 COMMENT= Check messages with ClamAV in OpenSMTPD -MAINTAINER= adamw@FreeBSD.org RUN_DEPENDS= clamscan:security/clamav PLIST_FILES= libexec/opensmtpd/filter-clamav \ man/man8/filter-clamav.8.gz -CONFIGURE_ARGS+= --with-filter-clamav +CONFIGURE_ARGS+= --with-experimental-filter-clamav MASTERDIR= ${.CURDIR}/../opensmtpd-extras SLAVE_PORT= yes diff --git a/mail/opensmtpd-extras-filter-dkim/Makefile b/mail/opensmtpd-extras-filter-dkim/Makefile index 65d995f75182..c3e4dae297be 100644 --- a/mail/opensmtpd-extras-filter-dkim/Makefile +++ b/mail/opensmtpd-extras-filter-dkim/Makefile @@ -5,12 +5,11 @@ PKGNAMESUFFIX= -filter-dkim PORTREVISION= 0 COMMENT= DKIM-signing filter for OpenSMTPD -MAINTAINER= adamw@FreeBSD.org PLIST_FILES= libexec/opensmtpd/filter-dkim-signer \ man/man8/filter-dkim-signer.8.gz -CONFIGURE_ARGS+= --with-filter-dkim-signer +CONFIGURE_ARGS+= --with-experimental-filter-dkim-signer MASTERDIR= ${.CURDIR}/../opensmtpd-extras SLAVE_PORT= yes diff --git a/mail/opensmtpd-extras-filter-dnsbl/Makefile b/mail/opensmtpd-extras-filter-dnsbl/Makefile index 0cff1cd4b22c..655a73208b1d 100644 --- a/mail/opensmtpd-extras-filter-dnsbl/Makefile +++ b/mail/opensmtpd-extras-filter-dnsbl/Makefile @@ -5,12 +5,11 @@ PKGNAMESUFFIX= -filter-dnsbl PORTREVISION= 0 COMMENT= DNSBL-checking filter for OpenSMTPD -MAINTAINER= adamw@FreeBSD.org PLIST_FILES= libexec/opensmtpd/filter-dnsbl \ man/man8/filter-dnsbl.8.gz -CONFIGURE_ARGS+= --with-filter-dnsbl +CONFIGURE_ARGS+= --with-experimental-filter-dnsbl MASTERDIR= ${.CURDIR}/../opensmtpd-extras SLAVE_PORT= yes diff --git a/mail/opensmtpd-extras-filter-lua/Makefile b/mail/opensmtpd-extras-filter-lua/Makefile index 3d9d2ac1c5fc..1d8b6b7c311b 100644 --- a/mail/opensmtpd-extras-filter-lua/Makefile +++ b/mail/opensmtpd-extras-filter-lua/Makefile @@ -5,11 +5,10 @@ PKGNAMESUFFIX= -filter-lua PORTREVISION= 0 COMMENT= LUA-script filter support for OpenSMTPD -MAINTAINER= fluffy@FreeBSD.org PLIST_FILES= libexec/opensmtpd/filter-lua -CONFIGURE_ARGS+= --with-filter-lua --with-lua-type=lua-${LUA_VER} +CONFIGURE_ARGS+= --with-experimental-filter-lua --with-lua-type=lua-${LUA_VER} USES= lua pkgconfig diff --git a/mail/opensmtpd-extras-filter-monkey/Makefile b/mail/opensmtpd-extras-filter-monkey/Makefile index 492044795195..f0da2e38fdcc 100644 --- a/mail/opensmtpd-extras-filter-monkey/Makefile +++ b/mail/opensmtpd-extras-filter-monkey/Makefile @@ -5,9 +5,8 @@ PKGNAMESUFFIX= -filter-monkey PORTREVISION= 0 COMMENT= Arbitrary delay or reject filter for OpenSMTPD -MAINTAINER= fluffy@FreeBSD.org -CONFIGURE_ARGS+= --with-filter-monkey +CONFIGURE_ARGS+= --with-experimental-filter-monkey PLIST= ${.CURDIR}/pkg-plist MASTERDIR= ${.CURDIR}/../opensmtpd-extras @@ -15,7 +14,7 @@ SLAVE_PORT= yes post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail - ${INSTALL_DATA} ${WRKSRC}/extras/wip/filters/filter-monkey/filter-monkey.conf \ + ${INSTALL_DATA} ${WRKSRC}/extras/filters/filter-monkey/filter-monkey.conf \ ${STAGEDIR}${PREFIX}/etc/mail/filter-monkey.conf.sample .include "${MASTERDIR}/Makefile" diff --git a/mail/opensmtpd-extras-filter-pause/Makefile b/mail/opensmtpd-extras-filter-pause/Makefile index f933ee38a8a4..9b0bdd1a41b0 100644 --- a/mail/opensmtpd-extras-filter-pause/Makefile +++ b/mail/opensmtpd-extras-filter-pause/Makefile @@ -5,12 +5,11 @@ PKGNAMESUFFIX= -filter-pause PORTREVISION= 0 COMMENT= Pause incoming OpenSMTPD messages to reduce spam -MAINTAINER= adamw@FreeBSD.org PLIST_FILES= libexec/opensmtpd/filter-pause \ man/man8/filter-pause.8.gz -CONFIGURE_ARGS+= --with-filter-pause +CONFIGURE_ARGS+= --with-experimental-filter-pause MASTERDIR= ${.CURDIR}/../opensmtpd-extras SLAVE_PORT= yes diff --git a/mail/opensmtpd-extras-filter-perl/Makefile b/mail/opensmtpd-extras-filter-perl/Makefile index 8d4ded2bbcf0..4987d9e52230 100644 --- a/mail/opensmtpd-extras-filter-perl/Makefile +++ b/mail/opensmtpd-extras-filter-perl/Makefile @@ -5,11 +5,10 @@ PKGNAMESUFFIX= -filter-perl PORTREVISION= 0 COMMENT= Perl-script filter support for OpenSMTPD -MAINTAINER= fluffy@FreeBSD.org PLIST_FILES= libexec/opensmtpd/filter-perl -CONFIGURE_ARGS+= --with-filter-perl --with-perl-type=${perl_VERSION} +CONFIGURE_ARGS+= --with-experimental-filter-perl --with-perl-type=${perl_VERSION} USES= perl5 diff --git a/mail/opensmtpd-extras-filter-python/Makefile b/mail/opensmtpd-extras-filter-python/Makefile index ae9d64d4bd69..a5e800e525aa 100644 --- a/mail/opensmtpd-extras-filter-python/Makefile +++ b/mail/opensmtpd-extras-filter-python/Makefile @@ -5,11 +5,10 @@ PKGNAMESUFFIX= -filter-python PORTREVISION= 0 COMMENT= Python-script filter support for OpenSMTPD -MAINTAINER= fluffy@FreeBSD.org PLIST_FILES= libexec/opensmtpd/filter-python -CONFIGURE_ARGS+= --with-filter-python --with-python-type=${PYTHON_VERSION} +CONFIGURE_ARGS+= --with-experimental-filter-python --with-python-type=${PYTHON_VERSION} USES= python:2 pkgconfig diff --git a/mail/opensmtpd-extras-filter-regex/Makefile b/mail/opensmtpd-extras-filter-regex/Makefile index 5d365f1dbd22..a8b810f1f470 100644 --- a/mail/opensmtpd-extras-filter-regex/Makefile +++ b/mail/opensmtpd-extras-filter-regex/Makefile @@ -5,9 +5,8 @@ PKGNAMESUFFIX= -filter-regex PORTREVISION= 0 COMMENT= Regular expression filter for OpenSMTPD -MAINTAINER= adamw@FreeBSD.org -CONFIGURE_ARGS+= --with-filter-regex +CONFIGURE_ARGS+= --with-experimental-filter-regex PLIST= ${.CURDIR}/pkg-plist MASTERDIR= ${.CURDIR}/../opensmtpd-extras @@ -15,7 +14,7 @@ SLAVE_PORT= yes post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail - ${INSTALL_DATA} ${WRKSRC}/extras/wip/filters/filter-regex/filter-regex.conf \ + ${INSTALL_DATA} ${WRKSRC}/extras/filters/filter-regex/filter-regex.conf \ ${STAGEDIR}${PREFIX}/etc/mail/filter-regex.conf.sample .include "${MASTERDIR}/Makefile" diff --git a/mail/opensmtpd-extras-filter-spamassassin/Makefile b/mail/opensmtpd-extras-filter-spamassassin/Makefile index 33d828d3430e..fba86d8ed741 100644 --- a/mail/opensmtpd-extras-filter-spamassassin/Makefile +++ b/mail/opensmtpd-extras-filter-spamassassin/Makefile @@ -5,12 +5,11 @@ PKGNAMESUFFIX= -filter-spamassassin PORTREVISION= 0 COMMENT= Spamassassin filter addon for OpenSMTPD -MAINTAINER= adamw@FreeBSD.org PLIST_FILES= libexec/opensmtpd/filter-spamassassin \ man/man8/filter-spamassassin.8.gz -CONFIGURE_ARGS+= --with-filter-spamassassin +CONFIGURE_ARGS+= --with-experimental-filter-spamassassin MASTERDIR= ${.CURDIR}/../opensmtpd-extras SLAVE_PORT= yes diff --git a/mail/opensmtpd-extras-queue-python/Makefile b/mail/opensmtpd-extras-queue-python/Makefile index 47980c92544c..600eb9b50731 100644 --- a/mail/opensmtpd-extras-queue-python/Makefile +++ b/mail/opensmtpd-extras-queue-python/Makefile @@ -5,7 +5,6 @@ PKGNAMESUFFIX= -queue-python PORTREVISION= 0 COMMENT= Python queue support for OpenSMTPD -MAINTAINER= fluffy@FreeBSD.org PLIST_FILES= libexec/opensmtpd/queue-python diff --git a/mail/opensmtpd-extras-queue-ram/Makefile b/mail/opensmtpd-extras-queue-ram/Makefile index b3dd7f05a894..c00a93b4484c 100644 --- a/mail/opensmtpd-extras-queue-ram/Makefile +++ b/mail/opensmtpd-extras-queue-ram/Makefile @@ -5,7 +5,6 @@ PKGNAMESUFFIX= -queue-ram PORTREVISION= 0 COMMENT= RAM queue support for OpenSMTPD -MAINTAINER= fluffy@FreeBSD.org PLIST_FILES= libexec/opensmtpd/queue-ram diff --git a/mail/opensmtpd-extras-scheduler-python/Makefile b/mail/opensmtpd-extras-scheduler-python/Makefile index 1d8425061b4f..dd802dc2b8ba 100644 --- a/mail/opensmtpd-extras-scheduler-python/Makefile +++ b/mail/opensmtpd-extras-scheduler-python/Makefile @@ -5,7 +5,6 @@ PKGNAMESUFFIX= -scheduler-python PORTREVISION= 0 COMMENT= Python scheduler support for OpenSMTPD -MAINTAINER= fluffy@FreeBSD.org PLIST_FILES= libexec/opensmtpd/scheduler-python diff --git a/mail/opensmtpd-extras-scheduler-ram/Makefile b/mail/opensmtpd-extras-scheduler-ram/Makefile index 4da666c2ef1b..a89f7e1bf942 100644 --- a/mail/opensmtpd-extras-scheduler-ram/Makefile +++ b/mail/opensmtpd-extras-scheduler-ram/Makefile @@ -5,7 +5,6 @@ PKGNAMESUFFIX= -scheduler-ram PORTREVISION= 0 COMMENT= RAM scheduler support for OpenSMTPD -MAINTAINER= fluffy@FreeBSD.org PLIST_FILES= libexec/opensmtpd/scheduler-ram diff --git a/mail/opensmtpd-extras-table-ldap/Makefile b/mail/opensmtpd-extras-table-ldap/Makefile index 5cf16f5f3763..999b3337d7e1 100644 --- a/mail/opensmtpd-extras-table-ldap/Makefile +++ b/mail/opensmtpd-extras-table-ldap/Makefile @@ -5,7 +5,6 @@ PKGNAMESUFFIX= -table-ldap PORTREVISION= 0 COMMENT= LDAP table support for OpenSMTPD -MAINTAINER= fluffy@FreeBSD.org PLIST_FILES= libexec/opensmtpd/table-ldap diff --git a/mail/opensmtpd-extras-tool-stats/Makefile b/mail/opensmtpd-extras-tool-stats/Makefile index b563d2fcfb77..82ee90723076 100644 --- a/mail/opensmtpd-extras-tool-stats/Makefile +++ b/mail/opensmtpd-extras-tool-stats/Makefile @@ -5,7 +5,6 @@ PKGNAMESUFFIX= -tool-stats PORTREVISION= 0 COMMENT= Statistics tool for OpenSMTPD -MAINTAINER= fluffy@FreeBSD.org PLIST_FILES= bin/tool-stats \ man/man8/tool-stats.8.gz diff --git a/mail/opensmtpd-extras/Makefile b/mail/opensmtpd-extras/Makefile index 83c635ca5394..365cfa8c27bd 100644 --- a/mail/opensmtpd-extras/Makefile +++ b/mail/opensmtpd-extras/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= opensmtpd-extras -PORTVERSION= 201606212257 +PORTVERSION= 201606230001 PORTREVISION?= 0 CATEGORIES+= mail MASTER_SITES= http://www.opensmtpd.org/archives/ @@ -10,7 +10,7 @@ MASTER_SITES= http://www.opensmtpd.org/archives/ # NB: Please reset PORTREVISION to 0 in all slave subports # while updating PORTVERSION for master port -MAINTAINER?= fluffy@FreeBSD.org +MAINTAINER= fluffy@FreeBSD.org COMMENT?= Addons for OpenSMTPD LICENSE?= ISCL @@ -135,7 +135,9 @@ TOOL_STATS_RUN_DEPENDS= tool-stats:mail/opensmtpd-extras-tool-stats # Only install this for the opensmtpd-extras master port pre-patch: @${REINPLACE_CMD} -e '/man_MANS.*filter_api.3/s/^/#/' \ - ${WRKSRC}/extras/wip/filters/Makefile.am + ${WRKSRC}/extras/filters/Makefile.am +# While filters still experimental feature, suppress extra call warnings from logs + ${REINPLACE_CMD} -e '/is EXPERIMENTAL/d' ${WRKSRC}/api/filter_api.c .endif diff --git a/mail/opensmtpd-extras/distinfo b/mail/opensmtpd-extras/distinfo index 11137bd53472..68b9ce75a1a3 100644 --- a/mail/opensmtpd-extras/distinfo +++ b/mail/opensmtpd-extras/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1466588494 -SHA256 (opensmtpd-extras-201606212257.tar.gz) = dc2d3f60947a0f1c22ab4f9cf5d9efdca774a835bcf055c38a072160a59ccc34 -SIZE (opensmtpd-extras-201606212257.tar.gz) = 631713 +TIMESTAMP = 1466658022 +SHA256 (opensmtpd-extras-201606230001.tar.gz) = 4675ed506cd6dc277a6b784cdbf5abeb5710b8ee56b44faeec71c1cfec48174d +SIZE (opensmtpd-extras-201606230001.tar.gz) = 630831