From df17854b79fce42499aab355d4036c6a8ccad9ec Mon Sep 17 00:00:00 2001 From: Patrick Lauer Date: Sun, 1 Mar 2009 19:16:21 +0000 Subject: Fixing snort 2.6.1.4 for gcc 4.3.3 / foritfy_sources. Fixes #258487. Patch by Attila Fazekas. (Portage version: 2.2_rc23/cvs/Linux x86_64) --- net-analyzer/snort/ChangeLog | 9 +- .../snort/files/snort-2.6.1.4-server_stats.patch | 11 ++ net-analyzer/snort/snort-2.6.1.4-r1.ebuild | 193 +++++++++++++++++++++ 3 files changed, 212 insertions(+), 1 deletion(-) create mode 100644 net-analyzer/snort/files/snort-2.6.1.4-server_stats.patch create mode 100644 net-analyzer/snort/snort-2.6.1.4-r1.ebuild (limited to 'net-analyzer/snort') diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog index 097be109b207..c53b8051632d 100644 --- a/net-analyzer/snort/ChangeLog +++ b/net-analyzer/snort/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/snort # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.138 2009/01/26 18:37:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.139 2009/03/01 19:16:21 patrick Exp $ + +*snort-2.6.1.4-r1 (01 Mar 2009) + + 01 Mar 2009; Patrick Lauer + +files/snort-2.6.1.4-server_stats.patch, +snort-2.6.1.4-r1.ebuild: + Fixing snort 2.6.1.4 for gcc 4.3.3 / foritfy_sources. Fixes #258487. Patch + by Attila Fazekas. 26 Jan 2009; Mike Frysinger snort-2.8.3.1.ebuild: Drop usage of USE=pic here. diff --git a/net-analyzer/snort/files/snort-2.6.1.4-server_stats.patch b/net-analyzer/snort/files/snort-2.6.1.4-server_stats.patch new file mode 100644 index 000000000000..752b24fc4592 --- /dev/null +++ b/net-analyzer/snort/files/snort-2.6.1.4-server_stats.patch @@ -0,0 +1,11 @@ +--- snort-2.6.1.4/src/preprocessors/flow/portscan/server_stats.c.orig 2006-05-24 18:06:57.000000000 +0200 ++++ snort-2.6.1.4/src/preprocessors/flow/portscan/server_stats.c 2009-03-01 07:57:10.000000000 +0100 +@@ -325,7 +325,7 @@ + + /* open this description, create it if necessary, always wait on + * sync to disk w/ every write, only write */ +- fd = open(filename, O_CREAT|O_TRUNC|O_SYNC|O_WRONLY); ++ fd = open(filename, O_CREAT|O_TRUNC|O_SYNC|O_WRONLY,S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP); + + if(fd < 0) + { diff --git a/net-analyzer/snort/snort-2.6.1.4-r1.ebuild b/net-analyzer/snort/snort-2.6.1.4-r1.ebuild new file mode 100644 index 000000000000..ae014ccfc7b5 --- /dev/null +++ b/net-analyzer/snort/snort-2.6.1.4-r1.ebuild @@ -0,0 +1,193 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.6.1.4-r1.ebuild,v 1.3 2009/03/01 19:16:21 patrick Exp $ + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" +AT_M4DIR=m4 + +inherit eutils autotools + +DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS" +HOMEPAGE="http://www.snort.org/" +SRC_URI="http://www.snort.org/dl/current/${P}.tar.gz + http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Rules-2.4.tar.gz + http://www.snort.org/pub-bin/downloads.cgi/Download/vrt_pr/snortrules-pr-2.4.tar.gz + snortsam? ( mirror://gentoo/snortsam-20050110.tar.gz )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="postgres mysql flexresp selinux snortsam odbc prelude inline dynamicplugin +timestats perfprofiling linux-smp-stats flexresp2 react sguil gre" + +DEPEND="virtual/libc + >=dev-libs/libpcre-4.2-r1 + virtual/libpcap + flexresp? ( ~net-libs/libnet-1.0.2a ) + flexresp2? ( dev-libs/libdnet ) + react? ( ~net-libs/libnet-1.0.2a ) + postgres? ( virtual/postgresql-base ) + mysql? ( virtual/mysql ) + prelude? ( >=dev-libs/libprelude-0.9.0 ) + odbc? ( dev-db/unixODBC ) + >=sys-devel/libtool-1.4 + inline? ( + ~net-libs/libnet-1.0.2a + net-firewall/iptables + )" + +RDEPEND="${DEPEND} + dev-lang/perl + selinux? ( sec-policy/selinux-snort ) + snortsam? ( net-analyzer/snortsam )" + +pkg_setup() { + enewgroup snort + enewuser snort -1 -1 /dev/null snort + + if use flexresp && use flexresp2 ; then + ewarn + ewarn "You have both the 'flexresp' and 'flexresp2' USE" + ewarn "flags set. You can use 'flexresp' or 'flexresp2'" + ewarn "but not both." + ewarn + ewarn "Defaulting to flexresp2..." + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${PN}-2.6.1.2-libdir.patch" + epatch "${FILESDIR}/${PN}-2.6.1.1-libnet.patch" + epatch "${FILESDIR}/${P}-libdnet-ip6.patch" + epatch "${FILESDIR}/${P}-server_stats.patch" + use react && epatch "${FILESDIR}/${PN}-2.6.1.2-react.patch" + sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort/rules:" \ + etc/snort.conf + + if use prelude ; then + sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in + fi + + if use snortsam ; then + cd .. + einfo "Applying snortsam patch" + sed -i "s/PLUGIN_FWSAM/PLUGIN_FWSAM,/" snortpatch9 || die "sed failed" + ./patchsnort.sh "${S}" || die "snortsam patch failed" + cd "${S}" + fi + + einfo "Regenerating autoconf/automake files" + eautoreconf +} + +src_compile() { + local myconf + + if use flexresp2; then + myconf="${myconf} --enable-flexresp2" + elif use flexresp; then + myconf="${myconf} --enable-flexresp" + fi + + if use react && ! use flexresp; then + myconf="${myconf} --enable-react" + fi + + use gre && myconf="${myconf} --enable-gre" + + myconf="${myconf} --with-libipq-includes=/usr/include/libipq" + + econf \ + --without-oracle \ + $(use_with postgres postgresql) \ + $(use_with mysql) \ + $(use_with odbc) \ + $(use_enable prelude) \ + $(use_enable inline) \ + $(use_enable dynamicplugin) \ + $(use_enable timestats) \ + $(use_enable perfprofiling) \ + $(use_enable linux-smp-stats) \ + ${myconf} || die "econf failed" + + # limit to single as reported by jforman on irc + emake -j1 || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + keepdir /var/log/snort/ + + dodoc doc/* + dodoc ./RELEASE.NOTES + docinto schemas ; dodoc schemas/* + + insinto /etc/snort + doins etc/reference.config etc/classification.config \ + etc/*.map etc/threshold.conf + use dynamicplugin || sed -i -e 's:^dynamic:# dynamic:g' etc/snort.conf + sed -e "s:/usr/local/lib:/usr/$(get_libdir):g" -e 's:/usr/local/:/usr/:g' \ + etc/snort.conf > "${D}"/etc/snort/snort.conf.distrib + + newinitd "${FILESDIR}/snort.rc8" snort + newconfd "${FILESDIR}/snort.confd" snort + + fowners snort:snort /var/log/snort + fperms 0770 /var/log/snort + + # install rules + insinto /etc/snort/rules + doins -r "${WORKDIR}"/rules/* +} + +pkg_postinst() { + ewarn + ewarn "Users upgrading from snort 2.4.x should take care when updating" + ewarn "their snort.conf. A number of significant changes have been" + ewarn "have been added to snort 2.6 including the addition of" + ewarn "dynamically loadable preprocessors, detection engine and rules." + ewarn "Snort 2.6 also includes the addition of performance profiling" + ewarn "for rules & preprocessors and uses a new default pattern matcher" + ewarn "which provides faster matching at the expense of being very" + ewarn "memory intensive." + ewarn + ewarn "If you find that snort is using too much memory, your system" + ewarn "freezes, or snort crashes after a few minutes try adding the" + ewarn "following to your snort.conf..." + ewarn + ewarn "'config detection: search-method ac-sparsebands'" + ewarn + ewarn "This will provide high pattern matching performance at a much" + ewarn "lower cost to memory. For more information on the new features" + ewarn "in snort 2.6, please take a look at the release notes located in..." + ewarn + ewarn " /usr/share/doc/${PF}/RELEASE.NOTES.bz2" + ewarn + 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 before doing the" + einfo "following..." + einfo + einfo " MySQL: zcat /usr/share/doc/${PF}/schemas/create_mysql.gz | mysql -p snort" + einfo + einfo " PostgreSQL: import /usr/share/doc/${PF}/schemas/create_postgresql.gz" + einfo + einfo " ODBC: look at /usr/share/doc/${PF}/schemas/" + einfo + einfo "Users using the unified output plugin and barnyard do not need to" + einfo "compile database support into snort, but still need to set up their" + einfo "database as shown above." + einfo + ewarn "Only a basic set of rules was installed." + ewarn "Please add your other sets of rules to /etc/snort/rules." + ewarn "For more information on rules, visit ${HOMEPAGE}." + if use sguil ; then + elog "SGUIL needs to catch up with snort 2.6.x. If you plan on using SGUIL" + elog "you should unmerge ${P} and emerge snort-2.4.x" + fi +} -- cgit v1.2.3-65-gdbad