You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
128 lines
3.6 KiB
128 lines
3.6 KiB
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 |
|
@@ -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 2008-03-10 05:15:58 +0100 |
|
+++ configure 2008-03-10 17:04:26 +0100 |
|
@@ -1059,7 +1059,7 @@ |
|
PTHREAD_LDFLAGS="$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) |
|
@@ -2967,6 +2967,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=. |
|
@@ -3521,7 +3528,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-01-03 05:34:17 +0100 |
|
+++ dccm/dccm.c 2008-03-10 17:03:17 +0100 |
|
@@ -39,7 +39,7 @@ |
|
* Rhyolite Software DCC 1.3.84-1.222 $Revision: 1.4 $ |
|
*/ |
|
|
|
-#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 2008-03-10 17:03:17 +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 2008-03-10 17:03:17 +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-03-09 19:15:22 +0100 |
|
+++ homedir/Makefile.in 2008-03-10 17:05:11 +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@ |
|
@@ -78,7 +78,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; PASSWD1=`$(RSTRING)`;\ |
|
@@ -88,7 +88,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; \ |
|
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 |
|
@@ -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 |
|
} |
|
|
|
|