svn commit: r367931 - in head/mail: . dcc-dccd dcc-dccd/files spamassassin
Mathieu Arnold
mat at FreeBSD.org
Thu Sep 11 13:34:42 UTC 2014
Author: mat
Date: Thu Sep 11 13:34:39 2014
New Revision: 367931
URL: http://svnweb.freebsd.org/changeset/ports/367931
QAT: https://qat.redports.org/buildarchive/r367931/
Log:
Add back mail/dcc-dccd
- Update to 1.3.155.
- Stage.
- Build as a user.
- Add the option back to spamassassin.
Sponsored by: Absolight
Added:
head/mail/dcc-dccd/
- copied from r367498, head/mail/dcc-dccd/
head/mail/dcc-dccd/files/patch-Makefile.inc.in (contents, props changed)
head/mail/dcc-dccd/files/patch-cdcc__Makefile.in (contents, props changed)
head/mail/dcc-dccd/files/patch-configure (contents, props changed)
head/mail/dcc-dccd/files/patch-dccproc__Makefile.in (contents, props changed)
head/mail/dcc-dccd/files/patch-dccsight__Makefile.in (contents, props changed)
head/mail/dcc-dccd/files/patch-homedir__make-dcc_conf.in (contents, props changed)
head/mail/dcc-dccd/pkg-help (contents, props changed)
Modified:
head/mail/Makefile
head/mail/dcc-dccd/Makefile
head/mail/dcc-dccd/distinfo
head/mail/dcc-dccd/pkg-plist
head/mail/spamassassin/Makefile
Modified: head/mail/Makefile
==============================================================================
--- head/mail/Makefile Thu Sep 11 13:31:48 2014 (r367930)
+++ head/mail/Makefile Thu Sep 11 13:34:39 2014 (r367931)
@@ -85,6 +85,7 @@
SUBDIR += davmail
SUBDIR += dbmail
SUBDIR += dbmail22
+ SUBDIR += dcc-dccd
SUBDIR += deforaos-mailer
SUBDIR += delatt
SUBDIR += dk-milter
Modified: head/mail/dcc-dccd/Makefile
==============================================================================
--- head/mail/dcc-dccd/Makefile Sun Sep 7 08:38:53 2014 (r367498)
+++ head/mail/dcc-dccd/Makefile Thu Sep 11 13:34:39 2014 (r367931)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= dcc-dccd
-PORTVERSION= 1.3.141
+PORTVERSION= 1.3.155
CATEGORIES= mail
MASTER_SITES= http://www.dcc-servers.net/dcc/source/old/ \
http://www.rhyolite.com/anti-spam/dcc/source/old/ \
@@ -11,7 +11,7 @@ MASTER_SITES= http://www.dcc-servers.net
DISTNAME= dcc-${PORTVERSION}
EXTRACT_SUFX= .tar.Z
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= mat at FreeBSD.org
COMMENT= Distributed Checksum Clearinghouse bulk email detector
.if ! defined(PACKAGE_BUILDING)
@@ -22,38 +22,21 @@ LICENSE_PERMS= no-pkg-sell no-dist-mirro
.endif
HAS_CONFIGURE= yes
-MANCOMPRESSED= yes
-MAN8= cdcc.8 dbclean.8 dblist.8 dcc.8 dccd.8 dccifd.8 dccm.8 \
- dccproc.8 dccsight.8
-#
-# ALT_HOME - DCC keeps its config files in its home directory but writes
-# status and database files there as well. This latter point
-# means that the FreeBSD default home directory for DCC,
-# /usr/local/dcc, cannot be mounted read-only.
-#
-# DCC's default home dir of /var/dcc breaks FreeBSD hierarchy
-# conventions, but allows for a read-only /usr.
-#
-# Setting ALT_HOME on will set DCC's home to /var/dcc, but
-# keep its binaries in /usr/local/dcc/libexec. Since this
-# also means DCC's config files will be in /var/dcc, for
-# convenience a soft link from /usr/local/etc/dcc to /var/dcc
-# may be created.
-#
-# Note also that dccifd's default socket location is DCC's
-# home, so if /var/dcc is used for the home, then programs
-# like SpamAssassin may need to be explicitly told where
-# to find dccifd's socket.
-#
-OPTIONS_DEFINE= DCCIFD DCCM DCCD DCCGREY IPV6 ALT_HOME PORTS_SENDMAIL
+USES= gmake
+
+OPTIONS_DEFINE= DCCIFD DCCD DCCGREY IPV6 ALT_HOME
OPTIONS_DEFAULT= DCCIFD DCCM DCCD DCCGREY
+OPTIONS_GROUP= MILTER
+OPTIONS_GROUP_MILTER= DCCM PORTS_SENDMAIL
DCCIFD_DESC= DCC interface daemon (for SpamAssassin etc)
DCCM_DESC= DCC milter (for Sendmail only)
DCCD_DESC= DCC server
DCCGREY_DESC= DCC greylisting server
-ALT_HOME_DESC= DCC home in /var/dcc
-PORTS_SENDMAIL_DESC= Use base Sendmail if off, ports if on
+ALT_HOME_DESC= DCC home in /var/dcc (see help)
+PORTS_SENDMAIL_DESC= Use ports Sendmail instead of base
+
+OPTIONS_SUB= yes
## User for DCC files and SUID binaries
#
@@ -63,28 +46,38 @@ DCCGROUP?= dcc
USERS= ${DCCUSER}
GROUPS= ${DCCGROUP}
-PLIST_SUB+= DCCUSER="${DCCUSER}"
+PLIST_SUB+= DCCUSER="${DCCUSER}" DCCGROUP="${DCCGROUP}"
+SUB_FILES= pkg-install pkg-message
+SUB_LIST+= WRKSRC=${WRKSRC} DCCHOME=${DCCHOME}
## Use the configure script to explicitly set the locations of all files,
## in case the standard locations have been locally overridden
-#
-CONFIGURE_ARGS= --with-uid=${DCCUSER} --bindir=${PREFIX}/bin --mandir=${MANPREFIX}/man --with-configsuffix=.sample
+## Also, use a similar hack to USES=desthack.
+CONFIGURE_ARGS= --with-uid=${DCCUSER} \
+ --bindir=${PREFIX}/bin \
+ --mandir=${MANPREFIX}/man \
+ --with-installroot=\$${${DESTDIRNAME}} \
+ --with-configsuffix=.sample \
+ --with-make-cmd=${MAKE_CMD}
+
+ALT_HOME_CONFIGURE_ON= --libexecdir=${PREFIX}/dcc/libexec --with-cgibin=${PREFIX}/dcc/cgi-bin
+DCCM_CONFIGURE_ENABLE= dccm
+DCCM_USE= rc_subr=dccm
+PORTS_SENDMAIL_BUILD_DEPENDS= ${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail
+PORTS_SENDMAIL_CONFIGURE_ON= --with-sendmail=yes
+DCCIFD_CONFIGURE_ENABLE= dccifd
+DCCIFD_USE= rc_subr=dccifd
+DCCD_CONFIGURE_ENABLE= server
+IPV6_CONFIGURE_OFF= --disable-IPv6
+DCCD_USE= rc_subr=dccd
+DCCGREY_USE= rc_subr=dccgrey
-NO_STAGE= yes
.include <bsd.port.options.mk>
-SUB_FILES= pkg-install pkg-message
-SUB_LIST+= WRKSRC=${WRKSRC} DCCHOME=${DCCHOME}
-
-## /var/dcc home support
-#
.if ${PORT_OPTIONS:MALT_HOME}
-CONFIGURE_ARGS+= --libexecdir=${PREFIX}/dcc/libexec --with-cgibin=${PREFIX}/dcc/cgi-bin
DCCHOME= /var/dcc
-PLIST_SUB+= WITH_ALT_HOME=""
.else
DCCHOME= ${PREFIX}/dcc
-PLIST_SUB+= WITH_ALT_HOME="@comment "
.endif
CONFIGURE_ARGS+= --homedir=${DCCHOME}
@@ -106,7 +99,6 @@ IGNORE= ports Sendmail not found, rebui
.if ! ${PORT_OPTIONS:MPORTS_SENDMAIL}
MILTERBASE= /usr
.else
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail
MILTERBASE?= ${LOCALBASE}
.endif
@@ -116,75 +108,18 @@ MILTERLIB= ${MILTERBASE}/lib
CPPFLAGS+= -I${MILTERINC}
CFLAGS+= -I${MILTERINC}
LDFLAGS+= -L${MILTERLIB}
-
-CONFIGURE_ARGS+= --with-sendmail=yes
-
-PLIST_SUB+= WITH_DCCM=""
-
-USE_RC_SUBR+= dccm
-
-.else
-CONFIGURE_ARGS+= --disable-dccm
-PLIST_SUB+= WITH_DCCM="@comment "
.endif
-## dccifd client interface daemon support
-#
-.if ! ${PORT_OPTIONS:MDCCIFD}
-CONFIGURE_ARGS+= --disable-dccifd
-PLIST_SUB+= WITH_DCCIFD="@comment "
+.if ${PORT_OPTIONS:MDCCIFD} || ${PORT_OPTIONS:MDCCM}
+PLIST_SUB+= IFD_MILT=""
.else
-PLIST_SUB+= WITH_DCCIFD=""
-USE_RC_SUBR+= dccifd
+PLIST_SUB+= IFD_MILT="@comment "
.endif
-## dccd server support
-#
-.if ! ${PORT_OPTIONS:MDCCD} && ! ${PORT_OPTIONS:MDCCGREY}
-CONFIGURE_ARGS+= --disable-server
-PLIST_SUB+= WITH_DCCD="@comment "
-.else
-PLIST_SUB+= WITH_DCCD=""
-.endif
-
-## IPV6 support
-#
-.if ! ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+= --disable-IPv6
-.endif
-
-## Packing list and rcNG script fixups
-#
-.if ! ${PORT_OPTIONS:MDCCIFD} && ! ${PORT_OPTIONS:MDCCM}
-PLIST_SUB+= WITH_IFD_MILT="@comment "
-.else
-PLIST_SUB+= WITH_IFD_MILT=""
-.endif
-
-.if ${PORT_OPTIONS:MDCCD}
-USE_RC_SUBR+= dccd
-.endif
-
-.if ${PORT_OPTIONS:MDCCGREY}
-USE_RC_SUBR+= dccgrey
-PLIST_SUB+= WITH_DCCGREY=""
-.else
-PLIST_SUB+= WITH_DCCGREY="@comment "
-.endif
-
-pre-everything::
- @${ECHO_MSG} ' '
- @${ECHO_MSG} "A description of ALT_HOME may be found in the port's Makefile."
- @${ECHO_MSG} ' '
-
-post-install:
-
-## Make certain DCC's config files are owned by DCC's user
-#
- @${CHOWN} ${DCCUSER} ${DCCHOME}/*
-
-## Print DCC installation notes and RESTRICTIONS file info
-#
- @${CAT} ${PKGMESSAGE}
+post-stage:
+ @${MV} ${STAGEDIR}${PREFIX}/dcc/cgi-bin/footer-dist \
+ ${STAGEDIR}${PREFIX}/dcc/cgi-bin/footer.sample
+ @${MV} ${STAGEDIR}${PREFIX}/dcc/cgi-bin/header-dist \
+ ${STAGEDIR}${PREFIX}/dcc/cgi-bin/header.sample
.include <bsd.port.mk>
Modified: head/mail/dcc-dccd/distinfo
==============================================================================
--- head/mail/dcc-dccd/distinfo Sun Sep 7 08:38:53 2014 (r367498)
+++ head/mail/dcc-dccd/distinfo Thu Sep 11 13:34:39 2014 (r367931)
@@ -1,2 +1,2 @@
-SHA256 (dcc-1.3.141.tar.Z) = b13e339fc1505ecf7d3784de49953b7002243d63a163884a572ee5e933adbe77
-SIZE (dcc-1.3.141.tar.Z) = 1682913
+SHA256 (dcc-1.3.155.tar.Z) = ea922f75607cf0f571c7ec3745bb80903ff1739d749655bf731b8f7e15efd76d
+SIZE (dcc-1.3.155.tar.Z) = 1711020
Added: head/mail/dcc-dccd/files/patch-Makefile.inc.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/dcc-dccd/files/patch-Makefile.inc.in Thu Sep 11 13:34:39 2014 (r367931)
@@ -0,0 +1,23 @@
+--- Makefile.inc.in.orig 2014-08-06 14:43:42 UTC
++++ Makefile.inc.in
+@@ -102,7 +102,6 @@
+ DCC_OWN =@DCCSUID@
+ @MAKE_DOT at endif
+ @MAKE_DOT at endif
+-BINOWN =$(DCC_OWN)
+
+ @MAKE_DOT at ifndef DCC_GRP
+ DCC_GRP =@DCC_GRP@
+@@ -129,9 +128,9 @@
+ SET_MANOWN=
+ SET_DCCOWN=
+ @MAKE_DOT at else
+-SET_BINOWN=-o $(BINOWN) -g $(BINGRP)
+-SET_MANOWN=-o $(MANOWN) -g $(MANGRP)
+-SET_DCCOWN=-o @DCCSUID@ -g $(BINGRP)
++SET_BINOWN=
++SET_MANOWN=
++SET_DCCOWN=
+ @MAKE_DOT at endif
+
+ @MAKE_DOT at ifdef PROG
Added: head/mail/dcc-dccd/files/patch-cdcc__Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/dcc-dccd/files/patch-cdcc__Makefile.in Thu Sep 11 13:34:39 2014 (r367931)
@@ -0,0 +1,10 @@
+--- cdcc/Makefile.in.orig 2014-08-06 14:43:42 UTC
++++ cdcc/Makefile.in
+@@ -45,7 +45,5 @@
+
+ @MAKE_DOT at ifndef NO_SUID
+ # cdcc needs to be SUID to read the server passwords
+-BINMODE =4$(DCC_MODE)
+-BINOWN =@DCCSUID@
+ @MAKE_DOT at endif
+ @MAKE_INC2@
Added: head/mail/dcc-dccd/files/patch-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/dcc-dccd/files/patch-configure Thu Sep 11 13:34:39 2014 (r367931)
@@ -0,0 +1,11 @@
+--- configure.orig 2014-08-06 14:43:42 UTC
++++ configure
+@@ -1950,7 +1950,7 @@
+ # compressed via /usr/share/mk
+ mancat=man
+ MANX='$(MAN8)'
+- USE_DCCMANINSTALL='# USE_DCCMANINSTALL=no'
++ USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
+ ;;
+ DragonFly)
+ # default to /usr/local/man/man8 and use nroff files, possibly
Added: head/mail/dcc-dccd/files/patch-dccproc__Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/dcc-dccd/files/patch-dccproc__Makefile.in Thu Sep 11 13:34:39 2014 (r367931)
@@ -0,0 +1,10 @@
+--- dccproc/Makefile.in.orig 2014-08-06 14:43:42 UTC
++++ dccproc/Makefile.in
+@@ -45,7 +45,5 @@
+
+ @MAKE_DOT at ifndef NO_SUID
+ # dccproc needs to be SUID to read the server passwords
+-BINMODE =4$(DCC_MODE)
+-BINOWN =@DCCSUID@
+ @MAKE_DOT at endif
+ @MAKE_INC2@
Added: head/mail/dcc-dccd/files/patch-dccsight__Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/dcc-dccd/files/patch-dccsight__Makefile.in Thu Sep 11 13:34:39 2014 (r367931)
@@ -0,0 +1,10 @@
+--- dccsight/Makefile.in.orig 2014-08-06 14:43:42 UTC
++++ dccsight/Makefile.in
+@@ -46,7 +46,5 @@
+
+ @MAKE_DOT at ifndef NO_SUID
+ # dccsight needs to be SUID to read the server passwords
+-BINMODE =4$(DCC_MODE)
+-BINOWN =@DCCSUID@
+ @MAKE_DOT at endif
+ @MAKE_INC2@
Added: head/mail/dcc-dccd/files/patch-homedir__make-dcc_conf.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/dcc-dccd/files/patch-homedir__make-dcc_conf.in Thu Sep 11 13:34:39 2014 (r367931)
@@ -0,0 +1,13 @@
+--- homedir/make-dcc_conf.in.orig 2014-08-06 14:43:42 UTC
++++ homedir/make-dcc_conf.in
+@@ -83,10 +83,6 @@
+ if test -n "$FORCE" -o ! -f "$CUR"; then
+ cp $PROTOTYPE $CUR$FORCE
+ chmod 0644 $CUR$FORCE
+- if test -n "@DCCSUID@" -a -z "$NO_SUID"; then
+- set +e # do not die if the user name is not in the passwd file
+- chown @DCCSUID@ $CUR$FORCE
+- fi
+ exit
+ fi
+
Added: head/mail/dcc-dccd/pkg-help
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/dcc-dccd/pkg-help Thu Sep 11 13:34:39 2014 (r367931)
@@ -0,0 +1,19 @@
+ALT_HOME:
+
+DCC keeps its config files in its home directory but writes
+status and database files there as well. This latter point
+means that the FreeBSD default home directory for DCC,
+/usr/local/dcc, cannot be mounted read-only.
+
+DCC's default home dir of /var/dcc breaks FreeBSD hierarchy
+conventions, but allows for a read-only /usr.
+
+Setting ALT_HOME on will set DCC's home to /var/dcc, but keep
+its binaries in /usr/local/dcc/libexec. Since this also means
+DCC's config files will be in /var/dcc, for convenience a soft
+link from /usr/local/etc/dcc to /var/dcc may be created.
+
+Note also that dccifd's default socket location is DCC's home,
+so if /var/dcc is used for the home, then programs like
+SpamAssassin may need to be explicitly told where to find
+dccifd's socket.
Modified: head/mail/dcc-dccd/pkg-plist
==============================================================================
--- head/mail/dcc-dccd/pkg-plist Sun Sep 7 08:38:53 2014 (r367498)
+++ head/mail/dcc-dccd/pkg-plist Thu Sep 11 13:34:39 2014 (r367931)
@@ -1,35 +1,33 @@
-bin/cdcc
-%%WITH_DCCIFD%%bin/dccif-test
-bin/dccproc
+@(%%DCCUSER%%,%%DCCGROUP%%,4555) bin/cdcc
+%%DCCIFD%%bin/dccif-test
+@(%%DCCUSER%%,%%DCCGROUP%%,4555) bin/dccproc
dcc/cgi-bin/README
dcc/cgi-bin/chgpasswd
dcc/cgi-bin/common
dcc/cgi-bin/common.pm
dcc/cgi-bin/edit-whiteclnt
-dcc/cgi-bin/footer
-dcc/cgi-bin/header
dcc/cgi-bin/http2https
dcc/cgi-bin/list-log
dcc/cgi-bin/list-msg
dcc/cgi-bin/webuser-notify
-dcc/cgi-bin/footer-dist
-dcc/cgi-bin/header-dist
+ at sample dcc/cgi-bin/footer.sample
+ at sample dcc/cgi-bin/header.sample
dcc/libexec/check_ip_range
dcc/libexec/ck2ip
dcc/libexec/cron-dccd
-%%WITH_DCCIFD%%dcc/libexec/dccifd
-%%WITH_DCCM%%dcc/libexec/dccm
-%%WITH_DCCD%%dcc/libexec/dbclean
-%%WITH_DCCD%%dcc/libexec/dblist
-%%WITH_DCCD%%dcc/libexec/dump-clients
+%%DCCIFD%%dcc/libexec/dccifd
+%%DCCM%%dcc/libexec/dccm
+%%DCCD%%dcc/libexec/dbclean
+%%DCCD%%dcc/libexec/dblist
+%%DCCD%%dcc/libexec/dump-clients
dcc/libexec/dcc-nagios
dcc/libexec/dcc-stats-collect
dcc/libexec/dcc-stats-graph
dcc/libexec/dcc-stats-init
dcc/libexec/dcc-stats-update
-%%WITH_DCCD%%dcc/libexec/dccd
-dcc/libexec/dccsight
-%%WITH_IFD_MILT%%dcc/libexec/dns-helper
+%%DCCD%%dcc/libexec/dccd
+@(%%DCCUSER%%,%%DCCGROUP%%,4555) dcc/libexec/dccsight
+%%IFD_MILT%%dcc/libexec/dns-helper
dcc/libexec/fetchblack
dcc/libexec/fetchids
dcc/libexec/fetch-testmsg-whitelist
@@ -48,72 +46,43 @@ dcc/libexec/stop-dccd
dcc/libexec/updatedcc
dcc/libexec/uninstalldcc
dcc/libexec/wlist
+man/man8/cdcc.8.gz
+man/man8/dbclean.8.gz
+man/man8/dblist.8.gz
+man/man8/dcc.8.gz
+man/man8/dccd.8.gz
+man/man8/dccifd.8.gz
+man/man8/dccm.8.gz
+man/man8/dccproc.8.gz
+man/man8/dccsight.8.gz
@dirrm dcc/libexec
@dirrm dcc/cgi-bin
- at dirrmtry dcc
-%%WITH_DCCIFD%%@stopdaemon dccifd
-%%WITH_DCCM%%@stopdaemon dccm
-%%WITH_DCCD%%@stopdaemon dccd
-%%WITH_DCCGREY%%@stopdaemon dccgrey
-%%WITH_ALT_HOME%%@cwd /var
- at comment -------------------------
- at comment The next group of three-line sets install/remove the config files
- at comment
- at comment **** on uninstall, delete the config file if it matches the sample file
- at unexec if cmp -s %D/dcc/dcc_conf %D/dcc/dcc_conf.sample; then rm -f %D/dcc/dcc_conf; fi
- at comment
- at comment **** the sample file is unilaterally installed/removed
-dcc/dcc_conf.sample
- at comment
- at comment **** on install, the config file is created from the sample file if it doesn't exist
- at exec [ -f %B/dcc_conf ] || cp %B/%f %B/dcc_conf
- at comment
- at unexec if cmp -s %D/dcc/flod %D/dcc/flod.sample; then rm -f %D/dcc/flod; fi
-dcc/flod.sample
- at exec [ -f %B/flod ] || cp %B/%f %B/flod
- at comment
- at unexec if cmp -s %D/dcc/grey_flod %D/dcc/grey_flod.sample; then rm -f %D/dcc/grey_flod; fi
-dcc/grey_flod.sample
- at exec [ -f %B/grey_flod ] || cp %B/%f %B/grey_flod
- at comment
- at unexec if cmp -s %D/dcc/grey_whitelist %D/dcc/grey_whitelist.sample; then rm -f %D/dcc/grey_whitelist; fi
-dcc/grey_whitelist.sample
- at exec [ -f %B/grey_whitelist ] || cp %B/%f %B/grey_whitelist
- at comment
- at unexec if cmp -s %D/dcc/ids %D/dcc/ids.sample; then rm -f %D/dcc/ids; fi
-dcc/ids.sample
- at exec [ -f %B/ids ] || cp -p %B/%f %B/ids
- at comment
- at unexec if cmp -s %D/dcc/map.txt %D/dcc/map.txt.sample; then rm -f %D/dcc/map.txt; fi
-dcc/map.txt.sample
- at exec [ -f %B/map.txt ] || cp -p %B/%f %B/map.txt
- at comment
- at unexec if cmp -s %D/dcc/map %D/dcc/map.sample; then rm -f %D/dcc/map; fi
-dcc/map.sample
- at exec [ -f %B/map ] || cp -p %B/%f %B/map
- at comment
- at unexec if cmp -s %D/dcc/whiteclnt %D/dcc/whiteclnt.sample; then rm -f %D/dcc/whiteclnt; fi
-dcc/whiteclnt.sample
- at exec [ -f %B/whiteclnt ] || cp %B/%f %B/whiteclnt
- at comment
- at unexec if cmp -s %D/dcc/whitecommon %D/dcc/whitecommon.sample; then rm -f %D/dcc/whitecommon; fi
-dcc/whitecommon.sample
- at exec [ -f %B/whitecommon ] || cp %B/%f %B/whitecommon
- at comment
- at unexec if cmp -s %D/dcc/whitelist %D/dcc/whitelist.sample; then rm -f %D/dcc/whitelist; fi
-dcc/whitelist.sample
- at exec [ -f %B/whitelist ] || cp %B/%f %B/whitelist
- at comment
-%%WITH_IFD_MILT%%@unexec [ -e %D/dcc/whiteclnt.dccw ] && rm -f %D/dcc/whiteclnt.dccw || true
-%%WITH_IFD_MILT%%@unexec [ -e %D/dcc/whiteclnt.dccx ] && rm -f %D/dcc/whiteclnt.dccx || true
-%%WITH_DCCD%%@unexec [ -e %D/dcc/dcc_db ] && rm -f %D/dcc/dcc_db || true
-%%WITH_DCCD%%@unexec [ -e %D/dcc/dcc_db.hash ] && rm -f %D/dcc/dcc_db.hash || true
-%%WITH_DCCD%%@unexec [ -e %D/dcc/flod.map ] && rm -f %D/dcc/flod.map || true
-%%WITH_DCCD%%@unexec [ -e %D/dcc/dccd_clients ] && rm -f %D/dcc/dccd_clients || true
-%%WITH_DCCGREY%%@unexec [ -e %D/dcc/grey_db.hash ] && rm -f %D/dcc/grey_db.hash || true
-%%WITH_DCCGREY%%@unexec [ -e %D/dcc/grey_flod.map ] && rm -f %D/dcc/grey_flod.map || true
-%%WITH_DCCGREY%%@unexec [ -e %D/dcc/grey_clients ] && rm -f %D/dcc/grey_clients || true
- at exec mkdir -p %D/dcc/log
- at exec chown -R %%DCCUSER%% %D/dcc
+%%ALT_HOME%%@dirrmtry dcc
+%%ALT_HOME%%@cwd /var
+ at owner %%DCCUSER%%
+ at group %%DCCGROUP%%
+ at sample dcc/dcc_conf.sample
+ at sample dcc/flod.sample
+ at sample dcc/grey_flod.sample
+ at sample dcc/grey_whitelist.sample
+ at sample dcc/ids.sample
+ at sample dcc/map.txt.sample
+ at sample dcc/map.sample
+ at sample dcc/whiteclnt.sample
+ at sample dcc/whitecommon.sample
+ at sample dcc/whitelist.sample
+%%IFD_MILT%%@unexec [ -e %D/dcc/whiteclnt.dccw ] && rm -f %D/dcc/whiteclnt.dccw || true
+%%IFD_MILT%%@unexec [ -e %D/dcc/whiteclnt.dccx ] && rm -f %D/dcc/whiteclnt.dccx || true
+%%DCCD%%@unexec [ -e %D/dcc/dcc_db ] && rm -f %D/dcc/dcc_db || true
+%%DCCD%%@unexec [ -e %D/dcc/dcc_db.hash ] && rm -f %D/dcc/dcc_db.hash || true
+%%DCCD%%@unexec [ -e %D/dcc/flod.map ] && rm -f %D/dcc/flod.map || true
+%%DCCD%%@unexec [ -e %D/dcc/dccd_clients ] && rm -f %D/dcc/dccd_clients || true
+%%DCCGREY%%@unexec [ -e %D/dcc/grey_db.hash ] && rm -f %D/dcc/grey_db.hash || true
+%%DCCGREY%%@unexec [ -e %D/dcc/grey_flod.map ] && rm -f %D/dcc/grey_flod.map || true
+%%DCCGREY%%@unexec [ -e %D/dcc/grey_clients ] && rm -f %D/dcc/grey_clients || true
@dirrmtry dcc/log
+%%NO_ALT_HOME%%@group wheel
+%%NO_ALT_HOME%%@owner root
@dirrmtry dcc
+%%ALT_HOME%%@group wheel
+%%ALT_HOME%%@owner root
Modified: head/mail/spamassassin/Makefile
==============================================================================
--- head/mail/spamassassin/Makefile Thu Sep 11 13:31:48 2014 (r367930)
+++ head/mail/spamassassin/Makefile Thu Sep 11 13:34:39 2014 (r367931)
@@ -49,7 +49,7 @@ CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/et
OPTIONS_DEFINE= AS_ROOT GNUPG SSL UPDATE_AND_COMPILE
OPTIONS_GROUP= DATABASE PLUGINS
OPTIONS_GROUP_DATABASE= MYSQL PGSQL
-OPTIONS_GROUP_PLUGINS= DKIM PYZOR RAZOR RELAY_COUNTRY SPF_QUERY
+OPTIONS_GROUP_PLUGINS= DCC DKIM PYZOR RAZOR RELAY_COUNTRY SPF_QUERY
OPTIONS_DEFAULT= AS_ROOT GNUPG SSL UPDATE_AND_COMPILE
AS_ROOT_DESC= Run spamd as root (recommended)
@@ -60,6 +60,7 @@ UPDATE_AND_COMPILE_DESC=Download and com
DATABASE_DESC= Optional user-config/bayes database backends
PLUGINS_DESC= Optional SpamAssassin plugins
+DCC_DESC= DCC digest list support (mail/dcc-dccd)
DKIM_DESC= Verify DKIM records (mail/p5-Mail-DKIM)
PYZOR_DESC= Pyzor digest list support (mail/pyzor)
RAZOR_DESC= Vipul's Razor digest list support (mail/razor-agents)
@@ -71,6 +72,7 @@ SUB_LIST+= SPAMD_OWN="${USERS}:${GROUPS}
PLIST_SUB+= USER=${USERS} GROUP=${GROUPS}
OPTIONS_SUB= yes
+DCC_RUN_DEPENDS= dcc-dccd>=1.3.111:${PORTSDIR}/mail/dcc-dccd
DKIM_RUN_DEPENDS= p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
p5-Mail-DKIM>=0.37:${PORTSDIR}/mail/p5-Mail-DKIM \
p5-Crypt-OpenSSL-RSA>=0.26_1:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA
@@ -88,6 +90,7 @@ SSL_CONFIGURE_ON= ENABLE_SSL=yes
SSL_CONFIGURE_OFF= ENABLE_SSL=no
# plugin names in rules/*.pre, for enabling/disabling
+DCC_INITVAR= DCC
DKIM_INITVAR= DKIM
PYZOR_INITVAR= Pyzor
RAZOR_INITVAR= Razor2
More information about the svn-ports-head
mailing list