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

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo i686)

4 files changed, 17 insertions, 96 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/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
-
 }