gentoo resync : 25.08.2020

5 files changed, 99 insertions, 6 deletions

diff --git a/net-analyzer/sancp/Manifest b/net-analyzer/sancp/Manifest
index 772138d834cb..fc3f6a8efaf4 100644
--- a/net-analyzer/sancp/Manifest
+++ b/net-analyzer/sancp/Manifest
@@ -1,4 +1,5 @@
-AUX sancp-1.6.1-compiler.patch 4603 BLAKE2B de30f0283afd61503baf7b5bfea85faaec0d35b057e7e8e7f3a41e1c21300ef15c322d7ac1b9e594647aa12456ec59229ff01aac56036e9cecbc24e81b6db52f SHA512 7ae67ce719f36ea795eda87d7d9d97885ea544c150f568d7751397172d8608be5980f386b7f24fe4d7e3a9a49b4cae4efb3987cdbb9dfc85c69397e3d603535c
+AUX sancp-1.6.1-compiler.patch 4531 BLAKE2B 1122161750698acc40df82f315a359d5d7afc857ad9e2135fcd17d8e724c62eab668bdac7ee130a6f0f19c34fad6581ae436038e5a99f2f051bbd4cbcf99def3 SHA512 0a8564d9495c1004bffc55fd35bf826bbc069e1a63f4daef133621e44e9afb5a8914e93743716fadbb305dc37396dcb139613875742e65189f2ecc0404bec370
+AUX sancp-1.6.1-extern.patch 396 BLAKE2B 691b83cc1d88ae45ba29e7ea3c2f5cc2c2c1fff35c70dfb5b99fedb4c55c75a3afae6ec51028cc62a354c40f44fbffe066a6d3b62aba40507c330b8f67b064dc SHA512 ee83b0c7c8654f93aaa5dab1178c2f4fc87c6281224a1a1a506d236a9df8782ba13b2165b97e2dc9f8436f7af66fd6443c08447af3382649a86b7d3106024724
 AUX sancp-1.6.1-gcc6.patch 864 BLAKE2B 4ffd10b108e268e46ed71ff2930bd990df8f6d66df36716100fa9672532fa0ea57736ed02eab7d6f78b798eb7ebb9ad4487e2961bf3af63edd4cc2e7b77b7cdc SHA512 7dd6b24ed478866194bdd898b40c107f70b455b96856c854b6f458fad0a4001d14623e72c01d0313bb5b14c8b93a2a3451d3c30c8276c35631a616018dc9d88f
 AUX sancp.confd 382 BLAKE2B 1e333a9ec995e733ee3ae7db19e2479dfe87da9a1e1cd3c8e610d0873fab5825a602fee083c87cd0ef40813f98994d1a73b2a7a2c571c850522fba01b3f91afa SHA512 4ae33d655ca0a81a3bf71a382241bca90b1e58e121695041ef5210bd4abdcdbbc4385dfe673a4367898303ae64f9998453c95d2e71d8271ca322473ee61368df
 AUX sancp.rc1 859 BLAKE2B 624ca79a7bb4efd9e6c9513ff53c7f999e85481b2b5555b18c62e27693f371a4098865243fb6aff88d756ade4c988e94b3eda326c7a3539668b1d117a9b55167 SHA512 16c713cf009d597c67981caa5f159b5597732c7f984fb9e91568d2956abdfdc2afb3ef6c35f8189dcca3e89757622c67c1fb67a9a6390851d0db118fd92efd0e
@@ -8,5 +9,6 @@ DIST sancp-1.6.1.fix200511.b.patch 870 BLAKE2B 18ad38c37f11aa1c4804400db5475323d
 DIST sancp-1.6.1.fix200601.c.patch 3578 BLAKE2B 7c7e5ef0e1967d41f731d3c79f4273a4ebfc922159ada1940ba4635f6f82e63ed55faeffe53636d2c8fd96d57e1516211fff8852c73876d019fc13d59f4ace9d SHA512 3d15028d33e7dbddc74d8c6eefac6d66e357f024dca15afdfb8156b0cf969ab093c26baa43ebf7c1ac88f4275ef4bdc91c1cc69c5aa7b439a042ed966edea30f
 DIST sancp-1.6.1.fix200606.d.patch 6847 BLAKE2B 2d3d2369738adef1ae5ea37cfcab5952be243af269574292e042e361d7d4d02174bbaea2769f5fa6bf802eea6ae9559a3b637ee4dbce1b53715f1e4b66f9df51 SHA512 474a69052a2b9642fdc59e28c0237852d49b7b05445f0ffbbd2ea3f01b70a44e10ee49fba6294b413a53afe50271aaf88f979f8c479fb4b464b3ba5a70534276
 DIST sancp-1.6.1.tar.gz 69986 BLAKE2B 66ed4f5817f1bc299edc66441eea97fa0deeb0fffb15aeb251e3b0351d35f1c25aa452b30e0ba3feb80d306929687448228d0b6ac96e8deaf16c83322b73916a SHA512 41c6b35a2e7295d3b8185b9cc556c56b285cae7542c7ace78e663e54cef8d470bfa2ee083d9837fa34cf5ad1e7c325fb838b00e4f776f5662cade7d61e07145c
