From dean@odyssey.apana.org.au  Mon Feb 27 02:02:40 2006
Return-Path: <dean@odyssey.apana.org.au>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6A01F16A420
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 27 Feb 2006 02:02:40 +0000 (GMT)
	(envelope-from dean@odyssey.apana.org.au)
Received: from odyssey.apana.org.au (odyssey.apana.org.au [203.11.114.1])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 463C743D48
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 27 Feb 2006 02:02:38 +0000 (GMT)
	(envelope-from dean@odyssey.apana.org.au)
Received: (from root@localhost)
	by odyssey.apana.org.au (8.9.3/8.9.3) id KAA61139;
	Mon, 27 Feb 2006 10:02:37 +0800 (WST)
Message-Id: <200602270202.KAA61139@odyssey.apana.org.au>
Date: Mon, 27 Feb 2006 10:02:37 +0800 (WST)
From: Dean Hollister <dean@odyssey.apana.org.au>
Reply-To: Dean Hollister <dean@odyssey.apana.org.au>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Upgraded Port: mail/dcc-dccd to 1.3.29
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         93881
>Category:       ports
>Synopsis:       Upgraded Port: mail/dcc-dccd to 1.3.29
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    ehaupt
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 27 02:10:03 GMT 2006
>Closed-Date:    Fri Mar 03 10:09:41 CET 2006
>Last-Modified:  Fri Mar 03 10:09:41 CET 2006
>Originator:     Dean Hollister
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
Australian Public Access Network Association Inc
>Environment:
System: FreeBSD odyssey.apana.org.au 4.11-STABLE FreeBSD 4.11-STABLE #0: Wed Sep 21 06:20:10 WST 2005 root@odyssey.apana.org.au:/usr/obj/usr/src/sys/ODYSSEY i386
>Description:
Upgraded Port: mail/dcc-dccd to 1.3.29.
Deinstallation of config files problem is fixed in this upgrade. Config files will now install with 
.dist extensions.

This PR is to replace PR 93415.
>How-To-Repeat:
>Fix:
diff -ruN dcc-dccd.orig/Makefile dcc-dccd/Makefile
--- dcc-dccd.orig/Makefile	Mon Feb 27 09:23:29 2006
+++ dcc-dccd/Makefile	Mon Feb 27 09:41:34 2006
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	dcc-dccd
-PORTVERSION=	1.3.27
+PORTVERSION=	1.3.29
 CATEGORIES=	mail
-MASTER_SITES=	http://www.rhyolite.com/anti-spam/dcc/source/old/ \
+MASTER_SITES=	http://www.rhyolite.com/anti-spam/dcc/source/ \
 		http://www.wa.apana.org.au/~dean/sources/ \
 		ftp://ftp.wa.apana.org.au/pub/unix/packages/
 EXTRACT_SUFX=	.tar.Z
@@ -16,9 +16,6 @@
 MAINTAINER=	dean@odyssey.apana.org.au
 COMMENT=	Distributed Checksum Clearinghouse procmail, sendmail support
 
-#BROKEN=		Unfetchable
-
-USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 MANCOMPRESSED=	yes
 MAN8=		cdcc.8 dbclean.8 dblist.8 dcc.8 dccd.8 dccifd.8 dccm.8 \
@@ -54,7 +51,7 @@
 WITH_SENDMAIL=	yes
 .else
 .if !defined(WITHOUT_SENDMAIL)
-BROKEN=		"Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes or WITHOUT_SENDMAIL=yes"
+BROKEN=		Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes or WITHOUT_SENDMAIL=yes
 .endif
 .endif
 .else
