cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to samba-4.6.11

Browse Source 
See https://wiki.samba.org/index.php/Samba_4.6_Features_added/changed
for a ChangeLog.  samba-4.6.10 bulk build & ok ajacoutot@, tests by Ian;
samba-4.6.11 just adds a bunch of security fixes over 4.6.10.
This commit is contained in:
jca 2017-11-22 16:15:44 +00:00
parent d8eb8e9d68
commit b079a2af84
7 changed files with 77 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
net/samba/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.245 2017/11/22 15:09:24 jca Exp $
# $OpenBSD: Makefile,v 1.246 2017/11/22 16:15:44 jca Exp $
VERSION = 4.5.15
VERSION = 4.6.11
DISTNAME = samba-${VERSION}
COMMENT-main = SMB and CIFS client and server for UNIX
@ -15,20 +15,17 @@ PKGNAME-tevent = tevent-${TEVENT_V}
PKGNAME-util = samba-util-${VERSION}
PKGNAME-docs = samba-docs-${VERSION}
REVISION-tevent = 2
REVISION-ldb = 1
PKG_ARCH-docs = *
LDB_V = 1.1.27
TEVENT_V = 0.9.29
LDB_V = 1.1.29
TEVENT_V = 0.9.34
SHARED_LIBS = asn1-samba4 0.0 \
com_err-samba4 0.0 \
dcerpc 0.0 \
dcerpc-binding 1.0 \
dcerpc-binding 1.1 \
dcerpc-samr 0.0 \
dcerpc-server 2.0 \
dcerpc-server 3.0 \
gssapi-samba4 0.0 \
hcrypto-samba4 0.0 \
hdb-samba4 0.0 \
@ -36,31 +33,31 @@ SHARED_LIBS = asn1-samba4 0.0 \
heimntlm-samba4 0.0 \
hx509-samba4 0.0 \
kdc-samba4 0.0 \
krb5-samba4 0.0 \
ldb 0.3 \
krb5-samba4 0.1 \
ldb 0.4 \
ndr 0.2 \
ndr-krb5pac 0.1 \
ndr-nbt 0.1 \
ndr-standard 1.0 \
ndr-standard 2.0 \
netapi 2.0 \
pyldb-util 0.0 \
pyldb-util 0.1 \
roken-samba4 0.0 \
samba-credentials 0.0 \
samba-credentials 0.1 \
samba-errors 0.0 \
samba-hostconfig 2.0 \
samba-passdb 0.1 \
samba-hostconfig 2.1 \
samba-passdb 1.0 \
samba-policy 0.0 \
samba-util 1.1 \
samba-util 2.0 \
samdb 0.0 \
smbclient 4.1 \
smbconf 1.0 \
smbconf 2.0 \
smbldap 0.0 \
tevent 0.2 \
tevent 0.3 \
tevent-util 0.1 \
wbclient 3.1 \
wind-samba4 0.0 \
replace 1.0 \
util-setid 1.0
replace 2.0 \
util-setid 2.0
CATEGORIES = net sysutils security
@ -103,7 +100,8 @@ MULTI_PACKAGES = -main -ldb -tevent -util -docs
MODULES = lang/python perl
BUILD_DEPENDS = devel/p5-Parse-Yapp>=1.0.5 \
BUILD_DEPENDS = devel/cmocka \
devel/p5-Parse-Yapp>=1.0.5 \
net/py-dnspython \
textproc/docbook-xsl \
x11/dbus

4
net/samba/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (samba-4.5.15.tar.gz) = gRv3J4kqHh49Fw63LrOcQ9Bu2P9Vfl4DakGqvBkAjpQ=
SIZE (samba-4.5.15.tar.gz) = 21020181
SHA256 (samba-4.6.11.tar.gz) = BRt6sPoIjXfcDfA5/11rj9mYNy8MKey0VbFJRXwg7R0=
SIZE (samba-4.6.11.tar.gz) = 21157318

11
net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py
View File

@ -1,12 +1,13 @@
$OpenBSD: patch-buildtools_wafsamba_samba_autoconf_py,v 1.5 2016/11/09 15:59:37 jca Exp $
$OpenBSD: patch-buildtools_wafsamba_samba_autoconf_py,v 1.6 2017/11/22 16:15:44 jca Exp $
1. Sort -L flags to unbreak linking when any other version of Samba is installed.
2. Use -Wl,-no-undefined as on other platforms.
--- 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):
Index: buildtools/wafsamba/samba_autoconf.py
--- buildtools/wafsamba/samba_autoconf.py.orig
+++ buildtools/wafsamba/samba_autoconf.py
@@ -806,6 +806,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 +35,7 @@ $OpenBSD: patch-buildtools_wafsamba_samba_autoconf_py,v 1.5 2016/11/09 15:59:37
return flags
@@ -868,10 +889,9 @@ def SETUP_CONFIGURE_CACHE(conf, enable):
@@ -869,10 +890,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

