Add two patches from upstream, fixing compile issues on amd64 and 100% CPU utilization bug. Fixes bug 138337, thanks to Clemente Aguiar <caguiar at madeiratecnopolo dot pt>.

(Portage version: 2.1-r1)

4 files changed, 102 insertions, 1 deletions

diff --git a/net-analyzer/sancp/ChangeLog b/net-analyzer/sancp/ChangeLog
index 18c3710f4a6e..e1783d82944a 100644
--- a/net-analyzer/sancp/ChangeLog
+++ b/net-analyzer/sancp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/sancp
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/ChangeLog,v 1.6 2006/02/20 20:28:47 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/ChangeLog,v 1.7 2006/07/27 02:58:31 vanquirius Exp $
+
+*sancp-1.6.1-r2 (27 Jul 2006)
+
+  27 Jul 2006; Marcelo Goes <vanquirius@gentoo.org> -sancp-1.6.1.ebuild,
+  +sancp-1.6.1-r2.ebuild:
+  Add two patches from upstream, fixing compile issues on amd64 and 100% CPU
+  utilization bug. Fixes bug 138337, thanks to Clemente Aguiar <caguiar at
+  madeiratecnopolo dot pt>.
 
 *sancp-1.6.1-r1 (20 Feb 2006)
 
diff --git a/net-analyzer/sancp/files/digest-sancp-1.6.1-r1 b/net-analyzer/sancp/files/digest-sancp-1.6.1-r1
index 042857cd7920..190513471f70 100644
--- a/net-analyzer/sancp/files/digest-sancp-1.6.1-r1
+++ b/net-analyzer/sancp/files/digest-sancp-1.6.1-r1
@@ -1,3 +1,9 @@
 MD5 7b357ec3371fc399c7589261f0d8d11b sancp-1.6.1.fix200511.a.patch 662
+RMD160 cd0fbff5b5eb143c585453ad1bd5ef916364dd43 sancp-1.6.1.fix200511.a.patch 662
+SHA256 f80ea77873f03de40399c2c9247590829f02421d68758425cd139c48151eb13c sancp-1.6.1.fix200511.a.patch 662
 MD5 747aa31c477d726ce6a9b233e3e5f4ee sancp-1.6.1.fix200511.b.patch 870
+RMD160 519932df5a6645cac639862e67325d63200b97bd sancp-1.6.1.fix200511.b.patch 870
+SHA256 0bbcf2797d689f9eaa46933262edc3badd644636fb8821832264bab454a870c0 sancp-1.6.1.fix200511.b.patch 870
 MD5 b83e2f4abb2bf7b10fd874aa58f6324c sancp-1.6.1.tar.gz 69986
+RMD160 033c64427f8a61f77823e48ea89c0d8e510f0083 sancp-1.6.1.tar.gz 69986
+SHA256 58e487a4bd83716e90ff19d0d7fab352e28bbe143be60f4ee61c34d5fa6380a3 sancp-1.6.1.tar.gz 69986
diff --git a/net-analyzer/sancp/files/digest-sancp-1.6.1-r2 b/net-analyzer/sancp/files/digest-sancp-1.6.1-r2
new file mode 100644
index 000000000000..33f15560ea44
--- /dev/null
+++ b/net-analyzer/sancp/files/digest-sancp-1.6.1-r2
@@ -0,0 +1,15 @@
+MD5 7b357ec3371fc399c7589261f0d8d11b sancp-1.6.1.fix200511.a.patch 662
+RMD160 cd0fbff5b5eb143c585453ad1bd5ef916364dd43 sancp-1.6.1.fix200511.a.patch 662
+SHA256 f80ea77873f03de40399c2c9247590829f02421d68758425cd139c48151eb13c sancp-1.6.1.fix200511.a.patch 662
+MD5 747aa31c477d726ce6a9b233e3e5f4ee sancp-1.6.1.fix200511.b.patch 870
+RMD160 519932df5a6645cac639862e67325d63200b97bd sancp-1.6.1.fix200511.b.patch 870
+SHA256 0bbcf2797d689f9eaa46933262edc3badd644636fb8821832264bab454a870c0 sancp-1.6.1.fix200511.b.patch 870
+MD5 67be8fb2d747db03b61b157a340fc24c sancp-1.6.1.fix200601.c.patch 3578
+RMD160 0dd5c242998e87121ba4db93910538e7b88f4c3e sancp-1.6.1.fix200601.c.patch 3578
+SHA256 38fe2e2db7419fb79c57b1e0505dbfda9958f56ab85259a84485111eb644880f sancp-1.6.1.fix200601.c.patch 3578
+MD5 31f79a19ee913d73798c2e39751c8e18 sancp-1.6.1.fix200606.d.patch 6847
+RMD160 be2247f43dda501406eb82b3fa0a4ee904e90a9d sancp-1.6.1.fix200606.d.patch 6847
+SHA256 1c62a44d75f3cd8b07445b02d9535f3eede3a60329bda111dd855c674e2745a9 sancp-1.6.1.fix200606.d.patch 6847
+MD5 b83e2f4abb2bf7b10fd874aa58f6324c sancp-1.6.1.tar.gz 69986
+RMD160 033c64427f8a61f77823e48ea89c0d8e510f0083 sancp-1.6.1.tar.gz 69986
+SHA256 58e487a4bd83716e90ff19d0d7fab352e28bbe143be60f4ee61c34d5fa6380a3 sancp-1.6.1.tar.gz 69986
diff --git a/net-analyzer/sancp/sancp-1.6.1-r2.ebuild b/net-analyzer/sancp/sancp-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..e511bf416bdd
--- /dev/null
+++ b/net-analyzer/sancp/sancp-1.6.1-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/sancp-1.6.1-r2.ebuild,v 1.1 2006/07/27 02:58:31 vanquirius Exp $
+
+inherit eutils
+
+DESCRIPTION="SANCP is a network security tool designed to collect statistical \
+	information regarding network traffic and collect the traffic itself in pcap format."
+HOMEPAGE="http://www.metre.net/sancp.html"
+SRC_URI="http://www.metre.net/files/${P}.tar.gz
+	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.a.patch
+	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.b.patch
+	http://sancp.sourceforge.net/${PN}-1.6.1.fix200601.c.patch
+	http://sancp.sourceforge.net/${PN}-1.6.1.fix200606.d.patch"
+
+LICENSE="QPL"
+
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE="sguil"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	enewgroup sancp
+	enewuser sancp -1 -1 /dev/null sancp
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch
+	epatch "${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch
+	# bug 138337
+	epatch "${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch
+	epatch "${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch
+}
+
+src_install() {
+	keepdir /var/log/sancp/
+	dodoc docs/CHANGES docs/fields.LIST docs/README docs/SETUP \
+		"${FILESDIR}"/sguil_sancp.conf etc/sancp/sancp.conf
+
+	insinto /etc/sancp
+	if use sguil ; then
+		newins "${FILESDIR}"/sguil_sancp.conf sancp.conf
+	else
+		doins etc/sancp/sancp.conf
+	fi
+
+	exeinto /usr/bin
+	doexe sancp
+
+	newinitd "${FILESDIR}"/sancp.rc1 sancp
+	newconfd "${FILESDIR}"/sancp.confd sancp
+	if use sguil ; then
+		sed -i -e /^SANCP_OPTS/s:'sancp':"sguil":g \
+			-e s:'-d $LOGDIR/today':"-d /var/lib/sguil/$(hostname)/sancp": \
+			"${D}/etc/conf.d/sancp"
+	fi
+
+	fowners sancp:sancp /var/log/sancp
+	fperms 0770 /var/log/sancp
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please modify /etc/sancp/sancp.conf to suit your environment"
+	einfo
+}