Author: randy Date: 2005-05-03 07:59:48 -0600 (Tue, 03 May 2005) New Revision: 3945
Added: trunk/patches/cvs-1.11.20-zlib-1.patch Removed: trunk/patches/cvs-1.11.18-zlib-1.patch Modified: trunk/BOOK/basicnet/netprogs/cvs.xml trunk/BOOK/general.ent trunk/BOOK/introduction/welcome/changelog.xml Log: Updated to CVS-1.11.20 Modified: trunk/BOOK/basicnet/netprogs/cvs.xml =================================================================== --- trunk/BOOK/basicnet/netprogs/cvs.xml 2005-05-02 19:43:00 UTC (rev 3944) +++ trunk/BOOK/basicnet/netprogs/cvs.xml 2005-05-03 13:59:48 UTC (rev 3945) @@ -4,12 +4,12 @@ <!ENTITY % general-entities SYSTEM "../../general.ent"> %general-entities; - <!ENTITY cvs-download-http "https://ccvs.cvshome.org/files/documents/19/534/cvs-&cvs-version;.tar.bz2";> + <!ENTITY cvs-download-http "https://ccvs.cvshome.org/files/documents/19/861/cvs-&cvs-version;.tar.bz2";> <!ENTITY cvs-download-ftp " "> - <!ENTITY cvs-md5sum "1dd5c16064906617e4358738bfe59b66"> - <!ENTITY cvs-size "2.3 MB"> - <!ENTITY cvs-buildsize "20 MB"> - <!ENTITY cvs-time "0.31 SBU"> + <!ENTITY cvs-md5sum "9e215c0ee3bb7dfb76515d7cd81a3742"> + <!ENTITY cvs-size "2.4 MB"> + <!ENTITY cvs-buildsize "22 MB"> + <!ENTITY cvs-time "0.3 SBU (additional 19.1 SBU to run the test suite)"> ]> <sect1 id="cvs" xreflabel="CVS-&cvs-version;"> @@ -68,9 +68,11 @@ <bridgehead renderas="sect3">CVS Dependencies</bridgehead> <bridgehead renderas="sect4">Optional</bridgehead> - <para><xref linkend="gdbm"/>, + <para><xref linkend="gdbm"/>, + <xref linkend="tcsh"/>, <ulink url="http://www.pdc.kth.se/kth-krb/";>krb4</ulink>, - <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>, + <xref linkend="mitkrb"/> or <xref linkend="heimdal"/> + (for the GSSAPI libraries), <xref linkend="gs"/> or <xref linkend="espgs"/>, <ulink url="../server/mail.html">MTA</ulink> and <xref linkend="vim"/></para> @@ -92,9 +94,16 @@ the following commands:</para> <screen><userinput>./configure --prefix=/usr && -make && -make install</userinput></screen> +make</userinput></screen> + <para>To test the results, issue: <command>make check</command>.</para> + + <para>Now, as the <systemitem class="username">root</systemitem> user:</para> + +<screen role='root'><userinput>make install && +install -v -m755 -d /usr/share/doc/cvs-&cvs-version; && +install -v -m644 doc/cvs{,client}.ps /usr/share/doc/cvs-&cvs-version;</userinput></screen> + </sect2> <sect2 role="configuration"> @@ -152,7 +161,7 @@ <seglistitem> <seg>cvs, cvsbug, and rcs2log</seg> <seg>None</seg> - <seg>None</seg> + <seg>/usr/share/cvs and /usr/share/doc/cvs-&cvs-version;</seg> </seglistitem> </segmentedlist> @@ -185,13 +194,13 @@ <varlistentry id="rcs2log"> <term><command>rcs2log</command></term> <listitem> - <para>RCS to Change Log generator.</para> + <para>is a symlink to the contributed RCS to Change Log + generator.</para> <indexterm zone="cvs rcs2log"> <primary sortas="b-rcs2log">rcs2log</primary> </indexterm> </listitem> </varlistentry> - </variablelist> </sect2> Modified: trunk/BOOK/general.ent =================================================================== --- trunk/BOOK/general.ent 2005-05-02 19:43:00 UTC (rev 3944) +++ trunk/BOOK/general.ent 2005-05-03 13:59:48 UTC (rev 3945) @@ -1,8 +1,8 @@ -<!ENTITY day "02"> +<!ENTITY day "03"> <!ENTITY month "05"> <!ENTITY year "2005"> <!ENTITY version "svn-&year;&month;&day;"> -<!ENTITY releasedate "May &day;nd, &year;"> +<!ENTITY releasedate "May &day;rd, &year;"> <!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP --> <!ENTITY blfs-version "cvs"> <!-- cvs|[release #] --> <!ENTITY lfs-version "development"> <!-- version|stable|testing|unstable|development] --> @@ -211,7 +211,7 @@ <!ENTITY ncftp-version "3.1.7"> <!ENTITY openssh-version "4.0p1"> <!ENTITY rsync-version "2.6.3"> -<!ENTITY cvs-version "1.11.18"> +<!ENTITY cvs-version "1.11.20"> <!ENTITY subversion-version "1.1.4"> <!ENTITY wget-version "1.9.1"> <!ENTITY tcpwrappers-version "7.6"> Modified: trunk/BOOK/introduction/welcome/changelog.xml =================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml 2005-05-02 19:43:00 UTC (rev 3944) +++ trunk/BOOK/introduction/welcome/changelog.xml 2005-05-03 13:59:48 UTC (rev 3945) @@ -22,6 +22,9 @@ <itemizedlist> +<listitem><para>May 3rd, 2005 [randy]: Updated to +CVS-1.11.20.</para></listitem> + <listitem><para>May 2nd, 2005 [randy]: Updated to xine Libraries-1.0.1.</para></listitem> Deleted: trunk/patches/cvs-1.11.18-zlib-1.patch =================================================================== --- trunk/patches/cvs-1.11.18-zlib-1.patch 2005-05-02 19:43:00 UTC (rev 3944) +++ trunk/patches/cvs-1.11.18-zlib-1.patch 2005-05-03 13:59:48 UTC (rev 3945) @@ -1,53 +0,0 @@ -Submitted By: Matthew Burgess <[EMAIL PROTECTED]> -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.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_SCRIPTS = cvsbug - - # The cvs executable -@@ -278,7 +278,7 @@ - cvs_LDADD = \ - ../diff/libdiff.a \ - ../lib/libcvs.a \ -- ../zlib/libz.a -+ -lz - - - # extra clean targets -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) - --#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. */ Copied: trunk/patches/cvs-1.11.20-zlib-1.patch (from rev 3936, trunk/patches/cvs-1.11.18-zlib-1.patch) -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
