Remove old, vulnerable versions (bug 506354)

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 30380381)

7 files changed, 6 insertions, 278 deletions

diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index 6769e195fc23..400cf024ca67 100644
--- a/dev-db/couchdb/ChangeLog
+++ b/dev-db/couchdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/couchdb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.98 2014/06/08 10:55:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.99 2014/06/08 13:00:42 djc Exp $
+
+  08 Jun 2014; Dirkjan Ochtman <djc@gentoo.org> -couchdb-1.4.0.ebuild,
+  -couchdb-1.5.0.ebuild, -files/couchdb.conf-0.10, -files/couchdb.init-0.10,
+  -files/couchdb.init-2, -files/couchdb.init-3:
+  Remove old, vulnerable versions (bug 506354)
 
   08 Jun 2014; Agostino Sarubbo <ago@gentoo.org> couchdb-1.5.1.ebuild:
   Stable for x86, wrt bug #506354
diff --git a/dev-db/couchdb/couchdb-1.4.0.ebuild b/dev-db/couchdb/couchdb-1.4.0.ebuild
deleted file mode 100644
index 1b0200055abf..000000000000
--- a/dev-db/couchdb/couchdb-1.4.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.4.0.ebuild,v 1.5 2014/02/02 10:31:24 swift Exp $
-
-EAPI=5
-
-inherit eutils multilib pax-utils user
-
-DESCRIPTION="Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database."
-HOMEPAGE="http://couchdb.apache.org/"
-SRC_URI="mirror://apache/couchdb/source/${PV}/apache-${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="selinux test"
-
-RDEPEND=">=dev-libs/icu-4.3.1
-		dev-lang/erlang[ssl]
-		>=dev-libs/openssl-0.9.8j:0
-		>=net-misc/curl-7.18.2
-		<dev-lang/spidermonkey-1.8.7
-		selinux? ( sec-policy/selinux-couchdb )"
-
-DEPEND="${RDEPEND}"
-RESTRICT=test
-
-S="${WORKDIR}/apache-${P}"
-
-pkg_setup() {
-	enewgroup couchdb
-	enewuser couchdb -1 -1 /var/lib/couchdb couchdb
-}
-
-src_prepare() {
-	sed -i ./src/couchdb/priv/Makefile.* -e 's|-Werror||g'
-}
-
-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/${PF}#" -i Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake
-	# bug 442616
-	pax-mark mr src/couchdb/priv/couchjs
-}
-
-src_test() {
-	emake distcheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	fowners couchdb:couchdb \
-		/var/lib/couchdb \
-		/var/log/couchdb
-
-	for f in "${D}"/etc/couchdb/*.ini ; do
-		fowners root:couchdb "${f#${D}}"
-		fperms 660 "${f#${D}}"
-	done
-	fperms 664 /etc/couchdb/default.ini
-
-	newinitd "${FILESDIR}/couchdb.init-4" couchdb
-	newconfd "${FILESDIR}/couchdb.conf-2" couchdb
-
-	sed -i -e "s:LIBDIR:$(get_libdir):" "${D}/etc/conf.d/couchdb"
-}
diff --git a/dev-db/couchdb/couchdb-1.5.0.ebuild b/dev-db/couchdb/couchdb-1.5.0.ebuild
deleted file mode 100644
index adda244ce21f..000000000000
--- a/dev-db/couchdb/couchdb-1.5.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.5.0.ebuild,v 1.7 2014/06/07 19:50:48 djc Exp $
-
-EAPI=5
-
-inherit eutils multilib pax-utils user
-
-DESCRIPTION="Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database."
-HOMEPAGE="http://couchdb.apache.org/"
-SRC_URI="mirror://apache/couchdb/source/${PV}/apache-${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="selinux test"
-
-RDEPEND=">=dev-libs/icu-4.3.1:=
-		<dev-lang/erlang-17[ssl]
-		>=dev-libs/openssl-0.9.8j:0
-		>=net-misc/curl-7.18.2
-		<dev-lang/spidermonkey-1.8.7
-		selinux? ( sec-policy/selinux-couchdb )"
-
-DEPEND="${RDEPEND}"
-RESTRICT=test
-
-S="${WORKDIR}/apache-${P}"
-
-pkg_setup() {
-	enewgroup couchdb
-	enewuser couchdb -1 -1 /var/lib/couchdb couchdb
-}
-
-src_prepare() {
-	sed -i ./src/couchdb/priv/Makefile.* -e 's|-Werror||g'
-}
-
-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/${PF}#" -i Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake
-	# bug 442616
-	pax-mark mr src/couchdb/priv/couchjs
-}
-
-src_test() {
-	emake distcheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	fowners couchdb:couchdb \
-		/var/lib/couchdb \
-		/var/log/couchdb
-
-	for f in "${D}"/etc/couchdb/*.ini ; do
-		fowners root:couchdb "${f#${D}}"
-		fperms 660 "${f#${D}}"
-	done
-	fperms 664 /etc/couchdb/default.ini
-
-	newinitd "${FILESDIR}/couchdb.init-4" couchdb
-	newconfd "${FILESDIR}/couchdb.conf-2" couchdb
-
-	sed -i -e "s:LIBDIR:$(get_libdir):" "${D}/etc/conf.d/couchdb"
-}
diff --git a/dev-db/couchdb/files/couchdb.conf-0.10 b/dev-db/couchdb/files/couchdb.conf-0.10
deleted file mode 100644
index 573b5e1eb48e..000000000000
--- a/dev-db/couchdb/files/couchdb.conf-0.10
+++ /dev/null
@@ -1,15 +0,0 @@
-# Options for CouchDB
-
-EXEC="/usr/bin/couchdb"
-COUCHDB_USER="couchdb"
-COUCHDB_PID_FILE="/var/run/couchdb/couchdb.pid"
-COUCHDB_STDOUT_FILE="/dev/null"
-COUCHDB_STDERR_FILE="/dev/null"
-#COUCHDB_RESPAWN_TIMEOUT=
-#COUCHDB_OPTIONS=
-
-if [ -e /usr/LIBDIR/erlang/erts-*/bin/beam.smp ]; then
-  COUCHDB_BEAM="beam.smp"
-else
-  COUCHDB_BEAM="beam"
-fi
diff --git a/dev-db/couchdb/files/couchdb.init-0.10 b/dev-db/couchdb/files/couchdb.init-0.10
deleted file mode 100644
index f2cd9e7ec660..000000000000
--- a/dev-db/couchdb/files/couchdb.init-0.10
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/runscript
-# Copyright 2008-2013 Dirkjan Ochtman
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-
-	args="-b"
-	if test -n "$COUCHDB_STDOUT_FILE"; then
-		args="$args -o $COUCHDB_STDOUT_FILE"
-	fi
-	if test -n "$COUCHDB_STDERR_FILE"; then
-		args="$args -e $COUCHDB_STDERR_FILE"
-	fi
-	if test -n "$COUCHDB_RESPAWN_TIMEOUT"; then
-		args="$args -r $COUCHDB_RESPAWN_TIMEOUT"
-	fi
-	if test -n "$COUCHDB_OPTIONS"; then
-		args="$args $COUCHDB_OPTIONS"
-	fi
-	if test -n "$COUCHDB_PID_FILE"; then
-	    args="$args -p $COUCHDB_PID_FILE"
-    else
-        echo "* ERROR: COUCHDB_PID_FILE must be set"
-        return -1
-    fi
-	if test -z "$COUCHDB_USER"; then
-        echo "* ERROR: COUCHDB_USER must be set"
-        return -1
-	fi
-
-	start-stop-daemon --start --exec ${EXEC} --name ${COUCHDB_BEAM} \
-		--user ${COUCHDB_USER} --chuid ${COUCHDB_USER} --pidfile ${COUCHDB_PID_FILE} -- $args
-
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec ${EXEC} --name ${COUCHDB_BEAM} \
-		--pidfile ${COUCHDB_PID_FILE}
-	eend $? "Failed to stop ${SVCNAME}"
-}
diff --git a/dev-db/couchdb/files/couchdb.init-2 b/dev-db/couchdb/files/couchdb.init-2
deleted file mode 100644
index 94eb9e2e337b..000000000000
--- a/dev-db/couchdb/files/couchdb.init-2
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Dirkjan Ochtman
-# Distributed under the terms of the Apache License, Version 2.0
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-
-	args="-b"
-	if test -n "$COUCHDB_STDOUT_FILE"; then
-		args="$args -o $COUCHDB_STDOUT_FILE"
-	fi
-	if test -n "$COUCHDB_STDERR_FILE"; then
-		args="$args -e $COUCHDB_STDERR_FILE"
-	fi
-	if test -n "$COUCHDB_RESPAWN_TIMEOUT"; then
-		args="$args -r $COUCHDB_RESPAWN_TIMEOUT"
-	fi
-	if test -n "$COUCHDB_OPTIONS"; then
-		args="$args $COUCHDB_OPTIONS"
-	fi
-	if test -n "$COUCHDB_PID_FILE"; then
-	    args="$args -p $COUCHDB_PID_FILE"
-    else
-        echo "* ERROR: COUCHDB_PID_FILE must be set"
-        return -1
-    fi
-	if test -z "$COUCHDB_USER"; then
-        echo "* ERROR: COUCHDB_USER must be set"
-        return -1
-	fi
-
-	start-stop-daemon --start --exec ${EXEC} --name ${COUCHDB_BEAM} \
-		--user ${COUCHDB_USER} --pidfile ${COUCHDB_PID_FILE} -- $args
-
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec ${EXEC} --name ${COUCHDB_BEAM} \
-		--pidfile ${COUCHDB_PID_FILE}
-	eend $? "Failed to stop ${SVCNAME}"
-}
diff --git a/dev-db/couchdb/files/couchdb.init-3 b/dev-db/couchdb/files/couchdb.init-3
deleted file mode 100644
index ef9828af7bbd..000000000000
--- a/dev-db/couchdb/files/couchdb.init-3
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Dirkjan Ochtman
-# Distributed under the terms of the Apache License, Version 2.0
-
-pidfile=${COUCHDB_PID_FILE}
-command=${EXEC:-/usr/bin/couchdb}
-command_args="-b -o ${COUCHDB_STDOUT_FILE} -e ${COUCHDB_STDERR_FILE} -p ${pidfile} ${COUCHDB_OPTIONS}"
-
-user=${COUCHDB_USER}
-group=${COUCHDB_GROUP}
-
-depend() {
-	need net
-}
-
-start_pre() {
-	checkpath -q -d -m 0755 -o couchdb:couchdb /var/run/couchdb
-}