Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Apr 2016 16:49:21 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r413459 - in head/mail: opensmtpd-extras opensmtpd-extras-filter-dnsbl opensmtpd-extras-filter-pause opensmtpd-extras-filter-regex
Message-ID:  <201604161649.u3GGnLw1048575@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Sat Apr 16 16:49:21 2016
New Revision: 413459
URL: https://svnweb.freebsd.org/changeset/ports/413459

Log:
  Add dnsbl, pause, and regex filters for OpenSMTPD.
  
  -filter-regex needs a post-install target, so I changed the post-install
  in MASTERDIR to be pre-patch instead.
  
  Also, in the opensmtpd-extras/Makefile, change the dependencies to only
  be run-time, and fix some spacing nits.
  
  PORTREVISION bump for dependency changes.

Added:
  head/mail/opensmtpd-extras-filter-dnsbl/
  head/mail/opensmtpd-extras-filter-dnsbl/Makefile
     - copied, changed from r413445, head/mail/opensmtpd-extras/Makefile
  head/mail/opensmtpd-extras-filter-pause/
  head/mail/opensmtpd-extras-filter-pause/Makefile
     - copied, changed from r413445, head/mail/opensmtpd-extras/Makefile
  head/mail/opensmtpd-extras-filter-regex/
  head/mail/opensmtpd-extras-filter-regex/Makefile
     - copied, changed from r413445, head/mail/opensmtpd-extras/Makefile
  head/mail/opensmtpd-extras-filter-regex/pkg-plist   (contents, props changed)
Modified:
  head/mail/opensmtpd-extras/Makefile

Copied and modified: head/mail/opensmtpd-extras-filter-dnsbl/Makefile (from r413445, head/mail/opensmtpd-extras/Makefile)
==============================================================================
--- head/mail/opensmtpd-extras/Makefile	Sat Apr 16 15:39:53 2016	(r413445, copy source)
+++ head/mail/opensmtpd-extras-filter-dnsbl/Makefile	Sat Apr 16 16:49:21 2016	(r413459)
@@ -1,81 +1,19 @@
-# Created by: gahr
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	opensmtpd-extras
-PORTVERSION=	201602042118
-PORTREVISION?=	2
-CATEGORIES+=	mail
-MASTER_SITES=	http://www.opensmtpd.org/archives/
+PKGNAMESUFFIX=		-filter-dnsbl
 
-MAINTAINER?=	gahr@FreeBSD.org
-COMMENT?=	Addons for OpenSMTPD
+COMMENT=		DNSBL-checking filter for OpenSMTPD
+MAINTAINER=		adamw@FreeBSD.org
 
-LICENSE?=	ISCL
+LIB_DEPENDS=		libasr.so:dns/libasr
 
-LIB_DEPENDS+=	libevent.so:devel/libevent2
-RUN_DEPENDS+=	${LOCALBASE}/sbin/smtpctl:mail/opensmtpd
+PLIST_FILES=		libexec/opensmtpd/filter-dnsbl \
+			man/man8/filter-dnsbl.8.gz
 
-USES+=		autoreconf libtool pkgconfig
-USE_OPENSSL=	yes
-WITH_OPENSSL_PORT=	yes
-GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--with-filter-dnsbl
 
-.if empty(SLAVE_PORT)
-OPTIONS_GROUP=		FILTER TABLE
-OPTIONS_GROUP_FILTER=	SPAMASSASSIN
-OPTIONS_GROUP_TABLE=	LDAP MYSQL PASSWD PGSQL PYTHON REDIS SMAP SQLITE
-OPTIONS_DEFAULT=	${OPTIONS_GROUP_FILTER} ${OPTIONS_GROUP_TABLE}
+MASTERDIR=		${.CURDIR}/../opensmtpd-extras
+SLAVE_PORT=		yes
 
