svn commit: r517714 - in head: . mail mail/opensmtpd-extras mail/opensmtpd-extras-filter-clamav mail/opensmtpd-extras-filter-dkim mail/opensmtpd-extras-filter-dnsbl mail/opensmtpd-extras-filter-lua...

Dima Panov fluffy at FreeBSD.org
Sat Nov 16 04:00:25 UTC 2019 

Author: fluffy
Date: Sat Nov 16 04:00:24 2019
New Revision: 517714
URL: https://svnweb.freebsd.org/changeset/ports/517714

Log:
  - Update OpenSMTPD extras to 6.6.0 release
  - Drop deprecated upstream filters and tools

Deleted:
  head/mail/opensmtpd-extras-filter-clamav/
  head/mail/opensmtpd-extras-filter-dkim/
  head/mail/opensmtpd-extras-filter-dnsbl/
  head/mail/opensmtpd-extras-filter-lua/
  head/mail/opensmtpd-extras-filter-monkey/
  head/mail/opensmtpd-extras-filter-pause/
  head/mail/opensmtpd-extras-filter-perl/
  head/mail/opensmtpd-extras-filter-python/
  head/mail/opensmtpd-extras-filter-regex/
  head/mail/opensmtpd-extras-filter-spamassassin/
  head/mail/opensmtpd-extras-tool-stats/
Modified:
  head/MOVED
  head/mail/Makefile
  head/mail/opensmtpd-extras/Makefile
  head/mail/opensmtpd-extras/distinfo

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sat Nov 16 03:56:37 2019	(r517713)
+++ head/MOVED	Sat Nov 16 04:00:24 2019	(r517714)
@@ -13470,3 +13470,14 @@ devel/riscv64-binutils|devel/binutils at riscv64|2019-11-
 devel/s390x-binutils|devel/binutils at s390x|2019-11-05|Moved to a flavored version
 devel/sparc64-binutils|devel/binutils at sparc64|2019-11-05|Moved to a flavored version
 devel/xtoolchain-llvm-devel|devel/llvm-devel|2019-11-15|Subsumed into devel/llvm-devel
+mail/opensmtpd-extras-filter-clamav||2019-11-15| Deprecated upstream
+mail/opensmtpd-extras-filter-dkim||2019-11-15| Deprecated upstream
+mail/opensmtpd-extras-filter-dnsbl||2019-11-15| Deprecated upstream
+mail/opensmtpd-extras-filter-lua||2019-11-15| Deprecated upstream
+mail/opensmtpd-extras-filter-monkey||2019-11-15| Deprecated upstream
+mail/opensmtpd-extras-filter-pause||2019-11-15| Deprecated upstream
+mail/opensmtpd-extras-filter-perl||2019-11-15| Deprecated upstream
+mail/opensmtpd-extras-filter-python||2019-11-15| Deprecated upstream
+mail/opensmtpd-extras-filter-regex||2019-11-15| Deprecated upstream
+mail/opensmtpd-extras-filter-spamassassin||2019-11-15| Deprecated upstream
+mail/opensmtpd-extras-tool-stats||2019-11-15| Deprecated upstream

Modified: head/mail/Makefile
==============================================================================
--- head/mail/Makefile	Sat Nov 16 03:56:37 2019	(r517713)
+++ head/mail/Makefile	Sat Nov 16 04:00:24 2019	(r517714)
@@ -273,16 +273,6 @@
     SUBDIR += opensmtpd
     SUBDIR += opensmtpd-devel
     SUBDIR += opensmtpd-extras
-    SUBDIR += opensmtpd-extras-filter-clamav
-    SUBDIR += opensmtpd-extras-filter-dkim
-    SUBDIR += opensmtpd-extras-filter-dnsbl
-    SUBDIR += opensmtpd-extras-filter-lua
-    SUBDIR += opensmtpd-extras-filter-monkey
-    SUBDIR += opensmtpd-extras-filter-pause
-    SUBDIR += opensmtpd-extras-filter-perl
-    SUBDIR += opensmtpd-extras-filter-python
-    SUBDIR += opensmtpd-extras-filter-regex
-    SUBDIR += opensmtpd-extras-filter-spamassassin
     SUBDIR += opensmtpd-extras-queue-python
     SUBDIR += opensmtpd-extras-queue-ram
     SUBDIR += opensmtpd-extras-scheduler-python
@@ -295,7 +285,6 @@
     SUBDIR += opensmtpd-extras-table-redis
     SUBDIR += opensmtpd-extras-table-socketmap
     SUBDIR += opensmtpd-extras-table-sqlite
