svn commit: r550377 - in head/net/samba413: . files

Timur I. Bakeyev timur at FreeBSD.org
Sun Sep 27 21:24:18 UTC 2020


Author: timur
Date: Sun Sep 27 21:24:17 2020
New Revision: 550377
URL: https://svnweb.freebsd.org/changeset/ports/550377

Log:
  Introduce Samba 4.13 port as net/samba413

Added:
  head/net/samba413/
     - copied from r550372, head/net/samba412/
Deleted:
  head/net/samba413/files/patch-lib_ldb_ldb__mdb_ldb__mdb.c
Modified:
  head/net/samba413/Makefile
  head/net/samba413/distinfo
  head/net/samba413/files/patch-source3_wscript
  head/net/samba413/pkg-plist

Modified: head/net/samba413/Makefile
==============================================================================
--- head/net/samba412/Makefile	Sun Sep 27 21:07:14 2020	(r550372)
+++ head/net/samba413/Makefile	Sun Sep 27 21:24:17 2020	(r550377)
@@ -1,7 +1,7 @@
 # Created by: timur at FreeBSD.org
 # $FreeBSD$
 
-PORTNAME=			${SAMBA4_BASENAME}412
+PORTNAME=			${SAMBA4_BASENAME}413
 PORTVERSION=			${SAMBA4_VERSION}
 PORTREVISION=			0
 CATEGORIES?=			net
@@ -15,7 +15,7 @@ LICENSE=			GPLv3+
 LICENSE_FILE=			${WRKSRC}/COPYING
 
 IGNORE_NONTHREAD_PYTHON=	needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
-CONFLICTS_INSTALL?=		samba4-4.0.* samba4[1-9]-4.* samba41[013-9]-4.1* p5-Parse-Pidl-4.*
+CONFLICTS_INSTALL?=		samba4-4.0.* samba4[1-9]-4.* samba41[0-24-9]-4.1* p5-Parse-Pidl-4.*
 
 USES=				cpe
 
@@ -23,7 +23,7 @@ EXTRA_PATCHES+=			${PATCHDIR}/0001-Zfs-provision-1.pat
 
 SAMBA4_BASENAME=		samba
 SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
-SAMBA4_VERSION=			4.12.7
+SAMBA4_VERSION=			4.13.0
 SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=			${WRKDIR}/${DISTNAME}
@@ -232,8 +232,8 @@ SUB_LIST+=			SAMBA4_BUNDLED_LDB=""
 SAMBA4_MODULEDIR=		${SAMBA4_LIBDIR}/modules
 .else
 SAMBA4_BUNDLED_LIBS+=		!ldb
-BUILD_DEPENDS+=			ldb21>=2.1.2:databases/ldb21
-RUN_DEPENDS+=			ldb21>=2.1.2:databases/ldb21
+BUILD_DEPENDS+=			ldb22>=2.2.0:databases/ldb22
+RUN_DEPENDS+=			ldb22>=2.2.0:databases/ldb22
 PLIST_SUB+=			SAMBA4_BUNDLED_LDB="@comment "
 SUB_LIST+=			SAMBA4_BUNDLED_LDB="@comment "
 SAMBA4_MODULEDIR=		${PREFIX}/lib/shared-modules

Modified: head/net/samba413/distinfo
==============================================================================
--- head/net/samba412/distinfo	Sun Sep 27 21:07:14 2020	(r550372)
+++ head/net/samba413/distinfo	Sun Sep 27 21:24:17 2020	(r550377)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600628262
-SHA256 (samba-4.12.7.tar.gz) = 30556a0dd2f9ab3b251eb9db6132ffd4379c159f574366fc2f2eabbc018c6fd2
-SIZE (samba-4.12.7.tar.gz) = 18230157
+TIMESTAMP = 1601163828
+SHA256 (samba-4.13.0.tar.gz) = f11d52aee8db0aa50ac614143f2ccefead29e8f8ff585358792221557cade7f6
+SIZE (samba-4.13.0.tar.gz) = 18406380

Modified: head/net/samba413/files/patch-source3_wscript
==============================================================================
--- head/net/samba412/files/patch-source3_wscript	Sun Sep 27 21:07:14 2020	(r550372)
+++ head/net/samba413/files/patch-source3_wscript	Sun Sep 27 21:24:17 2020	(r550377)
@@ -82,13 +82,3 @@
      if Options.options.with_iconv:
          conf.env.with_iconv = True
          if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'):
-@@ -1778,9 +1795,6 @@ main() {
-     if conf.CONFIG_SET('HAVE_VXFS'):
-         default_shared_modules.extend(TO_LIST('vfs_vxfs'))
- 
--    if conf.CONFIG_SET('HAVE_DBUS'):
--        default_shared_modules.extend(TO_LIST('vfs_snapper'))
--
-     explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',')
-     explicit_static_modules = TO_LIST(Options.options.static_modules, delimiter=',')
- 

