Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1402 from Rmys/master

Browse Source 
net-tools-2.10
This commit is contained in:
Rmys
2022-08-26 16:52:43 +03:00
committed by GitHub
parent fbc06fe5be 07dcdfcb1f
commit d28934b29b
27 changed files with 78 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/base/net-tools/actions.py
+3 -3
View File
@@ -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")
system/base/net-tools/files/net-tools-configure.patch
+28
View File
@@ -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
system/base/net-tools/files/01_all_net-tools-1.60-2.6-compilefix.patch.bz2 → system/base/net-tools/files/old-patch/01_all_net-tools-1.60-2.6-compilefix.patch.bz2
View File
system/base/net-tools/files/02_all_net-tools-1.60-gcc34.patch.bz2 → system/base/net-tools/files/old-patch/02_all_net-tools-1.60-gcc34.patch.bz2
View File
system/base/net-tools/files/03_all_net-tools-1.60-cleanup-list-handling.patch.bz2 → system/base/net-tools/files/old-patch/03_all_net-tools-1.60-cleanup-list-handling.patch.bz2
View File
system/base/net-tools/files/04_all_net-tools-1.60-get_name.patch.bz2 → system/base/net-tools/files/old-patch/04_all_net-tools-1.60-get_name.patch.bz2
View File
system/base/net-tools/files/20_all_net-tools-1.54-ipvs.patch.bz2 → system/base/net-tools/files/old-patch/20_all_net-tools-1.54-ipvs.patch.bz2
View File
system/base/net-tools/files/21_all_net-tools-1.57-bug22040.patch.bz2 → system/base/net-tools/files/old-patch/21_all_net-tools-1.57-bug22040.patch.bz2
View File
system/base/net-tools/files/22_all_net-tools-1.60-manydevs.patch.bz2 → system/base/net-tools/files/old-patch/22_all_net-tools-1.60-manydevs.patch.bz2
View File
system/base/net-tools/files/23_all_net-tools-1.60-miiioctl.patch.bz2 → system/base/net-tools/files/old-patch/23_all_net-tools-1.60-miiioctl.patch.bz2
View File
system/base/net-tools/files/24_all_net-tools-1.60-virtualname.patch.bz2 → system/base/net-tools/files/old-patch/24_all_net-tools-1.60-virtualname.patch.bz2
View File
system/base/net-tools/files/25_all_net-tools-1.60-cycle.patch.bz2 → system/base/net-tools/files/old-patch/25_all_net-tools-1.60-cycle.patch.bz2
View File
system/base/net-tools/files/26_all_net-tools-1.60-overflow.patch.bz2 → system/base/net-tools/files/old-patch/26_all_net-tools-1.60-overflow.patch.bz2
View File
system/base/net-tools/files/27_all_net-tools-1.60-netstat_ulong.patch.bz2 → system/base/net-tools/files/old-patch/27_all_net-tools-1.60-netstat_ulong.patch.bz2
View File
system/base/net-tools/files/50_all_net-tools-1.60-multiline-string.patch.bz2 → system/base/net-tools/files/old-patch/50_all_net-tools-1.60-multiline-string.patch.bz2
View File
system/base/net-tools/files/51_all_net-tools-1.60-man.patch.bz2 → system/base/net-tools/files/old-patch/51_all_net-tools-1.60-man.patch.bz2
View File
system/base/net-tools/files/52_all_net-tools-1.60-numeric-ports.patch.bz2 → system/base/net-tools/files/old-patch/52_all_net-tools-1.60-numeric-ports.patch.bz2
View File
system/base/net-tools/files/53_all_net-tools-1.60-appletalk.patch.bz2 → system/base/net-tools/files/old-patch/53_all_net-tools-1.60-appletalk.patch.bz2
View File
system/base/net-tools/files/54_all_net-tools-1.60-wide.patch.bz2 → system/base/net-tools/files/old-patch/54_all_net-tools-1.60-wide.patch.bz2
View File
system/base/net-tools/files/55_all_net-tools-1.60-Makefile.patch.bz2 → system/base/net-tools/files/old-patch/55_all_net-tools-1.60-Makefile.patch.bz2
View File
system/base/net-tools/files/56_all_net-tools-1.60-ipv6-hostname.patch.bz2 → system/base/net-tools/files/old-patch/56_all_net-tools-1.60-ipv6-hostname.patch.bz2
View File
system/base/net-tools/files/57_all_net-tools-1.60-ifconfig-infiniband.patch.bz2 → system/base/net-tools/files/old-patch/57_all_net-tools-1.60-ifconfig-infiniband.patch.bz2
View File
system/base/net-tools/files/60_all_net-tools-1.60-headers.patch.bz2 → system/base/net-tools/files/old-patch/60_all_net-tools-1.60-headers.patch.bz2
View File
system/base/net-tools/files/large-buffer.patch → system/base/net-tools/files/old-patch/large-buffer.patch
View File
system/base/net-tools/files/net-tools-linux48.patch → system/base/net-tools/files/old-patch/net-tools-linux48.patch
View File
system/base/net-tools/files/pisilinux-Makefile.patch
+16
View File
@@ -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}
system/base/net-tools/pspec.xml
+31 -24
View File
@@ -12,34 +12,34 @@
<IsA>app:console</IsA>
<Summary>Standard Linux networking tools</Summary>
<Description>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.</Description>
<Archive sha1sum="944fb70641505d5d1139dba3aeb81ba124574b83" type="tarbz2">https://sourceforge.net/projects/net-tools/files/net-tools-1.60.tar.bz2</Archive>
<Archive sha1sum="4080baab0486dc882c3b293d5559c27251ae4268" type="tarxz">https://sourceforge.net/projects/net-tools/files/net-tools-2.10.tar.xz</Archive>
<Patches>
<Patch compressionType="bz2" level="1">01_all_net-tools-1.60-2.6-compilefix.patch.bz2</Patch>
<Patch compressionType="bz2">02_all_net-tools-1.60-gcc34.patch.bz2</Patch>
<Patch compressionType="bz2">03_all_net-tools-1.60-cleanup-list-handling.patch.bz2</Patch>
<Patch compressionType="bz2" level="1">04_all_net-tools-1.60-get_name.patch.bz2</Patch>
<Patch compressionType="bz2" level="1">20_all_net-tools-1.54-ipvs.patch.bz2</Patch>
<Patch compressionType="bz2" level="1">21_all_net-tools-1.57-bug22040.patch.bz2</Patch>
<Patch compressionType="bz2">22_all_net-tools-1.60-manydevs.patch.bz2</Patch>
<Patch compressionType="bz2" level="1">23_all_net-tools-1.60-miiioctl.patch.bz2</Patch>
<Patch compressionType="bz2" level="1">24_all_net-tools-1.60-virtualname.patch.bz2</Patch>
<Patch compressionType="bz2" level="1">25_all_net-tools-1.60-cycle.patch.bz2</Patch>
<Patch compressionType="bz2" level="1">26_all_net-tools-1.60-overflow.patch.bz2</Patch>
<Patch compressionType="bz2" level="1">27_all_net-tools-1.60-netstat_ulong.patch.bz2</Patch>
<Patch compressionType="bz2" level="1">50_all_net-tools-1.60-multiline-string.patch.bz2</Patch>
<Patch compressionType="bz2">51_all_net-tools-1.60-man.patch.bz2</Patch>
<Patch compressionType="bz2" level="1">52_all_net-tools-1.60-numeric-ports.patch.bz2</Patch>
<Patch compressionType="bz2" level="1">53_all_net-tools-1.60-appletalk.patch.bz2</Patch>
<Patch compressionType="bz2" level="1">54_all_net-tools-1.60-wide.patch.bz2</Patch>
<Patch compressionType="bz2">55_all_net-tools-1.60-Makefile.patch.bz2</Patch>
<Patch compressionType="bz2">56_all_net-tools-1.60-ipv6-hostname.patch.bz2</Patch>
<Patch compressionType="bz2" level="1">57_all_net-tools-1.60-ifconfig-infiniband.patch.bz2</Patch>
<Patch compressionType="bz2" level="1">60_all_net-tools-1.60-headers.patch.bz2</Patch>
<!-- <Patch compressionType="bz2" level="1">01_all_net-tools-1.60-2.6-compilefix.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2">02_all_net-tools-1.60-gcc34.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2">03_all_net-tools-1.60-cleanup-list-handling.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2" level="1">04_all_net-tools-1.60-get_name.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2" level="1">20_all_net-tools-1.54-ipvs.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2" level="1">21_all_net-tools-1.57-bug22040.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2">22_all_net-tools-1.60-manydevs.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2" level="1">23_all_net-tools-1.60-miiioctl.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2" level="1">24_all_net-tools-1.60-virtualname.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2" level="1">25_all_net-tools-1.60-cycle.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2" level="1">26_all_net-tools-1.60-overflow.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2" level="1">27_all_net-tools-1.60-netstat_ulong.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2" level="1">50_all_net-tools-1.60-multiline-string.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2">51_all_net-tools-1.60-man.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2" level="1">52_all_net-tools-1.60-numeric-ports.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2" level="1">53_all_net-tools-1.60-appletalk.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2" level="1">54_all_net-tools-1.60-wide.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2">55_all_net-tools-1.60-Makefile.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2">56_all_net-tools-1.60-ipv6-hostname.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2" level="1">57_all_net-tools-1.60-ifconfig-infiniband.patch.bz2</Patch> -->
<!-- <Patch compressionType="bz2" level="1">60_all_net-tools-1.60-headers.patch.bz2</Patch> -->
<Patch level="1">net-tools-missing.patch</Patch>
<Patch level="1">net-tools-linux48.patch</Patch><!--fedora-->
<Patch level="1">pisilinux-Makefile.patch</Patch>
<Patch level="1">kernel_headers.patch</Patch>
<Patch>gcc-4.3.patch</Patch>
<Patch>large-buffer.patch</Patch>
<Patch>net-tools-configure.patch</Patch>
</Patches>
</Source>
@@ -61,6 +61,13 @@
</Package>
<History>
<Update release="7">
<Date>2022-08-25</Date>
<Version>2.10</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6">
<Date>2020-12-09</Date>
<Version>1.60</Version>