Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/socat.git#ba7b9cd19a102a18c10f430d752828292bcdc76e

.gitignore

@@ -12,3 +12,4 @@ socat-1.7.2.0.tar.gz
 /socat-1.7.3.3.tar.gz
 /socat-1.7.3.4.tar.gz
 /socat-1.7.4.0.tar.gz
+/socat-1.7.4.1.tar.gz

socat.spec

@@ -2,15 +2,15 @@
 
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
-Version: 1.7.4.0
+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
 
 Patch1: socat-1.7.3.3-warn.patch
-Patch2: socat-1.7.4.0-uint64_t.patch
 
+BuildRequires: make
 BuildRequires:  gcc
 BuildRequires: openssl-devel readline-devel ncurses-devel
 BuildRequires: autoconf kernel-headers > 2.6.18
@@ -30,7 +30,6 @@ line editor (readline), a program, or a combination of two of these.
 iconv -f iso8859-1 -t utf-8 CHANGES > CHANGES.utf8
 mv CHANGES.utf8 CHANGES
 %patch1 -p1
-%patch2 -p1
 
 %build
 %configure  \
@@ -74,6 +73,9 @@ export OD_C=/usr/bin/od
 %doc %{_mandir}/man1/*
 
 %changelog
+* Mon Jan 11 10:35:54 EST 2021 Paul Wouters <pwouters@redhat.com> - 1.7.4.1-1
+- Resolves: rhbz#1914653 socat-1.7.4.1 is available
+
 * Mon Jan  4 09:34:27 EST 2021 Paul Wouters <pwouters@redhat.com> - 1.7.4.0-1
 - Resolves: rhbz#1912161 socat-1.7.4.0 is available
 

sources

@@ -1 +1 @@
-SHA512 (socat-1.7.4.0.tar.gz) = 0e500593f4086a9d94634232f8d5aa79eb57f85cb5f05e3bf0ae06baebd28c7c5d443ab71337d909a38f83538136119b89a8091681a19754b93229c42c23eb05
+SHA512 (socat-1.7.4.1.tar.gz) = e43c8b23a841aea5ecc3ac324185ee4ada552a8284ec41b99245def2d8b493bca9caea1af6f646f434a7eda67a1dd71e4e037eea65fce0444840236eadb126a6