From b5e6d2c7843b1f979732c6b4db5ddf229a126f8e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 1 Sep 2018 16:55:55 -0700 Subject: [PATCH] mtr: Switch to official tarball and remove hackish patches (#6738) Should properly report version now. Cosmetic makefile changes. Signed-off-by: Rosen Penev --- net/mtr/Makefile | 14 +++++------ .../patches/010-remove-libcap-support.patch | 15 ------------ ...event-MTR-reporting-unknown-revision.patch | 24 ------------------- 3 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 net/mtr/patches/010-remove-libcap-support.patch delete mode 100644 net/mtr/patches/020-Sami-Kerola-prevent-MTR-reporting-unknown-revision.patch diff --git a/net/mtr/Makefile b/net/mtr/Makefile index 9435b1354..c9fe06145 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -9,22 +9,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mtr PKG_VERSION:=0.92 -PKG_RELEASE:=2 - -PKG_MAINTAINER:=Jonathan McCrohan +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/traviscross/mtr/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=568a52911a8933496e60c88ac6fea12379469d7943feb9223f4337903e4bc164 +PKG_SOURCE_URL:=https://www.bitwizard.nl/mtr/files +PKG_HASH:=f2979db9e2f41aa8e6574e7771767c9afe111d9213814eb47f5e1e71876e4382 +PKG_MAINTAINER:=Jonathan McCrohan PKG_LICENSE:=GPL-2.0+ PKG_LICENSE_FILES:=COPYING PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -PKG_FIXUP:=autoreconf - include $(INCLUDE_DIR)/package.mk define Package/mtr @@ -50,8 +47,9 @@ CONFIGURE_ARGS += \ --without-gtk \ $(call autoconf_bool,CONFIG_IPV6,ipv6) +CONFIGURE_VARS += ac_cv_lib_cap_cap_set_proc=no + define Build/Configure - echo $(PKG_VERSION) > .tarball-version $(call Build/Configure/Default) endef diff --git a/net/mtr/patches/010-remove-libcap-support.patch b/net/mtr/patches/010-remove-libcap-support.patch deleted file mode 100644 index db15a5159..000000000 --- a/net/mtr/patches/010-remove-libcap-support.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index a08ce67..83bf094 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -106,10 +106,6 @@ AS_IF([test "x$with_ncurses" = "xyes"], - ]) - AM_CONDITIONAL([WITH_CURSES], [test "x$with_ncurses" = xyes]) - --AC_CHECK_LIB([cap], [cap_set_proc], [], -- AS_IF([test "$host_os" = linux-gnu], -- AC_MSG_WARN([Capabilities support is strongly recommended for increased security. See SECURITY for more information.]))) -- - # Enable ipinfo - AC_ARG_WITH([ipinfo], - [AS_HELP_STRING([--without-ipinfo], [Do not try to use ipinfo lookup at all])], diff --git a/net/mtr/patches/020-Sami-Kerola-prevent-MTR-reporting-unknown-revision.patch b/net/mtr/patches/020-Sami-Kerola-prevent-MTR-reporting-unknown-revision.patch deleted file mode 100644 index 4923d729b..000000000 --- a/net/mtr/patches/020-Sami-Kerola-prevent-MTR-reporting-unknown-revision.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 94218682b15832fd6f8ed09a767941974075a1b4 Mon Sep 17 00:00:00 2001 -From: "R.E. Wolff" -Date: Tue, 7 Nov 2017 17:24:14 +0100 -Subject: [PATCH] Sami Kerola: prevent MTR reporting unknown revision - ---- - Makefile.am | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index c0709ca..23ac1fc 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -156,3 +156,7 @@ endif # if CYGWIN - if BUILD_BASH_COMPLETION - dist_bashcompletion_DATA = bash-completion/mtr - endif -+ -+dist-hook: -+ $(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version -+ --- -2.17.1 -