From 40b0aa74242f77260c81f70059f73c0e1dda1e68 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 16 Jul 2015 01:23:03 +0000
Subject: [PATCH] Update to httpd-2.4.16. Update to links-2.10.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16251 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml |  8 ++++++++
 networking/textweb/links.xml       | 20 ++++++++++----------
 packages.ent                       |  4 ++--
 server/major/apache.xml            | 12 +++---------
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index dce505721b..f9d0de79ce 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,14 @@
     <listitem>
       <para>July 15th, 2015</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to httpd-2.4.16. Fixes
+          <ulink url="&blfs-ticket-root;6723">#6723</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to links-2.10. Fixes
+          <ulink url="&blfs-ticket-root;6714">#6714</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to mesa-10.6.2. Fixes
           <ulink url="&blfs-ticket-root;6714">#6714</ulink>.</para>
diff --git a/networking/textweb/links.xml b/networking/textweb/links.xml
index 56170bc661..41406fbb6e 100644
--- a/networking/textweb/links.xml
+++ b/networking/textweb/links.xml
@@ -4,15 +4,15 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY links-download-http "http://links.twibright.com/download/links-&Links-version;.tar.bz2">
-  <!ENTITY links-download-ftp  "&gentoo-ftp-repo;/links-&Links-version;.tar.bz2">
-  <!ENTITY links-md5sum        "b0b1a0110d0845cc97da7f6f7c5e007c">
-  <!ENTITY links-size          "3.9 MB">
-  <!ENTITY links-buildsize     "31 MB">
+  <!ENTITY links-download-http "http://links.twibright.com/download/links-&links-version;.tar.bz2">
+  <!ENTITY links-download-ftp  "&gentoo-ftp-repo;/links-&links-version;.tar.bz2">
+  <!ENTITY links-md5sum        "beb7dc2571533874045bcf5160d2d0a3">
+  <!ENTITY links-size          "5.0 MB">
+  <!ENTITY links-buildsize     "36 MB">
   <!ENTITY links-time          "0.2 SBU">
 ]>
 
-<sect1 id="Links" xreflabel="Links-&Links-version;">
+<sect1 id="Links" xreflabel="Links-&links-version;">
   <?dbhtml filename="links.html"?>
 
   <sect1info>
@@ -20,7 +20,7 @@
     <date>$Date$</date>
   </sect1info>
 
-  <title>Links-&Links-version;</title>
+  <title>Links-&links-version;</title>
 
   <indexterm zone="Links">
     <primary sortas="a-Links">Links</primary>
@@ -95,9 +95,9 @@ make</userinput></screen>
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role='root'><userinput>make install &amp;&amp;
-install -v -d -m755 /usr/share/doc/links-&Links-version; &amp;&amp;
+install -v -d -m755 /usr/share/doc/links-&links-version; &amp;&amp;
 install -v -m644 doc/links_cal/* KEYS BRAILLE_HOWTO \
-    /usr/share/doc/links-&Links-version;</userinput></screen>
+    /usr/share/doc/links-&links-version;</userinput></screen>
 
   </sect2>
 
@@ -146,7 +146,7 @@ install -v -m644 doc/links_cal/* KEYS BRAILLE_HOWTO \
       <seglistitem>
         <seg>links</seg>
         <seg>None</seg>
-        <seg>/usr/share/doc/links-&Links-version;</seg>
+        <seg>/usr/share/doc/links-&links-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/packages.ent b/packages.ent
index 59a6994afc..628aec4bc2 100644
--- a/packages.ent
+++ b/packages.ent
@@ -390,7 +390,7 @@
 <!ENTITY serf-version                 "1.3.8">
 
 <!-- Chapter 18 -->
-<!ENTITY Links-version                "2.9">
+<!ENTITY links-version                "2.10">
 <!ENTITY lynx-version                 "2.8.8rel.2">
 <!ENTITY w3m-version                  "0.5.3">
 
@@ -403,7 +403,7 @@
 
 <!-- Part V -->
 <!-- Chapter 20 -->
-<!ENTITY apache-version               "2.4.12">
+<!ENTITY apache-version               "2.4.16">
 <!ENTITY proftpd-version              "1.3.5a">
 <!ENTITY vsftpd-version               "3.0.2">
 
diff --git a/server/major/apache.xml b/server/major/apache.xml
index 875135451b..13381bc630 100644
--- a/server/major/apache.xml
+++ b/server/major/apache.xml
@@ -7,10 +7,10 @@
   <!ENTITY apache-download-http
            "https://archive.apache.org/dist/httpd/httpd-&apache-version;.tar.bz2">
   <!ENTITY apache-download-ftp  " ">
-  <!ENTITY apache-md5sum        "b8dc8367a57a8d548a9b4ce16d264a13">
+  <!ENTITY apache-md5sum        "2b19cd338fd526dd5a63c57b1e9bfee2">
   <!ENTITY apache-size          "4.9 MB">
-  <!ENTITY apache-buildsize     "93 MB">
-  <!ENTITY apache-time          "0.8 SBU">
+  <!ENTITY apache-buildsize     "73 MB">
+  <!ENTITY apache-time          "0.6 SBU">
 ]>
 
 <sect1 id="apache" xreflabel="Apache-&apache-version;">
@@ -135,7 +135,6 @@ useradd -c "Apache Server" -d /srv/www -g apache \
 
 <screen><userinput>patch -Np1 -i ../httpd-&apache-version;-blfs_layout-1.patch           &amp;&amp;
 
-sed 's/ldump_writer, &amp;b/&amp;, NULL/' -i modules/lua/mod_lua.c  &amp;&amp;
 sed '/dir.*CFG_PREFIX/s@^@#@'     -i support/apxs.in        &amp;&amp;
 
 ./configure --enable-authnz-fcgi                            \
@@ -175,11 +174,6 @@ chown -v -R apache:apache /srv/www</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para>
-      <command>sed 's/ldump_writer, &amp;b/&amp;, NULL/'...</command>: This sed
-      fixes compilation with <application>lua</application> 5.3.
-    </para>
-
     <para>
       <command>sed '/dir.*CFG_PREFIX/s@^@#@'...</command>: Forces the
       <application>apxs</application> utility to use absolute pathnames for