[packages/socat] up to 1.7.4.0

[atler]

commit 57774ea9f315400a2b99af635223c00c2d557972
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Jan 5 23:53:18 2021 +0100

    up to 1.7.4.0
    
    - 32bit build fix courtesy of project author (Gerhard Rieger)

 int64.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 socat.spec  |  8 +++++---
 2 files changed, 45 insertions(+), 3 deletions(-)
---
diff --git a/socat.spec b/socat.spec
index bb1ec24..d774f1f 100644
--- a/socat.spec
+++ b/socat.spec
@@ -1,15 +1,16 @@
 Summary:	Multipurpose relay
 Summary(pl.UTF-8):	Przekaźnik o wielu zastosowaniach
 Name:		socat
-Version:	1.7.3.3
-Release:	2
+Version:	1.7.4.0
+Release:	1
 License:	GPL
 Group:		Networking/Utilities
 Source0:	http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	b2a032a47b8b89a18485697fa975154f
+# Source0-md5:	334c7f3ab56a254226055ccd0ada58ff
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.tmpfiles
+Patch0:		int64.patch
 URL:		http://www.dest-unreach.org/socat/
 BuildRequires:	libwrap-devel >= 7.6-30
 BuildRequires:	openssl-devel >= 0.9.7d
@@ -48,6 +49,7 @@ połączeniami sieciowymi.
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i -e 's#-lssl#-lssl -lcrypto#g' configure*
 
 %build
diff --git a/int64.patch b/int64.patch
new file mode 100644
index 0000000..0caeee9
--- /dev/null
+++ b/int64.patch
@@ -0,0 +1,40 @@
+--- socat-1.7.4.0/compat.h.orig	2021-01-03 19:23:22.000000000 +0100
++++ socat-1.7.4.0/compat.h	2021-01-05 23:47:10.465452973 +0100
+@@ -134,6 +134,8 @@
+ #    define F_uint64_t "%u"
+ #  elif HAVE_BASIC_UINT64_T==6
+ #    define F_uint64_t "%lu"
++#  elif HAVE_BASIC_UINT64_T==8
++#    define F_uint64_t "%llu"
+ #  else
+ #    error "HAVE_BASIC_UINT64_T is out of range:" HAVE_BASIC_UINT64_T
+ #  endif
+@@ -147,7 +149,7 @@
+ #  elif HAVE_BASIC_INT16_T==3
+ #    define F_int16_t "%d"
+ #  elif HAVE_BASIC_INT16_T==5
+-#    define F_int16_t "%l"
++#    define F_int16_t "%ld"
+ #  else
+ #    error "HAVE_BASIC_INT16_T is out of range:" HAVE_BASIC_INT16_T
+ #  endif
+@@ -161,7 +163,7 @@
+ #  elif HAVE_BASIC_INT32_T==3
+ #    define F_int32_t "%d"
+ #  elif HAVE_BASIC_INT32_T==5
+-#    define F_int32_t "%l"
++#    define F_int32_t "%ld"
+ #  else
+ #    error "HAVE_BASIC_INT32_T is out of range:" HAVE_BASIC_INT32_T
+ #  endif
+@@ -175,7 +177,9 @@
+ #  elif HAVE_BASIC_INT64_T==3
+ #    define F_int64_t "%d"
+ #  elif HAVE_BASIC_INT64_T==5
+-#    define F_int64_t "%l"
++#    define F_int64_t "%ld"
++#  elif HAVE_BASIC_INT64_T==7
++#    define F_int64_t "%lld"
+ #  else
+ #    error "HAVE_BASIC_INT64_T is out of range:" HAVE_BASIC_INT64_T
+ #  endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/socat.git/commitdiff/ec20c8fb430b0fb7788ddcd6da39de544ac97f24