-# Filters
-SPAMASSASSIN_DESC=	Check messages with SpamAssassin
-# Tables
-PASSWD_DESC=	passwd(5) table support
-SMAP_DESC=	Socketmap protocol support
-
-OPTIONS_SUB=	yes
-
-PLIST_FILES=	man/man3/filter_api.3.gz
-INSTALL_DIR=	${LOCALBASE}/libexec/opensmtpd
-
-NO_ARCH=	yes
-
-#
-# Filters
-#
-
-SPAMASSASSIN_BUILD_DEPENDS=	${INSTALL_DIR}/filter-spamassassin:mail/opensmtpd-extras-filter-spamassassin
-SPAMASSASSIN_RUN_DEPENDS=	${SPAMASSASSIN_BUILD_DEPENDS}
-
-#
-# Tables
-#
-
-MYSQL_BUILD_DEPENDS=	${INSTALL_DIR}/table-mysql:mail/opensmtpd-extras-table-mysql
-MYSQL_RUN_DEPENDS=	${MYSQL_BUILD_DEPENDS}
-
-PASSWD_BUILD_DEPENDS=	${INSTALL_DIR}/table-passwd:mail/opensmtpd-extras-table-passwd
-PASSWD_RUN_DEPENDS=	${PASSWD_BUILD_DEPENDS}
-
-PGSQL_BUILD_DEPENDS=	${INSTALL_DIR}/table-postgres:mail/opensmtpd-extras-table-postgresql
-PGSQL_RUN_DEPENDS=	${PGSQL_BUILD_DEPENDS}
-
-PYTHON_BUILD_DEPENDS=	${INSTALL_DIR}/table-python:mail/opensmtpd-extras-table-python
-PYTHON_RUN_DEPENDS=	${PYTHON_BUILD_DEPENDS}
-
-REDIS_BUILD_DEPENDS=	${INSTALL_DIR}/table-redis:mail/opensmtpd-extras-table-redis
-REDIS_RUN_DEPENDS=	${REDIS_BUILD_DEPENDS}
-
-SMAP_BUILD_DEPENDS=	${INSTALL_DIR}/table-socketmap:mail/opensmtpd-extras-table-socketmap
-SMAP_RUN_DEPENDS=	${SMAP_BUILD_DEPENDS}
-
-SQLITE_BUILD_DEPENDS=	${INSTALL_DIR}/table-sqlite:mail/opensmtpd-extras-table-sqlite
-SQLITE_RUN_DEPENDS=	${SQLITE_BUILD_DEPENDS}
-.else
-
-# Only install this for the opensmtpd-extras master port
-post-install:
-	@${RM} ${STAGEDIR}${MAN3PREFIX}/man/man3/filter_api.3
-
-.endif
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"

Copied and modified: head/mail/opensmtpd-extras-filter-pause/Makefile (from r413445, head/mail/opensmtpd-extras/Makefile)
==============================================================================
--- head/mail/opensmtpd-extras/Makefile	Sat Apr 16 15:39:53 2016	(r413445, copy source)
+++ head/mail/opensmtpd-extras-filter-pause/Makefile	Sat Apr 16 16:49:21 2016	(r413459)
@@ -1,81 +1,17 @@
-# Created by: gahr
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	opensmtpd-extras
-PORTVERSION=	201602042118
-PORTREVISION?=	2
-CATEGORIES+=	mail
-MASTER_SITES=	http://www.opensmtpd.org/archives/
+PKGNAMESUFFIX=		-filter-pause
 
-MAINTAINER?=	gahr@FreeBSD.org
-COMMENT?=	Addons for OpenSMTPD
+COMMENT=		Pause incoming OpenSMTPD messages to reduce spam
+MAINTAINER=		adamw@FreeBSD.org
 
-LICENSE?=	ISCL
+PLIST_FILES=		libexec/opensmtpd/filter-pause \
+			man/man8/filter-pause.8.gz
 
-LIB_DEPENDS+=	libevent.so:devel/libevent2
-RUN_DEPENDS+=	${LOCALBASE}/sbin/smtpctl:mail/opensmtpd
+CONFIGURE_ARGS+=	--with-filter-pause
 
-USES+=		autoreconf libtool pkgconfig
-USE_OPENSSL=	yes
-WITH_OPENSSL_PORT=	yes
-GNU_CONFIGURE=	yes
+MASTERDIR=		${.CURDIR}/../opensmtpd-extras
+SLAVE_PORT=		yes
 
