1 |
commit: 28cc33c3d07f21aa30dd7a391864e7e1f81b8b47 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 16 04:54:26 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 16 05:33:12 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28cc33c3 |
7 |
|
8 |
net-analyzer/tcpdump: use live template |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
net-analyzer/tcpdump/tcpdump-4.99.0.ebuild | 19 ++++++++++++----- |
13 |
net-analyzer/tcpdump/tcpdump-9999.ebuild | 34 ++++++++++++++++++------------ |
14 |
2 files changed, 34 insertions(+), 19 deletions(-) |
15 |
|
16 |
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild |
17 |
index 03742866ec3..98642f21786 100644 |
18 |
--- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild |
19 |
+++ b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild |
20 |
@@ -7,18 +7,26 @@ inherit autotools |
21 |
|
22 |
DESCRIPTION="A tool for network monitoring and data acquisition" |
23 |
HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump" |
24 |
-SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz" |
25 |
-S="${WORKDIR}/${PN}-${P/_}" |
26 |
+ |
27 |
+if [[ ${PV} == *9999* ]] ; then |
28 |
+ inherit git-r3 |
29 |
+ |
30 |
+ EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump" |
31 |
+else |
32 |
+ SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz" |
33 |
+ S="${WORKDIR}/${PN}-${P/_}" |
34 |
+ |
35 |
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" |
36 |
+fi |
37 |
|
38 |
LICENSE="BSD" |
39 |
SLOT="0" |
40 |
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" |
41 |
IUSE="+drop-root libressl +smi +ssl +samba suid test" |
42 |
+REQUIRED_USE="test? ( samba )" |
43 |
+ |
44 |
# Assorted failures: bug #768498 |
45 |
RESTRICT="test" |
46 |
-REQUIRED_USE="test? ( samba )" |
47 |
|
48 |
-BDEPEND="drop-root? ( virtual/pkgconfig )" |
49 |
RDEPEND=" |
50 |
net-libs/libpcap |
51 |
drop-root? ( |
52 |
@@ -43,6 +51,7 @@ DEPEND=" |
53 |
dev-lang/perl |
54 |
) |
55 |
" |
56 |
+BDEPEND="drop-root? ( virtual/pkgconfig )" |
57 |
|
58 |
PATCHES=( |
59 |
"${FILESDIR}"/${PN}-9999-libdir.patch |
60 |
|
61 |
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild |
62 |
index 17c0eed4bfe..db5f72d97ac 100644 |
63 |
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild |
64 |
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild |
65 |
@@ -3,22 +3,30 @@ |
66 |
|
67 |
EAPI=7 |
68 |
|
69 |
-inherit autotools git-r3 |
70 |
+inherit autotools |
71 |
|
72 |
DESCRIPTION="A tool for network monitoring and data acquisition" |
73 |
-HOMEPAGE=" |
74 |
- https://www.tcpdump.org/ |
75 |
- https://github.com/the-tcpdump-group/tcpdump |
76 |
-" |
77 |
-EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump" |
78 |
+HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump" |
79 |
+ |
80 |
+if [[ ${PV} == *9999* ]] ; then |
81 |
+ inherit git-r3 |
82 |
+ |
83 |
+ EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump" |
84 |
+else |
85 |
+ SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz" |
86 |
+ S="${WORKDIR}/${PN}-${P/_}" |
87 |
+ |
88 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
89 |
+fi |
90 |
|
91 |
LICENSE="BSD" |
92 |
SLOT="0" |
93 |
IUSE="+drop-root libressl +smi +ssl +samba suid test" |
94 |
- |
95 |
-RESTRICT="!test? ( test )" |
96 |
REQUIRED_USE="test? ( samba )" |
97 |
|
98 |
+# Assorted failures: bug #768498 |
99 |
+RESTRICT="test" |
100 |
+ |
101 |
RDEPEND=" |
102 |
net-libs/libpcap |
103 |
drop-root? ( |
104 |
@@ -36,9 +44,6 @@ RDEPEND=" |
105 |
acct-user/pcap |
106 |
) |
107 |
" |
108 |
-BDEPEND=" |
109 |
- drop-root? ( virtual/pkgconfig ) |
110 |
-" |
111 |
DEPEND=" |
112 |
${RDEPEND} |
113 |
test? ( |
114 |
@@ -46,13 +51,14 @@ DEPEND=" |
115 |
dev-lang/perl |
116 |
) |
117 |
" |
118 |
+BDEPEND="drop-root? ( virtual/pkgconfig )" |
119 |
+ |
120 |
PATCHES=( |
121 |
"${FILESDIR}"/${PN}-9999-libdir.patch |
122 |
) |
123 |
|
124 |
src_prepare() { |
125 |
default |
126 |
- |
127 |
eautoreconf |
128 |
} |
129 |
|
130 |
@@ -67,7 +73,7 @@ src_configure() { |
131 |
} |
132 |
|
133 |
src_test() { |
134 |
- if [[ ${EUID} -ne 0 ]] || ! use drop-root; then |
135 |
+ if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then |
136 |
emake check |
137 |
else |
138 |
ewarn "If you want to run the test suite, make sure you either" |
139 |
@@ -81,7 +87,7 @@ src_install() { |
140 |
dodoc *.awk |
141 |
dodoc CHANGES CREDITS README.md |
142 |
|
143 |
- if use suid; then |
144 |
+ if use suid ; then |
145 |
fowners root:pcap /usr/sbin/tcpdump |
146 |
fperms 4110 /usr/sbin/tcpdump |
147 |
fi |