head	1.8;
access;
symbols;
locks; strict;
comment	@# @;


1.8
date	2009.01.10.22.14.02;	author rse;	state Exp;
branches;
next	1.7;
commitid	4TR18pfswDbRcXxt;

1.7
date	2009.01.09.09.27.21;	author rse;	state Exp;
branches;
next	1.6;
commitid	NJapORvtiLrPZKxt;

1.6
date	2008.05.21.18.29.54;	author rse;	state Exp;
branches;
next	1.5;
commitid	rIbn52bKrSqjuR3t;

1.5
date	2008.04.05.08.17.49;	author rse;	state Exp;
branches;
next	1.4;
commitid	SifDPwMHPqeZzTXs;

1.4
date	2008.03.10.16.09.06;	author rse;	state Exp;
branches;
next	1.3;
commitid	XGAjo3FAJ8Bu1BUs;

1.3
date	2008.03.03.07.33.47;	author rse;	state Exp;
branches;
next	1.2;
commitid	9OS87XJObe9EoETs;

1.2
date	2007.11.01.10.36.33;	author rse;	state Exp;
branches;
next	1.1;
commitid	eEtqu088Fi6umRDs;

1.1
date	2007.09.07.10.50.33;	author rse;	state Exp;
branches;
next	;
commitid	Y1etAp85uQsTcNws;


desc
@@


1.8
log
@upgrading package: dcc 1.3.100 -> 1.3.101
@
text
@Index: cdcc/Makefile.in
--- cdcc/Makefile.in.orig	2007-10-25 16:06:01 +0200
+++ cdcc/Makefile.in	2009-01-10 20:49:04 +0100
@@@@ -45,7 +45,7 @@@@
 
 @@MAKE_DOT@@ifndef NO_SUID
 # cdcc needs to be SUID to read the server passwords
-BINMODE	=4$(DCC_MODE)
-BINOWN	=@@DCCSUID@@
+BINMODE	=$(DCC_MODE)
+BINOWN	=$(DCC_SUID)
 @@MAKE_DOT@@endif
 @@MAKE_INC2@@
Index: configure
--- configure.orig	2009-01-09 17:35:38 +0100
+++ configure	2009-01-10 20:49:04 +0100
@@@@ -1098,7 +1098,7 @@@@
 	appendvar PTHREAD_LDFLAGS -pthread
 	if test -s /usr/lib/libc_r.a; then
 	    # use libc_r on ancient versions
-	    appendvar PTHREAD_LIBS -lc_r
+	    : # appendvar PTHREAD_LIBS -lc_r
 	fi
 	;;
     Darwin)
@@@@ -2916,6 +2916,13 @@@@
     SENDMAIL_EVAL="$SENDMAIL"
     with_sendmail=yes
 fi
+if test -n "$SENDMAIL" -a "$SENDMAIL" != "no"; then
+    if test -f $SENDMAIL/include/milter/mfapi.h -a -f $SENDMAIL/lib/libmilter.a; then
+        SENDMAIL_OBJ=$SENDMAIL/lib
+        SENDMAIL_OBJ_EVAL=$SENDMAIL_OBJ
+        SENDMAIL_LIB=$SENDMAIL_OBJ/libmilter.a
+    fi
+fi
 if test -z "$SENDMAIL"; then
     # prefer a parallel ../sendmail directory
     DEPTH=.
@@@@ -3473,7 +3480,7 @@@@
 	mancat=man
 	MAN8='dcc.8 $(SUBDIR_MAN8)'
 	MAN8INST=''
-	USE_DCCMANINSTALL='# do not use dccmaninstall'
+	USE_DCCMANINSTALL='maninstall:dccmaninstall'
 	;;
     DragonFly)
 	# default to /usr/local/man/man8 and use nroff files, possibly
Index: dccm/dccm.c
--- dccm/dccm.c.orig	2008-12-06 00:22:30 +0100
+++ dccm/dccm.c	2009-01-10 20:49:04 +0100
@@@@ -39,7 +39,7 @@@@
  * Rhyolite Software DCC 1.3.101-1.238 $Revision$
  */
 
-#include "libmilter/mfapi.h"
+#include "milter/mfapi.h"
 #include "cmn_defs.h"
 
 #undef NEW_MFAPI
