Date: Tue, 4 Sep 2018 10:19:31 +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: r478947 - in head/net/samba47: . files Message-ID: <201809041019.w84AJVYx093266@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Tue Sep 4 10:19:31 2018 New Revision: 478947 URL: https://svnweb.freebsd.org/changeset/ports/478947 Log: Update samba47 to 4.7.10 version Sponsored by: my wife Deleted: head/net/samba47/files/0001-bug-13351.patch Modified: head/net/samba47/Makefile head/net/samba47/distinfo head/net/samba47/files/patch-ctdb__wscript Modified: head/net/samba47/Makefile ============================================================================== --- head/net/samba47/Makefile Tue Sep 4 09:56:04 2018 (r478946) +++ head/net/samba47/Makefile Tue Sep 4 10:19:31 2018 (r478947) @@ -20,12 +20,12 @@ CONFLICTS_INSTALL?= samba4-4.0.* samba4[1-689]-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-bug-13351.patch:-p1 +#EXTRA_PATCHES+= ${PATCHDIR}/0001-bug-13351.patch:-p1 EXTRA_PATCHES+= ${PATCHDIR}/0001-bug-228462.patch:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.7.9 +SAMBA4_VERSION= 4.7.10 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} Modified: head/net/samba47/distinfo ============================================================================== --- head/net/samba47/distinfo Tue Sep 4 09:56:04 2018 (r478946) +++ head/net/samba47/distinfo Tue Sep 4 10:19:31 2018 (r478947) @@ -1,3 +1,3 @@ -TIMESTAMP = 1534254234 -SHA256 (samba-4.7.9.tar.gz) = ec9852b2efb974f2b92e9e7f7e6f559867e4a37ce58df51766bfb94ca66817ec -SIZE (samba-4.7.9.tar.gz) = 16907301 +TIMESTAMP = 1536019045 +SHA256 (samba-4.7.10.tar.gz) = 34596814e9b8daaec3e7a07d4d3b355d4976e6a7cf13d4e0b9aaf0388f32be70 +SIZE (samba-4.7.10.tar.gz) = 16911799 Modified: head/net/samba47/files/patch-ctdb__wscript ============================================================================== --- head/net/samba47/files/patch-ctdb__wscript Tue Sep 4 09:56:04 2018 (r478946) +++ head/net/samba47/files/patch-ctdb__wscript Tue Sep 4 10:19:31 2018 (r478947) @@ -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"), -@@ -210,7 +213,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: -@@ -246,9 +249,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 -@@ -573,9 +582,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) -@@ -718,6 +727,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) @@ -61,14 +60,3 @@ # Unit tests ctdb_unit_tests = [ 'db_hash_test', -@@ -828,7 +840,9 @@ def build(bld): - ib_deps, - install_path='${CTDB_TEST_LIBEXECDIR}') - -- if bld.env.HAVE_ROBUST_MUTEXES and sys.platform.startswith('linux'): -+ if bld.env.HAVE_ROBUST_MUTEXES and ( -+ sys.platform.startswith('linux') or sys.platform.startswith('freebsd') -+ ): - bld.SAMBA_BINARY('test_mutex_raw', - source='tests/src/test_mutex_raw.c', - deps='pthread',
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809041019.w84AJVYx093266>