Mon Jan 20 02:47:43 2020 UTC ()
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.


(nia)
diff -r1.105 -r1.106 pkgsrc/net/etherape/Makefile
diff -r1.10 -r1.11 pkgsrc/net/etherape/PLIST
diff -r1.11 -r1.12 pkgsrc/net/etherape/distinfo
diff -r0 -r1.1 pkgsrc/net/etherape/patches/patch-Makefile.in
diff -r0 -r1.1 pkgsrc/net/etherape/patches/patch-src_names_eth__resolv.c
diff -r1.4 -r0 pkgsrc/net/etherape/patches/patch-aa

cvs diff -r1.105 -r1.106 pkgsrc/net/etherape/Makefile (expand / switch to unified diff)

--- pkgsrc/net/etherape/Makefile 2020/01/18 23:33:14 1.105
+++ pkgsrc/net/etherape/Makefile 2020/01/20 02:47:43 1.106
@@ -1,35 +1,28 @@ @@ -1,35 +1,28 @@
1# $NetBSD: Makefile,v 1.105 2020/01/18 23:33:14 rillig Exp $ 1# $NetBSD: Makefile,v 1.106 2020/01/20 02:47:43 nia Exp $
2 2
3DISTNAME= etherape-0.9.12 3DISTNAME= etherape-0.9.18
4PKGREVISION= 38 4CATEGORIES= net
5CATEGORIES= gnome net 
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=etherape/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=etherape/}
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://etherape.sourceforge.net/ 8HOMEPAGE= https://etherape.sourceforge.io/
10COMMENT= Graphical network monitor 9COMMENT= Graphical network monitor
11LICENSE= gnu-gpl-v2 # or later 10LICENSE= gnu-gpl-v2 # or later
12 11
13USE_TOOLS+= gmake pkg-config 12TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
14USE_PKGLOCALEDIR= yes 13TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2
15GNU_CONFIGURE= yes 
16 14
17PKG_SYSCONFSUBDIR= etherape 15USE_TOOLS+= gmake pkg-config
18 16USE_TOOLS+= msgfmt msgmerge xgettext
19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 17GNU_CONFIGURE= yes
20 18
21EGDIR= ${PREFIX}/share/examples/etherape 19PKG_SYSCONFSUBDIR= etherape
22 
23CONF_FILES= ${EGDIR}/services ${PKG_SYSCONFDIR}/services 
24 20
25post-install: 21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
26 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} 
27 ${INSTALL_DATA} ${WRKSRC}/services ${DESTDIR}${EGDIR} 
28 22
29.include "../../net/libpcap/buildlink3.mk" 23.include "../../devel/glib2/buildlink3.mk"
30.include "../../devel/libglade/buildlink3.mk" 24.include "../../devel/popt/buildlink3.mk"
31.include "../../devel/libgnomeui/buildlink3.mk" 25.include "../../graphics/goocanvas2/buildlink3.mk"
32.include "../../mk/omf-scrollkeeper.mk" 26.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
33.include "../../textproc/gnome-doc-utils/buildlink3.mk" 
34.include "../../sysutils/desktop-file-utils/desktopdb.mk" 27.include "../../sysutils/desktop-file-utils/desktopdb.mk"
35.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"

cvs diff -r1.10 -r1.11 pkgsrc/net/etherape/PLIST (expand / switch to unified diff)

