bug 91820

(Portage version: 2.0.51.19)

6 files changed, 308 insertions, 11 deletions

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 54531668be00..0bca8df50333 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.66 2005/05/07 12:21:35 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.67 2005/05/08 17:43:03 vanquirius Exp $
+
+*snort-2.3.3-r1 (08 May 2005)
+
+  08 May 2005; Marcelo Goes <vanquirius@gentoo.org> +snort-2.3.3-r1.ebuild,
+  +snort-2.4.20050508.ebuild:
+  Prelude patching fun. Making snort-2.3.3-r1 depend on >=libprelude-0.9.0_rc1
+  and using patch from their mailing list, as pointed out by Yoann
+  Vandoorselaere <yoann@prelude-ids.org>. Also, I made a cvs snapshot of
+  snort-2.4, which does not require patching anymore, since prelude patches were
+  accepted in snort. Of course, both new ebuilds are in package.mask for testing
+  - I expect unexpected borks. This hopefully fixes bug 91820. Thanks to dago
+  <dago158@bluewin.ch> for reporting.
 
 *snort-2.3.3 (07 May 2005)
 
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 97627bbfaf4a..9b69e60f09e7 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,16 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ea9f93a543ea9a0fe2a2a2618b1d1351 snort-2.2.0.ebuild 4378
 MD5 8cab7eee4d08cd1ef234af6c54adbfae snort-2.3.3.ebuild 4152
 MD5 0ee736821e1141642d8d94cd4d0f4b13 snort-2.0.6.ebuild 3121
 MD5 d480ebe08f3b5eb3de0d9a26a3ce6f94 snort-2.3.0-r1.ebuild 4448
 MD5 ceb1cef02f0e92fcabcbbbb15e03b38c snort-2.3.0.ebuild 4169
+MD5 80e5dc6240336b5c5bd0f5e307b81d9a snort-2.3.3-r1.ebuild 4127
 MD5 93210bcdb5cb0a75002596ecd26ddff5 snort-2.3.2.ebuild 4454
 MD5 0d4b980ee35a1f18ce2a75f81098b20f snort-2.1.3.ebuild 4372
+MD5 4ee6199003c1a3a338354d3394f03b64 snort-2.4.20050508.ebuild 4039
 MD5 fa95f59e8e9f721a74b9d4ee268c8ea3 snort-2.3.0_rc2.ebuild 3974
 MD5 64dccbd1743981b7266d35cef80ee90a ChangeLog 12483
 MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
+MD5 04f9ed946469f7954b6bd27f8f1aca39 files/digest-snort-2.3.3-r1 284
 MD5 08107e2e3ce78a19d7df4c78b9461303 files/digest-snort-2.3.0_rc2 221
 MD5 919058894f4983c35900bc8bb98a96d4 files/snort.rc6 764
 MD5 ea783bd276257a20df5b6537d3ff5d49 files/snort-drop-calculation.diff 4957
@@ -22,16 +22,10 @@ MD5 a654db9256f89b77a9ce482c976dc896 files/digest-snort-2.2.0 129
 MD5 20c2ec2c963cca8c0abe1b6ee2b5b9f7 files/digest-snort-2.3.0 218
 MD5 5d26c971694357c500d666e68622a120 files/digest-snort-2.3.2 287
 MD5 24851ef65be2d80a70ba4bebe3e8c0ff files/digest-snort-2.3.3 287
