Index: head/mail/dcc-dccd/Makefile =================================================================== --- head/mail/dcc-dccd/Makefile (revision 443716) +++ head/mail/dcc-dccd/Makefile (revision 443717) @@ -1,126 +1,149 @@ # Created by: Dean Hollister # $FreeBSD$ PORTNAME= dcc-dccd -PORTVERSION= 1.3.158 -PORTREVISION= 2 +PORTVERSION= 1.3.159 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= gmake tar:Z +USES= tar:Z 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 (see help) PORTS_SENDMAIL_DESC= Use ports Sendmail instead of base OPTIONS_SUB= yes ## User for DCC files and SUID binaries # DCCUSER?= dcc DCCGROUP?= dcc USERS= ${DCCUSER} GROUPS= ${DCCGROUP} 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 ## Also, use a similar hack to USES=desthack. -CONFIGURE_ARGS= --with-uid=${DCCUSER} \ +CONFIGURE_ARGS= -q \ + --with-uid=${DCCUSER} \ --bindir=${PREFIX}/bin \ --mandir=${MANPREFIX}/man \ --with-installroot=\$${${DESTDIRNAME}} \ --with-configsuffix=.sample \ - --with-make-cmd=${MAKE_CMD} + --with-make-cmd=${MAKE_CMD} \ + --with-install-cmd=${BSD_INSTALL_PROGRAM} \ + --enable-pkg-make CONFIGURE_ENV= ac_cv_header_histedit_h=no # disable libedit detection 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:mail/libmilter 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 .include .if ${PORT_OPTIONS:MALT_HOME} DCCHOME= /var/dcc .else DCCHOME= ${PREFIX}/dcc .endif 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 MILTERBASE?= ${LOCALBASE} .endif 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} +.endfor +.if ${PORT_OPTIONS:MDCCIFD} || ${PORT_OPTIONS:MDCCM} + ${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} +.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} +.endfor + +post-install-DCCM-on: + ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/dcc/libexec/dccm .include Index: head/mail/dcc-dccd/distinfo =================================================================== --- head/mail/dcc-dccd/distinfo (revision 443716) +++ head/mail/dcc-dccd/distinfo (revision 443717) @@ -1,2 +1,3 @@ -SHA256 (dcc-1.3.158.tar.Z) = 596bb4a02800a87501818215e61ac877e4d5a31ec0c8c227f23438f6b6b831c6 -SIZE (dcc-1.3.158.tar.Z) = 1714175 +TIMESTAMP = 1497491773 +SHA256 (dcc-1.3.159.tar.Z) = 064144a1f01bda7cdc3e8b8f721b2b73df53bf7b293c1c672244eada9776ac89 +SIZE (dcc-1.3.159.tar.Z) = 1606625 Index: head/mail/dcc-dccd/files/patch-configure =================================================================== --- head/mail/dcc-dccd/files/patch-configure (revision 443716) +++ head/mail/dcc-dccd/files/patch-configure (nonexistent) @@ -1,11 +0,0 @@ ---- configure.orig 2014-08-06 14:43:42 UTC -+++ configure -@@ -1961,7 +1961,7 @@ case "$TARGET_SYS" in - # compressed via /usr/share/mk - mancat=man - MANX='$(MAN8)' -- USE_DCCMANINSTALL='# USE_DCCMANINSTALL=no' -+ USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes' - ;; - Darwin) - # default to /usr/local/man/man8 and use nroff files Property changes on: head/mail/dcc-dccd/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/dcc-dccd/files/patch-dccsight__Makefile.in =================================================================== --- head/mail/dcc-dccd/files/patch-dccsight__Makefile.in (revision 443716) +++ head/mail/dcc-dccd/files/patch-dccsight__Makefile.in (nonexistent) @@ -1,10 +0,0 @@ ---- dccsight/Makefile.in.orig 2014-08-06 14:43:42 UTC -+++ dccsight/Makefile.in -@@ -46,7 +46,5 @@ DCC_BINDIR=@installroot@@libexecdir@ - - @MAKE_DOT@ifndef NO_SUID - # dccsight needs to be SUID to read the server passwords --BINMODE =4$(DCC_MODE) --BINOWN =@DCCSUID@ - @MAKE_DOT@endif - @MAKE_INC2@ Property changes on: head/mail/dcc-dccd/files/patch-dccsight__Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/dcc-dccd/files/patch-Makefile.inc2.in =================================================================== --- head/mail/dcc-dccd/files/patch-Makefile.inc2.in (revision 443716) +++ head/mail/dcc-dccd/files/patch-Makefile.inc2.in (nonexistent) @@ -1,11 +0,0 @@ ---- Makefile.inc2.in.orig 2015-04-03 01:32:45 UTC -+++ Makefile.inc2.in -@@ -44,7 +44,7 @@ - INSTALL =@DCCINSTALL@ - @MAKE_DOT@endif - --BININSTALL=$(INSTALL) -c $(SET_BINOWN) -m $(BINMODE) -+BININSTALL=$(BSD_INSTALL_PROGRAM) - - # create the DCC home directory before trying to install files - beforeinstall:$(BINDIR) $(MANDIR)8 depend all Property changes on: head/mail/dcc-dccd/files/patch-Makefile.inc2.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/dcc-dccd/files/patch-dccproc__Makefile.in =================================================================== --- head/mail/dcc-dccd/files/patch-dccproc__Makefile.in (revision 443716) +++ head/mail/dcc-dccd/files/patch-dccproc__Makefile.in (nonexistent) @@ -1,10 +0,0 @@ ---- dccproc/Makefile.in.orig 2014-08-06 14:43:42 UTC -+++ dccproc/Makefile.in -@@ -45,7 +45,5 @@ SRCS =$(PROG).c - - @MAKE_DOT@ifndef NO_SUID - # dccproc needs to be SUID to read the server passwords --BINMODE =4$(DCC_MODE) --BINOWN =@DCCSUID@ - @MAKE_DOT@endif - @MAKE_INC2@ Property changes on: head/mail/dcc-dccd/files/patch-dccproc__Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/dcc-dccd/files/patch-cdcc__Makefile.in =================================================================== --- head/mail/dcc-dccd/files/patch-cdcc__Makefile.in (revision 443716) +++ head/mail/dcc-dccd/files/patch-cdcc__Makefile.in (nonexistent) @@ -1,10 +0,0 @@ ---- cdcc/Makefile.in.orig 2014-08-06 14:43:42 UTC -+++ cdcc/Makefile.in -@@ -45,7 +45,5 @@ SRCS =$(PROG).c - - @MAKE_DOT@ifndef NO_SUID - # cdcc needs to be SUID to read the server passwords --BINMODE =4$(DCC_MODE) --BINOWN =@DCCSUID@ - @MAKE_DOT@endif - @MAKE_INC2@ Property changes on: head/mail/dcc-dccd/files/patch-cdcc__Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/dcc-dccd/files/patch-Makefile.inc.in =================================================================== --- head/mail/dcc-dccd/files/patch-Makefile.inc.in (revision 443716) +++ head/mail/dcc-dccd/files/patch-Makefile.inc.in (nonexistent) @@ -1,23 +0,0 @@ ---- Makefile.inc.in.orig 2014-08-06 14:43:42 UTC -+++ Makefile.inc.in -@@ -102,7 +102,6 @@ DCC_OWN =@DCC_OWN@ - DCC_OWN =@DCCSUID@ - @MAKE_DOT@endif - @MAKE_DOT@endif --BINOWN =$(DCC_OWN) - - @MAKE_DOT@ifndef DCC_GRP - DCC_GRP =@DCC_GRP@ -@@ -129,9 +128,9 @@ SET_BINOWN= - SET_MANOWN= - SET_DCCOWN= - @MAKE_DOT@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@endif - - @MAKE_DOT@ifdef PROG Property changes on: head/mail/dcc-dccd/files/patch-Makefile.inc.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/dcc-dccd/files/patch-homedir_Makefile.in =================================================================== --- head/mail/dcc-dccd/files/patch-homedir_Makefile.in (revision 443716) +++ head/mail/dcc-dccd/files/patch-homedir_Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- homedir/Makefile.in.orig 2014-08-06 14:43:42 UTC -+++ homedir/Makefile.in -@@ -61,7 +61,7 @@ all: - @: - - install:$(HD) $(HD)/log -- for NM in $(SSCRIPTS); do $(BININSTALL) $$NM $(DCC_BINDIR)/$$NM;done -+ for NM in $(SSCRIPTS); do $(BSD_INSTALL_SCRIPT) $$NM $(DCC_BINDIR)/$$NM;done - sh make-dcc_conf -F '@configsuffix@' -h $(HD) - for NM in $(SIMPLE); do\ - if test -n '@configsuffix@' -o ! -f $(HD)/$$NM; then\ Property changes on: head/mail/dcc-dccd/files/patch-homedir_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/dcc-dccd/files/patch-homedir__make-dcc_conf.in =================================================================== --- head/mail/dcc-dccd/files/patch-homedir__make-dcc_conf.in (revision 443716) +++ head/mail/dcc-dccd/files/patch-homedir__make-dcc_conf.in (nonexistent) @@ -1,13 +0,0 @@ ---- homedir/make-dcc_conf.in.orig 2014-08-06 14:43:42 UTC -+++ homedir/make-dcc_conf.in -@@ -83,10 +83,6 @@ fi - 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 - Property changes on: head/mail/dcc-dccd/files/patch-homedir__make-dcc_conf.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/dcc-dccd/files/patch-misc_Makefile.in =================================================================== --- head/mail/dcc-dccd/files/patch-misc_Makefile.in (revision 443716) +++ head/mail/dcc-dccd/files/patch-misc_Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- misc/Makefile.in.orig 2014-08-06 14:43:42 UTC -+++ misc/Makefile.in -@@ -51,7 +51,7 @@ DCC_BINDIR=@installroot@@libexecdir@ - @MAKE_INC2@ - - install: -- for NM in $(SSCRIPTS); do $(BININSTALL) $$NM $(DCC_BINDIR)/$$NM;done -+ for NM in $(SSCRIPTS); do $(BSD_INSTALL_SCRIPT) $$NM $(DCC_BINDIR)/$$NM;done - - deinstall: - -if test -d $(DCC_BINDIR); then cd $(DCC_BINDIR); rm -f $(SSCRIPTS); fi Property changes on: head/mail/dcc-dccd/files/patch-misc_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/dcc-dccd/pkg-plist =================================================================== --- head/mail/dcc-dccd/pkg-plist (revision 443716) +++ head/mail/dcc-dccd/pkg-plist (revision 443717) @@ -1,86 +1,85 @@ @(%%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/fetchids 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 %%ALT_HOME%%@dir dcc %%ALT_HOME%%@cwd /var @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 %%NO_ALT_HOME%%@group wheel %%NO_ALT_HOME%%@owner root @dir dcc %%ALT_HOME%%@group wheel %%ALT_HOME%%@owner root