Fix permissions on configuration files (bug 317055).

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 67 insertions, 2 deletions

diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index 822c7852debf..71a7c622f337 100644
--- a/dev-db/couchdb/ChangeLog
+++ b/dev-db/couchdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/couchdb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.22 2010/04/19 16:10:26 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.23 2010/05/25 11:22:36 djc Exp $
+
+*couchdb-0.11.0-r1 (25 May 2010)
+
+  25 May 2010; Dirkjan Ochtman <djc@gentoo.org> +couchdb-0.11.0-r1.ebuild:
+  Fix permissions on configuration files (bug 317055).
 
 *couchdb-0.10.2 (19 Apr 2010)
 
diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index 8a18f1ea621b..f117dfe1eca0 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -7,6 +7,7 @@ DIST apache-couchdb-0.11.0.tar.gz 925354 RMD160 cd52e0f41a67b1cba9792e2ac11c74ca
 EBUILD couchdb-0.10.0.ebuild 1245 RMD160 331c5794f1c335dc8cc2406e96f57516cbff143b SHA1 4b168b1f72afeba93e051038e176a4c8185ac85d SHA256 afbb4eda1b6b4af58a1ca5acd8bf6121ff9a9e69b61b31adf90b78bf1d16b293
 EBUILD couchdb-0.10.1.ebuild 1442 RMD160 ddcc7e20d5e75b7a33acf5ae0c4e6eb10d298ef8 SHA1 ff5e518292e7f993ce53f6ecf51695dbb2e9c145 SHA256 9090d9b2fa46eacc4913dd394fa9889ad5d11240f89fdc1e55016912eb587e94
 EBUILD couchdb-0.10.2.ebuild 1442 RMD160 fc7aed472604d31e74712c34fe150a4b41c9fb0d SHA1 8f1a92699c8b33cd2b92954ad59ea41e6303fd2b SHA256 4341a0146db1ffab63a275b0eca19c02f2093e885a4e02bb65349f8689e27b39
+EBUILD couchdb-0.11.0-r1.ebuild 1518 RMD160 2d93b930c753ee6518e8a0f9d3d382f2e21ec128 SHA1 35b23f767be8bd0dc437160ad79591fbe7867287 SHA256 dd2d8212537df4cd7ccb211f7b74d1ef38206ca2b1c858c90e9610f2dc57fe0d
 EBUILD couchdb-0.11.0.ebuild 1442 RMD160 7a0acba55c7a35eda90a4a61eb1ef6256743ebbd SHA1 e066e0480275a7d77f049187d0a31862a0a4a550 SHA256 195c14aad2e572bee2d7dc27f4ac2435936dec288291ada04e5eb456440e00d6
-MISC ChangeLog 3028 RMD160 f34f3fa6131e73171123534f192e0a3e12bdc995 SHA1 53e941dee5b1951461d35d37168987eaaf50059f SHA256 ffec13ecefd1e24f2a85d32dfaa59bed42e8f8848e6e17e3044638705f2e5542
+MISC ChangeLog 3193 RMD160 a6f52f26b8cc54b468141d642e8aae180be6afdc SHA1 54ab0aa060e900443b37219cd517cff1fa7c6d16 SHA256 9e9aa415ba402e104590261d27dbfff35197cc17aa69af78a4c21469de4e841b
 MISC metadata.xml 281 RMD160 7304480305abc4ebc06b7830580f19e94ad9c0ba SHA1 87753154b0a5bee4cc95e7f01cdee14b7a2ad006 SHA256 f602bc3aedf3d0938b3dcbecbfb97fff8e6fd6cc52e86bf589c04ae328ce1735
diff --git a/dev-db/couchdb/couchdb-0.11.0-r1.ebuild b/dev-db/couchdb/couchdb-0.11.0-r1.ebuild
new file mode 100644
index 000000000000..fdaa3b24e9e8
--- /dev/null
+++ b/dev-db/couchdb/couchdb-0.11.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-0.11.0-r1.ebuild,v 1.1 2010/05/25 11:22:36 djc Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database."
+HOMEPAGE="http://couchdb.apache.org/"
+SRC_URI="mirror://apache/couchdb/${PV}/apache-${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="dev-libs/icu
+		dev-lang/erlang[ssl]
+		>=dev-libs/openssl-0.9.8j
+		>=net-misc/curl-7.18.2
+		dev-lang/spidermonkey"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/apache-${P}"
+
+pkg_setup() {
+	enewgroup couchdb
+	enewuser couchdb -1 /bin/bash /var/lib/couchdb couchdb
+}
+
+src_configure() {
+	econf \
+		--with-erlang=/usr/lib/erlang/usr/include \
+		--localstatedir=/var \
+		--with-js-lib=/usr/lib
+	# bug 296609, upstream bug #COUCHDB-621
+	sed -e "s#localdocdir = /usr/share/doc/couchdb#localdocdir = /usr/share/doc/couchdb-0.10.1#" -i Makefile || die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	insinto /var/run/couchdb
+
+	fowners couchdb:couchdb \
+		/var/run/couchdb \
+		/var/lib/couchdb \
+		/var/log/couchdb
+
+	fowners root:couchdb /etc/couchdb/*.ini
+	fperms 660 /etc/couchdb/*.ini
+
+	newinitd "${FILESDIR}/couchdb.init-0.10" couchdb || die
+	newconfd "${FILESDIR}/couchdb.conf-0.10" couchdb || die
+
+	sed -i -e "s:LIBDIR:$(get_libdir):" "${D}/etc/conf.d/couchdb"
+}