Index: dccproc/Makefile.in
--- dccproc/Makefile.in.orig	2007-10-25 16:02:00 +0200
+++ dccproc/Makefile.in	2009-01-10 20:49:04 +0100
@@@@ -45,7 +45,7 @@@@
 
 @@MAKE_DOT@@ifndef NO_SUID
 # dccproc needs to be SUID to read the server passwords
-BINMODE	=4$(DCC_MODE)
-BINOWN	=@@DCCSUID@@
+BINMODE	=$(DCC_MODE)
+BINOWN	=$(DCC_SUID)
 @@MAKE_DOT@@endif
 @@MAKE_INC2@@
Index: dccsight/Makefile.in
--- dccsight/Makefile.in.orig	2007-10-25 16:21:01 +0200
+++ dccsight/Makefile.in	2009-01-10 20:49:04 +0100
@@@@ -46,7 +46,7 @@@@
 
 @@MAKE_DOT@@ifndef NO_SUID
 # dccsight needs to be SUID to read the server passwords
-BINMODE	=4$(DCC_MODE)
-BINOWN	=@@DCCSUID@@
+BINMODE	=$(DCC_MODE)
+BINOWN	=$(DCC_SUID)
 @@MAKE_DOT@@endif
 @@MAKE_INC2@@
Index: homedir/Makefile.in
--- homedir/Makefile.in.orig	2008-10-19 17:53:22 +0200
+++ homedir/Makefile.in	2009-01-10 20:49:04 +0100
@@@@ -42,7 +42,7 @@@@
 @@MAKE_PROG@@
 @@MAKE_INC2@@
 
-HINST	=$(INSTALL) -c $(SET_DCCOWN)
+HINST	=$(INSTALL) -c
 HD	=@@installroot@@$(DCC_HOMEDIR)
 MAP	=$(HD)/map@@configsuffix@@
 MAPTXT	=$(HD)/map.txt@@configsuffix@@
@@@@ -76,7 +76,7 @@@@
 		$(HINST) -m 644 $$nm $(HD)/$${nm}@@configsuffix@@; fi; done
 	if test -s $(UPFILE); then\
 	    $(HINST) -m 600 $(UPFILE) $(HD)/$(UPFILE);\
-	    set +e; chown @@DCCSUID@@ $(HD)/$(UPFILE); fi
+	    set +e; fi
 	if test -n '@@configsuffix@@' || test ! -f $(HD)/ids -a ! -f $(HD)/map\
 				 -a ! -f $(HD)/map.txt; then\
 	    umask 077; PASSWD=`$(RND)`;\
@@@@ -86,7 +86,7 @@@@
 	    sh fix-map -c $(CDCC) -m $(MAP) -h $(HD);\
 	    echo '# map.txt is merely the output of `cdcc info`' >$(MAPTXT);\
 	    $(CDCC) -qh$(HD) "file $(MAP); info" >>$(MAPTXT);\
-	    set +e; chown @@DCCSUID@@ $(MAPTXT) $(MAP) $(IDS);\
+	    set +e; \
 	else\
 	    sh fix-map -c $(CDCC) -m $(MAP) -h $(HD);\
 	fi
Index: thrlib/cmn.c
--- thrlib/cmn.c.orig	2008-12-06 00:21:11 +0100
+++ thrlib/cmn.c	2009-01-10 20:49:04 +0100
@@@@ -646,7 +646,7 @@@@
 	LOG_CMN_CAPTION(cwp, DCC_LOG_TRN_MSG_CR);
 	cwp->log_size = MAX_LOG_SIZE+1;
 #else
-	log_write(&wp->cw, buf, buflen);
+	log_write(cwp, buf, buflen);
 #endif
 }
 
@


1.7
log
@upgrading package: dcc 1.3.99 -> 1.3.100
@
text
@d3 1
a3 1
+++ cdcc/Makefile.in	2009-01-09 10:19:33 +0100
d15 2
a16 2
--- configure.orig	2009-01-09 04:55:11 +0100
+++ configure	2009-01-09 10:19:33 +0100
a48 12
Index: dccd/dump-clients/dump-clients.c
--- dccd/dump-clients/dump-clients.c.orig	2008-11-29 01:38:06 +0100
+++ dccd/dump-clients/dump-clients.c	2009-01-09 10:24:55 +0100
@@@@ -43,7 +43,7 @@@@
 
 static const char *homedir;
 