diff -ruN dcc-dccd.orig/distinfo dcc-dccd/distinfo
--- dcc-dccd.orig/distinfo	Tue Feb 21 07:00:25 2006
+++ dcc-dccd/distinfo	Mon Feb 27 08:24:10 2006
@@ -1,3 +1,3 @@
-MD5 (dcc-dccd-1.3.27.tar.Z) = 1aa43c1ec6841b86bae50208b3ffdf03
-SHA256 (dcc-dccd-1.3.27.tar.Z) = 28d189c1602fbe369f3133946cc827d38bae0b00e281f55401c3adceeb408a29
-SIZE (dcc-dccd-1.3.27.tar.Z) = 1400407
+MD5 (dcc-dccd-1.3.29.tar.Z) = 5d52f9a6173a8755355c745f67a21856
+SHA256 (dcc-dccd-1.3.29.tar.Z) = bbaa3b864221a31ec3aebe72910578a6544d37248744e7e5373c35681ea141d9
+SIZE (dcc-dccd-1.3.29.tar.Z) = 1399517
diff -ruN dcc-dccd.orig/files/patch-homedir::Makefile.in dcc-dccd/files/patch-homedir::Makefile.in
--- dcc-dccd.orig/files/patch-homedir::Makefile.in	Sun Sep 18 04:12:28 2005
+++ dcc-dccd/files/patch-homedir::Makefile.in	Mon Feb 27 09:31:14 2006
@@ -1,6 +1,6 @@
---- homedir/Makefile.in.orig	Tue Aug  2 18:04:26 2005
-+++ homedir/Makefile.in	Sat Sep 17 13:42:56 2005
-@@ -45,11 +45,7 @@
+--- homedir/Makefile.in.orig	Thu Sep  8 09:57:07 2005
++++ homedir/Makefile.in	Mon Feb 27 09:30:03 2006
+@@ -51,15 +51,11 @@
  	  $(HINSTALL) -m 755 -d $(INST_HOMEDIR); fi
  	if test ! -d $(INST_HOMEDIR)/log; then \
  	  $(HINSTALL) -m 710 -d $(INST_HOMEDIR)/log; fi
@@ -13,3 +13,24 @@
  	for nm in flod grey_flod whitelist grey_whitelist \
  		whiteclnt whitecommon; do \
  	  if test ! -f $(INST_HOMEDIR)/$$nm; then \
+-		$(HINSTALL) -m 644 $$nm $(INST_HOMEDIR)/$$nm; fi; \
++		$(HINSTALL) -m 644 $$nm $(INST_HOMEDIR)/$$nm.dist; fi; \
+ 	  done
+ 	@if test ! -f $(INST_HOMEDIR)/ids \
+ 		 -a ! -f $(INST_HOMEDIR)/map \
+@@ -67,11 +63,11 @@
+ 	  PASSWD1=`ps|cksum|tr ' 	' 'xy'`; \
+ 	  PASSWD2=`ps|cksum|tr ' 	' 'yx'`; \
+ 	  umask 077; \
+-	  sed -e "s/secret1/$$PASSWD1/" map.txt >$(INST_HOMEDIR)/map.txt; \
++	  sed -e "s/secret1/$$PASSWD1/" map.txt >$(INST_HOMEDIR)/map.txt.dist; \
+ 	  sed -e "s/secret1/$$PASSWD1/" -e "s/secret2/$$PASSWD2/" ids \
+-		>$(INST_HOMEDIR)/ids; \
++		>$(INST_HOMEDIR)/ids.dist; \
+ 	  ${DEPTH}/cdcc/cdcc -qh $(INST_HOMEDIR) 'new map; load -' \
+ 		<$(INST_HOMEDIR)/map.txt >/dev/null; \
+-	  set +e; chown $(DCC_SUID) $(INST_HOMEDIR)/map.txt \
+-			$(INST_HOMEDIR)/map $(INST_HOMEDIR)/ids; \
++	  set +e; chown $(DCC_SUID) $(INST_HOMEDIR)/map.txt.dist \
++			$(INST_HOMEDIR)/map $(INST_HOMEDIR)/ids.dist; \
+ 	fi
diff -ruN dcc-dccd.orig/pkg-plist dcc-dccd/pkg-plist
--- dcc-dccd.orig/pkg-plist	Sun Sep 18 04:12:27 2005
+++ dcc-dccd/pkg-plist	Mon Feb 27 09:34:02 2006
@@ -11,10 +11,10 @@
 dcc/cgi-bin/webuser-notify
 @unexec if cmp -s %D/dcc/dcc_conf %D/dcc/dcc_conf.dist; then rm -f %D/dcc/dcc_conf; fi
 dcc/dcc_conf.dist
-dcc/flod
-dcc/grey_flod
-dcc/grey_whitelist
-dcc/ids
+dcc/flod.dist
+dcc/grey_flod.dist
+dcc/grey_whitelist.dist
+dcc/ids.dist
 dcc/libexec/cron-dccd
 %%WITH_DCCIFD%%dcc/libexec/dccifd
 %%WITH_SENDMAIL%%dcc/libexec/dccm
@@ -40,11 +40,11 @@
 dcc/libexec/stop-dccd
 dcc/libexec/updatedcc
 dcc/libexec/wlist
