* [gentoo-commits] gentoo-x86 commit in www-servers/monkeyd: monkeyd-1.2.0.ebuild ChangeLog
@ 2013-06-01 16:30 Anthony G. Basile (blueness)
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile (blueness) @ 2013-06-01 16:30 UTC (permalink / raw
To: gentoo-commits
blueness 13/06/01 16:30:20
Modified: monkeyd-1.2.0.ebuild ChangeLog
Log:
ssl is broken on monkeyd-1.2.0, so we'll turn it off for now
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path
1.3 www-servers/monkeyd/monkeyd-1.2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild?r1=1.2&r2=1.3
Index: monkeyd-1.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- monkeyd-1.2.0.ebuild 28 May 2013 23:52:23 -0000 1.2
+++ monkeyd-1.2.0.ebuild 1 Jun 2013 16:30:20 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999- Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild,v 1.2 2013/05/28 23:52:23 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild,v 1.3 2013/06/01 16:30:20 blueness Exp $
EAPI="5"
@@ -15,15 +15,16 @@
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_polarssl"
-IUSE="-debug php minimal ssl uclibc ${PLUGINS}"
+# ssl is broken, so we turn it off until fixed
+#PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_polarssl"
+#IUSE="-debug php minimal ssl uclibc ${PLUGINS}"
+PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril"
+IUSE="-debug php minimal uclibc ${PLUGINS}"
# uclibc is often compiled without backtrace info so we should
# force this off. If someone complains, consider relaxing it.
-REQUIRED_USE="
- uclibc? ( !debug )
- ssl? ( monkeyd_plugins_polarssl )
-"
+# ssl is borken, so we remove "ssl? ( monkeyd_plugins_polarssl )"
+REQUIRED_USE="uclibc? ( !debug )"
RDEPEND="php? ( dev-lang/php )"
1.54 www-servers/monkeyd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?r1=1.53&r2=1.54
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ChangeLog 28 May 2013 23:52:23 -0000 1.53
+++ ChangeLog 1 Jun 2013 16:30:20 -0000 1.54
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/monkeyd
# Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.53 2013/05/28 23:52:23 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.54 2013/06/01 16:30:20 blueness Exp $
+
+ ; Anthony G. Basile <blueness@gentoo.org> monkeyd-1.2.0.ebuild:
+ ssl is broken on monkeyd-1.2.0, so we'll turn it off for now
; Anthony G. Basile <blueness@gentoo.org> metadata.xml, monkeyd-1.2.0.ebuild:
Incorporate suggestions from gentoo-dev ML, thanks mgorny
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/monkeyd: monkeyd-1.2.0.ebuild ChangeLog
@ 2013-06-02 13:03 Anthony G. Basile (blueness)
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile (blueness) @ 2013-06-02 13:03 UTC (permalink / raw
To: gentoo-commits
blueness 13/06/02 13:03:56
Modified: monkeyd-1.2.0.ebuild ChangeLog
Log:
Almost everyone will need liana, so turn it on by default
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path
1.4 www-servers/monkeyd/monkeyd-1.2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild?r1=1.3&r2=1.4
Index: monkeyd-1.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monkeyd-1.2.0.ebuild 1 Jun 2013 16:30:20 -0000 1.3
+++ monkeyd-1.2.0.ebuild 2 Jun 2013 13:03:56 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999- Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild,v 1.3 2013/06/01 16:30:20 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild,v 1.4 2013/06/02 13:03:56 blueness Exp $
EAPI="5"
@@ -16,10 +16,7 @@
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
# ssl is broken, so we turn it off until fixed
-#PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_polarssl"
-#IUSE="-debug php minimal ssl uclibc ${PLUGINS}"
-PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril"
-IUSE="-debug php minimal uclibc ${PLUGINS}"
+IUSE="-debug php minimal uclibc monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril"
# uclibc is often compiled without backtrace info so we should
# force this off. If someone complains, consider relaxing it.
1.55 www-servers/monkeyd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?r1=1.54&r2=1.55
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ChangeLog 1 Jun 2013 16:30:20 -0000 1.54
+++ ChangeLog 2 Jun 2013 13:03:56 -0000 1.55
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/monkeyd
# Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.54 2013/06/01 16:30:20 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.55 2013/06/02 13:03:56 blueness Exp $
+
+ 02 Jun 2013; Anthony G. Basile <blueness@gentoo.org> monkeyd-1.2.0.ebuild:
+ Almost everyone will need liana, so turn it on by default
; Anthony G. Basile <blueness@gentoo.org> monkeyd-1.2.0.ebuild:
ssl is broken on monkeyd-1.2.0, so we'll turn it off for now
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/monkeyd: monkeyd-1.2.0.ebuild ChangeLog
@ 2013-06-05 20:45 Anthony G. Basile (blueness)
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile (blueness) @ 2013-06-05 20:45 UTC (permalink / raw
To: gentoo-commits
blueness 13/06/05 20:45:45
Modified: monkeyd-1.2.0.ebuild ChangeLog
Log:
Fix DoS bug on headers parser, bug #472400, CVE-2013-3843
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path
1.5 www-servers/monkeyd/monkeyd-1.2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild?r1=1.4&r2=1.5
Index: monkeyd-1.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- monkeyd-1.2.0.ebuild 2 Jun 2013 13:03:56 -0000 1.4
+++ monkeyd-1.2.0.ebuild 5 Jun 2013 20:45:45 -0000 1.5
@@ -1,10 +1,10 @@
# Copyright 1999- Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild,v 1.4 2013/06/02 13:03:56 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild,v 1.5 2013/06/05 20:45:45 blueness Exp $
EAPI="5"
-inherit toolchain-funcs depend.php multilib
+inherit toolchain-funcs depend.php multilib eutils
MY_P="${PN/d}-${PV}"
DESCRIPTION="A small, fast, and scalable web server"
@@ -42,6 +42,9 @@
}
src_prepare() {
+ # Fixes security issue, bug #472400, CVE-2013-3843
+ epatch "${FILESDIR}"/${PN}-fix-DoS-headers-parser.patch
+
# Don't install the banana script, we use ${FILESDIR}/monkeyd.initd instead
sed -i '/Creating bin\/banana/d' configure || die "No configure file"
sed -i '/create_banana_script bindir/d' configure || die "No configure file"
1.56 www-servers/monkeyd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?r1=1.55&r2=1.56
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ChangeLog 2 Jun 2013 13:03:56 -0000 1.55
+++ ChangeLog 5 Jun 2013 20:45:45 -0000 1.56
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/monkeyd
# Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.55 2013/06/02 13:03:56 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.56 2013/06/05 20:45:45 blueness Exp $
+
+ 05 Jun 2013; Anthony G. Basile <blueness@gentoo.org>
+ +files/monkeyd-fix-DoS-headers-parser.patch, monkeyd-1.2.0.ebuild:
+ Fix DoS bug on headers parser, bug #472400, CVE-2013-3843
02 Jun 2013; Anthony G. Basile <blueness@gentoo.org> monkeyd-1.2.0.ebuild:
Almost everyone will need liana, so turn it on by default
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-05 20:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-02 13:03 [gentoo-commits] gentoo-x86 commit in www-servers/monkeyd: monkeyd-1.2.0.ebuild ChangeLog Anthony G. Basile (blueness)
-- strict thread matches above, loose matches on Subject: below --
2013-06-05 20:45 Anthony G. Basile (blueness)
2013-06-01 16:30 Anthony G. Basile (blueness)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox