From 1c73261434354ff634f6250bebd2215593562f8d Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 8 Feb 2015 18:58:07 +0000
Subject: [PATCH] Update to sharutils-4.15. Update to lzo-2.09. Remove no
 longer valid ftp locations for packages hosted by samba.org

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15474 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genlib/lzo.xml             | 6 +++---
 general/genlib/talloc.xml          | 2 +-
 general/genutils/sharutils.xml     | 4 ++--
 introduction/welcome/changelog.xml | 8 ++++++++
 networking/netprogs/cifsutils.xml  | 2 +-
 networking/netprogs/rsync.xml      | 4 ++--
 networking/netprogs/samba.xml      | 2 +-
 packages.ent                       | 4 ++--
 8 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/general/genlib/lzo.xml b/general/genlib/lzo.xml
index e457d5cac3..eca45f213b 100644
--- a/general/genlib/lzo.xml
+++ b/general/genlib/lzo.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY lzo-download-http "http://www.oberhumer.com/opensource/lzo/download/lzo-&lzo-version;.tar.gz">
   <!ENTITY lzo-download-ftp  " ">
-  <!ENTITY lzo-md5sum        "fcec64c26a0f4f4901468f360029678f">
-  <!ENTITY lzo-size          "575 KB">
+  <!ENTITY lzo-md5sum        "c7ffc9a103afe2d1bba0b015e7aa887f">
+  <!ENTITY lzo-size          "584 KB">
   <!ENTITY lzo-buildsize     "8.4 MB">
-  <!ENTITY lzo-time          "0.3 SBU (additional 0.3 SBU to run the tests)">
+  <!ENTITY lzo-time          "0.2 SBU (additional 0.2 SBU to run the tests)">
 ]>
 
 <sect1 id="lzo" xreflabel="LZO-&lzo-version;">
diff --git a/general/genlib/talloc.xml b/general/genlib/talloc.xml
index e5588ed7bb..7e8735c8b6 100644
--- a/general/genlib/talloc.xml
+++ b/general/genlib/talloc.xml
@@ -5,7 +5,7 @@
   %general-entities;
 
   <!ENTITY talloc-download-http "https://www.samba.org/ftp/talloc/talloc-&talloc-version;.tar.gz">
-  <!ENTITY talloc-download-ftp  "ftp://samba.org/pub/talloc/talloc-&talloc-version;.tar.gz">
+  <!ENTITY talloc-download-ftp  " ">
   <!ENTITY talloc-md5sum        "5dffb86414218a91864ed4453ba9be07">
   <!ENTITY talloc-size          "409 KB">
   <!ENTITY talloc-buildsize     "6.4 MB">
diff --git a/general/genutils/sharutils.xml b/general/genutils/sharutils.xml
index 34623eff0b..e993f01df8 100644
--- a/general/genutils/sharutils.xml
+++ b/general/genutils/sharutils.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY sharutils-download-http "http://ftp.gnu.org/gnu/sharutils/sharutils-&sharutils-version;.tar.xz">
   <!ENTITY sharutils-download-ftp  "ftp://ftp.gnu.org/gnu/sharutils/sharutils-&sharutils-version;.tar.xz">
-  <!ENTITY sharutils-md5sum        "77ede22951bdb67279c6e78e79a04784">
+  <!ENTITY sharutils-md5sum        "4b94e8016adf1a544c90e96132e36c8d">
   <!ENTITY sharutils-size          "1.1 MB">
   <!ENTITY sharutils-buildsize     "21 MB">
-  <!ENTITY sharutils-time          "0.8 SBU">
+  <!ENTITY sharutils-time          "0.4 SBU">
 ]>
 
 <sect1 id="sharutils" xreflabel="Sharutils-&sharutils-version;">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 7bae96cfab..06e8caec26 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,14 @@
     <listitem>
       <para>February 8th, 2015</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to sharutils-4.15. Fixes