Modified: head/net/samba413/pkg-plist
==============================================================================
--- head/net/samba412/pkg-plist	Sun Sep 27 21:07:14 2020	(r550372)
+++ head/net/samba413/pkg-plist	Sun Sep 27 21:24:17 2020	(r550377)
@@ -113,7 +113,6 @@ include/samba4/tsocket.h
 include/samba4/util_ldb.h
 include/samba4/util/attr.h
 include/samba4/util/blocking.h
-include/samba4/util/byteorder.h
 include/samba4/util/data_blob.h
 include/samba4/util/debug.h
 include/samba4/util/discard.h
@@ -404,6 +403,7 @@ lib/samba4/private/libxattr-tdb-samba4.so
 %%SAMBA4_MODULEDIR%%/vfs/time_audit.so
 %%SAMBA4_MODULEDIR%%/vfs/unityed_media.so
 %%SAMBA4_MODULEDIR%%/vfs/virusfilter.so
+%%SAMBA4_MODULEDIR%%/vfs/widelinks.so
 %%SAMBA4_MODULEDIR%%/vfs/worm.so
 %%SAMBA4_MODULEDIR%%/vfs/xattr_tdb.so
 %%SAMBA4_MODULEDIR%%/vfs/zfsacl.so
@@ -439,6 +439,8 @@ lib/samba4/private/libxattr-tdb-samba4.so
 %%PKGCONFIGDIR%%/wbclient.pc
 @comment Setup files
 %%SPOTLIGHT%%%%DATADIR%%/samba/mdssvc/elasticsearch_mappings.json
+%%AD_DC%%%%DATADIR%%/samba/admx/en-US/samba.adml
+%%AD_DC%%%%DATADIR%%/samba/admx/samba.admx
 %%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Attributes__Windows_Server_2012_R2.ldf
 %%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Attributes__Windows_Server_2016.ldf
 %%AD_DC%%%%DATADIR%%/setup/ad-schema/AD_DS_Classes__Windows_Server_2012_R2.ldf
@@ -461,8 +463,7 @@ lib/samba4/private/libxattr-tdb-samba4.so
 %%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Sch59.ldf.diff
 %%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Schema-Updates.md
 %%AD_DC%%%%DATADIR%%/setup/aggregate_schema.ldif
-%%AD_DC%%%%DATADIR%%/setup/cn=samba.ldif
-%%AD_DC%%%%DATADIR%%/setup/DB_CONFIG
+
 %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt
 %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt
 %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt
@@ -470,26 +471,12 @@ lib/samba4/private/libxattr-tdb-samba4.so
 %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt
 %%AD_DC%%%%DATADIR%%/setup/dns_update_list
 %%AD_DC%%%%DATADIR%%/setup/extended-rights.ldif
-%%AD_DC%%%%DATADIR%%/setup/fedorads-index.ldif
-%%AD_DC%%%%DATADIR%%/setup/fedorads-linked-attributes.ldif
-%%AD_DC%%%%DATADIR%%/setup/fedorads-pam.ldif
-%%AD_DC%%%%DATADIR%%/setup/fedorads-samba.ldif
-%%AD_DC%%%%DATADIR%%/setup/fedorads-sasl.ldif
 %%AD_DC%%%%DATADIR%%/setup/idmap_init.ldif
 %%AD_DC%%%%DATADIR%%/setup/krb5.conf
-%%AD_DC%%%%DATADIR%%/setup/memberof.conf
-%%AD_DC%%%%DATADIR%%/setup/mmr_serverids.conf
-%%AD_DC%%%%DATADIR%%/setup/mmr_syncrepl.conf
-%%AD_DC%%%%DATADIR%%/setup/modules.conf
 %%AD_DC%%%%DATADIR%%/setup/named.conf
 %%AD_DC%%%%DATADIR%%/setup/named.conf.dlz
 %%AD_DC%%%%DATADIR%%/setup/named.conf.update
 %%AD_DC%%%%DATADIR%%/setup/named.txt
-%%AD_DC%%%%DATADIR%%/setup/olc_mmr.conf
-%%AD_DC%%%%DATADIR%%/setup/olc_seed.ldif
-%%AD_DC%%%%DATADIR%%/setup/olc_serverid.conf
-%%AD_DC%%%%DATADIR%%/setup/olc_syncrepl_seed.conf
-%%AD_DC%%%%DATADIR%%/setup/olc_syncrepl.conf
 %%AD_DC%%%%DATADIR%%/setup/prefixMap.txt
 %%AD_DC%%%%DATADIR%%/setup/provision_basedn_modify.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision_basedn_options.ldif
@@ -526,14 +513,9 @@ lib/samba4/private/libxattr-tdb-samba4.so
 %%AD_DC%%%%DATADIR%%/setup/provision.ldif
 %%AD_DC%%%%DATADIR%%/setup/provision.reg
 %%AD_DC%%%%DATADIR%%/setup/provision.zone
-%%AD_DC%%%%DATADIR%%/setup/refint.conf
 %%AD_DC%%%%DATADIR%%/setup/schema_samba4.ldif
