diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2012-10-22 23:24:35 +0000 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2012-10-22 23:24:35 +0000 |
commit | 29609720b066238866258f79d3886e20ef01a35f (patch) | |
tree | 639c8512ed1e28ae3934e9e0c785e0ef92e8c168 /www-servers/monkeyd | |
parent | Remove deprecated desktop profiles. (diff) | |
download | gentoo-2-29609720b066238866258f79d3886e20ef01a35f.tar.gz gentoo-2-29609720b066238866258f79d3886e20ef01a35f.tar.bz2 gentoo-2-29609720b066238866258f79d3886e20ef01a35f.zip |
Remove vulnerable version, bug #439340
(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key 0xD0455535)
Diffstat (limited to 'www-servers/monkeyd')
-rw-r--r-- | www-servers/monkeyd/ChangeLog | 6 | ||||
-rw-r--r-- | www-servers/monkeyd/files/monkeyd.conf.d | 6 | ||||
-rw-r--r-- | www-servers/monkeyd/files/monkeyd.init.d | 22 | ||||
-rw-r--r-- | www-servers/monkeyd/monkeyd-0.31.0.ebuild | 68 |
4 files changed, 5 insertions, 97 deletions
diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog index de023d9eafff..692614a8d8b0 100644 --- a/www-servers/monkeyd/ChangeLog +++ b/www-servers/monkeyd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/monkeyd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.45 2012/08/18 23:13:40 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.46 2012/10/22 23:24:35 blueness Exp $ + + 22 Oct 2012; Anthony G. Basile <blueness@gentoo.org> -files/monkeyd.conf.d, + -files/monkeyd.init.d, -monkeyd-0.31.0.ebuild: + Remove vulnerable version, bug #439340 *monkeyd-1.1.1 (18 Aug 2012) diff --git a/www-servers/monkeyd/files/monkeyd.conf.d b/www-servers/monkeyd/files/monkeyd.conf.d deleted file mode 100644 index 1580cc20766e..000000000000 --- a/www-servers/monkeyd/files/monkeyd.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/files/monkeyd.conf.d,v 1.2 2004/09/28 02:02:09 swegener Exp $ - -# this should be fine -MONKEY_PID=/var/run/monkey.pid diff --git a/www-servers/monkeyd/files/monkeyd.init.d b/www-servers/monkeyd/files/monkeyd.init.d deleted file mode 100644 index a71c9cb0d472..000000000000 --- a/www-servers/monkeyd/files/monkeyd.init.d +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/files/monkeyd.init.d,v 1.3 2005/02/20 22:47:11 vapier Exp $ - -depend() { - use net -} - -start() { - ebegin "Starting monkeyd" - /usr/bin/monkey -D &> /dev/null - eend $? -} - -stop() { - ebegin "Stopping monkeyd" - start-stop-daemon --stop --quiet --pidfile ${MONKEY_PID} - ret=$? - rm -f ${MONKEY_PID} - eend ${ret} -} diff --git a/www-servers/monkeyd/monkeyd-0.31.0.ebuild b/www-servers/monkeyd/monkeyd-0.31.0.ebuild deleted file mode 100644 index 103aa5bdb5f1..000000000000 --- a/www-servers/monkeyd/monkeyd-0.31.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.31.0.ebuild,v 1.4 2012/03/18 18:00:00 armin76 Exp $ - -EAPI="4" - -inherit toolchain-funcs depend.php multilib - -WEBROOT=/var/www/localhost - -MY_P="${PN/d}-${PV}" -DESCRIPTION="A small, fast, and scalable web server" -HOMEPAGE="http://www.monkey-project.com/" -SRC_URI="http://monkey-project.com/releases/${PV:0:4}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~mips ppc x86" -IUSE="php" - -RDEPEND="php? ( virtual/httpd-php )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - use php && require_php_cgi -} - -src_prepare() { - # Don't install the banana script, it is broken as is anyway and the - # functionality is provided by the ${FILESDIR}/monkeyd.init.d script. - sed -i '/install -m 755 bin\/banana/d' configure || die "sed banana" - - # Don't explicitly strip files - sed -i -e '/$STRIP /d' -e 's/install -s -m 644/install -m 755/' configure || die -} - -src_configure() { - # Non-autotools configure - ./configure \ - --prefix=/usr \ - --bindir=/usr/bin \ - --datadir=${WEBROOT}/htdocs \ - --logdir=/var/log/${PN} \ - --mandir=/usr/share/man \ - --plugdir=/usr/$(get_libdir)/monkeyd/plugins \ - --sysconfdir=/etc/${PN} \ - || die -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -} - -src_install() { - default - - if use php ; then - sed -i -e '/^#AddScript application\/x-httpd-php/s:^#::' "${D}"/etc/monkeyd/monkey.conf || die - sed -i -e 's:/home/my_home/php/bin/php:/usr/bin/php-cgi:' "${D}"/etc/monkeyd/monkey.conf || die - fi - - mv "${D}"${WEBROOT}/htdocs/{index,index-monkey}.html - - sed -i -e "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" "${D}"/etc/monkeyd/monkey.conf || die - newinitd "${FILESDIR}"/monkeyd.init.d monkeyd - newconfd "${FILESDIR}"/monkeyd.conf.d monkeyd -} |