Changed location for classification.config and reference.config. Closing bug #38769.

5 files changed, 122 insertions, 11 deletions

diff --git a/net-analyzer/snort_inline/ChangeLog b/net-analyzer/snort_inline/ChangeLog
index 565e0c0e6d1f..07d4e2b910e1 100644
--- a/net-analyzer/snort_inline/ChangeLog
+++ b/net-analyzer/snort_inline/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/snort_inline
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort_inline/ChangeLog,v 1.3 2004/03/19 09:44:52 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort_inline/ChangeLog,v 1.4 2004/03/29 13:04:45 mboman Exp $
+
+*snort_inline-2.1.0a-r2 (29 Mar 2004)
+
+  29 Mar 2004; Michael Boman <mboman@gentoo.org>
+  snort_inline-2.1.0a-r2.ebuild, files/snort_inline.confd:
+  Changed location for classification.config and reference.config. Closing bug
+  #38769.
 
 *snort_inline-2.1.0a-r1 (17 Mar 2004)
 
diff --git a/net-analyzer/snort_inline/Manifest b/net-analyzer/snort_inline/Manifest
index b562eecaa16b..41647d38a2e4 100644
--- a/net-analyzer/snort_inline/Manifest
+++ b/net-analyzer/snort_inline/Manifest
@@ -1,12 +1,14 @@
-MD5 c04d5cb45b04ca460000620043c72d3d snort_inline-2.1.0a-r1.ebuild 2896
-MD5 9a10a8ef3afbf20e35a3718c2716a7ef ChangeLog 703
-MD5 a03c7143facdc72a078379d3cb85ceb0 metadata.xml 775
 MD5 d84972b2328551e0f7539c35048e25ed snort_inline-2.1.0a.ebuild 2843
-MD5 ea783bd276257a20df5b6537d3ff5d49 files/snort-drop-calculation.diff 4957
-MD5 5379f2b178725088a8757ef25c77775c files/snort_inline-2.1.0a-pgsql.patch 645
-MD5 6f4160da265eb5b2d12d7ec7333e73a2 files/2.1.0a-libnet-1.0.patch 5923
-MD5 b5858725dbd2df4356875f78b9d855da files/digest-snort_inline-2.1.0a-r1 69
-MD5 9fcae34bfc813c01e13eaea9b8ddde02 files/snort_inline.confd 345
+MD5 a03c7143facdc72a078379d3cb85ceb0 metadata.xml 775
+MD5 69a0b61f02f16b6048a60474a4c5359a ChangeLog 942
+MD5 c04d5cb45b04ca460000620043c72d3d snort_inline-2.1.0a-r1.ebuild 2896
+MD5 2e8dcdb7c611e6816e8fcffe86e7e7e3 snort_inline-2.1.0a-r2.ebuild 3029
 MD5 0cce9e04506ab5922938962ae1fa1d07 files/snort_inline.initd 845
-MD5 513637a4fadce14177bf85e97e5931f8 files/snort_inline-2.1.0a-gcc3.patch 350
 MD5 b5858725dbd2df4356875f78b9d855da files/digest-snort_inline-2.1.0a 69
+MD5 6f4160da265eb5b2d12d7ec7333e73a2 files/2.1.0a-libnet-1.0.patch 5923
+MD5 513637a4fadce14177bf85e97e5931f8 files/snort_inline-2.1.0a-gcc3.patch 350
+MD5 5379f2b178725088a8757ef25c77775c files/snort_inline-2.1.0a-pgsql.patch 645
+MD5 ea783bd276257a20df5b6537d3ff5d49 files/snort-drop-calculation.diff 4957
+MD5 c663da5de60e2e230e14349acfecf6f7 files/snort_inline.confd 368
+MD5 b5858725dbd2df4356875f78b9d855da files/digest-snort_inline-2.1.0a-r1 69
+MD5 b5858725dbd2df4356875f78b9d855da files/digest-snort_inline-2.1.0a-r2 69
diff --git a/net-analyzer/snort_inline/files/digest-snort_inline-2.1.0a-r2 b/net-analyzer/snort_inline/files/digest-snort_inline-2.1.0a-r2
new file mode 100644
index 000000000000..3a56b5f4fb36
--- /dev/null
+++ b/net-analyzer/snort_inline/files/digest-snort_inline-2.1.0a-r2
@@ -0,0 +1 @@
+MD5 48eb488e2dcd75cb676b817db25e1f50 snort_inline-2.1.0a.tgz 2454674
diff --git a/net-analyzer/snort_inline/files/snort_inline.confd b/net-analyzer/snort_inline/files/snort_inline.confd
index bf04ff4fe4dc..05294ddeb947 100644
--- a/net-analyzer/snort_inline/files/snort_inline.confd
+++ b/net-analyzer/snort_inline/files/snort_inline.confd
@@ -10,4 +10,4 @@ LOGDIR="/var/log/snort_inline"
 CONF=/etc/snort_inline/snort.conf
 
 # This pulls in the options above
