mtr: update to v0.86

Drop 521-glib-dependency-fixes.patch; merged upstream

Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>

diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 0d421d0c4a332593c50ecda731106516d73b7dd1..7214991be5cb4729808915b96f7a5a4b6d4ce2b9 100644 (file)
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtr
-PKG_VERSION:=0.85
+PKG_VERSION:=0.86
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.bitwizard.nl/mtr
-PKG_MD5SUM:=5e665c617e5659b6ec3e201ee7488eb1
+PKG_MD5SUM:=8d63592c9d4579ef20cf491b41843eb2
 PKG_LICENSE:=GPL-2.0+
 PKG_LICENSE_FILES:=COPYING
 

diff --git a/net/mtr/patches/501-dns.patch b/net/mtr/patches/501-dns.patch
index 50c7230461b44b2a3dbf60a4cfb2b153078bd775..e50b7fbff5022ba8de0f278e1e2b34cda8f6f247 100644 (file)
--- a/net/mtr/patches/501-dns.patch
+++ b/net/mtr/patches/501-dns.patch
@@ -1,6 +1,6 @@
 --- a/dns.c
 +++ b/dns.c
-@@ -918,6 +918,507 @@ void restell(char *s)
+@@ -921,6 +921,507 @@ void restell(char *s)
    fputs("\r",stderr);
  }
  

diff --git a/net/mtr/patches/502-fix-res_ninit.patch b/net/mtr/patches/502-fix-res_ninit.patch
index aeec4edcce44803ab5487ce1fb38935a6e813591..2d9883b4afb16729b530edbb94702913659b4412 100644 (file)
--- a/net/mtr/patches/502-fix-res_ninit.patch
+++ b/net/mtr/patches/502-fix-res_ninit.patch
@@ -1,6 +1,6 @@
 --- a/dns.c
 +++ b/dns.c
-@@ -1305,28 +1305,6 @@ res_nmkquery(res_state statp,
+@@ -1308,28 +1308,6 @@ res_nmkquery(res_state statp,
                  return (-1);
          memset(buf, 0, HFIXEDSZ);
          hp = (HEADER *) buf;

diff --git a/net/mtr/patches/521-glib-dependency-fixes.patch b/net/mtr/patches/521-glib-dependency-fixes.patch
deleted file mode 100644 (file)
index 93c9804..0000000
--- a/net/mtr/patches/521-glib-dependency-fixes.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 25a2456845b341066adb5f9fcc553dec12a751b7 Mon Sep 17 00:00:00 2001
-From: Roger Wolff <R.E.Wolff@BitWizard.nl>
-Date: Fri, 5 Jul 2013 11:40:02 +0200
-Subject: [PATCH] glib dependency fixes.
-
----
- configure.ac | 32 ++++++++++++++------------------
- mtr.c        |  5 +++++
- report.c     |  2 ++
- 3 files changed, 21 insertions(+), 18 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -42,25 +42,22 @@ AC_ARG_WITH(gtk,
- [  --without-gtk           Do not try to use GTK+ at all],
- WANTS_GTK=$withval, WANTS_GTK=yes)
- 
--AC_ARG_WITH(glib,
--[  --without-glib          Do not try to use glib at all],
--WANTS_GLIB=$withval, WANTS_GLIB=yes)
--
- AC_ARG_WITH([ipinfo],
- [  --without-ipinfo        Do not try to use ipinfo lookup at all],
--[case "${withval}" in
--  yes) ipinfo=true ;;
--  no)  ipinfo=false ;;
--  *) AC_MSG_ERROR([bad value ${withval} for --with-ipinfo]) ;;
--esac],[ipinfo=true])
--AM_CONDITIONAL([IPINFO], [test x$ipinfo = xtrue])
--if test "x$ipinfo" = "xfalse"; then
--      AC_DEFINE([NO_IPINFO], [1], [Define to disable ipinfo lookup])
--fi
-+[ipinfo="${withval}"], [ipinfo=yes])
-+AM_CONDITIONAL([IPINFO], [test x$ipinfo = xyes])
- 
- AC_ARG_ENABLE(ipv6,
- [  --disable-ipv6          Do not enable IPv6],
- WANTS_IPV6=$enableval, WANTS_IPV6=yes)
-+
-+m4_ifndef([AM_PATH_GTK_2_0], [m4_defun([AM_PATH_GTK_2_0], [AC_MSG_ERROR([
-+  Could not locate the gtk2 automake macros, these are usually located in
-+    .../share/aclocal/gtk-2.0.m4
-+  Before running bootstrap try setting the environment variable
-+    ACLOCAL_PATH="/own/dir"
-+  or configure --without-gtk.
-+])])])
-    
- if test "x$WANTS_GTK" = "xyes"; then
-         AM_PATH_GTK_2_0(2.6.0, CFLAGS="$CFLAGS $GTK_CFLAGS"
-@@ -71,11 +68,10 @@ if test "x$WANTS_GTK" = "xyes"; then
- else
-       AC_DEFINE(NO_GTK)
-       GTK_OBJ=""
--      if test "x$WANTS_GLIB" = "xyes"; then
--              PKG_CHECK_MODULES([GLIB], [glib-2.0])
--      else
--              AC_DEFINE(NO_GLIB, 1, [Define if you don't have the glib libraries available.])
--      fi
-+fi
-+
-+if test "x$ipinfo" = "xno"; then
-+      AC_DEFINE([NO_IPINFO], [1], [Define to disable ipinfo lookup])
- fi
- 
- AC_CHECK_FUNC(socket, , 
---- a/mtr.c
-+++ b/mtr.c
-@@ -464,6 +464,11 @@ void parse_arg (int argc, char **argv)
-     case 'z':
-       ipinfo_no = 0;
-       break;
-+#else
-+    case 'y':
-+    case 'z':
-+      fprintf( stderr, "IPINFO not enabled.\n" );
-+      break;
- #endif
-     }
-   }
---- a/report.c
-+++ b/report.c
-@@ -340,6 +340,7 @@ void csv_close(time_t now)
-     snprint_addr(name, sizeof(name), addr);
- 
-     int last = net_last(at);
-+#ifndef NO_IPINFO
-     if(!ipinfo_no) {
-       char* fmtinfo = fmt_ipinfo(addr);
-       if (fmtinfo != NULL) fmtinfo = trim(fmtinfo);
-@@ -349,6 +350,7 @@ void csv_close(time_t now)
-       printf("MTR.%s;%lu;%s;%s;%d;%s;%d", MTR_VERSION, now, "OK", Hostname,
-              at+1, name, last);
-     }
-+#endif
- 
-     for( i=0; i<MAXFLD; i++ ) {
-       j = fld_index[fld_active[j]];