svn commit: r437387 - in head/net: samba44 samba44/files samba45 samba46

Timur I. Bakeyev timur at FreeBSD.org
Fri Mar 31 21:11:40 UTC 2017 

Author: timur
Date: Fri Mar 31 21:11:38 2017
New Revision: 437387
URL: https://svnweb.freebsd.org/changeset/ports/437387

Log:
  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

Deleted:
  head/net/samba44/files/patch-buildtools__wafsamba__samba_pidl.py
  head/net/samba44/files/patch-wscript
  head/net/samba44/files/patch-wscript_build
Modified:
  head/net/samba44/Makefile
  head/net/samba44/distinfo
  head/net/samba44/pkg-plist
  head/net/samba45/Makefile
  head/net/samba45/distinfo
  head/net/samba46/Makefile
  head/net/samba46/distinfo

Modified: head/net/samba44/Makefile
==============================================================================
--- head/net/samba44/Makefile	Fri Mar 31 20:39:56 2017	(r437386)
+++ head/net/samba44/Makefile	Fri Mar 31 21:11:38 2017	(r437387)
@@ -13,13 +13,13 @@ COMMENT?=		Free SMB/CIFS and AD/DC serve
 
 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/lib
 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

Modified: head/net/samba44/distinfo
==============================================================================
--- head/net/samba44/distinfo	Fri Mar 31 20:39:56 2017	(r437386)
+++ head/net/samba44/distinfo	Fri Mar 31 21:11:38 2017	(r437387)
@@ -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

Modified: head/net/samba44/pkg-plist
==============================================================================
--- head/net/samba44/pkg-plist	Fri Mar 31 20:39:56 2017	(r437386)
+++ head/net/samba44/pkg-plist	Fri Mar 31 21:11:38 2017	(r437387)
@@ -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

Modified: head/net/samba45/Makefile
==============================================================================
--- head/net/samba45/Makefile	Fri Mar 31 20:39:56 2017	(r437386)
+++ head/net/samba45/Makefile	Fri Mar 31 21:11:38 2017	(r437387)
@@ -3,7 +3,7 @@
 
 PORTNAME?=			${SAMBA4_BASENAME}45
 PORTVERSION?=			${SAMBA4_VERSION}
-PORTREVISION?=			3
+PORTREVISION?=			0
 CATEGORIES?=			net
 MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=			${SAMBA4_DISTNAME}
@@ -19,7 +19,7 @@ CONFLICTS?=			*samba3[2-6]-3.* samba4-4.
 
 SAMBA4_BASENAME=		samba
 SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
-SAMBA4_VERSION=			4.5.7
+SAMBA4_VERSION=			4.5.8
 SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=			${WRKDIR}/${DISTNAME}

Modified: head/net/samba45/distinfo
==============================================================================
--- head/net/samba45/distinfo	Fri Mar 31 20:39:56 2017	(r437386)
+++ head/net/samba45/distinfo	Fri Mar 31 21:11:38 2017	(r437387)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490375600
-SHA256 (samba-4.5.7.tar.gz) = ac70f09af80639d8189e1b9bc0a554841ee44df2b1ef58e7e682ad5400fd9400
-SIZE (samba-4.5.7.tar.gz) = 20981612
+TIMESTAMP = 1490981258
+SHA256 (samba-4.5.8.tar.gz) = f63b656d8823a280c50c9dbd6b692816cd7a88adfe9b47997ce697fd75bf81f0
+SIZE (samba-4.5.8.tar.gz) = 20979104

Modified: head/net/samba46/Makefile
==============================================================================
--- head/net/samba46/Makefile	Fri Mar 31 20:39:56 2017	(r437386)
+++ head/net/samba46/Makefile	Fri Mar 31 21:11:38 2017	(r437387)
@@ -3,7 +3,7 @@
 
 PORTNAME?=			${SAMBA4_BASENAME}46
 PORTVERSION?=			${SAMBA4_VERSION}
-PORTREVISION?=			2
+PORTREVISION?=			0
 CATEGORIES?=			net
 MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=			${SAMBA4_DISTNAME}
@@ -19,7 +19,7 @@ CONFLICTS?=			*samba3[2-6]-3.* samba4-4.
 
 SAMBA4_BASENAME=		samba
 SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
-SAMBA4_VERSION=			4.6.1
+SAMBA4_VERSION=			4.6.2
 SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=			${WRKDIR}/${DISTNAME}

Modified: head/net/samba46/distinfo
==============================================================================
--- head/net/samba46/distinfo	Fri Mar 31 20:39:56 2017	(r437386)
+++ head/net/samba46/distinfo	Fri Mar 31 21:11:38 2017	(r437387)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490409185
-SHA256 (samba-4.6.1.tar.gz) = 5d2751faa3cd33affd4f49681f700eff9f6c22d6b08e8858ae0d3cd8e51c535e
-SIZE (samba-4.6.1.tar.gz) = 21097666
+TIMESTAMP = 1490962372
+SHA256 (samba-4.6.2.tar.gz) = 927afcc16e444718985e3952de92d34e7b776b9ca0238179d866da18a6441c35
+SIZE (samba-4.6.2.tar.gz) = 21097045

More information about the svn-ports-head mailing list