-    SUBDIR += opensmtpd-extras-tool-stats
     SUBDIR += openwebmail
     SUBDIR += osbf-lua
     SUBDIR += ovs

Modified: head/mail/opensmtpd-extras/Makefile
==============================================================================
--- head/mail/opensmtpd-extras/Makefile	Sat Nov 16 03:56:37 2019	(r517713)
+++ head/mail/opensmtpd-extras/Makefile	Sat Nov 16 04:00:24 2019	(r517714)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opensmtpd-extras
-PORTVERSION?=	6.4.0
+PORTVERSION?=	6.6.0
 PORTREVISION?=	0
 PORTEPOCH?=	1
 CATEGORIES+=	mail
@@ -23,12 +23,15 @@ GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${OPENSSLLIB}
 CFLAGS+=	-I${OPENSSLINC}
 
-CONFIGURE_ARGS+=	--sysconfdir="${PREFIX}/etc/mail"
+WRKSRC=		${WRKDIR}/OpenSMTPD-extras-${PORTVERSION}
 
+CONFIGURE_ARGS+=	--sysconfdir="${PREFIX}/etc/mail" \
+			--with-libevent=${LOCALBASE} \
+			--with-libssl=${OPENSSLBASE}
+
 NO_OPTIONS_SORT=	yes
 
 # NB: Please *DO NOT* add the following; they are NOT for end-users:
-# filter-stub, filter-trace, filter-void
 # queue-null, queue-stub
 # scheduler-stub
 # table-stub
@@ -48,36 +51,17 @@ RUN_DEPENDS=	smtpctl:mail/opensmtpd
 
 
 .if empty(SLAVE_PORT)
-OPTIONS_GROUP=			FILTER TOOLS TABLE QUEUE SCHEDULER
-OPTIONS_GROUP_FILTER=		FILTER_MONKEY
-#OPTIONS_GROUP_FILTER=		FILTER_CLAMAV FILTER_DKIM FILTER_DNSBL FILTER_MONKEY FILTER_PAUSE FILTER_REGEX FILTER_SPAMASSASSIN
-#OPTIONS_GROUP_FILTER_EXP=	FILTER_LUA FILTER_PERL FILTER_PYTHON
+OPTIONS_GROUP=			TABLE QUEUE SCHEDULER
 OPTIONS_GROUP_QUEUE=		QUEUE_PYTHON QUEUE_RAM
 OPTIONS_GROUP_SCHEDULER=	SCHEDULER_PYTHON SCHEDULER_RAM
 OPTIONS_GROUP_TABLE=		TABLE_LDAP TABLE_MYSQL TABLE_PASSWD TABLE_PGSQL TABLE_PYTHON TABLE_REDIS TABLE_SOCKETMAP TABLE_SQLITE
-OPTIONS_GROUP_TOOLS=		TOOL_STATS
-OPTIONS_DEFAULT=		${OPTIONS_GROUP_TABLE} ${OPTIONS_GROUP_TOOLS}
+OPTIONS_DEFAULT=		${OPTIONS_GROUP_TABLE}
 
 # Groups
-FILTER_DESC=			BASE FILTERS
-FILTER_EXP_DESC=		EXPERIMENTAL FILTERS
 QUEUE_DESC=			EXPERIMENTAL QUEUES
 SCHEDULER_DESC=			EXPERIMENTAL SCHEDULERS
 TABLE_DESC=			BASE TABLES
-TOOLS_DESC=			BASE TOOLS
 
-# Filters
-FILTER_CLAMAV_DESC=		Check messages with ClamAV
-FILTER_DKIM_DESC=		Sign messages with DKIM
-FILTER_DNSBL_DESC=		Check incoming senders against DNSBLs
-FILTER_LUA_DESC=		Lua-filter interface
-FILTER_MONKEY_DESC=		Filter to arbitrary reject or delay mails
-FILTER_PAUSE_DESC=		Pause before SMTP greeting to reduce spam
-FILTER_PERL_DESC=		Perl-filter interface
-FILTER_PYTHON_DESC=		Python-filter interface
-FILTER_REGEX_DESC=		${REGEX_DESC}
-FILTER_SPAMASSASSIN_DESC=	Check messages with SpamAssassin
-
 # Queues
 QUEUE_PYTHON_DESC=		The queue-python
 QUEUE_RAM_DESC=			The queue-ram
