From f40a5f823d07440686061020de5754359f43ec54 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 21 2021 14:24:01 +0000
Subject: import socat-1.7.4.1-1.el8


---

diff --git a/.gitignore b/.gitignore
index a77fb82..98a03e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/socat-1.7.3.3.tar.gz
+SOURCES/socat-1.7.4.1.tar.gz
diff --git a/.socat.metadata b/.socat.metadata
index c59ce3d..cec1cc3 100644
--- a/.socat.metadata
+++ b/.socat.metadata
@@ -1 +1 @@
-acbb6c4c303a9bd8428c7846545849f25d92bd76 SOURCES/socat-1.7.3.3.tar.gz
+9fe5a0a0b13dded556a66259b68eb672b900f1d1 SOURCES/socat-1.7.4.1.tar.gz
diff --git a/SOURCES/socat-1.7.3.3-warn.patch b/SOURCES/socat-1.7.3.3-warn.patch
deleted file mode 100644
index 739ea3b..0000000
--- a/SOURCES/socat-1.7.3.3-warn.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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 fca7b01..41440b0 100644
--- a/SPECS/socat.spec
+++ b/SPECS/socat.spec
@@ -2,15 +2,13 @@
 
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
-Version: 1.7.3.3
-Release: 2%{?dist}
+Version: 1.7.4.1
+Release: 1%{?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
@@ -26,7 +24,6 @@ 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
 
@@ -68,6 +65,11 @@ export OD_C=/usr/bin/od
 %doc %{_mandir}/man1/*
 
 %changelog
+* Tue Mar 30 2021 Paul Wouters <pwouters@redhat.com> - 1.7.4.1-1
+- Resolves: rhbz#1805132 socat does not recognize IP addresses of the SAN extensions in ssl mode
+- Resolves: rhbz#1870279 Transfer via socat fails with openssl enabled
+- Resolves: rhbz#1914989 Socat udp4-recvfrom cause endless loop error when target is not vaild
+
 * 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