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)
 (Unsigned Manifest commit)

3 files changed, 35 insertions, 64 deletions

diff --git a/net-analyzer/sancp/Manifest b/net-analyzer/sancp/Manifest
index 5238f11b7c58..57e09efb3207 100644
--- a/net-analyzer/sancp/Manifest
+++ b/net-analyzer/sancp/Manifest
@@ -1,9 +1,39 @@
-MD5 97eae6c34fda5c39c75be14a33e67c2b ChangeLog 1049
-MD5 5a29e0856415b398e93b6aa72172fa50 files/digest-sancp-1.6.1 62
-MD5 40f1b0b0bd28b4ec850cb460d78e9715 files/digest-sancp-1.6.1-r1 204
+AUX sancp.confd 275 RMD160 ed6c5c4c13e631111260791bfd97e829c33bc31e SHA1 7ad2fb5b7c6e45835733fe63a8324927ea33ea82 SHA256 272192ceb2d7e371c6ef1467baa91da2542ed22158eb5afe1a99a0f68b8f8390
 MD5 d58263b185630aa4738adbd4d79e0cbb files/sancp.confd 275
+RMD160 ed6c5c4c13e631111260791bfd97e829c33bc31e files/sancp.confd 275
+SHA256 272192ceb2d7e371c6ef1467baa91da2542ed22158eb5afe1a99a0f68b8f8390 files/sancp.confd 275
+AUX sancp.rc1 969 RMD160 1799aaebe92662c8b9ac943ce7a1bcc31d37eab6 SHA1 65e8338cc421df9b63b5190882de6c8c809dfd9c SHA256 64c172dc81927bd7b3adced16d183c699023588607fbda7f28168115b855dd93
 MD5 74992205ea566bb9d00fac0a01c9c684 files/sancp.rc1 969
+RMD160 1799aaebe92662c8b9ac943ce7a1bcc31d37eab6 files/sancp.rc1 969
+SHA256 64c172dc81927bd7b3adced16d183c699023588607fbda7f28168115b855dd93 files/sancp.rc1 969
+AUX sguil_sancp.conf 2133 RMD160 d7506587b0a0a00e4b40daad193bdea7ac19948c SHA1 11d38c964e48032a00c6d2899f9d41a25a664872 SHA256 e611481d8dcd66187db52f17c6e4505364bd1cc2f6e8cda45c0035fbeb77cd25
 MD5 3b34df10774a182a4cc3b848c35ccc94 files/sguil_sancp.conf 2133
-MD5 277c9d1d9522b7e2519bd07c003dc700 metadata.xml 238
+RMD160 d7506587b0a0a00e4b40daad193bdea7ac19948c files/sguil_sancp.conf 2133
+SHA256 e611481d8dcd66187db52f17c6e4505364bd1cc2f6e8cda45c0035fbeb77cd25 files/sguil_sancp.conf 2133
+DIST sancp-1.6.1.fix200511.a.patch 662 RMD160 cd0fbff5b5eb143c585453ad1bd5ef916364dd43 SHA1 fc44e0353ed2f922c29067fe54f9b607565a76a0 SHA256 f80ea77873f03de40399c2c9247590829f02421d68758425cd139c48151eb13c
+DIST sancp-1.6.1.fix200511.b.patch 870 RMD160 519932df5a6645cac639862e67325d63200b97bd SHA1 40bea5cc28bb52678c1ef739314df77bd0f3c462 SHA256 0bbcf2797d689f9eaa46933262edc3badd644636fb8821832264bab454a870c0
+DIST sancp-1.6.1.fix200601.c.patch 3578 RMD160 0dd5c242998e87121ba4db93910538e7b88f4c3e SHA1 b1d7939c078070e4ddac4345114b0724b3d39d7e SHA256 38fe2e2db7419fb79c57b1e0505dbfda9958f56ab85259a84485111eb644880f
+DIST sancp-1.6.1.fix200606.d.patch 6847 RMD160 be2247f43dda501406eb82b3fa0a4ee904e90a9d SHA1 d5da6d2024e4e5543bc65eafa08345f51cb208e3 SHA256 1c62a44d75f3cd8b07445b02d9535f3eede3a60329bda111dd855c674e2745a9
+DIST sancp-1.6.1.tar.gz 69986 RMD160 033c64427f8a61f77823e48ea89c0d8e510f0083 SHA1 9d09ffea003d252129232a5b574163cc71e491d2 SHA256 58e487a4bd83716e90ff19d0d7fab352e28bbe143be60f4ee61c34d5fa6380a3
+EBUILD sancp-1.6.1-r1.ebuild 1684 RMD160 b54ae80a8d12be906ae772a76d5dddc0c07f23bc SHA1 1c2f0a31389d124aee9e34e02c8949eba10e95bd SHA256 78702bb0053645d70db0bc2cd02c1037f86d6943ac360b326c09205ca0a3986b
 MD5 01599d1df076299182a22c62853c7d30 sancp-1.6.1-r1.ebuild 1684
