From 0165deb4c0f229c65b71b2569e7cb4e9f677698d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 21 2020 20:54:16 +0000
Subject: import socat-1.7.3.3-2.el8


---

diff --git a/.gitignore b/.gitignore
index 64f1452..a77fb82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/socat-1.7.3.2.tar.gz
+SOURCES/socat-1.7.3.3.tar.gz
diff --git a/.socat.metadata b/.socat.metadata
index 0ac6016..c59ce3d 100644
--- a/.socat.metadata
+++ b/.socat.metadata
@@ -1 +1 @@
-28eca1f8efeadde3f96c1ac89e553c28d736d41d SOURCES/socat-1.7.3.2.tar.gz
+acbb6c4c303a9bd8428c7846545849f25d92bd76 SOURCES/socat-1.7.3.3.tar.gz
diff --git a/SOURCES/socat-1.7.3.3-warn.patch b/SOURCES/socat-1.7.3.3-warn.patch
new file mode 100644
index 0000000..739ea3b
--- /dev/null
+++ b/SOURCES/socat-1.7.3.3-warn.patch
@@ -0,0 +1,43 @@
+diff -Naur socat-1.7.3.3-orig/sysutils.c socat-1.7.3.3/sysutils.c
+--- socat-1.7.3.3-orig/sysutils.c	2017-01-08 05:38:53.000000000 -0500
++++ socat-1.7.3.3/sysutils.c	2019-06-24 17:02:56.693056583 -0400
+@@ -614,7 +614,7 @@
+       return -1;
+    }
+ 
+-   strncpy(ifr.ifr_name, ifname, IFNAMSIZ);	/* ok */
++   strncpy(ifr.ifr_name, ifname, IFNAMSIZ - 1);	/* ok */
+    if (Ioctl(s, SIOCGIFINDEX, &ifr) < 0) {
+       Info3("ioctl(%d, SIOCGIFINDEX, {\"%s\"}): %s",
+ 	     s, ifr.ifr_name, strerror(errno));
+diff -Naur socat-1.7.3.3-orig/xio-socket.c socat-1.7.3.3/xio-socket.c
+--- socat-1.7.3.3-orig/xio-socket.c	2017-01-08 04:56:00.000000000 -0500
++++ socat-1.7.3.3/xio-socket.c	2019-06-24 17:04:48.684491835 -0400
+@@ -1710,7 +1710,6 @@
+ int xiocheckpeer(xiosingle_t *xfd,
+ 		 union sockaddr_union *pa, union sockaddr_union *la) {
+    char infobuff[256];
+-   int result;
+ 
+ #if WITH_IP4
+    if (xfd->para.socket.dorange) {
+@@ -1778,6 +1777,7 @@
+ #endif /* WITH_TCP || WITH_UDP */
+ 
+ #if (WITH_TCP || WITH_UDP) && WITH_LIBWRAP
++   int result;
+    result = xio_tcpwrap_check(xfd, la, pa);
+    if (result < 0) {
+       char infobuff[256];
+diff -Naur socat-1.7.3.3-orig/xio-tun.c socat-1.7.3.3/xio-tun.c
+--- socat-1.7.3.3-orig/xio-tun.c	2017-01-06 15:58:40.000000000 -0500
++++ socat-1.7.3.3/xio-tun.c	2019-06-24 17:03:55.276797729 -0400
+@@ -106,7 +106,7 @@
+    memset(&ifr, 0,sizeof(ifr));
+ 
+    if (retropt_string(opts, OPT_TUN_NAME, &tunname) == 0) {
+-      strncpy(ifr.ifr_name, tunname, IFNAMSIZ);	/* ok */
++      strncpy(ifr.ifr_name, tunname, IFNAMSIZ - 1);	/* ok */
+       free(tunname);
+    } else {
+       ifr.ifr_name[0] = '\0';
diff --git a/SPECS/socat.spec b/SPECS/socat.spec
index 22c18d2..fca7b01 100644
--- a/SPECS/socat.spec
+++ b/SPECS/socat.spec
@@ -2,12 +2,15 @@
 
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
-Version: 1.7.3.2
-Release: 6%{?dist}
+Version: 1.7.3.3
+Release: 2%{?dist}
 License: GPLv2
 Url:  http://www.dest-unreach.org/socat/
 Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.gz
 Group: Applications/Internet
+
+Patch1: socat-1.7.3.3-warn.patch
+
 BuildRequires: openssl-devel readline-devel ncurses-devel
 BuildRequires: autoconf kernel-headers > 2.6.18
 # for make test
@@ -23,6 +26,7 @@ line editor (readline), a program, or a combination of two of these.
 
 %prep
 %setup -q
+%patch1 -p1
 iconv -f iso8859-1 -t utf-8 CHANGES > CHANGES.utf8
 mv CHANGES.utf8 CHANGES
 
@@ -36,7 +40,7 @@ mv CHANGES.utf8 CHANGES
         --enable-listen --enable-proxy --enable-exec \
         --enable-system --enable-pty --enable-readline \
         --enable-openssl --enable-sycls --enable-filan \
-        --enable-retry --enable-fips
+        --enable-retry #--enable-fips
 
 make %{?_smp_mflags}
 
@@ -44,6 +48,9 @@ make %{?_smp_mflags}
 make DESTDIR=%{buildroot} install
 install -d %{buildroot}/%{_docdir}/socat
 install -m 0644 *.sh %{buildroot}/%{_docdir}/socat/
+install -m 0644 *.sh %{buildroot}/%{_docdir}/socat/
+echo ".so man1/socat.1" | gzip > %{buildroot}/%{_mandir}/man1/filan.1.gz
+cp -a %{buildroot}/%{_mandir}/man1/filan.1.gz %{buildroot}/%{_mandir}/man1/procan.1.gz
 
 %check
 export TERM=ansi
@@ -58,9 +65,15 @@ export OD_C=/usr/bin/od
 %{_bindir}/socat
 %{_bindir}/filan
 %{_bindir}/procan
-%doc %{_mandir}/man1/socat.1*
+%doc %{_mandir}/man1/*
 
 %changelog
+* Sun Dec 01 2019 Paul Wouters <pwouters@redhat.com> - 1.7.3.3-2
+- Resolves: rhbz#1682464 socat changes blocked until gating tests are added
+
+* Wed Nov 06 2019 Paul Wouters <pwouters@redhat.com> - 1.7.3.3-1
+- Resolves: rhbz#1723581 socat-1.7.3.3 is available
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild