From 21596fe1bfed71ea7b5f8ff15e8699faf78f2354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20=C5=BDivkovi=C4=87?= <igor@linuxfromscratch.org>
Date: Tue, 7 Oct 2003 06:32:59 +0000
Subject: [PATCH] missing links - chapter 18

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@1337 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 basicnet/netprogs/cvs/cvs.ent                       |  8 ++++----
 basicnet/netprogs/inetutils/inetutils.ent           |  7 +++----
 basicnet/netprogs/ncftp/ncftp.ent                   |  6 +++---
 basicnet/netprogs/ncpfs/ncpfs.ent                   | 10 ++++------
 basicnet/netprogs/nfs-utils/nfs-utils.ent           | 10 +++++-----
 basicnet/netprogs/ntp/ntp.ent                       |  9 ++++-----
 basicnet/netprogs/portmap/portmap-intro.xml         |  2 +-
 basicnet/netprogs/portmap/portmap.ent               |  9 ++++-----
 basicnet/netprogs/tcpwrappers/tcpwrappers-intro.xml |  5 ++---
 basicnet/netprogs/tcpwrappers/tcpwrappers.ent       |  9 ++++-----
 basicnet/netprogs/wget/wget.ent                     |  8 ++++----
 11 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/basicnet/netprogs/cvs/cvs.ent b/basicnet/netprogs/cvs/cvs.ent
index 24eed56e4f..0efb548e79 100644
--- a/basicnet/netprogs/cvs/cvs.ent
+++ b/basicnet/netprogs/cvs/cvs.ent
@@ -1,11 +1,11 @@
 <!ENTITY cvs SYSTEM "../cvs.xml">
 <!ENTITY cvs-intro SYSTEM "cvs-intro.xml">
 <!ENTITY cvs-inst SYSTEM "cvs-inst.xml">
-<!ENTITY cvs-desc SYSTEM "cvs-desc.xml">
 <!ENTITY cvs-config SYSTEM "cvs-config.xml">
-<!ENTITY cvs-buildsize "14 MB">
+<!ENTITY cvs-desc SYSTEM "cvs-desc.xml">
 <!ENTITY cvs-version "1.11.6">
-<!ENTITY cvs-download-http "http://ccvs.cvshome.org/servlets/ProjectDownloadList">
-<!ENTITY cvs-download-ftp "ftp://ftp.cvshome.org/pub/release/stable/cvs-1.11.6/cvs-1.11.6.tar.bz2">
+<!ENTITY cvs-download-http "http://gd.tuwien.ac.at/opsys/linux/sf/s/scmlinux/cvs-&cvs-version;.tar.bz2">
+<!ENTITY cvs-download-ftp "ftp://ftp.cvshome.org/pub/release/stable/cvs-&cvs-version;/cvs-&cvs-version;.tar.bz2">
 <!ENTITY cvs-size "2.1 MB">
+<!ENTITY cvs-buildsize "14 MB">
 <!ENTITY cvs-time "0.37 SBU">
diff --git a/basicnet/netprogs/inetutils/inetutils.ent b/basicnet/netprogs/inetutils/inetutils.ent
index ca17e26fc6..8781f56819 100644
--- a/basicnet/netprogs/inetutils/inetutils.ent
+++ b/basicnet/netprogs/inetutils/inetutils.ent
@@ -3,10 +3,9 @@
 <!ENTITY inetutils-inst SYSTEM "inetutils-inst.xml">
 <!ENTITY inetutils-exp SYSTEM "inetutils-exp.xml">
 <!ENTITY inetutils-desc SYSTEM "inetutils-desc.xml">
-<!ENTITY inetutils-config SYSTEM "inetutils-config.xml">
-<!ENTITY inetutils-buildsize "2.3 MB">
 <!ENTITY inetutils-version "1.4.2">
-<!ENTITY inetutils-download-http "">
-<!ENTITY inetutils-download-ftp "ftp://ftp.gnu.org/gnu/inetutils/inetutils-1.4.2.tar.gz">
+<!ENTITY inetutils-download-http "http://gd.tuwien.ac.at/gnu/gnusrc/inetutils/inetutils-&inetutils-version;.tar.gz">
+<!ENTITY inetutils-download-ftp "ftp://ftp.gnu.org/gnu/inetutils/inetutils-&inetutils-version;.tar.gz">
 <!ENTITY inetutils-size "1018 KB">
+<!ENTITY inetutils-buildsize "2.3 MB">
 <!ENTITY inetutils-time "">
