diff options
| -rw-r--r-- | net-analyzer/midas-nms/ChangeLog | 9 | ||||
| -rw-r--r-- | net-analyzer/midas-nms/files/digest-midas-nms-2.2f-r1 (renamed from net-analyzer/midas-nms/files/digest-midas-nms-2.2f) | 0 | ||||
| -rw-r--r-- | net-analyzer/midas-nms/files/midas-nms-2.2f-sysconfdir.patch | 112 | ||||
| -rw-r--r-- | net-analyzer/midas-nms/midas-nms-2.2f-r1.ebuild (renamed from net-analyzer/midas-nms/midas-nms-2.2f.ebuild) | 44 |
4 files changed, 140 insertions, 25 deletions
diff --git a/net-analyzer/midas-nms/ChangeLog b/net-analyzer/midas-nms/ChangeLog index eb2051702e14..2fc5dcc33d60 100644 --- a/net-analyzer/midas-nms/ChangeLog +++ b/net-analyzer/midas-nms/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/midas-nms # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/midas-nms/ChangeLog,v 1.11 2007/07/29 16:59:58 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/midas-nms/ChangeLog,v 1.12 2007/09/06 12:00:53 jokey Exp $ + +*midas-nms-2.2f-r1 (06 Sep 2007) + + 06 Sep 2007; Markus Ullmann <jokey@gentoo.org> + +files/midas-nms-2.2f-sysconfdir.patch, -midas-nms-2.2f.ebuild, + +midas-nms-2.2f-r1.ebuild: + Fix for correct configfile path wrt bug #101846 thanks to Tomoyuki Sakurai 29 Jul 2007; Christian Heim <phreak@gentoo.org> midas-nms-2.2f.ebuild: Fixing the DEPEND/RDEPEND for the move of net-www/apache to diff --git a/net-analyzer/midas-nms/files/digest-midas-nms-2.2f b/net-analyzer/midas-nms/files/digest-midas-nms-2.2f-r1 index 0b4be263f2a3..0b4be263f2a3 100644 --- a/net-analyzer/midas-nms/files/digest-midas-nms-2.2f +++ b/net-analyzer/midas-nms/files/digest-midas-nms-2.2f-r1 diff --git a/net-analyzer/midas-nms/files/midas-nms-2.2f-sysconfdir.patch b/net-analyzer/midas-nms/files/midas-nms-2.2f-sysconfdir.patch new file mode 100644 index 000000000000..ee0a49245a6a --- /dev/null +++ b/net-analyzer/midas-nms/files/midas-nms-2.2f-sysconfdir.patch @@ -0,0 +1,112 @@ +diff -Nru MIDAS-2.2f.orig/MIDASa/MIDASa.c MIDAS-2.2f/MIDASa/MIDASa.c +--- MIDAS-2.2f.orig/MIDASa/MIDASa.c 2004-03-01 03:19:31.000000000 +0900 ++++ MIDAS-2.2f/MIDASa/MIDASa.c 2005-08-09 08:22:22.000000000 +0900 +@@ -78,7 +78,7 @@ + (void) signal(SIGKILL, CatchSignal); + (void) signal(SIGTERM, CatchSignal); + +- CFGPATH = dsprintf(CFGPATH, "%s/etc/MIDASa.cf", APPROOT); ++ CFGPATH = dsprintf(CFGPATH, "%s/MIDASa.cf", SYSCONFDIR); + ConfigXMLTree = FileToXMLTree(CFGPATH); + + if(!ConfigXMLTree) +diff -Nru MIDAS-2.2f.orig/MIDASb/MIDASb.c MIDAS-2.2f/MIDASb/MIDASb.c +--- MIDAS-2.2f.orig/MIDASb/MIDASb.c 2004-03-01 03:19:34.000000000 +0900 ++++ MIDAS-2.2f/MIDASb/MIDASb.c 2005-08-09 08:22:22.000000000 +0900 +@@ -81,7 +81,7 @@ + (void) signal(SIGKILL, CatchSignal); + (void) signal(SIGTERM, CatchSignal); + +- CFGPATH = dsprintf(CFGPATH, "%s/etc/MIDASb.cf", APPROOT); ++ CFGPATH = dsprintf(CFGPATH, "%s/MIDASb.cf", SYSCONFDIR); + ConfigXMLTree = FileToXMLTree(CFGPATH); + + if(!ConfigXMLTree) +diff -Nru MIDAS-2.2f.orig/MIDASc/MIDASc.c MIDAS-2.2f/MIDASc/MIDASc.c +--- MIDAS-2.2f.orig/MIDASc/MIDASc.c 2004-03-01 03:19:37.000000000 +0900 ++++ MIDAS-2.2f/MIDASc/MIDASc.c 2005-08-09 08:22:22.000000000 +0900 +@@ -93,7 +93,7 @@ + (void) signal(SIGKILL, CatchSignal); + (void) signal(SIGTERM, CatchSignal); + +- CFGPATH = dsprintf(CFGPATH, "%s/etc/MIDASc.cf", APPROOT); ++ CFGPATH = dsprintf(CFGPATH, "%s/MIDASc.cf", SYSCONFDIR); + ConfigXMLTree = FileToXMLTree(CFGPATH); + + if(!ConfigXMLTree) +diff -Nru MIDAS-2.2f.orig/MIDASd/MIDASd.c MIDAS-2.2f/MIDASd/MIDASd.c +--- MIDAS-2.2f.orig/MIDASd/MIDASd.c 2004-03-01 03:37:21.000000000 +0900 ++++ MIDAS-2.2f/MIDASd/MIDASd.c 2005-08-09 08:22:22.000000000 +0900 +@@ -91,7 +91,7 @@ + (void) signal(SIGKILL, CatchSignal); + (void) signal(SIGTERM, CatchSignal); + +- CFGPATH = dsprintf(CFGPATH, "%s/etc/MIDASd.cf", APPROOT); ++ CFGPATH = dsprintf(CFGPATH, "%s/MIDASd.cf", SYSCONFDIR); + ConfigXMLTree = FileToXMLTree(CFGPATH); + if(!ConfigXMLTree) + { +diff -Nru MIDAS-2.2f.orig/MIDASn/MIDASn.c MIDAS-2.2f/MIDASn/MIDASn.c +--- MIDAS-2.2f.orig/MIDASn/MIDASn.c 2004-03-01 03:19:44.000000000 +0900 ++++ MIDAS-2.2f/MIDASn/MIDASn.c 2005-08-09 08:22:23.000000000 +0900 +@@ -88,7 +88,7 @@ + (void) signal(SIGHUP, CatchSignal); + (void) signal(SIGTERM, CatchSignal); + +- CFGPATH = dsprintf(CFGPATH, "%s/etc/MIDASn.cf", APPROOT); ++ CFGPATH = dsprintf(CFGPATH, "%s/MIDASn.cf", SYSCONFDIR); + ConfigXMLTree = FileToXMLTree(CFGPATH); + + if(!ConfigXMLTree) +diff -Nru MIDAS-2.2f.orig/MIDASs/MIDASs.c MIDAS-2.2f/MIDASs/MIDASs.c +--- MIDAS-2.2f.orig/MIDASs/MIDASs.c 2004-03-01 03:19:48.000000000 +0900 ++++ MIDAS-2.2f/MIDASs/MIDASs.c 2005-08-09 08:22:23.000000000 +0900 +@@ -73,7 +73,7 @@ + (void) signal(SIGKILL, CatchSignal); + (void) signal(SIGTERM, CatchSignal); + +- CFGPATH = dsprintf(CFGPATH, "%s/etc/MIDASs.cf", APPROOT); ++ CFGPATH = dsprintf(CFGPATH, "%s/MIDASs.cf", SYSCONFDIR); + ConfigXMLTree = FileToXMLTree(CFGPATH); + + if(!ConfigXMLTree) +diff -Nru MIDAS-2.2f.orig/Makefile MIDAS-2.2f/Makefile +--- MIDAS-2.2f.orig/Makefile 2004-03-13 07:43:46.000000000 +0900 ++++ MIDAS-2.2f/Makefile 2005-08-09 08:22:23.000000000 +0900 +@@ -24,6 +24,7 @@ + # value is /usr/local/MIDAS + # + APPROOT = -DAPPROOT=\"/usr/local/MIDAS\" ++SYSCONFDIR = -DSYSCONFDIR=\"/etc/midas\" + + # + # CC +@@ -149,7 +150,7 @@ + # + # CFLAG declare + # +-CFLAGS = -Wall $(DMALLOC) $(MIDAS_VER) $(GETLOADAVG) $(UPTIMECMD) $(NEEDATOLL) $(NEEDSTRSEP) $(HAVEMYSQL) $(HAVEPCAP) $(NEEDGETTIMEOFDAY) $(NEEDGETLOADAVG) $(APPROOT) $(NODEBUG) -o $@ ++CFLAGS = -Wall $(DMALLOC) $(MIDAS_VER) $(GETLOADAVG) $(UPTIMECMD) $(NEEDATOLL) $(NEEDSTRSEP) $(HAVEMYSQL) $(HAVEPCAP) $(NEEDGETTIMEOFDAY) $(NEEDGETLOADAVG) $(APPROOT) $(SYSCONFDIR) $(NODEBUG) -o $@ + LDFLAGS = -O3 $(SOLARIS_LDFLAGS) + + # +diff -Nru MIDAS-2.2f.orig/Makefile.in MIDAS-2.2f/Makefile.in +--- MIDAS-2.2f.orig/Makefile.in 2004-03-13 07:37:45.000000000 +0900 ++++ MIDAS-2.2f/Makefile.in 2005-08-09 08:22:23.000000000 +0900 +@@ -24,6 +24,7 @@ + # value is /usr/local/MIDAS + # + APPROOT = -DAPPROOT=\"@prefix@\" ++SYSCONFDIR = -DSYSCONFDIR=\"@sysconfdir@\" + + # + # CC +@@ -149,7 +150,7 @@ + # + # CFLAG declare + # +-CFLAGS = -Wall $(DMALLOC) $(MIDAS_VER) $(GETLOADAVG) $(UPTIMECMD) $(NEEDATOLL) $(NEEDSTRSEP) $(HAVEMYSQL) $(HAVEPCAP) $(NEEDGETTIMEOFDAY) $(NEEDGETLOADAVG) $(APPROOT) $(NODEBUG) @CFLAG_OUTPUT@ ++CFLAGS = -Wall $(DMALLOC) $(MIDAS_VER) $(GETLOADAVG) $(UPTIMECMD) $(NEEDATOLL) $(NEEDSTRSEP) $(HAVEMYSQL) $(HAVEPCAP) $(NEEDGETTIMEOFDAY) $(NEEDGETLOADAVG) $(APPROOT) $(SYSCONFDIR) $(NODEBUG) @CFLAG_OUTPUT@ + LDFLAGS = -O3 $(SOLARIS_LDFLAGS) + + # diff --git a/net-analyzer/midas-nms/midas-nms-2.2f.ebuild b/net-analyzer/midas-nms/midas-nms-2.2f-r1.ebuild index abec4b486553..cb7f437d4c5c 100644 --- a/net-analyzer/midas-nms/midas-nms-2.2f.ebuild +++ b/net-analyzer/midas-nms/midas-nms-2.2f-r1.ebuild @@ -1,15 +1,14 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/midas-nms/midas-nms-2.2f.ebuild,v 1.14 2007/07/29 16:59:58 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/midas-nms/midas-nms-2.2f-r1.ebuild,v 1.1 2007/09/06 12:00:53 jokey Exp $ inherit webapp -S="${WORKDIR}/MIDAS-${PV}" DESCRIPTION="Monitoring, Intrusion Detection, Administration System" SRC_URI="mirror://sourceforge/midas-nms/MIDAS-${PV}.tar.gz" HOMEPAGE="http://midas-nms.sf.net" -LICENSE="MIT" +LICENSE="MIT" KEYWORDS="~ppc ~x86" DEPEND="virtual/mysql @@ -18,12 +17,14 @@ DEPEND="virtual/mysql RDEPEND="www-servers/apache virtual/httpd-php" +S="${WORKDIR}/MIDAS-${PV}" + pkg_setup() { webapp_pkg_setup } src_compile() { - econf || die "./configure failed" + econf --sysconfdir=/etc/midas-nms || die "./configure failed" emake || die } @@ -32,21 +33,18 @@ src_install () { # make DESTDIR=${D} install || die - dodir /usr/etc - dodir /usr/bin - - cp MIDASa/MIDASa.cf.dist ${D}/usr/etc - cp MIDASb/MIDASb.cf.dist ${D}/usr/etc - cp MIDASc/MIDASc.cf.dist ${D}/usr/etc - cp MIDASd/MIDASd.cf.dist ${D}/usr/etc - cp MIDASs/MIDASs.cf.dist ${D}/usr/etc - cp MIDASn/MIDASn.cf.dist ${D}/usr/etc - cp MIDASa/MIDASa ${D}/usr/bin - cp MIDASb/MIDASb ${D}/usr/bin - cp MIDASc/MIDASc ${D}/usr/bin - cp MIDASd/MIDASd ${D}/usr/bin - cp MIDASs/MIDASs ${D}/usr/bin - cp MIDASn/MIDASn ${D}/usr/bin + insinto /etc/midas-nms + doins MIDASa/MIDASa.cf.dist + doins MIDASb/MIDASb.cf.dist + doins MIDASc/MIDASc.cf.dist + doins MIDASd/MIDASd.cf.dist + doins MIDASs/MIDASs.cf.dist + doins MIDASn/MIDASn.cf.dist + + for each in a b c d n s + do + dobin MIDAS${each}/MIDAS${each} + done dodir /usr/share/midas-nms dodir /usr/share/midas-nms/sql @@ -54,7 +52,7 @@ src_install () { doins sql/* /usr/share/midas-nms/sql/ # web - cp -r MIDAS/* ${D}${MY_HTDOCSDIR}/ + doins -r MIDAS/* ${MY_HTDOCSDIR} webapp_serverowned ${MY_HTDOCSDIR} webapp_src_install @@ -70,12 +68,10 @@ src_install () { pkg_postinst() { webapp_pkg_postinst - chown -R :apache /var/www/localhost/htdocs/midas-nms/{inc/config,php-graph} - chmod g+w /var/www/localhost/htdocs/midas-nms/{inc/config,php-graph} - cp ${FILESDIR}/install.php /var/www/localhost/htdocs/midas-nms/install elog - elog "To install the web interface go to:" + elog "To install the web interface setup the app and copy" + elog "${FILESDIR}/install.php to (adapt to your install root):" elog "http://localhost/midas-nms/install/install.php" elog elog "The conf files are located in /usr/etc/MIDAS*.cf.dist" |