From 81a248dd1e5f60ebf3a2d2859f077213bfc5b680 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sat, 2 Mar 2019 14:52:50 +0200 Subject: [PATCH] net-tools: fix hardcoded paths --- packages/net-tools/arp.c.patch | 21 +++++++++++++++++++++ packages/net-tools/build.sh | 2 +- packages/net-tools/lib-pathnames.h.patch | 12 ++++++++++++ packages/net-tools/nameif.c.patch | 14 ++++++++++++-- packages/net-tools/rarp.c.patch | 12 ++++++++++++ packages/net-tools/slattach.c.patch | 12 ++++++++++++ 6 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 packages/net-tools/arp.c.patch create mode 100644 packages/net-tools/lib-pathnames.h.patch create mode 100644 packages/net-tools/rarp.c.patch create mode 100644 packages/net-tools/slattach.c.patch diff --git a/packages/net-tools/arp.c.patch b/packages/net-tools/arp.c.patch new file mode 100644 index 000000000..bcc8b4943 --- /dev/null +++ b/packages/net-tools/arp.c.patch @@ -0,0 +1,21 @@ +diff -uNr net-tools/arp.c net-tools.mod/arp.c +--- net-tools/arp.c 2017-02-21 20:24:32.000000000 +0200 ++++ net-tools.mod/arp.c 2019-03-01 19:05:20.555355036 +0200 +@@ -644,7 +644,7 @@ + fprintf(stderr, _(" -i, --device specify network interface (e.g. eth0)\n")); + fprintf(stderr, _(" -D, --use-device read from given device\n")); + fprintf(stderr, _(" -A, -p, --protocol specify protocol family\n")); +- fprintf(stderr, _(" -f, --file read new entries from file or from /etc/ethers\n\n")); ++ fprintf(stderr, _(" -f, --file read new entries from file or from $PREFIX/etc/ethers\n\n")); + + fprintf(stderr, _(" =Use '-H ' to specify hardware address type. Default: %s\n"), DFLT_HW); + fprintf(stderr, _(" List of possible hardware types (which support ARP):\n")); +@@ -791,7 +791,7 @@ + break; + + case 2: /* process an EtherFile */ +- what = arp_file(argv[optind] ? argv[optind] : "/etc/ethers"); ++ what = arp_file(argv[optind] ? argv[optind] : "@TERMUX_PREFIX@/etc/ethers"); + break; + + case 3: /* delete an ARP entry from the cache */ diff --git a/packages/net-tools/build.sh b/packages/net-tools/build.sh index c575aaf3c..2ffef547e 100644 --- a/packages/net-tools/build.sh +++ b/packages/net-tools/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://net-tools.sourceforge.net/ TERMUX_PKG_DESCRIPTION="Configuration tools for Linux networking" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_VERSION=1.60.2017.02.21 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 local commit=479bb4a7e11a4084e2935c0a576388f92469225b TERMUX_PKG_SHA256=7e9f8e8dcbabed0c8eeb976100496567abae7ac9d92c72cebd1a9d965473e943 # We use a mirror to avoid using diff --git a/packages/net-tools/lib-pathnames.h.patch b/packages/net-tools/lib-pathnames.h.patch new file mode 100644 index 000000000..e8a887128 --- /dev/null +++ b/packages/net-tools/lib-pathnames.h.patch @@ -0,0 +1,12 @@ +diff -uNr net-tools/lib/pathnames.h net-tools.mod/lib/pathnames.h +--- net-tools/lib/pathnames.h 2017-02-21 20:24:32.000000000 +0200 ++++ net-tools.mod/lib/pathnames.h 2019-03-01 19:05:45.935478227 +0200 +@@ -47,7 +47,7 @@ + #define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6" + #define _PATH_PROCNET_DEV "/proc/net/dev" + #define _PATH_PROCNET_RARP "/proc/net/rarp" +-#define _PATH_ETHERS "/etc/ethers" ++#define _PATH_ETHERS "@TERMUX_PREFIX@/etc/ethers" + #define _PATH_PROCNET_ROSE "/proc/net/rose" + #define _PATH_PROCNET_ROSE_NEIGH "/proc/net/rose_neigh" + #define _PATH_PROCNET_ROSE_NODES "/proc/net/rose_nodes" diff --git a/packages/net-tools/nameif.c.patch b/packages/net-tools/nameif.c.patch index 3157bbac1..0c42c1ff3 100644 --- a/packages/net-tools/nameif.c.patch +++ b/packages/net-tools/nameif.c.patch @@ -1,5 +1,6 @@ ---- ./nameif.c 2017-02-21 23:54:32.000000000 +0530 -+++ ../nameif.c 2017-04-09 14:47:40.889765378 +0530 +diff -uNr net-tools/nameif.c net-tools.mod/nameif.c +--- net-tools/nameif.c 2017-02-21 20:24:32.000000000 +0200 ++++ net-tools.mod/nameif.c 2019-03-01 19:02:26.447822359 +0200 @@ -10,7 +10,7 @@ #endif #include @@ -9,3 +10,12 @@ #include #include #include +@@ -25,7 +25,7 @@ + #include "net-support.h" + #include "util.h" + +-const char default_conf[] = "/etc/mactab"; ++const char default_conf[] = "@TERMUX_PREFIX@/etc/mactab"; + const char *fname = default_conf; + int use_syslog; + int ctl_sk = -1; diff --git a/packages/net-tools/rarp.c.patch b/packages/net-tools/rarp.c.patch new file mode 100644 index 000000000..f01592894 --- /dev/null +++ b/packages/net-tools/rarp.c.patch @@ -0,0 +1,12 @@ +diff -uNr net-tools/rarp.c net-tools.mod/rarp.c +--- net-tools/rarp.c 2017-02-21 20:24:32.000000000 +0200 ++++ net-tools.mod/rarp.c 2019-03-01 19:06:09.028923071 +0200 +@@ -178,7 +178,7 @@ + fprintf(stderr, _("Usage: rarp -a list entries in cache.\n")); + fprintf(stderr, _(" rarp -d delete entry from cache.\n")); + fprintf(stderr, _(" rarp [] -s add entry to cache.\n")); +- fprintf(stderr, _(" rarp -f add entries from /etc/ethers.\n")); ++ fprintf(stderr, _(" rarp -f add entries from $PREFIX/etc/ethers.\n")); + fprintf(stderr, _(" rarp -V display program version.\n\n")); + + fprintf(stderr, _(" =Use '-H ' to specify hardware address type. Default: %s\n"), DFLT_HW); diff --git a/packages/net-tools/slattach.c.patch b/packages/net-tools/slattach.c.patch new file mode 100644 index 000000000..2b0078f27 --- /dev/null +++ b/packages/net-tools/slattach.c.patch @@ -0,0 +1,12 @@ +diff -uNr net-tools/slattach.c net-tools.mod/slattach.c +--- net-tools/slattach.c 2017-02-21 20:24:32.000000000 +0200 ++++ net-tools.mod/slattach.c 2019-03-01 21:54:06.558251056 +0200 +@@ -55,7 +55,7 @@ + #include "util.h" + + #ifndef _PATH_LOCKD +-#define _PATH_LOCKD "/var/lock" /* lock files */ ++#define _PATH_LOCKD "@TERMUX_PREFIX@/var/lock" /* lock files */ + #endif + #ifndef _UID_UUCP + #define _UID_UUCP "uucp" /* owns locks */