-static u_char nonames, quiet, avg, grey_on;
+static u_char nonames, quiet, avg;
 
 
 static void NRATTRIB
d51 1
a51 1
+++ dccm/dccm.c	2009-01-09 10:19:33 +0100
d53 1
a53 1
  * Rhyolite Software DCC 1.3.100-1.238 $Revision$
d63 1
a63 1
+++ dccproc/Makefile.in	2009-01-09 10:19:33 +0100
d76 1
a76 1
+++ dccsight/Makefile.in	2009-01-09 10:19:33 +0100
d89 1
a89 1
+++ homedir/Makefile.in	2009-01-09 10:19:33 +0100
d119 1
a119 1
+++ thrlib/cmn.c	2009-01-09 10:19:33 +0100
@


1.6
log
@upgrading package: dcc 1.3.90 -> 1.3.91
@
text
@d3 1
a3 1
+++ cdcc/Makefile.in	2008-05-21 20:20:45 +0200
d15 3
a17 3
--- configure.orig	2008-05-21 15:13:30 +0200
+++ configure	2008-05-21 20:20:45 +0200
@@@@ -1082,7 +1082,7 @@@@
d26 1
a26 1
@@@@ -2993,6 +2993,13 @@@@
d40 1
a40 1
@@@@ -3550,7 +3557,7 @@@@
d49 12
d62 2
a63 2
--- dccm/dccm.c.orig	2008-05-15 18:44:02 +0200
+++ dccm/dccm.c	2008-05-21 20:20:45 +0200
d65 1
a65 1
  * Rhyolite Software DCC 1.3.91-1.224 $Revision$
d75 1
a75 1
+++ dccproc/Makefile.in	2008-05-21 20:20:45 +0200
d88 1
a88 1
+++ dccsight/Makefile.in	2008-05-21 20:20:45 +0200
d100 2
a101 2
--- homedir/Makefile.in.orig	2008-04-28 17:34:10 +0200
+++ homedir/Makefile.in	2008-05-21 20:25:23 +0200
d110 1
a110 1
 MAPTXT	=$(MAP).txt@@configsuffix@@
d130 3
a132 3
--- thrlib/cmn.c.orig	2008-05-18 06:16:57 +0200
+++ thrlib/cmn.c	2008-05-21 20:20:45 +0200
@@@@ -667,7 +667,7 @@@@
@


1.5
log
@upgrading package: dcc 1.3.86 -> 1.3.87
@
text
@d3 1
a3 1
+++ cdcc/Makefile.in	2008-04-05 10:13:35 +0200
d15 2
a16 2
--- configure.orig	2008-04-05 05:55:14 +0200
+++ configure	2008-04-05 10:13:35 +0200
d26 1
a26 1
@@@@ -2992,6 +2992,13 @@@@
d40 1
a40 1
@@@@ -3549,7 +3556,7 @@@@
d50 2
a51 2
--- dccm/dccm.c.orig	2008-01-03 05:34:17 +0100
+++ dccm/dccm.c	2008-04-05 10:13:35 +0200
d53 1
a53 1
  * Rhyolite Software DCC 1.3.87-1.222 $Revision$
d63 1
a63 1
+++ dccproc/Makefile.in	2008-04-05 10:13:35 +0200
d76 1
a76 1
+++ dccsight/Makefile.in	2008-04-05 10:13:35 +0200
d88 2
a89 2
--- homedir/Makefile.in.orig	2008-03-27 23:45:55 +0100
+++ homedir/Makefile.in	2008-04-05 10:14:04 +0200
d108 1
a108 2
@@@@ -85,7 +85,7 @@@@
 		$(CDCC) -q "new map $(MAP); load -";\
d110 2
a111 1
 	    $(CDCC) -q "file $(MAP); info" >$(MAPTXT);\
d118 2
a119 2
--- thrlib/cmn.c.orig	2008-03-31 03:05:18 +0200
+++ thrlib/cmn.c	2008-04-05 10:13:35 +0200
@


