diff options
author | wiz <wiz@pkgsrc.org> | 2017-06-27 12:22:38 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2017-06-27 12:22:38 +0000 |
commit | 92d9261fd49c4d716efd444fe8f82df26909ee82 (patch) | |
tree | e87569d98cab8f109b124925d37ae9ea0eec2a57 /net | |
parent | a27f43ce03f904cd8b4eaf3b5c4a7c534a5dc5b9 (diff) | |
download | pkgsrc-92d9261fd49c4d716efd444fe8f82df26909ee82.tar.gz |
Updated mtr to 0.92 again.
Install missing mtr-packet. Now it's working except for
6-to-4 fallback; use "-4" for that case.
Diffstat (limited to 'net')
-rw-r--r-- | net/mtr/MESSAGE | 9 | ||||
-rw-r--r-- | net/mtr/Makefile | 19 | ||||
-rw-r--r-- | net/mtr/PLIST | 5 | ||||
-rw-r--r-- | net/mtr/distinfo | 13 | ||||
-rw-r--r-- | net/mtr/patches/patch-asn.c | 16 | ||||
-rw-r--r-- | net/mtr/patches/patch-net.c | 15 | ||||
-rw-r--r-- | net/mtr/patches/patch-net.h | 19 |
7 files changed, 14 insertions, 82 deletions
diff --git a/net/mtr/MESSAGE b/net/mtr/MESSAGE deleted file mode 100644 index 6ee43baad24..00000000000 --- a/net/mtr/MESSAGE +++ /dev/null @@ -1,9 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.2 2003/05/06 17:42:12 jmmv Exp $ - - ${PREFIX}/sbin/mtr is setuid "root". - - Please read about potential security issues in - ${PREFIX}/share/doc/mtr/SECURITY - -=========================================================================== diff --git a/net/mtr/Makefile b/net/mtr/Makefile index e60b92c585f..9beb742de09 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.100 2017/06/26 14:41:37 wiz Exp $ +# $NetBSD: Makefile,v 1.101 2017/06/27 12:22:38 wiz Exp $ -DISTNAME= mtr-0.87 -PKGREVISION= 2 +DISTNAME= mtr-0.92 CATEGORIES= net MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ @@ -12,21 +11,13 @@ LICENSE= gnu-gpl-v2 GNU_CONFIGURE= YES USE_TOOLS+= pkg-config -INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/doc/mtr +INSTALLATION_DIRS= share/doc/mtr .include "options.mk" -SPECIAL_PERMS= sbin/mtr ${SETUID_ROOT_PERMS} +SPECIAL_PERMS= sbin/mtr-packet ${SETUID_ROOT_PERMS} -# Remove hard-coded compiler option that GCC 3.x doesn't support. -.include "../../mk/compiler.mk" -.if !empty(CC_VERSION:Mgcc-3.*) -BUILDLINK_TRANSFORM+= rm:-Wno-pointer-sign -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mtr ${DESTDIR}${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/mtr.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 +post-install: ${INSTALL_DATA} ${WRKSRC}/SECURITY ${DESTDIR}${PREFIX}/share/doc/mtr .include "../../mk/curses.buildlink3.mk" diff --git a/net/mtr/PLIST b/net/mtr/PLIST index 4e104c2867e..cf8f9fd3ca4 100644 --- a/net/mtr/PLIST +++ b/net/mtr/PLIST @@ -1,4 +1,7 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:09:35 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2017/06/27 12:22:38 wiz Exp $ +man/man8/mtr-packet.8 man/man8/mtr.8 sbin/mtr +sbin/mtr-packet +share/bash-completion/completions/mtr share/doc/mtr/SECURITY diff --git a/net/mtr/distinfo b/net/mtr/distinfo index 5f075c70d70..bf49c6c5416 100644 --- a/net/mtr/distinfo +++ b/net/mtr/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.48 2017/06/26 14:41:37 wiz Exp $ +$NetBSD: distinfo,v 1.49 2017/06/27 12:22:38 wiz Exp $ -SHA1 (mtr-0.87.tar.gz) = afd192a765116f3d44e4bada9e11d4ccd79acefc -RMD160 (mtr-0.87.tar.gz) = 9cc760ec31113462f9aeff94b3ba1af1cb4ed994 -SHA512 (mtr-0.87.tar.gz) = 172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9 -Size (mtr-0.87.tar.gz) = 184645 bytes -SHA1 (patch-asn.c) = 37aec0ccc296122c93d60f7b5397fd5a61c94e86 -SHA1 (patch-net.c) = b8a88ef7c4bad7cfbb502e60e12fd84b90e601dd -SHA1 (patch-net.h) = b5209872236f078e29e124988324ab0be870c45c +SHA1 (mtr-0.92.tar.gz) = 3d568bf712bb1257390375c6953589004aa56c39 +RMD160 (mtr-0.92.tar.gz) = 7a697e13abfb12e50af43c6d493098dc0a7fe803 +SHA512 (mtr-0.92.tar.gz) = d362a418b6c17fd2d08da1ed9e033fa3330e4c0497e1bb0644f6193d23f4e20dd8ee181942c2a20ec0025a8b96c521394a21be5a1d9036f8a0a8c4cddfbe381f +Size (mtr-0.92.tar.gz) = 296430 bytes diff --git a/net/mtr/patches/patch-asn.c b/net/mtr/patches/patch-asn.c deleted file mode 100644 index 3208c2bbf81..00000000000 --- a/net/mtr/patches/patch-asn.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-asn.c,v 1.7 2017/06/26 14:41:37 wiz Exp $ - -Fix build on Darwin. - ---- asn.c.orig 2017-02-17 02:50:57.000000000 +0000 -+++ asn.c -@@ -23,9 +23,6 @@ - #include <stdlib.h> - #include <sys/types.h> - --#ifdef __APPLE__ --#define BIND_8_COMPAT --#endif - #include <arpa/nameser.h> - #ifdef HAVE_ARPA_NAMESER_COMPAT_H - #include <arpa/nameser_compat.h> diff --git a/net/mtr/patches/patch-net.c b/net/mtr/patches/patch-net.c deleted file mode 100644 index 681a4e6752b..00000000000 --- a/net/mtr/patches/patch-net.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-net.c,v 1.3 2017/06/26 14:41:37 wiz Exp $ - -Fix build on SunOS. ---- net.c.orig 2013-04-29 18:22:05.000000000 +0000 -+++ net.c -@@ -38,6 +38,9 @@ - #include <math.h> - #include <errno.h> - #include <string.h> -+#ifdef __sun -+#include <sys/filio.h> -+#endif - - #include "mtr.h" - #include "net.h" diff --git a/net/mtr/patches/patch-net.h b/net/mtr/patches/patch-net.h deleted file mode 100644 index 61fe085cea2..00000000000 --- a/net/mtr/patches/patch-net.h +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-net.h,v 1.4 2017/06/26 14:41:37 wiz Exp $ - -Assumes that SCTP is available everywhere. -At least let it compile on older systems. -https://github.com/traviscross/mtr/issues/141 - ---- net.h.orig 2014-12-09 11:19:43.000000000 +0000 -+++ net.h -@@ -26,6 +26,10 @@ - #include <netinet/icmp6.h> - #endif - -+#ifndef IPPROTO_SCTP -+#define IPPROTO_SCTP 132 -+#endif -+ - int net_preopen(void); - int net_selectsocket(void); - int net_open(struct hostent *host); |