[Midnightbsd-cvs] mports [23831] trunk/mail/dcc-dccd: update
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Aug 26 12:14:14 EDT 2018
Revision: 23831
http://svnweb.midnightbsd.org/mports/?rev=23831
Author: laffer1
Date: 2018-08-26 12:14:13 -0400 (Sun, 26 Aug 2018)
Log Message:
-----------
update
Modified Paths:
--------------
trunk/mail/dcc-dccd/Makefile
trunk/mail/dcc-dccd/distinfo
trunk/mail/dcc-dccd/files/pkg-install.in
trunk/mail/dcc-dccd/pkg-plist
Modified: trunk/mail/dcc-dccd/Makefile
===================================================================
--- trunk/mail/dcc-dccd/Makefile 2018-08-21 21:30:17 UTC (rev 23830)
+++ trunk/mail/dcc-dccd/Makefile 2018-08-26 16:14:13 UTC (rev 23831)
@@ -1,57 +1,39 @@
# $MidnightBSD$
PORTNAME= dcc-dccd
-PORTVERSION= 1.3.158
+PORTVERSION= 1.3.159
CATEGORIES= mail
MASTER_SITES= http://www.dcc-servers.net/dcc/source/old/ \
- http://www.rhyolite.com/anti-spam/dcc/source/old/ \
ftp://ftp.dcc-servers.net/src/dcc/old/ \
- ftp://ftp.rhyolite.com/src/dcc/old/
+ FREEBSD_LOCAL/mat/${PORTNAME}
DISTNAME= dcc-${PORTVERSION}
-EXTRACT_SUFX= .tar.Z
MAINTAINER= ports at MidnightBSD.org
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
-USE_GCC= any
-
HAS_CONFIGURE= yes
-#
-# 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_SUB= yes
-OPTIONS_DEFINE= DCCIFD DCCM DCCD DCCGREY IPV6 ALT_HOME PORTS_SENDMAIL
+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 (for Sendmail only)
+DCCM_DESC= DCC milter
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
+PORTS_MILTER_DESC= Use ports milter instead of base
+OPTIONS_SUB= yes
+
## User for DCC files and SUID binaries
#
DCCUSER?= dcc
@@ -60,51 +42,47 @@
USERS= ${DCCUSER}
GROUPS= ${DCCGROUP}
-PLIST_SUB+= DCCUSER="${DCCUSER}"
+DCCHOME= ${PREFIX}/dcc
+PLIST_SUB+= DCCUSER="${DCCUSER}" DCCGROUP="${DCCGROUP}"
+SUB_FILES= pkg-install pkg-message
+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
-#
-CONFIGURE_ARGS= --with-uid=${DCCUSER} --bindir=${PREFIX}/bin --mandir=${MANPREFIX}/man --with-configsuffix=.sample
+## Also, use a similar hack to USES=desthack.
+CONFIGURE_ARGS= -q \
+ --with-uid=${DCCUSER} \
+ --bindir=${PREFIX}/bin \
+ --mandir=${FAKE_DESTDIR}${TRUE_PREFIX}/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
-.include <bsd.mport.options.mk>
+CONFIGURE_ENV= ac_cv_header_histedit_h=no # disable libedit detection
-SUB_FILES= pkg-install pkg-message
-SUB_LIST+= WRKSRC=${WRKSRC} DCCHOME=${DCCHOME}
+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
-## /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
+.include <bsd.mport.options.mk>
-CONFIGURE_ARGS+= --homedir=${DCCHOME}
-
## dccm milter support
#
-.if ${PORT_OPTIONS:MDCCM}
-
-.if !exists(/usr/lib/libmilter.a) && !exists(${LOCALBASE}/lib/libmilter.a)
-IGNORE= neither base system nor Ports version of Sendmail installed, cannot build milter
-.endif
-.if ! ${PORT_OPTIONS:MPORTS_SENDMAIL} && !exists(/usr/lib/libmilter.a)
-IGNORE= base system Sendmail not found or too old, rebuild with WITH_PORTS_SENDMAIL=yes or WITHOUT_DCCM=yes
-.endif
-.if ${PORT_OPTIONS:MPORTS_SENDMAIL} && !exists(${LOCALBASE}/lib/libmilter.a)
-IGNORE= ports Sendmail not found, rebuild with WITHOUT_PORTS_SENDMAIL=yes or WITHOUT_DCCM=yes
-.endif
-
-.if ! ${PORT_OPTIONS:MPORTS_SENDMAIL}
-MILTERBASE= /usr
-.else
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail
+.if ${PORT_OPTIONS:MPORTS_MILTER}
MILTERBASE?= ${LOCALBASE}
-.endif
MILTERINC= ${MILTERBASE}/include
MILTERLIB= ${MILTERBASE}/lib
@@ -112,78 +90,40 @@
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=""
+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}
+.endfor
+.if ${PORT_OPTIONS:MDCCIFD} || ${PORT_OPTIONS:MDCCM}
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/dcc/libexec/dns-helper
.endif
+ ${REINPLACE_CMD} -e 's|${FAKE_DESTDIR}||g' ${PREFIX}/dcc/libexec/updatedcc
-## IPV6 support
-#
-.if ! ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+= --disable-IPv6
-.endif
+post-install-DCCIFD-on:
+.for sf in bin/dccif-test dcc/libexec/dccifd
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${sf}
+.endfor
-## 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
+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}
+.endfor
-.if ${PORT_OPTIONS:MDCCD}
-USE_RC_SUBR+= dccd
-.endif
+post-install-DCCM-on:
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/dcc/libexec/dccm
-.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} ' '
-
-pre-build:
- ${MKDIR} ${FAKE_DESTDIR}/usr/lib
- ${LN} -sf /usr/lib/libc.a ${FAKE_DESTDIR}/usr/lib/libc.a
-
-pre-fake:
- ${MKDIR} ${FAKE_DESTDIR}${TRUE_PREFIX}/dcc/libexec
-
-post-install:
-
-## Make certain DCC's config files are owned by DCC's user
-#
- @${CHOWN} ${DCCUSER} ${DCCHOME}/*
-
.include <bsd.port.mk>
Modified: trunk/mail/dcc-dccd/distinfo
===================================================================
--- trunk/mail/dcc-dccd/distinfo 2018-08-21 21:30:17 UTC (rev 23830)
+++ trunk/mail/dcc-dccd/distinfo 2018-08-26 16:14:13 UTC (rev 23831)
@@ -1,2 +1,3 @@
-SHA256 (dcc-1.3.158.tar.Z) = 596bb4a02800a87501818215e61ac877e4d5a31ec0c8c227f23438f6b6b831c6
-SIZE (dcc-1.3.158.tar.Z) = 1714175
+TIMESTAMP = 1535299646
+SHA256 (dcc-1.3.159.tar.Z) = 064144a1f01bda7cdc3e8b8f721b2b73df53bf7b293c1c672244eada9776ac89
+SIZE (dcc-1.3.159.tar.Z) = 1606625
Modified: trunk/mail/dcc-dccd/files/pkg-install.in
===================================================================
--- trunk/mail/dcc-dccd/files/pkg-install.in 2018-08-21 21:30:17 UTC (rev 23830)
+++ trunk/mail/dcc-dccd/files/pkg-install.in 2018-08-26 16:14:13 UTC (rev 23831)
@@ -2,24 +2,20 @@
# $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
Modified: trunk/mail/dcc-dccd/pkg-plist
===================================================================
--- trunk/mail/dcc-dccd/pkg-plist 2018-08-21 21:30:17 UTC (rev 23830)
+++ trunk/mail/dcc-dccd/pkg-plist 2018-08-26 16:14:13 UTC (rev 23831)
@@ -1,6 +1,7 @@
@(%%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
@@ -28,7 +29,6 @@
@(%%DCCUSER%%,%%DCCGROUP%%,4555) dcc/libexec/dccsight
%%IFD_MILT%%dcc/libexec/dns-helper
dcc/libexec/fetchblack
-dcc/libexec/fetchids
dcc/libexec/fetch-testmsg-whitelist
dcc/libexec/fix-map
dcc/libexec/hackmc
@@ -45,17 +45,6 @@
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
-%%ALT_HOME%%@dir dcc
-%%ALT_HOME%%@cwd /var
@owner %%DCCUSER%%
@group %%DCCGROUP%%
@sample dcc/dcc_conf.sample
@@ -78,8 +67,4 @@
%%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
-%%NO_ALT_HOME%%@group wheel
-%%NO_ALT_HOME%%@owner root
@dir dcc
-%%ALT_HOME%%@group wheel
-%%ALT_HOME%%@owner root
More information about the Midnightbsd-cvs
mailing list