Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Jan 2015 03:54:22 +0000 (UTC)
From:      "Timur I. Bakeyev" <timur@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r377151 - in head/net: samba4 samba4/files samba41 samba41/files
Message-ID:  <201501160354.t0G3sM0Q094716@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: timur
Date: Fri Jan 16 03:54:21 2015
New Revision: 377151
URL: https://svnweb.freebsd.org/changeset/ports/377151
QAT: https://qat.redports.org/buildarchive/r377151/

Log:
  Update ports net/samba4 and net/samba41 to address recent security issue with
  the elevation of privilege to ADDC.
  
  Security:	CVE-2014-8143

Added:
  head/net/samba4/files/patch-nsswitch__wscript_build   (contents, props changed)
  head/net/samba41/files/patch-nsswitch__wscript_build   (contents, props changed)
Modified:
  head/net/samba4/Makefile
  head/net/samba4/distinfo
  head/net/samba4/files/patch-source3__wscript_build
  head/net/samba41/Makefile
  head/net/samba41/distinfo
  head/net/samba41/files/patch-source3__wscript_build
  head/net/samba41/pkg-plist

Modified: head/net/samba4/Makefile
==============================================================================
--- head/net/samba4/Makefile	Fri Jan 16 03:49:35 2015	(r377150)
+++ head/net/samba4/Makefile	Fri Jan 16 03:54:21 2015	(r377151)
@@ -3,7 +3,7 @@
 
 PORTNAME?=		${SAMBA4_BASENAME}4
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		1
+PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	samba/stable samba/rc
@@ -18,7 +18,7 @@ CONFLICTS?=		*samba3[2-6]-3.* samba41-4.
 
 SAMBA4_BASENAME=	samba
 SAMBA4_PORTNAME=	${SAMBA4_BASENAME}4
-SAMBA4_VERSION=		4.0.23
+SAMBA4_VERSION=		4.0.24
 SAMBA4_DISTNAME=	${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=		${WRKDIR}/${DISTNAME}
@@ -64,7 +64,7 @@ DESTDIRNAME=		--destdir
 CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 			PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
 
-USES=			compiler cpe execinfo fam iconv perl5 pkgconfig \
+USES=			compiler cpe execinfo iconv perl5 pkgconfig \
 			python:2 readline shebangfix
 USE_PERL5=		build
 USE_LDCONFIG=		${SAMBA4_LIBDIR}
@@ -137,10 +137,11 @@ DEVELOPER_DESC=		With development suppor
 MANPAGES_DESC=		Build manpages from DOCBOOK templates
 
 OPTIONS_RADIO=		DNS ZEROCONF
-OPTIONS_RADIO_DNS=	NSUPDATE BIND99
+OPTIONS_RADIO_DNS=	NSUPDATE BIND99 BIND910
 OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
 
 BIND99_DESC=		Use bind99 as AD DC DNS server frontend
+BIND910_DESC=		Use bind910 as AD DC DNS server frontend
 NSUPDATE_DESC=		Use samba NSUPDATE utility for AD DC
 
 .include <bsd.port.options.mk>
@@ -162,6 +163,9 @@ CFLAGS+=		-fno-omit-frame-pointer
 .if ${PORT_OPTIONS:MBIND99}
 RUN_DEPENDS+=		bind99>=9.9.0.0:${PORTSDIR}/dns/bind99
 SUB_LIST+=		NSUPDATE="@comment "
+.elif ${PORT_OPTIONS:MBIND910}
+RUN_DEPENDS+=		bind910>=9.10.0.0:${PORTSDIR}/dns/bind910
+SUB_LIST+=		NSUPDATE="@comment "
 .elif ${PORT_OPTIONS:MNSUPDATE}
 RUN_DEPENDS+=		samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate
 SUB_LIST+=		NSUPDATE=""

Modified: head/net/samba4/distinfo
==============================================================================
--- head/net/samba4/distinfo	Fri Jan 16 03:49:35 2015	(r377150)
+++ head/net/samba4/distinfo	Fri Jan 16 03:54:21 2015	(r377151)
@@ -1,2 +1,2 @@
-SHA256 (samba-4.0.23.tar.gz) = 47d7b9d0caf76ea111794c6181db2fed5c15fd496a5a9eaa8ed4323302c72118
-SIZE (samba-4.0.23.tar.gz) = 22140738
+SHA256 (samba-4.0.24.tar.gz) = e1e4068c65684848d8cb17c8997c91be426ff75ccd617f647878307817af615a
+SIZE (samba-4.0.24.tar.gz) = 22148369

Added: head/net/samba4/files/patch-nsswitch__wscript_build
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/samba4/files/patch-nsswitch__wscript_build	Fri Jan 16 03:54:21 2015	(r377151)
@@ -0,0 +1,15 @@
+--- nsswitch/wscript_build.orig	2015-01-15 23:07:01.654902807 +0000
++++ nsswitch/wscript_build	2015-01-15 23:11:43.587388779 +0000
+@@ -57,6 +57,12 @@
+ 			  realname='nss_winbind.so.1',
+ 			  vnum='1')
+ 
++	bld.SAMBA3_LIBRARY('nss_wins',
++			  source='wins.c wins_freebsd.c',
++			  deps='''param libsmb LIBTSOCKET''',
++			  realname='nss_wins.so.1',
++			  vnum='1')
++
+ elif (host_os.rfind('netbsd') > -1):
+ 	# NetBSD winbind client is implemented as a wrapper
+ 	# around the Linux version. It needs getpwent_r() to

