Changeset 3e86dee for networking/netprogs/samba.xml

Timestamp:

10/01/2023 03:47:53 PM (13 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

lazarus

Children:

efec285

Parents:

f7a5feb9 (diff), 9448f79b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' into lazarus

File:

• networking/netprogs/samba.xml (modified) (8 diffs)

networking/netprogs/samba.xml

@@ -7 +7 @@
   <!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)">
 ]>
 
@@ -104 +104 @@
       <xref linkend="gdb"/>,
       <xref linkend="git"/>,
-      <xref linkend="gnupg2"/> (required for ADS and test suite),
+      <xref linkend="gnupg2"/> (required for ADS and the test suite),
       <xref linkend="libaio"/>,
       <xref linkend="libarchive"/> (for tar in smbclient),
@@ -131 +131 @@
       <ulink url="https://pypi.org/project/iso8601/">iso8601</ulink>,
       <ulink url="https://ldb.samba.org/">ldb</ulink> (included),
-      <ulink url="&pypi;/m2crypto">M2Crypto</ulink> (required for ADS),
       <ulink url="https://www.openafs.org/">OpenAFS</ulink>,
+      <ulink url="https://github.com/python-poetry/poetry-core">poetry-core (required for ADS)</ulink>,
       <ulink url="https://pypi.org/project/pyasn1/">pyasn1</ulink>,
-      <ulink url="&pypi;/pygpgme/">PyGPGME</ulink> (recommended for ADS),
       <ulink url="https://tevent.samba.org/">tevent</ulink> (included),
       <ulink url="https://tdb.samba.org/">tdb</ulink> (included), and
@@ -146 +145 @@
       <xref linkend="pytest"/>,
       <ulink url="&pypi;/argparse/">argparse</ulink>,
-      <ulink url="&pypi;/extras/">extras</ulink>,
-      <ulink url="&pypi;/hypothesis/">hypothesis</ulink>,
-      <ulink url="&pypi;/coverage/">coverage</ulink>,
-      <ulink url="&pypi;/pytest-cov/">pytest-cov</ulink>,
-      <ulink url="&pypi;/doctools/">doctools</ulink>,
-      <ulink url="&pypi;/unittest2/">unittest2</ulink>,
       <ulink url="&pypi;/testtools/">testtools</ulink>,
-      <ulink url="&pypi;/fixtures/">fixtures</ulink>,
-      <ulink url="&pypi;/python-mimeparse/">python-mimeparse</ulink>,
-      <ulink url="&pypi;/contextlib2/">contextlib2</ulink>,
-      <ulink url="&pypi;/traceback2/">traceback2</ulink>,
-      <ulink url="&pypi;/linecache2/">linecache2</ulink>,
-      <ulink url="&pypi;/testscenarios/">testscenarios</ulink>,
-      <ulink url="&pypi;/testresources/">testresources</ulink>,
-      <ulink url="&pypi;/virtualenv/">virtualenv</ulink>,
-      <ulink url="&pypi;/pbr/">pbr</ulink>, and
+      <ulink url="&pypi;/testscenarios/">testscenarios</ulink>, and
       <ulink url="&pypi;/python-subunit/">python-subunit</ulink>
     </para>
@@ -244 +229 @@
 
     <para>
-      Fix a hard coded path to Python 3 interpreter:
+      Fix hard coded paths to Python 3 interpreter:
     </para>
 
 <screen><userinput>sed '1s@^.*$@#!/usr/bin/python3@' \
-    -i ./bin/default/source4/scripting/bin/samba-gpupdate.inst</userinput></screen>
+    -i ./bin/default/source4/scripting/bin/*.inst</userinput></screen>
 
     <para>
@@ -657 +642 @@
           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>
 
@@ -670 +656 @@
           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,
@@ -1040 +1026 @@
       </varlistentry>
 
-<!-- Removed in 4.17.0
-      <varlistentry id="samba-prog">
-        <term><command>samba</command></term>
-        <listitem>
-          <para>
-            is a server to provide AD and SMB/CIFS services
-            to clients
-          </para>
-          <indexterm zone="samba samba-prog">
-            <primary sortas="b-samba-prog">samba</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
+      <varlistentry id="samba-log-parser">
+        <term><command>samba-log-parser</command></term>
+        <listitem>
+          <para>
+            parses winbind logs generated by Samba
+          </para>
+          <indexterm zone="samba samba-log-parser">
+            <primary sortas="b-samba-log-parser">samba-log-parser</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
       <varlistentry id="samba-gpupdate">