1.4
log
@upgrading package: dcc 1.3.83 -> 1.3.84
@
text
@d3 1
a3 1
+++ cdcc/Makefile.in	2008-03-10 17:03:17 +0100
d15 4
a18 4
--- configure.orig	2008-03-10 05:15:58 +0100
+++ configure	2008-03-10 17:04:26 +0100
@@@@ -1059,7 +1059,7 @@@@
 	PTHREAD_LDFLAGS="$PTHREAD_LDFLAGS -pthread"
d26 1
a26 1
@@@@ -2967,6 +2967,13 @@@@
d40 1
a40 1
@@@@ -3521,7 +3528,7 @@@@
d51 1
a51 1
+++ dccm/dccm.c	2008-03-10 17:03:17 +0100
d53 1
a53 1
  * Rhyolite Software DCC 1.3.84-1.222 $Revision$
d63 1
a63 1
+++ dccproc/Makefile.in	2008-03-10 17:03:17 +0100
d76 1
a76 1
+++ dccsight/Makefile.in	2008-03-10 17:03:17 +0100
d88 2
a89 2
--- homedir/Makefile.in.orig	2008-03-09 19:15:22 +0100
+++ homedir/Makefile.in	2008-03-10 17:05:11 +0100
d98 2
a99 2
 MAPTXT	=$(HD)/map.txt@@configsuffix@@
@@@@ -78,7 +78,7 @@@@
d102 3
a104 3
 	      $(HINST) -m 600 $(UPFILE) $(HD)/$(UPFILE);\
-	      set +e; chown @@DCCSUID@@ $(HD)/$(UPFILE); fi
+	      set +e; fi
d107 2
a108 2
 	    umask 077; PASSWD1=`$(RSTRING)`;\
@@@@ -88,7 +88,7 @@@@
d112 1
a112 1
-	    set +e; chown @@DCCSUID@@ $(MAPTXT) $(MAP) $(HD)/ids@@configsuffix@@;\
d118 2
a119 2
--- thrlib/cmn.c.orig	2008-02-11 06:00:45 +0100
+++ thrlib/cmn.c	2008-03-10 17:03:17 +0100
@


1.3
log
@upgrading package: dcc 1.3.82 -> 1.3.83
@
text
@d3 1
a3 1
+++ cdcc/Makefile.in	2008-03-03 07:57:17 +0100
d15 3
a17 3
--- configure.orig	2008-03-01 17:26:43 +0100
+++ configure	2008-03-03 08:29:26 +0100
@@@@ -1022,7 +1022,7 @@@@
d21 2
a22 2
-	    PTHREAD_LIBS="$PTHREAD_LIBS -lc_r"
+	    PTHREAD_LIBS="$PTHREAD_LIBS"
d26 1
a26 1
@@@@ -2924,6 +2924,13 @@@@
d40 1
a40 1
@@@@ -3477,7 +3484,7 @@@@
d51 1
a51 1
+++ dccm/dccm.c	2008-03-03 07:57:17 +0100
d53 1
a53 1
  * Rhyolite Software DCC 1.3.83-1.222 $Revision$
d63 1
a63 1
+++ dccproc/Makefile.in	2008-03-03 07:57:17 +0100
d76 1
a76 1
+++ dccsight/Makefile.in	2008-03-03 07:57:17 +0100
d88 2
a89 2
--- homedir/Makefile.in.orig	2008-03-01 17:24:30 +0100
+++ homedir/Makefile.in	2008-03-03 08:29:48 +0100
d97 4
a100 4
 
 # this should not be the ./configure name
@@@@ -74,7 +74,7 @@@@
 		$(HINST) -m 644 $$nm $(HD)/$$nm; fi; done
d105 9
a113 9
 	if test ! -f $(HD)/ids -a ! -f $(HD)/map -a ! -f $(HD)/map.txt; then\
 	  umask 077; PASSWD1=`$(RSTRING)`; PASSWD2=`$(RSTRING)`;\
 	  sed -e "s/secret1/$$PASSWD1/" map.txt >$(HD)/map.txt;\
