summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Stelling <blubb@gentoo.org>2007-02-11 12:44:17 +0000
committerSimon Stelling <blubb@gentoo.org>2007-02-11 12:44:17 +0000
commit82e20e680809ac58bf90d095f9fae5a35454ea16 (patch)
treee5acb616cd7268e11d7f85d5d628ebc23d61728b /net-analyzer
parentnet-p2p/ww removed from the tree (diff)
downloadgentoo-2-82e20e680809ac58bf90d095f9fae5a35454ea16.tar.gz
gentoo-2-82e20e680809ac58bf90d095f9fae5a35454ea16.tar.bz2
gentoo-2-82e20e680809ac58bf90d095f9fae5a35454ea16.zip
fix multilib-strict and mark stable on amd64; security bug 161632
(Portage version: 2.1.2-r7)
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/snort/ChangeLog6
-rw-r--r--net-analyzer/snort/files/snort-2.6.1.2-libdir.patch14
-rw-r--r--net-analyzer/snort/snort-2.6.1.2.ebuild5
3 files changed, 22 insertions, 3 deletions
diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index d2020479f050..e77cb70f8b5c 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/snort
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.116 2007/02/01 16:04:30 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.117 2007/02/11 12:44:17 blubb Exp $
+
+ 11 Feb 2007; Simon Stelling <blubb@gentoo.org>
+ +files/snort-2.6.1.2-libdir.patch, snort-2.6.1.2.ebuild:
+ fix multilib-strict and mark stable on amd64; security bug 161632
01 Feb 2007; Markus Ullmann <jokey@gentoo.org>
+files/snort-2.6.1.2-react.patch, snort-2.6.1.2.ebuild:
diff --git a/net-analyzer/snort/files/snort-2.6.1.2-libdir.patch b/net-analyzer/snort/files/snort-2.6.1.2-libdir.patch
new file mode 100644
index 000000000000..329e5558bbb0
--- /dev/null
+++ b/net-analyzer/snort/files/snort-2.6.1.2-libdir.patch
@@ -0,0 +1,14 @@
+--- snort-2.6.1.2/src/dynamic-plugins/sf_engine/Makefile.am.old 2007-02-03 21:11:09.000000000 +0100
++++ snort-2.6.1.2/src/dynamic-plugins/sf_engine/Makefile.am 2007-02-03 21:11:22.000000000 +0100
+@@ -3,9 +3,9 @@
+
+ #INCLUDES = -I../include
+
+-lib_LTLIBRARIES = libsf_engine.la
++libsf_LTLIBRARIES = libsf_engine.la
+
+-libdir = ${exec_prefix}/lib/snort_dynamicengine
++libsfdir = ${libdir}/snort_dynamicengine
+
+ libsf_engine_la_LDFLAGS = -module
+
diff --git a/net-analyzer/snort/snort-2.6.1.2.ebuild b/net-analyzer/snort/snort-2.6.1.2.ebuild
index e5bff0c3bb9e..3d4731d088eb 100644
--- a/net-analyzer/snort/snort-2.6.1.2.ebuild
+++ b/net-analyzer/snort/snort-2.6.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 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.2.ebuild,v 1.5 2007/02/01 16:04:30 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.6.1.2.ebuild,v 1.6 2007/02/11 12:44:17 blubb Exp $
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
@@ -17,7 +17,7 @@ SRC_URI="http://www.snort.org/dl/current/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ppc64 -sparc x86"
+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"
@@ -60,6 +60,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
+ epatch "${FILESDIR}/${P}-libdir.patch"
epatch "${FILESDIR}/${PN}-2.6.1.1-libnet.patch"
use gre && epatch "${FILESDIR}/${PN}-2.6.1.1-gre.patch"
use react && epatch "${FILESDIR}/${P}-react.patch"