diff --git a/ser2net-2.10.0.tar.gz b/ser2net-2.10.0.tar.gz deleted file mode 100644 index 328c3c2..0000000 --- a/ser2net-2.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98f6193225338e25f35302fef5e1f16688693ed43e7b3c3e9e09187eb54547ac -size 364322 diff --git a/ser2net-3.5.tar.xz b/ser2net-3.5.tar.xz new file mode 100644 index 0000000..a047710 --- /dev/null +++ b/ser2net-3.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd0320b5eac7b33f89cb12a6ec5658f7be1eebd819d63fb5a79287d80b75e533 +size 92384 diff --git a/ser2net-config.patch b/ser2net-config.patch index b5f9bf8..1c52ead 100644 --- a/ser2net-config.patch +++ b/ser2net-config.patch @@ -1,6 +1,6 @@ ---- ser2net-2.9.1.orig/ser2net.conf -+++ ser2net-2.9.1/ser2net.conf -@@ -115,26 +115,29 @@ +--- a/ser2net.conf ++++ b/ser2net.conf +@@ -275,6 +275,9 @@ CLOSESTR:close1:close str\r\n @@ -8,10 +8,11 @@ +#6969:telnet:0:/dev/ttyUSB0:115200 NONE 1STOPBIT 8DATABITS -XONXOFF -LOCAL -RTSCTS + # Don't do this by default - #CONTROLPORT:2000 + CONTROLPORT:localhost,2000 --2001:raw:600:/dev/ttyS0:9600 NONE 1STOPBIT 8DATABITS XONXOFF LOCAL -RTSCTS -+#2001:raw:600:/dev/ttyS0:9600 NONE 1STOPBIT 8DATABITS XONXOFF LOCAL -RTSCTS +@@ -323,26 +326,26 @@ + #192.168.27.3,2001:raw:600:/dev/ttyS0:9600 NONE 1STOPBIT 8DATABITS XONXOFF \ + # LOCAL -RTSCTS #2002:raw:600:/dev/ttyS1:9600 NONE 1STOPBIT 8DATABITS XONXOFF LOCAL -RTSCTS -2003:raw:5:/dev/ttyS2:9600 -2004:raw:5:/dev/ttyS3:115200 @@ -32,18 +33,53 @@ -3003:telnet:0:/dev/ttyS2:9600 signature1 rs485=rs485port1 -3004:telnet:0:/dev/ttyS3:115200 -3005:telnet:0:/dev/ttyS4:9600 --3006:telnet:0:/dev/ttyS5:9600 open1 --3007:telnet:0:/dev/ttyS6:9600 close1 +-3006:telnet:0:/dev/ttyS5:9600 open1 net-to-dev-bufsize=128 +-3007:telnet:0:/dev/ttyS6:9600 close1 dev-to-net-bufsize=128 -5001:rawlp:10:/dev/lp0 +- +-3020:telnet:0:/dev/ttyUSB0:115200 banner1 remctl telnet_brk_on_sync -chardelay \ +- open1 max-connections=3 +-udp,3020:raw:10:/dev/ttyUSB0:115200 banner1 remctl telnet_brk_on_sync \ +- -chardelay open1 max-connections=1 +#3003:telnet:0:/dev/ttyS2:9600 banner3 +#3003:telnet:0:/dev/ttyS2:9600 signature1 rs485=rs485port1 +#3004:telnet:0:/dev/ttyS3:115200 +#3005:telnet:0:/dev/ttyS4:9600 -+#3006:telnet:0:/dev/ttyS5:9600 open1 -+#3007:telnet:0:/dev/ttyS6:9600 close1 ++#3006:telnet:0:/dev/ttyS5:9600 open1 net-to-dev-bufsize=128 ++#3007:telnet:0:/dev/ttyS6:9600 close1 dev-to-net-bufsize=128 +#5001:rawlp:10:/dev/lp0 ++ ++#3020:telnet:0:/dev/ttyUSB0:115200 banner1 remctl telnet_brk_on_sync -chardelay \ ++# open1 max-connections=3 ++#udp,3020:raw:10:/dev/ttyUSB0:115200 banner1 remctl telnet_brk_on_sync \ ++# -chardelay open1 max-connections=1 --3020:telnet:0:/dev/ttyUSB0:9600 banner1 remctl asdfasd --3021:telnet:0:/dev/ttyUSB1:9600 banner2 open1 close1 remctl -+#3020:telnet:0:/dev/ttyUSB0:9600 banner1 remctl asdfasd -+#3021:telnet:0:/dev/ttyUSB1:9600 banner2 open1 close1 remctl + # Bind only to ipv4 example + #ipv4,3020:telnet:0:/dev/ttyUSB0:115200 remctl +@@ -362,18 +365,18 @@ + #3020:telnet:0:/dev/ttyUSB0:115200 remctl remaddr=otherserver,0 + + # A device file with ":" in it... +-DEVICE:MyUSBPort:/dev/serial/by-path/pci-0000:00:1d.0-usb-0:1.8.2.2:1.0-port0 +-DEFAULT:speed:115200 ++#DEVICE:MyUSBPort:/dev/serial/by-path/pci-0000:00:1d.0-usb-0:1.8.2.2:1.0-port0 ++#DEFAULT:speed:115200 + +-3021:telnet:0:MyUSBPort:banner2 open1 close1 remctl closehtml \ +- chardelay-scale=15 chardelay-min=500 chardelay-max=10000 \ +- max-connections=2 ++#3021:telnet:0:MyUSBPort:banner2 open1 close1 remctl closehtml \ ++# chardelay-scale=15 chardelay-min=500 chardelay-max=10000 \ ++# max-connections=2 + + # SOL connections +-3022:telnet:0:sol.lan -U minyard -P test i-ipmi:115200 banner +-3023:telnet:0:sol.lan -U admin -P admin t-crb8800-ipmi-1:115200 banner ++#3022:telnet:0:sol.lan -U minyard -P test i-ipmi:115200 banner ++#3023:telnet:0:sol.lan -U admin -P admin t-crb8800-ipmi-1:115200 banner + +-ROTATOR:4001:3021 3022 3023 ++#ROTATOR:4001:3021 3022 3023 + + #5000:telnet:0:/dev/ttyAPP0:9600 NONE 1STOPBIT 8DATABITS -XONXOFF LOCAL \ + # -RTSCTS led-tx=tx led-rx=rx diff --git a/ser2net.changes b/ser2net.changes index 39099fb..bebaeef 100644 --- a/ser2net.changes +++ b/ser2net.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Aug 17 14:24:52 UTC 2018 - agraf@suse.com + +- Update to version 3.5 + - allows to declare device aliases which enabled by-path device names + - adapted ser2net-config.patch + - builds with autoconf, add build dependencies (autoconf, automake, libtool) + ------------------------------------------------------------------- Mon Mar 23 01:37:22 UTC 2015 - p.drouand@gmail.com diff --git a/ser2net.spec b/ser2net.spec index 65955e5..fc38f90 100644 --- a/ser2net.spec +++ b/ser2net.spec @@ -1,7 +1,7 @@ # # spec file for package ser2net # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,18 @@ Name: ser2net -Version: 2.10.0 +Version: 3.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://ser2net.sourceforge.net/ -Source: http://download.sourceforge.net/ser2net/%{name}-%{version}.tar.gz +Url: https://github.com/cminyard/ser2net.git +Source: %{name}-%{version}.tar.xz Source2: ser2net.service Summary: Serial port to network proxy -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Networking/Other +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: systemd-rpm-macros Patch0: ser2net-config.patch %{?systemd_requires} @@ -40,6 +43,7 @@ monitoring ports, and controlling ports. %setup -q -n %{name}-%{version} %patch0 -p1 %build +autoreconf -i %configure --disable-static %{__make} %{?_smp_mflags}