From 7d8c10d268ca6e620e5583ee13629d8ab5526294 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Jan 06 2020 19:31:06 +0000
Subject: Merge branch 'f30'


---

diff --git a/.gitignore b/.gitignore
index 52ee4ba..e2c1215 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ socat-1.7.2.0.tar.gz
 /socat-1.7.3.1.tar.gz
 /socat-1.7.3.2.tar.gz
 /socat-1.7.3.3.tar.gz
+/socat-1.7.3.4.tar.gz
diff --git a/socat.spec b/socat.spec
index 1999eab..af4e202 100644
--- a/socat.spec
+++ b/socat.spec
@@ -2,8 +2,8 @@
 
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
-Version: 1.7.3.3
-Release: 2%{?dist}
+Version: 1.7.3.4
+Release: 1%{?dist}
 License: GPLv2
 Url:  http://www.dest-unreach.org/socat/
 Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.gz
@@ -54,8 +54,13 @@ cp -a %{buildroot}/%{_mandir}/man1/filan.1.gz %{buildroot}/%{_mandir}/man1/proca
 %check
 export TERM=ansi
 export OD_C=/usr/bin/od
-# intermittently, a test sometimes just fails and hangs, mostly on arm
-#timeout 30m make test
+# intermittently, a test sometimes just fails and some just hang
+# HANGS on x86_64: 93, 323
+# FAILED on x86_64:  61 215 306 307
+# FAILED on ppc64le: 58 239
+# FAILED on armv7hl: 154 155 318 319
+#sed -i 's/NUMCOND=true/NUMCOND="test \\$N -ne 93 -a \\$N -ne 323"/' test.sh
+#make test
 
 %files
 %doc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ PORTING
@@ -67,6 +72,9 @@ export OD_C=/usr/bin/od
 %doc %{_mandir}/man1/*
 
 %changelog
+* Mon Jan 06 2020 Paul Wouters <pwouters@redhat.com> - 1.7.3.4-1
+- Resolves: rhbz#1787954 socat-1.7.3.4 is available
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 4a947e1..bf52b16 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (socat-1.7.3.3.tar.gz) = b3ea4cb6081f7778a0281a3ec36ea7e5daf07dc19f2e0de08f767417112776e96e1bcac7962ebb6dd8b960ad91fc4a452f0da8327736d50e215e4ab43947ff78
+SHA512 (socat-1.7.3.4.tar.gz) = c5699fd1a703e90927076599d02323b85722d49e86bc2f627b4301a41d3df72c634af629f378425ff201cde78343da5cd0cad1044bf857665176c91357401fdd