فهرست منبع

upgrading package: dcc 1.3.66 -> 1.3.67

Ralf S. Engelschall 18 سال پیش
والد
کامیت
2b849b872e
2فایلهای تغییر یافته به همراه76 افزوده شده و 19 حذف شده
  1. 74 17
      dcc/dcc.patch
  2. 2 2
      dcc/dcc.spec

+ 74 - 17
dcc/dcc.patch

@@ -1,19 +1,20 @@
 Index: cdcc/Makefile.in
---- 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 @@
+--- 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_SYS_INSTALL
+ @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
- BINOWN	=$(DCC_SUID)
  @MAKE_INC2@
 Index: configure
---- configure.orig	2007-08-25 15:03:47 +0200
-+++ configure	2007-09-07 12:48:57 +0200
-@@ -1009,7 +1009,7 @@
+--- 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"
@@ -22,7 +23,7 @@ Index: configure
  	;;
      DragonFly)
  	PTHREAD_LDFLAGS="$PTHREAD_LDFLAGS -pthread"
-@@ -2929,6 +2929,13 @@
+@@ -2920,6 +2920,13 @@
      SENDMAIL_EVAL="$SENDMAIL"
      with_sendmail=yes
  fi
@@ -36,7 +37,7 @@ Index: configure
  if test -z "$SENDMAIL"; then
      # prefer a parallel ../sendmail directory
      DEPTH=.
-@@ -3468,7 +3475,7 @@
+@@ -3459,7 +3466,7 @@
  	mancat=man
  	MAN8='dcc.8 $(SUBDIR_MAN8)'
  	MAN8INST=''
@@ -46,10 +47,10 @@ Index: configure
      DragonFly)
  	# default to /usr/local/man/man8 and use nroff files, possibly
 Index: dccm/dccm.c
---- 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: 1.1 $
+--- 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"
@@ -57,10 +58,66 @@ Index: dccm/dccm.c
  #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-05-09 01:21:24 +0200
-+++ thrlib/cmn.c	2007-09-07 12:48:57 +0200
-@@ -660,7 +660,7 @@
+--- 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

+ 2 - 2
dcc/dcc.spec

@@ -34,8 +34,8 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        Mail
 License:      Open Source
-Version:      1.3.66
-Release:      20071016
+Version:      1.3.67
+Release:      20071101
 
 #   list of sources
 Source0:      http://www.rhyolite.com/anti-spam/dcc/source/dcc-%{version}.tar.Z