Attachment 203357 Details for Bug 220978 – Update to 1.3.163 and respect more hier(7)

[patch] Update to 1.3.163 and respect more hier(7)

dcc-dccd-1.3.163-and-respect-more-hier.patch (text/plain), 13.81 KB, created by Kai Knoblich on 2019-04-03 21:22:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Knoblich

Created: 2019-04-03 21:22:27 UTC

Size: 13.81 KB

patch

obsolete

>Index: mail/dcc-dccd/Makefile
>===================================================================
>--- mail/dcc-dccd/Makefile	(revision 497724)
>+++ mail/dcc-dccd/Makefile	(working copy)
>@@ -2,11 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	dcc-dccd
>-PORTVERSION=	1.3.159
>-PORTREVISION=	3
>+PORTVERSION=	1.3.163
> CATEGORIES=	mail
>-MASTER_SITES=	http://www.dcc-servers.net/dcc/source/old/ \
>-		ftp://ftp.dcc-servers.net/src/dcc/old/ \
>+MASTER_SITES=	https://www.dcc-servers.net/dcc/source/old/ \
> 		LOCAL/mat/${PORTNAME}
> DISTNAME=	dcc-${PORTVERSION}
> 
>@@ -20,40 +18,21 @@
> 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=	DCCDATA="${DCCDATA}" DCCUSER="${DCCUSER}" DCCGROUP="${DCCGROUP}"
>+SUB_FILES=	pkg-install pkg-message
>+SUB_LIST=	${PLIST_SUB} WRKSRC=${WRKSRC} DCCHOME=${DCCHOME}
> 
>-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
> ## Also, use a similar hack to USES=desthack.
>+HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	-q \
>+		--without-DCC-MD5 \
> 		--with-uid=${DCCUSER} \
> 		--bindir=${PREFIX}/bin \
> 		--mandir=${MANPREFIX}/man \
>@@ -62,23 +41,43 @@
> 		--with-make-cmd=${MAKE_CMD} \
> 		--with-install-cmd=${BSD_INSTALL_PROGRAM} \
> 		--enable-pkg-make \
>-		--homedir=${DCCHOME} \
>-		--libexecdir=${DCCHOME}/libexec \
>+		--homedir=${DCCDATA} \
>+		--libexecdir=${PREFIX}/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
>+OPTIONS_DEFINE=		DCCIFD DCCD DCCGREY IPV6
>+OPTIONS_DEFAULT=	DCCIFD DCCM DCCD DCCGREY
>+OPTIONS_GROUP=		MILTER
>+OPTIONS_GROUP_MILTER=	DCCM PORTS_MILTER
>+OPTIONS_SUB=		yes
>+
>+DCCD_DESC=		DCC server
>+DCCGREY_DESC=		DCC greylisting server
>+DCCIFD_DESC=		DCC interface daemon (for SpamAssassin etc)
>+DCCM_DESC=		DCC milter
>+PORTS_MILTER_DESC=	Use ports milter instead of base
>+
>+DCCD_USE=			rc_subr=dccd
>+DCCD_CONFIGURE_ENABLE=		server
>+DCCGREY_USE=			rc_subr=dccgrey
>+DCCIFD_USE=			rc_subr=dccifd
>+DCCIFD_CONFIGURE_ENABLE=	dccifd
>+DCCM_USE=			rc_subr=dccm
>+DCCM_CONFIGURE_ENABLE=		dccm
>+IPV6_CONFIGURE_OFF=		--disable-IPv6
> 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
> 
>+## User for DCC files and SUID binaries
>+#
>+DCCUSER?=	dcc
>+DCCGROUP?=	dcc
>+
>+DCCHOME=	${PREFIX}/dcc
>+DCCDATA=	/var/db/dcc
>+
> .include <bsd.port.options.mk>
> 
> ## dccm milter support
>@@ -100,31 +99,17 @@
> PLIST_SUB+=	IFD_MILT="@comment "
> .endif
> 
>+post-patch:
>+	${REINPLACE_CMD} -e 's,md5.c ,,' ${WRKSRC}/clntlib/Makefile.in
>+	${REINPLACE_CMD} -e 's,^$BININSTALL.*$,\1 -s,p'	\
>+			-e 's,^BIN$INSTALL\s*=\s*.*$ -s$$,SCRIPT\1,' ${WRKSRC}/Makefile.inc.in
>+	${REINPLACE_CMD} -e 's,BININSTALL,SCRIPTINSTALL,g'	\
>+			${WRKSRC}/homedir/Makefile.in ${WRKSRC}/misc/Makefile.in
>+
> 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 <bsd.port.mk>
>Index: mail/dcc-dccd/distinfo
>===================================================================
>--- mail/dcc-dccd/distinfo	(revision 497724)
>+++ mail/dcc-dccd/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1497491773
>-SHA256 (dcc-1.3.159.tar.Z) = 064144a1f01bda7cdc3e8b8f721b2b73df53bf7b293c1c672244eada9776ac89
>-SIZE (dcc-1.3.159.tar.Z) = 1606625
>+TIMESTAMP = 1520867210
>+SHA256 (dcc-1.3.163.tar.Z) = 195195b79ee15253c4caf48d4ca3bf41b16c66a8cb9a13984a1dc4741d7f6735
>+SIZE (dcc-1.3.163.tar.Z) = 1627877
>Index: mail/dcc-dccd/files/dccd.in
>===================================================================
>--- mail/dcc-dccd/files/dccd.in	(revision 497724)
>+++ mail/dcc-dccd/files/dccd.in	(working copy)
>@@ -31,8 +31,8 @@
> 
> # Set defaults
> : ${dccd_enable:="NO"}
>-: ${dccd_home="%%DCCHOME%%"}
>-: ${dccd_libexec="%%PREFIX%%/dcc/libexec"}
>+: ${dccd_home="%%DCCDATA%%"}
>+: ${dccd_libexec="%%PREFIX%%/libexec"}
> : ${dccd_conf="$dccd_home/dcc_conf"}
> 
> 
>Index: mail/dcc-dccd/files/dccgrey.in
>===================================================================
>--- mail/dcc-dccd/files/dccgrey.in	(revision 497724)
>+++ mail/dcc-dccd/files/dccgrey.in	(working copy)
>@@ -32,8 +32,8 @@
> 
> # Set defaults
> : ${dccgrey_enable:="NO"}
>-: ${dccgrey_home="%%DCCHOME%%"}
>-: ${dccgrey_libexec="%%PREFIX%%/dcc/libexec"}
>+: ${dccgrey_home="%%DCCDATA%%"}
>+: ${dccgrey_libexec="%%PREFIX%%/libexec"}
> : ${dccgrey_conf="$dccgrey_home/dcc_conf"}
> 
> 
>Index: mail/dcc-dccd/files/dccifd.in
>===================================================================
>--- mail/dcc-dccd/files/dccifd.in	(revision 497724)
>+++ mail/dcc-dccd/files/dccifd.in	(working copy)
>@@ -32,8 +32,8 @@
> 
> # Set defaults
> : ${dccifd_enable:="NO"}
>-: ${dccifd_home="%%DCCHOME%%"}
>-: ${dccifd_libexec="%%PREFIX%%/dcc/libexec"}
>+: ${dccifd_home="%%DCCDATA%%"}
>+: ${dccifd_libexec="%%PREFIX%%/libexec"}
> : ${dccifd_conf="$dccifd_home/dcc_conf"}
> 
> pidfile=${dccifd_pidfile:-"/var/run/dcc/dccifd.pid"}
>Index: mail/dcc-dccd/files/dccm.in
>===================================================================
>--- mail/dcc-dccd/files/dccm.in	(revision 497724)
>+++ mail/dcc-dccd/files/dccm.in	(working copy)
>@@ -32,8 +32,8 @@
> 
> # Set defaults
> : ${dccm_enable:="NO"}
>-: ${dccm_home="%%DCCHOME%%"}
>-: ${dccm_libexec="%%PREFIX%%/dcc/libexec"}
>+: ${dccm_home="%%DCCDATA%%"}
>+: ${dccm_libexec="%%PREFIX%%/libexec"}
> : ${dccm_conf="$dccm_home/dcc_conf"}
> 
> pidfile=${dccm_pidfile:-"/var/run/dcc/dccm.pid"}
>Index: mail/dcc-dccd/files/pkg-install.in
>===================================================================
>--- mail/dcc-dccd/files/pkg-install.in	(revision 497724)
>+++ mail/dcc-dccd/files/pkg-install.in	(working copy)
>@@ -2,20 +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%%
>+DCCDATA=%%DCCDATA%%
> DCCUSER=%%DCCUSER%%
> 
> if [ "$2" = "POST-INSTALL" ]; then
> 
>-	/bin/sh $PREFIX/dcc/libexec/fix-map \
>+	/bin/sh $PREFIX/libexec/fix-map \
> 	-n .nopasswd \
>-	-I $DCCHOME/ids.nopasswd -i $DCCHOME/ids \
>-	-T $DCCHOME/map.txt.nopasswd -t $DCCHOME/map.txt \
>-	-m $DCCHOME/map
>+	-I $DCCDATA/ids.nopasswd -i $DCCHOME/ids \
>+	-T $DCCDATA/map.txt.nopasswd -t $DCCHOME/map.txt \
>+	-m $DCCDATA/map
> 
>         for file in ids map map.txt ; do
>-                /bin/cp -p $DCCHOME/$file $DCCHOME/${file}.nopasswd
>-		/usr/sbin/chown $DCCUSER $DCCHOME/${file} $DCCHOME/${file}.nopasswd
>+                /bin/cp -p $DCCDATA/$file $DCCDATA/${file}.nopasswd
>+		/usr/sbin/chown $DCCUSER $DCCDATA/${file} $DCCDATA/${file}.nopasswd
>         done
> fi
> 
>Index: mail/dcc-dccd/files/pkg-message.in
>===================================================================
>--- mail/dcc-dccd/files/pkg-message.in	(revision 497724)
>+++ mail/dcc-dccd/files/pkg-message.in	(working copy)
>@@ -11,12 +11,12 @@
> Daemon startup flags are also specified in %%DCCHOME%%/dcc_conf.
> 
> 
>-If you run the DCC server, %%LOCALBASE%%/dcc/libexec/cron-dccd should be
>+If you run the DCC server, %%PREFIX%%/libexec/cron-dccd should be
> run at least daily from the crontab to clean old checksums from the DB.
> 
> 
> If you just run the client, you may still wish to add
>-%%LOCALBASE%%/dcc/libexec/cron-dccd to your crontab to clean up the
>+%%PREFIX%%/libexec/cron-dccd to your crontab to clean up the
> client's log files on a regular basis. dcc_conf's DBCLEAN_LOGDAYS
> variable controls the number of days to keep logs.
> 
>Index: mail/dcc-dccd/pkg-descr
>===================================================================
>--- mail/dcc-dccd/pkg-descr	(revision 497724)
>+++ mail/dcc-dccd/pkg-descr	(working copy)
>@@ -6,4 +6,4 @@
> Also included are utilities such as cdcc and all of the manual pages
> and documentation.
> 
>-WWW: http://www.rhyolite.com/dcc/
>+WWW: https://www.rhyolite.com/dcc/
>Index: mail/dcc-dccd/pkg-plist
>===================================================================
>--- mail/dcc-dccd/pkg-plist	(revision 497724)
>+++ mail/dcc-dccd/pkg-plist	(working copy)
>@@ -12,39 +12,39 @@
> 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
>+libexec/check_ip_range
>+libexec/ck2ip
>+libexec/cron-dccd
>+%%DCCIFD%%libexec/dccifd
>+%%DCCM%%libexec/dccm
>+%%DCCD%%libexec/dbclean
>+%%DCCD%%libexec/dblist
>+%%DCCD%%libexec/dump-clients
>+libexec/dcc-nagios
>+libexec/dcc-stats-collect
>+libexec/dcc-stats-graph
>+libexec/dcc-stats-init
>+libexec/dcc-stats-update
>+%%DCCD%%libexec/dccd
>+@(%%DCCUSER%%,%%DCCGROUP%%,4555) libexec/dccsight
>+%%IFD_MILT%%libexec/dns-helper
>+libexec/fetchblack
>+libexec/fetch-testmsg-whitelist
>+libexec/fix-map
>+libexec/hackmc
>+libexec/list-clients
>+libexec/logger
>+libexec/newwebuser
>+libexec/rcDCC
>+libexec/start-dccd
>+libexec/start-dccifd
>+libexec/start-dccm
>+libexec/start-grey
>+libexec/stats-get
>+libexec/stop-dccd
>+libexec/updatedcc
>+libexec/uninstalldcc
>+libexec/wlist
> man/man8/cdcc.8.gz
> man/man8/dbclean.8.gz
> man/man8/dblist.8.gz
>@@ -56,24 +56,27 @@
> 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
>-@dir dcc
>+@sample %%DCCDATA%%/dcc_conf.sample
>+@sample %%DCCDATA%%/flod.sample
>+@sample %%DCCDATA%%/grey_flod.sample
>+@sample %%DCCDATA%%/grey_whitelist.sample
>+@sample %%DCCDATA%%/ids.sample
>+@sample %%DCCDATA%%/map.txt.sample
>+@sample %%DCCDATA%%/map.sample
>+@sample %%DCCDATA%%/whiteclnt.sample
>+@sample %%DCCDATA%%/whitecommon.sample
>+@sample %%DCCDATA%%/whitelist.sample
>+@postunexec [ -e %%DCCDATA%%/ids.nopasswd ] && rm -f %%DCCDATA%%/ids.nopasswd
>+@postunexec [ -e %%DCCDATA%%/map.nopasswd ] && rm -f %%DCCDATA%%/map.nopasswd
>+@postunexec [ -e %%DCCDATA%%/map.txt.nopasswd ] && rm -f %%DCCDATA%%/map.txt.nopasswd
>+%%IFD_MILT%%@postunexec [ -e %%DCCDATA%%/whiteclnt.dccw ] && rm -f %%DCCDATA%%/whiteclnt.dccw || true
>+%%IFD_MILT%%@postunexec [ -e %%DCCDATA%%/whiteclnt.dccx ] && rm -f %%DCCDATA%%/whiteclnt.dccx || true
>+%%DCCD%%@postunexec [ -e %%DCCDATA%%/dcc_db ] && rm -f %%DCCDATA%%/dcc_db || true
>+%%DCCD%%@postunexec [ -e %%DCCDATA%%/dcc_db.hash ] && rm -f %%DCCDATA%%/dcc_db.hash || true
>+%%DCCD%%@postunexec [ -e %%DCCDATA%%/flod.map ] && rm -f %%DCCDATA%%/flod.map || true
>+%%DCCD%%@postunexec [ -e %%DCCDATA%%/dccd_clients ] && rm -f %%DCCDATA%%/dccd_clients || true
>+%%DCCGREY%%@postunexec [ -e %%DCCDATA%%/grey_db.hash ] && rm -f %%DCCDATA%%/grey_db.hash || true
>+%%DCCGREY%%@postunexec [ -e %%DCCDATA%%/grey_flod.map ] && rm -f %%DCCDATA%%/grey_flod.map || true
>+%%DCCGREY%%@postunexec [ -e %%DCCDATA%%/grey_clients ] && rm -f %%DCCDATA%%/grey_clients || true
>+@dir %%DCCDATA%%/log
>+@dir %%DCCDATA%%

Flags:

kai: maintainer-approval? (pkubaj)

Actions: View | Diff

Attachments on bug 220978: 184675 | 203357