From 1e9bd5362dfd22b5802fac6596467b08635ad2e6 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sat, 6 May 2006 22:18:13 +0000
Subject: [PATCH] Update to dhcp-3.0.4

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6012 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        | 8 ++++----
 introduction/welcome/changelog.xml | 5 ++++-
 server/other/dhcp.xml              | 6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/general.ent b/general.ent
index 6dfeff902a..58938a36c7 100644
--- a/general.ent
+++ b/general.ent
@@ -1,4 +1,4 @@
-<!ENTITY day          "05">                   <!-- Always 2 digits -->
+<!ENTITY day          "06">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -258,7 +258,7 @@
 <!ENTITY wvdial-version               "1.54.0">
 
 <!-- Chapter 14 -->
-<!ENTITY dhcp-version                 "3.0.3">
+<!ENTITY dhcp-version                 "3.0.4">
 <!ENTITY dhcpcd-version               "2.0.5">
 
 <!-- Chapter 15 -->
@@ -526,10 +526,10 @@
 
 <!-- Part XI -->
 <!-- Chapter 38 -->
-<!ENTITY alsa-version                 "1.0.9">
+<!ENTITY alsa-version                 "1.0.11">
 <!ENTITY alsa-lib-version             "&alsa-version;">
 <!ENTITY alsa-plugins-version         "&alsa-version;">
-<!ENTITY alsa-utils-version           "&alsa-version;a">
+<!ENTITY alsa-utils-version           "&alsa-version;">
 <!ENTITY alsa-tools-version           "&alsa-version;">
 <!ENTITY alsa-firmware-version        "&alsa-version;">
 <!ENTITY alsa-oss-version             "&alsa-version;">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 8cfa79a47d..090ba6212c 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -42,8 +42,11 @@
 -->
 
     <listitem>
-      <para>May 5th, 2006</para>
+      <para>May 6th, 2006</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Updated to dhcp-3.0.4.</para>
+        </listitem>
         <listitem>
           <para>[dnicholson] - Fixed EsounD installation to note that the
           documentation can only be installed with DocBook-utils.  Thanks
diff --git a/server/other/dhcp.xml b/server/other/dhcp.xml
index e4b2ed3631..3d72533f9c 100644
--- a/server/other/dhcp.xml
+++ b/server/other/dhcp.xml
@@ -18,8 +18,8 @@
 
   <!ENTITY dhcp-download-http "http://gd.tuwien.ac.at/infosys/servers/isc/dhcp/dhcp-&dhcp-version;.tar.gz">
   <!ENTITY dhcp-download-ftp "ftp://ftp.isc.org/isc/dhcp/dhcp-&dhcp-version;.tar.gz">
-  <!ENTITY dhcp-md5sum "f91416a0b8ed3fd0601688cf0b7df58f">
-  <!ENTITY dhcp-size "856 KB">
+  <!ENTITY dhcp-md5sum "004ef935fd54b8046b16bdde31a9e151">
+  <!ENTITY dhcp-size "868 KB">
   <!ENTITY dhcp-buildsize "21.3 MB">
   <!ENTITY dhcp-time "0.1 SBU">
 ]>
@@ -112,7 +112,7 @@
     <para>If you chose not to install net-tools, apply the
     iproute2 patch:</para>
 
-<screen><userinput>patch -Np1 -i ../dhcp-&dhcp-version;-iproute2-3.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../dhcp-&dhcp-version;-iproute2-1.patch</userinput></screen>
 
     <para>Install <application>DHCP</application> by running
     the following commands:</para>