+          <ulink url="&blfs-ticket-root;6127">#6127</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to lzo-2.09. Fixes
+          <ulink url="&blfs-ticket-root;6123">#6123</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[fernando] - Update to shared-mime-info-1.4. Fixes
           <ulink url="&blfs-ticket-root;6124">#6124</ulink>.</para>
diff --git a/networking/netprogs/cifsutils.xml b/networking/netprogs/cifsutils.xml
index dca37ea9d8..c6b0dd074d 100644
--- a/networking/netprogs/cifsutils.xml
+++ b/networking/netprogs/cifsutils.xml
@@ -5,7 +5,7 @@
   %general-entities;
 
   <!ENTITY cifsutils-download-http "https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-&cifsutils-version;.tar.bz2">
-  <!ENTITY cifsutils-download-ftp  "ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-&cifsutils-version;.tar.bz2">
+  <!ENTITY cifsutils-download-ftp  " ">
   <!ENTITY cifsutils-md5sum        "b7d75b67fd3987952896d27256c7293d">
   <!ENTITY cifsutils-size          "384 KB">
   <!ENTITY cifsutils-buildsize     "3.1 MB">
diff --git a/networking/netprogs/rsync.xml b/networking/netprogs/rsync.xml
index c23d2f24cc..a817f1b2e1 100644
--- a/networking/netprogs/rsync.xml
+++ b/networking/netprogs/rsync.xml
@@ -4,8 +4,8 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY rsync-download-http "http://samba.org/ftp/rsync/src/rsync-&rsync-version;.tar.gz">
-  <!ENTITY rsync-download-ftp  "ftp://ftp.samba.org/pub/rsync/src/rsync-&rsync-version;.tar.gz">
+  <!ENTITY rsync-download-http "https://www.samba.org/ftp/rsync/src/rsync-&rsync-version;.tar.gz">
+  <!ENTITY rsync-download-ftp  " ">
   <!ENTITY rsync-md5sum        "43bd6676f0b404326eee2d63be3cdcfe">
   <!ENTITY rsync-size          "869 KB">
   <!ENTITY rsync-buildsize     "9.0 MB">
diff --git a/networking/netprogs/samba.xml b/networking/netprogs/samba.xml
index 7176ec4d4b..d8f08cb635 100644
--- a/networking/netprogs/samba.xml
+++ b/networking/netprogs/samba.xml
@@ -5,7 +5,7 @@
   %general-entities;
 
   <!ENTITY samba-download-http "https://download.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
-  <!ENTITY samba-download-ftp  "ftp://download.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
+  <!ENTITY samba-download-ftp  " ">
   <!ENTITY samba-md5sum        "9c3bc2fb98fd3bac9945b911c71fdc66">
   <!ENTITY samba-size          "19 MB">
   <!ENTITY samba-buildsize     "416 MB (additional 397 MB for the quicktest, reputedly up to 500 MB additional for all tests)">
diff --git a/packages.ent b/packages.ent
index 3da0bc374a..bab1066db3 100644
--- a/packages.ent
+++ b/packages.ent
@@ -132,7 +132,7 @@
 <!ENTITY libxml2-version              "2.9.2">
 <!ENTITY libxslt-version              "1.1.28">
 <!ENTITY libzeitgeist-version         "0.3.18">
-<!ENTITY lzo-version                  "2.08">
+<!ENTITY lzo-version                  "2.09">
 <!ENTITY mtdev-version                "1.1.5">
 <!ENTITY nspr-version                 "4.10.8">
 <!ENTITY openobex-version             "1.7.1">
@@ -199,7 +199,7 @@
 <!ENTITY recode-version               "3.6">
 <!ENTITY rep-gtk-version              "0.90.8.2">
 <!ENTITY screen-version               "4.2.1">
-<!ENTITY sharutils-version            "4.14">
+<!ENTITY sharutils-version            "4.15">
 <!ENTITY tidy-version                 "cvs_20101110">
 <!ENTITY time-version                 "1.7">
 <!ENTITY tree-version                 "1.7.0">