r2980 - trunk/patches

igor at linuxfromscratch.org igor at linuxfromscratch.org
Fri Nov 19 22:11:08 PST 2004


Author: igor
Date: 2004-11-19 23:11:07 -0700 (Fri, 19 Nov 2004)
New Revision: 2980

Modified:
   trunk/patches/cvs-1.11.18-zlib-1.patch
Log:
Updated CVS zlib patch.

Modified: trunk/patches/cvs-1.11.18-zlib-1.patch
===================================================================
--- trunk/patches/cvs-1.11.18-zlib-1.patch	2004-11-20 05:22:07 UTC (rev 2979)
+++ trunk/patches/cvs-1.11.18-zlib-1.patch	2004-11-20 06:11:07 UTC (rev 2980)
@@ -1,27 +1,33 @@
-Submitted By:            BLFS Book <blfs-book at linuxfromscratch.org>
-Date:                    2003-10-04
+Submitted By:            Matthew Burgess <matthew at linuxfromscratch.org>
+Date:                    2004-11-12
 Initial Package Version: 1.11.2
 Upstream Status:         Not submitted
 Origin:                  BLFS Dev Post
 Description:             Links against system zlib instead of the
                          internal zlib.
 
-$LastChangedBy$
-$Date$
-
-diff -Naur cvs-1.11.17-orig/src/Makefile.in cvs-1.11.17/src/Makefile.in
---- cvs-1.11.17-orig/src/Makefile.in	2004-06-09 14:46:19.000000000 +0000
-+++ cvs-1.11.17/src/Makefile.in	2004-10-07 19:25:52.804524123 +0000
-@@ -146,7 +146,7 @@
+diff -Naur cvs-1.11.18.orig/src/Makefile.in cvs-1.11.18/src/Makefile.in
+--- cvs-1.11.18.orig/src/Makefile.in	2004-11-11 18:17:20.000000000 +0000
++++ cvs-1.11.18/src/Makefile.in	2004-11-12 19:58:14.962293296 +0000
+@@ -86,7 +86,7 @@
+ 	version.$(OBJEXT) vers_ts.$(OBJEXT) watch.$(OBJEXT) \
+ 	wrapper.$(OBJEXT) zlib.$(OBJEXT)
+ cvs_OBJECTS = $(am_cvs_OBJECTS)
+-cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a
++cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -199,7 +199,7 @@
  # some namespace hackery going on that maybe shouldn't be.  Long term fix is to
  # try and remove naming ocnflicts and fix Automake to allow particular includes
  # to be attached only to particular object files.  Short term fix is either or.
 -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
 +INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
- 
- bin_PROGRAMS = cvs
  bin_SCRIPTS = cvsbug
-@@ -228,7 +228,7 @@
+ 
+ # The cvs executable
+@@ -278,7 +278,7 @@
  cvs_LDADD = \
  	../diff/libdiff.a \
  	../lib/libcvs.a \
@@ -30,18 +36,9 @@
  
  
  # extra clean targets
-@@ -272,7 +272,7 @@
- 	vers_ts.$(OBJEXT) watch.$(OBJEXT) wrapper.$(OBJEXT) \
- 	zlib.$(OBJEXT)
- cvs_OBJECTS = $(am_cvs_OBJECTS)
--cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a
-+cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a
- cvs_LDFLAGS =
- SCRIPTS = $(bin_SCRIPTS)
- 
-diff -Naur cvs-1.11.17-orig/src/zlib.c cvs-1.11.17/src/zlib.c
---- cvs-1.11.17-orig/src/zlib.c	2004-03-19 19:18:57.000000000 +0000
-+++ cvs-1.11.17/src/zlib.c	2004-10-07 19:25:52.806523816 +0000
+diff -Naur cvs-1.11.18.orig/src/zlib.c cvs-1.11.18/src/zlib.c
+--- cvs-1.11.18.orig/src/zlib.c	2004-03-19 19:18:57.000000000 +0000
++++ cvs-1.11.18/src/zlib.c	2004-11-12 19:58:55.531125896 +0000
 @@ -22,7 +22,7 @@
  
  #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)




More information about the blfs-book mailing list