-%%AD_DC%%%%DATADIR%%/setup/schema-map-fedora-ds-1.0
-%%AD_DC%%%%DATADIR%%/setup/schema-map-openldap-2.3
 %%AD_DC%%%%DATADIR%%/setup/secrets_dns.ldif
 %%AD_DC%%%%DATADIR%%/setup/secrets_init.ldif
-%%AD_DC%%%%DATADIR%%/setup/secrets_sasl_ldap.ldif
-%%AD_DC%%%%DATADIR%%/setup/secrets_simple_ldap.ldif
 %%AD_DC%%%%DATADIR%%/setup/secrets.ldif
 %%AD_DC%%%%DATADIR%%/setup/share.ldif
 %%AD_DC%%%%DATADIR%%/setup/spn_update_list
@@ -641,6 +623,7 @@ man/man8/vfs_syncops.8.gz
 man/man8/vfs_time_audit.8.gz
 man/man8/vfs_unityed_media.8.gz
 man/man8/vfs_virusfilter.8.gz
+man/man8/vfs_widelinks.8.gz
 man/man8/vfs_worm.8.gz
 man/man8/vfs_xattr_tdb.8.gz
 man/man8/vfs_zfsacl.8.gz
@@ -717,6 +700,7 @@ man/man8/winbindd.8.gz
 %%CLUSTER%%share/ctdb/events/legacy/31.clamd.script
 %%CLUSTER%%share/ctdb/events/legacy/40.vsftpd.script
 %%CLUSTER%%share/ctdb/events/legacy/41.httpd.script
+%%CLUSTER%%share/ctdb/events/legacy/48.netbios.script
 %%CLUSTER%%share/ctdb/events/legacy/49.winbind.script
 %%CLUSTER%%share/ctdb/events/legacy/50.samba.script
 %%CLUSTER%%share/ctdb/events/legacy/60.nfs.script
@@ -742,6 +726,8 @@ man/man8/winbindd.8.gz
 %%PYTHON_SITELIBDIR%%/samba/common.py
 %%PYTHON_SITELIBDIR%%/samba/compat.py
 %%PYTHON_SITELIBDIR%%/samba/credentials.so
+%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dsdb_dns.so
+%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dsdb.so
 %%PYTHON_SITELIBDIR%%/samba/crypto.so
 %%PYTHON_SITELIBDIR%%/samba/dbchecker.py
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/__init__.py
@@ -789,8 +775,6 @@ man/man8/winbindd.8.gz
 %%PYTHON_SITELIBDIR%%/samba/dnsserver.py
 %%PYTHON_SITELIBDIR%%/samba/domain_update.py
 %%PYTHON_SITELIBDIR%%/samba/drs_utils.py
-%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dsdb_dns.so
-%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dsdb.so
 %%PYTHON_SITELIBDIR%%/samba/emulate/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/emulate/traffic_packets.py
 %%PYTHON_SITELIBDIR%%/samba/emulate/traffic.py
@@ -801,6 +785,7 @@ man/man8/winbindd.8.gz
 %%PYTHON_SITELIBDIR%%/samba/gp_parse/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_aas.py
 %%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_csv.py
+%%PYTHON_SITELIBDIR%%/samba/gp_scripts_ext.py
 %%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_inf.py
 %%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_ini.py
 %%PYTHON_SITELIBDIR%%/samba/gp_parse/gp_pol.py
@@ -904,6 +889,8 @@ man/man8/winbindd.8.gz
 %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/ndrdump.py
 %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/netads_json.py
 %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/samba_dnsupdate.py
+%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcacls_basic.py
+%%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcacls.py
 %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcontrol_process.py
 %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/smbcontrol.py
 %%PYTHON_SITELIBDIR%%/samba/tests/blackbox/traffic_learner.py
@@ -964,6 +951,12 @@ man/man8/winbindd.8.gz
 %%PYTHON_SITELIBDIR%%/samba/tests/kcc/kcc_utils.py
 %%PYTHON_SITELIBDIR%%/samba/tests/kcc/ldif_import_export.py
 %%PYTHON_SITELIBDIR%%/samba/tests/krb5_credentials.py
+%%PYTHON_SITELIBDIR%%/samba/tests/krb5/kcrypto.py
+%%PYTHON_SITELIBDIR%%/samba/tests/krb5/raw_testcase.py
+%%PYTHON_SITELIBDIR%%/samba/tests/krb5/rfc4120_pyasn1.py
+%%PYTHON_SITELIBDIR%%/samba/tests/krb5/s4u_tests.py
+%%PYTHON_SITELIBDIR%%/samba/tests/krb5/simple_tests.py
+%%PYTHON_SITELIBDIR%%/samba/tests/krb5/xrealm_tests.py
 %%PYTHON_SITELIBDIR%%/samba/tests/ldap_raw.py
 %%PYTHON_SITELIBDIR%%/samba/tests/ldap_referrals.py
 %%PYTHON_SITELIBDIR%%/samba/tests/libsmb.py


More information about the svn-ports-all mailing list