Fixed position of functions.sh, bug 234521, thank Olivier Huber for report. Respect LDFLAGS. Clean old.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo i686

5 files changed, 19 insertions, 102 deletions

diff --git a/net-analyzer/snortsam/ChangeLog b/net-analyzer/snortsam/ChangeLog
index 27b4ac1d1a11..c744ef298143 100644
--- a/net-analyzer/snortsam/ChangeLog
+++ b/net-analyzer/snortsam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/snortsam
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/ChangeLog,v 1.29 2007/11/06 17:21:23 armin76 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/ChangeLog,v 1.30 2008/09/16 10:42:34 pva Exp $
+
+  16 Sep 2008; Peter Volkov <pva@gentoo.org> -snortsam-2.30.ebuild,
+  -snortsam-2.44.ebuild, snortsam-2.50-r1.ebuild:
+  Fixed position of functions.sh, bug 234521, thank Olivier Huber for
+  report. Respect LDFLAGS. Clean old.
 
   06 Nov 2007; Raúl Porcel <armin76@gentoo.org> snortsam-2.50-r1.ebuild:
   sparc stable
diff --git a/net-analyzer/snortsam/Manifest b/net-analyzer/snortsam/Manifest
index 7ea0544b291b..da67f4fe0682 100644
--- a/net-analyzer/snortsam/Manifest
+++ b/net-analyzer/snortsam/Manifest
@@ -1,10 +1,6 @@
 AUX snortsam-2.29-no-ugly----lines.diff 1665 RMD160 96e1ed518c462991430c3413f810dd9cc7af9845 SHA1 4f487b38f871497d3ba3230b97d13fc15a01a906 SHA256 9fd58962944045d660b6ca703e520dbccfae9b596e09e2dde0fd2ba838c0f51a
 DIST snortsam-2.50-ciscoacl.diff.bz2 7295 RMD160 91d36fecc3fcf14de5ed964928d69ef3cc167bae SHA1 c887162193df59bff2f3fb2fe0ae0aec253314ce SHA256 a4f39789e9f10b95e6db1bbce5f9d26f7393161311f5c955a4b8380186a2cb6b
-DIST snortsam-src-2.30.tar.gz 1009013 RMD160 06d8839c1b06d2b755dbab0cff6df3c5099a999c SHA1 0b4ef40c6b9a996875c017d03be59d510ce882e1 SHA256 04365ac474ed0db45558c38a10a0a8135c7e72e88e13f4b54282d82d3479c02f
-DIST snortsam-src-2.44.tar.gz 1071400 RMD160 54ccb38dddadc72f562db1f8d5f7c674570ef042 SHA1 6449283750f9734316a70bc8c8937ffd93bb51cc SHA256 685ea0b9ec5409fbffe435c8e244e9e0e238a64327a72398838d88fa44b30777
 DIST snortsam-src-2.50.tar.gz 1073391 RMD160 d4cc56f2f5d87254784f4b03b639bce943b8530d SHA1 59dd84b53c7af0c7c487160d2016395883c2a58f SHA256 3c77967f9ef581310de02443512fc7cd3f145249c9be765b1bcf679d408dc441
-EBUILD snortsam-2.30.ebuild 1199 RMD160 44e0b836dd4d0b0321d2933ede75cf5ea2f2c79f SHA1 16d57bc3f5e9dd4c101492612c0e6ef5a725309b SHA256 6b13ab717d561696c412fe5276d15e54394b91d936ce1d77ec9ba73d493f82d7
-EBUILD snortsam-2.44.ebuild 1214 RMD160 c0281ab5dd73bbc0c3c12763096eb465f7e75e35 SHA1 43d9e7a7d17d5dfd30ece152cbb826f2c411ffa6 SHA256 9ae1d3f49fff7e0e144b3b8d5a540244c030986fe1f4a2008977332d5cd4a879
-EBUILD snortsam-2.50-r1.ebuild 1366 RMD160 56c3497159c61a653939410250ba6fe5d89b5cfc SHA1 256b72c73727a556d0548a8a23e5195904a1a170 SHA256 f72477e56d3f08c5add26501b0e08394a1c3719d7313b0c1009fc549f9efb18e
-MISC ChangeLog 3664 RMD160 e8e2031e6ae46aed2fca710abfba206fc9d8dafe SHA1 08c775390d3c106b3fb883b69902b8a0ad0e8ded SHA256 8093230da4ce510670138ec59231fdd2cbecb88e42460b11aa0dcb1d50ef2f63
+EBUILD snortsam-2.50-r1.ebuild 1527 RMD160 063d7af8b76c38cbab1d6869439da52141ca4c8c SHA1 749aa618eebc32cbc67477f6870f25f38dc0a848 SHA256 61348139d0bf53c38c735cc705ceb23dacf3c55cba4bb5ccb2427f55854b5f49
+MISC ChangeLog 3887 RMD160 cbd8ba339321998923e983abfadeb2e6ea32837b SHA1 30705b39f30e6c9bc18e5946fa5918312b7cf5db SHA256 9ec6be187754ae6452698323748bfcb1c19f316c20db74b312eac36696d1546f
 MISC metadata.xml 275 RMD160 5c13a5b966876b91c33b523878247da0676786be SHA1 ab1cdfc2553ebfb64e7b62bee4f627d58ce8ed0f SHA256 b67561a55b3667bc0e6ca54a4c459227ce10c6720951cf89cdd001753cabb09d
