- up to 0.85

diff --git a/mtr-resolv.patch b/mtr-resolv.patch
deleted file mode 100644 (file)
index 33fc8f1..0000000
--- a/mtr-resolv.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- mtr-0.71/configure.ac.orig 2006-03-24 07:37:17.000000000 +0100
-+++ mtr-0.71/configure.ac      2006-03-25 16:00:03.264992250 +0100
-@@ -85,10 +85,11 @@
- AC_CHECK_FUNCS(seteuid)
- #  AC_CHECK_FUNC(setuid, , AC_MSG_ERROR (I Need either seteuid or setuid))
- 
--AC_CHECK_FUNC(res_mkquery, , 
--  AC_CHECK_LIB(bind, res_mkquery, , 
--   AC_CHECK_LIB(resolv, res_mkquery, ,
--     AC_CHECK_LIB(resolv, __res_mkquery, , AC_MSG_ERROR(No resolver library found)))))
-+AC_CHECK_FUNC(res_mkquery, ,[
-+ AC_CHECK_FUNC(__res_mkquery, ,[
-+  AC_CHECK_LIB(resolv, res_mkquery, ,[
-+   AC_CHECK_LIB(resolv, __res_mkquery, ,[
-+     AC_CHECK_LIB(bind, res_mkquery, , [AC_MSG_ERROR(No resolver library found)])])])])])
- # This next line would override the just detected-or-not -lresolv. 
- # This apparently hurts BSD. And it's bad practise. So it should go. 
- # However, it probably didn't get added for nothing..... Holler if

diff --git a/mtr-usage_first_max_hop.patch b/mtr-usage_first_max_hop.patch
index 0c082d542b16c4797370f747c2c4d9a8ff0488eb..696e78f4b154a2be1161b4e94d6fd7a3a5cb1aea 100644 (file)
--- a/mtr-usage_first_max_hop.patch
+++ b/mtr-usage_first_max_hop.patch
@@ -1,10 +1,10 @@
---- mtr.c~     2008-01-05 14:51:56.000000000 +0100
-+++ mtr.c      2008-01-05 14:57:54.940603328 +0100
-@@ -367,6 +367,7 @@
-            "\t\t[--raw] [--split] [--no-dns] [--address interface]\n" /* BL */
+--- mtr.c~     2013-07-10 14:54:59.000000000 +0200
++++ mtr.c      2013-07-10 14:55:33.519595585 +0200
+@@ -579,6 +579,7 @@ int main(int argc, char **argv)
+ #endif
             "\t\t[--psize=bytes/-s bytes]\n"            /* ok */
-            "\t\t[--report-wide|-w] [-u]\n"            /* rew */
-+           "\t\t[-f FIRSTHOP] [-m MAXHOP]\n"            /* first and max hop */
-          "\t\t[--interval=SECONDS] HOSTNAME [PACKETSIZE]\n", argv[0]);
+            "\t\t[--report-wide|-w] [-u|-T] [--port=PORT] [--timeout=SECONDS]\n"            /* rew */
++         "\t\t[-f FIRSTHOP] [-m MAXHOP]\n"            /* first and max hop */
+          "\t\t[--interval=SECONDS] HOSTNAME\n", argv[0]);
      exit(0);
    }