@@ -96,26 +80,10 @@ TABLE_REDIS_DESC=		REDIS table support
 TABLE_SOCKETMAP_DESC=		Socketmap protocol support
 TABLE_SQLITE_DESC=		SQLite table support
 
-# Tools
-TOOL_STATS_DESC=		Stats tool for OpenSMTPD
-
-#PLIST_FILES=			man/man3/filter_api.3.gz
 INSTALL_DIR=			${LOCALBASE}/libexec/opensmtpd
 
 NO_ARCH=	yes
 
-# Filters
-FILTER_CLAMAV_RUN_DEPENDS=		${INSTALL_DIR}/filter-clamav:mail/opensmtpd-extras-filter-clamav
-FILTER_DKIM_RUN_DEPENDS=		${INSTALL_DIR}/filter-dkim-signer:mail/opensmtpd-extras-filter-dkim
-FILTER_DNSBL_RUN_DEPENDS=		${INSTALL_DIR}/filter-dnsbl:mail/opensmtpd-extras-filter-dnsbl
-FILTER_LUA_RUN_DEPENDS=			${INSTALL_DIR}/filter-lua:mail/opensmtpd-extras-filter-lua
-FILTER_MONKEY_RUN_DEPENDS=		${INSTALL_DIR}/filter-monkey:mail/opensmtpd-extras-filter-monkey
-FILTER_PAUSE_RUN_DEPENDS=		${INSTALL_DIR}/filter-pause:mail/opensmtpd-extras-filter-pause
-FILTER_PERL_RUN_DEPENDS=		${INSTALL_DIR}/filter-perl:mail/opensmtpd-extras-filter-perl
-FILTER_PYTHON_RUN_DEPENDS=		${INSTALL_DIR}/filter-python:mail/opensmtpd-extras-filter-python
-FILTER_REGEX_RUN_DEPENDS=		${INSTALL_DIR}/filter-regex:mail/opensmtpd-extras-filter-regex
-FILTER_SPAMASSASSIN_RUN_DEPENDS=	${INSTALL_DIR}/filter-spamassassin:mail/opensmtpd-extras-filter-spamassassin
-
 # Queues
 QUEUE_PYTHON_RUN_DEPENDS=		${INSTALL_DIR}/queue-python:mail/opensmtpd-extras-queue-python
 QUEUE_RAM_RUN_DEPENDS=			${INSTALL_DIR}/queue-ram:mail/opensmtpd-extras-queue-ram
@@ -134,14 +102,7 @@ TABLE_REDIS_RUN_DEPENDS=		${INSTALL_DIR}/table-redis:m
 TABLE_SOCKETMAP_RUN_DEPENDS=		${INSTALL_DIR}/table-socketmap:mail/opensmtpd-extras-table-socketmap
 TABLE_SQLITE_RUN_DEPENDS=		${INSTALL_DIR}/table-sqlite:mail/opensmtpd-extras-table-sqlite
 
-# Tools
-TOOL_STATS_RUN_DEPENDS=			tool-stats:mail/opensmtpd-extras-tool-stats
-.else
-
-# Only install this for the opensmtpd-extras master port
-#pre-patch:
-#	@${REINPLACE_CMD} -e '/man_MANS.*filter_api.3/s/^/#/' \
-#		${WRKSRC}/extras/filters/Makefile.am
+#.else
 
 .endif
 

Modified: head/mail/opensmtpd-extras/distinfo
==============================================================================
--- head/mail/opensmtpd-extras/distinfo	Sat Nov 16 03:56:37 2019	(r517713)
+++ head/mail/opensmtpd-extras/distinfo	Sat Nov 16 04:00:24 2019	(r517714)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1541745103
-SHA256 (opensmtpd-extras-6.4.0.tar.gz) = cb66986b7c0d0113210f4fb9ca1447b7f50ca088165e6ca61b9015ff0f2d6226
-SIZE (opensmtpd-extras-6.4.0.tar.gz) = 522988
-SHA256 (opensmtpd-extras-201703132115.tar.gz) = 4672afdd756ef279c0adcfcbf8151d6d8a370d5a628a705967373a1c83ee0ef5
-SIZE (opensmtpd-extras-201703132115.tar.gz) = 564165
+TIMESTAMP = 1573830614
+SHA256 (opensmtpd-extras-6.6.0.tar.gz) = 126b023602e8bb222bf24543a056ee0a548343dc86d184669ff9d82dfca1fbdf
+SIZE (opensmtpd-extras-6.6.0.tar.gz) = 124234

More information about the svn-ports-all mailing list