14
net/samba/patches/patch-lib_replace_wscript Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-lib_replace_wscript,v 1.8 2017/11/22 16:15:44 jca Exp $
Index: lib/replace/wscript
--- lib/replace/wscript.orig
+++ lib/replace/wscript
@@ -167,6 +167,8 @@ def configure(conf):
msg='Checking for IPV6_V6ONLY in linux/in6.h',
local_include=False)
+ # these headers need to be tested as a group on freebsd and openbsd
+ conf.CHECK_HEADERS(headers='sys/socket.h net/if.h', together=True)
conf.CHECK_CODE('''
struct sockaddr_storage sa_store;
struct addrinfo *ai = NULL;

16
net/samba/patches/patch-lib_tevent_tevent_internal_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-lib_tevent_tevent_internal_h,v 1.1 2017/11/22 16:15:44 jca Exp $
Index: lib/tevent/tevent_internal.h
--- lib/tevent/tevent_internal.h.orig
+++ lib/tevent/tevent_internal.h
@@ -27,6 +27,10 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#ifdef HAVE_PTHREAD
+#include <pthread.h>
+#endif
+
struct tevent_req {
/**
* @brief What to do on completion

9
net/samba/pkg/PLIST-docs
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.24 2016/04/12 17:42:09 jca Exp $
@comment $OpenBSD: PLIST-docs,v 1.25 2017/11/22 16:15:44 jca Exp $
@pkgpath net/samba,-docs
share/examples/samba/LDAP/
share/examples/samba/LDAP/README
@ -42,6 +42,13 @@ share/examples/samba/autofs/auto.smb
share/examples/samba/dce-dfs/
share/examples/samba/dce-dfs/README
share/examples/samba/dce-dfs/smb.conf
share/examples/samba/fuse/
share/examples/samba/fuse/README
share/examples/samba/fuse/clifuse.c
share/examples/samba/fuse/clifuse.h
share/examples/samba/fuse/smb2mount.c
share/examples/samba/fuse/wscript
share/examples/samba/fuse/wscript_build
share/examples/samba/libsmbclient/
share/examples/samba/libsmbclient/Makefile
share/examples/samba/libsmbclient/Makefile.internal.in

14
net/samba/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.38 2017/03/12 22:19:50 jca Exp $
@comment $OpenBSD: PLIST-main,v 1.39 2017/11/22 16:15:44 jca Exp $
@pkgpath net/samba,ldap,-main
@pkgpath net/samba,ads,-main
@pkgpath net/samba,,-main
@ -9,6 +9,7 @@ bin/findsmb
@bin bin/gentest
@bin bin/locktest
@bin bin/masktest
@bin bin/mvxattr
@bin bin/ndrdump
@bin bin/net
@bin bin/nmblookup
@ -122,7 +123,6 @@ include/samba-4.0/util/tevent_ntstatus.h
include/samba-4.0/util/tevent_unix.h
include/samba-4.0/util/tevent_werror.h
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-binding.so.${LIBdcerpc-binding_VERSION}
@ -161,6 +161,8 @@ lib/pkgconfig/samba-util.pc
lib/pkgconfig/samdb.pc
lib/pkgconfig/smbclient.pc
lib/pkgconfig/wbclient.pc
lib/python${MODPY_VERSION}/
lib/python${MODPY_VERSION}/site-packages/
lib/python${MODPY_VERSION}/site-packages/samba/
lib/python${MODPY_VERSION}/site-packages/samba/__init__.py
lib/python${MODPY_VERSION}/site-packages/samba/__init__.pyc
@ -546,6 +548,9 @@ lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/__init__.${MODPY
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/base.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/base.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/base.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/dnscmd.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/dnscmd.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/dnscmd.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/fsmo.py
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/fsmo.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tests/samba_tool/fsmo.${MODPY_PYOEXTENSION}
@ -803,7 +808,6 @@ lib/samba/libsmbd-conn-samba4.so
lib/samba/libsmbd-shim-samba4.so
lib/samba/libsmbldaphelper-samba4.so
lib/samba/libsmbpasswdparser-samba4.so
lib/samba/libsmbregistry-samba4.so
lib/samba/libsocket-blocking-samba4.so
lib/samba/libsys-rw-samba4.so
lib/samba/libtalloc-report-samba4.so
@ -877,6 +881,7 @@ 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/
lib/security/pam_winbind.so
lib/winbind_krb5_locator.so
${P5SITE}/Parse/
@ -919,6 +924,7 @@ libexec/samba/
@man man/man1/locktest.1
@man man/man1/log2pcap.1
@man man/man1/masktest.1
@man man/man1/mvxattr.1
@man man/man1/ndrdump.1
@man man/man1/nmblookup.1
@man man/man1/ntlm_auth.1
@ -1032,10 +1038,12 @@ sbin/samba_upgradedns
@bin sbin/smbd
@bin sbin/winbindd
share/doc/pkg-readmes/${FULLPKGNAME}
@comment share/doc/samba/
share/examples/samba/
@sample ${SYSCONFDIR}/samba/
share/examples/samba/smb.conf.default
@sample ${SYSCONFDIR}/samba/smb.conf
@comment share/perl5/
share/samba/
share/samba/setup/
share/samba/setup/DB_CONFIG