Hi,
here's an update to samba-4.10.10 I already sent earlier, along with the
required databases/tdb and devel/libtalloc updates. Additional tweaks:
- remove gratuitous --bundled-libraries= change in previous
- also provide DEBUG_PACKAGES for tdb and libtalloc
I only lightly tested smbd. Real world tests reports and oks welcome.
Index: databases/tdb/Makefile
===================================================================
RCS file: /cvs/ports/databases/tdb/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- databases/tdb/Makefile 8 Nov 2019 19:44:31 -0000 1.30
+++ databases/tdb/Makefile 26 Nov 2019 15:14:14 -0000
@@ -3,10 +3,9 @@
COMMENT= trivial database library
# Keep in sync with the version bundled in net/samba
-DISTNAME= tdb-1.3.16
-REVISION= 1
+DISTNAME= tdb-1.3.18
-SHARED_LIBS+= tdb 4.3
+SHARED_LIBS+= tdb 4.4
CATEGORIES= databases
@@ -19,8 +18,9 @@ PERMIT_PACKAGE= Yes
WANTLIB += c intl m pthread util ${MODPY_WANTLIB}
-MASTER_SITES= https://filedump.se.rit.edu/pub/distfiles/ \
- https://download.samba.org/pub/tdb/
+MASTER_SITES= https://download.samba.org/pub/tdb/
+
+DEBUG_PACKAGES= ${BUILD_PACKAGES}
MODULES= lang/python
MODPY_RUNDEP= No
Index: databases/tdb/distinfo
===================================================================
RCS file: /cvs/ports/databases/tdb/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- databases/tdb/distinfo 12 Aug 2018 22:57:21 -0000 1.13
+++ databases/tdb/distinfo 26 Nov 2019 15:14:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (tdb-1.3.16.tar.gz) = aj/CYWVn8jmTmEraPOqX2VOidmn/0b+76WHybgz5bMU=
-SIZE (tdb-1.3.16.tar.gz) = 504330
+SHA256 (tdb-1.3.18.tar.gz) = wVa0Doi8gqU4iTQ3zXY9JvvtU3mHHg9yGf0CHmDTNrc=
+SIZE (tdb-1.3.18.tar.gz) = 697970
Index: databases/tdb/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/databases/tdb/patches/patch-Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile
--- databases/tdb/patches/patch-Makefile 18 Jul 2015 02:11:13 -0000 1.1
+++ databases/tdb/patches/patch-Makefile 26 Nov 2019 15:14:14 -0000
@@ -1,11 +1,13 @@
$OpenBSD: patch-Makefile,v 1.1 2015/07/18 02:11:13 jca Exp $
---- Makefile.orig Thu Jul 16 12:58:06 2015
-+++ Makefile Thu Jul 16 12:58:16 2015
-@@ -1,6 +1,6 @@
- # simple makefile wrapper to run waf
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -2,7 +2,7 @@
--WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
-+WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf $(WAF_ARGS)
+ WAF_BIN=`PATH=buildtools/bin:../../buildtools/bin:$$PATH which waf`
+ WAF_BINARY=$(PYTHON) $(WAF_BIN)
+-WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
++WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY) $(WAF_ARGS)
all:
$(WAF) build
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.4
diff -u -p -r1.4 patch-buildtools_wafsamba_samba_install_py
--- databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py 25 Apr 2016 08:13:41 -0000 1.4
+++ databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py 26 Nov 2019 15:14:14 -0000
@@ -3,8 +3,9 @@ $OpenBSD: patch-buildtools_wafsamba_samb
- respect OpenBSD shared libraries versioning
- --version-script fails if specified multipled times
---- buildtools/wafsamba/samba_install.py.orig Thu Dec 10 12:01:40 2015
-+++ buildtools/wafsamba/samba_install.py Sat Apr 23 18:40:25 2016
+Index: buildtools/wafsamba/samba_install.py
+--- buildtools/wafsamba/samba_install.py.orig
++++ buildtools/wafsamba/samba_install.py
@@ -117,11 +117,15 @@ def install_library(self):
else:
inst_name = bld.make_libname(t.target)
@@ -24,7 +25,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', ''):
-@@ -171,7 +175,7 @@ def apply_vscript(self):
+@@ -172,7 +176,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.7
diff -u -p -r1.7 patch-buildtools_wafsamba_wafsamba_py
--- databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py 12 Aug 2018 22:57:21 -0000 1.7
+++ databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py 26 Nov 2019 15:14:14 -0000
@@ -6,7 +6,7 @@ $OpenBSD: patch-buildtools_wafsamba_wafs
Index: buildtools/wafsamba/wafsamba.py
--- buildtools/wafsamba/wafsamba.py.orig
+++ buildtools/wafsamba/wafsamba.py
-@@ -222,6 +222,13 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -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'))
@@ -20,10 +20,10 @@ Index: buildtools/wafsamba/wafsamba.py
# 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:
-@@ -331,9 +338,9 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -325,9 +332,9 @@ def SAMBA_LIBRARY(bld, libname, source,
if pc_files is not None and not private_library:
- if pyembed and bld.env['IS_EXTRA_PYTHON']:
+ if pyembed:
- bld.PKG_CONFIG_FILES(pc_files, vnum=vnum, extra_name=bld.env['PYTHON_SO_ABI_FLAG'])
+ bld.PKG_CONFIG_FILES(pc_files, vnum=saved_lib_version, extra_name=bld.env['PYTHON_SO_ABI_FLAG'])
else:
Index: databases/tdb/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/tdb/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- databases/tdb/pkg/PLIST 22 Jun 2019 23:04:49 -0000 1.9
+++ databases/tdb/pkg/PLIST 26 Nov 2019 15:14:14 -0000
@@ -9,7 +9,7 @@ include/tdb.h
lib/pkgconfig/tdb.pc
lib/python${MODPY_VERSION}/site-packages/_tdb_text.py
lib/python${MODPY_VERSION}/site-packages/_tdb_text.pyc
-lib/python${MODPY_VERSION}/site-packages/tdb.so
+@so lib/python${MODPY_VERSION}/site-packages/tdb.so
@man man/man8/tdbbackup.8
@man man/man8/tdbdump.8
@man man/man8/tdbrestore.8
Index: devel/libtalloc/Makefile
===================================================================
RCS file: /cvs/ports/devel/libtalloc/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- devel/libtalloc/Makefile 8 Nov 2019 19:44:31 -0000 1.22
+++ devel/libtalloc/Makefile 26 Nov 2019 15:14:14 -0000
@@ -3,9 +3,8 @@
COMMENT= hierarchical memory pool system with destructors
# Keep in sync with the version bundled in net/samba
-DISTNAME= talloc-2.1.14
+DISTNAME= talloc-2.1.16
PKGNAME= lib${DISTNAME}
-REVISION= 0
SHARED_LIBS+= talloc 1.1
SHARED_LIBS+= pytalloc-util 0.1
@@ -21,8 +20,9 @@ PERMIT_PACKAGE= Yes
WANTLIB += intl m pthread util ${MODPY_WANTLIB}
-MASTER_SITES= https://filedump.se.rit.edu/pub/distfiles/ \
- https://download.samba.org/pub/talloc/
+MASTER_SITES= https://download.samba.org/pub/talloc/
+
+DEBUG_PACKAGES= ${BUILD_PACKAGES}
MODULES= lang/python
MODPY_RUNDEP= No
Index: devel/libtalloc/distinfo
===================================================================
RCS file: /cvs/ports/devel/libtalloc/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- devel/libtalloc/distinfo 12 Aug 2018 22:29:10 -0000 1.11
+++ devel/libtalloc/distinfo 26 Nov 2019 15:14:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (talloc-2.1.14.tar.gz) = sYVgJ1amKLrFB/qK+LnfkqzmnSfArdXauTGQrXwzZ84=
-SIZE (talloc-2.1.14.tar.gz) = 444589
+SHA256 (talloc-2.1.16.tar.gz) = GVv2gwoHDesRxJK4zVdaWc1NO2NBZPP2k/Y4j4BqUqk=
+SIZE (talloc-2.1.16.tar.gz) = 634906
Index: devel/libtalloc/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/devel/libtalloc/patches/patch-Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile
--- devel/libtalloc/patches/patch-Makefile 18 Jul 2015 02:13:25 -0000 1.1
+++ devel/libtalloc/patches/patch-Makefile 26 Nov 2019 15:14:14 -0000
@@ -1,11 +1,13 @@
$OpenBSD: patch-Makefile,v 1.1 2015/07/18 02:13:25 jca Exp $
---- Makefile.orig Wed Jul 15 22:53:08 2015
-+++ Makefile Wed Jul 15 22:52:56 2015
-@@ -1,6 +1,6 @@
- # simple makefile wrapper to run waf
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -2,7 +2,7 @@
--WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
-+WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf ${WAF_ARGS}
+ WAF_BIN=`PATH=buildtools/bin:../../buildtools/bin:$$PATH which waf`
+ WAF_BINARY=$(PYTHON) $(WAF_BIN)
+-WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
++WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY) $(WAR_ARGS)
all:
$(WAF) build
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.3
diff -u -p -r1.3 patch-buildtools_wafsamba_samba_install_py
--- devel/libtalloc/patches/patch-buildtools_wafsamba_samba_install_py 22 Apr 2016 11:44:48 -0000 1.3
+++ devel/libtalloc/patches/patch-buildtools_wafsamba_samba_install_py 26 Nov 2019 15:14:14 -0000
@@ -3,8 +3,9 @@ $OpenBSD: patch-buildtools_wafsamba_samb
- respect OpenBSD shared libraries versioning
- --version-script fails if specified multipled times
---- 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
+Index: buildtools/wafsamba/samba_install.py
+--- buildtools/wafsamba/samba_install.py.orig
++++ buildtools/wafsamba/samba_install.py
@@ -117,11 +117,15 @@ def install_library(self):
else:
inst_name = bld.make_libname(t.target)
@@ -24,7 +25,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', ''):
-@@ -171,7 +175,7 @@ def apply_vscript(self):
+@@ -172,7 +176,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.4
diff -u -p -r1.4 patch-buildtools_wafsamba_wafsamba_py
--- devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py 9 Feb 2018 11:04:13 -0000 1.4
+++ devel/libtalloc/patches/patch-buildtools_wafsamba_wafsamba_py 26 Nov 2019 15:14:14 -0000
@@ -5,7 +5,7 @@ $OpenBSD: patch-buildtools_wafsamba_wafs
Index: buildtools/wafsamba/wafsamba.py
--- buildtools/wafsamba/wafsamba.py.orig
+++ buildtools/wafsamba/wafsamba.py
-@@ -222,6 +222,12 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -214,6 +214,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/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/libtalloc/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- devel/libtalloc/pkg/PLIST 18 Jul 2015 02:13:25 -0000 1.3
+++ devel/libtalloc/pkg/PLIST 26 Nov 2019 15:14:14 -0000
@@ -5,5 +5,5 @@ include/talloc.h
@lib lib/libtalloc.so.${LIBtalloc_VERSION}
lib/pkgconfig/pytalloc-util.pc
lib/pkgconfig/talloc.pc
-lib/python${MODPY_VERSION}/site-packages/talloc.so
+@so lib/python${MODPY_VERSION}/site-packages/talloc.so
@man man/man3/talloc.3
Index: net/samba/Makefile
===================================================================
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.280
diff -u -p -r1.280 Makefile
--- net/samba/Makefile 30 Oct 2019 13:03:11 -0000 1.280
+++ net/samba/Makefile 26 Nov 2019 15:14:14 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.280 2019/10/30 13:03:11 jca Exp $
-VERSION = 4.9.15
+VERSION = 4.10.10
DISTNAME = samba-${VERSION}
COMMENT-main = SMB and CIFS client and server for UNIX
@@ -17,17 +17,15 @@ PKGNAME-docs = samba-docs-${VERSION}
PKG_ARCH-docs = *
-LDB_V = 1.4.8
-TEVENT_V = 0.9.37
-
-REVISION-tevent = 0
+LDB_V = 1.5.6
+TEVENT_V = 0.9.39
SHARED_LIBS = asn1-samba4 0.0 \
com_err-samba4 0.0 \
dcerpc 0.0 \
- dcerpc-binding 1.1 \
+ dcerpc-binding 1.2 \
dcerpc-samr 0.0 \
- dcerpc-server 5.0 \
+ dcerpc-server 6.0 \
gssapi-samba4 0.0 \
hcrypto-samba4 0.0 \
hdb-samba4 0.0 \
@@ -36,8 +34,8 @@ SHARED_LIBS = asn1-samba4 0.0 \
hx509-samba4 0.0 \
kdc-samba4 0.0 \
krb5-samba4 0.1 \
- ldb 0.9 \
- ndr 0.3 \
+ ldb 0.10 \
+ ndr 0.4 \
ndr-krb5pac 0.1 \
ndr-nbt 0.1 \
ndr-standard 3.0 \
@@ -46,20 +44,20 @@ SHARED_LIBS = asn1-samba4 0.0 \
roken-samba4 0.0 \
samba-credentials 0.2 \
samba-errors 1.0 \
- samba-hostconfig 4.1 \
+ samba-hostconfig 5.0 \
samba-passdb 2.1 \
samba-policy 0.0 \
- samba-util 4.0 \
+ samba-util 5.0 \
samdb 0.2 \
- smbclient 4.3 \
- smbconf 6.0 \
+ smbclient 4.4 \
+ smbconf 7.0 \
smbldap 0.1 \
tevent 0.5 \
tevent-util 1.1 \
- wbclient 3.2 \
+ wbclient 3.3 \
wind-samba4 0.0 \
- replace 9.0 \
- util-setid 9.0
+ replace 10.0 \
+ util-setid 10.0
CATEGORIES = net sysutils security
@@ -81,25 +79,25 @@ WANTLIB-common = c pthread
WANTLIB-main = ${WANTLIB-common} ${MODPY_WANTLIB}
WANTLIB-main += crypto curses m util z
WANTLIB-main += avahi-client avahi-common cups dbus-1 execinfo fam
-WANTLIB-main += iconv intl jansson lber ldap pam popt gnutls
-WANTLIB-main += ldb pyldb-util pytalloc-util readline tdb talloc tevent
+WANTLIB-main += iconv intl jansson lber ldap pam popt gcrypt gnutls ldb
+WANTLIB-main += pyldb-util pytalloc-util readline tasn1 tdb talloc tevent
WANTLIB-main += ${UTIL_WANTLIB}
WANTLIB-ldb = ${WANTLIB-common} ${MODPY_WANTLIB}
-WANTLIB-ldb += lber ldap popt m talloc tdb tevent util
+WANTLIB-ldb += intl lber ldap popt m replace talloc tdb tevent util
WANTLIB-tevent = ${WANTLIB-common} ${MODPY_WANTLIB}
-WANTLIB-tevent += m talloc util
+WANTLIB-tevent += intl m replace talloc util
WANTLIB-util = ${WANTLIB-common}
WANTLIB-docs =
-MASTER_SITES = https://filedump.se.rit.edu/pub/distfiles/ \
- https://download.samba.org/pub/samba/stable/ \
+MASTER_SITES = https://download.samba.org/pub/samba/stable/ \
https://download.samba.org/pub/samba/old-versions/
MULTI_PACKAGES = -main -ldb -tevent -util -docs
+DEBUG_PACKAGES = ${BUILD_PACKAGES}
MODULES = lang/python perl
@@ -126,16 +124,19 @@ LIB_DEPENDS-main = ${BUILD_PKGPATH},-ldb
net/avahi \
print/cups,-libs \
security/gnutls \
+ security/libgcrypt \
security/openpam \
sysutils/gamin
LIB_DEPENDS-ldb = ${BUILD_PKGPATH},-tevent>=${TEVENT_V} \
+ ${BUILD_PKGPATH},-util>=${VERSION} \
devel/popt \
databases/openldap \
databases/tdb>=1.3.14 \
devel/libtalloc>=2.1.9
-LIB_DEPENDS-tevent = devel/libtalloc>=2.1.9
+LIB_DEPENDS-tevent = devel/libtalloc>=2.1.9 \
+ ${BUILD_PKGPATH},-util>=${VERSION}
LIB_DEPENDS-docs =
@@ -178,7 +179,9 @@ WAF_ARGS = -v -j ${MAKE_JOBS}
CONFIGURE_ENV = LC_ALL=en_US.UTF-8 \
CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}" \
- CPP="/usr/libexec/cpp"
+ CPP="/usr/libexec/cpp" \
+ CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
MAKE_ENV = LC_ALL=en_US.UTF-8 \
PYTHON=${MODPY_BIN} \
@@ -195,11 +198,6 @@ SUBST_VARS = SAMBA_LOGDIR
post-patch:
find ${WRKSRC} -type f | xargs ${MODPY_BIN_ADJ}
-
-# Avoid bogus -L/usr/local/lib at the start of linker options
-post-configure:
- perl -pi.ldflags -e 's/^LINKFLAGS_PYEMBED.*/LINKFLAGS_PYEMBED = []/' \
- ${WRKBUILD}/bin/c4che/default.cache.py
post-install:
# removing extra files
Index: net/samba/distinfo
===================================================================
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.78
diff -u -p -r1.78 distinfo
--- net/samba/distinfo 30 Oct 2019 12:20:48 -0000 1.78
+++ net/samba/distinfo 26 Nov 2019 15:14:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (samba-4.9.15.tar.gz) = N3ECuAuXlBvw0TG4KMroQVGQ5b3SkowuLJVOKfGQRJY=
-SIZE (samba-4.9.15.tar.gz) = 18110369
+SHA256 (samba-4.10.10.tar.gz) = cAxzS1FhDi/qoNZ0T5vsDA2JF7yozHjVtjpFkfMoZqU=
+SIZE (samba-4.10.10.tar.gz) = 18335638
Index: net/samba/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile
--- net/samba/patches/patch-Makefile 25 Aug 2015 11:04:39 -0000 1.1
+++ net/samba/patches/patch-Makefile 26 Nov 2019 15:14:14 -0000
@@ -1,14 +1,14 @@
$OpenBSD: patch-Makefile,v 1.1 2015/08/25 11:04:39 jca Exp $
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9886
---- Makefile.orig Fri Apr 26 00:49:58 2013
-+++ Makefile Fri Apr 26 00:50:45 2013
-@@ -2,7 +2,8 @@
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -1,7 +1,7 @@
+ # simple makefile wrapper to run waf
- PYTHON?=python
WAF_BINARY=$(PYTHON) ./buildtools/bin/waf
--WAF=WAF_MAKE=1 $(WAF_BINARY)
-+WAF_ARGS?=
-+WAF=WAF_MAKE=1 $(WAF_BINARY) $(WAF_ARGS)
+-WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
++WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY) $(WAF_ARGS)
all:
$(WAF) build
Index: net/samba/patches/patch-auth_auth_log_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-auth_auth_log_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-auth_auth_log_c
--- net/samba/patches/patch-auth_auth_log_c 7 Oct 2019 12:50:13 -0000 1.2
+++ net/samba/patches/patch-auth_auth_log_c 26 Nov 2019 15:14:14 -0000
@@ -5,7 +5,7 @@ Avoid printf("%s", NULL);
Index: auth/auth_log.c
--- auth/auth_log.c.orig
+++ auth/auth_log.c
-@@ -566,7 +566,8 @@ static void log_authentication_event_human_readable(
+@@ -604,7 +604,8 @@ static void log_authentication_event_human_readable(
ui->netlogon_trust_account.account_name);
nl = talloc_asprintf(frame,
" NETLOGON computer [%s] trust account [%s]",
@@ -15,7 +15,7 @@ Index: auth/auth_log.c
}
remote = tsocket_address_string(ui->remote_host, frame);
-@@ -585,8 +586,10 @@ static void log_authentication_event_human_readable(
+@@ -622,8 +623,10 @@ static void log_authentication_event_human_readable(
logon_line = talloc_asprintf(
frame,
" mapped to [%s]\\[%s].",
@@ -28,7 +28,7 @@ Index: auth/auth_log.c
}
DEBUGC(DBGC_AUTH_AUDIT, debug_level,
-@@ -596,13 +599,15 @@ static void log_authentication_event_human_readable(
+@@ -633,13 +636,15 @@ static void log_authentication_event_human_readable(
"%s local host [%s]"
" %s\n",
ui->service_description,
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.10
diff -u -p -r1.10 patch-buildtools_wafsamba_samba_autoconf_py
--- net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py 7 Oct 2019 12:50:13 -0000 1.10
+++ net/samba/patches/patch-buildtools_wafsamba_samba_autoconf_py 26 Nov 2019 15:14:14 -0000
@@ -7,7 +7,7 @@ $OpenBSD: patch-buildtools_wafsamba_samb
Index: buildtools/wafsamba/samba_autoconf.py
--- buildtools/wafsamba/samba_autoconf.py.orig
+++ buildtools/wafsamba/samba_autoconf.py
-@@ -848,6 +848,27 @@ def ADD_LDFLAGS(conf, flags, testflags=False):
+@@ -863,6 +863,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))
@@ -35,7 +35,7 @@ Index: buildtools/wafsamba/samba_autocon
return flags
-@@ -911,10 +932,9 @@ def SETUP_CONFIGURE_CACHE(conf, enable):
+@@ -923,10 +944,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.3
diff -u -p -r1.3 patch-buildtools_wafsamba_samba_conftests_py
--- net/samba/patches/patch-buildtools_wafsamba_samba_conftests_py 22 Apr 2016 11:48:36 -0000 1.3
+++ net/samba/patches/patch-buildtools_wafsamba_samba_conftests_py 26 Nov 2019 15:14:14 -0000
@@ -1,9 +1,10 @@
$OpenBSD: patch-buildtools_wafsamba_samba_conftests_py,v 1.3 2016/04/22 11:48:36 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 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):
+Index: buildtools/wafsamba/samba_conftests.py
+--- buildtools/wafsamba/samba_conftests.py.orig
++++ buildtools/wafsamba/samba_conftests.py
+@@ -40,9 +40,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.3
diff -u -p -r1.3 patch-buildtools_wafsamba_samba_install_py
--- net/samba/patches/patch-buildtools_wafsamba_samba_install_py 22 Apr 2016 11:48:36 -0000 1.3
+++ net/samba/patches/patch-buildtools_wafsamba_samba_install_py 26 Nov 2019 15:14:14 -0000
@@ -1,8 +1,9 @@
$OpenBSD: patch-buildtools_wafsamba_samba_install_py,v 1.3 2016/04/22 11:48:36 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 Wed Apr 13 17:18:35 2016
-+++ buildtools/wafsamba/samba_install.py Wed Apr 13 19:24:13 2016
+Index: buildtools/wafsamba/samba_install.py
+--- buildtools/wafsamba/samba_install.py.orig
++++ buildtools/wafsamba/samba_install.py
@@ -117,11 +117,15 @@ def install_library(self):
else:
inst_name = bld.make_libname(t.target)
@@ -22,7 +23,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', ''):
-@@ -171,7 +175,7 @@ def apply_vscript(self):
+@@ -172,7 +176,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_wafsamba_py
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-buildtools_wafsamba_wafsamba_py,v
retrieving revision 1.5
diff -u -p -r1.5 patch-buildtools_wafsamba_wafsamba_py
--- net/samba/patches/patch-buildtools_wafsamba_wafsamba_py 11 Jun 2018 11:59:51 -0000 1.5
+++ net/samba/patches/patch-buildtools_wafsamba_wafsamba_py 26 Nov 2019 15:14:14 -0000
@@ -9,7 +9,7 @@ $OpenBSD: patch-buildtools_wafsamba_wafs
Index: buildtools/wafsamba/wafsamba.py
--- buildtools/wafsamba/wafsamba.py.orig
+++ buildtools/wafsamba/wafsamba.py
-@@ -219,6 +219,14 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -210,6 +210,14 @@ def SAMBA_LIBRARY(bld, libname, source,
deps = TO_LIST(deps)
deps.append(obj_target)
@@ -24,10 +24,10 @@ Index: buildtools/wafsamba/wafsamba.py
realname = bld.map_shlib_extension(realname, python=(target_type=='PYTHON'))
link_name = bld.map_shlib_extension(link_name, python=(target_type=='PYTHON'))
-@@ -331,9 +339,9 @@ def SAMBA_LIBRARY(bld, libname, source,
+@@ -324,9 +332,9 @@ def SAMBA_LIBRARY(bld, libname, source,
if pc_files is not None and not private_library:
- if pyembed and bld.env['IS_EXTRA_PYTHON']:
+ if pyembed:
- bld.PKG_CONFIG_FILES(pc_files, vnum=vnum, extra_name=bld.env['PYTHON_SO_ABI_FLAG'])
+ bld.PKG_CONFIG_FILES(pc_files, vnum=saved_lib_version, extra_name=bld.env['PYTHON_SO_ABI_FLAG'])
else:
Index: net/samba/patches/patch-buildtools_wafsamba_wscript
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-buildtools_wafsamba_wscript,v
retrieving revision 1.2
diff -u -p -r1.2 patch-buildtools_wafsamba_wscript
--- net/samba/patches/patch-buildtools_wafsamba_wscript 22 Apr 2016 11:48:36 -0000 1.2
+++ net/samba/patches/patch-buildtools_wafsamba_wscript 26 Nov 2019 15:14:14 -0000
@@ -1,8 +1,9 @@
$OpenBSD: patch-buildtools_wafsamba_wscript,v 1.2 2016/04/22 11:48:36 jca Exp $
Add a hack to force addition of -I/usr/include before any other include path discovered.
---- 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):
+Index: buildtools/wafsamba/wscript
+--- buildtools/wafsamba/wscript.orig
++++ buildtools/wafsamba/wscript
+@@ -88,6 +88,11 @@ def options(opt):
help=("Disable use of gettext"),
action="store_true", dest='disable_gettext', default=False)
Index: net/samba/patches/patch-lib_ldb_wscript
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-lib_ldb_wscript,v
retrieving revision 1.10
diff -u -p -r1.10 patch-lib_ldb_wscript
--- net/samba/patches/patch-lib_ldb_wscript 7 Oct 2019 12:50:13 -0000 1.10
+++ net/samba/patches/patch-lib_ldb_wscript 26 Nov 2019 15:14:14 -0000
@@ -7,7 +7,7 @@ $OpenBSD: patch-lib_ldb_wscript,v 1.10 2
Index: lib/ldb/wscript
--- lib/ldb/wscript.orig
+++ lib/ldb/wscript
-@@ -67,6 +67,7 @@ def configure(conf):
+@@ -69,6 +69,7 @@ def configure(conf):
conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') + '/ldb')
conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
@@ -15,7 +15,7 @@ Index: lib/ldb/wscript
if not conf.env.standalone_ldb:
max_ldb_version = [int(x) for x in VERSION.split(".")]
-@@ -160,8 +161,7 @@ def configure(conf):
+@@ -163,8 +164,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_tevent_wscript
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-lib_tevent_wscript,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lib_tevent_wscript
--- net/samba/patches/patch-lib_tevent_wscript 15 Feb 2018 09:59:44 -0000 1.2
+++ net/samba/patches/patch-lib_tevent_wscript 26 Nov 2019 15:14:14 -0000
@@ -3,7 +3,7 @@ Force building standalone library (e.g.,
Index: lib/tevent/wscript
--- lib/tevent/wscript.orig
+++ lib/tevent/wscript
-@@ -29,6 +29,7 @@ def configure(conf):
+@@ -31,6 +31,7 @@ def configure(conf):
conf.RECURSE('lib/talloc')
conf.env.standalone_tevent = conf.IN_LAUNCH_DIR()
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.6
diff -u -p -r1.6 patch-python_samba_provision___init___py
--- net/samba/patches/patch-python_samba_provision___init___py 7 Oct 2019 12:50:13 -0000 1.6
+++ net/samba/patches/patch-python_samba_provision___init___py 26 Nov 2019 15:14:14 -0000
@@ -5,7 +5,7 @@ $OpenBSD: patch-python_samba_provision__
Index: python/samba/provision/__init__.py
--- python/samba/provision/__init__.py.orig
+++ python/samba/provision/__init__.py
-@@ -2138,7 +2138,7 @@ def provision(logger, session_info, smbconf=None,
+@@ -2158,7 +2158,7 @@ def provision(logger, session_info, smbconf=None,
root_gid = pwd.getpwuid(root_uid).pw_gid
try:
Index: net/samba/patches/patch-source3_modules_vfs_acl_tdb_c
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-source3_modules_vfs_acl_tdb_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-source3_modules_vfs_acl_tdb_c
--- net/samba/patches/patch-source3_modules_vfs_acl_tdb_c 11 Jun 2018 11:59:51 -0000 1.1
+++ net/samba/patches/patch-source3_modules_vfs_acl_tdb_c 26 Nov 2019 15:14:14 -0000
@@ -5,7 +5,7 @@ Workaround/fix for https://bugzilla.samb
Index: source3/modules/vfs_acl_tdb.c
--- source3/modules/vfs_acl_tdb.c.orig
+++ source3/modules/vfs_acl_tdb.c
-@@ -59,7 +59,7 @@ static bool acl_tdb_init(void)
+@@ -58,7 +58,7 @@ static bool acl_tdb_init(void)
become_root();
acl_db = db_open(NULL, dbname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600,
Index: net/samba/patches/patch-source3_wscript
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-source3_wscript,v
retrieving revision 1.9
diff -u -p -r1.9 patch-source3_wscript
--- net/samba/patches/patch-source3_wscript 7 Oct 2019 12:50:13 -0000 1.9
+++ net/samba/patches/patch-source3_wscript 26 Nov 2019 15:14:14 -0000
@@ -6,7 +6,7 @@ $OpenBSD: patch-source3_wscript,v 1.9 20
Index: source3/wscript
--- source3/wscript.orig
+++ source3/wscript
-@@ -90,7 +90,7 @@ def configure(conf):
+@@ -91,7 +91,7 @@ def configure(conf):
conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
conf.env.developer = True
@@ -15,7 +15,7 @@ Index: source3/wscript
conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
# We crash without vfs_default
-@@ -1521,6 +1521,7 @@ main() {
+@@ -1522,6 +1522,7 @@ main() {
conf.CHECK_CODE('void seekdir(DIR *d, long loc) { return; }',
'SEEKDIR_RETURNS_VOID',
Index: net/samba/patches/patch-source3_wscript_build
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-source3_wscript_build,v
retrieving revision 1.2
diff -u -p -r1.2 patch-source3_wscript_build
--- net/samba/patches/patch-source3_wscript_build 7 Oct 2019 12:50:13 -0000 1.2
+++ net/samba/patches/patch-source3_wscript_build 26 Nov 2019 15:14:14 -0000
@@ -9,7 +9,7 @@ Work around by spelling out the affected
Index: source3/wscript_build
--- source3/wscript_build.orig
+++ source3/wscript_build
-@@ -135,7 +135,9 @@ ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_doma
+@@ -132,7 +132,9 @@ ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_doma
'!get_attr_list']
private_pdb_match.append('!pdb_nds_*')
private_pdb_match.append('!pdb_ldapsam_init*')
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.2
diff -u -p -r1.2 patch-source4_heimdal_build_wscript_build
--- net/samba/patches/patch-source4_heimdal_build_wscript_build 22 Apr 2016 11:48:36 -0000 1.2
+++ net/samba/patches/patch-source4_heimdal_build_wscript_build 26 Nov 2019 15:14:14 -0000
@@ -1,9 +1,10 @@
$OpenBSD: patch-source4_heimdal_build_wscript_build,v 1.2 2016/04/22 11:48:36 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 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
+Index: source4/heimdal_build/wscript_build
+--- source4/heimdal_build/wscript_build.orig
++++ source4/heimdal_build/wscript_build
+@@ -245,6 +245,11 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, versi
features = 'c cshlib symlink_lib install_lib'
Index: net/samba/patches/patch-source4_scripting_bin_samba_upgradedns
===================================================================
RCS file: /cvs/ports/net/samba/patches/patch-source4_scripting_bin_samba_upgradedns,v
retrieving revision 1.3
diff -u -p -r1.3 patch-source4_scripting_bin_samba_upgradedns
--- net/samba/patches/patch-source4_scripting_bin_samba_upgradedns 11 Jun 2018 11:59:51 -0000 1.3
+++ net/samba/patches/patch-source4_scripting_bin_samba_upgradedns 26 Nov 2019 15:14:14 -0000
@@ -5,7 +5,7 @@ $OpenBSD: patch-source4_scripting_bin_sa
Index: source4/scripting/bin/samba_upgradedns
--- source4/scripting/bin/samba_upgradedns.orig
+++ source4/scripting/bin/samba_upgradedns
-@@ -77,7 +77,7 @@ __docformat__ = 'restructuredText'
+@@ -76,7 +76,7 @@ __docformat__ = 'restructuredText'
def find_bind_gid():
"""Find system group id for bind9
"""
Index: net/samba/patches/patch-source4_torture_smbtorture_c
===================================================================
RCS file: net/samba/patches/patch-source4_torture_smbtorture_c
diff -N net/samba/patches/patch-source4_torture_smbtorture_c
--- net/samba/patches/patch-source4_torture_smbtorture_c 25 Aug 2015 11:04:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-source4_torture_smbtorture_c,v 1.1 2015/08/25 11:04:39 jca Exp $
-This code isn't needed at all because lib/replace/system/readline.h
-automatically includes <readline/history.h> if supported, and it
-breaks the build when devel/readline is installed.
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=9885
---- source4/torture/smbtorture.c.orig Mon May 13 00:27:51 2013
-+++ source4/torture/smbtorture.c Mon May 13 00:31:00 2013
-@@ -34,10 +34,6 @@
- #include "param/param.h"
- #include "lib/util/samba_modules.h"
-
--#if HAVE_READLINE_HISTORY_H
--#include <readline/history.h>
--
No comments:
Post a Comment