diff --git a/system/base/net-tools/actions.py b/system/base/net-tools/actions.py
index 0c11d1a1..ace05af1 100644
--- a/system/base/net-tools/actions.py
+++ b/system/base/net-tools/actions.py
@@ -11,12 +11,12 @@ from pisi.actionsapi import get
def setup():
pisitools.dosed("Makefile", "(?m)^(COPTS =.*)", "COPTS = %s -fPIE" % get.CFLAGS())
- pisitools.dosed("Makefile", "(?m)^(LOPTS =.*)", "LOPTS = %s -pie" % get.LDFLAGS())
+ pisitools.dosed("Makefile", "(?m)^(LOPTS =.*)", "LOPTS = %s -pie -Wl,-z,now" % get.LDFLAGS())
def build():
shelltools.export("CC", get.CC())
- autotools.make("libdir")
+ autotools.make('libdir')
autotools.make()
autotools.make("ether-wake")
autotools.make("i18ndir")
@@ -27,4 +27,4 @@ def install():
pisitools.dosbin("ether-wake")
pisitools.dosym("/bin/hostname", "/usr/bin/hostname")
- pisitools.dodoc("README", "README.ipv6", "TODO")
+ pisitools.dodoc("README", "README*", "TODO")
diff --git a/system/base/net-tools/files/net-tools-configure.patch b/system/base/net-tools/files/net-tools-configure.patch
new file mode 100644
index 00000000..44fa9f84
--- /dev/null
+++ b/system/base/net-tools/files/net-tools-configure.patch
@@ -0,0 +1,28 @@
+Index: net-tools-2.10/config.in
+===================================================================
+--- net-tools-2.10.orig/config.in
++++ net-tools-2.10/config.in
+@@ -42,7 +42,7 @@
+ * course, welcome. Answer `n' here if you have no support for
+ * internationalization on your system.
+ *
+-bool 'Does your system support GNU gettext?' I18N n
++bool 'Does your system support GNU gettext?' I18N y
+ *
+ *
+ * Protocol Families.
+===================================================================
+--- net-tools-2.10.orig/configure.sh
++++ net-tools-2.10/configure.sh
+@@ -66,9 +66,8 @@ config_fd_redir='<&7'
+ #
+ function readln()
+ {
+- echo -n "$1"
+- IFS='@' read ans || exit 1
+- [ -z "$ans" ] && ans=$2
++ echo "$1"
++ ans=$2
+ }
+
+ # bool processes a boolean argument
diff --git a/system/base/net-tools/files/01_all_net-tools-1.60-2.6-compilefix.patch.bz2 b/system/base/net-tools/files/old-patch/01_all_net-tools-1.60-2.6-compilefix.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/01_all_net-tools-1.60-2.6-compilefix.patch.bz2
rename to system/base/net-tools/files/old-patch/01_all_net-tools-1.60-2.6-compilefix.patch.bz2
diff --git a/system/base/net-tools/files/02_all_net-tools-1.60-gcc34.patch.bz2 b/system/base/net-tools/files/old-patch/02_all_net-tools-1.60-gcc34.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/02_all_net-tools-1.60-gcc34.patch.bz2
rename to system/base/net-tools/files/old-patch/02_all_net-tools-1.60-gcc34.patch.bz2
diff --git a/system/base/net-tools/files/03_all_net-tools-1.60-cleanup-list-handling.patch.bz2 b/system/base/net-tools/files/old-patch/03_all_net-tools-1.60-cleanup-list-handling.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/03_all_net-tools-1.60-cleanup-list-handling.patch.bz2
rename to system/base/net-tools/files/old-patch/03_all_net-tools-1.60-cleanup-list-handling.patch.bz2
diff --git a/system/base/net-tools/files/04_all_net-tools-1.60-get_name.patch.bz2 b/system/base/net-tools/files/old-patch/04_all_net-tools-1.60-get_name.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/04_all_net-tools-1.60-get_name.patch.bz2
rename to system/base/net-tools/files/old-patch/04_all_net-tools-1.60-get_name.patch.bz2
diff --git a/system/base/net-tools/files/20_all_net-tools-1.54-ipvs.patch.bz2 b/system/base/net-tools/files/old-patch/20_all_net-tools-1.54-ipvs.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/20_all_net-tools-1.54-ipvs.patch.bz2
rename to system/base/net-tools/files/old-patch/20_all_net-tools-1.54-ipvs.patch.bz2
diff --git a/system/base/net-tools/files/21_all_net-tools-1.57-bug22040.patch.bz2 b/system/base/net-tools/files/old-patch/21_all_net-tools-1.57-bug22040.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/21_all_net-tools-1.57-bug22040.patch.bz2
rename to system/base/net-tools/files/old-patch/21_all_net-tools-1.57-bug22040.patch.bz2
diff --git a/system/base/net-tools/files/22_all_net-tools-1.60-manydevs.patch.bz2 b/system/base/net-tools/files/old-patch/22_all_net-tools-1.60-manydevs.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/22_all_net-tools-1.60-manydevs.patch.bz2
rename to system/base/net-tools/files/old-patch/22_all_net-tools-1.60-manydevs.patch.bz2
diff --git a/system/base/net-tools/files/23_all_net-tools-1.60-miiioctl.patch.bz2 b/system/base/net-tools/files/old-patch/23_all_net-tools-1.60-miiioctl.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/23_all_net-tools-1.60-miiioctl.patch.bz2
rename to system/base/net-tools/files/old-patch/23_all_net-tools-1.60-miiioctl.patch.bz2
diff --git a/system/base/net-tools/files/24_all_net-tools-1.60-virtualname.patch.bz2 b/system/base/net-tools/files/old-patch/24_all_net-tools-1.60-virtualname.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/24_all_net-tools-1.60-virtualname.patch.bz2
rename to system/base/net-tools/files/old-patch/24_all_net-tools-1.60-virtualname.patch.bz2
diff --git a/system/base/net-tools/files/25_all_net-tools-1.60-cycle.patch.bz2 b/system/base/net-tools/files/old-patch/25_all_net-tools-1.60-cycle.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/25_all_net-tools-1.60-cycle.patch.bz2
rename to system/base/net-tools/files/old-patch/25_all_net-tools-1.60-cycle.patch.bz2
diff --git a/system/base/net-tools/files/26_all_net-tools-1.60-overflow.patch.bz2 b/system/base/net-tools/files/old-patch/26_all_net-tools-1.60-overflow.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/26_all_net-tools-1.60-overflow.patch.bz2
rename to system/base/net-tools/files/old-patch/26_all_net-tools-1.60-overflow.patch.bz2
diff --git a/system/base/net-tools/files/27_all_net-tools-1.60-netstat_ulong.patch.bz2 b/system/base/net-tools/files/old-patch/27_all_net-tools-1.60-netstat_ulong.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/27_all_net-tools-1.60-netstat_ulong.patch.bz2
rename to system/base/net-tools/files/old-patch/27_all_net-tools-1.60-netstat_ulong.patch.bz2
diff --git a/system/base/net-tools/files/50_all_net-tools-1.60-multiline-string.patch.bz2 b/system/base/net-tools/files/old-patch/50_all_net-tools-1.60-multiline-string.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/50_all_net-tools-1.60-multiline-string.patch.bz2
rename to system/base/net-tools/files/old-patch/50_all_net-tools-1.60-multiline-string.patch.bz2
diff --git a/system/base/net-tools/files/51_all_net-tools-1.60-man.patch.bz2 b/system/base/net-tools/files/old-patch/51_all_net-tools-1.60-man.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/51_all_net-tools-1.60-man.patch.bz2
rename to system/base/net-tools/files/old-patch/51_all_net-tools-1.60-man.patch.bz2
diff --git a/system/base/net-tools/files/52_all_net-tools-1.60-numeric-ports.patch.bz2 b/system/base/net-tools/files/old-patch/52_all_net-tools-1.60-numeric-ports.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/52_all_net-tools-1.60-numeric-ports.patch.bz2
rename to system/base/net-tools/files/old-patch/52_all_net-tools-1.60-numeric-ports.patch.bz2
diff --git a/system/base/net-tools/files/53_all_net-tools-1.60-appletalk.patch.bz2 b/system/base/net-tools/files/old-patch/53_all_net-tools-1.60-appletalk.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/53_all_net-tools-1.60-appletalk.patch.bz2
rename to system/base/net-tools/files/old-patch/53_all_net-tools-1.60-appletalk.patch.bz2
diff --git a/system/base/net-tools/files/54_all_net-tools-1.60-wide.patch.bz2 b/system/base/net-tools/files/old-patch/54_all_net-tools-1.60-wide.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/54_all_net-tools-1.60-wide.patch.bz2
rename to system/base/net-tools/files/old-patch/54_all_net-tools-1.60-wide.patch.bz2
diff --git a/system/base/net-tools/files/55_all_net-tools-1.60-Makefile.patch.bz2 b/system/base/net-tools/files/old-patch/55_all_net-tools-1.60-Makefile.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/55_all_net-tools-1.60-Makefile.patch.bz2
rename to system/base/net-tools/files/old-patch/55_all_net-tools-1.60-Makefile.patch.bz2
diff --git a/system/base/net-tools/files/56_all_net-tools-1.60-ipv6-hostname.patch.bz2 b/system/base/net-tools/files/old-patch/56_all_net-tools-1.60-ipv6-hostname.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/56_all_net-tools-1.60-ipv6-hostname.patch.bz2
rename to system/base/net-tools/files/old-patch/56_all_net-tools-1.60-ipv6-hostname.patch.bz2
diff --git a/system/base/net-tools/files/57_all_net-tools-1.60-ifconfig-infiniband.patch.bz2 b/system/base/net-tools/files/old-patch/57_all_net-tools-1.60-ifconfig-infiniband.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/57_all_net-tools-1.60-ifconfig-infiniband.patch.bz2
rename to system/base/net-tools/files/old-patch/57_all_net-tools-1.60-ifconfig-infiniband.patch.bz2
diff --git a/system/base/net-tools/files/60_all_net-tools-1.60-headers.patch.bz2 b/system/base/net-tools/files/old-patch/60_all_net-tools-1.60-headers.patch.bz2
similarity index 100%
rename from system/base/net-tools/files/60_all_net-tools-1.60-headers.patch.bz2
rename to system/base/net-tools/files/old-patch/60_all_net-tools-1.60-headers.patch.bz2
diff --git a/system/base/net-tools/files/large-buffer.patch b/system/base/net-tools/files/old-patch/large-buffer.patch
similarity index 100%
rename from system/base/net-tools/files/large-buffer.patch
rename to system/base/net-tools/files/old-patch/large-buffer.patch
diff --git a/system/base/net-tools/files/net-tools-linux48.patch b/system/base/net-tools/files/old-patch/net-tools-linux48.patch
similarity index 100%
rename from system/base/net-tools/files/net-tools-linux48.patch
rename to system/base/net-tools/files/old-patch/net-tools-linux48.patch
diff --git a/system/base/net-tools/files/pisilinux-Makefile.patch b/system/base/net-tools/files/pisilinux-Makefile.patch
new file mode 100644
index 00000000..cbbed04a
--- /dev/null
+++ b/system/base/net-tools/files/pisilinux-Makefile.patch
@@ -0,0 +1,16 @@
+diff -Nuar a/Makefile b/Makefile
+--- a/Makefile 2022-08-26 15:13:21.675818000 +0300
++++ b/Makefile 2022-08-26 15:18:38.664795897 +0300
+@@ -211,10 +211,10 @@
+ @echo
+ install -m 0755 -d ${BASEDIR}${SBINDIR}
+ install -m 0755 -d ${BASEDIR}${BINDIR}
+- install -m 0755 ifconfig ${BASEDIR}${BINDIR}
++ install -m 0755 ifconfig ${BASEDIR}${SBINDIR}
+ install -m 0755 nameif ${BASEDIR}${SBINDIR}
+ install -m 0755 netstat ${BASEDIR}${BINDIR}
+- install -m 0755 route ${BASEDIR}${BINDIR}
++ install -m 0755 route ${BASEDIR}${SBINDIR}
+ ifeq ($(HAVE_ARP_TOOLS),1)
+ install -m 0755 arp ${BASEDIR}${SBINDIR}
+ install -m 0755 rarp ${BASEDIR}${SBINDIR}
diff --git a/system/base/net-tools/pspec.xml b/system/base/net-tools/pspec.xml
index c221e144..a5027e73 100644
--- a/system/base/net-tools/pspec.xml
+++ b/system/base/net-tools/pspec.xml
@@ -12,34 +12,34 @@
app:console
Standard Linux networking tools
net-tools is a collection of programs that form the base set of the networking tools for the Linux operating system. It includes arp, hostname, ifconfig, ipmaddr, iptunnel, mii-tool, nameif, netstat, plipconfig, rarp, route and slattach.
- https://sourceforge.net/projects/net-tools/files/net-tools-1.60.tar.bz2
+ https://sourceforge.net/projects/net-tools/files/net-tools-2.10.tar.xz
- 01_all_net-tools-1.60-2.6-compilefix.patch.bz2
- 02_all_net-tools-1.60-gcc34.patch.bz2
- 03_all_net-tools-1.60-cleanup-list-handling.patch.bz2
- 04_all_net-tools-1.60-get_name.patch.bz2
- 20_all_net-tools-1.54-ipvs.patch.bz2
- 21_all_net-tools-1.57-bug22040.patch.bz2
- 22_all_net-tools-1.60-manydevs.patch.bz2
- 23_all_net-tools-1.60-miiioctl.patch.bz2
- 24_all_net-tools-1.60-virtualname.patch.bz2
- 25_all_net-tools-1.60-cycle.patch.bz2
- 26_all_net-tools-1.60-overflow.patch.bz2
- 27_all_net-tools-1.60-netstat_ulong.patch.bz2
- 50_all_net-tools-1.60-multiline-string.patch.bz2
- 51_all_net-tools-1.60-man.patch.bz2
- 52_all_net-tools-1.60-numeric-ports.patch.bz2
- 53_all_net-tools-1.60-appletalk.patch.bz2
- 54_all_net-tools-1.60-wide.patch.bz2
- 55_all_net-tools-1.60-Makefile.patch.bz2
- 56_all_net-tools-1.60-ipv6-hostname.patch.bz2
- 57_all_net-tools-1.60-ifconfig-infiniband.patch.bz2
- 60_all_net-tools-1.60-headers.patch.bz2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
net-tools-missing.patch
- net-tools-linux48.patch
+ pisilinux-Makefile.patch
kernel_headers.patch
gcc-4.3.patch
- large-buffer.patch
+ net-tools-configure.patch
@@ -61,6 +61,13 @@
+
+ 2022-08-25
+ 2.10
+ Rebuild.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2020-12-09
1.60