Accepting request 795497 from home:mnhauke

- Update to version 4.1.6 * upstream does not provide a changelog - Drop patch: * ser2net-config.patch (config is now done via YAML) - Add BR: pkgconfig(libgensio), pkgconfig(yaml-0.1) OBS-URL: https://build.opensuse.org/request/show/795497 OBS-URL: https://build.opensuse.org/package/show/network:utilities/ser2net?expand=0&rev=15
2020-04-19 12:56:26 +00:00 · 2020-04-19 12:56:26 +00:00 · 6ce29fa923
commit 6ce29fa923
parent 8257b7be1d
6 changed files with 36 additions and 111 deletions
--- a/ser2net-3.5.tar.xz
+++ b/ser2net-3.5.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cd0320b5eac7b33f89cb12a6ec5658f7be1eebd819d63fb5a79287d80b75e533
-size 92384
--- a/ser2net-4.1.6.tar.gz
+++ b/ser2net-4.1.6.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9461ee1c8016901ec8a32cd7f00f692233f205ce4a1ef9a2aa79b6bf4797f0a4
+size 119877
--- a/ser2net-config.patch
+++ b/ser2net-config.patch
@ -1,85 +0,0 @@
--- a/ser2net.conf
-+++ b/ser2net.conf
-@@ -275,6 +275,9 @@
- 
- CLOSESTR:close1:close str\r\n
- 
-+#example for modern USB<->serial adapters, telnet to port 6969
-+#6969:telnet:0:/dev/ttyUSB0:115200 NONE 1STOPBIT 8DATABITS -XONXOFF -LOCAL -RTSCTS
-+
- # Don't do this by default
- CONTROLPORT:localhost,2000
- 
-@@ -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
-2005:raw:5:/dev/ttyS4:9600
-2006:raw:5:/dev/ttyS5:9600
-2007:raw:5:/dev/ttyS6:9600 tw=tw1 tr=tr1
-3001:telnet:0:/dev/ttyS0:19200 remctl banner1
-3011:telnet:3:/dev/ttyS0:19200 banner2
-+#2003:raw:5:/dev/ttyS2:9600
-+#2004:raw:5:/dev/ttyS3:115200
-+#2005:raw:5:/dev/ttyS4:9600
-+#2006:raw:5:/dev/ttyS5:9600
-+#2007:raw:5:/dev/ttyS6:9600 tw=tw1 tr=tr1
-+#3001:telnet:0:/dev/ttyS0:19200 remctl banner1
-+#3011:telnet:3:/dev/ttyS0:19200 banner2
- #3002:telnet:0:/dev/ttyS1:9600
-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 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 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
- 
- # 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
--- a/ser2net.changes
+++ b/ser2net.changes
@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sun Apr 19 12:19:00 UTC 2020 - Martin Hauke <mardnh@gmx.de>
+
+- Update to version 4.1.6
+  * upstream does not provide a changelog
+- Drop patch:
+  * ser2net-config.patch (config is now done via YAML)
+- Add BR: pkgconfig(libgensio), pkgconfig(yaml-0.1)
+
 -------------------------------------------------------------------
 Thu Sep  6 23:18:53 UTC 2018 - Jan Engelhardt <jengelh@inai.de>

--- a/ser2net.service
+++ b/ser2net.service
@ -6,4 +6,4 @@ After=network.target
 ExecStart=/usr/sbin/ser2net -n

 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
--- a/ser2net.spec
+++ b/ser2net.spec
@ -1,7 +1,7 @@
 #
 # spec file for package ser2net
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -12,46 +12,46 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #


 Name:           ser2net
-Version:        3.5
+Version:        4.1.6
 Release:        0
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-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-or-later
 Group:          Productivity/Networking/Other
+URL:            https://github.com/cminyard/ser2net.git
+Source:         https://github.com/cminyard/ser2net/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source2:        ser2net.service
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
+BuildRequires:  pkgconfig
 BuildRequires:  systemd-rpm-macros
-Patch0:         ser2net-config.patch
+BuildRequires:  pkgconfig(libgensio)
+BuildRequires:  pkgconfig(yaml-0.1)
 %{?systemd_requires}

 %description
-ser2net provides a way for a user to connect from a network connection to a 
-serial port. It provides all the serial port setup, a configuration file to 
-configure the ports, a control login for modifying port parameters, 
+ser2net provides a way for a user to connect from a network connection to a
+serial port. It provides all the serial port setup, a configuration file to
+configure the ports, a control login for modifying port parameters,
 monitoring ports, and controlling ports.

 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
+%setup -q

 %build
-autoreconf -i
+autoreconf -fiv
 %configure --disable-static
-make %{?_smp_mflags}
+%make_build

 %install
 %make_install
-install -D -m 0644 %{name}.conf %{buildroot}/%{_sysconfdir}/%{name}.conf
-install -D -m 0644 %{S:2} %{buildroot}/%{_unitdir}/ser2net.service
+install -D -m 0644 %{name}.yaml %{buildroot}/%{_sysconfdir}/%{name}.yaml
+install -D -m 0644 %{SOURCE2} %{buildroot}/%{_unitdir}/ser2net.service

 %pre
 %service_add_pre ser2net.service
@ -66,11 +66,12 @@ install -D -m 0644 %{S:2} %{buildroot}/%{_unitdir}/ser2net.service
 %service_del_postun ser2net.service

 %files
-%defattr(-,root,root)
-%doc COPYING ChangeLog AUTHORS README
-%{_unitdir}/ser2net.service
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%license COPYING
+%doc ChangeLog AUTHORS README
 %{_sbindir}/%{name}
-%{_mandir}/man8/%{name}*
+%config(noreplace) %{_sysconfdir}/%{name}.yaml
+%{_unitdir}/ser2net.service
+%{_mandir}/man5/ser2net.yaml.5%{?ext_man}
+%{_mandir}/man8/ser2net.8%{?ext_man}

 %changelog