[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sancp/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sancp/

[Jeroen Roovers]

commit:     be28e73c8f778ed0db5f9809853865466df565dd
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 08:34:34 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon May 29 08:34:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be28e73c

net-analyzer/sancp: Fix DESCRIPTION.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/sancp/sancp-1.6.1-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/sancp/sancp-1.6.1-r4.ebuild b/net-analyzer/sancp/sancp-1.6.1-r4.ebuild
index fda9168f38c..aa665e1ec71 100644
--- a/net-analyzer/sancp/sancp-1.6.1-r4.ebuild
+++ b/net-analyzer/sancp/sancp-1.6.1-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 inherit eutils toolchain-funcs user
 
-DESCRIPTION="collect statistical information regarding network traffic and collect it in pcap format"
+DESCRIPTION="collect network traffic statistics and store them in pcap format"
 HOMEPAGE="http://www.metre.net/sancp.html"
 SRC_URI="
 	http://www.metre.net/files/${P}.tar.gz

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sancp/

[Jeroen Roovers]

commit:     854fb8510ec9d9a44683dd3768b06eae6804eb32
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 08:06:19 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 08:08:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854fb851

net-analyzer/sancp: Update HOMEPAGE

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Closes: https://bugs.gentoo.org/738086
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/sancp/sancp-1.6.1-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/sancp/sancp-1.6.1-r4.ebuild b/net-analyzer/sancp/sancp-1.6.1-r4.ebuild
index 4f1bfd0b4e9..686e16f2ea8 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

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sancp/

[Jeroen Roovers]

commit:     c78b7ad4cf91fb8c321cf5467ee9e086ad2382e4
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 27 13:43:00 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 13:47:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c78b7ad4

net-analyzer/sancp: Old

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/sancp/sancp-1.6.1-r4.ebuild | 69 --------------------------------
 1 file changed, 69 deletions(-)

diff --git a/net-analyzer/sancp/sancp-1.6.1-r4.ebuild b/net-analyzer/sancp/sancp-1.6.1-r4.ebuild
deleted file mode 100644
index 686e16f2ea8..00000000000
--- a/net-analyzer/sancp/sancp-1.6.1-r4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils 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
-}
-
-src_prepare() {
-	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
-	epatch "${FILESDIR}"/${P}-compiler.patch
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-
-	tc-export CXX CC
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sancp/

[David Seifert]

commit:     610f1d4c7b272ad5e6fd42c8f97188262c2a85d2
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  3 15:29:35 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct  3 15:29:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=610f1d4c

net-analyzer/sancp: [QA] Port to GLEP 81

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../sancp/{sancp-1.6.1-r5.ebuild => sancp-1.6.1-r6.ebuild}   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/sancp/sancp-1.6.1-r5.ebuild b/net-analyzer/sancp/sancp-1.6.1-r6.ebuild
similarity index 92%
rename from net-analyzer/sancp/sancp-1.6.1-r5.ebuild
rename to net-analyzer/sancp/sancp-1.6.1-r6.ebuild
index 543e814ff1d..be00f2204c5 100644
--- a/net-analyzer/sancp/sancp-1.6.1-r5.ebuild
+++ b/net-analyzer/sancp/sancp-1.6.1-r6.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs user
+
+inherit toolchain-funcs
 
 DESCRIPTION="collect network traffic statistics and store them in pcap format"
 HOMEPAGE="https://sourceforge.net/projects/sancp/"
@@ -19,13 +20,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="sguil"
 
-RDEPEND="net-libs/libpcap"
+RDEPEND="
+	acct-group/sancp
+	acct-user/sancp
+	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

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sancp/

[Ulrich Müller]

commit:     6e544c64f4acc1df8f6e1ccb5789f35807ff45f3
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed May 12 10:58:52 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu May 13 16:12:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e544c64

net-analyzer/sancp: Update LICENSE

QPL and QPL-1.0 are duplicates.

Bug: https://bugs.gentoo.org/789666
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-analyzer/sancp/{sancp-1.6.1-r6.ebuild => sancp-1.6.1-r7.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/sancp/sancp-1.6.1-r6.ebuild b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
similarity index 95%
rename from net-analyzer/sancp/sancp-1.6.1-r6.ebuild
rename to net-analyzer/sancp/sancp-1.6.1-r7.ebuild
index be00f2204c5..e18588995cb 100644
--- a/net-analyzer/sancp/sancp-1.6.1-r6.ebuild
+++ b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="
 	http://sancp.sourceforge.net/${PN}-1.6.1.fix200606.d.patch
 "
 
-LICENSE="QPL GPL-2"
+LICENSE="QPL-1.0 GPL-2"     # GPL-2 for init script
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="sguil"

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sancp/

[Sam James]

commit:     fda0cd2b9a57ef7e4d8e6e44bbf1d675ccb0feea
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  6 09:09:53 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb  6 09:12:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fda0cd2b

net-analyzer/sancp: fix musl build

Closes: https://bugs.gentoo.org/832421
CLoses: https://bugs.gentoo.org/714662
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/sancp/Manifest              |  1 +
 net-analyzer/sancp/sancp-1.6.1-r7.ebuild | 24 ++++++++++--------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/net-analyzer/sancp/Manifest b/net-analyzer/sancp/Manifest
index 5334b6da520f..82188b274820 100644
--- a/net-analyzer/sancp/Manifest
+++ b/net-analyzer/sancp/Manifest
@@ -1,3 +1,4 @@
+DIST sancp-1.6.1-musl.patch.bz2 7013 BLAKE2B a54c3a3c45b1029a95451a21de2b42497434dff6715cb173db5f04293740f3e03869900e23c571dae97a563a9b7fdce76c4295f3267857a77a074a65e79f3b53 SHA512 3310577acef1d16b87b51924ed6fbb82b491afc5646555667fcd2430aef1b0dd5f0ee510c6356eebd32402b79eb8e9f5032955b5194517acc0c055da8dd74fc2
 DIST sancp-1.6.1.fix200511.a.patch 662 BLAKE2B d3d5114662f3904db4052d581b3a95f07f5a492b439958bd64149ca6f9aaf48f2d2d9cf2094500b9ab829b3a06358180893637ed6d3f502ef46f87dfe8527ccc SHA512 87662d9ea863a3a2468b7b64c81a191d34c81348eab9374245a73d3ed63cf2f25df54561f092f3713d516d9cc4eb553d4d7286fd920676a301e61669a023142e
 DIST sancp-1.6.1.fix200511.b.patch 870 BLAKE2B 18ad38c37f11aa1c4804400db5475323db25e0c135d3478e9c81af3a0a3885f397521fdf9b58825216fdd16ec2e2616584f3dc9e175e76d64c7125a767b2c029 SHA512 a54bbec1ce3799f83c006f7375297bafee85b12a90361f1f5dbbf46c936193c7e0f1196483a2bdf560019e93ceffe9129b3c01322eedc397e5dfa3a1a6b76b81
 DIST sancp-1.6.1.fix200601.c.patch 3578 BLAKE2B 7c7e5ef0e1967d41f731d3c79f4273a4ebfc922159ada1940ba4635f6f82e63ed55faeffe53636d2c8fd96d57e1516211fff8852c73876d019fc13d59f4ace9d SHA512 3d15028d33e7dbddc74d8c6eefac6d66e357f024dca15afdfb8156b0cf969ab093c26baa43ebf7c1ac88f4275ef4bdc91c1cc69c5aa7b439a042ed966edea30f

diff --git a/net-analyzer/sancp/sancp-1.6.1-r7.ebuild b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
index e18588995cbb..f3ea7b0a3461 100644
--- a/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
+++ b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,15 +7,14 @@ inherit toolchain-funcs
 
 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
+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
-"
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.6.1-musl.patch.bz2"
 
-LICENSE="QPL-1.0 GPL-2"     # GPL-2 for init script
+LICENSE="QPL-1.0 GPL-2" # GPL-2 for init script
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="sguil"
@@ -27,20 +26,17 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
+	"${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch
+	"${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch
+	# bug 138337
+	"${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch
+	"${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch
 	"${FILESDIR}"/${PN}-1.6.1-compiler.patch
 	"${FILESDIR}"/${PN}-1.6.1-gcc6.patch
 	"${FILESDIR}"/${PN}-1.6.1-extern.patch
+	"${WORKDIR}"/${PN}-1.6.1-musl.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}"