From 22320b4cd95a5b77ea67b1e3653ee7448858acde Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Wed, 21 Sep 2005 21:19:30 +0000
Subject: [PATCH] Updated to Samba-3.0.20

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5113 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 introduction/welcome/changelog.xml |  3 ++
 server/major/samba3.xml            | 45 +++++++++++++++++++++---------
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/general.ent b/general.ent
index a0d1f6ea47..4ece1663f1 100644
--- a/general.ent
+++ b/general.ent
@@ -249,7 +249,7 @@
 <!ENTITY openssh-version              "4.2p1">
 <!ENTITY portmap-version              "5beta">
 <!ENTITY rsync-version                "2.6.5">
-<!ENTITY samba3-version               "3.0.14a">
+<!ENTITY samba3-version               "3.0.20">
 <!ENTITY subversion-version           "1.2.3">
 <!ENTITY tcpwrappers-version          "7.6">
 <!ENTITY wget-version                 "1.10.1">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index f804ae2f88..1b181e7c96 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,9 @@
     <listitem>
       <para>September 21st, 2005</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to Samba-3.0.20.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Reverted gcc build instructions.</para>
         </listitem>
diff --git a/server/major/samba3.xml b/server/major/samba3.xml
index 8681bb2220..1b44bdb7e5 100644
--- a/server/major/samba3.xml
+++ b/server/major/samba3.xml
@@ -5,11 +5,11 @@
   %general-entities;
 
   <!ENTITY samba3-download-http "http://us1.samba.org/samba/ftp/samba-&samba3-version;.tar.gz">
-  <!ENTITY samba3-download-ftp "ftp://ftp.samba.org/pub/samba/samba-&samba3-version;.tar.gz">
-  <!ENTITY samba3-md5sum "ebee37e66a8b5f6fd328967dc09088e8">
-  <!ENTITY samba3-size "15.6 MB">
-  <!ENTITY samba3-buildsize "147 MB">
-  <!ENTITY samba3-time "2.21 SBU">
+  <!ENTITY samba3-download-ftp  "ftp://ftp.samba.org/pub/samba/samba-&samba3-version;.tar.gz">
+  <!ENTITY samba3-md5sum        "68e72ab16334c329901816febc43217a">
+  <!ENTITY samba3-size          "17.1 MB">
+  <!ENTITY samba3-buildsize     "146 MB">
+  <!ENTITY samba3-time          "2.5 SBU">
 ]>
 
 <sect1 id="samba3" xreflabel="Samba-&samba3-version;">
@@ -59,6 +59,15 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem> 
+        <para>Required patch if you have <application>Heimdal</application>
+        installed: <ulink
+        url="&patch-root;/samba-&samba3-version;-heimdal-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Samba Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -69,8 +78,7 @@
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
     <xref linkend="libxml2"/>,
     <xref linkend="mysql"/> or <xref linkend="postgresql"/>,
-    <xref linkend="python"/>,
-    <xref linkend="xinetd"/> and
+    <xref linkend="python"/> and
     <ulink url="http://valgrind.kde.org/">Valgrind</ulink></para>
 
   </sect2>
@@ -78,9 +86,24 @@
   <sect2 role="installation">
     <title>Installation of Samba</title>
 
+    <para>A <application>Samba</application> <filename>include.h</filename>
+    header now does checks for C++ reserved names. The package will not build
+    if you have <application>Heimdal</application> installed as Heimdal uses
+    some of these reserved names inappropriately. If you have
+    <application>Heimdal</application> installed, apply the following patch to
+    disable these checks and allow the package to compile successfully:</para>
+
+<screen><userinput>patch -Np1 -i ../samba-&samba3-version;-heimdal-1.patch</userinput></screen>
+
     <para>Install <application>Samba</application> by running the following
     commands:</para>
 
+    <note>
+      <para>You may want to run <command>configure</command> with the
+      <option>--help</option> parameter. There may be other parameters
+      needed to take advantage of the optional dependencies.</para>
+    </note>
+
 <screen><userinput>cd source &amp;&amp;
 ./configure \
     --prefix=/usr \
@@ -91,6 +114,8 @@
     --with-smbmount &amp;&amp;
 make</userinput></screen>
 
+    <para>This package does not come with a test suite.</para>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>install -v -m755 -d /var/cache/samba &amp;&amp;
@@ -107,12 +132,6 @@ fi &amp;&amp;
 install -v -m644 ../examples/smb.conf.default /etc/samba &amp;&amp;
 install -v -m644 ../docs/*.pdf /usr/share/samba</userinput></screen>
 
-    <note>
-      <para>You may want to run <command>configure</command> with the
-      <option>--help</option> parameter. There may be other parameters
-      needed to take advantage of the optional dependencies.</para>
-    </note>
-
   </sect2>
 
   <sect2 role="commands">