<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0e36bca628216f4ac8c7257a74262784fa7f0da5">https://github.com/macports/macports-ports/commit/0e36bca628216f4ac8c7257a74262784fa7f0da5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0e36bca6282 samba4: update to 4.21.2
</span>0e36bca6282 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0e36bca628216f4ac8c7257a74262784fa7f0da5
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Sat Dec 7 17:22:36 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> samba4: update to 4.21.2
</span>---
net/samba4/Portfile | 16 ++++++++++------
net/samba4/files/patch-ldb-wscript.diff | 14 ++++++++++++++
net/samba4/files/patch-no-xsltproc.diff | 22 ----------------------
3 files changed, 24 insertions(+), 28 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/samba4/Portfile b/net/samba4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c79bee1849..ea5ae56b54f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/samba4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/samba4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,11 +11,11 @@ legacysupport.newest_darwin_requires_legacy 16
</span>
name samba4
conflicts samba3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.20.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 bf61fb4a298bf55695d3f6ddccb97b608da06bba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 02672542510ac6e5d0c91c0c14d90ab4e6ec397c709e952c6da3a6e0b4d5a42f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 42433302
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.21.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f8b0751600bb857aadc37767c8edf0afd57bf3c1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bde66be3d2025cb949de38518ad2652f3795f824c7fa89d4e443ede1ae828ea6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 42647875
</span>
categories net
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,8 @@ depends_lib port:gettext-runtime \
</span> port:readline \
port:zlib \
port:tdb \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:talloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:talloc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tevent
</span>
platform darwin {
# patch "get_user_groups: failed to get the unix group list" on
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,6 +78,9 @@ patchfiles-append patch-no-xsltproc.diff
</span> patchfiles-append patch-bug-15030.diff
patchfiles-append patch-samba-install.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://bugzilla.samba.org/show_bug.cgi?id=15763
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-ldb-wscript.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.perl ${perl5.bin}
configure.python ${prefix}/bin/python3.12
configure.env-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/samba4/files/patch-ldb-wscript.diff b/net/samba4/files/patch-ldb-wscript.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..45dfd022d3b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/samba4/files/patch-ldb-wscript.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/ldb/wscript.orig 2024-10-14 15:30:14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/ldb/wscript 2024-12-07 17:06:19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -362,11 +362,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ deps='cmocka ldb',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install=False)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bld.SAMBA_BINARY('test_ldb_comparison_fold',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- source='tests/test_ldb_comparison_fold.c',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- deps='cmocka ldb ldbwrap',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install=False)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bld.SAMBA_BINARY('ldb_key_value_test',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ source='tests/ldb_key_value_test.c',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ deps='cmocka ldb ldb_tdb_err_map',
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/samba4/files/patch-no-xsltproc.diff b/net/samba4/files/patch-no-xsltproc.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fc7de9b101d..fc391af3c31 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/samba4/files/patch-no-xsltproc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/samba4/files/patch-no-xsltproc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,25 +20,3 @@
</span> manpages = manpages_binary + manpages_misc + manpages_etcd + manpages_ceph
for t in manpages:
cmd = CMD_TEMPLATE % ('doc/%s' % t, MAN_XSL, 'doc/%s.xml' % t)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/ldb/wscript.orig 2021-10-27 07:53:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/ldb/wscript 2022-01-11 20:36:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf.define('USING_SYSTEM_CMOCKA', 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf.RECURSE('lib/replace')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- conf.find_program('xsltproc', var='XSLTPROC')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ conf.find_program('NOTxsltproc', var='XSLTPROC')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf.SAMBA_CHECK_PYTHON()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf.SAMBA_CHECK_PYTHON_HEADERS()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- wscript.orig 2021-08-26 04:01:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ wscript 2022-01-11 20:36:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -166,7 +166,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf.RECURSE('examples/winexe')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf.SAMBA_CHECK_PERL(mandatory=True)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- conf.find_program('xsltproc', var='XSLTPROC')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ conf.find_program('NOTxsltproc', var='XSLTPROC')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if conf.env.disable_python:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not (Options.options.without_ad_dc):
</span></pre><pre style='margin:0'>
</pre>