fix multilib-strict and mark stable on amd64; security bug 161632

Package-Manager: portage-2.1.2-r7

diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index d2020479f050df0d6f02fdac7b7dabf456180713..e77cb70f8b5cc50fadd54e7bed0001e39e7b55e2 100644 (file)
--- 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/Manifest b/net-analyzer/snort/Manifest
index ba42ed96690718165ad1078648229fa5d4e3d6fa..c7a4ad7fdb4121821f1f92dca1491aa13c241412 100644 (file)
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX snort-2.6.1.1-gre.patch 1164 RMD160 c80be0a6286ad7f79bb22fa94148e2f77ce25a34 SHA1 f0b3e80f05a433a9182d038fe4a28bc37260337a SHA256 72df4c81f615a72a3d305ac236b38aee5a2c953ff1e5fa39e075a7ef2e6b82ef
 MD5 e83ddd6b75669ad58e2ce6cafedc0aaf files/snort-2.6.1.1-gre.patch 1164
 RMD160 c80be0a6286ad7f79bb22fa94148e2f77ce25a34 files/snort-2.6.1.1-gre.patch 1164
@@ -9,6 +6,10 @@ AUX snort-2.6.1.1-libnet.patch 8062 RMD160 fb42546b2efce968160afb0a0e0e96c8f0ad1
 MD5 24315885b9f04323523e4fec8906888d files/snort-2.6.1.1-libnet.patch 8062
 RMD160 fb42546b2efce968160afb0a0e0e96c8f0ad1471 files/snort-2.6.1.1-libnet.patch 8062
 SHA256 ff36205cdd4554ff23c845383a82c9fdef6682a399072f3306f6aa3b74378b86 files/snort-2.6.1.1-libnet.patch 8062
+AUX snort-2.6.1.2-libdir.patch 446 RMD160 7508ad071e9cc9746f3c501c2525d82df3fdd9d0 SHA1 04cc4ddbd4570175483a33ce0729eb156473a1a5 SHA256 252743e9e5ddf4867f64cfcf22ca6127d07e6c69285635c0b7025a606a5fedc8
+MD5 3123dbccc436db568167fd3cff9d3c8c files/snort-2.6.1.2-libdir.patch 446
+RMD160 7508ad071e9cc9746f3c501c2525d82df3fdd9d0 files/snort-2.6.1.2-libdir.patch 446
+SHA256 252743e9e5ddf4867f64cfcf22ca6127d07e6c69285635c0b7025a606a5fedc8 files/snort-2.6.1.2-libdir.patch 446
 AUX snort-2.6.1.2-react.patch 952 RMD160 f5856ba63d63c20386af53b1e95db3d3ce758843 SHA1 b2c87c82b4c32af573b30fc39441d3f393afd284 SHA256 15cfb26179883a962612cdf54f283fd195199118328586595f001a750ad68ab1
 MD5 9926736655005465b6f2e85f6ccbb359 files/snort-2.6.1.2-react.patch 952
 RMD160 f5856ba63d63c20386af53b1e95db3d3ce758843 files/snort-2.6.1.2-react.patch 952
@@ -36,14 +37,14 @@ EBUILD snort-2.4.5.ebuild 4425 RMD160 e0df6b4511ecd8ea5447d49963b32279981a2aa8 S
 MD5 edd3367ef6795d519b1ae1cf237de552 snort-2.4.5.ebuild 4425
 RMD160 e0df6b4511ecd8ea5447d49963b32279981a2aa8 snort-2.4.5.ebuild 4425
 SHA256 8fcef1aae9797a4c5bd51f4810c17d4de69cfa6d351bb131f3f8fa1cfdc873c7 snort-2.4.5.ebuild 4425
-EBUILD snort-2.6.1.2.ebuild 5756 RMD160 ba648cb9b9d17082bb2f6918648bf6ab5aef361a SHA1 36d1d8439ff973186dc55ce3e93fdb444ee4ce05 SHA256 6c855e0836c84f3db56b2c80216f38942dd2fbd739a5c656e6e2bb4594763dfa
-MD5 08b696ddcd9ffe3e3d71327de8b6fefc snort-2.6.1.2.ebuild 5756
-RMD160 ba648cb9b9d17082bb2f6918648bf6ab5aef361a snort-2.6.1.2.ebuild 5756
-SHA256 6c855e0836c84f3db56b2c80216f38942dd2fbd739a5c656e6e2bb4594763dfa snort-2.6.1.2.ebuild 5756
-MISC ChangeLog 21114 RMD160 f25cd8ffd7b91295a9d1082486c7770f550c4e1b SHA1 ec5cfe9814d4721d4eb7214e52e870b6071525b8 SHA256 86e0d40b68c65edabc8958f802a541051b67edba0d474044de136a59b84f1f3c
-MD5 9a71d0d9adbe1c644a710fb527a5ac2c ChangeLog 21114
-RMD160 f25cd8ffd7b91295a9d1082486c7770f550c4e1b ChangeLog 21114
-SHA256 86e0d40b68c65edabc8958f802a541051b67edba0d474044de136a59b84f1f3c ChangeLog 21114
+EBUILD snort-2.6.1.2.ebuild 5795 RMD160 d45d0f9a356e17d59c855797aabfe7f395692a41 SHA1 d59838013dda8b19e7dd13d3ba6e6b8f4253f004 SHA256 7bf4f501d887c23d588b7721c45ec670298d078a16a5b4a5abbfeb80a3a36fee
+MD5 4d9eb32731c5778ea6745a7f8d89a67c snort-2.6.1.2.ebuild 5795
+RMD160 d45d0f9a356e17d59c855797aabfe7f395692a41 snort-2.6.1.2.ebuild 5795
+SHA256 7bf4f501d887c23d588b7721c45ec670298d078a16a5b4a5abbfeb80a3a36fee snort-2.6.1.2.ebuild 5795
+MISC ChangeLog 21291 RMD160 781772c924e4aaa132c59ce362fe68fd0d2546be SHA1 3e35dc01e6ec6cff7b955deecab70c300872fbbb SHA256 2d55bdaa08d3fded6048f56d2ab2595c3dcc2373d002ff5e44b3bd6e526e0e9b
+MD5 c90d2d000f3bda71bab46b1711c63c3c ChangeLog 21291
+RMD160 781772c924e4aaa132c59ce362fe68fd0d2546be ChangeLog 21291
+SHA256 2d55bdaa08d3fded6048f56d2ab2595c3dcc2373d002ff5e44b3bd6e526e0e9b ChangeLog 21291
 MISC metadata.xml 246 RMD160 427cf3e9767d777650d905a7b4fcad57259908bb SHA1 470a19ab011412f7f219d654304b7a43876082ae SHA256 843ac8d26d6f2f01b254d963268d1b4dc7ec515e5ce16daf47f7c68f2c47584e
 MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
 RMD160 427cf3e9767d777650d905a7b4fcad57259908bb metadata.xml 246
@@ -54,10 +55,3 @@ SHA256 eca549eac2e372a4307f224ffb2150f9fd940540134ecae1c73621c81f61d826 files/di
 MD5 815d00c6b73946345b8c4860388db41d files/digest-snort-2.6.1.2 1006
 RMD160 a5a63f7a2ddef96a836bb966b98d7d71431965e0 files/digest-snort-2.6.1.2 1006
 SHA256 c776d126ad4060bf4566a1457d753418cf16c4014207e82aa3b34d7c834cefb0 files/digest-snort-2.6.1.2 1006
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFwg96z974XjDVpbkRAlogAKCEzJtTEyCdB73t0b2yaMHBV488zACfWINN
-OKa3BUIEnS7cHNItmbStYYQ=
-=/pfZ
------END PGP SIGNATURE-----

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 (file)
index 0000000..329e555
--- /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 e5bff0c3bb9e4d182cb402d0ff6f7be8b2adb930..3d4731d088eb3e09f8e9dcd4c8db247ebd9db534 100644 (file)
--- 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"