Add a couple of patches from upstream for bug 123521. Thanks to Clemente Aguiar <caguiar at madeiratecnopolo dot pt>.

(Portage version: 2.0.54 vanquish yourself edition)

4 files changed, 79 insertions, 15 deletions

diff --git a/net-analyzer/sancp/ChangeLog b/net-analyzer/sancp/ChangeLog
index 1ed9a5efcf9f..18c3710f4a6e 100644
--- a/net-analyzer/sancp/ChangeLog
+++ b/net-analyzer/sancp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2006/02/15 23:50:15 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/ChangeLog,v 1.6 2006/02/20 20:28:47 vanquirius Exp $
+
+*sancp-1.6.1-r1 (20 Feb 2006)
+
+  20 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> +sancp-1.6.1-r1.ebuild:
+  Add a couple of patches from upstream for bug 123521. Thanks to Clemente
+  Aguiar <caguiar at madeiratecnopolo dot pt>.
 
   15 Feb 2006; Markus Ullmann <jokey@gentoo.org> sancp-1.6.1.ebuild:
   Removing virtual/libpcap wrt bug #117898
diff --git a/net-analyzer/sancp/Manifest b/net-analyzer/sancp/Manifest
index 984ece2acb1f..69f035a5880d 100644
--- a/net-analyzer/sancp/Manifest
+++ b/net-analyzer/sancp/Manifest
@@ -1,21 +1,9 @@
 MD5 1b2a041ac8af82a32a6b39af9a37fd80 ChangeLog 814
-RMD160 35589580a854cfabe1459aeadebf15640ab005aa ChangeLog 814
-SHA256 f84ceda3c39a8ade0c955a387a9d6cbe355d6de8e3c1d1d4a0225ac2fde55664 ChangeLog 814
 MD5 5a29e0856415b398e93b6aa72172fa50 files/digest-sancp-1.6.1 62
-RMD160 b16cc7483791124eb27b8d3f4f2a34572a5d1fb3 files/digest-sancp-1.6.1 62
-SHA256 998d16350ad793d63fd95d934182dc552486944d0d2e9f10d636c2c56ca54db8 files/digest-sancp-1.6.1 62
+MD5 40f1b0b0bd28b4ec850cb460d78e9715 files/digest-sancp-1.6.1-r1 204
 MD5 d58263b185630aa4738adbd4d79e0cbb files/sancp.confd 275
-RMD160 ed6c5c4c13e631111260791bfd97e829c33bc31e files/sancp.confd 275
-SHA256 272192ceb2d7e371c6ef1467baa91da2542ed22158eb5afe1a99a0f68b8f8390 files/sancp.confd 275
 MD5 74992205ea566bb9d00fac0a01c9c684 files/sancp.rc1 969
-RMD160 1799aaebe92662c8b9ac943ce7a1bcc31d37eab6 files/sancp.rc1 969
-SHA256 64c172dc81927bd7b3adced16d183c699023588607fbda7f28168115b855dd93 files/sancp.rc1 969
 MD5 3b34df10774a182a4cc3b848c35ccc94 files/sguil_sancp.conf 2133
-RMD160 d7506587b0a0a00e4b40daad193bdea7ac19948c files/sguil_sancp.conf 2133
-SHA256 e611481d8dcd66187db52f17c6e4505364bd1cc2f6e8cda45c0035fbeb77cd25 files/sguil_sancp.conf 2133
 MD5 277c9d1d9522b7e2519bd07c003dc700 metadata.xml 238
-RMD160 cdefd3726eda45b3219d535185a6aeaa5b47e1f9 metadata.xml 238
-SHA256 7ebb9fc1a80a14c3ac97261f4683edd4dfbcbce54fc3be19c265f3f5cae3a7d9 metadata.xml 238
+MD5 541c3fcbf41fd910bc2ad2c476357393 sancp-1.6.1-r1.ebuild 1676
 MD5 0c3d0dc7b2e7202098d5cfd99e204277 sancp-1.6.1.ebuild 1404
-RMD160 800c753ccdb34a7350477f5366d353bc541d10da sancp-1.6.1.ebuild 1404
-SHA256 2d27d501bd336a406e1a0d6af6f46f79847a86e0dd38d54927d13629a946c6eb sancp-1.6.1.ebuild 1404
diff --git a/net-analyzer/sancp/files/digest-sancp-1.6.1-r1 b/net-analyzer/sancp/files/digest-sancp-1.6.1-r1
new file mode 100644
index 000000000000..042857cd7920
--- /dev/null
+++ b/net-analyzer/sancp/files/digest-sancp-1.6.1-r1
@@ -0,0 +1,3 @@
+MD5 7b357ec3371fc399c7589261f0d8d11b sancp-1.6.1.fix200511.a.patch 662
+MD5 747aa31c477d726ce6a9b233e3e5f4ee sancp-1.6.1.fix200511.b.patch 870
+MD5 b83e2f4abb2bf7b10fd874aa58f6324c sancp-1.6.1.tar.gz 69986
diff --git a/net-analyzer/sancp/sancp-1.6.1-r1.ebuild b/net-analyzer/sancp/sancp-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..a3f872a09af4
--- /dev/null
+++ b/net-analyzer/sancp/sancp-1.6.1-r1.ebuild
@@ -0,0 +1,67 @@
+# 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-r1.ebuild,v 1.1 2006/02/20 20:28:47 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"
+
+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
+}
+
+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
+}