Add ser2net and integrate to synocli-net (SynoCommunity#3733)

* initial ser2net (not verified)
* libyaml is needed
* fixes from @hgy59
* Add icon and update PLIST
* add ser2net to synocli-net
- move spk/ser2net to diyspk/ser2net
- add ser2net to spk/synocli-net
- create description based on included packages
* update ser2net
- update ser2net to v4.1.6
- update gensio to v1.5.6
- add sample configuration ser2net.yaml
- use generic link creation
Co-authored-by: hgy59 <[email protected]>

cross/gensio/Makefile

@@ -0,0 +1,32 @@
+PKG_NAME = gensio
+PKG_VERS = 1.5.6
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/cminyard/$(PKG_NAME)/archive
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+HOMEPAGE = https://github.com/cminyard/gensio
+COMMENT  = gensio - General Stream I/O
+LICENSE  = GPLv2
+
+# qoriq is the only PPC arch that is supported
+UNSUPPORTED_ARCHS = powerpc ppc824x ppc853x ppc854x
+
+DEPENDS = cross/openssl
+
+GNU_CONFIGURE = 1
+PRE_CONFIGURE_TARGET = gensio_pre_configure
+
+CONFIGURE_ARGS  = --with-python=no --with-swig=no
+
+include ../../mk/spksrc.cross-cc.mk
+
+ifeq ($(findstring $(ARCH), $(PPC_ARCHES)),$(ARCH))
+# archs/toolchains without compatible RS485 support (linux serial.h)
+CONFIGURE_ARGS += ac_cv_have_decl_TIOCSRS485=no
+endif
+
+.PHONY: gensio_pre_configure
+gensio_pre_configure:
+	$(RUN) autoreconf -i 

cross/gensio/PLIST

@@ -0,0 +1,3 @@
+lnk:lib/libgensio.so
+lnk:lib/libgensio.so.0 
+lib:lib/libgensio.so.0.0.0

cross/gensio/digests

@@ -0,0 +1,3 @@
+gensio-1.5.6.tar.gz SHA1 ff257b6e2d8e9755e5045dc886dbd8aeb20f32f6
+gensio-1.5.6.tar.gz SHA256 db179d6bccbba7d4627ed489723c1b857f6b42adc30e96fd34ee24b299ecbf23
+gensio-1.5.6.tar.gz MD5 17899235903aa149f18d3d57bc99eef5

cross/mosh/PLIST

@@ -1,3 +1,3 @@
-bin:bin/mosh
+rsc:bin/mosh
 bin:bin/mosh-client
 bin:bin/mosh-server

cross/nmap/PLIST

@@ -1,4 +1,4 @@
-bin:bin/ndiff
+rsc:bin/ndiff
 bin:bin/nmap
 bin:bin/nping
 rsc:share/nmap

cross/ser2net/Makefile

@@ -0,0 +1,29 @@
+PKG_NAME = ser2net
+PKG_VERS = 4.1.6
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/cminyard/$(PKG_NAME)/archive
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/gensio cross/libyaml
+
+HOMEPAGE = https://sourceforge.net/projects/ser2net/
+COMMENT  = Serial port to network proxy.
+LICENSE  = GPLv2
+
+GNU_CONFIGURE = 1
+PRE_CONFIGURE_TARGET = ser2net_pre_configure
+POST_INSTALL_TARGET = ser2net_post_install
+
+
+include ../../mk/spksrc.cross-cc.mk
+
+.PHONY: ser2net_pre_configure
+ser2net_pre_configure:
+	$(RUN) ; ./reconf
+
+.PHONY: ser2net_post_install
+ser2net_post_install:
+	install -m 755 -d $(STAGING_INSTALL_PREFIX)/etc
+	install -m 644 $(WORK_DIR)/$(PKG_DIR)/ser2net.yaml $(STAGING_INSTALL_PREFIX)/etc/ser2net.yaml

cross/ser2net/PLIST

@@ -0,0 +1,2 @@
+bin:sbin/ser2net
+rsc:etc/ser2net.yaml

cross/ser2net/digests

@@ -0,0 +1,3 @@
+ser2net-4.1.6.tar.gz SHA1 aec8ffda4cb9d979cabf5b28b1b37a0edc953a37
+ser2net-4.1.6.tar.gz SHA256 9461ee1c8016901ec8a32cd7f00f692233f205ce4a1ef9a2aa79b6bf4797f0a4
+ser2net-4.1.6.tar.gz MD5 90a5e8915c2a2f7c7b515bd9a8766ccc

cross/socat/Makefile

@@ -8,7 +8,7 @@ PKG_DIST_SITE = http://www.dest-unreach.org/socat/download
 DEPENDS = cross/openssl
 
 HOMEPAGE = http://www.dest-unreach.org/socat/
-COMMENT  = socat: multipurpose relay
+COMMENT  = socat - Multipurpose relay \(SOcket CAT)\. Socat is a command line based utility that establishes two bidirectional byte streams and transfers data between them. Because the streams can be constructed from a large set of different types of data sinks and sources, and because lots of address options may be applied to the streams, socat can be used for many different purposes.  
 LICENSE  = GPLv2
 
 GNU_CONFIGURE = 1

diyspk/ser2net/Makefile

@@ -0,0 +1,23 @@
+SPK_NAME = ser2net
+SPK_VERS = 4.1.6
+SPK_REV = 1
+SPK_ICON = src/ser2net.png
+
+DEPENDS = cross/ser2net
+
+# qoriq is the only PPC arch that is supported
+UNSUPPORTED_ARCHS = powerpc ppc824x ppc853x ppc854x
+
+MAINTAINER = SynoCommunity
+DESCRIPTION = ser2net provides a way for a user to connect from a network connection to a serial port.
+CHANGELOG = "Initial release"
+DISPLAY_NAME = ser2net
+STARTABLE = no
+
+HOMEPAGE = http://ser2net.sourceforge.net/
+LICENSE = GPLv2
+
+SPK_COMMANDS = sbin/ser2net
+
+
+include ../../mk/spksrc.spk.mk

spk/synocli-net/Makefile

@@ -1,13 +1,17 @@
 SPK_NAME = synocli-net
-SPK_VERS = 1.2
-SPK_REV = 2
+SPK_VERS = 1.3
+SPK_REV = 3
 SPK_ICON = src/synocli-net.png
 
-include ../../mk/spksrc.common.mk
-
 DEPENDS = cross/screen cross/tmux cross/nmap cross/sshfs cross/mosh cross/socat
 DEPENDS += cross/rsync
-OPTIONAL_DEPENDS = cross/fritzctl
+
+# Requirement for Mosh
+SPK_DEPENDS = "Perl>=5.14"
+
+OPTIONAL_DEPENDS = cross/fritzctl cross/ser2net
+
+include ../../mk/spksrc.common.mk
 
 OPTIONAL_DESC =
 
@@ -16,16 +20,16 @@ DEPENDS += cross/fritzctl
 OPTIONAL_DESC := $(OPTIONAL_DESC)", fritzctl"
 endif
 
-
-
-# Requirement for Mosh
-SPK_DEPENDS = "Perl>=5.14"
+ifneq ($(findstring $(ARCH), powerpc ppc824x ppc853x ppc854x),$(ARCH))
+DEPENDS += cross/ser2net
+OPTIONAL_DESC := $(OPTIONAL_DESC)", ser2net"
+endif
 
 MAINTAINER = ymartin59
 DESCRIPTION = "SynoCli Network Tools provides a set of small command-line utilities: screen, tmux, mosh, socat, nmap, sshfs, rsync$(OPTIONAL_DESC). Credits to Sebastian Schmidt \(publicarray\) for icons"
 DISPLAY_NAME = SynoCli Network Tools
 STARTABLE = no
-CHANGELOG = "1. Add rsync"
+CHANGELOG = "1. Add rsync<br/>2. Add ser2net"
 
 HOMEPAGE = https://github.com/SynoCommunity/spksrc/wiki/FAQ-SynoCliNet
 LICENSE  = Each tool is licensed under it\'s respective license.
@@ -39,5 +43,6 @@ SPK_COMMANDS += bin/mosh bin/mosh-client bin/mosh-server
 SPK_COMMANDS += bin/socat bin/procan bin/filan
 SPK_COMMANDS += bin/fritzctl
 SPK_COMMANDS += bin/rsync
+SPK_COMMANDS += sbin/ser2net
 
 include ../../mk/spksrc.spk.mk