From 2dee720b89e0097c48cfeb8a0c7e31ff879632df Mon Sep 17 00:00:00 2001
From: Gerhard Rieger <gerhard@dest-unreach.org>
Date: Mon, 6 Apr 2015 18:49:59 +0200
Subject: [PATCH] version 2.0.0-b8 - CVE-2015-1379, 1.7.3.0 fixes, v2 fixes

---
 CHANGES      | 4 +++-
 README       | 2 +-
 VERSION      | 2 +-
 doc/socat.yo | 2 +-
 socat.spec   | 2 +-
 test.sh      | 4 +++-
 xio.h        | 1 -
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index ba3b0d7..9539446 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 
+####################### V 2.0.0-b8:
+
 security:
-	(CVE Id pending)
+	CVE-2015-1379
 	Fixed problems with signal handling caused by use of not async signal
 	safe functions in signal handlers that could freeze socat, allowing
 	denial of service attacks.
diff --git a/README b/README
index fff675e..0f71529 100644
--- a/README
+++ b/README
@@ -75,7 +75,7 @@ install
 
 Get the tarball and extract it:
 	gtar xzf socat.tar.gz
-	cd socat-1.7.1.0
+	cd socat-2.0.0-b8
 	./configure
 	make
 	su
diff --git a/VERSION b/VERSION
index 219fe17..a64acd6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-"2.0.0-b7+1724+sigfix"
+"2.0.0-b8"
diff --git a/doc/socat.yo b/doc/socat.yo
index c90b336..df5b184 100644
--- a/doc/socat.yo
+++ b/doc/socat.yo
@@ -3624,7 +3624,7 @@ standard specifications available on the Internet for free.
 label(VERSION)
 manpagesection(VERSION)
 
-This man page describes version 2.0.0-b3 of socat().
+This man page describes version 2.0.0-b8 of socat().
 
 
 label(BUGS)
diff --git a/socat.spec b/socat.spec
index ca2cfe2..5c70721 100644
--- a/socat.spec
+++ b/socat.spec
@@ -1,6 +1,6 @@
 
 %define majorver 2.0
-%define minorver 0-b7
+%define minorver 0-b8
 
 Summary: socat - multipurpose relay
 Name: socat
diff --git a/test.sh b/test.sh
index 6ac323f..feb26d4 100755
--- a/test.sh
+++ b/test.sh
@@ -12496,7 +12496,9 @@ N=$((N+1))
 
 
 # test if the various SSL methods can be used with OpenSSL
-for method in SSL3 SSL23 TLS1 TLS1.1 TLS1.2 DTLS1; do
+# DTLS1 hangs on Fedora-20
+for method in SSL3 SSL23 TLS1 TLS1.1 TLS1.2; do
+#for method in SSL3 SSL23 TLS1 TLS1.1 TLS1.2 DTLS1; do
 
 NAME=OPENSSL_METHOD_$method
 case "$TESTS" in
diff --git a/xio.h b/xio.h
index abb5cde..5efaf2b 100644
--- a/xio.h
+++ b/xio.h
@@ -570,7 +570,6 @@ union integral {
 } ;
 
 /* some aliases */
-#define u_off u_long	/* please report when this causes problems */
  
 #if HAVE_BASIC_OFF_T==3
 #  define u_off u_int