cvs commit: patches/diffutils diffutils-2.8.4-sdiff-1.patch diffutils-2.8.4-tabsize-1.patch diffutils-2.8.4-typo-1.patch

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Sep 9 14:01:52 PDT 2003


jim         03/09/09 15:01:52

  Added:       diffutils diffutils-2.8.4-sdiff-1.patch
                        diffutils-2.8.4-tabsize-1.patch
                        diffutils-2.8.4-typo-1.patch
  Log:
  added diffutils 2.8.4
  
  Revision  Changes    Path
  1.1                  patches/diffutils/diffutils-2.8.4-sdiff-1.patch
  
  Index: diffutils-2.8.4-sdiff-1.patch
  ===================================================================
  Submitted By: Jim Gifford (patches at jg555 dot com)
  Date: 09-09-2003
  Initial Package Version: diffutils 2.8.4
  Origin: converter at dalnet-perl.org Gentoo Bug #11728
  Description: Removes waitpid() call after pclose() on piped diff stream
  
  diff -Naur diffutils-2.8.4.orig/src/sdiff.c diffutils-2.8.4/src/sdiff.c
  --- diffutils-2.8.4.orig/src/sdiff.c	2002-06-17 05:55:42.000000000 +0000
  +++ diffutils-2.8.4/src/sdiff.c	2003-09-09 20:25:53.000000000 +0000
  @@ -692,7 +692,7 @@
         ck_fclose (out);
   
         {
  -	int wstatus;
  +	int wstatus = 0;
   	int werrno = 0;
   
   #if ! (HAVE_WORKING_FORK || HAVE_WORKING_VFORK)
  @@ -701,11 +701,6 @@
   	  werrno = errno;
   #else
   	ck_fclose (diffout);
  -	while (waitpid (diffpid, &wstatus, 0) < 0)
  -	  if (errno == EINTR)
  -	    checksigs ();
  -	  else
  -	    perror_fatal ("waitpid");
   	diffpid = 0;
   #endif
   
  
  
  
  1.1                  patches/diffutils/diffutils-2.8.4-tabsize-1.patch
  
  Index: diffutils-2.8.4-tabsize-1.patch
  ===================================================================
  Submitted By: Jim Gifford (patches at jg555 dot com)
  Date: 09-09-2003
  Initial Package Version: diffutils 2.8.4
  Origin: taviso at gentoo.org Gentoo Bug # 24238
  Description: --tabsize option, undocumented in diff but used in sdiff, makes
  	     diff dump core
  
  diff -Naur diffutils-2.8.4.orig/src/diff.c diffutils-2.8.4/src/diff.c
  --- diffutils-2.8.4.orig/src/diff.c	2002-06-17 05:55:42.000000000 +0000
  +++ diffutils-2.8.4/src/diff.c	2003-09-09 20:29:43.000000000 +0000
  @@ -234,7 +234,7 @@
     {"starting-file", 1, 0, 'S'},
     {"strip-trailing-cr", 0, 0, STRIP_TRAILING_CR_OPTION},
     {"suppress-common-lines", 0, 0, SUPPRESS_COMMON_LINES_OPTION},
  -  {"tabsize", 0, 0, TABSIZE_OPTION},
  +  {"tabsize", 1, 0, TABSIZE_OPTION},
     {"text", 0, 0, 'a'},
     {"to-file", 1, 0, TO_FILE_OPTION},
     {"unchanged-group-format", 1, 0, UNCHANGED_GROUP_FORMAT_OPTION},
  
  
  
  1.1                  patches/diffutils/diffutils-2.8.4-typo-1.patch
  
  Index: diffutils-2.8.4-typo-1.patch
  ===================================================================
  Submitted By: Jim Gifford (patches at jg555 dot com)
  Date: 09-09-2003
  Initial Package Version: diffutils 2.8.4
  Origin: azarah at gentoo.org Gentoo Bug # 8934
  Description: Build fails with make -j5 or greater on pentium4.  This is because
  	     the jobs creating the opjects, which depend on paths.h is sheduled
  	     at the same time paths.h is generated.
  
  diff -Naur diffutils-2.8.4.orig/src/Makefile.am diffutils-2.8.4/src/Makefile.am
  --- diffutils-2.8.4.orig/src/Makefile.am	2002-06-17 05:55:42.000000000 +0000
  +++ diffutils-2.8.4/src/Makefile.am	2003-09-09 20:19:18.000000000 +0000
  @@ -37,7 +37,7 @@
   
   MOSTLYCLEANFILES = paths.h
   
  -cmp.$(OBJEXT) diff3.$(OBJECT) diff.$(OBJECT) sdiff.$(OBJECT): paths.h
  +cmp.$(OBJEXT) diff3.$(OBJEXT) diff.$(OBJEXT) sdiff.$(OBJEXT): paths.h
   paths.h:
   	(echo '#define DEFAULT_DIFF_PROGRAM "$(bindir)/'`echo diff|sed '$(transform)'`'"' && \
   	 echo '#define LOCALEDIR "$(localedir)"') >$@
  diff -Naur diffutils-2.8.4.orig/src/Makefile.in diffutils-2.8.4/src/Makefile.in
  --- diffutils-2.8.4.orig/src/Makefile.in	2002-06-28 07:04:20.000000000 +0000
  +++ diffutils-2.8.4/src/Makefile.in	2003-09-09 20:19:18.000000000 +0000
  @@ -410,7 +410,7 @@
   	uninstall-binPROGRAMS uninstall-info-am
   
   
  -cmp.$(OBJEXT) diff3.$(OBJECT) diff.$(OBJECT) sdiff.$(OBJECT): paths.h
  +cmp.$(OBJEXT) diff3.$(OBJEXT) diff.$(OBJEXT) sdiff.$(OBJEXT): paths.h
   paths.h:
   	(echo '#define DEFAULT_DIFF_PROGRAM "$(bindir)/'`echo diff|sed '$(transform)'`'"' && \
   	 echo '#define LOCALEDIR "$(localedir)"') >$@
  
  
  



More information about the patches mailing list