Received: by mail.netbsd.org (Postfix, from userid 605) id DB44E84D20; Mon, 20 Jan 2020 02:47:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5D51D84D04 for ; Mon, 20 Jan 2020 02:47:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id s7DVjGPXwfkX for ; Mon, 20 Jan 2020 02:47:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 04EA484CDA for ; Mon, 20 Jan 2020 02:47:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EDAA8FBF4; Mon, 20 Jan 2020 02:47:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1579488463199500" MIME-Version: 1.0 Date: Mon, 20 Jan 2020 02:47:43 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/net/etherape To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200120024743.EDAA8FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1579488463199500 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: nia Date: Mon Jan 20 02:47:43 UTC 2020 Modified Files: pkgsrc/net/etherape: Makefile PLIST distinfo Added Files: pkgsrc/net/etherape/patches: patch-Makefile.in patch-src_names_eth__resolv.c Removed Files: pkgsrc/net/etherape/patches: patch-aa Log Message: etherape: Update to 0.9.18 Overview of changes in EtherApe 0.9.18 (Sunday, June 3, 2018): EtherApe now is a pure GTK 3 application, with canvas supplied by GooCanvas (https://wiki.gnome.org/Projects/GooCanvas). While GooCanvas itself is in maintenance mode, is still the simpler canvas library available and with an API almost identical to gnome-canvas, too! Longer term, EtherApe ui should be completely redesigned and modernized, but this is for another day. Changes summary: * EtherApe ported to GTK3 using GooCanvas instead of the obsolete GnomeCanvas. Overview of changes in EtherApe 0.9.17 (Thursday, April 5, 2018): This is a bugfix release, because a bug made 0.9.16 still runtime-dependent on gnomeui and other gnome 2 libraries. Changes summary: * EtherApe now requires Gtk 2.24 * fixed a bug making libglade load gnome2 libraries * Sometimes node/links windows were freezing. Overview of changes in EtherApe 0.9.16 (Sunday, January 14, 2018): Several distributions are phasing out Gnome 2 libraries and EtherApe needs to update as well. Unfortunately, this mean dropping support for older distributions, for example CENTOS 5 and 6. At this time the EtherApe executable can still be built for those distributions, but not the project as a whole. This is an interim release, where the only Gnome 2 component is gnome-canvas. Apart of that, EtherApe is now a GTK2 application. Work is underway to replace gnome-canvas with another component. Documentation is now based on yelp-tools instead of Scroolkeeper/Rarian. Many thanks to Patrick Matthäi for packaging EtherApe for Debian and helping to keep this tool current. Changes summary: * require only gnome-canvas, not gnome-ui. Based on the work of Arch Linux packager bgyorgy (Balló György). Thanks! * migrate from deprecated gnome-doc-utils to yelp-tools. Unfortunately this change rules out older distributions * updated German translation, thanks to Chris Leick Overview of changes in EtherApe 0.9.15 (Friday, February 10, 2017): The central node ring setting now accepts multiple node specifiers (separated by any combination of spaces and/or commas), and also now understands glob syntax, so you can put for example 10.0.0.0/24, *.mydomain.tld, somehost.otherdomain.tld and it will do what you'd expect. There is now a compile-time configure option ('--with-c-ares', disabled by default) to enable DNS resolution via the c-ares library, supplanting EtherApe's built-in multithreaded gethostbyaddr(3)-based resolver. This is a fully non-blocking DNS library and thus has potential for better performance while using only a single background resolver thread, but also means that name-lookup is strictly DNS-based, and will thus not take /etc/hosts, NIS, or other name services into account. There is a slightly backwards-incompatible change in the syntax of the node-position file used with the '-P' flag added in release 0.9.14. It now uses the same CIDR notation plus hostname-globbing syntax used by the central node ring setting (instead of POSIX regular expressions). This provides simpler and more consistent syntax with essentially the same real-world utility, but may require some small changes to existing node-position files. Some examples: Old (regex) New (CIDR+glob) =============== =============== 172.16.2.[0-9]* 172.16.2.0/24 .*.mydomain.com *.mydomain.com fe80:.* fe80::/16 Additionally, each line of the node-position file may now include multiple such node-matching patterns (separated by spaces and/or commas as with the central node ring setting), so a single line might look like: *.mydomain.com, 10.0.0.0/24 3 (to put all nodes matching the given domain or CIDR range into column 3). As a security feature (privilege separation), packet-capture operations are now isolated in a separate background process. The new '-Z' flag can be used to specify a user to run the main (foreground) process as. Changes summary: * New option to use c-ares for DNS resolution. * Multiple node/subnets and glob syntax now supported for central node ring. * Node-matching syntax for '-P' flag's file now uses CIDR notation and hostname-globbing instead of regexes. * Multiple patterns can now be given on a single line of the node-position ('-P') file. * The columnar-layout ('-P') code has been changed to re-adjust the spacing of nodes within a column when the number of nodes decreases. The 10-column limit has also been removed. * The background-image feature introduced in 0.9.14 can now be turned off via a preference check-box. * The background of the protocol legend is now black so that lighter colors (e.g. yellow) are more readable. * There is now an option to display packet-capture statistics from libpcap in the main window (hover the mouse over them for an explanation in the status bar). * The show/hide state of the toolbar, protocol legend, and status bar are now preserved along with other preferences in the user's config file. * New '-Z' flag (or '--relinquish-privileges') can be used to run most processing as an unprivileged user. Overview of changes in EtherApe 0.9.14 (Saturday February 06, 2016): EtherApe now users the system /etc/services file instead of its own. While this change make some customizations a bit harder, it guarantees an up-to-date services file. Note to packagers: /etc/etherape is not needed anymore. Central node option now undestands CIDR notation, allowing for a central ring of nodes, thanks to Zev Weiss. Static background image, courtesy of Glenn Feunteun. Nodes can be optionally arranged as columns, thanks to David Goldfarb. Changes summary: * autoconf updated to 2.69 * fixed incorrect WLAN control frames decoding * fix UTF-8 encoding of several files, thanks to StrPt. * read system services file instead of EtherApe one, thanks to Zev Weiss. * fix race condition on exit, thanks to Zev Weiss * central ring option, thanks to Zev Weiss * tweaks to preference windows to better work with tiling managers, thanks to Zev Weiss. * static background image (Glenn Feunteun) * arrange nodes in 'columns' (David Goldfarb) Overview of changes in EtherApe 0.9.13 (Sun May 05, 2013): Central node option, useful for displaying routers or proxies. Translations and documentation updates, plus some fixes. Changes summary: * Optional central node, based on work of Javier Fernandez-Sanguino Peña. * re-enabled full-screen mode, thanks to nrvale0 * Updated spanish translation, thanks to Javier Fernandez-Sanguino Peña. * Added German translation, and fixed typos, thanks to Chris Leick. * Updated documentation. To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 pkgsrc/net/etherape/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/etherape/PLIST cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/etherape/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/net/etherape/patches/patch-Makefile.in \ pkgsrc/net/etherape/patches/patch-src_names_eth__resolv.c cvs rdiff -u -r1.4 -r0 pkgsrc/net/etherape/patches/patch-aa Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1579488463199500 Content-Disposition: inline Content-Length: 8133 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/etherape/Makefile diff -u pkgsrc/net/etherape/Makefile:1.105 pkgsrc/net/etherape/Makefile:1.106 --- pkgsrc/net/etherape/Makefile:1.105 Sat Jan 18 23:33:14 2020 +++ pkgsrc/net/etherape/Makefile Mon Jan 20 02:47:43 2020 @@ -1,35 +1,28 @@ -# $NetBSD: Makefile,v 1.105 2020/01/18 23:33:14 rillig Exp $ +# $NetBSD: Makefile,v 1.106 2020/01/20 02:47:43 nia Exp $ -DISTNAME= etherape-0.9.12 -PKGREVISION= 38 -CATEGORIES= gnome net +DISTNAME= etherape-0.9.18 +CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=etherape/} MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://etherape.sourceforge.net/ +HOMEPAGE= https://etherape.sourceforge.io/ COMMENT= Graphical network monitor LICENSE= gnu-gpl-v2 # or later -USE_TOOLS+= gmake pkg-config -USE_PKGLOCALEDIR= yes -GNU_CONFIGURE= yes +TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool +TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 -PKG_SYSCONFSUBDIR= etherape - -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +USE_TOOLS+= gmake pkg-config +USE_TOOLS+= msgfmt msgmerge xgettext +GNU_CONFIGURE= yes -EGDIR= ${PREFIX}/share/examples/etherape - -CONF_FILES= ${EGDIR}/services ${PKG_SYSCONFDIR}/services +PKG_SYSCONFSUBDIR= etherape -post-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/services ${DESTDIR}${EGDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -.include "../../net/libpcap/buildlink3.mk" -.include "../../devel/libglade/buildlink3.mk" -.include "../../devel/libgnomeui/buildlink3.mk" -.include "../../mk/omf-scrollkeeper.mk" -.include "../../textproc/gnome-doc-utils/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/popt/buildlink3.mk" +.include "../../graphics/goocanvas2/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/etherape/PLIST diff -u pkgsrc/net/etherape/PLIST:1.10 pkgsrc/net/etherape/PLIST:1.11 --- pkgsrc/net/etherape/PLIST:1.10 Thu Jun 9 16:55:30 2011 +++ pkgsrc/net/etherape/PLIST Mon Jan 20 02:47:43 2020 @@ -1,41 +1,39 @@ -@comment $NetBSD: PLIST,v 1.10 2011/06/09 16:55:30 drochner Exp $ +@comment $NetBSD: PLIST,v 1.11 2020/01/20 02:47:43 nia Exp $ bin/etherape man/man1/etherape.1 share/applications/etherape.desktop -share/etherape/glade/etherape.glade share/etherape/glade/etherape.png -share/etherape/glade/nodes.xpm -share/examples/etherape/services -share/gnome/help/etherape/C/etherape.xml -share/gnome/help/etherape/C/figures/all_nodes.eps -share/gnome/help/etherape/C/figures/all_nodes.png -share/gnome/help/etherape/C/figures/appmain.eps -share/gnome/help/etherape/C/figures/appmain.png -share/gnome/help/etherape/C/figures/capture_file_dlg.eps -share/gnome/help/etherape/C/figures/capture_file_dlg.png -share/gnome/help/etherape/C/figures/color_select_dlg.eps -share/gnome/help/etherape/C/figures/color_select_dlg.png -share/gnome/help/etherape/C/figures/eth_toolbar.eps -share/gnome/help/etherape/C/figures/eth_toolbar.png -share/gnome/help/etherape/C/figures/link_info.eps -share/gnome/help/etherape/C/figures/link_info.png -share/gnome/help/etherape/C/figures/node_info.eps -share/gnome/help/etherape/C/figures/node_info.png -share/gnome/help/etherape/C/figures/pref_colors_dlg.eps -share/gnome/help/etherape/C/figures/pref_colors_dlg.png -share/gnome/help/etherape/C/figures/pref_diagram_dlg.eps -share/gnome/help/etherape/C/figures/pref_diagram_dlg.png -share/gnome/help/etherape/C/figures/pref_timings_dlg.eps -share/gnome/help/etherape/C/figures/pref_timings_dlg.png -share/gnome/help/etherape/C/figures/proto_info.eps -share/gnome/help/etherape/C/figures/proto_info.png -share/gnome/help/etherape/C/figures/protocol_edit_dlg.eps -share/gnome/help/etherape/C/figures/protocol_edit_dlg.png +share/etherape/glade/etherape.ui +share/help/C/etherape/figures/all_nodes.eps +share/help/C/etherape/figures/all_nodes.png +share/help/C/etherape/figures/appmain.eps +share/help/C/etherape/figures/appmain.png +share/help/C/etherape/figures/capture_file_dlg.eps +share/help/C/etherape/figures/capture_file_dlg.png +share/help/C/etherape/figures/color_select_dlg.eps +share/help/C/etherape/figures/color_select_dlg.png +share/help/C/etherape/figures/eth_toolbar.eps +share/help/C/etherape/figures/eth_toolbar.png +share/help/C/etherape/figures/link_info.eps +share/help/C/etherape/figures/link_info.png +share/help/C/etherape/figures/node_info.eps +share/help/C/etherape/figures/node_info.png +share/help/C/etherape/figures/pref_colors_dlg.eps +share/help/C/etherape/figures/pref_colors_dlg.png +share/help/C/etherape/figures/pref_diagram_dlg.eps +share/help/C/etherape/figures/pref_diagram_dlg.png +share/help/C/etherape/figures/pref_timings_dlg.eps +share/help/C/etherape/figures/pref_timings_dlg.png +share/help/C/etherape/figures/proto_info.eps +share/help/C/etherape/figures/proto_info.png +share/help/C/etherape/figures/protocol_edit_dlg.eps +share/help/C/etherape/figures/protocol_edit_dlg.png +share/help/C/etherape/index.docbook +share/locale/de/LC_MESSAGES/etherape.mo share/locale/es/LC_MESSAGES/etherape.mo share/locale/fr/LC_MESSAGES/etherape.mo share/locale/it/LC_MESSAGES/etherape.mo share/locale/nl/LC_MESSAGES/etherape.mo share/locale/sv/LC_MESSAGES/etherape.mo share/locale/tr/LC_MESSAGES/etherape.mo -share/omf/etherape/etherape-C.omf share/pixmaps/etherape.png Index: pkgsrc/net/etherape/distinfo diff -u pkgsrc/net/etherape/distinfo:1.11 pkgsrc/net/etherape/distinfo:1.12 --- pkgsrc/net/etherape/distinfo:1.11 Wed Nov 4 00:34:59 2015 +++ pkgsrc/net/etherape/distinfo Mon Jan 20 02:47:43 2020 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.11 2015/11/04 00:34:59 agc Exp $ +$NetBSD: distinfo,v 1.12 2020/01/20 02:47:43 nia Exp $ -SHA1 (etherape-0.9.12.tar.gz) = 8e9cc85e73e44eccb236f488111e02f418ab095d -RMD160 (etherape-0.9.12.tar.gz) = 8ac83923c2dc9c9f82917bbb0a7bde9c1edd8d7a -SHA512 (etherape-0.9.12.tar.gz) = e8a3f246a556d9c795703b455e1343e191a2cddfc95fb2db72805036716c0cf3708548f3331dc1de236f9bdf4e5d208abaf872a383d2fe0867c3d05d413e6e4b -Size (etherape-0.9.12.tar.gz) = 1384124 bytes -SHA1 (patch-aa) = 543227bdc60b172c1001bf7c0737f6230dc8e6d0 +SHA1 (etherape-0.9.18.tar.gz) = a6a06512e483b68405c3f2e15ac7f019d92bb74c +RMD160 (etherape-0.9.18.tar.gz) = c983b3ae5601ca37a627f6b6638d3c1385b51ff5 +SHA512 (etherape-0.9.18.tar.gz) = 0ed19966451f9e9b5f5754018d485e7dc59005657ceddf8a75e790c4b7fbf3c8eea56354cf490ec27e18c4bc14c5b3fe648c90facc471dfb14b52ea68abc37d3 +Size (etherape-0.9.18.tar.gz) = 1436265 bytes +SHA1 (patch-Makefile.in) = 6f83887002b4c72a96104928412cf0e5ef497acf +SHA1 (patch-src_names_eth__resolv.c) = 63cedcefe32ddd1b1d476d8e9471a86b6a46e28e Added files: Index: pkgsrc/net/etherape/patches/patch-Makefile.in diff -u /dev/null pkgsrc/net/etherape/patches/patch-Makefile.in:1.1 --- /dev/null Mon Jan 20 02:47:43 2020 +++ pkgsrc/net/etherape/patches/patch-Makefile.in Mon Jan 20 02:47:43 2020 @@ -0,0 +1,13 @@ +$NetBSD: patch-Makefile.in,v 1.1 2020/01/20 02:47:43 nia Exp $ + +--- Makefile.in.orig 2018-06-03 18:41:08.000000000 +0000 ++++ Makefile.in +@@ -395,7 +395,7 @@ SUBDIRS = src doc glade m4 po + DATADIR = . + DISTCHECK_CONFIGURE_FLAGS = + man_MANS = etherape.1 +-confdir = $(sysconfdir)/etherape ++confdir = $(sysconfdir) + conf_DATA = + Developmentdir = $(datadir)/applications + Development_DATA = etherape.desktop Index: pkgsrc/net/etherape/patches/patch-src_names_eth__resolv.c diff -u /dev/null pkgsrc/net/etherape/patches/patch-src_names_eth__resolv.c:1.1 --- /dev/null Mon Jan 20 02:47:43 2020 +++ pkgsrc/net/etherape/patches/patch-src_names_eth__resolv.c Mon Jan 20 02:47:43 2020 @@ -0,0 +1,19 @@ +$NetBSD: patch-src_names_eth__resolv.c,v 1.1 2020/01/20 02:47:43 nia Exp $ + +Build on NetBSD. + +--- src/names/eth_resolv.c.orig 2018-04-14 16:45:39.000000000 +0000 ++++ src/names/eth_resolv.c +@@ -26,8 +26,12 @@ + #include + #include + ++#ifdef __NetBSD__ ++#include ++#else + #include + #include ++#endif + + #include + --_----------=_1579488463199500--