From owner-svn-ports-all@freebsd.org Wed Jun 5 21:00:08 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E976015B9090; Wed, 5 Jun 2019 21:00:07 +0000 (UTC) (envelope-from timur@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8D9C56CED3; Wed, 5 Jun 2019 21:00:07 +0000 (UTC) (envelope-from timur@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 68A7EA74E; Wed, 5 Jun 2019 21:00:07 +0000 (UTC) (envelope-from timur@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x55L072H061465; Wed, 5 Jun 2019 21:00:07 GMT (envelope-from timur@FreeBSD.org) Received: (from timur@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x55L06al061462; Wed, 5 Jun 2019 21:00:06 GMT (envelope-from timur@FreeBSD.org) Message-Id: <201906052100.x55L06al061462@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: timur set sender to timur@FreeBSD.org using -f From: "Timur I. Bakeyev" Date: Wed, 5 Jun 2019 21:00:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r503529 - in head/databases/ldb13: . files X-SVN-Group: ports-head X-SVN-Commit-Author: timur X-SVN-Commit-Paths: in head/databases/ldb13: . files X-SVN-Commit-Revision: 503529 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8D9C56CED3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.969,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jun 2019 21:00:08 -0000 Author: timur Date: Wed Jun 5 21:00:06 2019 New Revision: 503529 URL: https://svnweb.freebsd.org/changeset/ports/503529 Log: Update port to 1.3.8 version, making it compliant with samba47 Deleted: head/databases/ldb13/files/0001-bug-13362.patch Modified: head/databases/ldb13/Makefile head/databases/ldb13/distinfo head/databases/ldb13/files/patch-wscript Modified: head/databases/ldb13/Makefile ============================================================================== --- head/databases/ldb13/Makefile Wed Jun 5 19:40:49 2019 (r503528) +++ head/databases/ldb13/Makefile Wed Jun 5 21:00:06 2019 (r503529) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ldb -PORTVERSION= 1.3.6 +PORTVERSION= 1.3.8 PORTREVISION= 0 PORTEPOCH= 0 CATEGORIES= databases @@ -26,8 +26,6 @@ LDB_DEPENDS= talloc>=2.1.14:devel/talloc \ CONFLICTS_INSTALL= ldb-1.1.* ldb12-1.2.* -EXTRA_PATCHES+= ${PATCHDIR}/0001-bug-13362.patch:-p3 - #FLAVORS= default nopython #nopython_PKGNAMESUFFIX= -nopython #nopython_CONFLICTS= ldb @@ -53,9 +51,11 @@ CONFIGURE_ARGS+= --bundled-libraries=!talloc,!tevent,! OPTIONS_DEFINE= MANPAGES DEBUG MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) -.include - +DEBUG_CONFIGURE_ON= --verbose --enable-debug +DEBUG_MAKE_ARGS= --verbose DEBUG_FLAGS= -g -ggdb3 -O0 + +.include LDB_BINS= bin/ldbedit \ bin/ldbmodify \ Modified: head/databases/ldb13/distinfo ============================================================================== --- head/databases/ldb13/distinfo Wed Jun 5 19:40:49 2019 (r503528) +++ head/databases/ldb13/distinfo Wed Jun 5 21:00:06 2019 (r503529) @@ -1,3 +1,3 @@ -TIMESTAMP = 1535926436 -SHA256 (ldb-1.3.6.tar.gz) = 51d23134b356490e75258518dfc5c994c1710ad5357a1e3455a9eaeddff8939a -SIZE (ldb-1.3.6.tar.gz) = 1374574 +TIMESTAMP = 1557920439 +SHA256 (ldb-1.3.8.tar.gz) = 4d047c687ddc266d0d5a2c16629aa1a6fa6c3114499c9cc80914e3cda16ddca0 +SIZE (ldb-1.3.8.tar.gz) = 1375782 Modified: head/databases/ldb13/files/patch-wscript ============================================================================== --- head/databases/ldb13/files/patch-wscript Wed Jun 5 19:40:49 2019 (r503528) +++ head/databases/ldb13/files/patch-wscript Wed Jun 5 21:00:06 2019 (r503529) @@ -1,6 +1,6 @@ ---- wscript.orig 2017-09-07 10:04:11 UTC +--- wscript.orig 2019-02-26 17:14:29 UTC +++ wscript -@@ -126,9 +126,15 @@ def build(bld): +@@ -139,9 +139,15 @@ def build(bld): bld.RECURSE('lib/tdb') if bld.env.standalone_ldb: @@ -16,7 +16,7 @@ LDB_MAP_SRC = bld.SUBDIR('ldb_map', 'ldb_map.c ldb_map_inbound.c ldb_map_outbound.c') -@@ -149,13 +155,6 @@ def build(bld): +@@ -162,13 +168,6 @@ def build(bld): if bld.PYTHON_BUILD_IS_ENABLED(): if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'): for env in bld.gen_python_environments(['PKGCONFIGDIR']): @@ -30,3 +30,24 @@ name = bld.pyembed_libname('pyldb-util') bld.SAMBA_LIBRARY(name, +@@ -364,10 +363,6 @@ def build(bld): + deps='cmocka ldb', + install=False) + +- bld.SAMBA_BINARY('ldb_match_test', +- source='tests/ldb_match_test.c', +- deps='cmocka ldb', +- install=False) + + def test(ctx): + '''run ldb testsuite''' +@@ -397,8 +392,7 @@ def test(ctx): + + cmocka_ret = 0 + for test_exe in ['ldb_tdb_mod_op_test', +- 'ldb_msg_test', +- 'ldb_match_test']: ++ 'ldb_msg_test']: + cmd = os.path.join(Utils.g_module.blddir, test_exe) + cmocka_ret = cmocka_ret or samba_utils.RUN_COMMAND(cmd) +