-.if empty(SLAVE_PORT)
-OPTIONS_GROUP=		FILTER TABLE
-OPTIONS_GROUP_FILTER=	SPAMASSASSIN
-OPTIONS_GROUP_TABLE=	LDAP MYSQL PASSWD PGSQL PYTHON REDIS SMAP SQLITE
-OPTIONS_DEFAULT=	${OPTIONS_GROUP_FILTER} ${OPTIONS_GROUP_TABLE}
-
-# Filters
-SPAMASSASSIN_DESC=	Check messages with SpamAssassin
-# Tables
-PASSWD_DESC=	passwd(5) table support
-SMAP_DESC=	Socketmap protocol support
-
-OPTIONS_SUB=	yes
-
-PLIST_FILES=	man/man3/filter_api.3.gz
-INSTALL_DIR=	${LOCALBASE}/libexec/opensmtpd
-
-NO_ARCH=	yes
-
-#
-# Filters
-#
-
-SPAMASSASSIN_BUILD_DEPENDS=	${INSTALL_DIR}/filter-spamassassin:mail/opensmtpd-extras-filter-spamassassin
-SPAMASSASSIN_RUN_DEPENDS=	${SPAMASSASSIN_BUILD_DEPENDS}
-
-#
-# Tables
-#
-
-MYSQL_BUILD_DEPENDS=	${INSTALL_DIR}/table-mysql:mail/opensmtpd-extras-table-mysql
-MYSQL_RUN_DEPENDS=	${MYSQL_BUILD_DEPENDS}
-
-PASSWD_BUILD_DEPENDS=	${INSTALL_DIR}/table-passwd:mail/opensmtpd-extras-table-passwd
-PASSWD_RUN_DEPENDS=	${PASSWD_BUILD_DEPENDS}
-
-PGSQL_BUILD_DEPENDS=	${INSTALL_DIR}/table-postgres:mail/opensmtpd-extras-table-postgresql
-PGSQL_RUN_DEPENDS=	${PGSQL_BUILD_DEPENDS}
-
-PYTHON_BUILD_DEPENDS=	${INSTALL_DIR}/table-python:mail/opensmtpd-extras-table-python
-PYTHON_RUN_DEPENDS=	${PYTHON_BUILD_DEPENDS}
-
-REDIS_BUILD_DEPENDS=	${INSTALL_DIR}/table-redis:mail/opensmtpd-extras-table-redis
-REDIS_RUN_DEPENDS=	${REDIS_BUILD_DEPENDS}
-
-SMAP_BUILD_DEPENDS=	${INSTALL_DIR}/table-socketmap:mail/opensmtpd-extras-table-socketmap
-SMAP_RUN_DEPENDS=	${SMAP_BUILD_DEPENDS}
-
-SQLITE_BUILD_DEPENDS=	${INSTALL_DIR}/table-sqlite:mail/opensmtpd-extras-table-sqlite
-SQLITE_RUN_DEPENDS=	${SQLITE_BUILD_DEPENDS}
-.else
-
-# Only install this for the opensmtpd-extras master port
-post-install:
-	@${RM} ${STAGEDIR}${MAN3PREFIX}/man/man3/filter_api.3
-
-.endif
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"

Copied and modified: head/mail/opensmtpd-extras-filter-regex/Makefile (from r413445, head/mail/opensmtpd-extras/Makefile)
==============================================================================
--- head/mail/opensmtpd-extras/Makefile	Sat Apr 16 15:39:53 2016	(r413445, copy source)
+++ head/mail/opensmtpd-extras-filter-regex/Makefile	Sat Apr 16 16:49:21 2016	(r413459)
@@ -1,81 +1,26 @@
-# Created by: gahr
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	opensmtpd-extras
-PORTVERSION=	201602042118
-PORTREVISION?=	2
-CATEGORIES+=	mail
-MASTER_SITES=	http://www.opensmtpd.org/archives/
+PKGNAMESUFFIX=		-filter-regex
 
-MAINTAINER?=	gahr@FreeBSD.org
-COMMENT?=	Addons for OpenSMTPD
+COMMENT=		Regular expression filter for OpenSMTPD
+MAINTAINER=		adamw@FreeBSD.org
 
-LICENSE?=	ISCL
+CONFIGURE_ARGS+=	--with-filter-regex
 
-LIB_DEPENDS+=	libevent.so:devel/libevent2
-RUN_DEPENDS+=	${LOCALBASE}/sbin/smtpctl:mail/opensmtpd
+PLIST=			${.CURDIR}/pkg-plist
+MASTERDIR=		${.CURDIR}/../opensmtpd-extras
+SLAVE_PORT=		yes
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|/etc/mail/filter-regex.conf|${PREFIX}&|' \
+		${WRKSRC}/extras/wip/filters/filter-regex/filter_regex.c \
+		${WRKSRC}/extras/wip/filters/filter-regex/filter-regex.8
 
