Move to latest upstream versions.
- libtalloc tests now fail intermittently, upstream seems to have
introduced an unstable comparison method in pytalloc
- more libraries move to the private directory
- shared lib bumps still hard to get right, some of them are not tracked
upstream, thus some bumps come from upstream .sigs, some from
abi-compliance-checker (confirmed with nm -g).
- dbus added to BDEPS, needed to build vfs_snapper; not enforced in
RDEPS but dbus is brought in by avahi anyway
- LDEPS and WANTLIB cleanup
Build and test reports welcome!
Index: databases/tdb/Makefile
===================================================================
RCS file: /cvs/ports/databases/tdb/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- databases/tdb/Makefile 12 Apr 2016 17:38:15 -0000 1.18
+++ databases/tdb/Makefile 17 Apr 2016 20:08:11 -0000
@@ -2,8 +2,8 @@
COMMENT= trivial database library
-# Keep in sync with the version bundled in net/samba4
-DISTNAME= tdb-1.3.7
+# Keep in sync with the version bundled in net/samba
+DISTNAME= tdb-1.3.8
SHARED_LIBS+= tdb 4.1
@@ -32,8 +32,9 @@ LIB_DEPENDS= ${MODPY_LIB_DEPENDS}
WAF_ARGS= -v -j ${MAKE_JOBS}
MAKE_FLAGS= WAF_ARGS="${WAF_ARGS}"
.for _l _v in ${SHARED_LIBS}
-MAKE_ENV += LIB${_l:S/-/_/g}_VERSION=${_v}
+MAKE_ENV += LIB${_l:S/-/_/g}_VERSION=${_v}
.endfor
+TEST_ENV= LD_LIBRARY_PATH="${WRKSRC}/bin/default"
CONFIGURE_STYLE= simple
CONFIGURE_ARGS= --mandir="${PREFIX}/man" \
Index: databases/tdb/distinfo
===================================================================
RCS file: /cvs/ports/databases/tdb/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- databases/tdb/distinfo 12 Apr 2016 17:38:15 -0000 1.6
+++ databases/tdb/distinfo 17 Apr 2016 17:26:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (tdb-1.3.7.tar.gz) = pk2VygzAaij+0kxulSrtdmDK4EmDEIc11rwwuSUTZBI=
-SIZE (tdb-1.3.7.tar.gz) = 493847
+SHA256 (tdb-1.3.8.tar.gz) = BgWsBCfqycI79h6/2CBqB9Xs4ZhJjqsXac0M+2595rE=
+SIZE (tdb-1.3.8.tar.gz) = 494106
Index: databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py
===================================================================
RCS file:
/cvs/ports/databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-buildtools_wafsamba_samba_install_py
--- databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py 12 Apr
2016 17:38:15 -0000 1.2
+++ databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py 17 Apr
2016 17:30:13 -0000
@@ -3,10 +3,13 @@ $OpenBSD: patch-buildtools_wafsamba_samb
- respect OpenBSD shared libraries versioning
- --version-script fails if specified multipled times
---- buildtools/wafsamba/samba_install.py.orig Sat Jun 13 03:00:10 2015
-+++ buildtools/wafsamba/samba_install.py Sun Apr 10 12:24:17 2016
-@@ -117,9 +117,12 @@ def install_library(self):
+--- buildtools/wafsamba/samba_install.py.orig Fri Nov 6 14:28:25 2015
++++ buildtools/wafsamba/samba_install.py Sun Apr 17 19:30:08 2016
+@@ -116,11 +116,15 @@ def install_library(self):
+ else:
+ inst_name = bld.make_libname(t.target)
elif self.vnum:
++ import sys
vnum_base = self.vnum.split('.')[0]
install_name = bld.make_libname(target_name, version=self.vnum)
- install_link = bld.make_libname(target_name, version=vnum_base)
@@ -21,7 +24,7 @@ $OpenBSD: patch-buildtools_wafsamba_samb
# only generate the dev link for non-bundled libs
dev_link = bld.make_libname(target_name)
elif getattr(self, 'soname', ''):
-@@ -169,7 +172,7 @@ def apply_vscript(self):
+@@ -170,7 +174,7 @@ def apply_vscript(self):
'''add version-script arguments to library build'''
if self.env.HAVE_LD_VERSION_SCRIPT and getattr(self, 'version_script',
''):
Index: databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py
===================================================================
RCS file:
/cvs/ports/databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-buildtools_wafsamba_wafsamba_py
--- databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py 12 Apr 2016
17:38:15 -0000 1.3
+++ databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py 17 Apr 2016
17:27:06 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-buildtools_wafsamba_wafs
- allow the library version to be overriden
- make sure we don't clobber the version that ends up in tdb.pc
---- buildtools/wafsamba/wafsamba.py.orig Tue Jul 21 22:32:32 2015
-+++ buildtools/wafsamba/wafsamba.py Sun Apr 10 12:53:36 2016
-@@ -215,6 +215,13 @@ def SAMBA_LIBRARY(bld, libname, source,
+--- buildtools/wafsamba/wafsamba.py.orig Fri Nov 6 14:28:25 2015
++++ buildtools/wafsamba/wafsamba.py Sun Apr 17 19:27:01 2016
+@@ -214,6 +214,13 @@ def SAMBA_LIBRARY(bld, libname, source,
realname = bld.map_shlib_extension(realname,
python=(target_type=='PYTHON'))
link_name = bld.map_shlib_extension(link_name,
python=(target_type=='PYTHON'))
@@ -19,7 +19,7 @@ $OpenBSD: patch-buildtools_wafsamba_wafs
# we don't want any public libraries without version numbers
if (not private_library and target_type != 'PYTHON' and not realname):
if vnum is None and soname is None:
-@@ -313,7 +320,7 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -322,7 +329,7 @@ def SAMBA_LIBRARY(bld, libname, source,
t.link_name = link_name
if pc_files is not None and not private_library:
Index: devel/libtalloc/Makefile
===================================================================
RCS file: /cvs/ports/devel/libtalloc/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- devel/libtalloc/Makefile 12 Apr 2016 17:39:20 -0000 1.10
+++ devel/libtalloc/Makefile 17 Apr 2016 19:36:42 -0000
@@ -2,12 +2,12 @@
COMMENT= hierarchical memory pool system with destructors
-# Keep in sync with the version bundled in net/samba4
-DISTNAME= talloc-2.1.3
+# Keep in sync with the version bundled in net/samba
+DISTNAME= talloc-2.1.6
PKGNAME= lib${DISTNAME}
-SHARED_LIBS+= talloc 1.0
-SHARED_LIBS+= pytalloc-util 0.0
+SHARED_LIBS+= talloc 1.1
+SHARED_LIBS+= pytalloc-util 0.1
CATEGORIES= devel
@@ -34,9 +34,9 @@ LIB_DEPENDS= ${MODPY_LIB_DEPENDS}
WAF_ARGS= -v -j ${MAKE_JOBS}
MAKE_FLAGS= WAF_ARGS="${WAF_ARGS}"
.for _l _v in ${SHARED_LIBS}
-MAKE_ENV += LIB${_l:S/-/_/g}_VERSION=${_v}
+MAKE_ENV += LIB${_l:S/-/_/g}_VERSION=${_v}
.endfor
-TEST_ENV = LD_LIBRARY_PATH="${WRKSRC}/bin/default"
+TEST_ENV= LD_LIBRARY_PATH="${WRKSRC}/bin/default"
CONFIGURE_STYLE= simple
CONFIGURE_ARGS= --mandir="${PREFIX}/man" \
Index: devel/libtalloc/distinfo
===================================================================
RCS file: /cvs/ports/devel/libtalloc/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- devel/libtalloc/distinfo 12 Apr 2016 17:39:20 -0000 1.4
+++ devel/libtalloc/distinfo 17 Apr 2016 17:28:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (talloc-2.1.3.tar.gz) = eqX3WyLU75xzeyVRXyooN93BMBT/SsbljdnjEfQfLLA=
-SIZE (talloc-2.1.3.tar.gz) = 434093
+SHA256 (talloc-2.1.6.tar.gz) = O44aULrLNZ2ZlC4N2ZQc73ea5LXrIPE4hzvYJwyx1Hs=
+SIZE (talloc-2.1.6.tar.gz) = 436983
Index: devel/libtalloc/patches/patch-buildtools_wafsamba_samba_install_py
===================================================================
RCS file:
/cvs/ports/devel/libtalloc/patches/patch-buildtools_wafsamba_samba_install_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-buildtools_wafsamba_samba_install_py
--- devel/libtalloc/patches/patch-buildtools_wafsamba_samba_install_py 12 Apr
2016 17:39:20 -0000 1.2
+++ devel/libtalloc/patches/patch-buildtools_wafsamba_samba_install_py 17 Apr
2016 17:31:56 -0000
@@ -3,10 +3,13 @@ $OpenBSD: patch-buildtools_wafsamba_samb
- respect OpenBSD shared libraries versioning
- --version-script fails if specified multipled times
---- buildtools/wafsamba/samba_install.py.orig Sat Jun 13 03:00:10 2015
-+++ buildtools/wafsamba/samba_install.py Mon Apr 11 00:57:00 2016
-@@ -117,9 +117,12 @@ def install_library(self):
+--- buildtools/wafsamba/samba_install.py.orig Thu Dec 10 12:01:40 2015
++++ buildtools/wafsamba/samba_install.py Sun Apr 17 19:31:51 2016
+@@ -117,11 +117,15 @@ def install_library(self):
+ else:
+ inst_name = bld.make_libname(t.target)
elif self.vnum:
++ import sys
vnum_base = self.vnum.split('.')[0]
install_name = bld.make_libname(target_name, version=self.vnum)
- install_link = bld.make_libname(target_name, version=vnum_base)
@@ -21,7 +24,7 @@ $OpenBSD: patch-buildtools_wafsamba_samb
# only generate the dev link for non-bundled libs
dev_link = bld.make_libname(target_name)
elif getattr(self, 'soname', ''):
-@@ -169,7 +172,7 @@ def apply_vscript(self):
+@@ -171,7 +175,7 @@ def apply_vscript(self):
'''add version-script arguments to library build'''
if self.env.HAVE_LD_VERSION_SCRIPT and getattr(self, 'version_script',
''):
Index: devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py
===================================================================
RCS file:
/cvs/ports/devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-buildtools_wafsamba_wafsamba_py
--- devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py 12 Apr
2016 17:39:20 -0000 1.2
+++ devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py 17 Apr
2016 17:28:35 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-buildtools_wafsamba_wafs
- allow the library version to be overriden
---- buildtools/wafsamba/wafsamba.py.orig Tue Jul 21 22:32:32 2015
-+++ buildtools/wafsamba/wafsamba.py Wed Mar 23 20:17:31 2016
-@@ -215,6 +215,12 @@ def SAMBA_LIBRARY(bld, libname, source,
+--- buildtools/wafsamba/wafsamba.py.orig Fri Feb 19 22:02:02 2016
++++ buildtools/wafsamba/wafsamba.py Sun Apr 17 19:28:35 2016
+@@ -220,6 +220,12 @@ def SAMBA_LIBRARY(bld, libname, source,
realname = bld.map_shlib_extension(realname,
python=(target_type=='PYTHON'))
link_name = bld.map_shlib_extension(link_name,
python=(target_type=='PYTHON'))
Index: devel/libtalloc/patches/patch-wscript
===================================================================
RCS file: devel/libtalloc/patches/patch-wscript
diff -N devel/libtalloc/patches/patch-wscript
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/libtalloc/patches/patch-wscript 17 Apr 2016 23:12:09 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+- fix path to tests helper script
+
+--- wscript.orig Sun Apr 17 19:47:33 2016
++++ wscript Sun Apr 17 19:47:35 2016
+@@ -159,7 +159,7 @@ def test(ctx):
+ ret = samba_utils.RUN_COMMAND(cmd)
+ print("testsuite returned %d" % ret)
+ magic_helper_cmd = os.path.join(Utils.g_module.blddir,
'talloc_test_magic_differs_helper')
+- magic_cmd = os.path.join(srcdir, 'lib', 'talloc',
++ magic_cmd = os.path.join(srcdir,
+ 'test_magic_differs.sh')
+
+ magic_ret = samba_utils.RUN_COMMAND(magic_cmd + " " + magic_helper_cmd)
Index: net/samba/Makefile
===================================================================
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.220
diff -u -p -r1.220 Makefile
--- net/samba/Makefile 13 Apr 2016 11:25:40 -0000 1.220
+++ net/samba/Makefile 17 Apr 2016 23:58:24 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.220 2016/04/13 11:25:40 jca Exp $
-VERSION = 4.3.8
+VERSION = 4.4.2
DISTNAME = samba-${VERSION}
COMMENT-main = SMB and CIFS client and server for UNIX
@@ -17,16 +17,15 @@ PKGNAME-docs = samba-docs-${VERSION}
PKG_ARCH-docs = *
-LDB_V = 1.1.21
-TEVENT_V = 0.9.25
+LDB_V = 1.1.26
+TEVENT_V = 0.9.28
SHARED_LIBS = asn1-samba4 0.0 \
+ com_err-samba4 0.0 \
dcerpc 0.0 \
- dcerpc-atsvc 0.0 \
- dcerpc-binding 0.0 \
+ dcerpc-binding 1.0 \
dcerpc-samr 0.0 \
dcerpc-server 0.0 \
- gensec 0.0 \
gssapi-samba4 0.0 \
hcrypto-samba4 0.0 \
hdb-samba4 0.0 \
@@ -35,28 +34,27 @@ SHARED_LIBS = asn1-samba4 0.0 \
hx509-samba4 0.0 \
kdc-samba4 0.0 \
krb5-samba4 0.0 \
- ldb 0.1 \
+ ldb 0.2 \
+ tevent-unix-util 0.0 \
ndr 0.1 \
ndr-krb5pac 0.0 \
ndr-nbt 0.0 \
ndr-standard 0.0 \
netapi 2.0 \
pyldb-util 0.0 \
- registry 0.0 \
roken-samba4 0.0 \
samba-credentials 0.0 \
- samba-hostconfig 0.0 \
- samba-passdb 0.0 \
+ samba-errors 0.0 \
+ samba-hostconfig 1.0 \
+ samba-passdb 0.1 \
samba-policy 0.0 \
samba-util 1.0 \
samdb 0.0 \
smbclient 4.1 \
- smbclient-raw 0.0 \
smbconf 0.0 \
smbldap 0.0 \
- tevent 0.1 \
+ tevent 0.2 \
tevent-util 0.0 \
- torture 0.0 \
wbclient 3.0 \
wind-samba4 0.0 \
replace 0.0 \
@@ -77,25 +75,22 @@ UTIL_LIBS = replace util-setid
# not "plugins" or such.
UTIL_WANTLIB = ${UTIL_LIBS:S@^@lib/samba/@}
-WANTLIB-common = c m pthread util ${MODPY_WANTLIB}
+WANTLIB-common = c pthread
-WANTLIB-main = ${WANTLIB-common} ${MODGETTEXT_WANTLIB}
-WANTLIB-main += com_err ncurses z
-WANTLIB-main += avahi-client avahi-common cups execinfo fam
iniparser
-WANTLIB-main += lber ldap pam popt sasl2 gcrypt gnutls
+WANTLIB-main = ${WANTLIB-common} ${MODGETTEXT_WANTLIB} ${MODPY_WANTLIB}
+WANTLIB-main += z
+WANTLIB-main += avahi-client avahi-common cups dbus-1 execinfo
fam
+WANTLIB-main += lber ldap pam popt gnutls
WANTLIB-main += ldb pyldb-util pytalloc-util tdb talloc tevent
WANTLIB-main += ${UTIL_WANTLIB}
-WANTLIB-ldb = ${WANTLIB-common}
-WANTLIB-ldb += popt tdb talloc tevent
-WANTLIB-ldb += ${UTIL_WANTLIB}
+WANTLIB-ldb = ${WANTLIB-common} ${MODPY_WANTLIB}
+WANTLIB-ldb += popt talloc tevent
-WANTLIB-tevent = ${WANTLIB-common}
+WANTLIB-tevent = ${WANTLIB-common} ${MODPY_WANTLIB}
WANTLIB-tevent += talloc
-WANTLIB-tevent += ${UTIL_WANTLIB}
WANTLIB-util = ${WANTLIB-common}
-WANTLIB-util += pytalloc-util talloc
WANTLIB-docs =
@@ -108,7 +103,8 @@ MODULES = devel/gettext lang/python per
BUILD_DEPENDS = devel/p5-Parse-Yapp>=1.0.5 \
net/py-dnspython \
- textproc/docbook-xsl
+ textproc/docbook-xsl \
+ x11/dbus
RUN_DEPENDS-main = net/py-dnspython
@@ -118,30 +114,20 @@ LIB_DEPENDS-main = ${BUILD_PKGPATH},-ldb
${BUILD_PKGPATH},-util>=${VERSION} \
${MODGETTEXT_LIB_DEPENDS} \
databases/openldap \
- databases/tdb>=1.3.7 \
- devel/iniparser \
+ databases/tdb>=1.3.8 \
devel/libexecinfo \
- devel/libtalloc>=2.1.3 \
+ devel/libtalloc>=2.1.6 \
net/avahi \
print/cups,-libs \
- security/cyrus-sasl2 \
security/gnutls \
- security/libgcrypt \
security/openpam \
- sysutils/e2fsprogs \
sysutils/gamin
LIB_DEPENDS-ldb = ${BUILD_PKGPATH},-tevent>=${TEVENT_V} \
- ${BUILD_PKGPATH},-util>=${VERSION} \
- databases/tdb>=1.3.7 \
- devel/libtalloc>=2.1.3 \
+ devel/libtalloc>=2.1.6 \
devel/popt
-LIB_DEPENDS-tevent = ${BUILD_PKGPATH},-util>=${VERSION} \
- devel/libtalloc>=2.1.3
-
-LIB_DEPENDS-util = ${MODPY_LIB_DEPENDS} \
- devel/libtalloc>=2.1.3
+LIB_DEPENDS-tevent = devel/libtalloc>=2.1.6
LIB_DEPENDS-docs =
Index: net/samba/distinfo
===================================================================
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.49
diff -u -p -r1.49 distinfo
--- net/samba/distinfo 13 Apr 2016 11:25:40 -0000 1.49
+++ net/samba/distinfo 13 Apr 2016 11:30:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (samba-4.3.8.tar.gz) = N53GbDoKSDv1vtN75uXRgpNNt8QQKyGSmmxGArMrKxA=
-SIZE (samba-4.3.8.tar.gz) = 20568773
+SHA256 (samba-4.4.2.tar.gz) = 6uzUGoXruVB7jbmFatoqlJN26dU891ZktUk2WPblkmo=
+SIZE (samba-4.4.2.tar.gz) = 20711230
Index: net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py
===================================================================
RCS file:
/cvs/ports/net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-buildtools_wafsamba_samba_autoconf_py
--- net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py 12 Apr
2016 17:42:09 -0000 1.3
+++ net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py 13 Apr
2016 15:19:28 -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 Tue Jul 21 11:47:48 2015
-+++ buildtools/wafsamba/samba_autoconf.py Sun Apr 10 19:38:17 2016
-@@ -788,6 +788,27 @@ def ADD_LDFLAGS(conf, flags, testflags=False):
+--- 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):
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
-@@ -851,10 +872,9 @@ def SETUP_CONFIGURE_CACHE(conf, enable):
+@@ -867,10 +888,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: net/samba/patches/patch-buildtools_wafsamba_samba_conftests_py
===================================================================
RCS file:
/cvs/ports/net/samba/patches/patch-buildtools_wafsamba_samba_conftests_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-buildtools_wafsamba_samba_conftests_py
--- net/samba/patches/patch-buildtools_wafsamba_samba_conftests_py 12 Apr
2016 17:42:09 -0000 1.2
+++ net/samba/patches/patch-buildtools_wafsamba_samba_conftests_py 13 Apr
2016 15:19:28 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-buildtools_wafsamba_samba_conftests_py,v 1.2 2016/04/12
17:42:09 jca Exp $
Reverse order of paths added to get reliable builds.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9890
---- buildtools/wafsamba/samba_conftests.py.orig Tue Jul 21 11:47:48 2015
-+++ buildtools/wafsamba/samba_conftests.py Sun Apr 10 19:38:17 2016
-@@ -40,9 +40,9 @@ def check(self, *k, **kw):
+--- buildtools/wafsamba/samba_conftests.py.orig Wed Apr 13 17:18:35 2016
++++ buildtools/wafsamba/samba_conftests.py Wed Apr 13 17:18:35 2016
+@@ -39,9 +39,9 @@ def check(self, *k, **kw):
def add_options_dir(dirs, env):
for x in dirs:
if not x in env.CPPPATH:
Index: net/samba/patches/patch-buildtools_wafsamba_samba_install_py
===================================================================
RCS file:
/cvs/ports/net/samba/patches/patch-buildtools_wafsamba_samba_install_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-buildtools_wafsamba_samba_install_py
--- net/samba/patches/patch-buildtools_wafsamba_samba_install_py 12 Apr
2016 17:42:09 -0000 1.2
+++ net/samba/patches/patch-buildtools_wafsamba_samba_install_py 13 Apr
2016 17:24:29 -0000
@@ -1,10 +1,13 @@
$OpenBSD: patch-buildtools_wafsamba_samba_install_py,v 1.2 2016/04/12 17:42:09
jca Exp $
Make Samba4 WAF respect OpenBSD shared libraries versioning conventions.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9774
---- buildtools/wafsamba/samba_install.py.orig Sun Apr 10 19:49:56 2016
-+++ buildtools/wafsamba/samba_install.py Sun Apr 10 21:06:05 2016
-@@ -117,9 +117,12 @@ def install_library(self):
+--- buildtools/wafsamba/samba_install.py.orig Wed Apr 13 17:18:35 2016
++++ buildtools/wafsamba/samba_install.py Wed Apr 13 19:24:13 2016
+@@ -117,11 +117,15 @@ def install_library(self):
+ else:
+ inst_name = bld.make_libname(t.target)
elif self.vnum:
++ import sys
vnum_base = self.vnum.split('.')[0]
install_name = bld.make_libname(target_name, version=self.vnum)
- install_link = bld.make_libname(target_name, version=vnum_base)
@@ -19,7 +22,7 @@ BUG: https://bugzilla.samba.org/show_bug
# only generate the dev link for non-bundled libs
dev_link = bld.make_libname(target_name)
elif getattr(self, 'soname', ''):
-@@ -169,7 +172,7 @@ def apply_vscript(self):
+@@ -171,7 +175,7 @@ def apply_vscript(self):
'''add version-script arguments to library build'''
if self.env.HAVE_LD_VERSION_SCRIPT and getattr(self, 'version_script',
''):
Index: net/samba/patches/patch-buildtools_wafsamba_symbols_py
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-buildtools_wafsamba_symbols_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-buildtools_wafsamba_symbols_py
--- net/samba/patches/patch-buildtools_wafsamba_symbols_py 28 Sep 2015
22:51:25 -0000 1.2
+++ net/samba/patches/patch-buildtools_wafsamba_symbols_py 13 Apr 2016
15:19:28 -0000
@@ -4,9 +4,9 @@ safe_symbols initially should probably g
a strange one (weak symbol everywhere in the whole system) and others are
coming from libgcc.a.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9892
---- buildtools/wafsamba/symbols.py.orig Tue May 14 17:30:33 2013
-+++ buildtools/wafsamba/symbols.py Tue May 14 19:58:59 2013
-@@ -569,7 +569,14 @@ def symbols_whyneeded(task):
+--- buildtools/wafsamba/symbols.py.orig Wed Apr 13 17:18:35 2016
++++ buildtools/wafsamba/symbols.py Wed Apr 13 17:18:35 2016
+@@ -570,7 +570,14 @@ def symbols_whyneeded(task):
def report_duplicate(bld, binname, sym, libs, fail_on_error):
'''report duplicated symbols'''
Index: net/samba/patches/patch-buildtools_wafsamba_wafsamba_py
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-buildtools_wafsamba_wafsamba_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-buildtools_wafsamba_wafsamba_py
--- net/samba/patches/patch-buildtools_wafsamba_wafsamba_py 12 Apr 2016
17:42:09 -0000 1.2
+++ net/samba/patches/patch-buildtools_wafsamba_wafsamba_py 13 Apr 2016
15:19:28 -0000
@@ -6,9 +6,9 @@ $OpenBSD: patch-buildtools_wafsamba_wafs
- make sure we don't clobber the version that ends up in tdb.pc
---- buildtools/wafsamba/wafsamba.py.orig Mon Apr 11 01:23:59 2016
-+++ buildtools/wafsamba/wafsamba.py Mon Apr 11 13:15:28 2016
-@@ -212,6 +212,14 @@ def SAMBA_LIBRARY(bld, libname, source,
+--- buildtools/wafsamba/wafsamba.py.orig Wed Apr 13 17:18:35 2016
++++ buildtools/wafsamba/wafsamba.py Wed Apr 13 17:18:35 2016
+@@ -217,6 +217,14 @@ def SAMBA_LIBRARY(bld, libname, source,
deps = TO_LIST(deps)
deps.append(obj_target)
@@ -23,7 +23,7 @@ $OpenBSD: patch-buildtools_wafsamba_wafs
realname = bld.map_shlib_extension(realname,
python=(target_type=='PYTHON'))
link_name = bld.map_shlib_extension(link_name,
python=(target_type=='PYTHON'))
-@@ -313,7 +321,7 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -328,7 +336,7 @@ def SAMBA_LIBRARY(bld, libname, source,
t.link_name = link_name
if pc_files is not None and not private_library:
Index: net/samba/patches/patch-buildtools_wafsamba_wscript
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-buildtools_wafsamba_wscript,v
retrieving revision 1.1
diff -u -p -r1.1 patch-buildtools_wafsamba_wscript
--- net/samba/patches/patch-buildtools_wafsamba_wscript 25 Aug 2015 11:04:39
-0000 1.1
+++ net/samba/patches/patch-buildtools_wafsamba_wscript 13 Apr 2016 15:19:28
-0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-buildtools_wafsamba_wscript,v 1.1 2015/08/25 11:04:39 jca Exp $
Add a hack to force addition of -I/usr/include before any other include path
discovered.
---- buildtools/wafsamba/wscript.orig Thu May 1 16:31:00 2014
-+++ buildtools/wafsamba/wscript Thu May 1 16:31:00 2014
-@@ -85,6 +85,11 @@ def set_options(opt):
+--- buildtools/wafsamba/wscript.orig Wed Apr 13 17:18:35 2016
++++ buildtools/wafsamba/wscript Wed Apr 13 17:18:35 2016
+@@ -82,6 +82,11 @@ def set_options(opt):
help=("Disable use of gettext"),
action="store_true", dest='disable_gettext', default=False)
Index: net/samba/patches/patch-examples_libsmbclient_teststat2_c
===================================================================
RCS file: net/samba/patches/patch-examples_libsmbclient_teststat2_c
diff -N net/samba/patches/patch-examples_libsmbclient_teststat2_c
--- net/samba/patches/patch-examples_libsmbclient_teststat2_c 25 Aug 2015
11:04:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-$OpenBSD: patch-examples_libsmbclient_teststat2_c,v 1.1 2015/08/25 11:04:39
jca Exp $
-Use safe and generic approach for time_t.
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=9889
---- examples/libsmbclient/teststat2.c.orig Mon Apr 8 20:44:21 2013
-+++ examples/libsmbclient/teststat2.c Mon Apr 8 20:44:59 2013
-@@ -47,10 +47,10 @@ static int gettime(const char * pUrl,
- return 1;
- }
-
-- printf("SAMBA\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
-- st.st_mtime, ctime_r(&st.st_mtime, m_time),
-- st.st_ctime, ctime_r(&st.st_ctime, c_time),
-- st.st_atime, ctime_r(&st.st_atime, a_time));
-+ printf("SAMBA\n mtime:%lld/%s ctime:%lld/%s atime:%lld/%s\n",
-+ (long long)st.st_mtime, ctime_r(&st.st_mtime, m_time),
-+ (long long)st.st_ctime, ctime_r(&st.st_ctime, c_time),
-+ (long long)st.st_atime, ctime_r(&st.st_atime, a_time));
-
-
- /* check the stat on this file */
-@@ -60,10 +60,10 @@ static int gettime(const char * pUrl,
- return 1;
- }
-
-- printf("LOCAL\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
-- st.st_mtime, ctime_r(&st.st_mtime, m_time),
-- st.st_ctime, ctime_r(&st.st_ctime, c_time),
-- st.st_atime, ctime_r(&st.st_atime, a_time));
-+ printf("LOCAL\n mtime:%lld/%s ctime:%lld/%s atime:%lld/%s\n",
-+ (long long)st.st_mtime, ctime_r(&st.st_mtime, m_time),
-+ (long long)st.st_ctime, ctime_r(&st.st_ctime, c_time),
-+ (long long)st.st_atime, ctime_r(&st.st_atime, a_time));
-
-
- return 0;
Index: net/samba/patches/patch-examples_libsmbclient_teststat_c
===================================================================
RCS file: net/samba/patches/patch-examples_libsmbclient_teststat_c
diff -N net/samba/patches/patch-examples_libsmbclient_teststat_c
--- net/samba/patches/patch-examples_libsmbclient_teststat_c 25 Aug 2015
11:04:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-$OpenBSD: patch-examples_libsmbclient_teststat_c,v 1.1 2015/08/25 11:04:39 jca
Exp $
-Use safe and generic approach for time_t.
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=9889
---- examples/libsmbclient/teststat.c.orig Mon Apr 8 20:06:15 2013
-+++ examples/libsmbclient/teststat.c Mon Apr 8 20:08:46 2013
-@@ -47,10 +47,10 @@ int main(int argc, char * argv[])
- return 1;
- }
-
-- printf("\nSAMBA\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
-- st.st_mtime, ctime_r(&st.st_mtime, m_time),
-- st.st_ctime, ctime_r(&st.st_ctime, c_time),
-- st.st_atime, ctime_r(&st.st_atime, a_time));
-+ printf("\nSAMBA\n mtime:%lld/%s ctime:%lld/%s atime:%llu/%s\n",
-+ (long long)st.st_mtime, ctime_r(&st.st_mtime, m_time),
-+ (long long)st.st_ctime, ctime_r(&st.st_ctime, c_time),
-+ (long long)st.st_atime, ctime_r(&st.st_atime, a_time));
-
- if (pLocalPath != NULL)
- {
-@@ -60,10 +60,10 @@ int main(int argc, char * argv[])
- return 1;
- }
-
-- printf("LOCAL\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
-- st.st_mtime, ctime_r(&st.st_mtime, m_time),
-- st.st_ctime, ctime_r(&st.st_ctime, c_time),
-- st.st_atime, ctime_r(&st.st_atime, a_time));
-+ printf("LOCAL\n mtime:%lld/%s ctime:%lld/%s atime:%lld/%s\n",
-+ (long long)st.st_mtime, ctime_r(&st.st_mtime, m_time),
-+ (long long)st.st_ctime, ctime_r(&st.st_ctime, c_time),
-+ (long long)st.st_atime, ctime_r(&st.st_atime, a_time));
- }
-
- return 0;
Index: net/samba/patches/patch-examples_libsmbclient_testutime_c
===================================================================
RCS file: net/samba/patches/patch-examples_libsmbclient_testutime_c
diff -N net/samba/patches/patch-examples_libsmbclient_testutime_c
--- net/samba/patches/patch-examples_libsmbclient_testutime_c 25 Aug 2015
11:04:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-$OpenBSD: patch-examples_libsmbclient_testutime_c,v 1.1 2015/08/25 11:04:39
jca Exp $
-Use safe and generic approach for time_t.
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=9889
---- examples/libsmbclient/testutime.c.orig Mon Apr 8 20:45:07 2013
-+++ examples/libsmbclient/testutime.c Mon Apr 8 20:45:33 2013
-@@ -47,10 +47,10 @@ int main(int argc, char * argv[])
- return 1;
- }
-
-- printf("Before\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
-- st.st_mtime, ctime_r(&st.st_mtime, m_time),
-- st.st_ctime, ctime_r(&st.st_ctime, c_time),
-- st.st_atime, ctime_r(&st.st_atime, a_time));
-+ printf("Before\n mtime:%lld/%s ctime:%lld/%s atime:%lld/%s\n",
-+ (long long)st.st_mtime, ctime_r(&st.st_mtime, m_time),
-+ (long long)st.st_ctime, ctime_r(&st.st_ctime, c_time),
-+ (long long)st.st_atime, ctime_r(&st.st_atime, a_time));
-
- utimbuf.actime = t; /* unchangable (wont change) */
- utimbuf.modtime = t; /* this one should succeed */
-@@ -66,10 +66,10 @@ int main(int argc, char * argv[])
- return 1;
- }
-
-- printf("After\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
-- st.st_mtime, ctime_r(&st.st_mtime, m_time),
-- st.st_ctime, ctime_r(&st.st_ctime, c_time),
-- st.st_atime, ctime_r(&st.st_atime, a_time));
-+ printf("After\n mtime:%lld/%s ctime:%lld/%s atime:%lld/%s\n",
-+ (long long)st.st_mtime, ctime_r(&st.st_mtime, m_time),
-+ (long long)st.st_ctime, ctime_r(&st.st_ctime, c_time),
-+ (long long)st.st_atime, ctime_r(&st.st_atime, a_time));
-
- return 0;
- }
Index: net/samba/patches/patch-lib_ldb_wscript
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-lib_ldb_wscript,v
retrieving revision 1.4
diff -u -p -r1.4 patch-lib_ldb_wscript
--- net/samba/patches/patch-lib_ldb_wscript 12 Apr 2016 17:42:09 -0000
1.4
+++ net/samba/patches/patch-lib_ldb_wscript 13 Apr 2016 15:19:28 -0000
@@ -4,17 +4,17 @@ $OpenBSD: patch-lib_ldb_wscript,v 1.4 20
2. Use -Wl,no-undefined as on other platforms.
---- lib/ldb/wscript.orig Thu Dec 10 10:23:28 2015
-+++ lib/ldb/wscript Sun Apr 10 19:38:17 2016
-@@ -54,6 +54,7 @@ def configure(conf):
+--- lib/ldb/wscript.orig Wed Apr 13 17:18:37 2016
++++ lib/ldb/wscript Wed Apr 13 17:18:37 2016
+@@ -53,6 +53,7 @@ def configure(conf):
conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') +
'/ldb')
conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
+ conf.env.standalone_ldb = True
if not conf.env.standalone_ldb:
- if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util',
minversion=SYSTEM_VERSION,
-@@ -74,8 +75,7 @@ def configure(conf):
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=VERSION,
+@@ -73,8 +74,7 @@ def configure(conf):
# we don't want any libraries or modules to rely on runtime
# resolution of symbols
Index: net/samba/patches/patch-lib_replace_wscript
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-lib_replace_wscript,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lib_replace_wscript
--- net/samba/patches/patch-lib_replace_wscript 12 Apr 2016 17:42:09 -0000
1.2
+++ net/samba/patches/patch-lib_replace_wscript 13 Apr 2016 15:19:28 -0000
@@ -5,9 +5,9 @@ succeeding erroneously (eg on hppa/mips6
Also fix atomic_add_32 check so that it doesn't get picked up instead.
---- lib/replace/wscript.orig Tue Sep 8 15:45:25 2015
-+++ lib/replace/wscript Sun Apr 10 19:38:58 2016
-@@ -197,23 +197,15 @@ def configure(conf):
+--- 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('''
Index: net/samba/patches/patch-python_samba_provision___init___py
===================================================================
RCS file:
/cvs/ports/net/samba/patches/patch-python_samba_provision___init___py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-python_samba_provision___init___py
--- net/samba/patches/patch-python_samba_provision___init___py 12 Apr 2016
17:42:09 -0000 1.2
+++ net/samba/patches/patch-python_samba_provision___init___py 13 Apr 2016
15:19:28 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-python_samba_provision__
- net/isc-bind group name
---- python/samba/provision/__init__.py.orig Tue Jul 21 11:47:49 2015
-+++ python/samba/provision/__init__.py Sun Apr 10 19:39:03 2016
-@@ -1966,7 +1966,7 @@ def provision(logger, session_info, smbconf=None,
+--- 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,
root_gid = pwd.getpwuid(root_uid).pw_gid
try:
Index: net/samba/patches/patch-source3_wscript
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-source3_wscript,v
retrieving revision 1.2
diff -u -p -r1.2 patch-source3_wscript
--- net/samba/patches/patch-source3_wscript 12 Apr 2016 17:42:09 -0000
1.2
+++ net/samba/patches/patch-source3_wscript 13 Apr 2016 15:19:28 -0000
@@ -1,11 +1,10 @@
$OpenBSD: patch-source3_wscript,v 1.2 2016/04/12 17:42:09 jca Exp $
- use more generic check for OpenBSD.
-- disable vfs_snapper.so to avoid a possibly useless dep on d-bus
---- source3/wscript.orig Mon Apr 11 19:08:44 2016
-+++ source3/wscript Mon Apr 11 21:32:23 2016
-@@ -74,7 +74,7 @@ def configure(conf):
+--- 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):
conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
conf.env.developer = True
@@ -13,13 +12,4 @@ $OpenBSD: patch-source3_wscript,v 1.2 20
+ if not sys.platform.startswith('openbsd'):
conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
- conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h netdb.h')
-@@ -1652,7 +1652,7 @@ main() {
- if conf.CONFIG_SET('HAVE_VXFS'):
- default_shared_modules.extend(TO_LIST('vfs_vxfs'))
-
-- if conf.CONFIG_SET('HAVE_DBUS'):
-+ if False:
- default_shared_modules.extend(TO_LIST('vfs_snapper'))
-
- explicit_shared_modules = TO_LIST(Options.options.shared_modules,
delimiter=',')
+ # We crash without vfs_default
Index: net/samba/patches/patch-source4_heimdal_build_wscript_build
===================================================================
RCS file:
/cvs/ports/net/samba/patches/patch-source4_heimdal_build_wscript_build,v
retrieving revision 1.1
diff -u -p -r1.1 patch-source4_heimdal_build_wscript_build
--- net/samba/patches/patch-source4_heimdal_build_wscript_build 25 Aug 2015
11:04:39 -0000 1.1
+++ net/samba/patches/patch-source4_heimdal_build_wscript_build 17 Apr 2016
20:27:44 -0000
@@ -1,11 +1,11 @@
$OpenBSD: patch-source4_heimdal_build_wscript_build,v 1.1 2015/08/25 11:04:39
jca Exp $
Make Samba4 WAF respect OpenBSD shared libraries versioning conventions.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9774
---- source4/heimdal_build/wscript_build.orig Thu Dec 5 10:16:48 2013
-+++ source4/heimdal_build/wscript_build Wed Jun 17 13:28:09 2015
+--- source4/heimdal_build/wscript_build.orig Sun Apr 17 22:05:54 2016
++++ source4/heimdal_build/wscript_build Sun Apr 17 22:27:32 2016
@@ -243,6 +243,11 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, versi
- features = 'cc cshlib symlink_lib install_lib'
+ features = 'c cshlib symlink_lib install_lib'
+ # OpenBSD-like library version handling
+ osvnum = os.getenv('LIB' + bundled_name.replace('-', '_') + '_VERSION')
Index: net/samba/pkg/PLIST-ldb
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-ldb,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-ldb
--- net/samba/pkg/PLIST-ldb 12 Apr 2016 17:42:09 -0000 1.2
+++ net/samba/pkg/PLIST-ldb 15 Apr 2016 16:06:14 -0000
@@ -15,6 +15,9 @@ include/samba-4.0/pyldb.h
@lib lib/libpyldb-util.so.${LIBpyldb-util_VERSION}
lib/pkgconfig/ldb.pc
lib/pkgconfig/pyldb-util.pc
+lib/python${MODPY_VERSION}/site-packages/_ldb_text.py
+lib/python${MODPY_VERSION}/site-packages/_ldb_text.pyc
+lib/python${MODPY_VERSION}/site-packages/_ldb_text.pyo
lib/python${MODPY_VERSION}/site-packages/ldb.so
lib/samba/ldb/
lib/samba/libldb-cmdline-samba4.so
Index: net/samba/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-main,v
retrieving revision 1.32
diff -u -p -r1.32 PLIST-main
--- net/samba/pkg/PLIST-main 12 Apr 2016 17:42:09 -0000 1.32
+++ net/samba/pkg/PLIST-main 17 Apr 2016 22:32:38 -0000
@@ -30,9 +30,7 @@ bin/samba-tool
@bin bin/smbget
@bin bin/smbpasswd
@bin bin/smbspool
-@bin bin/smbspool_krb5_wrapper
@bin bin/smbstatus
-@bin bin/smbta-util
bin/smbtar
@bin bin/smbtorture
@bin bin/smbtree
@@ -48,7 +46,6 @@ include/samba-4.0/core/werror.h
include/samba-4.0/credentials.h
include/samba-4.0/dcerpc.h
include/samba-4.0/dcerpc_server.h
-include/samba-4.0/dlinklist.h
include/samba-4.0/domain_credentials.h
include/samba-4.0/gen_ndr/
include/samba-4.0/gen_ndr/atsvc.h
@@ -56,22 +53,15 @@ include/samba-4.0/gen_ndr/auth.h
include/samba-4.0/gen_ndr/dcerpc.h
include/samba-4.0/gen_ndr/drsblobs.h
include/samba-4.0/gen_ndr/drsuapi.h
-include/samba-4.0/gen_ndr/epmapper.h
include/samba-4.0/gen_ndr/krb5pac.h
include/samba-4.0/gen_ndr/lsa.h
-include/samba-4.0/gen_ndr/mgmt.h
include/samba-4.0/gen_ndr/misc.h
include/samba-4.0/gen_ndr/nbt.h
include/samba-4.0/gen_ndr/ndr_atsvc.h
-include/samba-4.0/gen_ndr/ndr_atsvc_c.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/gen_ndr/ndr_epmapper.h
-include/samba-4.0/gen_ndr/ndr_epmapper_c.h
include/samba-4.0/gen_ndr/ndr_krb5pac.h
-include/samba-4.0/gen_ndr/ndr_mgmt.h
-include/samba-4.0/gen_ndr/ndr_mgmt_c.h
include/samba-4.0/gen_ndr/ndr_misc.h
include/samba-4.0/gen_ndr/ndr_nbt.h
include/samba-4.0/gen_ndr/ndr_samr.h
@@ -83,11 +73,6 @@ include/samba-4.0/gen_ndr/samr.h
include/samba-4.0/gen_ndr/security.h
include/samba-4.0/gen_ndr/server_id.h
include/samba-4.0/gen_ndr/svcctl.h
-include/samba-4.0/gensec.h
-include/samba-4.0/ldap-util.h
-include/samba-4.0/ldap_errors.h
-include/samba-4.0/ldap_message.h
-include/samba-4.0/ldap_ndr.h
include/samba-4.0/ldb_wrap.h
include/samba-4.0/libsmbclient.h
include/samba-4.0/lookup_sid.h
@@ -103,43 +88,18 @@ include/samba-4.0/netapi.h
include/samba-4.0/param.h
include/samba-4.0/passdb.h
include/samba-4.0/policy.h
-include/samba-4.0/read_smb.h
-include/samba-4.0/registry.h
-include/samba-4.0/roles.h
include/samba-4.0/rpc_common.h
include/samba-4.0/samba/
include/samba-4.0/samba/session.h
include/samba-4.0/samba/version.h
-include/samba-4.0/samba_util.h
include/samba-4.0/share.h
-include/samba-4.0/smb2.h
-include/samba-4.0/smb2_constants.h
-include/samba-4.0/smb2_create_blob.h
-include/samba-4.0/smb2_lease.h
include/samba-4.0/smb2_lease_struct.h
-include/samba-4.0/smb2_signing.h
-include/samba-4.0/smb_cli.h
-include/samba-4.0/smb_cliraw.h
-include/samba-4.0/smb_common.h
-include/samba-4.0/smb_composite.h
-include/samba-4.0/smb_constants.h
include/samba-4.0/smb_ldap.h
-include/samba-4.0/smb_raw.h
-include/samba-4.0/smb_raw_interfaces.h
-include/samba-4.0/smb_raw_signing.h
-include/samba-4.0/smb_raw_trans2.h
-include/samba-4.0/smb_request.h
-include/samba-4.0/smb_seal.h
-include/samba-4.0/smb_signing.h
-include/samba-4.0/smb_unix_ext.h
-include/samba-4.0/smb_util.h
include/samba-4.0/smbconf.h
include/samba-4.0/smbldap.h
include/samba-4.0/tdr.h
-include/samba-4.0/torture.h
include/samba-4.0/tsocket.h
include/samba-4.0/tsocket_internal.h
-include/samba-4.0/tstream_smbXcli_np.h
include/samba-4.0/util/
include/samba-4.0/util/attr.h
include/samba-4.0/util/blocking.h
@@ -163,50 +123,42 @@ include/samba-4.0/util/time.h
include/samba-4.0/util/xfile.h
include/samba-4.0/util_ldb.h
include/samba-4.0/wbclient.h
-@lib lib/libdcerpc-atsvc.so.${LIBdcerpc-atsvc_VERSION}
@lib lib/libdcerpc-binding.so.${LIBdcerpc-binding_VERSION}
@lib lib/libdcerpc-samr.so.${LIBdcerpc-samr_VERSION}
@lib lib/libdcerpc-server.so.${LIBdcerpc-server_VERSION}
@lib lib/libdcerpc.so.${LIBdcerpc_VERSION}
-@lib lib/libgensec.so.${LIBgensec_VERSION}
@lib lib/libndr-krb5pac.so.${LIBndr-krb5pac_VERSION}
@lib lib/libndr-nbt.so.${LIBndr-nbt_VERSION}
@lib lib/libndr-standard.so.${LIBndr-standard_VERSION}
@lib lib/libndr.so.${LIBndr_VERSION}
@lib lib/libnetapi.so.${LIBnetapi_VERSION}
-@lib lib/libregistry.so.${LIBregistry_VERSION}
@lib lib/libsamba-credentials.so.${LIBsamba-credentials_VERSION}
+@lib lib/libsamba-errors.so.${LIBsamba-errors_VERSION}
@lib lib/libsamba-hostconfig.so.${LIBsamba-hostconfig_VERSION}
@lib lib/libsamba-passdb.so.${LIBsamba-passdb_VERSION}
@lib lib/libsamba-policy.so.${LIBsamba-policy_VERSION}
@lib lib/libsamba-util.so.${LIBsamba-util_VERSION}
@lib lib/libsamdb.so.${LIBsamdb_VERSION}
-@lib lib/libsmbclient-raw.so.${LIBsmbclient-raw_VERSION}
@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/libtorture.so.${LIBtorture_VERSION}
@lib lib/libwbclient.so.${LIBwbclient_VERSION}
lib/pkgconfig/dcerpc.pc
-lib/pkgconfig/dcerpc_atsvc.pc
lib/pkgconfig/dcerpc_samr.pc
lib/pkgconfig/dcerpc_server.pc
-lib/pkgconfig/gensec.pc
lib/pkgconfig/ndr.pc
lib/pkgconfig/ndr_krb5pac.pc
lib/pkgconfig/ndr_nbt.pc
lib/pkgconfig/ndr_standard.pc
lib/pkgconfig/netapi.pc
-lib/pkgconfig/registry.pc
lib/pkgconfig/samba-credentials.pc
lib/pkgconfig/samba-hostconfig.pc
lib/pkgconfig/samba-policy.pc
lib/pkgconfig/samba-util.pc
lib/pkgconfig/samdb.pc
-lib/pkgconfig/smbclient-raw.pc
lib/pkgconfig/smbclient.pc
-lib/pkgconfig/torture.pc
lib/pkgconfig/wbclient.pc
lib/python${MODPY_VERSION}/site-packages/samba/
lib/python${MODPY_VERSION}/site-packages/samba/__init__.py
@@ -267,6 +219,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/drs_utils.pyc
lib/python${MODPY_VERSION}/site-packages/samba/drs_utils.pyo
lib/python${MODPY_VERSION}/site-packages/samba/dsdb.so
+lib/python${MODPY_VERSION}/site-packages/samba/dsdb_dns.so
lib/python${MODPY_VERSION}/site-packages/samba/gensec.so
lib/python${MODPY_VERSION}/site-packages/samba/getopt.py
lib/python${MODPY_VERSION}/site-packages/samba/getopt.pyc
@@ -375,9 +328,6 @@ lib/python${MODPY_VERSION}/site-packages
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
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/vampire.py
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/vampire.pyc
-lib/python${MODPY_VERSION}/site-packages/samba/netcmd/vampire.pyo
lib/python${MODPY_VERSION}/site-packages/samba/ntacls.py
lib/python${MODPY_VERSION}/site-packages/samba/ntacls.pyc
lib/python${MODPY_VERSION}/site-packages/samba/ntacls.pyo
@@ -398,6 +348,9 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/provision/sambadns.pyc
lib/python${MODPY_VERSION}/site-packages/samba/provision/sambadns.pyo
lib/python${MODPY_VERSION}/site-packages/samba/registry.so
+lib/python${MODPY_VERSION}/site-packages/samba/remove_dc.py
+lib/python${MODPY_VERSION}/site-packages/samba/remove_dc.pyc
+lib/python${MODPY_VERSION}/site-packages/samba/remove_dc.pyo
lib/python${MODPY_VERSION}/site-packages/samba/samba3/
lib/python${MODPY_VERSION}/site-packages/samba/samba3/__init__.py
lib/python${MODPY_VERSION}/site-packages/samba/samba3/__init__.pyc
@@ -420,6 +373,9 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/sites.pyc
lib/python${MODPY_VERSION}/site-packages/samba/sites.pyo
lib/python${MODPY_VERSION}/site-packages/samba/smb.so
+lib/python${MODPY_VERSION}/site-packages/samba/subnets.py
+lib/python${MODPY_VERSION}/site-packages/samba/subnets.pyc
+lib/python${MODPY_VERSION}/site-packages/samba/subnets.pyo
lib/python${MODPY_VERSION}/site-packages/samba/subunit/
lib/python${MODPY_VERSION}/site-packages/samba/subunit/__init__.py
lib/python${MODPY_VERSION}/site-packages/samba/subunit/__init__.pyc
@@ -460,6 +416,9 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/__init__.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/__init__.pyo
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/array.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/array.pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/array.pyo
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/bare.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/bare.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/bare.pyo
@@ -472,6 +431,9 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/misc.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/misc.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/misc.pyo
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/raw_protocol.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/raw_protocol.pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/raw_protocol.pyo
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/registry.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/registry.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/dcerpc/registry.pyo
@@ -579,6 +541,9 @@ lib/python${MODPY_VERSION}/site-packages
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/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
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/timecmd.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/timecmd.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/timecmd.pyo
@@ -666,8 +631,8 @@ lib/samba/ldb/aclread.so
lib/samba/ldb/anr.so
lib/samba/ldb/asq.so
lib/samba/ldb/descriptor.so
-lib/samba/ldb/dns_notify.so
lib/samba/ldb/dirsync.so
+lib/samba/ldb/dns_notify.so
lib/samba/ldb/extended_dn_in.so
lib/samba/ldb/extended_dn_out.so
lib/samba/ldb/extended_dn_store.so
@@ -734,6 +699,7 @@ lib/samba/libcli-spoolss-samba4.so
lib/samba/libcliauth-samba4.so
lib/samba/libcluster-samba4.so
lib/samba/libcmdline-credentials-samba4.so
+@lib lib/samba/libcom_err-samba4.so.${LIBcom_err-samba4_VERSION}
lib/samba/libdb-glue-samba4.so
lib/samba/libdbwrap-samba4.so
lib/samba/libdcerpc-samba-samba4.so
@@ -742,10 +708,10 @@ lib/samba/libdfs-server-ad-samba4.so
lib/samba/libdlz-bind9-for-torture-samba4.so
lib/samba/libdnsserver-common-samba4.so
lib/samba/libdsdb-module-samba4.so
-lib/samba/liberrors-samba4.so
lib/samba/libevents-samba4.so
lib/samba/libflag-mapping-samba4.so
lib/samba/libgenrand-samba4.so
+lib/samba/libgensec-samba4.so
lib/samba/libgpo-samba4.so
lib/samba/libgse-samba4.so
@lib lib/samba/libgssapi-samba4.so.${LIBgssapi-samba4_VERSION}
@@ -782,6 +748,7 @@ lib/samba/libpopt-samba3-samba4.so
lib/samba/libposix-eadb-samba4.so
lib/samba/libprinting-migrate-samba4.so
lib/samba/libprocess-model-samba4.so
+lib/samba/libregistry-samba4.so
@lib lib/samba/libroken-samba4.so.${LIBroken-samba4_VERSION}
lib/samba/libsamba-cluster-support-samba4.so
lib/samba/libsamba-debug-samba4.so
@@ -798,6 +765,7 @@ lib/samba/libserver-role-samba4.so
lib/samba/libservice-samba4.so
lib/samba/libshares-samba4.so
lib/samba/libsmb-transport-samba4.so
+lib/samba/libsmbclient-raw-samba4.so
lib/samba/libsmbd-base-samba4.so
lib/samba/libsmbd-conn-samba4.so
lib/samba/libsmbd-shim-samba4.so
@@ -809,6 +777,7 @@ lib/samba/libsys-rw-samba4.so
lib/samba/libtalloc-report-samba4.so
lib/samba/libtdb-wrap-samba4.so
lib/samba/libtime-basic-samba4.so
+lib/samba/libtorture-samba4.so
lib/samba/libtrusts-util-samba4.so
lib/samba/libutil-cmdline-samba4.so
lib/samba/libutil-reg-samba4.so
@@ -835,7 +804,6 @@ 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
@@ -859,16 +827,16 @@ lib/samba/vfs/full_audit.so
lib/samba/vfs/linux_xfs_sgid.so
lib/samba/vfs/media_harmony.so
lib/samba/vfs/netatalk.so
+lib/samba/vfs/offline.so
lib/samba/vfs/posix_eadb.so
lib/samba/vfs/preopen.so
lib/samba/vfs/readahead.so
lib/samba/vfs/readonly.so
lib/samba/vfs/recycle.so
-lib/samba/vfs/scannedonly.so
lib/samba/vfs/shadow_copy.so
lib/samba/vfs/shadow_copy2.so
lib/samba/vfs/shell_snap.so
-lib/samba/vfs/smb_traffic_analyzer.so
+lib/samba/vfs/snapper.so
lib/samba/vfs/streams_depot.so
lib/samba/vfs/streams_xattr.so
lib/samba/vfs/syncops.so
@@ -876,7 +844,6 @@ lib/samba/vfs/time_audit.so
lib/samba/vfs/unityed_media.so
lib/samba/vfs/worm.so
lib/samba/vfs/xattr_tdb.so
-lib/security/pam_smbpass.so
lib/security/pam_winbind.so
lib/winbind_krb5_locator.so
${P5SITE}/Parse/
@@ -911,6 +878,8 @@ ${P5SITE}/Parse/Pidl/Util.pm
${P5SITE}/Parse/Pidl/Wireshark/
${P5SITE}/Parse/Pidl/Wireshark/Conformance.pm
${P5SITE}/Parse/Pidl/Wireshark/NDR.pm
+libexec/samba/
+@bin libexec/samba/smbspool_krb5_wrapper
@man man/man1/dbwrap_tool.1
@man man/man1/findsmb.1
@man man/man1/gentest.1
@@ -954,6 +923,7 @@ ${P5SITE}/Parse/Pidl/Wireshark/NDR.pm
@man man/man7/libsmbclient.7
@man man/man7/samba.7
@man man/man7/winbind_krb5_locator.7
+@man man/man8/cifsdd.8
@man man/man8/eventlogadm.8
@man man/man8/idmap_ad.8
@man man/man8/idmap_autorid.8
@@ -975,7 +945,6 @@ ${P5SITE}/Parse/Pidl/Wireshark/NDR.pm
@man man/man8/smbpasswd.8
@man man/man8/smbspool.8
@man man/man8/smbspool_krb5_wrapper.8
-@man man/man8/smbta-util.8
@man man/man8/vfs_acl_tdb.8
@man man/man8/vfs_acl_xattr.8
@man man/man8/vfs_aio_fork.8
@@ -1001,16 +970,15 @@ ${P5SITE}/Parse/Pidl/Wireshark/NDR.pm
@man man/man8/vfs_linux_xfs_sgid.8
@man man/man8/vfs_media_harmony.8
@man man/man8/vfs_netatalk.8
+@man man/man8/vfs_offline.8
@man man/man8/vfs_prealloc.8
@man man/man8/vfs_preopen.8
@man man/man8/vfs_readahead.8
@man man/man8/vfs_readonly.8
@man man/man8/vfs_recycle.8
-@man man/man8/vfs_scannedonly.8
@man man/man8/vfs_shadow_copy.8
@man man/man8/vfs_shadow_copy2.8
@man man/man8/vfs_shell_snap.8
-@man man/man8/vfs_smb_traffic_analyzer.8
@man man/man8/vfs_snapper.8
@man man/man8/vfs_streams_depot.8
@man man/man8/vfs_streams_xattr.8
Index: x11/gnome/gvfs/Makefile
===================================================================
RCS file: /cvs/ports/x11/gnome/gvfs/Makefile,v
retrieving revision 1.153
diff -u -p -r1.153 Makefile
--- x11/gnome/gvfs/Makefile 12 Apr 2016 17:43:31 -0000 1.153
+++ x11/gnome/gvfs/Makefile 18 Apr 2016 00:43:31 -0000
@@ -15,7 +15,7 @@ PKGNAME-goa= ${GNOME_PROJECT}-goa-${GNO
PKGNAME-nfs= ${GNOME_PROJECT}-nfs-${GNOME_VERSION}
PKGNAME-google= ${GNOME_PROJECT}-google-${GNOME_VERSION}
-REVISION-smb= 0
+REVISION-smb= 1
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
@@ -40,7 +40,7 @@ WANTLIB-main += gcrypt gpg-error secret-
WANTLIB-smb += ${WANTLIB}
WANTLIB-smb += gcrypt gpg-error secret-1 smbclient gck-1 gcr-base-3
-WANTLIB-smb += com_err crypto dcerpc-binding execinfo gensec gmp gnutls
+WANTLIB-smb += com_err crypto dcerpc-binding execinfo gmp gnutls
WANTLIB-smb += hogweed idn lber-2.4 ldap-2.4 ldb ndr ndr-krb5pac ndr-nbt
WANTLIB-smb += ndr-standard nettle p11-kit replace
WANTLIB-smb += samba-credentials samba-hostconfig samba-util samdb
Index: x11/kde/base3/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde/base3/Makefile,v
retrieving revision 1.138
diff -u -p -r1.138 Makefile
--- x11/kde/base3/Makefile 12 Apr 2016 17:43:31 -0000 1.138
+++ x11/kde/base3/Makefile 18 Apr 2016 00:45:30 -0000
@@ -14,7 +14,7 @@ PKGNAME-locale = kde3-locale-${VERSION}
PKG_ARCH-en_US = *
PKG_ARCH-locale = *
REVISION-main = 42
-REVISION-samba = 18
+REVISION-samba = 19
REVISION-en_US = 2
REVISION-locale = 2
@@ -93,7 +93,7 @@ WANTLIB-samba += execinfo ndr ndr-standa
WANTLIB-samba += samba-util smbclient smbconf talloc tdb tevent
WANTLIB-samba += tevent-util
WANTLIB-samba += X11-xcb Xdamage Xxf86vm com_err dcerpc-binding drm
-WANTLIB-samba += ffi gcrypt gensec glapi gmp gnutls gpg-error hogweed
+WANTLIB-samba += ffi gcrypt glapi gmp gnutls gpg-error hogweed
WANTLIB-samba += ldb ndr-krb5pac ndr-nbt nettle p11-kit samba-credentials
WANTLIB-samba += samdb tasn1 wbclient xcb-dri2 xcb-glx
WANTLIB-samba += lib/samba/asn1-samba4 lib/samba/gssapi-samba4
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
