Author: cjg
Date: Sun Oct  5 18:32:06 2014
New Revision: 14508

Log:
Merge samba update from trunk.

Modified:
   branches/systemd/networking/netprogs/samba-systemd.xml
   branches/systemd/packages.ent

Modified: branches/systemd/networking/netprogs/samba-systemd.xml
==============================================================================
--- branches/systemd/networking/netprogs/samba-systemd.xml      Sun Oct  5 
15:57:12 2014        (r14507)
+++ branches/systemd/networking/netprogs/samba-systemd.xml      Sun Oct  5 
18:32:06 2014        (r14508)
@@ -6,7 +6,7 @@
 
   <!ENTITY samba-download-http 
"http://ftp.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz";>
   <!ENTITY samba-download-ftp  
"ftp://ftp.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz";>
-  <!ENTITY samba-md5sum        "d7377e7247ad16f6b15363727b91b761">
+  <!ENTITY samba-md5sum        "232016d7581a1ba11e991ec2674553c4">
   <!ENTITY samba-size          "19 MB">
   <!ENTITY samba-buildsize     "415 MB (additional 396 MB for the quicktest, 
reputedly up to 500 MB additional for all tests)">
   <!ENTITY samba-time          "6 SBU (additional 4.3 SBU for the quicktest, 
reputedly up to 110 SBU to run all tests)">
@@ -97,15 +97,15 @@
   <sect2 role="installation">
     <title>Installation of Samba</title>
 
-    <note>
+<!--    <note>
       <para>If you wish to run the test suite after the binaries are built,
-      you must add the <option>--enable-socket-wrapper</option> 
-      and <option>--enable-selftest</option> parameters to
+      you must add the <option>- -enable-socket-wrapper</option> 
+      and <option>- -enable-selftest</option> parameters to
       the <command>configure</command> script below. You may want to run
-      <command>configure</command> with the <option>--help</option> parameter
+      <command>configure</command> with the <option>- -help</option> parameter
       first. There may be other parameters needed to take advantage of
       optional dependencies.</para>
-    </note>
+    </note>-->
 
     <para>Fix a build failure when building on a system with
     <application>systemd</application> installed:</para>
@@ -126,10 +126,10 @@
 
 make</userinput></screen>
 
-    <para>According to <application>Samba</application> developers, the
+<!--    <para>According to <application>Samba</application> developers, the
     limitation to 108 characters of the path length of a unix named pipe socket
     may be the cause of errors, so that over 1/3 of the tests might fail. For
-    this reason, the switch <option>--with-selftest-prefix=/tmp/quick</option>
+    this reason, the switch <option>- -with-selftest-prefix=/tmp/quick</option>
     (or another path with small number of characters) can be used with
     configure. Even so, the 
     <quote><replaceable>samba3.raw.eas</replaceable></quote> test may fail,
@@ -142,7 +142,8 @@
     <para>To test the results, as the <systemitem
     class="username">root</systemitem> user, issue: <command>make
     quicktest</command>.  There are other targets (test, subunit-test)
-    available, but take a very long time (over 100 SBU).</para>
+    available, but take a very long time (over 100 SBU).</para>-->
+    <para>This package does not have a working test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> 
user:</para>
 
@@ -181,12 +182,12 @@
     <para><parameter>--enable-nss-wrapper</parameter>: Builds the nss-wrapper
     library.</para>
 
-    <para><option>--enable-socket-wrapper</option> and
-    <option>--enable-selftest</option>: These options are required to run
+<!--    <para><option>- -enable-socket-wrapper</option> and
+    <option>- -enable-selftest</option>: These options are required to run
     the test suite.</para>
 
-    <para><option>--with-selftest-prefix=SELFTEST_PREFIX</option>: This option
-    specify the test suite work directory (default=./st).</para>
+    <para><option>- -with-selftest-prefix=SELFTEST_PREFIX</option>: This option
+    specify the test suite work directory (default=./st).</para>-->
 
     <para><command>mv -v /usr/lib/libnss_win{s,bind}.so* /lib</command>:
     The nss libraries are installed in /usr/lib by default. Move them to

Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent       Sun Oct  5 15:57:12 2014        (r14507)
+++ branches/systemd/packages.ent       Sun Oct  5 18:32:06 2014        (r14508)
@@ -346,7 +346,7 @@
 <!ENTITY ntp-version                  "4.2.6p5">
 <!ENTITY rpcbind-version              "0.2.1">
 <!ENTITY rsync-version                "3.1.1">
-<!ENTITY samba-version                "4.1.11">
+<!ENTITY samba-version                "4.1.12">
 <!ENTITY wget-version                 "1.15">
 <!ENTITY wireless-tools-version       "29">
 <!ENTITY wpa_supplicant-version       "2.2">
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to