diff --git a/basicnet/netprogs/ncftp/ncftp.ent b/basicnet/netprogs/ncftp/ncftp.ent
index 1e940b1161..a85430df67 100644
--- a/basicnet/netprogs/ncftp/ncftp.ent
+++ b/basicnet/netprogs/ncftp/ncftp.ent
@@ -2,11 +2,11 @@
 <!ENTITY ncftp-intro SYSTEM "ncftp-intro.xml">
 <!ENTITY ncftp-inst SYSTEM "ncftp-inst.xml">
 <!ENTITY ncftp-exp SYSTEM "ncftp-exp.xml">
-<!ENTITY ncftp-desc SYSTEM "ncftp-desc.xml">
 <!ENTITY ncftp-config SYSTEM "ncftp-config.xml">
-<!ENTITY ncftp-buildsize "5.2 MB">
+<!ENTITY ncftp-desc SYSTEM "ncftp-desc.xml">
 <!ENTITY ncftp-version "3.1.6">
 <!ENTITY ncftp-download-http "">
-<!ENTITY ncftp-download-ftp "ftp://ftp.ncftp.com/ncftp/ncftp-3.1.6-src.tar.bz2">
+<!ENTITY ncftp-download-ftp "ftp://ftp.ncftp.com/ncftp/ncftp-&ncftp-version;-src.tar.bz2">
 <!ENTITY ncftp-size "396 KB">
+<!ENTITY ncftp-buildsize "5.2 MB">
 <!ENTITY ncftp-time "0.26 SBU">
diff --git a/basicnet/netprogs/ncpfs/ncpfs.ent b/basicnet/netprogs/ncpfs/ncpfs.ent
index 5987f5d292..9f42ae70fb 100644
--- a/basicnet/netprogs/ncpfs/ncpfs.ent
+++ b/basicnet/netprogs/ncpfs/ncpfs.ent
@@ -2,13 +2,11 @@
 <!ENTITY ncpfs-intro SYSTEM "ncpfs-intro.xml">
 <!ENTITY ncpfs-inst SYSTEM "ncpfs-inst.xml">
 <!ENTITY ncpfs-exp SYSTEM "ncpfs-exp.xml">
-<!ENTITY ncpfs-desc SYSTEM "ncpfs-desc.xml">
 <!ENTITY ncpfs-config SYSTEM "ncpfs-config.xml">
-<!ENTITY ncpfs-buildsize "40 MB">
+<!ENTITY ncpfs-desc SYSTEM "ncpfs-desc.xml">
 <!ENTITY ncpfs-version "2.2.3">
-<!ENTITY ncpfs-download-http 
-"http://platan.vc.cvut.cz/ftp/pub/linux/ncpfs/ncpfs-&ncpfs-version;.tar.gz">
-<!ENTITY ncpfs-download-ftp 
-"ftp://platan.vc.cvut.cz/pub/linux/ncpfs/ncpfs-&ncpfs-version;.tar.gz">
+<!ENTITY ncpfs-download-http "http://platan.vc.cvut.cz/ftp/pub/linux/ncpfs/ncpfs-&ncpfs-version;.tar.gz">
+<!ENTITY ncpfs-download-ftp "ftp://platan.vc.cvut.cz/pub/linux/ncpfs/ncpfs-&ncpfs-version;.tar.gz">
 <!ENTITY ncpfs-size "1.5 MB">
+<!ENTITY ncpfs-buildsize "40 MB">
 <!ENTITY ncpfs-time "">
diff --git a/basicnet/netprogs/nfs-utils/nfs-utils.ent b/basicnet/netprogs/nfs-utils/nfs-utils.ent
index 55ef645ae6..9a71579c48 100644
--- a/basicnet/netprogs/nfs-utils/nfs-utils.ent
+++ b/basicnet/netprogs/nfs-utils/nfs-utils.ent
@@ -2,11 +2,11 @@
 <!ENTITY nfs-utils-intro SYSTEM "nfs-utils-intro.xml">
 <!ENTITY nfs-utils-inst SYSTEM "nfs-utils-inst.xml">
 <!ENTITY nfs-utils-exp SYSTEM "nfs-utils-exp.xml">
-<!ENTITY nfs-utils-desc SYSTEM "nfs-utils-desc.xml">
 <!ENTITY nfs-utils-config SYSTEM "nfs-utils-config.xml">
-<!ENTITY nfs-utils-buildsize "">
+<!ENTITY nfs-utils-desc SYSTEM "nfs-utils-desc.xml">
 <!ENTITY nfs-utils-version "1.0.3">
