OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 10-Mar-2008 17:09:09 Branch: HEAD Handle: 2008031016090600 Modified files: openpkg-src/dcc dcc.patch dcc.spec Log: upgrading package: dcc 1.3.83 -> 1.3.84 Summary: Revision Changes Path 1.4 +29 -29 openpkg-src/dcc/dcc.patch 1.21 +2 -2 openpkg-src/dcc/dcc.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/dcc/dcc.patch ============================================================================ $ cvs diff -u -r1.3 -r1.4 dcc.patch --- openpkg-src/dcc/dcc.patch 3 Mar 2008 07:33:47 -0000 1.3 +++ openpkg-src/dcc/dcc.patch 10 Mar 2008 16:09:06 -0000 1.4 @@ -1,6 +1,6 @@ Index: cdcc/Makefile.in --- cdcc/Makefile.in.orig 2007-10-25 16:06:01 +0200 -+++ cdcc/Makefile.in 2008-03-03 07:57:17 +0100 ++++ cdcc/Makefile.in 2008-03-10 17:03:17 +0100 @@ -45,7 +45,7 @@ @[EMAIL PROTECTED] NO_SUID @@ -12,18 +12,18 @@ @[EMAIL PROTECTED] @MAKE_INC2@ Index: configure ---- configure.orig 2008-03-01 17:26:43 +0100 -+++ configure 2008-03-03 08:29:26 +0100 -@@ -1022,7 +1022,7 @@ +--- 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 -- PTHREAD_LIBS="$PTHREAD_LIBS -lc_r" -+ PTHREAD_LIBS="$PTHREAD_LIBS" +- appendvar PTHREAD_LIBS -lc_r ++ : # appendvar PTHREAD_LIBS -lc_r fi ;; Darwin) -@@ -2924,6 +2924,13 @@ +@@ -2967,6 +2967,13 @@ SENDMAIL_EVAL="$SENDMAIL" with_sendmail=yes fi @@ -37,7 +37,7 @@ if test -z "$SENDMAIL"; then # prefer a parallel ../sendmail directory DEPTH=. -@@ -3477,7 +3484,7 @@ +@@ -3521,7 +3528,7 @@ mancat=man MAN8='dcc.8 $(SUBDIR_MAN8)' MAN8INST='' @@ -48,9 +48,9 @@ # 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-03 07:57:17 +0100 ++++ dccm/dccm.c 2008-03-10 17:03:17 +0100 @@ -39,7 +39,7 @@ - * Rhyolite Software DCC 1.3.83-1.222 $Revision: 1.3 $ + * Rhyolite Software DCC 1.3.84-1.222 $Revision: 1.4 $ */ -#include "libmilter/mfapi.h" @@ -60,7 +60,7 @@ #undef NEW_MFAPI Index: dccproc/Makefile.in --- dccproc/Makefile.in.orig 2007-10-25 16:02:00 +0200 -+++ dccproc/Makefile.in 2008-03-03 07:57:17 +0100 ++++ dccproc/Makefile.in 2008-03-10 17:03:17 +0100 @@ -45,7 +45,7 @@ @[EMAIL PROTECTED] NO_SUID @@ -73,7 +73,7 @@ @MAKE_INC2@ Index: dccsight/Makefile.in --- dccsight/Makefile.in.orig 2007-10-25 16:21:01 +0200 -+++ dccsight/Makefile.in 2008-03-03 07:57:17 +0100 ++++ dccsight/Makefile.in 2008-03-10 17:03:17 +0100 @@ -46,7 +46,7 @@ @[EMAIL PROTECTED] NO_SUID @@ -85,8 +85,8 @@ @[EMAIL PROTECTED] @MAKE_INC2@ Index: homedir/Makefile.in ---- homedir/Makefile.in.orig 2008-03-01 17:24:30 +0100 -+++ homedir/Makefile.in 2008-03-03 08:29:48 +0100 +--- 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@ @@ -94,29 +94,29 @@ -HINST =$(INSTALL) -c $(SET_DCCOWN) +HINST =$(INSTALL) -c HD [EMAIL PROTECTED]@$(DCC_HOMEDIR) - - # this should not be the ./configure name -@@ -74,7 +74,7 @@ - $(HINST) -m 644 $$nm $(HD)/$$nm; fi; done + MAP =$(HD)/[EMAIL PROTECTED]@ + MAPTXT =$(HD)/[EMAIL PROTECTED]@ +@@ -78,7 +78,7 @@ + $(HINST) -m 644 $$nm $(HD)/[EMAIL PROTECTED]@; 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; \ + 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)/[EMAIL PROTECTED]@;\ ++ set +e; \ else\ - sh -e fix-map -c $(DEPTH)/cdcc/cdcc -h $(HD);\ + 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-03 07:57:17 +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; @@ . patch -p0 <<'@@ .' Index: openpkg-src/dcc/dcc.spec ============================================================================ $ cvs diff -u -r1.20 -r1.21 dcc.spec --- openpkg-src/dcc/dcc.spec 3 Mar 2008 07:33:49 -0000 1.20 +++ openpkg-src/dcc/dcc.spec 10 Mar 2008 16:09:06 -0000 1.21 @@ -33,8 +33,8 @@ Class: EVAL Group: Mail License: Open Source -Version: 1.3.83 -Release: 20080303 +Version: 1.3.84 +Release: 20080310 # list of sources Source0: http://www.rhyolite.com/anti-spam/dcc/source/dcc-%{version}.tar.Z @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org