+MD5 60c507a31d5c83c9ddf7fde2a91a7bb8 files/digest-snort-2.4.20050508 208
 MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.0.6-gcc3.patch 350
 MD5 446f8d2b3435b8a6be738da978670605 files/snort.confd 423
 MD5 fe6a25fdd3c6d4b527d89c51d78b8f36 files/2.1.2-libnet-1.0.patch 2753
 MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.2-gcc3.patch 350
 MD5 513637a4fadce14177bf85e97e5931f8 files/snort-2.1.3-gcc3.patch 350
 MD5 a9fc70d50c4512c835aa428f4b198fae files/digest-snort-2.3.0-r1 287
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCfLMZEZCkKN40op4RAi9HAJ90y7Y7CZhSSdfyhcfgYvLVa+/r/QCgjeDz
-wptc5gJ6HNZPpEwAhHZON+0=
-=DV4O
------END PGP SIGNATURE-----
diff --git a/net-analyzer/snort/files/digest-snort-2.3.3-r1 b/net-analyzer/snort/files/digest-snort-2.3.3-r1
new file mode 100644
index 000000000000..a7fbb2e623e4
--- /dev/null
+++ b/net-analyzer/snort/files/digest-snort-2.3.3-r1
@@ -0,0 +1,4 @@
+MD5 06bf140893e7cb120aaa9372d10a0100 snort-2.3.3.tar.gz 2631270
+MD5 2eeef1a7a040d67c3afaf9d749905e47 snortsam-20050110.tar.gz 29395
+MD5 ad562cd6fdfab3049608144d9ba2d480 snort-2.3.3-prelude-0.9.0_rc1.diff.bz2 331076
+MD5 681fa7e99aa674c0e2be4788ef503d69 sguil-sensor-0.5.3.tar.gz 89816
diff --git a/net-analyzer/snort/files/digest-snort-2.4.20050508 b/net-analyzer/snort/files/digest-snort-2.4.20050508
new file mode 100644
index 000000000000..3104a65adb0e
--- /dev/null
+++ b/net-analyzer/snort/files/digest-snort-2.4.20050508
@@ -0,0 +1,3 @@
+MD5 c83a4ef61f462ff83c6da922b5d4784a snort-2.4.20050508.tar.gz 2090957
+MD5 2eeef1a7a040d67c3afaf9d749905e47 snortsam-20050110.tar.gz 29395
+MD5 681fa7e99aa674c0e2be4788ef503d69 sguil-sensor-0.5.3.tar.gz 89816
diff --git a/net-analyzer/snort/snort-2.3.3-r1.ebuild b/net-analyzer/snort/snort-2.3.3-r1.ebuild
new file mode 100644
index 000000000000..ede778d05d9c
--- /dev/null
+++ b/net-analyzer/snort/snort-2.3.3-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.3.3-r1.ebuild,v 1.1 2005/05/08 17:43:03 vanquirius Exp $
+
+inherit eutils gnuconfig flag-o-matic
+
+DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="http://www.snort.org/dl/current/${P}.tar.gz
+	snortsam? ( mirror://gentoo/snortsam-20050110.tar.gz )
+	prelude? ( mirror://gentoo/${P}-prelude-0.9.0_rc1.diff.bz2 )
+	sguil? ( mirror://sourceforge/sguil/sguil-sensor-0.5.3.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 -sparc -alpha ~amd64 ~ppc"
+IUSE="ssl postgres mysql flexresp selinux snortsam odbc prelude inline sguil"
+
+DEPEND="virtual/libc
+	>=dev-libs/libpcre-4.2-r1
+	virtual/libpcap
+	flexresp? ( ~net-libs/libnet-1.0.2a )
+	postgres? ( >=dev-db/postgresql-7.2 )
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	prelude? ( >=dev-libs/libprelude-0.9.0_rc1 )
+	odbc? ( dev-db/unixODBC )
+	inline? (
+				~net-libs/libnet-1.0.2a
+				net-firewall/iptables
+			)"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	selinux? ( sec-policy/selinux-snort )
+	snortsam? ( net-analyzer/snortsam )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	gnuconfig_update
+
+	if use flexresp || use inline ; then
+		epatch ${FILESDIR}/2.3.0-libnet-1.0.patch
+	fi
+
+	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" \
+		etc/snort.conf || die "sed snort.conf failed"
+
+	if use prelude ; then
+		epatch ${DISTDIR}/${P}-prelude-0.9.0_rc1.diff.bz2
+		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in \
+			|| die "sed configure.in failed"
+	fi
+
+	if use sguil ; then
+		cd ${S}/src/preprocessors
+		epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_portscan_sguil.patch || die
+		epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_stream4_sguil.patch || die
+		cd ${S}
+	fi
+
+	if use snortsam ; then
+		cd ..
+		einfo "Applying snortsam patch"
+		./patchsnort.sh ${S} || die "snortsam patch failed"
+		cd ${S}
+	fi
+
+	einfo "Regenerating autoconf/automake files"
+	autoreconf -f -i || die "autoreconf failed"
+}
+
+src_compile() {
+	local myconf
+
+	# There is no --diable-flexresp, cannot use use_enable
+	use flexresp && myconf="${myconf} --enable-flexresp"
+
+	use inline && append-flags -I/usr/include/libipq
+
+	econf \
+		$(use_with postgres postgresql) \
+		$(use_with mysql) \
+		$(use_with ssl openssl) \
+		$(use_with odbc) \
+		--without-oracle \
+		$(use_with prelude) \
+		$(use_with sguil) \
+		$(use_enable inline) \
+		${myconf} || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+pkg_preinst() {
+	enewgroup snort
+	enewuser snort -1 /bin/false /var/log/snort snort
+	usermod -d "/var/log/snort" snort || die "usermod problem"
+	usermod -g "snort" snort || die "usermod problem"
+	usermod -s "/bin/false" snort || die "usermod problem"
+	echo "ignore any message about CREATE_HOME above..."
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	keepdir /var/log/snort/
+
+	dodoc COPYING LICENSE doc/*
+	docinto schemas ; dodoc schemas/*
+
+	insinto /etc/snort
+	doins etc/reference.config etc/classification.config rules/*.rules \
+		etc/*.map etc/threshold.conf
+	newins etc/snort.conf snort.conf.distrib
+
+	use prelude && doins etc/prelude-classification.config
+
+	newinitd ${FILESDIR}/snort.rc6 snort
+	newconfd ${FILESDIR}/snort.confd snort
+
+	chown snort:snort ${D}/var/log/snort
+	chmod 0770 ${D}/var/log/snort
+}
+
+pkg_postinst() {
+	if use mysql || use postgres || use odbc ; then
+		einfo "To use a database as a backend for snort you will have to"
+		einfo "import the correct tables to the database."
+		einfo "You will have to setup a database called snort first."
+		einfo ""
+		use mysql && \
+			einfo "  MySQL: zcat /usr/share/doc/${PF}/schemas/create_mysql.gz | mysql -p snort"
+		use postgres && \
+			einfo "  PostgreSQL: import /usr/share/doc/${PF}/schemas/create_postgresql.gz"
+		use odbc && einfo "SQL tables need to be created - look at /usr/share/doc/${PF}/schemas/"
+		einfo ""
+		einfo "Also, read the following Gentoo forums article:"
+		einfo '   http://forums.gentoo.org/viewtopic.php?t=78718'
+	fi
+}
diff --git a/net-analyzer/snort/snort-2.4.20050508.ebuild b/net-analyzer/snort/snort-2.4.20050508.ebuild
new file mode 100644
index 000000000000..d602d269cfa2
--- /dev/null
+++ b/net-analyzer/snort/snort-2.4.20050508.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.4.20050508.ebuild,v 1.1 2005/05/08 17:43:03 vanquirius Exp $
+
+inherit eutils gnuconfig flag-o-matic
+
+# Note: This is a experimental CVS build
+
+DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	snortsam? ( mirror://gentoo/snortsam-20050110.tar.gz )
+	sguil? ( mirror://sourceforge/sguil/sguil-sensor-0.5.3.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 -sparc -alpha ~amd64 ~ppc"
+IUSE="ssl postgres mysql flexresp selinux snortsam odbc prelude inline sguil"
+
+DEPEND="virtual/libc
+	>=dev-libs/libpcre-4.2-r1
+	virtual/libpcap
+	flexresp? ( ~net-libs/libnet-1.0.2a )
+	postgres? ( >=dev-db/postgresql-7.2 )
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	prelude? ( >=dev-libs/libprelude-0.9.0_rc1 )
+	odbc? ( dev-db/unixODBC )
+	inline? (
+				~net-libs/libnet-1.0.2a
+				net-firewall/iptables
+			)"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	selinux? ( sec-policy/selinux-snort )
+	snortsam? ( net-analyzer/snortsam )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	gnuconfig_update
+
+	if use flexresp || use inline ; then
+		epatch ${FILESDIR}/2.3.0-libnet-1.0.patch
+	fi
+
+	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" \
+		etc/snort.conf || die "sed snort.conf failed"
+
+	if use prelude ; then
+		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in \
+			|| die "sed configure.in failed"
+	fi
+
+	if use sguil ; then
+		cd ${S}/src/preprocessors
+		epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_portscan_sguil.patch || die
+		epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_stream4_sguil.patch || die
+		cd ${S}
+	fi
+
+	if use snortsam ; then
+		cd ..
+		einfo "Applying snortsam patch"
+		./patchsnort.sh ${S} || die "snortsam patch failed"
+		cd ${S}
+	fi
+
+	einfo "Regenerating autoconf/automake files"
+	autoreconf -f -i || die "autoreconf failed"
+}
+
+src_compile() {
+	local myconf
+
+	# There is no --diable-flexresp, cannot use use_enable
+	use flexresp && myconf="${myconf} --enable-flexresp"
+
+	use inline && append-flags -I/usr/include/libipq
+
+	econf \
+		$(use_with postgres postgresql) \
+		$(use_with mysql) \
+		$(use_with ssl openssl) \
+		$(use_with odbc) \
+		--without-oracle \
+		$(use_with prelude) \
+		$(use_with sguil) \
+		$(use_enable inline) \
+		${myconf} || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+pkg_preinst() {
+	enewgroup snort
+	enewuser snort -1 /bin/false /var/log/snort snort
+	usermod -d "/var/log/snort" snort || die "usermod problem"
+	usermod -g "snort" snort || die "usermod problem"
+	usermod -s "/bin/false" snort || die "usermod problem"
+	echo "ignore any message about CREATE_HOME above..."
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	keepdir /var/log/snort/
+
+	dodoc COPYING LICENSE doc/*
+	docinto schemas ; dodoc schemas/*
+
+	insinto /etc/snort
+	doins etc/reference.config etc/classification.config rules/*.rules \
+		etc/*.map etc/threshold.conf
+	newins etc/snort.conf snort.conf.distrib
+
+	use prelude && doins etc/prelude-classification.config
+
+	newinitd ${FILESDIR}/snort.rc6 snort
+	newconfd ${FILESDIR}/snort.confd snort
+
+	chown snort:snort ${D}/var/log/snort
+	chmod 0770 ${D}/var/log/snort
+}
+
+pkg_postinst() {
+	if use mysql || use postgres || use odbc ; then
+		einfo "To use a database as a backend for snort you will have to"
+		einfo "import the correct tables to the database."
+		einfo "You will have to setup a database called snort first."
+		einfo ""
+		use mysql && \
+			einfo "  MySQL: zcat /usr/share/doc/${PF}/schemas/create_mysql.gz | mysql -p snort"
+		use postgres && \
+			einfo "  PostgreSQL: import /usr/share/doc/${PF}/schemas/create_postgresql.gz"
+		use odbc && einfo "SQL tables need to be created - look at /usr/share/doc/${PF}/schemas/"
+		einfo ""
+		einfo "Also, read the following Gentoo forums article:"
+		einfo '   http://forums.gentoo.org/viewtopic.php?t=78718'
+	fi
+}