@@@@ -83,7 +83,7 @@@@
 	  $(DEPTH)/cdcc/cdcc -qh $(HD) 'new map; load $(HD)/map.txt';\
 	  sh -e fix-map -c $(DEPTH)/cdcc/cdcc -h $(HD);\
 	  $(DEPTH)/cdcc/cdcc -qh $(HD) info >$(HD)/map.txt;\
-	  set +e; chown @@DCCSUID@@ $(HD)/map.txt $(HD)/map $(HD)/ids;\
+	  set +e; \
d115 1
a115 1
 	  sh -e fix-map -c $(DEPTH)/cdcc/cdcc -h $(HD);\
d119 1
a119 1
+++ thrlib/cmn.c	2008-03-03 07:57:17 +0100
@


1.2
log
@upgrading package: dcc 1.3.66 -> 1.3.67
@
text
@d3 1
a3 1
+++ cdcc/Makefile.in	2007-11-01 09:31:26 +0100
d15 3
a17 5
--- configure.orig	2007-10-31 21:15:23 +0100
+++ configure	2007-11-01 09:31:26 +0100
@@@@ -1020,7 +1020,7 @@@@
 	;;
     FreeBSD)
d19 5
a23 2
-	PTHREAD_LIBS="$PTHREAD_LIBS -lc_r"
+	PTHREAD_LIBS="$PTHREAD_LIBS"
d25 2
a26 3
     DragonFly)
 	PTHREAD_LDFLAGS="$PTHREAD_LDFLAGS -pthread"
@@@@ -2920,6 +2920,13 @@@@
d40 1
a40 1
@@@@ -3459,7 +3466,7 @@@@
d50 2
a51 2
--- dccm/dccm.c.orig	2007-10-25 16:10:32 +0200
+++ dccm/dccm.c	2007-11-01 09:31:26 +0100
d53 1
a53 1
  * Rhyolite Software DCC 1.3.67-1.220 $Revision$
d63 1
a63 1
+++ dccproc/Makefile.in	2007-11-01 09:31:26 +0100
d76 1
a76 1
+++ dccsight/Makefile.in	2007-11-01 09:31:26 +0100
d88 2
a89 2
--- homedir/Makefile.in.orig	2007-10-25 16:14:27 +0200
+++ homedir/Makefile.in	2007-11-01 09:35:29 +0100
d109 3
a111 3
 	  ${DEPTH}/cdcc/cdcc -qh $(HD) 'new map; load $(HD)/map.txt';\
 	  sh -e fix-map -c ${DEPTH}/cdcc/cdcc -h $(HD);\
 	  ${DEPTH}/cdcc/cdcc -qh $(HD) info >$(HD)/map.txt;\
d115 1
a115 1
 	  sh -e fix-map -c ${DEPTH}/cdcc/cdcc -h $(HD);\
d118 2
a119 2
--- thrlib/cmn.c.orig	2007-10-18 23:45:05 +0200
+++ thrlib/cmn.c	2007-11-01 09:31:26 +0100
@


1.1
log
@flush my work on DCC
@
text
@d2 3
a4 3
--- cdcc/Makefile.in.orig	2005-10-12 23:04:19 +0200
+++ cdcc/Makefile.in	2007-09-07 12:48:57 +0200
@@@@ -43,7 +43,7 @@@@
d6 1
a6 1
 @@MAKE_DOT@@ifndef NO_SYS_INSTALL
d9 1
d11 1
a12 1
 BINOWN	=$(DCC_SUID)
d15 3
a17 3
--- configure.orig	2007-08-25 15:03:47 +0200
+++ configure	2007-09-07 12:48:57 +0200
@@@@ -1009,7 +1009,7 @@@@
d26 1
a26 1
@@@@ -2929,6 +2929,13 @@@@
d40 1
a40 1
@@@@ -3468,7 +3475,7 @@@@
d50 4
a53 4
--- dccm/dccm.c.orig	2007-05-12 06:17:26 +0200
+++ dccm/dccm.c	2007-09-07 12:49:38 +0200
@@@@ -37,7 +37,7 @@@@
  * Rhyolite Software DCC 1.3.59-1.215 $Revision$
d61 56
d118 3
a120 3
--- thrlib/cmn.c.orig	2007-05-09 01:21:24 +0200
+++ thrlib/cmn.c	2007-09-07 12:48:57 +0200
@@@@ -660,7 +660,7 @@@@
@