<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5660d78073684cbe6b646f94926a616d4d77e1ac">https://github.com/macports/macports-ports/commit/5660d78073684cbe6b646f94926a616d4d77e1ac</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5660d78073684cbe6b646f94926a616d4d77e1ac
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jan 11 20:40:33 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> samba4: Update to 4.15.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64396
</span>---
net/samba4/Portfile | 31 ++++++++++++--------------
net/samba4/files/patch-fix-debug.diff | 12 ----------
net/samba4/files/patch-macos-grouplimit.diff | 22 ++++++++-----------
net/samba4/files/patch-no-xsltproc.diff | 33 ++++++++++++++--------------
4 files changed, 39 insertions(+), 59 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 d3860551ff4..1ac3f3cf1c4 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;'>@@ -2,23 +2,26 @@
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# O_CLOEXEC, AT_FDCWD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name samba4
conflicts samba3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.14.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 732a018b5b97e9efc91efd1b2d3540c23aec1dca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6f50353f9602aa20245eb18ceb00e7e5ec793df0974aebd5254c38f16d8f1906 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 18668592
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.15.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0d4a2443d6e3f53268389e3504ef97765ac8b9be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 519399404391550345846768ea4dd0fe7fcb04e20c2b891b5eeb02e5554137db \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 19272345
</span>
categories net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers nomaintainer
license GPL-3
description SMB/CIFS server and client
long_description Samba is an software suite that provides seamless file \
and print services to SMB/CIFS clients.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.samba.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.samba.org
</span> master_sites https://download.samba.org/pub/samba/stable
distname samba-${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,17 +36,11 @@ depends_lib port:cctools \
</span> path:lib/libldap.dylib:openldap \
port:p5.28-parse-yapp \
port:popt \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python38 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python310 \
</span> port:readline \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix missing header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-debug.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # patch "get_user_groups: failed to get the unix group list" on
# macOS
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +57,7 @@ platform darwin {
</span> # https://github.com/Homebrew/legacy-homebrew/issues/5954
patchfiles-append \
patch-macos-grouplimit.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# patch to disable building documentation on MacOS
# this enables us to have a working samba4 port without docs,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +66,7 @@ platform darwin {
</span> patchfiles-append patch-no-xsltproc.diff
configure.perl ${prefix}/bin/perl5.28
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python3.10
</span> configure.env-append \
YAPP=${prefix}/bin/yapp-5.28
configure.cmd ${configure.python} ./buildtools/bin/waf configure
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -217,5 +214,5 @@ post-destroot {
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://us4.samba.org/samba/ftp/samba4/?M=D
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://download.samba.org/pub/samba/
</span> livecheck.regex samba-(\[0-9a-z.\]+)\\.tar\\.gz
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/samba4/files/patch-fix-debug.diff b/net/samba4/files/patch-fix-debug.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 487b8122344..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/samba4/files/patch-fix-debug.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lib/util/charset/charset_macosxfs.c b/lib/util/charset/charset_macosxfs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 55a6df85fb7..cea813f5fe3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib/util/charset/charset_macosxfs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib/util/charset/charset_macosxfs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,6 +32,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "replace.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "charset.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "charset_proto.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "lib/util/debug.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef realloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef DARWINOS
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/samba4/files/patch-macos-grouplimit.diff b/net/samba4/files/patch-macos-grouplimit.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3768c8502c8..0ee2ea86ff4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/samba4/files/patch-macos-grouplimit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/samba4/files/patch-macos-grouplimit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/source3/lib/system.c b/source3/lib/system.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f1265e0..a02055a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/source3/lib/system.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/source3/lib/system.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -844,7 +844,25 @@ void sys_srandom(unsigned int seed)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int groups_max(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source3/lib/system.c.orig 2021-09-13 08:42:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source3/lib/system.c 2022-01-11 20:30:07.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -758,7 +758,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int setgroups_max(void)
</span> {
-#if defined(SYSCONF_SC_NGROUPS_MAX)
+#if defined(DARWINOS)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,11 +27,9 @@ index f1265e0..a02055a 100644
</span> int ret = sysconf(_SC_NGROUPS_MAX);
return (ret == -1) ? NGROUPS_MAX : ret;
#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/source3/lib/system_smbd.c b/source3/lib/system_smbd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3b1ac9c..748c788 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/source3/lib/system_smbd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/source3/lib/system_smbd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -205,7 +205,27 @@ bool getgroups_unix_user(TALLOC_CTX *mem_ctx, const char *user,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source3/lib/system_smbd.c.orig 2021-09-13 08:42:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source3/lib/system_smbd.c 2022-01-11 20:32:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -205,7 +205,27 @@
</span> gid_t primary_gid,
gid_t **ret_groups, uint32_t *p_ngroups)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +52,7 @@ index 3b1ac9c..748c788 100644
</span> + */
+ int max_grp = 128;
+#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- int max_grp = MIN(128, groups_max());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int max_grp = MIN(128, getgroups_max());
</span> +#endif
gid_t stack_groups[max_grp];
uint32_t ngrp;
<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 f440d323079..fc7de9b101d 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;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./buildtools/wafsamba/samba_conftests.py 2019-09-13 09:43:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./buildtools/wafsamba/orig.samba_conftests.py 2018-01-14 21:41:58.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -481,7 +481,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- buildtools/wafsamba/samba_conftests.py.orig 2021-08-09 08:38:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ buildtools/wafsamba/samba_conftests.py 2022-01-11 20:36:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -484,7 +484,7 @@
</span>
if not conf.CONFIG_SET('XSLTPROC'):
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,10 +9,9 @@
</span> if not conf.CONFIG_SET('XSLTPROC'):
return False
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./ctdb/wscript 2019-09-13 09:43:47.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ctdb/orig.wscript 2018-08-24 09:58:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1014,7 +1014,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ctdb/wscript.orig 2021-08-09 08:38:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ctdb/wscript 2022-01-11 20:36:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1183,7 +1183,7 @@
</span> BASE_URL = 'http://docbook.sourceforge.net/release/xsl/current'
MAN_XSL = '%s/manpages/docbook.xsl' % BASE_URL
HTML_XSL = '%s/html/docbook.xsl' % BASE_URL
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,21 +20,21 @@ Exit 1
</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;'>-Exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./lib/ldb/wscript 2019-09-13 09:42:28.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./lib/ldb/orig.wscript 2018-08-24 09:58:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,5 +60,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/ldb/wscript.orig 2021-10-27 07:53:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/ldb/wscript 2022-01-11 20:36:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.define('USING_SYSTEM_CMOCKA', 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> conf.RECURSE('lib/replace')
- conf.find_program('xsltproc', var='XSLTPROC')
+ conf.find_program('NOTxsltproc', var='XSLTPROC')
conf.SAMBA_CHECK_PYTHON()
conf.SAMBA_CHECK_PYTHON_HEADERS()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./wscript 2019-09-13 09:43:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./orig.wscript 2018-11-26 08:54:31.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -122,7 +122,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf.RECURSE('examples/fuse')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- wscript.orig 2021-08-26 04:01:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ wscript 2022-01-11 20:36:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -166,7 +166,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.RECURSE('examples/winexe')
</span>
conf.SAMBA_CHECK_PERL(mandatory=True)
- conf.find_program('xsltproc', var='XSLTPROC')
</pre><pre style='margin:0'>
</pre>