|
|
@@ -1,6 +1,6 @@
|
|
|
Index: cdcc/Makefile.in
|
|
|
--- cdcc/Makefile.in.orig 2007-10-25 16:06:01 +0200
|
|
|
-+++ cdcc/Makefile.in 2008-03-10 17:03:17 +0100
|
|
|
++++ cdcc/Makefile.in 2008-04-05 10:13:35 +0200
|
|
|
@@ -45,7 +45,7 @@
|
|
|
|
|
|
@MAKE_DOT@ifndef NO_SUID
|
|
|
@@ -12,10 +12,10 @@ Index: cdcc/Makefile.in
|
|
|
@MAKE_DOT@endif
|
|
|
@MAKE_INC2@
|
|
|
Index: configure
|
|
|
---- 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"
|
|
|
+--- configure.orig 2008-04-05 05:55:14 +0200
|
|
|
++++ configure 2008-04-05 10:13:35 +0200
|
|
|
+@@ -1082,7 +1082,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
|
|
|
@@ -23,7 +23,7 @@ Index: configure
|
|
|
fi
|
|
|
;;
|
|
|
Darwin)
|
|
|
-@@ -2967,6 +2967,13 @@
|
|
|
+@@ -2992,6 +2992,13 @@
|
|
|
SENDMAIL_EVAL="$SENDMAIL"
|
|
|
with_sendmail=yes
|
|
|
fi
|
|
|
@@ -37,7 +37,7 @@ Index: configure
|
|
|
if test -z "$SENDMAIL"; then
|
|
|
# prefer a parallel ../sendmail directory
|
|
|
DEPTH=.
|
|
|
-@@ -3521,7 +3528,7 @@
|
|
|
+@@ -3549,7 +3556,7 @@
|
|
|
mancat=man
|
|
|
MAN8='dcc.8 $(SUBDIR_MAN8)'
|
|
|
MAN8INST=''
|
|
|
@@ -48,9 +48,9 @@ Index: configure
|
|
|
# default to /usr/local/man/man8 and use nroff files, possibly
|
|
|
Index: dccm/dccm.c
|
|
|
--- dccm/dccm.c.orig 2008-01-03 05:34:17 +0100
|
|
|
-+++ dccm/dccm.c 2008-03-10 17:03:17 +0100
|
|
|
++++ dccm/dccm.c 2008-04-05 10:13:35 +0200
|
|
|
@@ -39,7 +39,7 @@
|
|
|
- * Rhyolite Software DCC 1.3.84-1.222 $Revision: 1.4 $
|
|
|
+ * Rhyolite Software DCC 1.3.87-1.222 $Revision: 1.5 $
|
|
|
*/
|
|
|
|
|
|
-#include "libmilter/mfapi.h"
|
|
|
@@ -60,7 +60,7 @@ Index: dccm/dccm.c
|
|
|
#undef NEW_MFAPI
|
|
|
Index: dccproc/Makefile.in
|
|
|
--- dccproc/Makefile.in.orig 2007-10-25 16:02:00 +0200
|
|
|
-+++ dccproc/Makefile.in 2008-03-10 17:03:17 +0100
|
|
|
++++ dccproc/Makefile.in 2008-04-05 10:13:35 +0200
|
|
|
@@ -45,7 +45,7 @@
|
|
|
|
|
|
@MAKE_DOT@ifndef NO_SUID
|
|
|
@@ -73,7 +73,7 @@ Index: dccproc/Makefile.in
|
|
|
@MAKE_INC2@
|
|
|
Index: dccsight/Makefile.in
|
|
|
--- dccsight/Makefile.in.orig 2007-10-25 16:21:01 +0200
|
|
|
-+++ dccsight/Makefile.in 2008-03-10 17:03:17 +0100
|
|
|
++++ dccsight/Makefile.in 2008-04-05 10:13:35 +0200
|
|
|
@@ -46,7 +46,7 @@
|
|
|
|
|
|
@MAKE_DOT@ifndef NO_SUID
|
|
|
@@ -85,8 +85,8 @@ Index: dccsight/Makefile.in
|
|
|
@MAKE_DOT@endif
|
|
|
@MAKE_INC2@
|
|
|
Index: homedir/Makefile.in
|
|
|
---- homedir/Makefile.in.orig 2008-03-09 19:15:22 +0100
|
|
|
-+++ homedir/Makefile.in 2008-03-10 17:05:11 +0100
|
|
|
+--- homedir/Makefile.in.orig 2008-03-27 23:45:55 +0100
|
|
|
++++ homedir/Makefile.in 2008-04-05 10:14:04 +0200
|
|
|
@@ -42,7 +42,7 @@
|
|
|
@MAKE_PROG@
|
|
|
@MAKE_INC2@
|
|
|
@@ -95,28 +95,28 @@ Index: homedir/Makefile.in
|
|
|
+HINST =$(INSTALL) -c
|
|
|
HD =@installroot@$(DCC_HOMEDIR)
|
|
|
MAP =$(HD)/map@configsuffix@
|
|
|
- MAPTXT =$(HD)/map.txt@configsuffix@
|
|
|
-@@ -78,7 +78,7 @@
|
|
|
+ MAPTXT =$(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
|
|
|
+ $(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; PASSWD1=`$(RSTRING)`;\
|
|
|
-@@ -88,7 +88,7 @@
|
|
|
+ umask 077; PASSWD=`$(RND)`;\
|
|
|
+@@ -85,7 +85,7 @@
|
|
|
$(CDCC) -q "new map $(MAP); load -";\
|
|
|
sh fix-map -c $(CDCC) -m $(MAP) -h $(HD);\
|
|
|
$(CDCC) -q "file $(MAP); info" >$(MAPTXT);\
|
|
|
-- set +e; chown @DCCSUID@ $(MAPTXT) $(MAP) $(HD)/ids@configsuffix@;\
|
|
|
+- 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-02-11 06:00:45 +0100
|
|
|
-+++ thrlib/cmn.c 2008-03-10 17:03:17 +0100
|
|
|
+--- thrlib/cmn.c.orig 2008-03-31 03:05:18 +0200
|
|
|
++++ thrlib/cmn.c 2008-04-05 10:13:35 +0200
|
|
|
@@ -667,7 +667,7 @@
|
|
|
LOG_CMN_CAPTION(cwp, DCC_LOG_TRN_MSG_CR);
|
|
|
cwp->log_size = MAX_LOG_SIZE+1;
|