-USES+=		autoreconf libtool pkgconfig
-USE_OPENSSL=	yes
-WITH_OPENSSL_PORT=	yes
-GNU_CONFIGURE=	yes
-
-.if empty(SLAVE_PORT)
-OPTIONS_GROUP=		FILTER TABLE
-OPTIONS_GROUP_FILTER=	SPAMASSASSIN
-OPTIONS_GROUP_TABLE=	LDAP MYSQL PASSWD PGSQL PYTHON REDIS SMAP SQLITE
-OPTIONS_DEFAULT=	${OPTIONS_GROUP_FILTER} ${OPTIONS_GROUP_TABLE}
-
-# Filters
-SPAMASSASSIN_DESC=	Check messages with SpamAssassin
-# Tables
-PASSWD_DESC=	passwd(5) table support
-SMAP_DESC=	Socketmap protocol support
-
-OPTIONS_SUB=	yes
-
-PLIST_FILES=	man/man3/filter_api.3.gz
-INSTALL_DIR=	${LOCALBASE}/libexec/opensmtpd
-
-NO_ARCH=	yes
-
-#
-# Filters
-#
-
-SPAMASSASSIN_BUILD_DEPENDS=	${INSTALL_DIR}/filter-spamassassin:mail/opensmtpd-extras-filter-spamassassin
-SPAMASSASSIN_RUN_DEPENDS=	${SPAMASSASSIN_BUILD_DEPENDS}
-
-#
-# Tables
-#
-
-MYSQL_BUILD_DEPENDS=	${INSTALL_DIR}/table-mysql:mail/opensmtpd-extras-table-mysql
-MYSQL_RUN_DEPENDS=	${MYSQL_BUILD_DEPENDS}
-
-PASSWD_BUILD_DEPENDS=	${INSTALL_DIR}/table-passwd:mail/opensmtpd-extras-table-passwd
-PASSWD_RUN_DEPENDS=	${PASSWD_BUILD_DEPENDS}
-
-PGSQL_BUILD_DEPENDS=	${INSTALL_DIR}/table-postgres:mail/opensmtpd-extras-table-postgresql
-PGSQL_RUN_DEPENDS=	${PGSQL_BUILD_DEPENDS}
-
-PYTHON_BUILD_DEPENDS=	${INSTALL_DIR}/table-python:mail/opensmtpd-extras-table-python
-PYTHON_RUN_DEPENDS=	${PYTHON_BUILD_DEPENDS}
-
-REDIS_BUILD_DEPENDS=	${INSTALL_DIR}/table-redis:mail/opensmtpd-extras-table-redis
-REDIS_RUN_DEPENDS=	${REDIS_BUILD_DEPENDS}
-
-SMAP_BUILD_DEPENDS=	${INSTALL_DIR}/table-socketmap:mail/opensmtpd-extras-table-socketmap
-SMAP_RUN_DEPENDS=	${SMAP_BUILD_DEPENDS}
-
-SQLITE_BUILD_DEPENDS=	${INSTALL_DIR}/table-sqlite:mail/opensmtpd-extras-table-sqlite
-SQLITE_RUN_DEPENDS=	${SQLITE_BUILD_DEPENDS}
-.else
-
-# Only install this for the opensmtpd-extras master port
 post-install:
-	@${RM} ${STAGEDIR}${MAN3PREFIX}/man/man3/filter_api.3
-
-.endif
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail
+	${INSTALL_DATA} ${WRKSRC}/extras/wip/filters/filter-regex/filter-regex.conf \
+		${STAGEDIR}${PREFIX}/etc/mail/filter-regex.conf.sample
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"

Added: head/mail/opensmtpd-extras-filter-regex/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/opensmtpd-extras-filter-regex/pkg-plist	Sat Apr 16 16:49:21 2016	(r413459)
@@ -0,0 +1,4 @@
+@sample etc/mail/filter-regex.conf.sample
+libexec/opensmtpd/filter-regex
+man/man5/filter-regex.conf.5.gz
+man/man8/filter-regex.8.gz

Modified: head/mail/opensmtpd-extras/Makefile
==============================================================================
--- head/mail/opensmtpd-extras/Makefile	Sat Apr 16 16:46:04 2016	(r413458)
+++ head/mail/opensmtpd-extras/Makefile	Sat Apr 16 16:49:21 2016	(r413459)
@@ -3,7 +3,7 @@
 
 PORTNAME=	opensmtpd-extras
 PORTVERSION=	201602042118
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES+=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/
 
@@ -22,15 +22,17 @@ GNU_CONFIGURE=	yes
 
 .if empty(SLAVE_PORT)
 OPTIONS_GROUP=		FILTER TABLE
-OPTIONS_GROUP_FILTER=	SPAMASSASSIN
+OPTIONS_GROUP_FILTER=	DNSBL PAUSE REGEX SPAMASSASSIN
 OPTIONS_GROUP_TABLE=	LDAP MYSQL PASSWD PGSQL PYTHON REDIS SMAP SQLITE
 OPTIONS_DEFAULT=	${OPTIONS_GROUP_FILTER} ${OPTIONS_GROUP_TABLE}
 
 # Filters
+DNSBL_DESC=		Check messages against DNSBLs
+PAUSE_DESC=		Pause incoming messages to reduce spam
 SPAMASSASSIN_DESC=	Check messages with SpamAssassin
 # Tables
-PASSWD_DESC=	passwd(5) table support
-SMAP_DESC=	Socketmap protocol support
+PASSWD_DESC=		passwd(5) table support
+SMAP_DESC=		Socketmap protocol support
 
 OPTIONS_SUB=	yes
 
@@ -42,39 +44,27 @@ NO_ARCH=	yes
 #
 # Filters
 #
-
-SPAMASSASSIN_BUILD_DEPENDS=	${INSTALL_DIR}/filter-spamassassin:mail/opensmtpd-extras-filter-spamassassin
-SPAMASSASSIN_RUN_DEPENDS=	${SPAMASSASSIN_BUILD_DEPENDS}
+DNSBL_RUN_DEPENDS=		${INSTALL_DIR}/filter-dnsbl:mail/opensmtpd-extras-filter-dnsbl
+PAUSE_RUN_DEPENDS=		${INSTALL_DIR}/filter-pause:mail/opensmtpd-extras-filter-pause
+REGEX_RUN_DEPENDS=		${INSTALL_DIR}/filter-regex:mail/opensmtpd-extras-filter-regex
+SPAMASSASSIN_RUN_DEPENDS=	${INSTALL_DIR}/filter-spamassassin:mail/opensmtpd-extras-filter-spamassassin
 
 #
 # Tables
 #
-
-MYSQL_BUILD_DEPENDS=	${INSTALL_DIR}/table-mysql:mail/opensmtpd-extras-table-mysql
-MYSQL_RUN_DEPENDS=	${MYSQL_BUILD_DEPENDS}
-
-PASSWD_BUILD_DEPENDS=	${INSTALL_DIR}/table-passwd:mail/opensmtpd-extras-table-passwd
-PASSWD_RUN_DEPENDS=	${PASSWD_BUILD_DEPENDS}
-
-PGSQL_BUILD_DEPENDS=	${INSTALL_DIR}/table-postgres:mail/opensmtpd-extras-table-postgresql
-PGSQL_RUN_DEPENDS=	${PGSQL_BUILD_DEPENDS}
-
-PYTHON_BUILD_DEPENDS=	${INSTALL_DIR}/table-python:mail/opensmtpd-extras-table-python
-PYTHON_RUN_DEPENDS=	${PYTHON_BUILD_DEPENDS}
-
-REDIS_BUILD_DEPENDS=	${INSTALL_DIR}/table-redis:mail/opensmtpd-extras-table-redis
-REDIS_RUN_DEPENDS=	${REDIS_BUILD_DEPENDS}
-
-SMAP_BUILD_DEPENDS=	${INSTALL_DIR}/table-socketmap:mail/opensmtpd-extras-table-socketmap
-SMAP_RUN_DEPENDS=	${SMAP_BUILD_DEPENDS}
-
-SQLITE_BUILD_DEPENDS=	${INSTALL_DIR}/table-sqlite:mail/opensmtpd-extras-table-sqlite
-SQLITE_RUN_DEPENDS=	${SQLITE_BUILD_DEPENDS}
+MYSQL_RUN_DEPENDS=	${INSTALL_DIR}/table-mysql:mail/opensmtpd-extras-table-mysql
+PASSWD_RUN_DEPENDS=	${INSTALL_DIR}/table-passwd:mail/opensmtpd-extras-table-passwd
+PGSQL_RUN_DEPENDS=	${INSTALL_DIR}/table-postgres:mail/opensmtpd-extras-table-postgresql
+PYTHON_RUN_DEPENDS=	${INSTALL_DIR}/table-python:mail/opensmtpd-extras-table-python
+REDIS_RUN_DEPENDS=	${INSTALL_DIR}/table-redis:mail/opensmtpd-extras-table-redis
+SMAP_RUN_DEPENDS=	${INSTALL_DIR}/table-socketmap:mail/opensmtpd-extras-table-socketmap
+SQLITE_RUN_DEPENDS=	${INSTALL_DIR}/table-sqlite:mail/opensmtpd-extras-table-sqlite
 .else
 
 # Only install this for the opensmtpd-extras master port
-post-install:
-	@${RM} ${STAGEDIR}${MAN3PREFIX}/man/man3/filter_api.3
+pre-patch:
+	@${REINPLACE_CMD} -e '/man_MANS.*filter_api.3/s/^/#/' \
+		${WRKSRC}/extras/wip/filters/Makefile.am
 
 .endif
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604161649.u3GGnLw1048575>