Skip to content

Commit b21ffb4

Browse files
committed
update cli-net tools; add: arp-scan, update: screen, socat, nmap
- update screen to version 4.8.0 - update socat to version 1.7.3.4 - update nmap to version 7.80 - add arp-scan (#3519) - add diyspk for screen, socat, sshfs, nmap, arp-scan - remove openssl.cnf from openssl/PLIST as it is not installed anymore (see #4192) - add spk target all-general to build the same arch-tc combinations as github build action does
1 parent 2778dbf commit b21ffb4

33 files changed

+235
-1085
lines changed

cross/arp-scan/Makefile

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
PKG_NAME = arp-scan
2+
PKG_VERS = 1.9
3+
PKG_EXT = tar.gz
4+
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
5+
PKG_DIST_SITE = https://github.com/royhills/$(PKG_NAME)/releases/download/$(PKG_VERS)
6+
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
7+
8+
DEPENDS = cross/libpcap
9+
10+
HOMEPAGE = http://www.royhills.co.uk/wiki/index.php/Arp-scan_User_Guide
11+
COMMENT = Command-line tool for system discovery and fingerprinting. It constructs and sends ARP requests to the specified IP addresses, and displays any responses that are received.
12+
LICENSE = MIT
13+
GNU_CONFIGURE = 1
14+
# use the standard C99 format (it cannot be determined due to cross compilation)
15+
CONFIGURE_ARGS = pgac_cv_snprintf_long_long_int_format="%lld"
16+
# needed for compilation to avoid warning "_FORTIFY_SOURCE requires compiling with optimization (-O)"
17+
ADDITIONAL_CPPFLAGS = -O3
18+
19+
include ../../mk/spksrc.cross-cc.mk

cross/arp-scan/PLIST

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
rsc:bin/arp-fingerprint
2+
bin:bin/arp-scan
3+
rsc:bin/get-iab
4+
rsc:bin/get-oui
5+
rsc:share/arp-scan

cross/arp-scan/digests

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
arp-scan-1.9.tar.gz SHA1 6bf698572b21242778df9d2019fd386b2a21a135
2+
arp-scan-1.9.tar.gz SHA256 ce908ac71c48e85dddf6dd4fe5151d13c7528b1f49717a98b2a2535bd797d892
3+
arp-scan-1.9.tar.gz MD5 38584d6c1edfa9f6b41d496e4a5539f1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# update url for iab.txt
2+
# fix wide character output
3+
4+
--- get-iab.org 2013-04-15 09:24:43.000000000 +0000
5+
+++ get-iab 2020-09-27 14:49:27.962936234 +0000
6+
@@ -36,7 +36,7 @@
7+
use Getopt::Std;
8+
use LWP::Simple;
9+
#
10+
-my $default_url = 'http://standards.ieee.org/develop/regauth/iab/iab.txt';
11+
+my $default_url = 'http://standards-oui.ieee.org/iab/iab.txt';
12+
my $default_filename='ieee-iab.txt';
13+
#
14+
my $usage =
15+
@@ -99,6 +99,8 @@
16+
#
17+
print "Opening output file $filename\n" if $verbose;
18+
open OUTPUT, ">$filename" || die "Could not open $filename for writing";
19+
+# avoid error "Wide character in print at /usr/local/bin/get-iab line 147."
20+
+binmode(OUTPUT, ":utf8");
21+
#
22+
# Write the header comments to the output file.
23+
#
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# update url for out.txt
2+
# fix wide character output
3+
4+
--- get-oui.org 2013-04-15 09:24:43.000000000 +0000
5+
+++ get-oui 2020-09-27 15:04:28.802007198 +0000
6+
@@ -32,7 +32,7 @@
7+
use Getopt::Std;
8+
use LWP::Simple;
9+
#
10+
-my $default_url = 'http://standards.ieee.org/develop/regauth/oui/oui.txt';
11+
+my $default_url = 'http://standards-oui.ieee.org/oui/oui.txt';
12+
my $default_filename='ieee-oui.txt';
13+
#
14+
my $usage =
15+
@@ -93,6 +93,8 @@
16+
#
17+
print "Opening output file $filename\n" if $verbose;
18+
open OUTPUT, ">$filename" || die "Could not open $filename for writing";
19+
+# avoid error "Wide character in print at /usr/local/bin/get-oui line 135."
20+
+binmode(OUTPUT, ":utf8");
21+
#
22+
# Write the header comments to the output file.
23+
#

cross/fuse/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ LICENSE = GPLv2, LGPLv2.1 (libfuse.so, libulockmgr.so)
1313

1414
GNU_CONFIGURE = 1
1515
CONFIGURE_ARGS += enable_example=no
16-
PRE_CONFIGURE_TARGET = run_makeconf
16+
PRE_CONFIGURE_TARGET = fuse_pre_configure
1717

1818
ENV += MOUNT_FUSE_PATH=/$(INSTALL_PREFIX)/sbin
1919

2020
include ../../mk/spksrc.cross-cc.mk
2121

22-
.PHONY: run_makeconf
23-
run_makeconf:
22+
.PHONY: fuse_pre_configure
23+
fuse_pre_configure:
2424
$(RUN) ./makeconf.sh

cross/nmap/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = nmap
2-
PKG_VERS = 7.70
2+
PKG_VERS = 7.80
33
PKG_EXT = tar.bz2
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://nmap.org/dist
@@ -13,5 +13,7 @@ LICENSE = https://svn.nmap.org/nmap/COPYING
1313

1414
GNU_CONFIGURE = 1
1515
CONFIGURE_ARGS = --without-zenmap --without-ncat --with-liblua=included --with-libpcre=included
16+
# needed for compilation to avoid warning "_FORTIFY_SOURCE requires compiling with optimization (-O)"
17+
ADDITIONAL_CPPFLAGS = -O3
1618

1719
include ../../mk/spksrc.cross-cc.mk

cross/nmap/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
nmap-7.70.tar.bz2 SHA1 71057361a0953bba5967dc0385de77f3eed792de
2-
nmap-7.70.tar.bz2 SHA256 847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e18
3-
nmap-7.70.tar.bz2 MD5 84eb6fbe788e0d4918c2b1e39421bf79
1+
nmap-7.80.tar.bz2 SHA1 cfd8162192cfe2623f5770b8ed3c6237791ff6bf
2+
nmap-7.80.tar.bz2 SHA256 fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4773faa
3+
nmap-7.80.tar.bz2 MD5 d37b75b06d1d40f27b76d60db420a1f5

cross/openssl/PLIST

-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ lnk:lib/libcrypto.so
1616
lib:lib/libcrypto.so.1.0.0
1717
lnk:lib/libssl.so
1818
lib:lib/libssl.so.1.0.0
19-
rsc:openssl.cnf

cross/screen/Makefile

+9-16
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,27 @@
11
PKG_NAME = screen
2-
PKG_VERS = 4.0.3
2+
PKG_VERS = 4.8.0
33
PKG_EXT = tar.gz
44
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
55
PKG_DIST_SITE = http://ftp.gnu.org/gnu/$(PKG_NAME)
66
PKG_DIST_NAME = $(PKG_DIR).$(PKG_EXT)
77

8-
DEPENDS = cross/ncurses
8+
DEPENDS = cross/ncursesw
99

1010
HOMEPAGE = https://www.gnu.org/software/screen/
1111
COMMENT = Screen is a full-screen window manager that multiplexes a physical terminal between several processes, typically interactive shells.
1212
LICENSE = GPLv2
1313

1414
GNU_CONFIGURE = 1
15-
PRE_CONFIGURE_TARGET = screen_pre_configure_target
16-
INSTALL_TARGET = screen_install_target
17-
18-
PATCHES_LEVEL = 1
19-
20-
CONFIGURE_ARGS = --with-pty-mode=0620 --with-pty-group=5
21-
#TODO: Do like in OE, put this in the toolchain configuration file
22-
CONFIGURE_ARGS += screen_cv_sys_bcopy_overlap=no screen_cv_sys_memcpy_overlap=no screen_cv_sys_memmove_overlap=no screen_cv_sys_fifo_broken_impl=no
23-
CONFIGURE_ARGS += screen_cv_sys_fifo_usable=yes screen_cv_sys_select_broken_retval=no screen_cv_sys_sockets_nofs=no screen_cv_sys_sockets_usable=yes
24-
CONFIGURE_ARGS += screen_cv_sys_terminfo_used=yes
15+
PRE_CONFIGURE_TARGET = screen_pre_configure
16+
INSTALL_TARGET = screen_install
2517

18+
2619
include ../../mk/spksrc.cross-cc.mk
2720

28-
.PHONY: screen_pre_configure_target
29-
screen_pre_configure_target:
21+
.PHONY: screen_pre_configure
22+
screen_pre_configure:
3023
$(RUN) autoconf
3124

32-
.PHONY: screen_install_target
33-
screen_install_target:
25+
.PHONY: screen_install
26+
screen_install:
3427
$(RUN) install -c screen $(STAGING_INSTALL_PREFIX)/bin/$(PKG_NAME)

cross/screen/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
screen-4.0.3.tar.gz SHA1 7bc6e2f0959ffaae6f52d698c26c774e7dec3545
2-
screen-4.0.3.tar.gz SHA256 78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77
3-
screen-4.0.3.tar.gz MD5 8506fd205028a96c741e4037de6e3c42
1+
screen-4.8.0.tar.gz SHA1 2328927e10e68d357bdfec7bd740726011e834e9
2+
screen-4.8.0.tar.gz SHA256 6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1
3+
screen-4.8.0.tar.gz MD5 d276213d3acd10339cd37848b8c4ab1e

0 commit comments

Comments
 (0)