From 79736ae655963888d2478fae719b0e054b12248e Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Wed, 6 Sep 2023 14:25:33 -0500
Subject: [PATCH] Update to samba-4.19.0

---
 introduction/welcome/changelog.xml |  9 +++++++++
 networking/netprogs/samba.xml      | 32 ++++++++++++++----------------
 packages.ent                       |  2 +-
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index b0b3980d44..20d8335b4a 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -38,6 +38,15 @@
       </itemizedlist>
     </listitem>
     -->
+    <listitem>
+      <para>September 6th, 2023</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to samba-4.19.0. Fixes
+          <ulink url="&blfs-ticket-root;18506">#18506</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>September 5th, 2023</para>
diff --git a/networking/netprogs/samba.xml b/networking/netprogs/samba.xml
index af037e500e..d5941c7abd 100644
--- a/networking/netprogs/samba.xml
+++ b/networking/netprogs/samba.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY samba-download-http "https://download.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
   <!ENTITY samba-download-ftp  " ">
-  <!ENTITY samba-md5sum        "d7e75ab3de1f48ea696c030c869c96f2">
-  <!ENTITY samba-size          "39 MB">
-  <!ENTITY samba-buildsize     "600 MB (add 100 MB for quicktest)">
-  <!ENTITY samba-time          "1.7 SBU (using parallelism=4; add 0.3 SBU for quicktest)">
+  <!ENTITY samba-md5sum        "0bcbee83dc1918055873691bb6007838">
+  <!ENTITY samba-size          "40 MB">
+  <!ENTITY samba-buildsize     "696 MB (add 73 MB for quicktest)">
+  <!ENTITY samba-time          "2.1 SBU (using parallelism=4; add 0.4 SBU for quicktest)">
 ]>
 
 <sect1 id="samba" xreflabel="Samba-&samba-version;">
@@ -656,10 +656,11 @@ systemctl start smbd.socket</userinput></screen>
           ldbadd, ldbdel, ldbedit, ldbmodify, ldbrename, ldbsearch, locktest,
           masktest, mdsearch, mvxattr, ndrdump, net, nmbd, nmblookup, ntlm_auth,
           oLschema2ldif, pdbedit, profiles, regdiff, regpatch, regshell,
-          regtree, rpcclient, samba-gpupdate, samba-regedit, samba-tool,
-          sharesec, smbcacls, smbclient, smbcontrol, smbcquotas, smbd, smbget,
-          smbpasswd, smbspool, smbstatus, smbtar, smbtorture, smbtree,
-          tdbbackup, tdbdump, tdbrestore, tdbtool, testparm, wbinfo, and winbindd
+          regtree, rpcclient, samba-log-parser, samba-gpupdate, samba-regedit,
+          samba-tool, sharesec, smbcacls, smbclient, smbcontrol, smbcquotas,
+          smbd, smbget, smbpasswd, smbspool, smbstatus, smbtar, smbtorture,
+          smbtree, tdbbackup, tdbdump, tdbrestore, tdbtool, testparm, wbinfo,
+          and winbindd
         </seg>
 
         <seg>
@@ -669,7 +670,7 @@ systemctl start smbd.socket</userinput></screen>
           libndr-standard.so, libnetapi.so, libnss_winbind.so, libnss_wins.so,
           libsamba-credentials.so, libsamba-errors.so,
           libsamba-hostconfig.so, libsamba-passdb.so,
-          libsamba-policy.cpython-310-x86_64-linux-gnu.so, libsamba-util.so,
+          libsamba-policy.cpython-311-x86_64-linux-gnu.so, libsamba-util.so,
           libsamdb.so, libsmbclient.so,
           libsmbconf.so, libsmbldap.so, libtevent-util.so,
           libwbclient.so, and filesystem and support modules under
@@ -1039,20 +1040,17 @@ systemctl start smbd.socket</userinput></screen>
         </listitem>
       </varlistentry>
 
-<!-- Removed in 4.17.0
-      <varlistentry id="samba-prog">
-        <term><command>samba</command></term>
+      <varlistentry id="samba-log-parser">
+        <term><command>samba-log-parser</command></term>
         <listitem>
           <para>
-            is a server to provide AD and SMB/CIFS services
-            to clients
+            parses winbind logs generated by Samba
           </para>
-          <indexterm zone="samba samba-prog">
-            <primary sortas="b-samba-prog">samba</primary>
+          <indexterm zone="samba samba-log-parser">
+            <primary sortas="b-samba-log-parser">samba-log-parser</primary>
           </indexterm>
         </listitem>
       </varlistentry>
--->
 
       <varlistentry id="samba-gpupdate">
         <term><command>samba-gpupdate</command></term>
diff --git a/packages.ent b/packages.ent
index ac83b6b905..090e948c52 100644
--- a/packages.ent
+++ b/packages.ent
@@ -662,7 +662,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY ntp-version                  "4.2.8p17">
 <!ENTITY rpcbind-version              "1.2.6">
 <!ENTITY rsync-version                "3.2.7">
-<!ENTITY samba-version                "4.18.6">
+<!ENTITY samba-version                "4.19.0">
 <!ENTITY wget-version                 "1.21.4">
 <!ENTITY wireless-tools-version       "29">
 <!ENTITY wpa_supplicant-version       "2.10">