Date: Sun, 2 Sep 2018 22:36:09 +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: r478825 - in head/net/samba48: . files Message-ID: <201809022236.w82Ma9cX076954@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Sun Sep 2 22:36:09 2018 New Revision: 478825 URL: https://svnweb.freebsd.org/changeset/ports/478825 Log: Update samba48 port to 4.8.5 version Sponsored by: my wife Deleted: head/net/samba48/files/0001-bug-13351.patch head/net/samba48/files/0001-bug-13441.patch head/net/samba48/files/0001-bug-13451.patch head/net/samba48/files/0001-bug-13537.patch head/net/samba48/files/patch-ctdb__common__ctdb_util.c Modified: head/net/samba48/Makefile head/net/samba48/distinfo head/net/samba48/files/patch-ctdb__wscript head/net/samba48/files/patch-source3__wscript_build head/net/samba48/files/patch-source4__heimdal__lib__roken__rand.c head/net/samba48/pkg-plist Modified: head/net/samba48/Makefile ============================================================================== --- head/net/samba48/Makefile Sun Sep 2 22:31:42 2018 (r478824) +++ head/net/samba48/Makefile Sun Sep 2 22:36:09 2018 (r478825) @@ -3,7 +3,7 @@ PORTNAME= ${SAMBA4_BASENAME}48 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -21,17 +21,12 @@ CONFLICTS_INSTALL?= samba4-4.0.* samba4[1-79]-4.* p5- EXTRA_PATCHES+= ${PATCHDIR}/0001-Zfs-provision-1.patch:-p1 EXTRA_PATCHES+= ${PATCHDIR}/0001-Freenas-master-mdns-fixes-22.patch:-p1 EXTRA_PATCHES+= ${PATCHDIR}/0001-audit.patch:-p1 -EXTRA_PATCHES+= ${PATCHDIR}/0001-ctdb.patch:-p1 EXTRA_PATCHES+= ${PATCHDIR}/0001-bug-13175.patch:-p1 -EXTRA_PATCHES+= ${PATCHDIR}/0001-bug-13351.patch:-p1 -EXTRA_PATCHES+= ${PATCHDIR}/0001-bug-13441.patch:-p1 -EXTRA_PATCHES+= ${PATCHDIR}/0001-bug-13451.patch:-p1 -EXTRA_PATCHES+= ${PATCHDIR}/0001-bug-13537.patch:-p1 EXTRA_PATCHES+= ${PATCHDIR}/0001-bug-228462.patch:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.8.4 +SAMBA4_VERSION= 4.8.5 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -165,8 +160,8 @@ RUN_DEPENDS+= libarchive>=3.1.2:archivers/libarchive #SAMBA4_BUNDLED_TALLOC?= no #SAMBA4_BUNDLED_TEVENT?= no #SAMBA4_BUNDLED_TDB?= no -SAMBA4_BUNDLED_LDB?= yes -SAMBA4_LDB= 13 +#SAMBA4_BUNDLED_LDB?= yes +#SAMBA4_LDB= 13 # cmocka .if defined(SAMBA4_BUNDLED_CMOCKA) SAMBA4_BUNDLED_LIBS+= cmocka @@ -228,8 +223,8 @@ PLIST_SUB+= SAMBA4_BUNDLED_LDB="" SUB_LIST+= SAMBA4_BUNDLED_LDB="" .else . if ${SAMBA4_LDB} == 13 -BUILD_DEPENDS+= ldb13>=1.3.4:databases/ldb13 -RUN_DEPENDS+= ldb13>=1.3.4:databases/ldb13 +BUILD_DEPENDS+= ldb13>=1.3.6:databases/ldb13 +RUN_DEPENDS+= ldb13>=1.3.6:databases/ldb13 . elif ${SAMBA4_LDB} == 12 BUILD_DEPENDS+= ldb12>=1.2.3:databases/ldb12 RUN_DEPENDS+= ldb12>=1.2.3:databases/ldb12 @@ -483,7 +478,8 @@ CONFIGURE_ARGS+= --accel-aes=none .endif .if ${PORT_OPTIONS:MGSSAPI_MIT} -PLIST_FILES+= lib/samba4/winbind-krb5-localauth.so +PLIST_FILES+= lib/shared-modules/krb5/winbind_krb5_localauth.so \ + man/man8/winbind_krb5_localauth.8.gz . if ${PORT_OPTIONS:MAD_DC} PLIST_FILES+= lib/samba4/krb5/plugins/kdb/samba.so . endif Modified: head/net/samba48/distinfo ============================================================================== --- head/net/samba48/distinfo Sun Sep 2 22:31:42 2018 (r478824) +++ head/net/samba48/distinfo Sun Sep 2 22:36:09 2018 (r478825) @@ -1,3 +1,3 @@ -TIMESTAMP = 1534251663 -SHA256 (samba-4.8.4.tar.gz) = f5044d149e01894a08b1d114b8b69aed78171a7bb19608bd1fd771453b9a5406 -SIZE (samba-4.8.4.tar.gz) = 17700008 +TIMESTAMP = 1535201844 +SHA256 (samba-4.8.5.tar.gz) = e58ee6b1262d4128b8932ceee59d5f0b0a9bbe00547eb3cc4c41552de1a65155 +SIZE (samba-4.8.5.tar.gz) = 17715401 Modified: head/net/samba48/files/patch-ctdb__wscript ============================================================================== --- head/net/samba48/files/patch-ctdb__wscript Sun Sep 2 22:31:42 2018 (r478824) +++ head/net/samba48/files/patch-ctdb__wscript Sun Sep 2 22:36:09 2018 (r478825) @@ -1,6 +1,6 @@ ---- ctdb/wscript.orig 2018-03-13 13:18:01 UTC +--- ctdb/wscript.orig 2018-08-24 11:58:20 UTC +++ ctdb/wscript -@@ -86,6 +86,9 @@ def set_options(opt): +@@ -90,6 +90,9 @@ def set_options(opt): opt.add_option('--enable-ceph-reclock', help=("Enable Ceph CTDB recovery lock helper (default=no)"), action="store_true", dest='ctdb_ceph_reclock', default=False) @@ -10,22 +10,20 @@ opt.add_option('--with-logdir', help=("Path to log directory"), -@@ -219,7 +222,7 @@ def configure(conf): +@@ -231,7 +234,7 @@ def configure(conf): + conf.env['LIBPATH_CEPH-COMMON'] = conf.env['LIBPATH_RADOS'] + '/ceph' - if Options.options.ctdb_ceph_reclock: if (conf.CHECK_HEADERS('rados/librados.h', False, False, 'rados') and - conf.CHECK_LIB('rados', shlib=True)): -+ conf.CHECK_LIB('rados', shlib=True)): ++ conf.CHECK_LIB('rados', shlib=True)): + conf.CHECK_LIB('ceph-common', shlib=True) Logs.info('Building with Ceph librados recovery lock support') conf.define('HAVE_LIBRADOS', 1) - else: -@@ -255,9 +258,15 @@ def configure(conf): +@@ -268,9 +271,15 @@ def configure(conf): conf.env.CTDB_VARDIR, conf.env.CTDB_RUNDIR)) - conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.EXEC_PREFIX, -- 'share/ctdb/tests') -- conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests') + if Options.options.ctdb_no_tests: + conf.env.ctdb_tests = False + else: @@ -33,25 +31,26 @@ + + if conf.env.ctdb_tests: + conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.EXEC_PREFIX, -+ 'share/ctdb/tests') + 'share/ctdb/tests') +- conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests') + conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests') # Allow unified compilation and separate compilation of utilities # to find includes -@@ -592,9 +601,9 @@ def build(bld): +@@ -605,9 +614,9 @@ def build(bld): if bld.env.HAVE_LIBRADOS: bld.SAMBA_BINARY('ctdb_mutex_ceph_rados_helper', source='utils/ceph/ctdb_mutex_ceph_rados_helper.c', -- deps='talloc tevent rados', +- deps='talloc tevent rados ceph-common', - includes='include', - install_path='${CTDB_HELPER_BINDIR}') -+ deps='talloc tevent rados', ++ deps='talloc tevent rados ceph-common', + includes='include', + install_path='${CTDB_HELPER_BINDIR}') sed_expr1 = 's|/usr/local/var/lib/ctdb|%s|g' % (bld.env.CTDB_VARDIR) sed_expr2 = 's|/usr/local/etc/ctdb|%s|g' % (bld.env.CTDB_ETCDIR) -@@ -737,6 +746,9 @@ def build(bld): +@@ -750,6 +759,9 @@ def build(bld): bld.install_dir(bld.env.CTDB_RUNDIR) bld.install_dir(bld.env.CTDB_VARDIR) Modified: head/net/samba48/files/patch-source3__wscript_build ============================================================================== --- head/net/samba48/files/patch-source3__wscript_build Sun Sep 2 22:31:42 2018 (r478824) +++ head/net/samba48/files/patch-source3__wscript_build Sun Sep 2 22:36:09 2018 (r478825) @@ -1,5 +1,13 @@ --- source3/wscript_build.orig 2017-07-25 13:09:58 UTC +++ source3/wscript_build +@@ -124,7 +124,6 @@ ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_doma + '!get_attr_list'] + private_pdb_match.append('!pdb_nds_*') + private_pdb_match.append('!pdb_ldapsam_init*') +-private_pdb_match.append('!pdb_*_init') + private_pdb_match = private_pdb_match + ldapsam_pdb_match + + bld.SAMBA3_LIBRARY('samba-passdb', @@ -221,11 +221,9 @@ bld.SAMBA3_SUBSYSTEM('SMBREGISTRY', talloc replace Modified: head/net/samba48/files/patch-source4__heimdal__lib__roken__rand.c ============================================================================== --- head/net/samba48/files/patch-source4__heimdal__lib__roken__rand.c Sun Sep 2 22:31:42 2018 (r478824) +++ head/net/samba48/files/patch-source4__heimdal__lib__roken__rand.c Sun Sep 2 22:36:09 2018 (r478825) @@ -1,5 +1,5 @@ ---- source4/heimdal/lib/roken/rand.c.orig 2018-01-14 12:41:58.000000000 -0800 -+++ source4/heimdal/lib/roken/rand.c 2018-08-22 22:11:26.937151714 -0700 +--- source4/heimdal/lib/roken/rand.c.orig 2018-01-14 04:41:58 UTC ++++ source4/heimdal/lib/roken/rand.c @@ -37,7 +37,6 @@ rk_random_init(void) { Modified: head/net/samba48/pkg-plist ============================================================================== --- head/net/samba48/pkg-plist Sun Sep 2 22:31:42 2018 (r478824) +++ head/net/samba48/pkg-plist Sun Sep 2 22:36:09 2018 (r478825) @@ -178,7 +178,6 @@ lib/samba4/libtevent-util.so lib/samba4/libtevent-util.so.0 lib/samba4/libwbclient.so lib/samba4/libwbclient.so.0 -lib/samba4/winbind_krb5_locator.so lib/nss_winbind.so.1 lib/nss_wins.so.1 lib/pam_winbind.so @@ -298,6 +297,7 @@ lib/samba4/private/libxattr-tdb-samba4.so %%AD_DC%%lib/shared-modules/bind9/dlz_bind9_9.so %%AD_DC%%lib/shared-modules/bind9/dlz_bind9.so %%AD_DC%%lib/shared-modules/gensec/krb5.so +%%AD_DC%%lib/shared-modules/krb5/winbind_krb5_locator.so %%AD_DC%%lib/shared-modules/ldb/acl.so %%AD_DC%%lib/shared-modules/ldb/aclread.so %%AD_DC%%lib/shared-modules/ldb/anr.so @@ -1140,7 +1140,6 @@ man/man7/libsmbclient.7.gz man/man7/samba.7.gz man/man7/traffic_learner.7.gz man/man7/traffic_replay.7.gz -man/man7/winbind_krb5_locator.7.gz man/man8/cifsdd.8.gz man/man8/eventlogadm.8.gz man/man8/idmap_ad.8.gz @@ -1207,6 +1206,7 @@ man/man8/vfs_virusfilter.8.gz man/man8/vfs_worm.8.gz man/man8/vfs_xattr_tdb.8.gz man/man8/vfs_zfsacl.8.gz +man/man8/winbind_krb5_locator.8.gz man/man8/winbindd.8.gz @dir %%SAMBA4_RUNDIR%% @dir %%SAMBA4_LOGDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809022236.w82Ma9cX076954>