diff --git a/mtr-v6-ns-fix.patch b/mtr-v6-ns-fix.patch
deleted file mode 100644 (file)
index b50cc44..0000000
--- a/mtr-v6-ns-fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-commit cece39e9fad8d53a1e41cae57348f5ab41ec3ba4
-Author: mutantmonkey <mutantmonkey@mutantmonkey.in>
-Date:   Sun Apr 21 15:56:59 2013 -0400
-
-    Fix segfault with mixed IPv4/IPv6 nameservers
-    
-    Fixes bug #1154432
-
-diff --git a/dns.c b/dns.c
-index 683a4aa..8ea48ba 100644
---- a/dns.c
-+++ b/dns.c
-@@ -934,6 +934,8 @@ void dorequest(char *s,int type,word id)
-   hp->id = id;        /* htons() deliberately left out (redundant) */
- #ifdef ENABLE_IPV6
-   for (i = 0;i < NSCOUNT6;i++) {
-+    if (!NSSOCKADDR6(i))
-+      continue;
-     if (NSSOCKADDR6(i)->sin6_family == AF_INET6)
-       (void)sendto(resfd6,buf,r,0,(struct sockaddr *) NSSOCKADDR6(i),
-                  sizeof(struct sockaddr_in6));
-@@ -1340,6 +1342,8 @@ void dns_ack6(void)
-       }
-     } else
-       for (i = 0;i < NSCOUNT6;i++) {
-+        if (!NSSOCKADDR6(i))
-+          continue;
-       if ( addrcmp( (void *) &(NSSOCKADDR6(i)->sin6_addr),
-                     (void *) &(from6->sin6_addr), AF_INET6 ) == 0 )
-         break;
-commit 59c16297a4008ee4b59ae49854d09f49f0713055
-Author: Michal Sekletar <sekletar.m@gmail.com>
-Date:   Thu Jun 6 16:13:52 2013 +0200
-
-    dns: Fix segfault with mixed ipv4/ipv6 nameservers
-    
-    Follow-up on bug #1154432.
-
-diff --git a/dns.c b/dns.c
-index 8ea48ba..371934f 100644
---- a/dns.c
-+++ b/dns.c
-@@ -1334,6 +1334,9 @@ void dns_ack6(void)
-     if ( addrcmp( (void *) &(from6->sin6_addr), (void *) &localhost6,
-                   (int) AF_INET6 ) == 0 ) {
-       for (i = 0;i < NSCOUNT6;i++) {
-+        if (!NSSOCKADDR6(i))
-+          continue;
-+
-       if ( addrcmp( (void *) &(NSSOCKADDR6(i)->sin6_addr),
-                     (void *) &(from6->sin6_addr), (int) AF_INET6 ) == 0 ||
-            addrcmp( (void *) &(NSSOCKADDR6(i)->sin6_addr),

diff --git a/mtr.spec b/mtr.spec
index a4423dffa6b66f7358f434a784dedadbf42019dd..fded5d222bd55f9dbbd4425d260aae4a0a7213d9 100644 (file)
--- a/mtr.spec
+++ b/mtr.spec
@@ -9,23 +9,22 @@ Summary(pt_BR.UTF-8): Ferramenta para diagnóstico da rede, combinando ping/trac
 Summary(ru.UTF-8):     Matt's Traceroute - утилита для диагностики сети
 Summary(uk.UTF-8):     Matt's Traceroute - утиліта для діагностики мережі
 Name:          mtr
-Version:       0.84
-Release:       2
+Version:       0.85
+Release:       1
 Epoch:         1
 License:       GPL v2
 Group:         Networking/Utilities
 Source0:       ftp://ftp.bitwizard.nl/mtr/%{name}-%{version}.tar.gz
-# Source0-md5: df61096ae1b18b27f915feeb907ae48c
+# Source0-md5: aba1e111d270178eb1d65e51ebf6503f
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Patch0:                %{name}-Makefile.patch
-Patch1:                %{name}-resolv.patch
+
 Patch2:                %{name}-mtr6.patch
 Patch3:                %{name}-display.patch
 Patch4:                %{name}-usage_first_max_hop.patch
 Patch5:                %{name}-noraw.patch
 Patch6:                %{name}-nox.patch
-Patch7:                mtr-v6-ns-fix.patch
 URL:           http://www.bitwizard.nl/mtr/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -139,13 +138,12 @@ mtr - це traceroute та ping в одному флаконі. При запу
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+
 %patch2 -p1
 %patch3 -p1
 %patch4 -p0
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 #echo 'AC_DEFUN([AM_PATH_GTK],[$3])' >> acinclude.m4
 %{!?with_x:echo 'AC_DEFUN([AM_PATH_GTK_2_0],[$3])' >> acinclude.m4}