diff --git a/net-analyzer/snortsam/snortsam-2.30.ebuild b/net-analyzer/snortsam/snortsam-2.30.ebuild
deleted file mode 100644
index 47d029f9d1bf..000000000000
--- a/net-analyzer/snortsam/snortsam-2.30.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.30.ebuild,v 1.6 2007/07/11 23:49:24 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls"
-HOMEPAGE="http://www.snortsam.net/"
-SRC_URI="http://www.snortsam.net/files/snortsam-v2_multi-threaded/${PN}-src-${PV}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2.29-no-ugly----lines.diff
-}
-
-src_compile() {
-	sed -i "s: -O2 : ${CFLAGS} :" makesnortsam.sh || die "sed failed"
-	sh makesnortsam.sh || die "makesnortsam.sh failed"
-}
-
-src_install() {
-	find ${S} -type d -name CVS -exec rm -rf {} \;
-	find ${S} -type f -name "*.asc" -exec rm -f {} \;
-	dobin snortsam || die "dobin failed"
-	dodoc docs/* conf/*
-}
-
-pkg_postinst() {
-	echo
-	elog "To use snortsam with snort, you'll have to compile snort with USE=snortsam."
-	elog "Read the INSTALL file to configure snort for snortsam, and configure"
-	elog "snortsam for your particular firewall."
-	echo
-}
diff --git a/net-analyzer/snortsam/snortsam-2.44.ebuild b/net-analyzer/snortsam/snortsam-2.44.ebuild
deleted file mode 100644
index f1e58dd52a2b..000000000000
--- a/net-analyzer/snortsam/snortsam-2.44.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.44.ebuild,v 1.2 2007/05/01 22:39:36 genone Exp $
-
-inherit eutils
-
-MY_P="${PN}-src-${PV}"
-DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls"
-HOMEPAGE="http://www.snortsam.net/"
-SRC_URI="http://www.snortsam.net/files/snortsam/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.29-no-ugly----lines.diff
-}
-
-src_compile() {
-	sed -i "s: -O2 : ${CFLAGS} :" makesnortsam.sh || die "sed failed"
-	sh makesnortsam.sh || die "makesnortsam.sh failed"
-}
-
-src_install() {
-	find "${S}" -type d -name CVS -exec rm -rf {} \;
-	find "${S}" -type f -name "*.asc" -exec rm -f {} \;
-	dobin snortsam || die "dobin failed"
-	dodoc docs/* conf/*
-}
-
-pkg_postinst() {
-	elog
-	elog "To use snortsam with snort, you'll have to compile snort with USE=snortsam."
-	elog "Read the INSTALL file to configure snort for snortsam, and configure"
-	elog "snortsam for your particular firewall."
-	elog
-
-}
diff --git a/net-analyzer/snortsam/snortsam-2.50-r1.ebuild b/net-analyzer/snortsam/snortsam-2.50-r1.ebuild
index 88d92c4dfda2..c0e113f33d24 100644
--- a/net-analyzer/snortsam/snortsam-2.50-r1.ebuild
+++ b/net-analyzer/snortsam/snortsam-2.50-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.50-r1.ebuild,v 1.10 2007/11/06 17:21:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.50-r1.ebuild,v 1.11 2008/09/16 10:42:34 pva Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 MY_P="${PN}-src-${PV}"
 DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls"
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
@@ -23,17 +23,20 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-2.29-no-ugly----lines.diff
 	# bug 155955, ciscoacl segfaults with gcc-4.1.1
 	epatch "${DISTDIR}"/${PN}-2.50-ciscoacl.diff.bz2
+	sed -i -e "s:sbin/functions.sh:etc/init.d/functions.sh:" \
+			-e "s: -O2 : ${CFLAGS} :" \
+			-e "s:gcc :$(tc-getCC) :" \
+			-e "s:\( -o ../snortsam\): ${LDFLAGS}\1:" makesnortsam.sh || die "sed failed"
+	find "${S}" -depth -type d -name CVS -exec rm -rf \{\} \;
 }
 
 src_compile() {
-	sed -i "s: -O2 : ${CFLAGS} :" makesnortsam.sh || die "sed failed"
 	sh makesnortsam.sh || die "makesnortsam.sh failed"
 }
 
 src_install() {
-	find "${S}" -type d -name CVS -exec rm -rf {} \;
-	find "${S}" -type f -name "*.asc" -exec rm -f {} \;
 	dobin snortsam || die "dobin failed"
+	find "${S}" -depth -type f -name "*.asc" -exec rm -f {} \;
 	dodoc docs/* conf/*
 }
 
@@ -43,5 +46,4 @@ pkg_postinst() {
 	elog "Read the INSTALL file to configure snort for snortsam, and configure"
 	elog "snortsam for your particular firewall."
 	elog
-
 }