-EBUILD sancp-1.6.1-r4.ebuild 1712 BLAKE2B 34ac6e791e5f5edd0edfa07d23ac7a1eef8a44bedd3bb49de56539ad902190efaf66661c962acf3bb7a4296e24d9e5f04bfaaa5629287e5db8ec41b8f9341f7a SHA512 9ae4fdda34f9e2d4bf59e0c3eec641bdec84f7a468647b528ce5e3abda3ab3abacf7a287d80cee6fcdff285284a42a68e78bfed1460b574f70e218e8e6e5e525
+EBUILD sancp-1.6.1-r4.ebuild 1717 BLAKE2B b2453eb7cfe66a10ec3761c23fa704ff1a75c1194f4bc1c1c30c4f6e747d64fe81f300f1bdf15c9c535a2c63422ff07786335f915331e346799810e18f52dce2 SHA512 20507210264c2b4aa7692916442e565b1128e960bc953a6ee2c3bb63e752caf6596fc2edf7a0e5ec530eea801b15a08c3eda33d2c00423d5c429a91f0fe14828
+EBUILD sancp-1.6.1-r5.ebuild 1814 BLAKE2B f16f379c88b9807221810e5fd3c89c5eb56d26670fcb19e441185c9583f69f4e9ecab41f4ee5d9cf720ab35632c77e1abbf3e4cd21a8ba2740be0dd2e7fd3d6e SHA512 437ab1a97e4323d582e26f82a555ca31aea878a3100d9d1ae955b03483cb98d546a7d29cb5a5009b5a0d086b7fb3bd2064dc0c2eb53d734216ac0afb65c7f03c
 MISC metadata.xml 473 BLAKE2B 2d145ab771bc6ec7572cfc0523c7d9630638909cdd4a8eba60a5ba47bd0d74d14985cca1cb435c26d1f2cf9893d22e8001066d17cbf763014def308c787cad99 SHA512 3328fdd1dc68198464db9730005254454691ac8f4fbdd76dc09eb21c12f21fcd011ce7fb6cb1ce06262eb79fcc3c43abddd2314bdc64e2022fc8e5bb58360a85
diff --git a/net-analyzer/sancp/files/sancp-1.6.1-compiler.patch b/net-analyzer/sancp/files/sancp-1.6.1-compiler.patch
index d7816cbdd5de..5b4391d79ddc 100644
--- a/net-analyzer/sancp/files/sancp-1.6.1-compiler.patch
+++ b/net-analyzer/sancp/files/sancp-1.6.1-compiler.patch
@@ -1,5 +1,5 @@
---- a/Makefile	2004-01-19 23:04:56.000000000 +0100
-+++ b/Makefile	2010-09-15 02:02:26.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -1,26 +1,26 @@
  
  # !!! Uncomment this CFLAGS for a small binary !!!
diff --git a/net-analyzer/sancp/files/sancp-1.6.1-extern.patch b/net-analyzer/sancp/files/sancp-1.6.1-extern.patch
new file mode 100644
index 000000000000..c046f1eb4971
--- /dev/null
+++ b/net-analyzer/sancp/files/sancp-1.6.1-extern.patch
@@ -0,0 +1,18 @@
+--- a/sancp.cc
++++ b/sancp.cc
+@@ -54,7 +54,6 @@
+  *************/
+ 
+ int main(int argc, char *argv[]) {
+-	extern struct gvars gVars;
+ 	int cKey;
+ 	pid_t pid=0;
+ 
+@@ -274,7 +273,6 @@
+ 
+ extern "C" void ProcessMyPacket(char *user, struct pcap_pkthdr * pkthdr, u_char * pkt)
+ {
+-	extern struct gvars gVars;
+ 	CBuffer *buffer;
+ 	struct cnx *new_cnx=0;
+         gVars.timeptr.tv_sec=pkthdr->ts.tv_sec;
diff --git a/net-analyzer/sancp/sancp-1.6.1-r4.ebuild b/net-analyzer/sancp/sancp-1.6.1-r4.ebuild
index 4f1bfd0b4e9f..686e16f2ea80 100644
--- a/net-analyzer/sancp/sancp-1.6.1-r4.ebuild
+++ b/net-analyzer/sancp/sancp-1.6.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils toolchain-funcs user
 
 DESCRIPTION="collect network traffic statistics and store them in pcap format"
-HOMEPAGE="http://www.metre.net/sancp.html"
+HOMEPAGE="https://sourceforge.net/projects/sancp/"
 SRC_URI="
 	http://www.metre.net/files/${P}.tar.gz
 	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.a.patch
diff --git a/net-analyzer/sancp/sancp-1.6.1-r5.ebuild b/net-analyzer/sancp/sancp-1.6.1-r5.ebuild
new file mode 100644
index 000000000000..543e814ff1d0
--- /dev/null
+++ b/net-analyzer/sancp/sancp-1.6.1-r5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs user
+
+DESCRIPTION="collect network traffic statistics and store them in pcap format"
+HOMEPAGE="https://sourceforge.net/projects/sancp/"
+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 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sguil"
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	enewgroup sancp
+	enewuser sancp -1 -1 /dev/null sancp
+}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-compiler.patch
+	"${FILESDIR}"/${PN}-1.6.1-gcc6.patch
+	"${FILESDIR}"/${PN}-1.6.1-extern.patch
+)
+
+src_prepare() {
+	eapply "${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch
+	eapply "${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch
+	# bug 138337
+	eapply "${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch
+	eapply "${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch
+	default
+}
+
+src_compile() {
+	tc-export CC CXX
+	emake CFLAGS="${CXXFLAGS}"
+}
+
+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
+
+	dobin 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
+}