Modified: head/net/samba4/files/patch-source3__wscript_build
==============================================================================
--- head/net/samba4/files/patch-source3__wscript_build	Fri Jan 16 03:49:35 2015	(r377150)
+++ head/net/samba4/files/patch-source3__wscript_build	Fri Jan 16 03:54:21 2015	(r377151)
@@ -1,34 +1,20 @@
---- source3/wscript_build.orig	2013-07-01 09:15:40.000000000 +0200
-+++ source3/wscript_build	2013-11-12 10:13:36.004046408 +0100
-@@ -1,7 +1,8 @@
- #!/usr/bin/env python
- 
- from samba_utils import *
--import samba_version, samba3
-+import samba_version, samba3, sys
-+host_os = sys.platform
- 
- TDB_LIB_SRC = '''
- 	  lib/dbwrap/dbwrap_open.c
-@@ -651,7 +652,16 @@
+--- source3/wscript_build.orig	2014-12-08 07:46:38.000000000 +0000
++++ source3/wscript_build	2015-01-16 00:11:55.966511894 +0000
+@@ -653,13 +653,6 @@
                      vnum='0',
                      vars=locals())
  
 -bld.SAMBA3_LIBRARY('nss_wins',
-+if (host_os.rfind('freebsd') > -1):
-+        # FreeBSD winbind client is implemented as a wrapper around
-+        # the Linux version.
-+        bld.SAMBA3_LIBRARY('nss_wins',
-+                  source=' '.join([WINBIND_WINS_NSS_SRC, '../nsswitch/wins_freebsd.c']),
-+                  deps='''param libsmb LIBTSOCKET''',
-+                  realname='nss_wins.so.1',
-+                  vnum='1')
-+else:
-+        bld.SAMBA3_LIBRARY('nss_wins',
-                   source=WINBIND_WINS_NSS_SRC,
-                   deps='''param libsmb LIBTSOCKET''',
-                   realname='libnss_wins.so.2',
-@@ -972,10 +982,12 @@
+-                  source=WINBIND_WINS_NSS_SRC,
+-                  deps='''param libsmb LIBTSOCKET''',
+-                  realname='libnss_wins.so.2',
+-                  soname='libnss_wins.so',
+-                  vnum='2')
+-
+ bld.SAMBA3_LIBRARY('gse',
+                    source='librpc/crypto/gse_krb5.c librpc/crypto/gse.c',
+                    deps='krb5samba gensec param KRBCLIENT secrets3',
+@@ -975,10 +968,12 @@
                      LIBAFS_SETTOKEN
                      RPC_SERVER
                      NDR_SMBXSRV
@@ -42,7 +28,7 @@
                      ''' + bld.env['dmapi_lib'],
                      private_library=True,
                      vars=locals())