-dcc/map
-dcc/map.txt
-dcc/whiteclnt
-dcc/whitecommon
-dcc/whitelist
+dcc/map.dist
+dcc/map.txt.dist
+dcc/whiteclnt.dist
+dcc/whitecommon.dist
+dcc/whitelist.dist
 @dirrm dcc/log
 @dirrm dcc/libexec
 @dirrm dcc/cgi-bin
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ehaupt 
Responsible-Changed-By: ehaupt 
Responsible-Changed-When: Mon Feb 27 09:32:45 CET 2006 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=93881 
State-Changed-From-To: open->feedback 
State-Changed-By: ehaupt 
State-Changed-When: Tue Feb 28 17:08:57 CET 2006 
State-Changed-Why:  
Patch does not apply. Later sent patch (mail) fails to build. Maintainer will 
send a new patch. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=93881 

From: Emanuel Haupt <ehaupt@FreeBSD.org>
To: bug-followup@FreeBSD.org, dean@odyssey.apana.org.au
Cc:  
Subject: Re: ports/93881: Upgraded Port: mail/dcc-dccd to 1.3.29
Date: Thu, 2 Mar 2006 21:05:34 +0100

 I suggest the following patch:
 
 --- dcc-dccd.patch begins here ---
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/mail/dcc-dccd/Makefile,v
 retrieving revision 1.21
 diff -u -r1.21 Makefile
 --- Makefile	25 Feb 2006 20:50:07 -0000	1.21
 +++ Makefile	2 Mar 2006 20:02:09 -0000
 @@ -2,11 +2,11 @@
  # Date created:		Wed Oct 9 19:30:00 WST 2002
  # Whom:			Dean Hollister <dean@odyssey.apana.org.au>
  #
 -# $FreeBSD: ports/mail/dcc-dccd/Makefile,v 1.21 2006/02/25 20:50:07 kris Exp $
 +# $FreeBSD$
  #
  
  PORTNAME=	dcc-dccd
 -PORTVERSION=	1.3.27
 +PORTVERSION=	1.3.29
  CATEGORIES=	mail
  MASTER_SITES=	http://www.rhyolite.com/anti-spam/dcc/source/ \
  		http://www.wa.apana.org.au/~dean/sources/ \
 @@ -16,9 +16,6 @@
  MAINTAINER=	dean@odyssey.apana.org.au
  COMMENT=	Distributed Checksum Clearinghouse procmail, sendmail support
  
 -BROKEN=		Unfetchable
 -
 -USE_REINPLACE=	yes
  HAS_CONFIGURE=	yes
  MANCOMPRESSED=	yes
  MAN8=		cdcc.8 dbclean.8 dblist.8 dcc.8 dccd.8 dccifd.8 dccm.8 \
 @@ -54,7 +51,7 @@
  WITH_SENDMAIL=	yes
  .else
  .if !defined(WITHOUT_SENDMAIL)
 -BROKEN=		"Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes or WITHOUT_SENDMAIL=yes"
 +IGNORE=		base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes or WITHOUT_SENDMAIL=yes
  .endif
  .endif
  .else
 @@ -110,4 +107,10 @@
  	@${SETENV} PKG_PREFIX=${PREFIX} \
  	${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
  
 +post-install:
 +.if !exists(${PREFIX}/dcc/map)
 +	${CP} ${PREFIX}/dcc/map ${PREFIX}/dcc/map.dist
 +	@${CHOWN} ${DCCUSER} ${PREFIX}/dcc/map.dist
 +.endif
 +
  .include <bsd.port.post.mk>
 Index: distinfo
 ===================================================================
 RCS file: /home/pcvs/ports/mail/dcc-dccd/distinfo,v
 retrieving revision 1.16
 diff -u -r1.16 distinfo
 --- distinfo	11 Feb 2006 14:43:04 -0000	1.16
 +++ distinfo	2 Mar 2006 20:02:09 -0000
 @@ -1,3 +1,3 @@
 -MD5 (dcc-dccd-1.3.27.tar.Z) = 1aa43c1ec6841b86bae50208b3ffdf03
 -SHA256 (dcc-dccd-1.3.27.tar.Z) = 28d189c1602fbe369f3133946cc827d38bae0b00e281f55401c3adceeb408a29
 -SIZE (dcc-dccd-1.3.27.tar.Z) = 1400407
 +MD5 (dcc-dccd-1.3.29.tar.Z) = 5d52f9a6173a8755355c745f67a21856
 +SHA256 (dcc-dccd-1.3.29.tar.Z) = bbaa3b864221a31ec3aebe72910578a6544d37248744e7e5373c35681ea141d9
 +SIZE (dcc-dccd-1.3.29.tar.Z) = 1399517
 Index: pkg-plist
 ===================================================================
 RCS file: /home/pcvs/ports/mail/dcc-dccd/pkg-plist,v
 retrieving revision 1.9
 diff -u -r1.9 pkg-plist
 --- pkg-plist	17 Sep 2005 20:12:27 -0000	1.9
 +++ pkg-plist	2 Mar 2006 20:02:09 -0000
 @@ -1,3 +1,33 @@
 +@unexec if cmp -s %D/dcc/dcc_conf %D/dcc/dcc_conf.dist; then rm -f %D/dcc/dcc_conf; fi
 +dcc/dcc_conf.dist
 +@exec [ -f %B/dcc_conf ] || cp %B/%f %B/dcc_conf
 +@unexec if cmp -s %D/dcc/flod %D/dcc/flod.dist; then rm -f %D/dcc/flod; fi
 +dcc/flod.dist
 +@exec [ -f %B/flod ] || cp %B/%f %B/flod
 +@unexec if cmp -s %D/dcc/grey_flod %D/dcc/grey_flod.dist; then rm -f %D/dcc/grey_flod; fi
 +dcc/grey_flod.dist
 +@exec [ -f %B/grey_flod ] || cp %B/%f %B/grey_flod
 +@unexec if cmp -s %D/dcc/grey_whitelist %D/dcc/grey_whitelist.dist; then rm -f %D/dcc/grey_whitelist; fi
 +dcc/grey_whitelist.dist
 +@exec [ -f %B/grey_whitelist ] || cp %B/%f %B/grey_whitelist
 +@unexec if cmp -s %D/dcc/ids %D/dcc/ids.dist; then rm -f %D/dcc/ids; fi
 +dcc/ids.dist
 +@exec [ -f %B/ids ] || cp %B/%f %B/ids
 +@unexec if cmp -s %D/dcc/map %D/dcc/map.dist; then rm -f %D/dcc/map; fi
 +dcc/map.dist
 +@exec [ -f %B/map ] || cp %B/%f %B/map
 +@unexec if cmp -s %D/dcc/map.txt %D/dcc/map.txt.dist; then rm -f %D/dcc/map.txt; fi
 +dcc/map.txt.dist
 +@exec [ -f %B/map.txt ] || cp %B/%f %B/map.txt
 +@unexec if cmp -s %D/dcc/whiteclnt %D/dcc/whiteclnt.dist; then rm -f %D/dcc/whiteclnt; fi
 +dcc/whiteclnt.dist
 +@exec [ -f %B/whiteclnt ] || cp %B/%f %B/whiteclnt
 +@unexec if cmp -s %D/dcc/whitecommon %D/dcc/whitecommon.dist; then rm -f %D/dcc/whitecommon; fi
 +dcc/whitecommon.dist
 +@exec [ -f %B/whitecommon ] || cp %B/%f %B/whitecommon
 +@unexec if cmp -s %D/dcc/whitelist %D/dcc/whitelist.dist; then rm -f %D/dcc/whitelist; fi
 +dcc/whitelist.dist
 +@exec [ -f %B/whitelist ] || cp %B/%f %B/whitelist
  bin/cdcc
  bin/dccif-test
  bin/dccproc
 @@ -9,12 +39,6 @@
  dcc/cgi-bin/list-log
  dcc/cgi-bin/list-msg
  dcc/cgi-bin/webuser-notify
 -@unexec if cmp -s %D/dcc/dcc_conf %D/dcc/dcc_conf.dist; then rm -f %D/dcc/dcc_conf; fi
 -dcc/dcc_conf.dist
 -dcc/flod
 -dcc/grey_flod
 -dcc/grey_whitelist
 -dcc/ids
  dcc/libexec/cron-dccd
  %%WITH_DCCIFD%%dcc/libexec/dccifd
  %%WITH_SENDMAIL%%dcc/libexec/dccm
 @@ -40,12 +64,7 @@
  dcc/libexec/stop-dccd
  dcc/libexec/updatedcc
  dcc/libexec/wlist
 -dcc/map
 -dcc/map.txt
 -dcc/whiteclnt
 -dcc/whitecommon
 -dcc/whitelist
  @dirrm dcc/log
  @dirrm dcc/libexec
  @dirrm dcc/cgi-bin
 -@dirrm dcc
 +@dirrmtry dcc
 Index: files/patch-homedir::Makefile.in
 ===================================================================
 RCS file: /home/pcvs/ports/mail/dcc-dccd/files/patch-homedir::Makefile.in,v
 retrieving revision 1.4
 diff -u -r1.4 patch-homedir::Makefile.in
 --- files/patch-homedir::Makefile.in	17 Sep 2005 20:12:28 -0000	1.4
 +++ files/patch-homedir::Makefile.in	2 Mar 2006 20:02:09 -0000
 @@ -1,6 +1,6 @@
 ---- homedir/Makefile.in.orig	Tue Aug  2 18:04:26 2005
 -+++ homedir/Makefile.in	Sat Sep 17 13:42:56 2005
 -@@ -45,11 +45,7 @@
 +--- homedir/Makefile.in.orig	Thu Sep  8 09:57:07 2005
 ++++ homedir/Makefile.in	Wed Mar  1 07:39:11 2006
 +@@ -51,15 +51,11 @@
   	  $(HINSTALL) -m 755 -d $(INST_HOMEDIR); fi
   	if test ! -d $(INST_HOMEDIR)/log; then \
   	  $(HINSTALL) -m 710 -d $(INST_HOMEDIR)/log; fi
 @@ -13,3 +13,25 @@
   	for nm in flod grey_flod whitelist grey_whitelist \
   		whiteclnt whitecommon; do \
   	  if test ! -f $(INST_HOMEDIR)/$$nm; then \
 +-		$(HINSTALL) -m 644 $$nm $(INST_HOMEDIR)/$$nm; fi; \
 ++		$(HINSTALL) -m 644 $$nm $(INST_HOMEDIR)/$$nm.dist; fi; \
 + 	  done
 + 	@if test ! -f $(INST_HOMEDIR)/ids \
 + 		 -a ! -f $(INST_HOMEDIR)/map \
 +@@ -67,11 +63,11 @@
 + 	  PASSWD1=`ps|cksum|tr ' 	' 'xy'`; \
 + 	  PASSWD2=`ps|cksum|tr ' 	' 'yx'`; \
 + 	  umask 077; \
 +-	  sed -e "s/secret1/$$PASSWD1/" map.txt >$(INST_HOMEDIR)/map.txt; \
 ++	  sed -e "s/secret1/$$PASSWD1/" map.txt >$(INST_HOMEDIR)/map.txt.dist; \
 + 	  sed -e "s/secret1/$$PASSWD1/" -e "s/secret2/$$PASSWD2/" ids \
 +-		>$(INST_HOMEDIR)/ids; \
 ++		>$(INST_HOMEDIR)/ids.dist; \
 + 	  ${DEPTH}/cdcc/cdcc -qh $(INST_HOMEDIR) 'new map; load -' \
 +-		<$(INST_HOMEDIR)/map.txt >/dev/null; \
 +-	  set +e; chown $(DCC_SUID) $(INST_HOMEDIR)/map.txt \
 +-			$(INST_HOMEDIR)/map $(INST_HOMEDIR)/ids; \
 ++		<$(INST_HOMEDIR)/map.txt.dist >/dev/null; \
 ++	  set +e; chown $(DCC_SUID) $(INST_HOMEDIR)/map.txt.dist \
 ++			$(INST_HOMEDIR)/map $(INST_HOMEDIR)/ids.dist; \
 + 	fi
 --- dcc-dccd.patch ends here ---
 
 Also available at:
 http://people.freebsd.org/~ehaupt/patches/dcc-dccd.patch

From: Dean Hollister <dean@odyssey.apana.org.au>
To: Emanuel Haupt <ehaupt@FreeBSD.org>, bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/93881: Upgraded Port: mail/dcc-dccd to 1.3.29
Date: Fri, 03 Mar 2006 06:51:49 +0800

 At 04:05 03/03/2006, Emanuel Haupt wrote:
 >I suggest the following patch:
 
 Yup, I'm happy with that. :-)
 
 Regards,
 
 d.
 
State-Changed-From-To: feedback->open 
State-Changed-By: ehaupt 
State-Changed-When: Fri Mar 3 09:47:20 CET 2006 
State-Changed-Why:  
Feedback received. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=93881 
State-Changed-From-To: open->closed 
State-Changed-By: ehaupt 
State-Changed-When: Fri Mar 3 10:09:39 CET 2006 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=93881 
>Unformatted:
