Index: head/mail/dcc-dccd/Makefile =================================================================== --- head/mail/dcc-dccd/Makefile (revision 444971) +++ head/mail/dcc-dccd/Makefile (revision 444972) @@ -1,130 +1,130 @@ # Created by: Dean Hollister # $FreeBSD$ PORTNAME= dcc-dccd PORTVERSION= 1.3.159 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://www.dcc-servers.net/dcc/source/old/ \ ftp://ftp.dcc-servers.net/src/dcc/old/ \ LOCAL/mat/${PORTNAME} DISTNAME= dcc-${PORTVERSION} MAINTAINER= pkubaj@anongoth.pl COMMENT= Distributed Checksum Clearinghouse bulk email detector .if ! defined(PACKAGE_BUILDING) LICENSE= DCC LICENSE_NAME= DCC LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= no-pkg-sell no-dist-mirror no-pkg-mirror no-dist-sell .endif HAS_CONFIGURE= yes USES= tar:Z OPTIONS_DEFINE= DCCIFD DCCD DCCGREY IPV6 OPTIONS_DEFAULT= DCCIFD DCCM DCCD DCCGREY OPTIONS_GROUP= MILTER OPTIONS_GROUP_MILTER= DCCM PORTS_MILTER DCCIFD_DESC= DCC interface daemon (for SpamAssassin etc) DCCM_DESC= DCC milter DCCD_DESC= DCC server DCCGREY_DESC= DCC greylisting server PORTS_MILTER_DESC= Use ports milter instead of base OPTIONS_SUB= yes ## User for DCC files and SUID binaries # DCCUSER?= dcc DCCGROUP?= dcc USERS= ${DCCUSER} GROUPS= ${DCCGROUP} DCCHOME= ${PREFIX}/dcc PLIST_SUB+= DCCUSER="${DCCUSER}" DCCGROUP="${DCCGROUP}" SUB_FILES= pkg-install pkg-message -SUB_LIST+= WRKSRC=${WRKSRC} DCCHOME=${DCCHOME} +SUB_LIST+= WRKSRC=${WRKSRC} DCCHOME=${DCCHOME} DCCUSER="${DCCUSER}" ## Use the configure script to explicitly set the locations of all files, ## in case the standard locations have been locally overridden ## Also, use a similar hack to USES=desthack. CONFIGURE_ARGS= -q \ --with-uid=${DCCUSER} \ --bindir=${PREFIX}/bin \ --mandir=${MANPREFIX}/man \ --with-installroot=\$${${DESTDIRNAME}} \ --with-configsuffix=.sample \ --with-make-cmd=${MAKE_CMD} \ --with-install-cmd=${BSD_INSTALL_PROGRAM} \ --enable-pkg-make \ --homedir=${DCCHOME} \ --libexecdir=${DCCHOME}/libexec \ --with-cgibin=${DCCHOME}/cgi-bin CONFIGURE_ENV= ac_cv_header_histedit_h=no # disable libedit detection DCCM_CONFIGURE_ENABLE= dccm DCCM_USE= rc_subr=dccm PORTS_MILTER_BUILD_DEPENDS= ${LOCALBASE}/lib/libmilter.a:mail/libmilter PORTS_MILTER_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 .include ## dccm milter support # .if ${PORT_OPTIONS:MPORTS_MILTER} MILTERBASE?= ${LOCALBASE} MILTERINC= ${MILTERBASE}/include MILTERLIB= ${MILTERBASE}/lib CPPFLAGS+= -I${MILTERINC} CFLAGS+= -I${MILTERINC} LDFLAGS+= -L${MILTERLIB} .endif .if ${PORT_OPTIONS:MDCCIFD} || ${PORT_OPTIONS:MDCCM} PLIST_SUB+= IFD_MILT="" .else PLIST_SUB+= IFD_MILT="@comment " .endif post-install: @${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 .for sf in bin/dccproc bin/cdcc dcc/libexec/dccsight dcc/libexec/check_ip_range \ dcc/libexec/wlist dcc/libexec/ck2ip - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/${sf} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${sf} .endfor .if ${PORT_OPTIONS:MDCCIFD} || ${PORT_OPTIONS:MDCCM} - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/dcc/libexec/dns-helper + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/dcc/libexec/dns-helper .endif post-install-DCCIFD-on: .for sf in bin/dccif-test dcc/libexec/dccifd - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/${sf} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${sf} .endfor post-install-DCCD-on: .for sf in dcc/libexec/dump-clients dcc/libexec/dbclean \ dcc/libexec/dblist dcc/libexec/dccd - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/${sf} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${sf} .endfor post-install-DCCM-on: - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/dcc/libexec/dccm + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/dcc/libexec/dccm .include Index: head/mail/dcc-dccd/files/pkg-install.in =================================================================== --- head/mail/dcc-dccd/files/pkg-install.in (revision 444971) +++ head/mail/dcc-dccd/files/pkg-install.in (revision 444972) @@ -1,26 +1,22 @@ #!/bin/sh # $FreeBSD: /tmp/pcvs/ports/mail/dcc-dccd/files/pkg-install.in,v 1.2 2011-07-04 19:39:45 crees Exp $ PREFIX=${PKG_PREFIX:-%%PREFIX%%} - DCCHOME=%%DCCHOME%% +DCCUSER=%%DCCUSER%% if [ "$2" = "POST-INSTALL" ]; then - echo "=> Generating unique passwords for your DCC install..." - echo "=>" - echo "=> Note this will make map.sample, map.txt.sample and" - echo "=> ids.sample fail their MD5 checks on package removal." - /bin/sh $PREFIX/dcc/libexec/fix-map \ - -n .sample \ - -I $DCCHOME/ids.sample -i $DCCHOME/ids \ - -T $DCCHOME/map.txt.sample -t $DCCHOME/map.txt \ + -n .nopasswd \ + -I $DCCHOME/ids.nopasswd -i $DCCHOME/ids \ + -T $DCCHOME/map.txt.nopasswd -t $DCCHOME/map.txt \ -m $DCCHOME/map for file in ids map map.txt ; do - /bin/cp -p $DCCHOME/$file $DCCHOME/${file}.sample + /bin/cp -p $DCCHOME/$file $DCCHOME/${file}.nopasswd + /usr/sbin/chown $DCCUSER $DCCHOME/${file} $DCCHOME/${file}.nopasswd done fi exit 0 Index: head/mail/dcc-dccd/pkg-plist =================================================================== --- head/mail/dcc-dccd/pkg-plist (revision 444971) +++ head/mail/dcc-dccd/pkg-plist (revision 444972) @@ -1,81 +1,79 @@ @(%%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/http2https dcc/cgi-bin/list-log dcc/cgi-bin/list-msg dcc/cgi-bin/webuser-notify @sample dcc/cgi-bin/footer.sample @sample dcc/cgi-bin/header.sample dcc/libexec/check_ip_range dcc/libexec/ck2ip dcc/libexec/cron-dccd %%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 %%DCCD%%dcc/libexec/dccd @(%%DCCUSER%%,%%DCCGROUP%%,4555) dcc/libexec/dccsight %%IFD_MILT%%dcc/libexec/dns-helper dcc/libexec/fetchblack dcc/libexec/fetch-testmsg-whitelist dcc/libexec/fix-map dcc/libexec/hackmc dcc/libexec/list-clients dcc/libexec/logger dcc/libexec/newwebuser dcc/libexec/rcDCC dcc/libexec/start-dccd dcc/libexec/start-dccifd dcc/libexec/start-dccm dcc/libexec/start-grey dcc/libexec/stats-get 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 @owner %%DCCUSER%% @group %%DCCGROUP%% @sample dcc/dcc_conf.sample @sample dcc/flod.sample @sample dcc/grey_flod.sample @sample dcc/grey_whitelist.sample @sample dcc/ids.sample @sample dcc/map.txt.sample @sample dcc/map.sample @sample dcc/whiteclnt.sample @sample dcc/whitecommon.sample @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 @dir dcc/log -@group wheel -@owner root @dir dcc