diff options
| -rw-r--r-- | net-analyzer/mwcollect/ChangeLog | 11 | ||||
| -rw-r--r-- | net-analyzer/mwcollect/files/mwcollect-3.0.4-r1-gcc43.patch | 102 | ||||
| -rw-r--r-- | net-analyzer/mwcollect/mwcollect-3.0.4-r1.ebuild | 59 |
3 files changed, 170 insertions, 2 deletions
diff --git a/net-analyzer/mwcollect/ChangeLog b/net-analyzer/mwcollect/ChangeLog index 5c9f713317b8..30988b9aaa93 100644 --- a/net-analyzer/mwcollect/ChangeLog +++ b/net-analyzer/mwcollect/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/mwcollect -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/ChangeLog,v 1.16 2007/07/24 20:55:51 jokey Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/ChangeLog,v 1.17 2008/12/24 02:36:41 mpagano Exp $ + +*mwcollect-3.0.4-r1 (24 Dec 2008) + + 24 Dec 2008; Michael Pagano <mpagano@gentoo.org> + +files/mwcollect-3.0.4-r1-gcc43.patch, +mwcollect-3.0.4-r1.ebuild: + Patch version to build and work with gcc 4.3 wrt to bugs #198121 and bug + #251436. 24 Jul 2007; Markus Ullmann <jokey@gentoo.org> -files/mwcollect-3.0.0-capacity.patch, diff --git a/net-analyzer/mwcollect/files/mwcollect-3.0.4-r1-gcc43.patch b/net-analyzer/mwcollect/files/mwcollect-3.0.4-r1-gcc43.patch new file mode 100644 index 000000000000..a5e056b1fe68 --- /dev/null +++ b/net-analyzer/mwcollect/files/mwcollect-3.0.4-r1-gcc43.patch @@ -0,0 +1,102 @@ +--- src/include/mwcollect/log.h.orig 2008-12-23 20:33:53.000000000 -0500 ++++ src/include/mwcollect/log.h 2008-12-23 20:34:07.000000000 -0500 +@@ -9,6 +9,7 @@ + + #include <list> + #include <stdio.h> ++#include <string.h> + + + #define LT_LEVEL_LOW 1 +--- src/core/config.cpp.orig 2008-12-23 20:34:50.000000000 -0500 ++++ src/core/config.cpp 2008-12-23 20:35:22.000000000 -0500 +@@ -10,6 +10,8 @@ + #include <mwcollect/config.h> + #include <stdio.h> + #include <ctype.h> ++#include <malloc.h> ++#include <stdlib.h> + + namespace mwccore + { +--- src/core/vshell.cpp.orig 2008-12-23 20:36:13.000000000 -0500 ++++ src/core/vshell.cpp 2008-12-23 20:36:27.000000000 -0500 +@@ -9,6 +9,7 @@ + #include <mwcollect/core.h> + #include <time.h> + #include <string> ++#include <malloc.h> + + namespace mwccore + { +--- src/net-posix/interface.cpp.orig 2008-12-23 20:37:59.000000000 -0500 ++++ src/net-posix/interface.cpp 2008-12-23 20:38:23.000000000 -0500 +@@ -23,6 +23,7 @@ + #include <errno.h> + #include <string.h> + #include <assert.h> ++#include <malloc.h> + + PosixInterface::PosixInterface(Configuration * pConfig) + { +--- src/shell-basic/shell-basic.cpp.orig 2008-12-23 21:10:01.000000000 -0500 ++++ src/shell-basic/shell-basic.cpp 2008-12-23 21:11:44.000000000 -0500 +@@ -7,6 +7,7 @@ + + #include "shell-basic.h" + #include <string> ++#include <malloc.h> + + extern "C" + { +--- src/log-irc/log-irc.cpp.orig 2008-12-23 21:12:32.000000000 -0500 ++++ src/log-irc/log-irc.cpp 2008-12-23 21:13:07.000000000 -0500 +@@ -11,6 +11,8 @@ + #include <fnmatch.h> + #include <time.h> + #include <unistd.h> ++#include <malloc.h> ++#include <stdlib.h> + + extern "C" + { +--- src/download-tftp/download-tftp-module.cpp.orig 2008-12-23 21:14:33.000000000 -0500 ++++ src/download-tftp/download-tftp-module.cpp 2008-12-23 21:14:51.000000000 -0500 +@@ -8,6 +8,7 @@ + + #include "download-tftp.h" + #include <assert.h> ++#include <malloc.h> + + extern "C" + { +--- src/download-tftp/download-tftp-subscription.cpp.orig 2008-12-23 21:17:28.000000000 -0500 ++++ src/download-tftp/download-tftp-subscription.cpp 2008-12-23 21:18:06.000000000 -0500 +@@ -8,6 +8,7 @@ + + #include "download-tftp.h" + #include <netinet/in.h> ++#include <malloc.h> + + void TftpSubscription::incomingData(unsigned char * pucData, unsigned int nLength) + { +--- src/download-curl/download-curl-container.cpp.orig 2008-12-23 21:18:50.000000000 -0500 ++++ src/download-curl/download-curl-container.cpp 2008-12-23 21:19:12.000000000 -0500 +@@ -8,6 +8,7 @@ + + #include "download-curl.h" + #include <string.h> ++#include <malloc.h> + #if defined(OBSD_FLAVOURED) /* select() */ + #include <sys/types.h> + #include <sys/time.h> +--- src/vuln-ms05-51/vuln-ms0551-subscription.cpp.orig 2008-12-23 21:19:44.000000000 -0500 ++++ src/vuln-ms05-51/vuln-ms0551-subscription.cpp 2008-12-23 21:20:44.000000000 -0500 +@@ -9,6 +9,7 @@ + + #include "vuln-ms0551.h" + ++#include <stdlib.h> + #include <string.h> + + // from http://www.frsirt.com/exploits/20051201.MS05-051msdtc.cpp.php diff --git a/net-analyzer/mwcollect/mwcollect-3.0.4-r1.ebuild b/net-analyzer/mwcollect/mwcollect-3.0.4-r1.ebuild new file mode 100644 index 000000000000..c93e44deb810 --- /dev/null +++ b/net-analyzer/mwcollect/mwcollect-3.0.4-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/mwcollect-3.0.4-r1.ebuild,v 1.1 2008/12/24 02:36:41 mpagano Exp $ + +inherit eutils + +DESCRIPTION="mwcollect collects worms and other autonomous spreading malware" +HOMEPAGE="http://www.mwcollect.org/" +SRC_URI="http://download.mwcollect.org/${P}.tar.bz2" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~ppc ~x86" +IUSE="debug" +# has issues right now +#IUSE="debug prelude" + +DEPEND="dev-libs/libpcre + net-misc/curl + >=sys-libs/libcap-1" + # has issues right now + # prelude?( >=dev-libs/libprelude-0.9 )" +RDEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + sed -i \ + -e "s:CXXFLAGS += -I./src/include:CXXFLAGS += ${CXXFLAGS} -I./src/include:" \ + Makefile || die "custom CFLAGS patching failed" + + sed -i \ + -e "s:%loadModule(\":%loadModule(\"\/usr\/$(get_libdir)\/mwcollect\/:g" \ + conf/mwcollect.conf || die "module load directory failed" + + epatch "${FILESDIR}"/${P}-${PR}-gcc43.patch +} + +src_compile() { + use debug && export DEBUG="y" + # has issues right now + #use prelude && export MODULES="log-prelude" + emake || die "Make failed" +} + +src_install() { + dosbin bin/mwcollectd || die "dosbin failed" + insinto /usr/$(get_libdir)/mwcollect + doins bin/modules/* || die "doins bin/modules/* failed" + + insinto /etc/mwcollect || die "insinto /etc/mwcollect failed" + doins conf/* \ + || die "config file installation failed" + + dodoc README* doc/core-design.txt + doman doc/mwcollectd.1 + + newinitd "${FILESDIR}"/initd mwcollectd + newconfd "${FILESDIR}"/confd mwcollectd +} |