-MD5 0c3d0dc7b2e7202098d5cfd99e204277 sancp-1.6.1.ebuild 1404
+RMD160 b54ae80a8d12be906ae772a76d5dddc0c07f23bc sancp-1.6.1-r1.ebuild 1684
+SHA256 78702bb0053645d70db0bc2cd02c1037f86d6943ac360b326c09205ca0a3986b sancp-1.6.1-r1.ebuild 1684
+EBUILD sancp-1.6.1-r2.ebuild 1920 RMD160 68a5afe0af1351399e0b78f8c12fd45bc35cd7ba SHA1 c6a5f69a74316989fc19252afd20f11be3833500 SHA256 f5b37d66df3526f35d137ef23d1c94e90e4a8066c91d5a784a8f5928609a657d
+MD5 ea99ce804d7c2dd6073aafbca7bb893e sancp-1.6.1-r2.ebuild 1920
+RMD160 68a5afe0af1351399e0b78f8c12fd45bc35cd7ba sancp-1.6.1-r2.ebuild 1920
+SHA256 f5b37d66df3526f35d137ef23d1c94e90e4a8066c91d5a784a8f5928609a657d sancp-1.6.1-r2.ebuild 1920
+MISC ChangeLog 1360 RMD160 c30e6f06b3d7505686e695ee868540a845fe17e1 SHA1 7d6302f90b58b24447d96a88126f36827404874a SHA256 697e1aecf2f2f3c6fc927d6ab94846128bcb4c5089117b347eb5e47699fe2d93
+MD5 1916e743a9023d6815d72d6b456f2279 ChangeLog 1360
+RMD160 c30e6f06b3d7505686e695ee868540a845fe17e1 ChangeLog 1360
+SHA256 697e1aecf2f2f3c6fc927d6ab94846128bcb4c5089117b347eb5e47699fe2d93 ChangeLog 1360
+MISC metadata.xml 238 RMD160 cdefd3726eda45b3219d535185a6aeaa5b47e1f9 SHA1 bb069f1edf266bb7f9d885aa4cc2188e9ce83619 SHA256 7ebb9fc1a80a14c3ac97261f4683edd4dfbcbce54fc3be19c265f3f5cae3a7d9
+MD5 277c9d1d9522b7e2519bd07c003dc700 metadata.xml 238
+RMD160 cdefd3726eda45b3219d535185a6aeaa5b47e1f9 metadata.xml 238
+SHA256 7ebb9fc1a80a14c3ac97261f4683edd4dfbcbce54fc3be19c265f3f5cae3a7d9 metadata.xml 238
+MD5 5b3e0e5400ee0477b447e5562ffc5f7b files/digest-sancp-1.6.1-r1 750
+RMD160 e02b86d3846c96f88e293fe989d2f5a48affcee5 files/digest-sancp-1.6.1-r1 750
+SHA256 7745bdc7b6f1e67bf79c2dc6d24fdce652f59c7f4fe0e1c090b345ca5d5f0ab3 files/digest-sancp-1.6.1-r1 750
+MD5 1d12ab7ca41e14aff0a11d1c0e790e0f files/digest-sancp-1.6.1-r2 1274
+RMD160 0db1dd6a36c157458c40e6beb2c267d6bab420a7 files/digest-sancp-1.6.1-r2 1274
+SHA256 bf2f8bb7dd2efd555188d5457a92dfe09c1cd701aa3a9a306aeb5660383b582a files/digest-sancp-1.6.1-r2 1274
diff --git a/net-analyzer/sancp/files/digest-sancp-1.6.1 b/net-analyzer/sancp/files/digest-sancp-1.6.1
deleted file mode 100644
index a55fe08d5eab..000000000000
--- a/net-analyzer/sancp/files/digest-sancp-1.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b83e2f4abb2bf7b10fd874aa58f6324c sancp-1.6.1.tar.gz 69986
diff --git a/net-analyzer/sancp/sancp-1.6.1.ebuild b/net-analyzer/sancp/sancp-1.6.1.ebuild
deleted file mode 100644
index 8d4d8db84e0c..000000000000
--- a/net-analyzer/sancp/sancp-1.6.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.ebuild,v 1.2 2006/02/15 23:50:15 jokey 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"
-
-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_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
-}