-<!ENTITY nfs-utils-download-http
-"http://unc.dl.sourceforge.net/sourceforge/nfs/nfs-utils-&nfs-utils-version;.tar.gz">
-<!ENTITY nfs-utils-download-ftp "">
+<!ENTITY nfs-utils-download-http "http://unc.dl.sourceforge.net/sourceforge/nfs/nfs-utils-&nfs-utils-version;.tar.gz">
+<!ENTITY nfs-utils-download-ftp "ftp://ftp.kernel.org/pub/linux/utils/nfs/nfs-utils-&nfs-utils-version;.tar.gz">
 <!ENTITY nfs-utils-size "237 KB">
+<!ENTITY nfs-utils-buildsize "">
+<!ENTITY nfs-utils-time "">
diff --git a/basicnet/netprogs/ntp/ntp.ent b/basicnet/netprogs/ntp/ntp.ent
index 5b6dd20e97..25a47ef8a8 100644
--- a/basicnet/netprogs/ntp/ntp.ent
+++ b/basicnet/netprogs/ntp/ntp.ent
@@ -1,12 +1,11 @@
 <!ENTITY ntp SYSTEM "../ntp.xml">
 <!ENTITY ntp-intro SYSTEM "ntp-intro.xml">
 <!ENTITY ntp-inst SYSTEM "ntp-inst.xml">
-<!ENTITY ntp-exp SYSTEM "ntp-exp.xml">
-<!ENTITY ntp-desc SYSTEM "ntp-desc.xml">
 <!ENTITY ntp-config SYSTEM "ntp-config.xml">
-<!ENTITY ntp-buildsize "13 MB">
+<!ENTITY ntp-desc SYSTEM "ntp-desc.xml">
 <!ENTITY ntp-version "4.1.2">
-<!ENTITY ntp-download-http "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.1.2.tar.gz">
-<!ENTITY ntp-download-ftp "ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-4.1.2.tar.gz">
+<!ENTITY ntp-download-http "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-&ntp-version;.tar.gz">
+<!ENTITY ntp-download-ftp "ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-&ntp-version;.tar.gz">
 <!ENTITY ntp-size "2.2 MB">
+<!ENTITY ntp-buildsize "13 MB">
 <!ENTITY ntp-time "">
diff --git a/basicnet/netprogs/portmap/portmap-intro.xml b/basicnet/netprogs/portmap/portmap-intro.xml
index 3dd98031e8..4bb504727d 100644
--- a/basicnet/netprogs/portmap/portmap-intro.xml
+++ b/basicnet/netprogs/portmap/portmap-intro.xml
@@ -23,7 +23,7 @@ url="&portmap-download-ftp;"/></para></listitem>
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
 <listitem><para>Required patch (HTTP): <ulink
-url="&portmap-patch-http;"/></para></listitem>
+url="http://files.ichilton.co.uk/nfs/portmap_5-1.diff.gz"/></para></listitem>
 <listitem><para>Required patch (HTTP): <ulink url="&hfile-root;/portmap_5-errno.patch"/></para></listitem></itemizedlist>
 </sect3>
 
diff --git a/basicnet/netprogs/portmap/portmap.ent b/basicnet/netprogs/portmap/portmap.ent
index 841b08214b..1810ab03aa 100644
--- a/basicnet/netprogs/portmap/portmap.ent
+++ b/basicnet/netprogs/portmap/portmap.ent
@@ -2,12 +2,11 @@
 <!ENTITY portmap-intro SYSTEM "portmap-intro.xml">
 <!ENTITY portmap-inst SYSTEM "portmap-inst.xml">
 <!ENTITY portmap-exp SYSTEM "portmap-exp.xml">
-<!ENTITY portmap-desc SYSTEM "portmap-desc.xml">
 <!ENTITY portmap-config SYSTEM "portmap-config.xml">
-<!ENTITY portmap-buildsize "250 KB">
+<!ENTITY portmap-desc SYSTEM "portmap-desc.xml">
 <!ENTITY portmap-version "5">
-<!ENTITY portmap-download-http "http://files.ichilton.co.uk/nfs/portmap_5.orig.tar.gz">
-<!ENTITY portmap-download-ftp "">
-<!ENTITY portmap-patch-http "http://files.ichilton.co.uk/nfs/portmap_5-1.diff.gz">
+<!ENTITY portmap-download-http "http://files.ichilton.co.uk/nfs/portmap_&portmap-version;.orig.tar.gz">
+<!ENTITY portmap-download-ftp "ftp://ftp.cvut.cz/adamantix/dists/adamantix-1.0.1/main/source/net/portmap_&portmap-version;.orig.tar.gz">
 <!ENTITY portmap-size "20 KB">
