From 338ba76750b8ac0fca0a949228328a8800be56d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Thu, 15 Jul 2021 15:30:19 +0200 Subject: groups/241.native_packages_inet.group: drop mtr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups/241.native_packages_inet.group | 6 +----- patches/mtr-0.92.local.patch | 28 ---------------------------- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 patches/mtr-0.92.local.patch diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index a7842231..1dbb6d05 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -5,7 +5,7 @@ GROUP_TARGET="native_packages"; NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" " apk_tools aria2 bind ca_certificates curl dropbear fetchmail git gnupg gpgme gnutls httpd icecast inetutils irssi isync ldns lighttpd links lynx mailutils -microsocks mtr mutt nginx ngircd nullmailer openlitespeed opensmtpd openssh +microsocks mutt nginx ngircd nullmailer openlitespeed opensmtpd openssh proxytunnel rsync socat thttpd w3m weechat wget whois")"; : ${PKG_APK_TOOLS_DEPENDS:="libfetch libressl libz"}; : ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b}; @@ -132,10 +132,6 @@ proxytunnel rsync socat thttpd w3m weechat wget whois")"; : ${PKG_MAILUTILS_IN_TREE=1}; : ${PKG_MICROSOCKS_URLS_GIT:=microsocks=https://github.com/rofl0r/microsocks.git@master}; : ${PKG_MICROSOCKS_BUILD_DIR:=microsocks}; -: ${PKG_MTR_SHA256SUM:=f2979db9e2f41aa8e6574e7771767c9afe111d9213814eb47f5e1e71876e4382}; -: ${PKG_MTR_VERSION:=0.92}; -: ${PKG_MTR_URL:=ftp://ftp.bitwizard.nl/mtr/mtr-${PKG_MTR_VERSION}.tar.gz}; -: ${PKG_MTR_DISABLED:=1}; : ${PKG_MUTT_DEPENDS:="gnutls libz ncursesw"}; : ${PKG_MUTT_SHA256SUM:=471218babe97968a45704f1e1e17523c4620ad1f92bae4143a4c9749ab1411c8}; : ${PKG_MUTT_VERSION:=2.0.2}; diff --git a/patches/mtr-0.92.local.patch b/patches/mtr-0.92.local.patch deleted file mode 100644 index a5ab92b1..00000000 --- a/patches/mtr-0.92.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 -- cgit v1.2.3