From e50cbbbbfb427714ee6b7951a930ccff83f47f8ec106756f6f86ed44fb436ae5 Mon Sep 17 00:00:00 2001
From: OBS User mrdocs <null@suse.de>
Date: Fri, 21 Mar 2014 05:02:02 +0000
Subject: [PATCH] Accepting request 226902 from
 home:elvigia:branches:network:utilities

- version 2.9.1
* drop tcpwrappers support
* Fix a bug in format strings where hex element (\x)
  would have the wrong values for a-f.
* Make RFC2217 signature configurable:
* The baudrate, that will be sent to the client,
    was converted twice.

OBS-URL: https://build.opensuse.org/request/show/226902
OBS-URL: https://build.opensuse.org/package/show/network:utilities/ser2net?expand=0&rev=7
---
 ser2net-2.8-rc3.tar.gz |  3 ---
 ser2net-2.9.1.tar.gz   |  3 +++
 ser2net-config.patch   | 17 +++++++++++------
 ser2net.changes        | 10 ++++++++++
 ser2net.spec           | 15 ++++++---------
 5 files changed, 30 insertions(+), 18 deletions(-)
 delete mode 100644 ser2net-2.8-rc3.tar.gz
 create mode 100644 ser2net-2.9.1.tar.gz

diff --git a/ser2net-2.8-rc3.tar.gz b/ser2net-2.8-rc3.tar.gz
deleted file mode 100644
index 8493874..0000000
--- a/ser2net-2.8-rc3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4548afc181242d885cb25866bf5276f4b0ec0bc23d768c53fa3952a6ea8bcee5
-size 330795
diff --git a/ser2net-2.9.1.tar.gz b/ser2net-2.9.1.tar.gz
new file mode 100644
index 0000000..08ebf57
--- /dev/null
+++ b/ser2net-2.9.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fdee1e69903cf409bdc6f32403a566cbc6006aa9e2a4d6f8f12b90dfd5ca0d0e
+size 357820
diff --git a/ser2net-config.patch b/ser2net-config.patch
index e937a94..e9a5a3e 100644
--- a/ser2net-config.patch
+++ b/ser2net-config.patch
@@ -1,13 +1,16 @@
---- ser2net.conf.orig
-+++ ser2net.conf
-@@ -105,19 +105,22 @@ CLOSESTR:close1:close str\r\n
+--- ser2net-2.9.1.orig/ser2net.conf
++++ ser2net-2.9.1/ser2net.conf
+@@ -108,23 +108,26 @@ OPENSTR:open1:Open str\r\n
+ 
+ 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:2000
  
 -2001:raw:600:/dev/ttyS0:9600 NONE 1STOPBIT 8DATABITS XONXOFF LOCAL -RTSCTS
-+#example for modern USB<->serial adapters, telnet to port 6969
-+#6969:telnet:0:/dev/ttyUSB0:115200 NONE 1STOPBIT 8DATABITS -XONXOFF -LOCAL -RTSCTS
-+#
 +#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
@@ -26,12 +29,14 @@
 +#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
 -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
 -5001:rawlp:10:/dev/lp0
 +#3003:telnet:0:/dev/ttyS2:9600 banner3
++#3003:telnet:0:/dev/ttyS2:9600 signature1
 +#3004:telnet:0:/dev/ttyS3:115200
 +#3005:telnet:0:/dev/ttyS4:9600
 +#3006:telnet:0:/dev/ttyS5:9600 open1
diff --git a/ser2net.changes b/ser2net.changes
index 7be1669..b3734b3 100644
--- a/ser2net.changes
+++ b/ser2net.changes
@@ -1,4 +1,14 @@
 -------------------------------------------------------------------
+Thu Mar 20 19:47:15 UTC 2014 - crrodriguez@opensuse.org
+
+- version 2.9.1
+* drop tcpwrappers support
+* Fix a bug in format strings where hex element (\x)
+  would have the wrong values for a-f.
+* Make RFC2217 signature configurable:
+* The baudrate, that will be sent to the client,
+    was converted twice.
+-------------------------------------------------------------------
 Fri Dec 21 20:21:12 UTC 2012 - crrodriguez@opensuse.org
 
 - Enable tcp-wrappers support
diff --git a/ser2net.spec b/ser2net.spec
index 778034c..0786861 100644
--- a/ser2net.spec
+++ b/ser2net.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ser2net
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,20 +16,17 @@
 #
 
 
-%define extra_ver rc3
-
 Name:           ser2net
-Version:        2.8
+Version:        2.9.1
 Release:        0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://ser2net.sourceforge.net/
-Source:         http://download.sourceforge.net/ser2net/%{name}-%{version}-%{extra_ver}.tar.gz
+Source:         http://download.sourceforge.net/ser2net/%{name}-%{version}.tar.gz
 Source2:        ser2net.service
 Summary:        Serial port to network proxy
 License:        GPL-2.0+
 Group:          Productivity/Networking/Other
 BuildRequires:  pkgconfig(systemd)
-BuildRequires:  tcpd-devel
 Patch0:         ser2net-config.patch
 %{?systemd_requires}
 
@@ -40,10 +37,10 @@ configure the ports, a control login for modifying port parameters,
 monitoring ports, and controlling ports.
 
 %prep
-%setup -q -n %{name}-%{version}-%{extra_ver}
-%patch0
+%setup -q -n %{name}-%{version}
+%patch0 -p1
 %build
-%configure --disable-static --with-tcp-wrappers
+%configure --disable-static
 %{__make} %{?_smp_mflags}
 
 %install