From owner-svn-ports-head@freebsd.org Mon Mar 14 18:29:07 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1CA53AD0C10; Mon, 14 Mar 2016 18:29:07 +0000 (UTC) (envelope-from pi@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 mx1.freebsd.org (Postfix) with ESMTPS id EA27C1F06; Mon, 14 Mar 2016 18:29:06 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2EIT5Ll081771; Mon, 14 Mar 2016 18:29:05 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2EIT51l081767; Mon, 14 Mar 2016 18:29:05 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201603141829.u2EIT51l081767@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Mon, 14 Mar 2016 18:29:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411108 - in head/databases/mongodb32: . files X-SVN-Group: ports-head 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.21 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, 14 Mar 2016 18:29:07 -0000 Author: pi Date: Mon Mar 14 18:29:05 2016 New Revision: 411108 URL: https://svnweb.freebsd.org/changeset/ports/411108 Log: databases/mongodb32: 3.2.3 -> 3.2.4 - modified pkg-plist from exec/unexec to @sample - provide a simplified mongodb.conf file - Fixed issue with setting optime when running with journaling disabled: SERVER-22495, SERVER-22728 - Have read concern majority reflect journaled state on the primary: SERVER-22269 - Fixed issue where specifying replication.enableMajorityReadConcern implied true regardless of the actual boolean value: SERVER-22683 - Fixed issue causing segfault when running aggregation that includes $lookup: SERVER-22537 PR: 207842 Submitted by: numisemis@yahoo.com Approved by: Brendan Molloy (maintainer) Added: head/databases/mongodb32/files/patch-rpm_mongod.conf (contents, props changed) Modified: head/databases/mongodb32/Makefile head/databases/mongodb32/distinfo head/databases/mongodb32/pkg-plist Modified: head/databases/mongodb32/Makefile ============================================================================== --- head/databases/mongodb32/Makefile Mon Mar 14 18:15:29 2016 (r411107) +++ head/databases/mongodb32/Makefile Mon Mar 14 18:29:05 2016 (r411108) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mongodb32 -PORTVERSION= 3.2.3 +PORTVERSION= 3.2.4 DISTVERSIONPREFIX= r CATEGORIES= databases net MASTER_SITES= https://fastdl.mongodb.org/src/ \ @@ -34,6 +34,7 @@ CHOSEN_COMPILER_TYPE= clang ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= "Only supported on amd64 (i386 deprecated in v3)" +CONFLICTS_BUILD= mongo-cxx-driver OPTIONS_DEFINE= SASL SSL OPTIONS_DEFAULT= SASL SSL @@ -68,6 +69,7 @@ post-install: .for f in mongo mongod mongoperf mongos mongosniff ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} .endfor + ${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample do-test: @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \ Modified: head/databases/mongodb32/distinfo ============================================================================== --- head/databases/mongodb32/distinfo Mon Mar 14 18:15:29 2016 (r411107) +++ head/databases/mongodb32/distinfo Mon Mar 14 18:29:05 2016 (r411108) @@ -1,2 +1,2 @@ -SHA256 (mongodb-src-r3.2.3.tar.gz) = 82030ada190095b5d95c0b59e9cf74efe9db602b49d2b8857b06f2683a5227fa -SIZE (mongodb-src-r3.2.3.tar.gz) = 29607224 +SHA256 (mongodb-src-r3.2.4.tar.gz) = b60743cc641de975c38e6e69ebbef60059ee9fe176cdd98bfab8d5c844dab42c +SIZE (mongodb-src-r3.2.4.tar.gz) = 29647777 Added: head/databases/mongodb32/files/patch-rpm_mongod.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mongodb32/files/patch-rpm_mongod.conf Mon Mar 14 18:29:05 2016 (r411108) @@ -0,0 +1,31 @@ +--- rpm/mongod.conf.orig 2016-03-01 04:38:06 UTC ++++ rpm/mongod.conf +@@ -1,4 +1,4 @@ +-# mongod.conf ++# mongodb.conf + + # for documentation of all options, see: + # http://docs.mongodb.org/manual/reference/configuration-options/ +@@ -7,11 +7,11 @@ + systemLog: + destination: file + logAppend: true +- path: /var/log/mongodb/mongod.log ++ path: /var/log/mongodb/log + + # Where and how to store data. + storage: +- dbPath: /var/lib/mongo ++ dbPath: /var/db/mongo + journal: + enabled: true + # engine: +@@ -21,7 +21,7 @@ storage: + # how the process runs + processManagement: + fork: true # fork and run in background +- pidFilePath: /var/run/mongodb/mongod.pid # location of pidfile ++ pidFilePath: /var/run/mongodb/pid # location of pidfile + + # network interfaces + net: Modified: head/databases/mongodb32/pkg-plist ============================================================================== --- head/databases/mongodb32/pkg-plist Mon Mar 14 18:15:29 2016 (r411107) +++ head/databases/mongodb32/pkg-plist Mon Mar 14 18:29:05 2016 (r411108) @@ -1,5 +1,4 @@ -@unexec if [ ! -s %D/etc/mongodb.conf ]; then /bin/rm -f %D/etc/mongodb.conf; fi -@exec if [ ! -f %D/etc/mongodb.conf ]; then /usr/bin/touch %D/etc/mongodb.conf; fi +@sample etc/mongodb.conf.sample bin/mongo bin/mongod bin/mongoperf