From owner-svn-ports-head@freebsd.org Mon Sep 3 12:08:42 2018 Return-Path: Delivered-To: svn-ports-head@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 023C5FE7B54; Mon, 3 Sep 2018 12:08:42 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AA0FA81AB9; Mon, 3 Sep 2018 12:08:41 +0000 (UTC) (envelope-from jbeich@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 9F56A27ABD; Mon, 3 Sep 2018 12:08:41 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w83C8fIW003516; Mon, 3 Sep 2018 12:08:41 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w83C8fsc003515; Mon, 3 Sep 2018 12:08:41 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201809031208.w83C8fsc003515@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 3 Sep 2018 12:08:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478856 - in head/databases/lmdb: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/databases/lmdb: . files X-SVN-Commit-Revision: 478856 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Sep 2018 12:08:42 -0000 Author: jbeich Date: Mon Sep 3 12:08:40 2018 New Revision: 478856 URL: https://svnweb.freebsd.org/changeset/ports/478856 Log: databases/lmdb: back out r478269 due to cyrus-imapd30 instability Robust mutexes were already enabled but r478269 disabled POSIX semaphores. It appears both are only mutually exclusive on Android and old GNU libc. PR: 230564 Reported by: Volodymyr Kostyrko Pointy hat to: jbeich Modified: head/databases/lmdb/Makefile (contents, props changed) head/databases/lmdb/files/patch-mdb.c (contents, props changed) Modified: head/databases/lmdb/Makefile ============================================================================== --- head/databases/lmdb/Makefile Mon Sep 3 11:51:38 2018 (r478855) +++ head/databases/lmdb/Makefile Mon Sep 3 12:08:40 2018 (r478856) @@ -4,7 +4,7 @@ PORTNAME= lmdb PORTVERSION= 0.9.22 DISTVERSIONPREFIX= ${PORTNAME:tu}_ -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= databases Modified: head/databases/lmdb/files/patch-mdb.c ============================================================================== --- head/databases/lmdb/files/patch-mdb.c Mon Sep 3 11:51:38 2018 (r478855) +++ head/databases/lmdb/files/patch-mdb.c Mon Sep 3 12:08:40 2018 (r478856) @@ -1,23 +1,11 @@ -- NetBSD has fdatasync(2), see https://github.com/NetBSD/src/commit/e963c41c6fb9 -- OpenBSD has fdatasync(3), see https://github.com/openbsd/src/commit/aa96fc3dc04f -- FreeBSD 11.0 has robust mutexes (see base r300043) and 11.1 has fdatasync(2) (see base r304977) - ---- mdb.c.orig 2018-03-22 15:23:05 UTC +--- mdb.c.orig 2017-06-01 16:51:10 UTC +++ mdb.c -@@ -124,11 +124,12 @@ typedef SSIZE_T ssize_t; - #include /* defines BYTE_ORDER on HPUX and Solaris */ - #endif - --#if defined(__APPLE__) || defined (BSD) || defined(__FreeBSD_kernel__) --# define MDB_USE_POSIX_SEM 1 -+#if defined(__APPLE__) || defined(ANDROID) || defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ < 11) +@@ -125,6 +125,8 @@ typedef SSIZE_T ssize_t; # define MDB_FDATASYNC fsync --#elif defined(ANDROID) --# define MDB_FDATASYNC fsync -+#endif -+ -+#if defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ < 11) -+# define MDB_USE_POSIX_SEM 1 + #elif defined(ANDROID) + # define MDB_FDATASYNC fsync ++#elif defined(__FreeBSD_version) && __FreeBSD_version < 1101000 ++# define MDB_FDATASYNC fsync #endif #ifndef _WIN32