Hmm, I see this.
===> Building package for samba-4.0.26
Create /usr/packages/amd64/all/samba-4.0.26.tgz
Error: Libraries in packing-lists in the ports tree
and libraries from installed packages don't match
--- /tmp/dep_cache.jj4UL4tjY/portstree-samba-4.0.26 Thu Jun 11 13:41:38 2015
+++ /tmp/dep_cache.jj4UL4tjY/inst-samba-4.0.26 Thu Jun 11 13:41:38 2015
@@ -24,7 +24,7 @@
-W ldb.0.0
-W pyldb-util.0.0
-W pytalloc-util.0.0
--W tdb.4.0
+-W tdb.5.0
-W tevent.0.0
-W lib/samba/nss_wrapper.0.0
-W lib/samba/socket_wrapper.0.0
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:3242 'wantlib-args')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1955
'/usr/packages/amd64/all/samba-4.0.26.tgz')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2506
'_internal-package')
*** Error 1 in /usr/mystuff/net/samba4
(/usr/ports/infrastructure/mk/bsd.port.mk:2486 'package')
Ian McWilliam
________________________________________
From: [email protected] [[email protected]] on behalf of Jérémie
Courrèges-Anglas [[email protected]]
Sent: Saturday, 6 June 2015 5:14 AM
To: Ian McWilliam
Cc: OpenBSD ports; [email protected]
Subject: [update] samba-4.0.26
Untested so far. talloc shlib version bumped only because the package
version changed, I haven't checked other libs.
Comments and test reports welcome!
Cheers,
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/samba4/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 27 Feb 2015 17:32:52 -0000 1.10
+++ Makefile 5 Jun 2015 18:11:37 -0000
@@ -1,9 +1,7 @@
# $OpenBSD: Makefile,v 1.10 2015/02/27 17:32:52 jca Exp $
-BROKEN = affected by CVE-2014-8143 and CVE-2015-0240
-
SHARED_ONLY = Yes
-VERSION = 4.0.22
+VERSION = 4.0.26
DISTNAME = samba-${VERSION}
DOCSVERSION = v3-5-test-4c5a1b6b
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
@@ -29,7 +27,7 @@ PKG_ARCH-docs = *
LDB_V = 1.1.16
#NTDB_V = 0.9
-TALLOC_V = 2.0.7
+TALLOC_V = 2.1.2
TDB_V = 1.2.11
TEVENT_V = 0.9.18
@@ -72,7 +70,7 @@ SHARED_LIBS = asn1-samba4 0.0 \
smbldap 0.0 \
smbsharemodes 2.0 \
talloc 1.0 \
- tdb 4.0 \
+ tdb 5.0 \
tevent 0.0 \
tevent-util 0.0 \
torture 0.0 \
@@ -189,8 +187,6 @@ CONFIGURE_ARGS = --enable-fhs \
--with-privatedir=${VARBASE}/samba/private \
--with-lockdir=${VARBASE}/run/samba \
--with-privileged-socket-dir=${VARBASE}/samba \
- --with-perl-arch-install-dir=${PREFIX}/${P5ARCH} \
- --with-perl-lib-install-dir=${PREFIX}/${P5SITE} \
--enable-selftest \
--pedantic
@@ -231,6 +227,8 @@ post-install:
-name '*.beforesubst' -or \
-name '*.deconforig' | \
xargs -rt rm --
+ # fix path to perl modules
+ mv ${PREFIX}/share/perl5/* ${PREFIX}/${P5SITE}
# precompiling Python modules
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${WRKINST}${MODPY_SITEPKG}
${MODPY_BIN} -O ${MODPY_LIBDIR}/compileall.py ${WRKINST}${MODPY_SITEPKG}
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/samba4/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 1 Nov 2014 10:44:05 -0000 1.6
+++ distinfo 4 Jun 2015 11:43:17 -0000
@@ -1,4 +1,4 @@
-SHA256 (samba-4.0.22.tar.gz) = SxXmh/HgOFoj+vf4BbYSTbaZkcOa1tkWbe1gNcFr2lM=
+SHA256 (samba-4.0.26.tar.gz) = ziRBmSxtGJUNdS7bLRJ0s/fgVrLi6FFvxC5AjkoliUo=
SHA256 (samba-docs-v3-5-test-4c5a1b6b.tar.bz2) =
bsF0WP1KT1M3jMx3Z88MbsEQ1QEq9catijXpnPm7hZA=
-SIZE (samba-4.0.22.tar.gz) = 22140230
+SIZE (samba-4.0.26.tar.gz) = 22155521
SIZE (samba-docs-v3-5-test-4c5a1b6b.tar.bz2) = 8070761
Index: patches/patch-buildtools_wafsamba_wafsamba_py
===================================================================
RCS file: /cvs/ports/net/samba4/patches/patch-buildtools_wafsamba_wafsamba_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-buildtools_wafsamba_wafsamba_py
--- patches/patch-buildtools_wafsamba_wafsamba_py 4 May 2014 16:08:29
-0000 1.1.1.1
+++ patches/patch-buildtools_wafsamba_wafsamba_py 4 Jun 2015 11:45:08
-0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-buildtools_wafsamba_wafsamba_py,v 1.1.1.1 2014/05/04 16:08:29
zhuk Exp $
Make Samba4 WAF respect OpenBSD shared libraries versioning conventions.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9774
---- buildtools/wafsamba/wafsamba.py.orig Tue May 14 15:17:30 2013
-+++ buildtools/wafsamba/wafsamba.py Tue May 14 20:16:50 2013
-@@ -192,6 +192,13 @@ def SAMBA_LIBRARY(bld, libname, source,
+--- buildtools/wafsamba/wafsamba.py.orig Thu Jun 4 13:43:26 2015
++++ buildtools/wafsamba/wafsamba.py Thu Jun 4 13:43:26 2015
+@@ -194,6 +194,13 @@ def SAMBA_LIBRARY(bld, libname, source,
deps = TO_LIST(deps)
deps.append(obj_target)
Index: patches/patch-lib_talloc_wscript
===================================================================
RCS file: /cvs/ports/net/samba4/patches/patch-lib_talloc_wscript,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-lib_talloc_wscript
--- patches/patch-lib_talloc_wscript 4 May 2014 16:08:29 -0000 1.1.1.1
+++ patches/patch-lib_talloc_wscript 5 Jun 2015 19:09:37 -0000
@@ -1,7 +1,11 @@
$OpenBSD: patch-lib_talloc_wscript,v 1.1.1.1 2014/05/04 16:08:29 zhuk Exp $
-Force building standalone library (e.g., put headers in apporiate place).
---- lib/talloc/wscript.orig Mon May 27 20:45:17 2013
-+++ lib/talloc/wscript Mon May 27 20:45:27 2013
+
+- Force building standalone library (e.g., put headers in appropriate
+ place).
+- workaround unavailable option (unused anyway)
+
+--- lib/talloc/wscript.orig Thu Jun 4 14:01:19 2015
++++ lib/talloc/wscript Fri Jun 5 13:22:39 2015
@@ -40,6 +40,7 @@ def configure(conf):
conf.RECURSE('lib/replace')
@@ -9,4 +13,13 @@ Force building standalone library (e.g.,
+ conf.env.standalone_talloc = True
conf.env.disable_python = getattr(Options.options, 'disable_python',
False)
+
+@@ -52,8 +53,6 @@ def configure(conf):
+ conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
+
+ conf.env.TALLOC_COMPAT1 = False
+- if conf.env.standalone_talloc:
+- conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
+
+ conf.CHECK_XSLTPROC_MANPAGES()
Index: patches/patch-lib_tdb_wscript
===================================================================
RCS file: /cvs/ports/net/samba4/patches/patch-lib_tdb_wscript,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-lib_tdb_wscript
--- patches/patch-lib_tdb_wscript 4 May 2014 16:08:29 -0000 1.1.1.1
+++ patches/patch-lib_tdb_wscript 5 Jun 2015 11:16:18 -0000
@@ -1,5 +1,5 @@
$OpenBSD: patch-lib_tdb_wscript,v 1.1.1.1 2014/05/04 16:08:29 zhuk Exp $
-Force building standalone library (e.g., put headers in apporiate place).
+Force building standalone library (e.g., put headers in appropriate place).
--- lib/tdb/wscript.orig Mon May 27 20:45:34 2013
+++ lib/tdb/wscript Mon May 27 20:45:51 2013
@@ -31,6 +31,7 @@ def configure(conf):
Index: patches/patch-lib_tevent_wscript
===================================================================
RCS file: /cvs/ports/net/samba4/patches/patch-lib_tevent_wscript,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-lib_tevent_wscript
--- patches/patch-lib_tevent_wscript 4 May 2014 16:08:29 -0000 1.1.1.1
+++ patches/patch-lib_tevent_wscript 5 Jun 2015 11:16:46 -0000
@@ -1,5 +1,5 @@
$OpenBSD: patch-lib_tevent_wscript,v 1.1.1.1 2014/05/04 16:08:29 zhuk Exp $
-Force building standalone library (e.g., put headers in apporiate place).
+Force building standalone library (e.g., put headers in appropriate place).
--- lib/tevent/wscript.orig Mon May 27 20:46:20 2013
+++ lib/tevent/wscript Mon May 27 20:46:32 2013
@@ -33,6 +33,7 @@ def configure(conf):
Index: patches/patch-pidl_pidl
===================================================================
RCS file: /cvs/ports/net/samba4/patches/patch-pidl_pidl,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-pidl_pidl
--- patches/patch-pidl_pidl 4 May 2014 16:08:29 -0000 1.1.1.1
+++ patches/patch-pidl_pidl 4 Jun 2015 11:45:09 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-pidl_pidl,v 1.1.1.1 2014/05/04 16:08:29 zhuk Exp $
Fix annoying warning that pollute output.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9887
---- pidl/pidl.orig Sat May 11 00:34:16 2013
-+++ pidl/pidl Sat May 11 00:35:13 2013
-@@ -605,7 +605,7 @@ sub process_file($)
+--- pidl/pidl.orig Thu Jun 4 13:43:29 2015
++++ pidl/pidl Thu Jun 4 13:43:29 2015
+@@ -604,7 +604,7 @@ sub process_file($)
require Parse::Pidl::IDL;
$pidl = Parse::Pidl::IDL::parse_file($idl_file, \@opt_incdirs);
Index: patches/patch-source4_torture_smbtorture_c
===================================================================
RCS file: /cvs/ports/net/samba4/patches/patch-source4_torture_smbtorture_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-source4_torture_smbtorture_c
--- patches/patch-source4_torture_smbtorture_c 4 May 2014 16:08:29 -0000
1.1.1.1
+++ patches/patch-source4_torture_smbtorture_c 5 Jun 2015 11:17:54 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-source4_torture_smbtorture_c,v 1.1.1.1 2014/05/04 16:08:29
zhuk Exp $
This code isn't needed at all because lib/replace/system/readline.h
-automatically includes <readline/history.h> if supportted, and it
+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
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/samba4/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main 7 Sep 2014 09:07:27 -0000 1.3
+++ pkg/PLIST-main 5 Jun 2015 17:50:36 -0000
@@ -34,7 +34,7 @@ bin/samba-tool
@bin bin/smbspool
@bin bin/smbstatus
@bin bin/smbta-util
-@bin bin/smbtar
+bin/smbtar
@bin bin/smbtorture
@bin bin/smbtree
@bin bin/testparm
@@ -165,7 +165,6 @@ include/samba-4.0/wbclient.h
@lib lib/libndr-standard.so.${LIBndr-standard_VERSION}
@lib lib/libndr.so.${LIBndr_VERSION}
@lib lib/libnetapi.so.${LIBnetapi_VERSION}
-@lib lib/libnss_wins.so.${LIBnss_wins_VERSION}
@lib lib/libpdb.so.${LIBpdb_VERSION}
@lib lib/libregistry.so.${LIBregistry_VERSION}
@lib lib/libsamba-credentials.so.${LIBsamba-credentials_VERSION}
@@ -584,7 +583,6 @@ 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/socket_wrapper.so
lib/python${MODPY_VERSION}/site-packages/samba/tdb_util.py
lib/python${MODPY_VERSION}/site-packages/samba/tdb_util.pyc
lib/python${MODPY_VERSION}/site-packages/samba/tdb_util.pyo
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
