* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/driftnet/, net-analyzer/driftnet/files/
@ 2020-09-25 14:14 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2020-09-25 14:14 UTC (permalink / raw
To: gentoo-commits
commit: 37bf177bef033402eebf2c00061319191efb8806
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 14:11:48 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 14:14:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37bf177b
net-analyzer/driftnet: Version 1.3.0
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/driftnet/Manifest | 1 +
net-analyzer/driftnet/driftnet-1.3.0.ebuild | 66 ++++++++++++++++++++++
.../driftnet/files/driftnet-1.3.0-CFLAGS.patch | 21 +++++++
3 files changed, 88 insertions(+)
diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest
index bfbea558151..64dfbfd5032 100644
--- a/net-analyzer/driftnet/Manifest
+++ b/net-analyzer/driftnet/Manifest
@@ -1 +1,2 @@
DIST driftnet-0.1.6_p20090401.tar.gz 43683 BLAKE2B a3f5c57c5f57247feca37815b84630422f9fdb9ec978791eadaaf0f0b51d1f744674931ea9bb1b9291fc9e556ec9758ff44210a442d219ceeabf71e0ea3a193f SHA512 93b2f7b644603bf2fea09163c3c8cc6eed7ed61f3ad7f6770a754e1a31afde5a75e27464c399261bfdafbe37729f201e6bbcb06bb6c59bf52ac0ede4393a15fa
+DIST driftnet-1.3.0.tar.gz 4971618 BLAKE2B 1cf0a46caac2267c093bf21a0d8e150518dbfe0e76acbe21ef87cd760ccbe964313116ee24d25ad7759b3eeba19ef7925200caee4fd06bb28f9836217d889256 SHA512 45f1016a850cf9e5e294756e47e40eccb13f57a316ae7fa885eac2d5e53f68b9d9ef86868415eca76b108f7aa1f4080c550a91f789265edb0f6e3a55e05f5f0c
diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
new file mode 100644
index 00000000000..7db19300b14
--- /dev/null
+++ b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools fcaps toolchain-funcs
+
+DESCRIPTION="Watches network traffic and displays media from TCP streams observed"
+HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
+SRC_URI="https://github.com/deiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 -sparc ~x86"
+SLOT="0"
+IUSE="debug gtk suid test"
+
+RDEPEND="
+ net-libs/libpcap
+ net-libs/libwebsockets:=[client,http-proxy,socks5]
+ gtk? (
+ media-libs/giflib:=
+ media-libs/libpng:=
+ virtual/jpeg:0
+ x11-libs/gtk+:2
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-util/cmocka )
+"
+DOCS="
+ Changelog CREDITS README.md TODO
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.0-CFLAGS.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable gtk display)
+}
+
+src_install() {
+ default
+
+ gzip -d "${ED}"/usr/share/man/man1/${PN}.1.gz || die
+
+ if use suid ; then
+ elog "marking the no-display driftnet as setuid root."
+ fowners root:wheel "/usr/bin/driftnet"
+ fperms 710 "/usr/bin/driftnet"
+ fperms u+s "/usr/bin/driftnet"
+ fi
+}
+
+pkg_postinst() {
+ fcaps \
+ cap_dac_read_search,cap_net_raw,cap_net_admin \
+ "${EROOT}"/usr/bin/driftnet
+}
diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch
new file mode 100644
index 00000000000..2b25ed45833
--- /dev/null
+++ b/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,12 +68,12 @@
+ ,
+ [enable_debug=yes])
+
+-if test "x$enable_debug" = xyes; then
+- CFLAGS="-O2 -g -DDEBUG"
+-else
+- CFLAGS="-O2 -DNDEBUG"
+-fi
+-#AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
++#if test "x$enable_debug" = xyes; then
++# CFLAGS="-O2 -g -DDEBUG"
++#else
++# CFLAGS="-O2 -DNDEBUG"
++#fi
++AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
+
+ #
+ # Checks for programs.
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/driftnet/, net-analyzer/driftnet/files/
@ 2020-09-25 14:56 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2020-09-25 14:56 UTC (permalink / raw
To: gentoo-commits
commit: 60574622dfb711016fdabba9deec135d77157485
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 14:56:25 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 14:56:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60574622
net-analyzer/driftnet: Fix building with USE=-gtk
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Closes: https://bugs.gentoo.org/744670
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/driftnet/driftnet-1.3.0.ebuild | 1 +
net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch | 13 +++++++++++++
2 files changed, 14 insertions(+)
diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
index 7db19300b14..a53b4a5dedf 100644
--- a/net-analyzer/driftnet/driftnet-1.3.0.ebuild
+++ b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
@@ -35,6 +35,7 @@ DOCS="
"
PATCHES=(
"${FILESDIR}"/${PN}-1.3.0-CFLAGS.patch
+ "${FILESDIR}"/${PN}-1.3.0-gtk.patch
)
src_prepare() {
diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch
new file mode 100644
index 00000000000..2a8a294e8db
--- /dev/null
+++ b/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch
@@ -0,0 +1,13 @@
+--- a/src/options.h
++++ b/src/options.h
+@@ -32,10 +32,8 @@
+ char *audio_mpeg_player;
+ int mpeg_player_specified;
+ int newpfx;
+-#ifndef NO_DISPLAY_WINDOW
+ char *savedimgpfx;
+ int enable_gtk_display;
+-#endif
+ char *drop_username;
+ int list_interfaces;
+ int monitor_mode;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/driftnet/, net-analyzer/driftnet/files/
@ 2020-09-25 16:10 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2020-09-25 16:10 UTC (permalink / raw
To: gentoo-commits
commit: 634a58c17ef7d17ad11ced70a9830d136fc8e960
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 16:09:17 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 16:09:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=634a58c1
net-analyzer/driftnet: [QA] Revert "Version 1.3.0" & followup
CI warnings not being honored.
Reverts: 37bf177bef033402eebf2c00061319191efb8806
Reverts: 60574622dfb711016fdabba9deec135d77157485
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
net-analyzer/driftnet/Manifest | 1 -
net-analyzer/driftnet/driftnet-1.3.0.ebuild | 67 ----------------------
.../driftnet/files/driftnet-1.3.0-CFLAGS.patch | 21 -------
.../driftnet/files/driftnet-1.3.0-gtk.patch | 13 -----
4 files changed, 102 deletions(-)
diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest
index 64dfbfd5032..bfbea558151 100644
--- a/net-analyzer/driftnet/Manifest
+++ b/net-analyzer/driftnet/Manifest
@@ -1,2 +1 @@
DIST driftnet-0.1.6_p20090401.tar.gz 43683 BLAKE2B a3f5c57c5f57247feca37815b84630422f9fdb9ec978791eadaaf0f0b51d1f744674931ea9bb1b9291fc9e556ec9758ff44210a442d219ceeabf71e0ea3a193f SHA512 93b2f7b644603bf2fea09163c3c8cc6eed7ed61f3ad7f6770a754e1a31afde5a75e27464c399261bfdafbe37729f201e6bbcb06bb6c59bf52ac0ede4393a15fa
-DIST driftnet-1.3.0.tar.gz 4971618 BLAKE2B 1cf0a46caac2267c093bf21a0d8e150518dbfe0e76acbe21ef87cd760ccbe964313116ee24d25ad7759b3eeba19ef7925200caee4fd06bb28f9836217d889256 SHA512 45f1016a850cf9e5e294756e47e40eccb13f57a316ae7fa885eac2d5e53f68b9d9ef86868415eca76b108f7aa1f4080c550a91f789265edb0f6e3a55e05f5f0c
diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
deleted file mode 100644
index a53b4a5dedf..00000000000
--- a/net-analyzer/driftnet/driftnet-1.3.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools fcaps toolchain-funcs
-
-DESCRIPTION="Watches network traffic and displays media from TCP streams observed"
-HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
-SRC_URI="https://github.com/deiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 -sparc ~x86"
-SLOT="0"
-IUSE="debug gtk suid test"
-
-RDEPEND="
- net-libs/libpcap
- net-libs/libwebsockets:=[client,http-proxy,socks5]
- gtk? (
- media-libs/giflib:=
- media-libs/libpng:=
- virtual/jpeg:0
- x11-libs/gtk+:2
- )
-"
-BDEPEND="
- virtual/pkgconfig
-"
-DEPEND="
- ${RDEPEND}
- test? ( dev-util/cmocka )
-"
-DOCS="
- Changelog CREDITS README.md TODO
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.0-CFLAGS.patch
- "${FILESDIR}"/${PN}-1.3.0-gtk.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable gtk display)
-}
-
-src_install() {
- default
-
- gzip -d "${ED}"/usr/share/man/man1/${PN}.1.gz || die
-
- if use suid ; then
- elog "marking the no-display driftnet as setuid root."
- fowners root:wheel "/usr/bin/driftnet"
- fperms 710 "/usr/bin/driftnet"
- fperms u+s "/usr/bin/driftnet"
- fi
-}
-
-pkg_postinst() {
- fcaps \
- cap_dac_read_search,cap_net_raw,cap_net_admin \
- "${EROOT}"/usr/bin/driftnet
-}
diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch
deleted file mode 100644
index 2b25ed45833..00000000000
--- a/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -68,12 +68,12 @@
- ,
- [enable_debug=yes])
-
--if test "x$enable_debug" = xyes; then
-- CFLAGS="-O2 -g -DDEBUG"
--else
-- CFLAGS="-O2 -DNDEBUG"
--fi
--#AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
-+#if test "x$enable_debug" = xyes; then
-+# CFLAGS="-O2 -g -DDEBUG"
-+#else
-+# CFLAGS="-O2 -DNDEBUG"
-+#fi
-+AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
-
- #
- # Checks for programs.
diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch
deleted file mode 100644
index 2a8a294e8db..00000000000
--- a/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/options.h
-+++ b/src/options.h
-@@ -32,10 +32,8 @@
- char *audio_mpeg_player;
- int mpeg_player_specified;
- int newpfx;
--#ifndef NO_DISPLAY_WINDOW
- char *savedimgpfx;
- int enable_gtk_display;
--#endif
- char *drop_username;
- int list_interfaces;
- int monitor_mode;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/driftnet/, net-analyzer/driftnet/files/
@ 2022-02-16 3:22 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-02-16 3:22 UTC (permalink / raw
To: gentoo-commits
commit: 3220c59fa39743e8ed6787c2a33faf474ab0fba6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 03:21:38 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 03:22:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3220c59f
net-analyzer/driftnet: fix build on musl
Closes: https://bugs.gentoo.org/832419
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/driftnet/driftnet-1.3.0.ebuild | 3 +-
.../files/driftnet-1.3.0-musl-stdint.patch | 113 +++++++++++++++++++++
2 files changed, 115 insertions(+), 1 deletion(-)
diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
index 9134806f0c99..3d2fa78cc783 100644
--- a/net-analyzer/driftnet/driftnet-1.3.0.ebuild
+++ b/net-analyzer/driftnet/driftnet-1.3.0.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
@@ -38,6 +38,7 @@ DOCS="
PATCHES=(
"${FILESDIR}"/${PN}-1.3.0-CFLAGS.patch
"${FILESDIR}"/${PN}-1.3.0-gtk.patch
+ "${FILESDIR}"/${PN}-1.3.0-musl-stdint.patch
)
src_prepare() {
diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch
new file mode 100644
index 000000000000..7261bbc80e16
--- /dev/null
+++ b/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch
@@ -0,0 +1,113 @@
+https://bugs.gentoo.org/832419
+--- a/src/media/image.c
++++ b/src/media/image.c
+@@ -11,6 +11,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h> /* On many systems (Darwin...), stdio.h is a prerequisite. */
++#include <stdint.h>
+ #include <string.h>
+
+ #include <netinet/in.h> /* ntohl */
+@@ -288,7 +289,7 @@ unsigned char *find_jpeg_image(const unsigned char *data, const size_t len, unsi
+ unsigned char *find_png_eoi(unsigned char *buffer, const size_t len) {
+ unsigned char *end_data, *data, chunk_code[PNG_CODE_LEN + 1];
+ struct png_chunk chunk;
+- u_int32_t datalen;
++ uint32_t datalen;
+
+ /* Move past the PNG header */
+ data = (buffer + PNG_SIG_LEN);
+--- a/src/network/layer2.c
++++ b/src/network/layer2.c
+@@ -12,6 +12,7 @@
+
+ #include "compat/compat.h"
+
++#include <stdint.h>
+ #include <string.h>
+
+ #ifdef __FreeBSD__
+@@ -39,7 +40,7 @@
+ struct ethhdr {
+ unsigned char h_dest[ETH_ALEN];
+ unsigned char h_source[ETH_ALEN];
+- u_int16_t h_proto;
++ uint16_t h_proto;
+ } __attribute__((packed));
+ #endif
+
+@@ -55,20 +56,20 @@ struct ethhdr {
+ #endif
+
+ struct ieee80211_radiotap_header {
+- u_int8_t it_version; /* set to 0 */
+- u_int8_t it_pad;
+- u_int16_t it_len; /* entire length */
+- u_int32_t it_present; /* fields present */
++ uint8_t it_version; /* set to 0 */
++ uint8_t it_pad;
++ uint16_t it_len; /* entire length */
++ uint32_t it_present; /* fields present */
+ };
+
+ struct ieee80211_frame {
+- u_int16_t fc;
+- u_int16_t wi_duration;
+- u_int8_t wi_add1[6];
+- u_int8_t wi_add2[6];
+- u_int8_t wi_add3[6];
+- u_int16_t wi_sequenceControl;
+- // u_int8_t wi_add4[6];
++ uint16_t fc;
++ uint16_t wi_duration;
++ uint8_t wi_add1[6];
++ uint8_t wi_add2[6];
++ uint8_t wi_add3[6];
++ uint16_t wi_sequenceControl;
++ // uint8_t wi_add4[6];
+ //unsigned int qosControl:2;
+ //unsigned int frameBody[23124];
+ };
+@@ -89,13 +90,13 @@ struct frame_control {
+
+ /* SNAP LLC header format */
+ struct snap_header {
+- u_int8_t dsap;
+- u_int8_t ssap;
+- u_int8_t ctl;
+- u_int8_t org1;
+- u_int8_t org2;
+- u_int8_t org3;
+- u_int16_t ether_type; /* ethernet type */
++ uint8_t dsap;
++ uint8_t ssap;
++ uint8_t ctl;
++ uint8_t org1;
++ uint8_t org2;
++ uint8_t org3;
++ uint16_t ether_type; /* ethernet type */
+ };
+
+ /*
+--- a/src/network/layer3.c
++++ b/src/network/layer3.c
+@@ -12,6 +12,7 @@
+
+ #include "compat/compat.h"
+
++#include <stdint.h>
+ #include <string.h>
+ #include <assert.h>
+
+@@ -30,8 +31,8 @@
+ int layer3_find_tcp(const u_char *pkt, uint8_t nextproto, int * offset,
+ struct sockaddr * src, struct sockaddr * dst, struct tcphdr * tcp)
+ {
+- u_int16_t *sport = NULL;
+- u_int16_t *dport = NULL;
++ uint16_t *sport = NULL;
++ uint16_t *dport = NULL;
+
+ while (1) {
+ switch (nextproto) {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-16 3:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-25 16:10 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/driftnet/, net-analyzer/driftnet/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2022-02-16 3:22 Sam James
2020-09-25 14:56 Jeroen Roovers
2020-09-25 14:14 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox