| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129 |
- Index: cdcc/Makefile.in
- --- cdcc/Makefile.in.orig 2007-10-25 16:06:01 +0200
- +++ cdcc/Makefile.in 2007-11-01 09:31:26 +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 2007-10-31 21:15:23 +0100
- +++ configure 2007-11-01 09:31:26 +0100
- @@ -1020,7 +1020,7 @@
- ;;
- FreeBSD)
- PTHREAD_LDFLAGS="$PTHREAD_LDFLAGS -pthread"
- - PTHREAD_LIBS="$PTHREAD_LIBS -lc_r"
- + PTHREAD_LIBS="$PTHREAD_LIBS"
- ;;
- DragonFly)
- PTHREAD_LDFLAGS="$PTHREAD_LDFLAGS -pthread"
- @@ -2920,6 +2920,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=.
- @@ -3459,7 +3466,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 2007-10-25 16:10:32 +0200
- +++ dccm/dccm.c 2007-11-01 09:31:26 +0100
- @@ -39,7 +39,7 @@
- * Rhyolite Software DCC 1.3.67-1.220 $Revision: 1.2 $
- */
-
- -#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 2007-11-01 09:31:26 +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 2007-11-01 09:31:26 +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 2007-10-25 16:14:27 +0200
- +++ homedir/Makefile.in 2007-11-01 09:35:29 +0100
- @@ -42,7 +42,7 @@
- @MAKE_PROG@
- @MAKE_INC2@
-
- -HINST =$(INSTALL) -c $(SET_DCCOWN)
- +HINST =$(INSTALL) -c
- HD =@installroot@$(DCC_HOMEDIR)
-
- # this should not be the ./configure name
- @@ -74,7 +74,7 @@
- $(HINST) -m 644 $$nm $(HD)/$$nm; 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 ! -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; \
- else\
- sh -e fix-map -c ${DEPTH}/cdcc/cdcc -h $(HD);\
- fi
- Index: thrlib/cmn.c
- --- thrlib/cmn.c.orig 2007-10-18 23:45:05 +0200
- +++ thrlib/cmn.c 2007-11-01 09:31:26 +0100
- @@ -667,7 +667,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
- }
-
|
