1 |
commit: 416d9a6613ba91327f6e372476aefd5ca5408ef4 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 30 09:20:08 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 30 09:20:08 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=416d9a66 |
7 |
|
8 |
net-analyzer/fprobe: update EAPI 6 -> 8 |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch | 11 ++++------- |
13 |
.../{fprobe-1.1-r4.ebuild => fprobe-1.1-r5.ebuild} | 20 +++++++------------- |
14 |
2 files changed, 11 insertions(+), 20 deletions(-) |
15 |
|
16 |
diff --git a/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch b/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch |
17 |
index 803a2a9ce43a..948c6fee29c1 100644 |
18 |
--- a/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch |
19 |
+++ b/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch |
20 |
@@ -4,15 +4,12 @@ Signed-off-by: Robin H. Johnson <robbat2@g.o> |
21 |
|
22 |
--- a/src/fprobe.c |
23 |
+++ b/src/fprobe.c |
24 |
-@@ -1541,10 +1541,10 @@ |
25 |
- } |
26 |
- |
27 |
+@@ -1543,7 +1543,7 @@ |
28 |
if (pw) { |
29 |
- if (setgroups(0, NULL) < 0) { |
30 |
- my_log(LOG_CRIT, "setgroups: %s", strerror(errno)); |
31 |
+ if (setgroups(0, NULL) < 0) { |
32 |
+ my_log(LOG_CRIT, "setgroups: %s", strerror(errno)); |
33 |
- exit(1); |
34 |
+ //exit(1); |
35 |
- } |
36 |
+ } |
37 |
if (setregid(pw->pw_gid, pw->pw_gid)) { |
38 |
my_log(LOG_CRIT, "setregid(%u): %s", pw->pw_gid, strerror(errno)); |
39 |
- exit(1); |
40 |
|
41 |
diff --git a/net-analyzer/fprobe/fprobe-1.1-r4.ebuild b/net-analyzer/fprobe/fprobe-1.1-r5.ebuild |
42 |
similarity index 83% |
43 |
rename from net-analyzer/fprobe/fprobe-1.1-r4.ebuild |
44 |
rename to net-analyzer/fprobe/fprobe-1.1-r5.ebuild |
45 |
index 76646bcf6a10..1aee1c4aa4f3 100644 |
46 |
--- a/net-analyzer/fprobe/fprobe-1.1-r4.ebuild |
47 |
+++ b/net-analyzer/fprobe/fprobe-1.1-r5.ebuild |
48 |
@@ -1,24 +1,20 @@ |
49 |
-# Copyright 1999-2021 Gentoo Authors |
50 |
+# Copyright 1999-2022 Gentoo Authors |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
|
53 |
-EAPI=6 |
54 |
+EAPI=8 |
55 |
|
56 |
DESCRIPTION="libpcap-based tool to collect network traffic data and emit it as NetFlow flows" |
57 |
HOMEPAGE="http://fprobe.sourceforge.net" |
58 |
-LICENSE="GPL-2" |
59 |
- |
60 |
SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2" |
61 |
+ |
62 |
+LICENSE="GPL-2" |
63 |
SLOT="0" |
64 |
KEYWORDS="amd64 ppc x86" |
65 |
- |
66 |
IUSE="debug messages" |
67 |
|
68 |
-DEPEND=" |
69 |
- net-libs/libpcap |
70 |
-" |
71 |
-RDEPEND=" |
72 |
- ${DEPEND} |
73 |
-" |
74 |
+RDEPEND="net-libs/libpcap" |
75 |
+DEPEND="${RDEPEND}" |
76 |
+ |
77 |
PATCHES=( |
78 |
"${FILESDIR}"/fprobe-1.1-pidfile-sanity.patch |
79 |
"${FILESDIR}"/fprobe-1.1-setgroups.patch |
80 |
@@ -30,8 +26,6 @@ src_configure() { |
81 |
$(use_enable messages) |
82 |
} |
83 |
|
84 |
-DOCS=( AUTHORS NEWS README TODO ) |
85 |
- |
86 |
src_install() { |
87 |
default |