synocli-net: add netcat and update some tools (#5808)

* add netcat for synocli-net (#5805)

* update ser2net to v4.3.12

* update nmap and add ncat command
- enable build of ncat within nmap
- update nmap from v7.93 to v7.94
- downgrade nmap to v7.92 for OLD_PPC_ARCHS (7.93 fails to build ncat for OLD_PPC_ARCHS)

* add netcat to synocli-net

* libuv: use alternate download site

cross/gensio/Makefile

@@ -1,8 +1,8 @@
 PKG_NAME = gensio
-PKG_VERS = 2.2.9
+PKG_VERS = 2.3.9
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://github.com/cminyard/$(PKG_NAME)/archive
+PKG_DIST_SITE = https://github.com/cminyard/gensio/archive
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
@@ -18,7 +18,10 @@ DEPENDS = cross/openssl
 GNU_CONFIGURE = 1
 PRE_CONFIGURE_TARGET = gensio_pre_configure
 
-CONFIGURE_ARGS = --with-python=no --with-swig=no
+CONFIGURE_ARGS  = --disable-static
+CONFIGURE_ARGS += --with-python=no
+CONFIGURE_ARGS += --with-swig=no
+CONFIGURE_ARGS += --disable-doc
 
 include ../../mk/spksrc.cross-cc.mk
 

cross/gensio/digests

@@ -1,3 +1,3 @@
-gensio-2.2.9.tar.gz SHA1 8cd7a991c43b1e35e5cfc15661ea89de2530409a
-gensio-2.2.9.tar.gz SHA256 ee42d880481b38a75f52f533e844519aa318d00516bce805f0900ef0d23def35
-gensio-2.2.9.tar.gz MD5 8891555b5900102ca95ff3fab817b91f
+gensio-2.3.9.tar.gz SHA1 563df4e914ee1335199f22e7a2259f1fb30df361
+gensio-2.3.9.tar.gz SHA256 ff1ba0dad0f5b259b7452eaa4f1a18debe81f8010b9ff6dc8c75fddaee040fd9
+gensio-2.3.9.tar.gz MD5 296d99c4bab43c531cab6a44261c067c

cross/libpcap/Makefile

@@ -5,6 +5,8 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.tcpdump.org/release
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
+# this is the latests version that builds for OLD_PPC_ARCHS
+
 DEPENDS =
 
 HOMEPAGE = https://www.tcpdump.org/

cross/libpcap/PLIST

@@ -1,4 +1,3 @@
-rsc:bin/pcap-config
 lnk:lib/libpcap.so
 lnk:lib/libpcap.so.1
 lib:lib/libpcap.so.1.9.1

cross/libuv/Makefile

@@ -1,9 +1,10 @@
 PKG_NAME = libuv
 PKG_VERS = 1.44.2
 PKG_EXT = tar.gz
-PKG_DIST_NAME = $(PKG_NAME)-v$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://dist.libuv.org/dist/v$(PKG_VERS)
-PKG_DIR = $(PKG_NAME)-v$(PKG_VERS)
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/libuv/libuv/archive
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS =
 

cross/libuv/digests

@@ -1,3 +1,3 @@
-libuv-v1.44.2.tar.gz SHA1 cefe49f783fbcfe110b27a8ae10099def895f54f
-libuv-v1.44.2.tar.gz SHA256 ccfcdc968c55673c6526d8270a9c8655a806ea92468afcbcabc2b16040f03cb4
-libuv-v1.44.2.tar.gz MD5 0addbddcb1098e2c1c99f03f0108e1e7
+libuv-1.44.2.tar.gz SHA1 0ea9726936755088e9c01d30caacfca1a384f3bb
+libuv-1.44.2.tar.gz SHA256 e6e2ba8b4c349a4182a33370bb9be5e23c51b32efb9b9e209d0e8556b73a48da
+libuv-1.44.2.tar.gz MD5 ce2e634d6af6e545dd02f5f19ea1465f

cross/netcat/Makefile

@@ -0,0 +1,18 @@
+PKG_NAME = netcat
+PKG_VERS = 0.7.1
+PKG_EXT = tar.bz2
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = http://sourceforge.net/projects/netcat/files/netcat/$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS =
+
+HOMEPAGE = https://netcat.sourceforge.net/
+COMMENT  = Netcat is a featured networking utility which reads and writes data across network connections, using the TCP/IP protocol.
+LICENSE  = GPLv2
+
+GNU_CONFIGURE = 1
+CONFIGURE_ARGS = --disable-static
+ADDITIONAL_CFLAGS = -O
+
+include ../../mk/spksrc.cross-cc.mk

cross/netcat/PLIST

@@ -0,0 +1,2 @@
+lnk:bin/nc
+bin:bin/netcat

cross/netcat/digests

@@ -0,0 +1,3 @@
+netcat-0.7.1.tar.bz2 SHA1 b761d70fe9e3e8b3fe33a329b9bc31300dc04d11
+netcat-0.7.1.tar.bz2 SHA256 b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb
+netcat-0.7.1.tar.bz2 MD5 0a29eff1736ddb5effd0b1ec1f6fe0ef

cross/nmap/Makefile

@@ -1,26 +1,22 @@
 PKG_NAME = nmap
-PKG_VERS = 7.93
+PKG_VERS = 7.94
 PKG_EXT = tar.bz2
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://nmap.org/dist
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/libpcap cross/openssl
 
+# latest version for OLD_PPC_ARCHS is 7.92
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+
 HOMEPAGE = https://nmap.org/
-COMMENT  = Nmap ("Network Mapper") is a free and open source utility for network discovery and security auditing
+COMMENT  = Nmap ("Network Mapper") is a free and open source utility for network discovery and security auditing.
 LICENSE  = https://svn.nmap.org/nmap/COPYING
 
 GNU_CONFIGURE = 1
-CONFIGURE_ARGS = --without-zenmap --without-ncat --with-liblua=included --with-libpcre=included
-# needed for compilation to avoid warning "_FORTIFY_SOURCE requires compiling with optimization (-O)"
-ADDITIONAL_CPPFLAGS = -O3
+CONFIGURE_ARGS = --without-zenmap --with-liblua=included --with-libpcre=included
 
-POST_INSTALL_TARGET = nmap_post_install
+ADDITIONAL_CPPFLAGS = -O3
 
 include ../../mk/spksrc.cross-cc.mk
-
-.PHONY: nmap_post_install
-nmap_post_install:
-	sed -i -e  '1 s|^#!/usr/bin/python2|#!/usr/bin/python|g' $(STAGING_INSTALL_PREFIX)/bin/ndiff
-	cp $(STAGING_INSTALL_PREFIX)/lib/python2.7/site-packages/ndiff.py $(STAGING_INSTALL_PREFIX)/bin/

cross/nmap/PLIST

@@ -1,5 +1,6 @@
+bin:bin/ncat
 rsc:bin/ndiff
-rsc:bin/ndiff.py
 bin:bin/nmap
 bin:bin/nping
+rsc:share/ncat
 rsc:share/nmap

cross/nmap/digests

@@ -1,3 +1,3 @@
-nmap-7.93.tar.bz2 SHA1 b9ad8849d3108e1f3c94a0d5cda59173d7807a7f
-nmap-7.93.tar.bz2 SHA256 55bcfe4793e25acc96ba4274d8c4228db550b8e8efd72004b38ec55a2dd16651
-nmap-7.93.tar.bz2 MD5 9027eac4b8ca57574012cb061ba9ce4d
+nmap-7.94.tar.bz2 SHA1 206f7931c5d08359fd5bf12b160b27fe5360b597
+nmap-7.94.tar.bz2 SHA256 d71be189eec43d7e099bac8571509d316c4577ca79491832ac3e1217bc8f92cc
+nmap-7.94.tar.bz2 MD5 4f65e08148d1eaac6b1a1482e7185e1d

cross/nmap_7.92/Makefile

@@ -0,0 +1,24 @@
+PKG_NAME = nmap
+# nmap 7.92 is the latest version for OLD_PPC_ARCHS
+PKG_VERS = 7.92
+PKG_EXT = tar.bz2
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://nmap.org/dist
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/libpcap cross/openssl
+
+HOMEPAGE = https://nmap.org/
+COMMENT  = Nmap ("Network Mapper") is a free and open source utility for network discovery and security auditing.
+LICENSE  = https://svn.nmap.org/nmap/COPYING
+
+GNU_CONFIGURE = 1
+CONFIGURE_ARGS = --without-zenmap --with-liblua=included --with-libpcre=included
+ADDITIONAL_CPPFLAGS = -O3
+
+include ../../mk/spksrc.archs.mk
+ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
+ADDITIONAL_CPPFLAGS += -DLUA_32BITS
+endif
+
+include ../../mk/spksrc.cross-cc.mk

cross/nmap_7.92/PLIST

@@ -0,0 +1,6 @@
+bin:bin/ncat
+rsc:bin/ndiff
+bin:bin/nmap
+bin:bin/nping
+rsc:share/ncat
+rsc:share/nmap

cross/nmap_7.92/digests

@@ -0,0 +1,3 @@
+nmap-7.92.tar.bz2 SHA1 62342a9a6641833c5c16b7a24ced4bace68c60fb
+nmap-7.92.tar.bz2 SHA256 a5479f2f8a6b0b2516767d2f7189c386c1dc858d997167d7ec5cfc798c7571a1
+nmap-7.92.tar.bz2 MD5 849f7298a786ce4cd5728db989cff763

cross/ser2net/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = ser2net
-PKG_VERS = 4.3.11
+PKG_VERS = 4.3.12
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/cminyard/ser2net/archive
@@ -8,6 +8,9 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/gensio cross/libyaml
 
+# cross/gensio
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+
 HOMEPAGE = https://sourceforge.net/projects/ser2net/
 COMMENT  = Serial to network interface, allows TCP/UDP to serial port connections.
 LICENSE  = GPLv2

cross/ser2net/digests

@@ -1,3 +1,3 @@
-ser2net-4.3.11.tar.gz SHA1 95593df99f93f2ea0fc221ab3d4470f402360ffe
-ser2net-4.3.11.tar.gz SHA256 ff5c8904869e4ab52298fa8704e6ecd969d565ff20cb697b2be5cd4c883383bd
-ser2net-4.3.11.tar.gz MD5 c00fea478e59c61dd6adc93641a77438
+ser2net-4.3.12.tar.gz SHA1 c664e4e5b854a7a0232321154343139902e9f3f7
+ser2net-4.3.12.tar.gz SHA256 40195025eeb17021bb7d525820b32beb50f8c3f65a75f3dfbb67079258d21796
+ser2net-4.3.12.tar.gz MD5 0fb3e98eb45c9a7ccb8cfde58835e64e

diyspk/netcat/Makefile

@@ -0,0 +1,17 @@
+SPK_NAME = netcat
+SPK_VERS = 0.7.1
+SPK_REV = 1
+
+DEPENDS = cross/netcat
+
+MAINTAINER = SynoCommunity
+DESCRIPTION = Netcat is a featured networking utility which reads and writes data across network connections, using the TCP/IP protocol.
+DISPLAY_NAME = netcat
+STARTABLE = no
+
+HOMEPAGE = https://netcat.sourceforge.net/
+LICENSE = GPLv2
+
+SPK_COMMANDS = bin/nc bin/netcat
+
+include ../../mk/spksrc.spk.mk

diyspk/nmap/Makefile

@@ -1,18 +1,25 @@
 SPK_NAME = nmap
-SPK_VERS = 7.93
+SPK_VERS = 7.94
 SPK_REV = 1
 SPK_ICON = src/nmap.png
 
-DEPENDS = cross/nmap
+OPTIONAL_DEPENDS = cross/nmap cross/nmap_7.92
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = Nmap \(Network Mapper\) is a free and open source utility for network discovery and security auditing.
 DISPLAY_NAME = nmap
 STARTABLE = no
 
 HOMEPAGE = https://nmap.org/
-LICENSE  = https://svn.nmap.org/nmap/COPYING
+LICENSE  = https://svn.nmap.org/nmap/LICENSE
+
+include ../../mk/spksrc.archs.mk
+ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
+DEPENDS = cross/nmap_7.92
+else
+DEPENDS = cross/nmap
+endif
 
-SPK_COMMANDS = bin/nmap bin/nping bin/ndiff
+SPK_COMMANDS = bin/ncat bin/nmap bin/nping bin/ndiff
 
 include ../../mk/spksrc.spk.mk

diyspk/ser2net/Makefile

@@ -1,5 +1,5 @@
 SPK_NAME = ser2net
-SPK_VERS = 4.3.10
+SPK_VERS = 4.3.12
 SPK_REV = 1
 SPK_ICON = src/ser2net.png
 

spk/synocli-net/Makefile

@@ -1,15 +1,16 @@
 SPK_NAME = synocli-net
-SPK_VERS = 2.2
-SPK_REV = 16
+SPK_VERS = 2.3
+SPK_REV = 17
 SPK_ICON = src/synocli-net.png
 
-DEPENDS = cross/screen cross/tmux cross/nmap cross/links cross/socat
+DEPENDS = cross/screen cross/tmux cross/links cross/socat
 DEPENDS += cross/rsync cross/autossh cross/arp-scan
 DEPENDS += cross/mtr
 DEPENDS += cross/etherwake
 DEPENDS += cross/inetutils
+DEPENDS += cross/netcat
 
-OPTIONAL_DEPENDS = cross/sshfs2 cross/sshfs3 cross/ser2net cross/bind cross/aria2
+OPTIONAL_DEPENDS = cross/sshfs2 cross/sshfs3 cross/ser2net cross/bind cross/aria2 cross/nmap cross/nmap_7.92
 
 include ../../mk/spksrc.common.mk
 
@@ -20,6 +21,9 @@ DEPENDS += cross/bind
 OPTIONAL_DESC := $(OPTIONAL_DESC)", arpaname, delv, dig, mdig"
 DEPENDS += cross/ser2net
 OPTIONAL_DESC := $(OPTIONAL_DESC)", ser2net"
+DEPENDS += cross/nmap
+else
+DEPENDS += cross/nmap_7.92
 endif
 
 ifeq ($(call version_lt,${TCVERSION},6.0)$(call version_ge,${TCVERSION},3.0),11)
@@ -44,14 +48,14 @@ MAINTAINER = ymartin59
 DESCRIPTION = "SynoCli Network Tools provides a set of small command-line utilities: screen, tmux, socat, nmap, arp-scan, mtr \(My traceroute\), links, rsync, autossh \(including openssh, sftp and scp\), etherwake, telnet, whois, sshfs$(OPTIONAL_DESC)."
 DISPLAY_NAME = SynoCli Network Tools
 STARTABLE = no
-CHANGELOG = "1. Update openssl to v1.1.1t.<br/>2. Update openssh to v9.3p1.<br/>3. Update links to v2.29.<br/>4. Update arp-scan to v1.10.0.<br/>5. Update ser2net to v4.3.11."
+CHANGELOG = "1. Add netcat.<br/>2. Update openssl to v1.1.1u.<br/>3. Update nmap to v7.94 and include ncat (latest nmap for old ppc archs is v7.92).<br/>4. Update ser2net to v4.3.12."
 
 HOMEPAGE = https://github.com/SynoCommunity/spksrc/wiki/FAQ-SynoCliNet
 LICENSE  = Each tool is licensed under it\'s respective license.
 
 SPK_COMMANDS = bin/screen
 SPK_COMMANDS += bin/tmux
-SPK_COMMANDS += bin/nmap bin/nping bin/ndiff
+SPK_COMMANDS += bin/nmap bin/nping bin/ndiff bin/ncat
 SPK_COMMANDS += bin/arp-scan bin/arp-fingerprint bin/get-iab bin/get-oui
 SPK_COMMANDS += bin/links
 SPK_COMMANDS += bin/sshfs
@@ -69,5 +73,6 @@ SPK_COMMANDS += bin/etherwake
 SPK_COMMANDS += bin/telnet bin/whois
 SPK_COMMANDS += bin/arpaname bin/delv bin/dig bin/mdig
 SPK_COMMANDS += bin/aria2c
+SPK_COMMANDS += bin/nc bin/netcat
 
 include ../../mk/spksrc.spk.mk