-SNORT_OPTS="-D -Q -u snort -l $LOGDIR -c $CONF"
+SNORT_OPTS="-D -Q -u snort_inline -g snort_inline -l $LOGDIR -c $CONF"
diff --git a/net-analyzer/snort_inline/snort_inline-2.1.0a-r2.ebuild b/net-analyzer/snort_inline/snort_inline-2.1.0a-r2.ebuild
new file mode 100644
index 000000000000..dc7e6349a72f
--- /dev/null
+++ b/net-analyzer/snort_inline/snort_inline-2.1.0a-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort_inline/snort_inline-2.1.0a-r2.ebuild,v 1.1 2004/03/29 13:04:45 mboman Exp $
+
+DESCRIPTION="Intrusion Prevention System (IPS) based on Snort"
+HOMEPAGE="http://snort-inline.sf.net/"
+SRC_URI="mirror://sourceforge/snort-inline/${P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="ssl postgres mysql"
+DEPEND="virtual/glibc
+	>=dev-libs/libpcre-4.2-r1
+	>=net-libs/libpcap-0.6.2-r1
+	>=net-firewall/iptables-1.2.7a-r4
+	<net-libs/libnet-1.1
+	>=net-libs/libnet-1.0.2a-r3
+	postgres? ( >=dev-db/postgresql-7.2 )
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )"
+
+RDEPEND="virtual/glibc
+	>=dev-libs/libpcre-4.2-r1
+	dev-lang/perl
+	net-firewall/iptables
+	net-firewall/ebtables
+	>=net-libs/libpcap-0.6.2-r1
+	<net-libs/libnet-1.1
+	>=net-libs/libnet-1.0.2a-r3
+	postgres? ( >=dev-db/postgresql-7.2 )
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )"
+
+S=${WORKDIR}/${P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-libnet-1.0.patch
+	epatch ${FILESDIR}/${P}-gcc3.patch
+	epatch ${FILESDIR}/snort-drop-calculation.diff
+
+	sed -i -e "s:^var RULE_PATH.*:var RULE_PATH /etc/snort_inline/rules:" \
+		-e "s:\$RULE_PATH/classification.config:classification.config:" \
+		-e "s:\$RULE_PATH/reference.config:reference.config:" \
+		etc/snort_inline.conf
+}
+
+src_compile() {
+	econf \
+		`use_with postgres postgresql` \
+		`use_with mysql` \
+		`use_with ssl openssl` \
+		--without-odbc \
+		--without-oracle || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodir /var/log/snort_inline
+	keepdir /var/log/snort_inline/
+
+	insinto /usr/lib/snort_inline/bin
+	doins contrib/{create_mysql,snortlog,*.pl}
+
+	dodoc COPYING LICENSE doc/*
+	docinto contrib ; dodoc contrib/*
+
+	newman snort.8 snort_inline.8
+	rm ${D}/usr/share/man/man8/snort.8
+
+	insinto /etc/snort_inline
+	doins etc/reference.config etc/classification.config etc/*.map etc/threshold.conf
+	newins etc/snort_inline.conf snort_inline.conf.distrib
+
+	insinto /etc/snort_inline/rules
+	doins rules/*.rules
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/snort_inline.initd snort_inline
+	insinto /etc/conf.d ; newins ${FILESDIR}/snort_inline.confd snort_inline
+}
+
+pkg_postinst() {
+	enewgroup snort_inline
+	enewuser snort_inline -1 /dev/null /var/log/snort_inline snort_inline
+	usermod -d "/var/log/snort_inline" snort_inline || die "usermod problem"
+	usermod -g "snort_inline" snort_inline || die "usermod problem"
+	usermod -s "/dev/null" snort_inline || die "usermod problem"
+	echo "ignore any message about CREATE_HOME above..."
+
+	chown snort_inline:snort_inline /var/log/snort_inline
+	chmod 0770 /var/log/snort_inline
+
+	einfo "snort_inline requires a kernel with ebtables support. 2.6.x"
+	einfo "kernels have this built-in, while 2.4.x kernels needs to be"
+	einfo "patched. ebtables can be found at http://ebtables.sf.net"
+}