From dee645a7653805a4b1cc602f762cc3403e5066f7 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz Date: Sep 02 2017 17:16:37 +0000 Subject: vars/build.vars: fix mtr to v0.92 (via Redfoxmoon.) patches/mtr-0.92.local.patch: sync filename. --- diff --git a/patches/mtr-0.92.local.patch b/patches/mtr-0.92.local.patch new file mode 100644 index 0000000..a5ab92b --- /dev/null +++ b/patches/mtr-0.92.local.patch @@ -0,0 +1,28 @@ +diff -ru mtr.orig/Makefile.am mtr/Makefile.am +--- mtr.orig/Makefile.am 2017-03-02 12:55:53.968328160 +0100 ++++ mtr/Makefile.am 2017-03-02 13:02:10.645991226 +0100 +@@ -41,8 +41,8 @@ + PATHFILES += man/mtr.8 man/mtr-packet.8 + + install-exec-hook: +- `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/mtr-packet` \ +- || chmod u+s $(DESTDIR)$(sbindir)/mtr-packet ++# `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/mtr-packet` \ ++# || chmod u+s $(DESTDIR)$(sbindir)/mtr-packet + + mtr_SOURCES = ui/mtr.c ui/mtr.h \ + ui/net.c ui/net.h \ +diff -ru mtr.orig/packet/platform.h mtr/packet/platform.h +--- mtr.orig/packet/platform.h 2017-03-02 12:55:53.968328160 +0100 ++++ mtr/packet/platform.h 2017-03-02 13:03:59.185316954 +0100 +@@ -40,6 +40,10 @@ + + #define PLATFORM_FREEBSD + ++#elif defined(__midipix__) ++ ++#define PLATFORM_MIDIPIX ++ + #elif defined(__unix__) + + #define PLATFORM_UNIX_UNKNOWN diff --git a/patches/mtr.git.local.patch b/patches/mtr.git.local.patch deleted file mode 100644 index a5ab92b..0000000 --- a/patches/mtr.git.local.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ru mtr.orig/Makefile.am mtr/Makefile.am ---- mtr.orig/Makefile.am 2017-03-02 12:55:53.968328160 +0100 -+++ mtr/Makefile.am 2017-03-02 13:02:10.645991226 +0100 -@@ -41,8 +41,8 @@ - PATHFILES += man/mtr.8 man/mtr-packet.8 - - install-exec-hook: -- `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/mtr-packet` \ -- || chmod u+s $(DESTDIR)$(sbindir)/mtr-packet -+# `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/mtr-packet` \ -+# || chmod u+s $(DESTDIR)$(sbindir)/mtr-packet - - mtr_SOURCES = ui/mtr.c ui/mtr.h \ - ui/net.c ui/net.h \ -diff -ru mtr.orig/packet/platform.h mtr/packet/platform.h ---- mtr.orig/packet/platform.h 2017-03-02 12:55:53.968328160 +0100 -+++ mtr/packet/platform.h 2017-03-02 13:03:59.185316954 +0100 -@@ -40,6 +40,10 @@ - - #define PLATFORM_FREEBSD - -+#elif defined(__midipix__) -+ -+#define PLATFORM_MIDIPIX -+ - #elif defined(__unix__) - - #define PLATFORM_UNIX_UNKNOWN diff --git a/vars/build.vars b/vars/build.vars index 8c0f8dc..8e1b7ec 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -744,9 +744,9 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_MKSH_INSTALL_FILES:="mksh=bin/ /=share/doc/mksh/examples dot.mkshrc=share/doc/mksh/examples/ mksh.1=share/man/man1/"}; : ${PKG_MKSH_NO_MAKE_INSTALL:=1}; : ${PKG_MKSH_SUBDIR:=${PKG_MKSH_BUILD_DIR}}; -: ${PKG_MTR_URLS_GIT:="mtr.git=https://github.com/traviscross/mtr.git@master"}; -: ${PKG_MTR_BUILD_DIR:=mtr.git}; -: ${PKG_MTR_SUBDIR:=${PKG_MTR_BUILD_DIR}}; +: ${PKG_MTR_SHA256SUM:=f2979db9e2f41aa8e6574e7771767c9afe111d9213814eb47f5e1e71876e4382}; +: ${PKG_MTR_VERSION:=0.92}; +: ${PKG_MTR_URL:=ftp://ftp.bitwizard.nl/mtr/mtr-${PKG_MTR_VERSION}.tar.gz}; : ${PKG_NANO_SHA256SUM:=3725aa145880223b2c4d0b3fa08220e1633f2d341917f49d028e067fc12cce49}; : ${PKG_NANO_VERSION:=2.8.6}; : ${PKG_NANO_URL:=http://www.nano-editor.org/dist/v${PKG_NANO_VERSION%.[0-9]}/nano-${PKG_NANO_VERSION}.tar.gz};