--- pkgsrc/net/etherape/PLIST 2011/06/09 16:55:30 1.10
+++ pkgsrc/net/etherape/PLIST 2020/01/20 02:47:43 1.11
@@ -1,41 +1,39 @@ @@ -1,41 +1,39 @@
1@comment $NetBSD: PLIST,v 1.10 2011/06/09 16:55:30 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.11 2020/01/20 02:47:43 nia Exp $
2bin/etherape 2bin/etherape
3man/man1/etherape.1 3man/man1/etherape.1
4share/applications/etherape.desktop 4share/applications/etherape.desktop
5share/etherape/glade/etherape.glade 
6share/etherape/glade/etherape.png 5share/etherape/glade/etherape.png
7share/etherape/glade/nodes.xpm 6share/etherape/glade/etherape.ui
8share/examples/etherape/services 7share/help/C/etherape/figures/all_nodes.eps
9share/gnome/help/etherape/C/etherape.xml 8share/help/C/etherape/figures/all_nodes.png
10share/gnome/help/etherape/C/figures/all_nodes.eps 9share/help/C/etherape/figures/appmain.eps
11share/gnome/help/etherape/C/figures/all_nodes.png 10share/help/C/etherape/figures/appmain.png
12share/gnome/help/etherape/C/figures/appmain.eps 11share/help/C/etherape/figures/capture_file_dlg.eps
13share/gnome/help/etherape/C/figures/appmain.png 12share/help/C/etherape/figures/capture_file_dlg.png
14share/gnome/help/etherape/C/figures/capture_file_dlg.eps 13share/help/C/etherape/figures/color_select_dlg.eps
15share/gnome/help/etherape/C/figures/capture_file_dlg.png 14share/help/C/etherape/figures/color_select_dlg.png
16share/gnome/help/etherape/C/figures/color_select_dlg.eps 15share/help/C/etherape/figures/eth_toolbar.eps
17share/gnome/help/etherape/C/figures/color_select_dlg.png 16share/help/C/etherape/figures/eth_toolbar.png
18share/gnome/help/etherape/C/figures/eth_toolbar.eps 17share/help/C/etherape/figures/link_info.eps
19share/gnome/help/etherape/C/figures/eth_toolbar.png 18share/help/C/etherape/figures/link_info.png
20share/gnome/help/etherape/C/figures/link_info.eps 19share/help/C/etherape/figures/node_info.eps
21share/gnome/help/etherape/C/figures/link_info.png 20share/help/C/etherape/figures/node_info.png
22share/gnome/help/etherape/C/figures/node_info.eps 21share/help/C/etherape/figures/pref_colors_dlg.eps
23share/gnome/help/etherape/C/figures/node_info.png 22share/help/C/etherape/figures/pref_colors_dlg.png
24share/gnome/help/etherape/C/figures/pref_colors_dlg.eps 23share/help/C/etherape/figures/pref_diagram_dlg.eps
25share/gnome/help/etherape/C/figures/pref_colors_dlg.png 24share/help/C/etherape/figures/pref_diagram_dlg.png
26share/gnome/help/etherape/C/figures/pref_diagram_dlg.eps 25share/help/C/etherape/figures/pref_timings_dlg.eps
27share/gnome/help/etherape/C/figures/pref_diagram_dlg.png 26share/help/C/etherape/figures/pref_timings_dlg.png
28share/gnome/help/etherape/C/figures/pref_timings_dlg.eps 27share/help/C/etherape/figures/proto_info.eps
29share/gnome/help/etherape/C/figures/pref_timings_dlg.png 28share/help/C/etherape/figures/proto_info.png
30share/gnome/help/etherape/C/figures/proto_info.eps 29share/help/C/etherape/figures/protocol_edit_dlg.eps
31share/gnome/help/etherape/C/figures/proto_info.png 30share/help/C/etherape/figures/protocol_edit_dlg.png
32share/gnome/help/etherape/C/figures/protocol_edit_dlg.eps 31share/help/C/etherape/index.docbook
33share/gnome/help/etherape/C/figures/protocol_edit_dlg.png 32share/locale/de/LC_MESSAGES/etherape.mo
34share/locale/es/LC_MESSAGES/etherape.mo 33share/locale/es/LC_MESSAGES/etherape.mo
35share/locale/fr/LC_MESSAGES/etherape.mo 34share/locale/fr/LC_MESSAGES/etherape.mo
36share/locale/it/LC_MESSAGES/etherape.mo 35share/locale/it/LC_MESSAGES/etherape.mo
37share/locale/nl/LC_MESSAGES/etherape.mo 36share/locale/nl/LC_MESSAGES/etherape.mo
38share/locale/sv/LC_MESSAGES/etherape.mo 37share/locale/sv/LC_MESSAGES/etherape.mo
39share/locale/tr/LC_MESSAGES/etherape.mo 38share/locale/tr/LC_MESSAGES/etherape.mo
40share/omf/etherape/etherape-C.omf 
41share/pixmaps/etherape.png 39share/pixmaps/etherape.png

cvs diff -r1.11 -r1.12 pkgsrc/net/etherape/distinfo (expand / switch to unified diff)

--- pkgsrc/net/etherape/distinfo 2015/11/04 00:34:59 1.11
+++ pkgsrc/net/etherape/distinfo 2020/01/20 02:47:43 1.12
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.11 2015/11/04 00:34:59 agc Exp $ 1$NetBSD: distinfo,v 1.12 2020/01/20 02:47:43 nia Exp $
2 2
3SHA1 (etherape-0.9.12.tar.gz) = 8e9cc85e73e44eccb236f488111e02f418ab095d 3SHA1 (etherape-0.9.18.tar.gz) = a6a06512e483b68405c3f2e15ac7f019d92bb74c
4RMD160 (etherape-0.9.12.tar.gz) = 8ac83923c2dc9c9f82917bbb0a7bde9c1edd8d7a 4RMD160 (etherape-0.9.18.tar.gz) = c983b3ae5601ca37a627f6b6638d3c1385b51ff5
5SHA512 (etherape-0.9.12.tar.gz) = e8a3f246a556d9c795703b455e1343e191a2cddfc95fb2db72805036716c0cf3708548f3331dc1de236f9bdf4e5d208abaf872a383d2fe0867c3d05d413e6e4b 5SHA512 (etherape-0.9.18.tar.gz) = 0ed19966451f9e9b5f5754018d485e7dc59005657ceddf8a75e790c4b7fbf3c8eea56354cf490ec27e18c4bc14c5b3fe648c90facc471dfb14b52ea68abc37d3
6Size (etherape-0.9.12.tar.gz) = 1384124 bytes 6Size (etherape-0.9.18.tar.gz) = 1436265 bytes
7SHA1 (patch-aa) = 543227bdc60b172c1001bf7c0737f6230dc8e6d0 7SHA1 (patch-Makefile.in) = 6f83887002b4c72a96104928412cf0e5ef497acf
 8SHA1 (patch-src_names_eth__resolv.c) = 63cedcefe32ddd1b1d476d8e9471a86b6a46e28e

File Added: pkgsrc/net/etherape/patches/patch-Makefile.in
$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

File Added: pkgsrc/net/etherape/patches/patch-src_names_eth__resolv.c
$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 <stdlib.h>
 #include <string.h>
 
+#ifdef __NetBSD__
+#include <net/if_ether.h>
+#else
 #include <net/ethernet.h>
 #include <netinet/ether.h>
+#endif
 
 #include <glib.h>
 

File Deleted: pkgsrc/net/etherape/patches/Attic/patch-aa