svn commit: r413482 - in head/mail: . opensmtpd-extras opensmtpd-extras-filter-clamav opensmtpd-extras-filter-dkim opensmtpd-extras-filter-spamassassin
Adam Weinberger
adamw at FreeBSD.org
Sat Apr 16 23:01:45 UTC 2016
Author: adamw
Date: Sat Apr 16 23:01:43 2016
New Revision: 413482
URL: https://svnweb.freebsd.org/changeset/ports/413482
Log:
Add clamav and dkim filters for opensmtpd-extras.
While here, improve the filter-spamassassin port to show the correct
port and host.
I'm done adding opensmtpd-extras now.
Added:
head/mail/opensmtpd-extras-filter-clamav/
head/mail/opensmtpd-extras-filter-clamav/Makefile
- copied, changed from r413477, head/mail/opensmtpd-extras/Makefile
head/mail/opensmtpd-extras-filter-dkim/
head/mail/opensmtpd-extras-filter-dkim/Makefile
- copied, changed from r413477, head/mail/opensmtpd-extras/Makefile
Modified:
head/mail/Makefile
head/mail/opensmtpd-extras-filter-spamassassin/Makefile
head/mail/opensmtpd-extras/Makefile
Modified: head/mail/Makefile
==============================================================================
--- head/mail/Makefile Sat Apr 16 21:30:23 2016 (r413481)
+++ head/mail/Makefile Sat Apr 16 23:01:43 2016 (r413482)
@@ -293,6 +293,8 @@
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-pause
SUBDIR += opensmtpd-extras-filter-regex
Copied and modified: head/mail/opensmtpd-extras-filter-clamav/Makefile (from r413477, head/mail/opensmtpd-extras/Makefile)
==============================================================================
--- head/mail/opensmtpd-extras/Makefile Sat Apr 16 19:42:36 2016 (r413477, copy source)
+++ head/mail/opensmtpd-extras-filter-clamav/Makefile Sat Apr 16 23:01:43 2016 (r413482)
@@ -1,71 +1,34 @@
-# Created by: gahr
+# Created by: Adam Weinberger <adamw at FreeBSD.org>
# $FreeBSD$
-PORTNAME= opensmtpd-extras
-PORTVERSION= 201602042118
-PORTREVISION?= 3
-CATEGORIES+= mail
-MASTER_SITES= http://www.opensmtpd.org/archives/
-
-MAINTAINER?= gahr at FreeBSD.org
-COMMENT?= Addons for OpenSMTPD
-
-LICENSE?= ISCL
-
-LIB_DEPENDS+= libevent.so:devel/libevent2
-RUN_DEPENDS+= ${LOCALBASE}/sbin/smtpctl:mail/opensmtpd
-
-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= 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
-
-OPTIONS_SUB= yes
-
-PLIST_FILES= man/man3/filter_api.3.gz
-INSTALL_DIR= ${LOCALBASE}/libexec/opensmtpd
-
-NO_ARCH= yes
-
-#
-# Filters
-#
-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_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
-pre-patch:
- @${REINPLACE_CMD} -e '/man_MANS.*filter_api.3/s/^/#/' \
- ${WRKSRC}/extras/wip/filters/Makefile.am
+PKGNAMESUFFIX= -filter-clamav
-.endif
+COMMENT= Check messages with ClamAV in OpenSMTPD
+MAINTAINER= adamw at FreeBSD.org
-.include <bsd.port.mk>
+RUN_DEPENDS= clamscan:security/clamav
+
+PLIST_FILES= libexec/opensmtpd/filter-clamav \
+ man/man8/filter-clamav.8.gz
+
+CONFIGURE_ARGS+= --with-filter-clamav
+
+MASTERDIR= ${.CURDIR}/../opensmtpd-extras
+SLAVE_PORT= yes
+
+# These have to be set at compile-time. These are the
+# defaults for ClamAV.
+FILTER_CLAMAV_HOST?= 127.0.0.1
+FILTER_CLAMAV_PORT?= 3310
+
+post-patch:
+ @${REINPLACE_CMD} \
+ -e '/^#define CLAMAV_HOST/s/127.0.0.1/${FILTER_CLAMAV_HOST}/' \
+ -e '/^#define CLAMAV_PORT/s/783/${FILTER_CLAMAV_PORT}/' \
+ ${WRKSRC}/extras/wip/filters/filter-clamav/filter_clamav.c
+ @${REINPLACE_CMD} \
+ -e 's/127.0.0.1/${FILTER_CLAMAV_HOST}/' \
+ -e 's/783/${FILTER_CLAMAV_PORT}/' \
+ ${WRKSRC}/extras/wip/filters/filter-clamav/filter-clamav.8
+
+.include "${MASTERDIR}/Makefile"
Copied and modified: head/mail/opensmtpd-extras-filter-dkim/Makefile (from r413477, head/mail/opensmtpd-extras/Makefile)
==============================================================================
--- head/mail/opensmtpd-extras/Makefile Sat Apr 16 19:42:36 2016 (r413477, copy source)
+++ head/mail/opensmtpd-extras-filter-dkim/Makefile Sat Apr 16 23:01:43 2016 (r413482)
@@ -1,71 +1,17 @@
-# Created by: gahr
+# Created by: Adam Weinberger <adamw at FreeBSD.org>
# $FreeBSD$
-PORTNAME= opensmtpd-extras
-PORTVERSION= 201602042118
-PORTREVISION?= 3
-CATEGORIES+= mail
-MASTER_SITES= http://www.opensmtpd.org/archives/
-
-MAINTAINER?= gahr at FreeBSD.org
-COMMENT?= Addons for OpenSMTPD
-
-LICENSE?= ISCL
-
-LIB_DEPENDS+= libevent.so:devel/libevent2
-RUN_DEPENDS+= ${LOCALBASE}/sbin/smtpctl:mail/opensmtpd
-
-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= 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
-
-OPTIONS_SUB= yes
-
-PLIST_FILES= man/man3/filter_api.3.gz
-INSTALL_DIR= ${LOCALBASE}/libexec/opensmtpd
-
-NO_ARCH= yes
-
-#
-# Filters
-#
-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_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
-pre-patch:
- @${REINPLACE_CMD} -e '/man_MANS.*filter_api.3/s/^/#/' \
- ${WRKSRC}/extras/wip/filters/Makefile.am
+PKGNAMESUFFIX= -filter-dkim
-.endif
+COMMENT= DKIM-signing filter for OpenSMTPD
+MAINTAINER= adamw at FreeBSD.org
-.include <bsd.port.mk>
+PLIST_FILES= libexec/opensmtpd/filter-dkim-signer \
+ man/man8/filter-dkim-signer.8.gz
+
+CONFIGURE_ARGS+= --with-filter-dkim-signer
+
+MASTERDIR= ${.CURDIR}/../opensmtpd-extras
+SLAVE_PORT= yes
+
+.include "${MASTERDIR}/Makefile"
Modified: head/mail/opensmtpd-extras-filter-spamassassin/Makefile
==============================================================================
--- head/mail/opensmtpd-extras-filter-spamassassin/Makefile Sat Apr 16 21:30:23 2016 (r413481)
+++ head/mail/opensmtpd-extras-filter-spamassassin/Makefile Sat Apr 16 23:01:43 2016 (r413482)
@@ -24,5 +24,9 @@ post-patch:
-e '/^#define SPAMASSASSIN_HOST/s/127.0.0.1/${FILTER_SPAMASSASSIN_HOST}/' \
-e '/^#define SPAMASSASSIN_PORT/s/783/${FILTER_SPAMASSASSIN_PORT}/' \
${WRKSRC}/extras/wip/filters/filter-spamassassin/filter_spamassassin.c
+ @${REINPLACE_CMD} \
+ -e 's/127.0.0.1/${FILTER_SPAMASSASSIN_HOST}/' \
+ -e 's/783/${FILTER_SPAMASSASSIN_PORT}/' \
+ ${WRKSRC}/extras/wip/filters/filter-spamassassin/filter-spamassassin.8
.include "${MASTERDIR}/Makefile"
Modified: head/mail/opensmtpd-extras/Makefile
==============================================================================
--- head/mail/opensmtpd-extras/Makefile Sat Apr 16 21:30:23 2016 (r413481)
+++ head/mail/opensmtpd-extras/Makefile Sat Apr 16 23:01:43 2016 (r413482)
@@ -3,7 +3,7 @@
PORTNAME= opensmtpd-extras
PORTVERSION= 201602042118
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES+= mail
MASTER_SITES= http://www.opensmtpd.org/archives/
@@ -22,11 +22,13 @@ GNU_CONFIGURE= yes
.if empty(SLAVE_PORT)
OPTIONS_GROUP= FILTER TABLE
-OPTIONS_GROUP_FILTER= DNSBL PAUSE REGEX SPAMASSASSIN
+OPTIONS_GROUP_FILTER= CLAMAV DKIM DNSBL PAUSE REGEX SPAMASSASSIN
OPTIONS_GROUP_TABLE= LDAP MYSQL PASSWD PGSQL PYTHON REDIS SMAP SQLITE
OPTIONS_DEFAULT= ${OPTIONS_GROUP_FILTER} ${OPTIONS_GROUP_TABLE}
# Filters
+CLAMAV_DESC= Check messages with ClamAV
+DKIM_DESC= Sign messages with DKIM
DNSBL_DESC= Check messages against DNSBLs
PAUSE_DESC= Pause incoming messages to reduce spam
SPAMASSASSIN_DESC= Check messages with SpamAssassin
@@ -44,6 +46,8 @@ NO_ARCH= yes
#
# Filters
#
+CLAMAV_RUN_DEPENDS= ${INSTALL_DIR}/filter-clamav:mail/opensmtpd-extras-filter-clamav
+DKIM_RUN_DEPENDS= ${INSTALL_DIR}/filter-dkim-signer:mail/opensmtpd-extras-filter-dkim
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
More information about the svn-ports-head
mailing list