r2970 - in trunk: BOOK/basicnet/netprogs patches

igor at linuxfromscratch.org igor at linuxfromscratch.org
Fri Nov 19 00:51:33 PST 2004


Author: igor
Date: 2004-11-19 01:51:31 -0700 (Fri, 19 Nov 2004)
New Revision: 2970

Added:
   trunk/patches/cvs-1.11.18-zlib-1.patch
Removed:
   trunk/patches/cvs-1.11.18-zlib-2.patch
Modified:
   trunk/BOOK/basicnet/netprogs/cvs.xml
Log:
Fixed CVS zlib patch version.

Modified: trunk/BOOK/basicnet/netprogs/cvs.xml
===================================================================
--- trunk/BOOK/basicnet/netprogs/cvs.xml	2004-11-19 08:40:48 UTC (rev 2969)
+++ trunk/BOOK/basicnet/netprogs/cvs.xml	2004-11-19 08:51:31 UTC (rev 2970)
@@ -41,7 +41,7 @@
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
 <listitem><para>Recommended patch: <ulink
-url="&patch-root;/cvs-&cvs-version;-zlib-2.patch"/>
+url="&patch-root;/cvs-&cvs-version;-zlib-1.patch"/>
 </para></listitem>
 </itemizedlist></sect3>
 
@@ -68,7 +68,7 @@
 library. If you want to modify CVS to use the newest system shared zlib
 library apply the following patch:</para>
 
-<screen><userinput><command>patch -Np1 -i ../cvs-&cvs-version;-zlib-2.patch</command></userinput></screen>
+<screen><userinput><command>patch -Np1 -i ../cvs-&cvs-version;-zlib-1.patch</command></userinput></screen>
 
 <para>Install <application><acronym>cvs</acronym></application> by running the following commands:</para>
 

Copied: trunk/patches/cvs-1.11.18-zlib-1.patch (from rev 2969, trunk/patches/cvs-1.11.18-zlib-2.patch)

Deleted: trunk/patches/cvs-1.11.18-zlib-2.patch
===================================================================
--- trunk/patches/cvs-1.11.18-zlib-2.patch	2004-11-19 08:40:48 UTC (rev 2969)
+++ trunk/patches/cvs-1.11.18-zlib-2.patch	2004-11-19 08:51:31 UTC (rev 2970)
@@ -1,53 +0,0 @@
-Submitted By:            BLFS Book <blfs-book at linuxfromscratch.org>
-Date:                    2003-10-04
-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 @@
- # 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 @@
- cvs_LDADD = \
- 	../diff/libdiff.a \
- 	../lib/libcvs.a \
--	../zlib/libz.a
-+	-lz
- 
- 
- # 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
-@@ -22,7 +22,7 @@
- 
- #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
- 
--#include "zlib.h"
-+#include <zlib.h>
- 
- /* OS/2 doesn't have EIO.  FIXME: this whole notion of turning
-    a different error into EIO strikes me as pretty dubious.  */




More information about the blfs-book mailing list