Author: randy
Date: 2005-09-21 15:19:30 -0600 (Wed, 21 Sep 2005)
New Revision: 5113
Added:
trunk/patches/samba-3.0.20-heimdal-1.patch
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/server/major/samba3.xml
Log:
Updated to Samba-3.0.20
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2005-09-21 16:26:53 UTC (rev 5112)
+++ trunk/BOOK/general.ent 2005-09-21 21:19:30 UTC (rev 5113)
@@ -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">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2005-09-21 16:26:53 UTC
(rev 5112)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2005-09-21 21:19:30 UTC
(rev 5113)
@@ -45,6 +45,9 @@
<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>
<listitem>
Modified: trunk/BOOK/server/major/samba3.xml
===================================================================
--- trunk/BOOK/server/major/samba3.xml 2005-09-21 16:26:53 UTC (rev 5112)
+++ trunk/BOOK/server/major/samba3.xml 2005-09-21 21:19:30 UTC (rev 5113)
@@ -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 &&
./configure \
--prefix=/usr \
@@ -91,6 +114,8 @@
--with-smbmount &&
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 &&
@@ -107,12 +132,6 @@
install -v -m644 ../examples/smb.conf.default /etc/samba &&
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">
Added: trunk/patches/samba-3.0.20-heimdal-1.patch
===================================================================
--- trunk/patches/samba-3.0.20-heimdal-1.patch 2005-09-21 16:26:53 UTC (rev
5112)
+++ trunk/patches/samba-3.0.20-heimdal-1.patch 2005-09-21 21:19:30 UTC (rev
5113)
@@ -0,0 +1,33 @@
+Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date: 2005-09-21
+Initial Package Version: 3.0.20
+Upstream Status: Not submitted (it is not an upstream Samba issue)
+Origin: Randy McMurchy
+Description: Fixes an issue if you have Heimdal installed as
+ Heimdal uses reserved C++ words and the Samba headers
+ now look for these conflicts. This patch comments out
+ the check for C++ reserved words. Heimdal is aware of
+ the issue
+
+$LastChangedBy$
+$Date$
+
+
+--- samba-3.0.20-orig/source/include/includes.h 2005-07-28
13:19:49.000000000 +0000
++++ samba-3.0.20/source/include/includes.h 2005-09-04 13:45:01.000000000
+0000
+@@ -25,6 +25,7 @@
+ #include "config.h"
+ #endif
+
++/*
+ #ifndef __cplusplus
+ #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+ #define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+@@ -36,6 +37,7 @@
+ #define delete #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+ #define friend #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
+ #endif
++*/
+
+ #include "local.h"
+
Property changes on: trunk/patches/samba-3.0.20-heimdal-1.patch
___________________________________________________________________
Name: svn:keywords
+ LastChangedBy Date
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
