Here's a tentative update to 4.5.0, if people want to give it a shot.
I'd like to point out that test reports on 4.4.x are the most important
concern right now. We have to deal with this s3fs vs. ntvfs issue.
I don't (and won't in the foreseeably future) have any windows machine
at hand, so test reports are needed (private or public). I can help
ports-wise and functionality-wise.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.228
diff -u -p -r1.228 Makefile
--- Makefile 12 Sep 2016 15:38:22 -0000 1.228
+++ Makefile 12 Sep 2016 20:38:21 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.228 2016/09/12 15:38:22 jca Exp $
-VERSION = 4.4.5
+VERSION = 4.5.0
DISTNAME = samba-${VERSION}
COMMENT-main = SMB and CIFS client and server for UNIX
@@ -15,14 +15,10 @@ PKGNAME-tevent = tevent-${TEVENT_V}
PKGNAME-util = samba-util-${VERSION}
PKGNAME-docs = samba-docs-${VERSION}
-REVISION-main = 0
-REVISION-ldb = 0
-REVISION-tevent = 0
-
PKG_ARCH-docs = *
-LDB_V = 1.1.26
-TEVENT_V = 0.9.28
+LDB_V = 1.1.27
+TEVENT_V = 0.9.29
SHARED_LIBS = asn1-samba4 0.0 \
com_err-samba4 0.0 \
@@ -39,7 +35,6 @@ SHARED_LIBS = asn1-samba4 0.0 \
kdc-samba4 0.0 \
krb5-samba4 0.0 \
ldb 0.2 \
- tevent-unix-util 0.0 \
ndr 0.1 \
ndr-krb5pac 0.0 \
ndr-nbt 0.0 \
@@ -161,7 +156,8 @@ CONFIGURE_ARGS = --enable-fhs \
--without-acl-support \
--without-libarchive \
--disable-rpath \
- --with-ntvfs-fileserver
+ --with-ntvfs-fileserver \
+ --without-gpgme
# XXX Remember to remove --enable-developer, it prints passwords in logs.
#CONFIGURE_ARGS += --enable-developer
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.53
diff -u -p -r1.53 distinfo
--- distinfo 8 Jul 2016 18:39:50 -0000 1.53
+++ distinfo 12 Sep 2016 20:38:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (samba-4.4.5.tar.gz) = uHbvLmP2YmVJDoChIuZu8tdhYRK4Od9o9WrC4c4Xp70=
-SIZE (samba-4.4.5.tar.gz) = 20715838
+SHA256 (samba-4.5.0.tar.gz) = 06mkObdG3dLF8Rn2DHLvigJrzuHvsRmb8Z5E8RT2tYY=
+SIZE (samba-4.5.0.tar.gz) = 20937551
Index: patches/patch-buildtools_wafsamba_samba_autoconf_py
===================================================================
RCS file:
/cvs/ports/net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-buildtools_wafsamba_samba_autoconf_py
--- patches/patch-buildtools_wafsamba_samba_autoconf_py 22 Apr 2016 11:48:36
-0000 1.4
+++ patches/patch-buildtools_wafsamba_samba_autoconf_py 12 Sep 2016 20:38:21
-0000
@@ -4,9 +4,9 @@ $OpenBSD: patch-buildtools_wafsamba_samb
2. Use -Wl,-no-undefined as on other platforms.
---- buildtools/wafsamba/samba_autoconf.py.orig Wed Apr 13 17:18:35 2016
-+++ buildtools/wafsamba/samba_autoconf.py Wed Apr 13 17:18:35 2016
-@@ -804,6 +804,27 @@ def ADD_LDFLAGS(conf, flags, testflags=False):
+--- buildtools/wafsamba/samba_autoconf.py.orig Mon Sep 12 18:42:31 2016
++++ buildtools/wafsamba/samba_autoconf.py Mon Sep 12 18:42:31 2016
+@@ -805,6 +805,27 @@ def ADD_LDFLAGS(conf, flags, testflags=False):
if not 'EXTRA_LDFLAGS' in conf.env:
conf.env['EXTRA_LDFLAGS'] = []
conf.env['EXTRA_LDFLAGS'].extend(TO_LIST(flags))
@@ -34,7 +34,7 @@ $OpenBSD: patch-buildtools_wafsamba_samb
return flags
-@@ -867,10 +888,9 @@ def SETUP_CONFIGURE_CACHE(conf, enable):
+@@ -868,10 +889,9 @@ def SETUP_CONFIGURE_CACHE(conf, enable):
def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
# we don't want any libraries or modules to rely on runtime
# resolution of symbols
Index: patches/patch-lib_replace_wscript
===================================================================
RCS file: patches/patch-lib_replace_wscript
diff -N patches/patch-lib_replace_wscript
--- patches/patch-lib_replace_wscript 27 Apr 2016 08:50:03 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-lib_replace_wscript,v 1.5 2016/04/27 08:50:03 jca Exp $
-
-Fix __sync_fetch_and_add check so that it properly fails instead of
-succeeding erroneously (eg on hppa).
-
-Committed upstream:
-
https://git.samba.org/?p=samba.git;a=commit;h=53e0860122c3fa6b9fe80b5693c7b1eee2ad605d
-
---- lib/replace/wscript.orig Wed Apr 13 17:18:37 2016
-+++ lib/replace/wscript Wed Apr 13 17:18:37 2016
-@@ -202,23 +202,15 @@ def configure(conf):
-
- # Check for atomic builtins. */
- conf.CHECK_CODE('''
-- int main(void) {
- int i;
- (void)__sync_fetch_and_add(&i, 1);
-- return 0;
-- }
- ''',
- 'HAVE___SYNC_FETCH_AND_ADD',
- msg='Checking for __sync_fetch_and_add compiler builtin')
-
- conf.CHECK_CODE('''
-- #include <stdint.h>
-- #include <sys/atomic.h>
-- int main(void) {
- int32_t i;
- atomic_add_32(&i, 1);
-- return 0;
-- }
- ''',
- 'HAVE_ATOMIC_ADD_32',
- headers='stdint.h sys/atomic.h',
Index: patches/patch-python_samba_provision___init___py
===================================================================
RCS file:
/cvs/ports/net/samba/patches/patch-python_samba_provision___init___py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-python_samba_provision___init___py
--- patches/patch-python_samba_provision___init___py 22 Apr 2016 11:48:36
-0000 1.3
+++ patches/patch-python_samba_provision___init___py 12 Sep 2016 20:38:21
-0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-python_samba_provision__
- net/isc-bind group name
---- python/samba/provision/__init__.py.orig Wed Apr 13 17:18:37 2016
-+++ python/samba/provision/__init__.py Wed Apr 13 17:18:37 2016
-@@ -1965,7 +1965,7 @@ def provision(logger, session_info, smbconf=None,
+--- python/samba/provision/__init__.py.orig Mon Sep 12 18:42:36 2016
++++ python/samba/provision/__init__.py Mon Sep 12 18:42:36 2016
+@@ -1969,7 +1969,7 @@ def provision(logger, session_info, smbconf=None,
root_gid = pwd.getpwuid(root_uid).pw_gid
try:
Index: patches/patch-source3_wscript
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-source3_wscript,v
retrieving revision 1.3
diff -u -p -r1.3 patch-source3_wscript
--- patches/patch-source3_wscript 22 Apr 2016 11:48:36 -0000 1.3
+++ patches/patch-source3_wscript 12 Sep 2016 20:38:21 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-source3_wscript,v 1.3 20
- use more generic check for OpenBSD.
---- source3/wscript.orig Wed Apr 13 17:18:38 2016
-+++ source3/wscript Wed Apr 13 17:18:38 2016
-@@ -89,7 +89,7 @@ def configure(conf):
+--- source3/wscript.orig Mon Sep 12 18:42:39 2016
++++ source3/wscript Mon Sep 12 18:42:39 2016
+@@ -90,7 +90,7 @@ def configure(conf):
conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
conf.env.developer = True
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-main,v
retrieving revision 1.34
diff -u -p -r1.34 PLIST-main
--- pkg/PLIST-main 8 Jul 2016 18:39:50 -0000 1.34
+++ pkg/PLIST-main 12 Sep 2016 20:38:22 -0000
@@ -14,6 +14,7 @@
@bin bin/ntlm_auth
@bin bin/oLschema2ldif
@bin bin/pdbedit
+bin/findsmb
bin/pidl
@bin bin/profiles
@bin bin/regdiff
@@ -61,6 +62,7 @@ include/samba-4.0/gen_ndr/ndr_atsvc.h
include/samba-4.0/gen_ndr/ndr_dcerpc.h
include/samba-4.0/gen_ndr/ndr_drsblobs.h
include/samba-4.0/gen_ndr/ndr_drsuapi.h
+include/samba-4.0/ndr/ndr_krb5pac.h
include/samba-4.0/gen_ndr/ndr_krb5pac.h
include/samba-4.0/gen_ndr/ndr_misc.h
include/samba-4.0/gen_ndr/ndr_nbt.h
@@ -142,7 +144,6 @@ include/samba-4.0/wbclient.h
@lib lib/libsmbclient.so.${LIBsmbclient_VERSION}
@lib lib/libsmbconf.so.${LIBsmbconf_VERSION}
@lib lib/libsmbldap.so.${LIBsmbldap_VERSION}
-@lib lib/libtevent-unix-util.so.${LIBtevent-unix-util_VERSION}
@lib lib/libtevent-util.so.${LIBtevent-util_VERSION}
@lib lib/libwbclient.so.${LIBwbclient_VERSION}
lib/pkgconfig/dcerpc.pc
@@ -304,6 +305,9 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/main.py
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/main.pyc
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/main.pyo
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/nettime.py
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/nettime.pyc
+lib/python${MODPY_VERSION}/site-packages/samba/netcmd/nettime.pyo
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/ntacl.py
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/ntacl.pyc
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/ntacl.pyo
@@ -322,9 +326,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/testparm.py
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/testparm.pyc
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/testparm.pyo
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/time.py
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/time.pyc
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/time.pyo
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user.py
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user.pyc
lib/python${MODPY_VERSION}/site-packages/samba/netcmd/user.pyo
@@ -400,6 +401,9 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/ndrdump.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/ndrdump.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/ndrdump.pyo
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/samba_dnsupdate.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/samba_dnsupdate.pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/samba_dnsupdate.pyo
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/samba_tool_drs.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/samba_tool_drs.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/samba_tool_drs.pyo
@@ -449,6 +453,9 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/srvsvc.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/srvsvc.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/srvsvc.pyo
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/string.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/string.pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/string.pyo
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/testrpc.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/testrpc.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/testrpc.pyo
@@ -458,6 +465,16 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/tests/dns.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dns.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/dns.pyo
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dns_forwarder.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dns_forwarder.pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dns_forwarder.pyo
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dns_forwarder_helpers/
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dns_forwarder_helpers/server.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dns_forwarder_helpers/server.pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dns_forwarder_helpers/server.pyo
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dns_tkey.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dns_tkey.pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dns_tkey.pyo
lib/python${MODPY_VERSION}/site-packages/samba/tests/docs.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/docs.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/docs.pyo
@@ -538,12 +555,18 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/group.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/group.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/group.pyo
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/join.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/join.pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/join.pyo
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/ntacl.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/ntacl.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/ntacl.pyo
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/processes.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/processes.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/processes.pyo
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/rodc.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/rodc.pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/rodc.pyo
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/sites.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/sites.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/sites.pyo
@@ -553,6 +576,9 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/user.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/user.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/user.pyo
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/user_check_password_script.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/user_check_password_script.pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/user_check_password_script.pyo
lib/python${MODPY_VERSION}/site-packages/samba/tests/samdb.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samdb.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/samdb.pyo
@@ -636,6 +662,7 @@ lib/samba/ldb/asq.so
lib/samba/ldb/descriptor.so
lib/samba/ldb/dirsync.so
lib/samba/ldb/dns_notify.so
+lib/samba/ldb/dsdb_notification.so
lib/samba/ldb/extended_dn_in.so
lib/samba/ldb/extended_dn_out.so
lib/samba/ldb/extended_dn_store.so
@@ -679,6 +706,7 @@ lib/samba/ldb/subtree_rename.so
lib/samba/ldb/tdb.so
lib/samba/ldb/tombstone_reanimate.so
lib/samba/ldb/update_keytab.so
+lib/samba/ldb/vlv.so
lib/samba/ldb/wins_ldb.so
lib/samba/libCHARSET3-samba4.so
lib/samba/libHDB-SAMBA4-samba4.so
@@ -807,6 +835,7 @@ lib/samba/service/ldap.so
lib/samba/service/nbtd.so
lib/samba/service/ntp_signd.so
lib/samba/service/s3fs.so
+lib/samba/service/smb.so
lib/samba/service/web.so
lib/samba/service/winbindd.so
lib/samba/service/wrepl.so
@@ -935,6 +964,7 @@ libexec/samba/
@man man/man8/idmap_nss.8
@man man/man8/idmap_rfc2307.8
@man man/man8/idmap_rid.8
+@man man/man8/idmap_script.8
@man man/man8/idmap_tdb.8
@man man/man8/idmap_tdb2.8
@man man/man8/net.8
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
