Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/driftnet/, net-analyzer/driftnet/files/
Date: Fri, 25 Sep 2020 16:10:22
Message-Id: 1601050195.634a58c17ef7d17ad11ced70a9830d136fc8e960.mgorny@gentoo
1 commit: 634a58c17ef7d17ad11ced70a9830d136fc8e960
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 25 16:09:17 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 25 16:09:55 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=634a58c1
7
8 net-analyzer/driftnet: [QA] Revert "Version 1.3.0" & followup
9
10 CI warnings not being honored.
11
12 Reverts: 37bf177bef033402eebf2c00061319191efb8806
13 Reverts: 60574622dfb711016fdabba9deec135d77157485
14 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
15
16 net-analyzer/driftnet/Manifest | 1 -
17 net-analyzer/driftnet/driftnet-1.3.0.ebuild | 67 ----------------------
18 .../driftnet/files/driftnet-1.3.0-CFLAGS.patch | 21 -------
19 .../driftnet/files/driftnet-1.3.0-gtk.patch | 13 -----
20 4 files changed, 102 deletions(-)
21
22 diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest
23 index 64dfbfd5032..bfbea558151 100644
24 --- a/net-analyzer/driftnet/Manifest
25 +++ b/net-analyzer/driftnet/Manifest
26 @@ -1,2 +1 @@
27 DIST driftnet-0.1.6_p20090401.tar.gz 43683 BLAKE2B a3f5c57c5f57247feca37815b84630422f9fdb9ec978791eadaaf0f0b51d1f744674931ea9bb1b9291fc9e556ec9758ff44210a442d219ceeabf71e0ea3a193f SHA512 93b2f7b644603bf2fea09163c3c8cc6eed7ed61f3ad7f6770a754e1a31afde5a75e27464c399261bfdafbe37729f201e6bbcb06bb6c59bf52ac0ede4393a15fa
28 -DIST driftnet-1.3.0.tar.gz 4971618 BLAKE2B 1cf0a46caac2267c093bf21a0d8e150518dbfe0e76acbe21ef87cd760ccbe964313116ee24d25ad7759b3eeba19ef7925200caee4fd06bb28f9836217d889256 SHA512 45f1016a850cf9e5e294756e47e40eccb13f57a316ae7fa885eac2d5e53f68b9d9ef86868415eca76b108f7aa1f4080c550a91f789265edb0f6e3a55e05f5f0c
29
30 diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
31 deleted file mode 100644
32 index a53b4a5dedf..00000000000
33 --- a/net-analyzer/driftnet/driftnet-1.3.0.ebuild
34 +++ /dev/null
35 @@ -1,67 +0,0 @@
36 -# Copyright 1999-2020 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=7
40 -inherit autotools fcaps toolchain-funcs
41 -
42 -DESCRIPTION="Watches network traffic and displays media from TCP streams observed"
43 -HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
44 -SRC_URI="https://github.com/deiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
45 -
46 -LICENSE="GPL-2"
47 -KEYWORDS="~amd64 ~arm64 -sparc ~x86"
48 -SLOT="0"
49 -IUSE="debug gtk suid test"
50 -
51 -RDEPEND="
52 - net-libs/libpcap
53 - net-libs/libwebsockets:=[client,http-proxy,socks5]
54 - gtk? (
55 - media-libs/giflib:=
56 - media-libs/libpng:=
57 - virtual/jpeg:0
58 - x11-libs/gtk+:2
59 - )
60 -"
61 -BDEPEND="
62 - virtual/pkgconfig
63 -"
64 -DEPEND="
65 - ${RDEPEND}
66 - test? ( dev-util/cmocka )
67 -"
68 -DOCS="
69 - Changelog CREDITS README.md TODO
70 -"
71 -PATCHES=(
72 - "${FILESDIR}"/${PN}-1.3.0-CFLAGS.patch
73 - "${FILESDIR}"/${PN}-1.3.0-gtk.patch
74 -)
75 -
76 -src_prepare() {
77 - default
78 - eautoreconf
79 -}
80 -
81 -src_configure() {
82 - econf $(use_enable gtk display)
83 -}
84 -
85 -src_install() {
86 - default
87 -
88 - gzip -d "${ED}"/usr/share/man/man1/${PN}.1.gz || die
89 -
90 - if use suid ; then
91 - elog "marking the no-display driftnet as setuid root."
92 - fowners root:wheel "/usr/bin/driftnet"
93 - fperms 710 "/usr/bin/driftnet"
94 - fperms u+s "/usr/bin/driftnet"
95 - fi
96 -}
97 -
98 -pkg_postinst() {
99 - fcaps \
100 - cap_dac_read_search,cap_net_raw,cap_net_admin \
101 - "${EROOT}"/usr/bin/driftnet
102 -}
103
104 diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch
105 deleted file mode 100644
106 index 2b25ed45833..00000000000
107 --- a/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch
108 +++ /dev/null
109 @@ -1,21 +0,0 @@
110 ---- a/configure.ac
111 -+++ b/configure.ac
112 -@@ -68,12 +68,12 @@
113 - ,
114 - [enable_debug=yes])
115 -
116 --if test "x$enable_debug" = xyes; then
117 -- CFLAGS="-O2 -g -DDEBUG"
118 --else
119 -- CFLAGS="-O2 -DNDEBUG"
120 --fi
121 --#AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
122 -+#if test "x$enable_debug" = xyes; then
123 -+# CFLAGS="-O2 -g -DDEBUG"
124 -+#else
125 -+# CFLAGS="-O2 -DNDEBUG"
126 -+#fi
127 -+AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
128 -
129 - #
130 - # Checks for programs.
131
132 diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch
133 deleted file mode 100644
134 index 2a8a294e8db..00000000000
135 --- a/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch
136 +++ /dev/null
137 @@ -1,13 +0,0 @@
138 ---- a/src/options.h
139 -+++ b/src/options.h
140 -@@ -32,10 +32,8 @@
141 - char *audio_mpeg_player;
142 - int mpeg_player_specified;
143 - int newpfx;
144 --#ifndef NO_DISPLAY_WINDOW
145 - char *savedimgpfx;
146 - int enable_gtk_display;
147 --#endif
148 - char *drop_username;
149 - int list_interfaces;
150 - int monitor_mode;