<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/1fc6ea9d99cc90528cb08de10ed5b8eb113391ce">https://github.com/macports/macports-ports/commit/1fc6ea9d99cc90528cb08de10ed5b8eb113391ce</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 1fc6ea9d99c samba4: Update to version 4.13.0
</span>1fc6ea9d99c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1fc6ea9d99cc90528cb08de10ed5b8eb113391ce
</span>Author: Hamid Maadani <zetta22000@yahoo.com>
AuthorDate: Fri Oct 30 01:37:11 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> samba4: Update to version 4.13.0
</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/61380
</span>---
net/samba4/Portfile | 76 +++++++++++++++++++++++----------
net/samba4/files/patch-fix-st_atim.diff | 53 +++++++++++++++++++++++
net/samba4/files/patch-no-xsltproc.diff | 45 +++++++++++++++++++
3 files changed, 152 insertions(+), 22 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 7f53403ad8d..40481a33341 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;'>@@ -1,34 +1,73 @@
</span> PortSystem 1.0
name samba4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.0.0tp5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.13.0
</span> categories net
platforms darwin
maintainers nomaintainer
license GPL-3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description SMB/CIFS server and client, ALPHA release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description SMB/CIFS server and client
</span> long_description Samba is an software suite that provides seamless file \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- and print services to SMB/CIFS clients. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This is an ALPHA release!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and print services to SMB/CIFS clients.
</span>
homepage http://www.samba.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://download.samba.org/samba/ftp/samba4/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://de.samba.org/samba.org/samba4/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://download.samba.org/pub/samba/stable
</span> distname samba-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 dbc2e04455d67b01d2020808065b96df \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 8897cc7a824a594b3543245cdbbceaea32e9e08d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1870f67aa851751e381a3b03dadfa1d0afa28a12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0e0efa2be30af3df3cce92b00496b296cc4c2a0d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f11d52aee8db0aa50ac614143f2ccefead29e8f8ff585358792221557cade7f6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 18406380
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gnutls port:readline port:libiconv port:popt port:sqlite3 port:zlib port:gettext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:cctools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gnutls \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gpgme \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jansson \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libarchive \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openldap \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p5.28-parse-yapp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:popt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python38 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir samba-${version}/source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-fhs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch to fix st_atim, st_ctim and st_mtim calls on MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-st_atim.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch to disable building documentation on MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this enables us to have a working samba4 port without docs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# rather than not having samba4 at all. Can be removed when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# doc build issues are resolved.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-no-xsltproc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append YAPP=${prefix}/bin/yapp-5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd ${python} ./buildtools/bin/waf configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -C \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-fhs \
</span> --mandir=${prefix}/share/man \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libiconv=${prefix} --with-readline=${prefix} --with-sqlite3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libiconv=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-acl-support \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-ad-dc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-avahi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gpgme \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-spotlight
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ${python} ./buildtools/bin/waf -v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.pre_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append DESTDIR=${destroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.cmd ${python} ./buildtools/bin/waf -v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append DESTDIR=${destroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.destdir
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target-append installman
</span> post-destroot {
# add a postfix of '4' to all executables to avoid file conflicts
foreach dir {bin sbin} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,15 +75,8 @@ post-destroot {
</span> file rename "${bin}" "${bin}4"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # ..and also to the manpages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir [glob -directory "${destroot}${prefix}/share/man" "man\[138\]"] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach man [glob -directory "${dir}" -type f *] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename "${man}" [string range "${man}" 0 [expr [string last . "${man}"] - 1]]4[string range "${man}" [string last . "${man}"] [string length "${man}"]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
livecheck.type regex
livecheck.url http://us4.samba.org/samba/ftp/samba4/?M=D
livecheck.regex samba-(\[0-9a-z.\]+)\\.tar\\.gz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/samba4/files/patch-fix-st_atim.diff b/net/samba4/files/patch-fix-st_atim.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fe32289d9b6
</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-fix-st_atim.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,53 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/source3/libsmb/libsmb_stat.c b/source3/libsmb/libsmb_stat.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 790934b..7372881 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/source3/libsmb/libsmb_stat.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/source3/libsmb/libsmb_stat.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,18 +102,18 @@ void setup_stat(struct stat *st,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ st->st_dev = dev;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- st->st_atim = access_time_ts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- st->st_ctim = change_time_ts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- st->st_mtim = write_time_ts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ st->st_atimespec = access_time_ts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ st->st_ctimespec = change_time_ts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ st->st_mtimespec = write_time_ts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void setup_stat_from_stat_ex(const struct stat_ex *stex,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *fname,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct stat *st)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- st->st_atim = stex->st_ex_atime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- st->st_ctim = stex->st_ex_ctime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- st->st_mtim = stex->st_ex_mtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ st->st_atimespec = stex->st_ex_atime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ st->st_ctimespec = stex->st_ex_ctime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ st->st_mtimespec = stex->st_ex_mtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ st->st_mode = stex->st_ex_mode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ st->st_size = stex->st_ex_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/source4/torture/libsmbclient/libsmbclient.c b/source4/torture/libsmbclient/libsmbclient.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3f39925..0ed93da 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/source4/torture/libsmbclient/libsmbclient.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/source4/torture/libsmbclient/libsmbclient.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1231,8 +1231,8 @@ static bool torture_libsmbclient_utimes(struct torture_context *tctx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = smbc_fstat(fhandle, &st);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ torture_assert_int_not_equal(tctx, ret, -1, "smbc_fstat failed");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tbuf[0] = convert_timespec_to_timeval(st.st_atim);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tbuf[1] = convert_timespec_to_timeval(st.st_mtim);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tbuf[0] = convert_timespec_to_timeval(st.st_atimespec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tbuf[1] = convert_timespec_to_timeval(st.st_mtimespec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tbuf[1] = timeval_add(&tbuf[1], 0, 100000); /* 100 msec */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1244,7 +1244,7 @@ static bool torture_libsmbclient_utimes(struct torture_context *tctx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ torture_assert_int_equal(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tctx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- st.st_mtim.tv_nsec / 1000,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ st.st_mtimespec.tv_nsec / 1000,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tbuf[1].tv_usec,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "smbc_utimes did not update msec");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f440d323079
</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-no-xsltproc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./buildtools/wafsamba/samba_conftests.py 2019-09-13 09:43:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./buildtools/wafsamba/orig.samba_conftests.py 2018-01-14 21:41:58.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -481,7 +481,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not conf.CONFIG_SET('XSLTPROC'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- conf.find_program('xsltproc', var='XSLTPROC')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conf.find_program('NOTxsltproc', var='XSLTPROC')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not conf.CONFIG_SET('XSLTPROC'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ctdb/wscript 2019-09-13 09:43:47.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ctdb/orig.wscript 2018-08-24 09:58:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1014,7 +1014,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BASE_URL = 'http://docbook.sourceforge.net/release/xsl/current'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAN_XSL = '%s/manpages/docbook.xsl' % BASE_URL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HTML_XSL = '%s/html/docbook.xsl' % BASE_URL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CMD_TEMPLATE = 'xsltproc --xinclude -o %s --nonet %s %s'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CMD_TEMPLATE = 'NOTxsltproc --xinclude -o %s --nonet %s %s'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ manpages = manpages_binary + manpages_misc + manpages_etcd + manpages_ceph
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for t in manpages:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmd = CMD_TEMPLATE % ('doc/%s' % t, MAN_XSL, 'doc/%s.xml' % t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./lib/ldb/wscript 2019-09-13 09:42:28.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./lib/ldb/orig.wscript 2018-08-24 09:58:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,5 +60,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.RECURSE('lib/replace')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- conf.find_program('xsltproc', var='XSLTPROC')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conf.find_program('NOTxsltproc', var='XSLTPROC')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.SAMBA_CHECK_PYTHON()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.SAMBA_CHECK_PYTHON_HEADERS()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./wscript 2019-09-13 09:43:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./orig.wscript 2018-11-26 08:54:31.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,7 +122,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.RECURSE('examples/fuse')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.SAMBA_CHECK_PERL(mandatory=True)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- conf.find_program('xsltproc', var='XSLTPROC')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conf.find_program('NOTxsltproc', var='XSLTPROC')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if conf.env.disable_python:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not (Options.options.without_ad_dc):
</span></pre><pre style='margin:0'>
</pre>