rpms/socat
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
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#80e06e41210df1590634369be246d9f2d71ed6f2
This commit is contained in:
DistroBaker 2021-01-05 17:00:16 +00:00
parent 6aabdb390f
commit 3f33a52d9e
4 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -11,3 +11,4 @@ socat-1.7.2.0.tar.gz
/socat-1.7.3.2.tar.gz
/socat-1.7.3.3.tar.gz
/socat-1.7.3.4.tar.gz
/socat-1.7.4.0.tar.gz

41
socat-1.7.4.0-uint64_t.patch Normal file
View File

@ -0,0 +1,41 @@
diff -Naur socat-1.7.4.0-orig/compat.h socat-1.7.4.0/compat.h
--- socat-1.7.4.0-orig/compat.h 2021-01-03 13:23:22.000000000 -0500
+++ socat-1.7.4.0/compat.h 2021-01-04 14:07:30.229747181 -0500
@@ -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

9
socat.spec
View File

@ -2,13 +2,14 @@
Summary: Bidirectional data relay between two data channels ('netcat++')
Name: socat
Version: 1.7.3.4
Release: 3%{?dist}
Version: 1.7.4.0
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: gcc
BuildRequires: openssl-devel readline-devel ncurses-devel
@ -29,6 +30,7 @@ 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 \
@ -72,6 +74,9 @@ export OD_C=/usr/bin/od
%doc %{_mandir}/man1/*
%changelog
* 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
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (socat-1.7.3.4.tar.gz) = c5699fd1a703e90927076599d02323b85722d49e86bc2f627b4301a41d3df72c634af629f378425ff201cde78343da5cd0cad1044bf857665176c91357401fdd
SHA512 (socat-1.7.4.0.tar.gz) = 0e500593f4086a9d94634232f8d5aa79eb57f85cb5f05e3bf0ae06baebd28c7c5d443ab71337d909a38f83538136119b89a8091681a19754b93229c42c23eb05