From aae9a4b292b4c83af58498c285f61bbe2629036c Mon Sep 17 00:00:00 2001 From: "Timur I. Bakeyev" Date: Fri, 31 Mar 2017 21:11:38 +0000 Subject: Upgrade Samba4[4-6] ports to fix regression with "follow symlinks = no". Remove dependency from the external p5-Parse-Pidl as it may break provisioning(and more). PR: 218255 --- net/samba44/Makefile | 12 +++---- net/samba44/distinfo | 6 ++-- .../patch-buildtools__wafsamba__samba_pidl.py | 11 ------ net/samba44/files/patch-wscript | 18 ---------- net/samba44/files/patch-wscript_build | 10 ------ net/samba44/pkg-plist | 40 ++++++++++++++++++++++ 6 files changed, 49 insertions(+), 48 deletions(-) delete mode 100644 net/samba44/files/patch-buildtools__wafsamba__samba_pidl.py delete mode 100644 net/samba44/files/patch-wscript delete mode 100644 net/samba44/files/patch-wscript_build (limited to 'net/samba44') diff --git a/net/samba44/Makefile b/net/samba44/Makefile index 33ee0f5e6271..7834eaf19ec2 100644 --- a/net/samba44/Makefile +++ b/net/samba44/Makefile @@ -13,13 +13,13 @@ COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3 -CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba42-4.2.* samba43-4.3.* +CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-356]-4.* p5-Parse-Pidl-4.* #EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.4.12 +SAMBA4_VERSION= 4.4.13 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -84,8 +84,9 @@ LIB_DEPENDS+= libsunacl.so:sysutils/libsunacl BUILD_DEPENDS+= libarchive>=3.1.2:archivers/libarchive RUN_DEPENDS+= libarchive>=3.1.2:archivers/libarchive # External Samba dependencies -# IDL compiler -BUILD_DEPENDS+= p5-Parse-Pidl44>=4.3.1:devel/p5-Parse-Pidl44 +# Needed for IDL compiler +BUILD_DEPENDS+= p5-Parse-Yapp>=0:devel/p5-Parse-Yapp +PLIST_SUB+= PIDL="" # External Python modules BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython @@ -442,13 +443,12 @@ PORTDOCS= README.FreeBSD IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-extract: - @${RM} -r ${WRKSRC}/pidl + @${RM} -r ${WRKSRC}/pidl/lib/Parse/Yapp post-patch: @${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${PATCH_WRKSRC}/buildtools/wafsamba/samba_pidl.py \ ${PATCH_WRKSRC}/buildtools/wafsamba/wafsamba.py @${REINPLACE_CMD} -e 's|%%GDB_CMD%%|${GDB_CMD}|g' \ ${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh diff --git a/net/samba44/distinfo b/net/samba44/distinfo index d7475adecec8..af2119dce801 100644 --- a/net/samba44/distinfo +++ b/net/samba44/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1490313767 -SHA256 (samba-4.4.12.tar.gz) = 9dd0e12b5f49c1e11f44447853ed59aa9394f8cb322bc04aa747602d1366c131 -SIZE (samba-4.4.12.tar.gz) = 20768303 +TIMESTAMP = 1490980593 +SHA256 (samba-4.4.13.tar.gz) = 61558009408e4f37d79c2b5f9c49cf7633908e12a14141e1c075c67011fa0d2d +SIZE (samba-4.4.13.tar.gz) = 20766658 diff --git a/net/samba44/files/patch-buildtools__wafsamba__samba_pidl.py b/net/samba44/files/patch-buildtools__wafsamba__samba_pidl.py deleted file mode 100644 index 52c188e4048a..000000000000 --- a/net/samba44/files/patch-buildtools__wafsamba__samba_pidl.py +++ /dev/null @@ -1,11 +0,0 @@ ---- buildtools/wafsamba/samba_pidl.py.orig 2016-01-26 11:45:46 UTC -+++ buildtools/wafsamba/samba_pidl.py -@@ -89,7 +89,7 @@ def SAMBA_PIDL(bld, pname, source, - # prime the list of nodes we are dependent on with the cached pidl sources - t.allnodes = pidl_src_nodes - -- t.env.PIDL = os.path.join(bld.srcnode.abspath(), 'pidl/pidl') -+ t.env.PIDL = os.path.join('%%LOCALBASE%%', 'bin/pidl') - t.env.OPTIONS = TO_LIST(options) - t.env.OUTPUTDIR = bld.bldnode.name + '/' + bld.path.find_dir(output_dir).bldpath(t.env) - diff --git a/net/samba44/files/patch-wscript b/net/samba44/files/patch-wscript deleted file mode 100644 index 36ccbb1547cb..000000000000 --- a/net/samba44/files/patch-wscript +++ /dev/null @@ -1,18 +0,0 @@ ---- wscript.orig 2016-01-26 11:45:47 UTC -+++ wscript -@@ -39,7 +39,6 @@ def set_options(opt): - opt.RECURSE('lib/ldb') - opt.RECURSE('selftest') - opt.RECURSE('source4/lib/tls') -- opt.RECURSE('pidl') - opt.RECURSE('source3') - opt.RECURSE('lib/util') - opt.RECURSE('ctdb') -@@ -156,7 +155,6 @@ def configure(conf): - conf.RECURSE('nsswitch') - conf.RECURSE('libcli/smbreadline') - conf.RECURSE('lib/crypto') -- conf.RECURSE('pidl') - conf.RECURSE('selftest') - if conf.CONFIG_GET('ENABLE_SELFTEST'): - conf.RECURSE('lib/nss_wrapper') diff --git a/net/samba44/files/patch-wscript_build b/net/samba44/files/patch-wscript_build deleted file mode 100644 index 1d66b008a3be..000000000000 --- a/net/samba44/files/patch-wscript_build +++ /dev/null @@ -1,10 +0,0 @@ ---- wscript_build.orig 2016-01-26 11:45:47 UTC -+++ wscript_build -@@ -141,7 +141,6 @@ if bld.AD_DC_BUILD_IS_ENABLED(): - if bld.env.with_ctdb: - bld.RECURSE('ctdb') - bld.RECURSE('source4/scripting') --bld.RECURSE('pidl') - bld.RECURSE('lib') - bld.RECURSE('libds/common') - bld.RECURSE('source3') diff --git a/net/samba44/pkg-plist b/net/samba44/pkg-plist index 0ce531f6a073..2eaef1680113 100644 --- a/net/samba44/pkg-plist +++ b/net/samba44/pkg-plist @@ -10,6 +10,7 @@ bin/nmblookup bin/ntlm_auth bin/oLschema2ldif bin/pdbedit +%%PIDL%%bin/pidl bin/profiles bin/regdiff bin/regpatch @@ -648,6 +649,39 @@ lib/shared-modules/vfs/zfsacl.so @dir %%PYTHON_SITELIBDIR%%/samba/netcmd @dir %%PYTHON_SITELIBDIR%%/samba/dcerpc @dir %%PYTHON_SITELIBDIR%%/samba +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/CUtil.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Compat.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Dump.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Expr.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/IDL.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/NDR.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/ODL.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba3/ClientNDR.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba3/ServerNDR.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Header.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Proxy.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Stub.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/Header.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Client.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Parser.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Server.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/Python.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/TDR.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/Template.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Typelist.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Util.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Wireshark/Conformance.pm +%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Wireshark/NDR.pm +%%PIDL%%@dir %%DATADIR%%/perl5/Parse/Pidl/Wireshark +%%PIDL%%@dir %%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR +%%PIDL%%@dir %%DATADIR%%/perl5/Parse/Pidl/Samba4/COM +%%PIDL%%@dir %%DATADIR%%/perl5/Parse/Pidl/Samba4 +%%PIDL%%@dir %%DATADIR%%/perl5/Parse/Pidl/Samba3 +%%PIDL%%@dir %%DATADIR%%/perl5/Parse/Pidl +%%PIDL%%@dir %%DATADIR%%/perl5/Parse +%%PIDL%%@dir %%DATADIR%%/perl5 %%AD_DC%%%%DATADIR%%/setup/DB_CONFIG %%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Attributes.txt %%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Classes.txt @@ -751,6 +785,7 @@ man/man1/nmblookup.1.gz man/man1/ntlm_auth.1.gz man/man1/oLschema2ldif.1.gz man/man1/profiles.1.gz +%%PIDL%%man/man1/pidl.1.gz man/man1/regdiff.1.gz man/man1/regpatch.1.gz man/man1/regshell.1.gz @@ -769,6 +804,11 @@ man/man1/smbtree.1.gz man/man1/testparm.1.gz man/man1/vfstest.1.gz man/man1/wbinfo.1.gz +%%PIDL%%man/man3/Parse::Pidl::Dump.3.gz +%%PIDL%%man/man3/Parse::Pidl::NDR.3.gz +%%PIDL%%man/man3/Parse::Pidl::Util.3.gz +%%PIDL%%man/man3/Parse::Pidl::Wireshark::Conformance.3.gz +%%PIDL%%man/man3/Parse::Pidl::Wireshark::NDR.3.gz man/man5/lmhosts.5.gz man/man5/pam_winbind.conf.5.gz man/man5/smb.conf.5.gz -- cgit v1.2.3