-@@ -1277,6 +1289,7 @@
+@@ -1284,6 +1279,7 @@
                   libsmb
                   msrpc3
                   RPC_NDR_SRVSVC
@@ -50,7 +36,7 @@
                   cli_smb_common''')
  
  bld.SAMBA3_BINARY('net',
-@@ -1629,7 +1642,7 @@
+@@ -1636,7 +1632,7 @@
  
  bld.SAMBA3_PYTHON('pylibsmb',
                    source='libsmb/pylibsmb.c',

Modified: head/net/samba41/Makefile
==============================================================================
--- head/net/samba41/Makefile	Fri Jan 16 03:49:35 2015	(r377150)
+++ head/net/samba41/Makefile	Fri Jan 16 03:54:21 2015	(r377151)
@@ -3,7 +3,7 @@
 
 PORTNAME?=		${SAMBA4_BASENAME}41
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		1
+PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	samba/stable samba/rc
@@ -18,7 +18,7 @@ CONFLICTS?=		*samba3[2-6]-3.* samba4-4.0
 
 SAMBA4_BASENAME=	samba
 SAMBA4_PORTNAME=	${SAMBA4_BASENAME}4
-SAMBA4_VERSION=		4.1.14
+SAMBA4_VERSION=		4.1.16
 SAMBA4_DISTNAME=	${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=		${WRKDIR}/${DISTNAME}
@@ -64,7 +64,7 @@ DESTDIRNAME=		--destdir
 CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 			PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
 
-USES=			compiler cpe execinfo fam iconv perl5 pkgconfig \
+USES=			compiler cpe execinfo iconv perl5 pkgconfig \
 			python:2 readline shebangfix
 USE_PERL5=		build
 USE_LDCONFIG=		${SAMBA4_LIBDIR}
@@ -89,6 +89,10 @@ LIB_DEPENDS+=		libsunacl.so:${PORTSDIR}/
 # External Samba dependencies
 # IDL compiler
 BUILD_DEPENDS+=		p5-Parse-Pidl>=4.0.0:${PORTSDIR}/devel/p5-Parse-Pidl
+# 
+BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython
+RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython
+PLIST_SUB+=		PY_DNSPYTHON="@comment "
 # talloc
 BUILD_DEPENDS+=		talloc>=2.1.0:${PORTSDIR}/devel/talloc
 RUN_DEPENDS+=		talloc>=2.1.0:${PORTSDIR}/devel/talloc
@@ -140,10 +144,11 @@ DEVELOPER_DESC=		With development suppor
 MANPAGES_DESC=		Build manpages from DOCBOOK templates
 
 OPTIONS_RADIO=		DNS ZEROCONF
-OPTIONS_RADIO_DNS=	NSUPDATE BIND99
+OPTIONS_RADIO_DNS=	NSUPDATE BIND99 BIND910
 OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
 
 BIND99_DESC=		Use bind99 as AD DC DNS server frontend
+BIND910_DESC=		Use bind910 as AD DC DNS server frontend
 NSUPDATE_DESC=		Use samba NSUPDATE utility for AD DC
 
 .include <bsd.port.options.mk>
@@ -165,6 +170,9 @@ CFLAGS+=		-fno-omit-frame-pointer
 .if ${PORT_OPTIONS:MBIND99}
 RUN_DEPENDS+=		bind99>=9.9.0.0:${PORTSDIR}/dns/bind99
 SUB_LIST+=		NSUPDATE="@comment "
+.elif ${PORT_OPTIONS:MBIND910}
+RUN_DEPENDS+=		bind910>=9.10.0.0:${PORTSDIR}/dns/bind910
+SUB_LIST+=		NSUPDATE="@comment "
 .elif ${PORT_OPTIONS:MNSUPDATE}
 RUN_DEPENDS+=		samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate
 SUB_LIST+=		NSUPDATE=""

Modified: head/net/samba41/distinfo
==============================================================================
--- head/net/samba41/distinfo	Fri Jan 16 03:49:35 2015	(r377150)
+++ head/net/samba41/distinfo	Fri Jan 16 03:54:21 2015	(r377151)
@@ -1,2 +1,2 @@
-SHA256 (samba-4.1.14.tar.gz) = 5ea14baaca997292355d368918879e3d639def92b54efef2279cf5abe8db2cba
-SIZE (samba-4.1.14.tar.gz) = 19527260
+SHA256 (samba-4.1.16.tar.gz) = 12a09c167bfa25f50b82775bcbeda94c71c5d71d3b0d1210f6dae0f23020a87b
+SIZE (samba-4.1.16.tar.gz) = 19534236

Added: head/net/samba41/files/patch-nsswitch__wscript_build
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/samba41/files/patch-nsswitch__wscript_build	Fri Jan 16 03:54:21 2015	(r377151)
@@ -0,0 +1,15 @@
+--- nsswitch/wscript_build.orig	2015-01-15 23:07:01.654902807 +0000
++++ nsswitch/wscript_build	2015-01-15 23:11:43.587388779 +0000
+@@ -57,6 +57,12 @@
+ 			  realname='nss_winbind.so.1',
+ 			  vnum='1')
+ 
++	bld.SAMBA3_LIBRARY('nss_wins',
++			  source='wins.c wins_freebsd.c',
++			  deps='''param libsmb LIBTSOCKET''',
++			  realname='nss_wins.so.1',
++			  vnum='1')
++
+ elif (host_os.rfind('netbsd') > -1):
+ 	# NetBSD winbind client is implemented as a wrapper
+ 	# around the Linux version. It needs getpwent_r() to

Modified: head/net/samba41/files/patch-source3__wscript_build
==============================================================================
--- head/net/samba41/files/patch-source3__wscript_build	Fri Jan 16 03:49:35 2015	(r377150)
+++ head/net/samba41/files/patch-source3__wscript_build	Fri Jan 16 03:54:21 2015	(r377151)
@@ -1,33 +1,5 @@
 --- source3/wscript_build.orig	2013-09-06 09:39:57.000000000 +0000
 +++ source3/wscript_build	2013-11-20 00:35:51.687173831 +0000
-@@ -1,7 +1,8 @@
- #!/usr/bin/env python
- 
- from samba_utils import *
--import samba_version, samba3
-+import samba_version, samba3, sys
-+host_os = sys.platform
- 
- TDB_LIB_SRC = '''
- 	  lib/dbwrap/dbwrap_open.c
-@@ -654,7 +655,16 @@
-                     vnum='0',
-                     vars=locals())
- 
--bld.SAMBA3_LIBRARY('nss_wins',
-+if (host_os.rfind('freebsd') > -1):
-+        # FreeBSD winbind client is implemented as a wrapper around
-+        # the Linux version.
-+        bld.SAMBA3_LIBRARY('nss_wins',
-+                  source=' '.join([WINBIND_WINS_NSS_SRC, '../nsswitch/wins_freebsd.c']),
-+                  deps='''param libsmb LIBTSOCKET''',
-+                  realname='nss_wins.so.1',
-+                  vnum='1')
-+else:
-+        bld.SAMBA3_LIBRARY('nss_wins',
-                   source=WINBIND_WINS_NSS_SRC,
-                   deps='''param libsmb LIBTSOCKET''',
-                   realname='libnss_wins.so.2',
 @@ -976,11 +986,13 @@
                      LIBAFS_SETTOKEN
                      RPC_SERVER

Modified: head/net/samba41/pkg-plist
==============================================================================
--- head/net/samba41/pkg-plist	Fri Jan 16 03:49:35 2015	(r377150)
+++ head/net/samba41/pkg-plist	Fri Jan 16 03:54:21 2015	(r377151)
@@ -531,86 +531,86 @@ libdata/pkgconfig/wbclient.pc
 %%PYTHON_SITELIBDIR%%/samba/drs_utils.py
 %%PYTHON_SITELIBDIR%%/samba/dsdb.so
 %%PYTHON_SITELIBDIR%%/samba/external/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/dnssec.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/e164.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/edns.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/entropy.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/exception.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/flags.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/hash.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/inet.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/ipv4.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/ipv6.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/message.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/name.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/namedict.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/node.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/opcode.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/query.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rcode.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdata.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdataclass.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdataset.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdatatype.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/AFSDB.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/CERT.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/CNAME.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DLV.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DNAME.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DNSKEY.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DS.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/GPOS.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/HINFO.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/HIP.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/ISDN.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/LOC.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/MX.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NS.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC3.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC3PARAM.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/PTR.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RP.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RRSIG.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RT.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SOA.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SPF.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SSHFP.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/TXT.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/X25.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/A.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/AAAA.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/APL.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/DHCID.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/IPSECKEY.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/KX.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NAPTR.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NSAP.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NSAP_PTR.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/PX.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/SRV.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/WKS.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/__init__.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/dsbase.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/mxbase.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/nsbase.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/txtbase.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/renderer.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/resolver.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/reversename.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/rrset.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/set.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/tokenizer.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/tsig.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/tsigkeyring.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/ttl.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/update.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/version.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/wiredata.py
-%%PYTHON_SITELIBDIR%%/samba/external/dns/zone.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/__init__.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/dnssec.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/e164.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/edns.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/entropy.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/exception.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/flags.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/hash.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/inet.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/ipv4.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/ipv6.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/message.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/name.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/namedict.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/node.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/opcode.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/query.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rcode.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdata.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdataclass.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdataset.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdatatype.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/AFSDB.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/CERT.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/CNAME.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DLV.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DNAME.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DNSKEY.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DS.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/GPOS.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/HINFO.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/HIP.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/ISDN.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/LOC.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/MX.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NS.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC3.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC3PARAM.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/PTR.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RP.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RRSIG.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RT.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SOA.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SPF.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SSHFP.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/TXT.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/X25.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/__init__.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/A.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/AAAA.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/APL.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/DHCID.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/IPSECKEY.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/KX.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NAPTR.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NSAP.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NSAP_PTR.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/PX.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/SRV.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/WKS.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/__init__.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/__init__.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/dsbase.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/mxbase.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/nsbase.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/txtbase.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/renderer.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/resolver.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/reversename.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rrset.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/set.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/tokenizer.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/tsig.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/tsigkeyring.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/ttl.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/update.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/version.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/wiredata.py
+%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/zone.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/chunked.py
 %%PYTHON_SITELIBDIR%%/samba/external/subunit/details.py
@@ -820,10 +820,10 @@ libdata/pkgconfig/wbclient.pc
 @dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools
 @dirrm %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests
 @dirrm %%PYTHON_SITELIBDIR%%/samba/external/subunit
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes
-@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns
+%%PY_DNSPYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN
+%%PY_DNSPYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY
+%%PY_DNSPYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes
+%%PY_DNSPYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns
 @dirrm %%PYTHON_SITELIBDIR%%/samba/external
 @dirrm %%PYTHON_SITELIBDIR%%/samba/dcerpc
 @dirrm %%PYTHON_SITELIBDIR%%/samba



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501160354.t0G3sM0Q094716>