+<!ENTITY portmap-buildsize "250 KB">
 <!ENTITY portmap-time "0.03 SBU">
diff --git a/basicnet/netprogs/tcpwrappers/tcpwrappers-intro.xml b/basicnet/netprogs/tcpwrappers/tcpwrappers-intro.xml
index 048547f287..f219e8db51 100644
--- a/basicnet/netprogs/tcpwrappers/tcpwrappers-intro.xml
+++ b/basicnet/netprogs/tcpwrappers/tcpwrappers-intro.xml
@@ -19,9 +19,8 @@ url="&tcpwrappers-download-ftp;"/></para></listitem>
 
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&tcpwrappers-patch-http;"/></para></listitem></itemizedlist>
+<listitem><para>Required patch:<ulink
+url="http://files.ichilton.co.uk/nfs/tcp_wrappers_7.6.diff.gz"/></para></listitem></itemizedlist>
 </sect3>
 
-
 </sect2>
diff --git a/basicnet/netprogs/tcpwrappers/tcpwrappers.ent b/basicnet/netprogs/tcpwrappers/tcpwrappers.ent
index ee180a4a3f..92bbca2a8c 100644
--- a/basicnet/netprogs/tcpwrappers/tcpwrappers.ent
+++ b/basicnet/netprogs/tcpwrappers/tcpwrappers.ent
@@ -2,12 +2,11 @@
 <!ENTITY tcpwrappers-intro SYSTEM "tcpwrappers-intro.xml">
 <!ENTITY tcpwrappers-inst SYSTEM "tcpwrappers-inst.xml">
 <!ENTITY tcpwrappers-exp SYSTEM "tcpwrappers-exp.xml">
-<!ENTITY tcpwrappers-desc SYSTEM "tcpwrappers-desc.xml">
 <!ENTITY tcpwrappers-config SYSTEM "tcpwrappers-config.xml">
-<!ENTITY tcpwrappers-buildsize "720 KB">
+<!ENTITY tcpwrappers-desc SYSTEM "tcpwrappers-desc.xml">
 <!ENTITY tcpwrappers-version "7.6">
-<!ENTITY tcpwrappers-download-http "http://files.ichilton.co.uk/nfs/tcp_wrappers_7.6.tar.gz">
-<!ENTITY tcpwrappers-download-ftp "">
-<!ENTITY tcpwrappers-patch-http "http://files.ichilton.co.uk/nfs/tcp_wrappers_7.6.diff.gz">
+<!ENTITY tcpwrappers-download-http "http://files.ichilton.co.uk/nfs/tcp_wrappers_&tcpwrappers-version;.tar.gz">
+<!ENTITY tcpwrappers-download-ftp "ftp://ftp.zcu.cz/pub/security/tue/tcp_wrappers_&tcpwrappers-version;.tar.gz">
 <!ENTITY tcpwrappers-size "100 KB">
+<!ENTITY tcpwrappers-buildsize "720 KB">
 <!ENTITY tcpwrappers-time "0.16 SBU">
diff --git a/basicnet/netprogs/wget/wget.ent b/basicnet/netprogs/wget/wget.ent
index 30b059b0fc..22e9dc8a15 100644
--- a/basicnet/netprogs/wget/wget.ent
+++ b/basicnet/netprogs/wget/wget.ent
@@ -2,11 +2,11 @@
 <!ENTITY wget-intro SYSTEM "wget-intro.xml">
 <!ENTITY wget-inst SYSTEM "wget-inst.xml">
 <!ENTITY wget-exp SYSTEM "wget-exp.xml">
-<!ENTITY wget-desc SYSTEM "wget-desc.xml">
 <!ENTITY wget-config SYSTEM "wget-config.xml">
-<!ENTITY wget-buildsize "5.4 MB">
+<!ENTITY wget-desc SYSTEM "wget-desc.xml">
 <!ENTITY wget-version "1.8.2">
-<!ENTITY wget-download-http "http://ftp.gnu.org/gnu/wget/wget-1.8.2.tar.gz">
-<!ENTITY wget-download-ftp "ftp://ftp.gnu.org/gnu/wget/wget-1.8.2.tar.gz">
+<!ENTITY wget-download-http "http://ftp.gnu.org/gnu/wget/wget-&wget-version;.tar.gz">
+<!ENTITY wget-download-ftp "ftp://ftp.gnu.org/gnu/wget/wget-&wget-version;.tar.gz">
 <!ENTITY wget-size "1.1 MB">
+<!ENTITY wget-buildsize "5.4 MB">
 <!ENTITY wget-time "0.23 SBU">