From e01d0293989644979d258a5993fbf11a63dbf481 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 25 Oct 2024 19:23:47 +0300 Subject: [PATCH] import socat-1.7.4.4-6.el10 --- .gitignore | 1 + .socat.metadata | 1 + SOURCES/socat-1.7.3.3-warn.patch | 43 ++++ SOURCES/socat-configure-c99.patch | 32 +++ SPECS/socat.spec | 313 ++++++++++++++++++++++++++++++ 5 files changed, 390 insertions(+) create mode 100644 .gitignore create mode 100644 .socat.metadata create mode 100644 SOURCES/socat-1.7.3.3-warn.patch create mode 100644 SOURCES/socat-configure-c99.patch create mode 100644 SPECS/socat.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..651635c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/socat-1.7.4.4.tar.gz diff --git a/.socat.metadata b/.socat.metadata new file mode 100644 index 0000000..e236b44 --- /dev/null +++ b/.socat.metadata @@ -0,0 +1 @@ +39ff9114e93476f8ce28398c38a43368b6a0ac09 SOURCES/socat-1.7.4.4.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/SOURCES/socat-configure-c99.patch b/SOURCES/socat-configure-c99.patch new file mode 100644 index 0000000..37d8c4b --- /dev/null +++ b/SOURCES/socat-configure-c99.patch @@ -0,0 +1,32 @@ +Include for the ERR_error_string function. This +improves compatibility with future compilers which will not accept +implicit funcction declarations by default. + +diff --git a/configure b/configure +index fe4e606e91010520..694801b2a93659af 100755 +--- a/configure ++++ b/configure +@@ -5199,6 +5199,8 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include ++ #include ++ + int + main () + { +diff --git a/configure.ac b/configure.ac +index 09dbb7a1e8d35c84..abd599c90e3ef0d7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -559,7 +559,9 @@ if test -n "$WITH_OPENSSL" -a "$sc_cv_have_openssl_ssl_h" = 'yes'; then + else + LIBS="$LIBS -lssl -lcrypto" + fi +- AC_TRY_LINK([#include ], ++ AC_TRY_LINK([#include ++ #include ++ ], + [SSL_library_init();ERR_error_string()], + [sc_cv_have_libssl='yes'], + [ LIBS="$LIBS -lcrypto" diff --git a/SPECS/socat.spec b/SPECS/socat.spec new file mode 100644 index 0000000..cce58e7 --- /dev/null +++ b/SPECS/socat.spec @@ -0,0 +1,313 @@ +%global _hardened_build 1 + +Summary: Bidirectional data relay between two data channels ('netcat++') +Name: socat +Version: 1.7.4.4 +Release: 6%{?dist} +License: GPL-2.0-only +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-configure-c99.patch + +BuildRequires: make +BuildRequires: gcc +BuildRequires: openssl-devel readline-devel ncurses-devel +BuildRequires: autoconf kernel-headers > 2.6.18 +# for make test +BuildRequires: iproute net-tools coreutils procps-ng openssl iputils + +%description +Socat is a relay for bidirectional data transfer between two independent data +channels. Each of these data channels may be a file, pipe, device (serial line +etc. or a pseudo terminal), a socket (UNIX, IP4, IP6 - raw, UDP, TCP), an +SSL socket, proxy CONNECT connection, a file descriptor (stdin etc.), the GNU +line editor (readline), a program, or a combination of two of these. + + +%prep +%setup -q +iconv -f iso8859-1 -t utf-8 CHANGES > CHANGES.utf8 +mv CHANGES.utf8 CHANGES +%patch1 -p1 +%patch2 -p1 + +%build +%configure \ + --enable-help --enable-stdio \ + --enable-fdnum --enable-file --enable-creat \ + --enable-gopen --enable-pipe --enable-termios \ + --enable-unix --enable-ip4 --enable-ip6 \ + --enable-rawip --enable-tcp --enable-udp \ + --enable-listen --enable-proxy --enable-exec \ + --enable-system --enable-pty --enable-readline \ + --enable-openssl --enable-sycls --enable-filan \ + --enable-retry # --enable-fips + +%make_build + +%install + %make_install +install -d %{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 +export OD_C=/usr/bin/od +# intermittently, a test sometimes just fails and some just hang +# HANGS on x86_64: 93, 323 +# FAILED on x86_64: 61 215 306 307 +# FAILED on ppc64le: 58 239 +# FAILED on armv7hl: 154 155 318 319 +#sed -i 's/NUMCOND=true/NUMCOND="test \\$N -ne 93 -a \\$N -ne 323"/' test.sh +#make test + +%files +%doc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ PORTING +%doc COPYING* README SECURITY +%doc %{_docdir}/socat/*.sh +%{_bindir}/socat +%{_bindir}/filan +%{_bindir}/procan +%doc %{_mandir}/man1/* + +%changelog +* Mon Jun 24 2024 Troy Dawson - 1.7.4.4-6 +- Bump release for June 2024 mass rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.7.4.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Oct 02 2023 Martin Osvald - 1.7.4.4-4 +- SPDX migration + +* Sat Jul 22 2023 Fedora Release Engineering - 1.7.4.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.7.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Jan 17 2023 Clemens Lang - 1.7.4.4-1 +- Resolves: rhbz#2038615 socat-1.7.4.4 is available + +* Mon Dec 12 2022 Florian Weimer - 1.7.4.2-4 +- Port configure script to C99 (#2152488) + +* Sat Jul 23 2022 Fedora Release Engineering - 1.7.4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.7.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Nov 1 2021 Davide Cavalca - 1.7.4.2-1 +- Resolves: rhbz#2018835 socat-1.7.4.2 is available + +* Tue Sep 14 2021 Sahana Prasad - 1.7.4.1-4 +- Rebuilt with OpenSSL 3.0.0 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.7.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.7.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jan 11 10:35:54 EST 2021 Paul Wouters - 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 - 1.7.4.0-1 +- Resolves: rhbz#1912161 socat-1.7.4.0 is available + +* Wed Jul 29 2020 Fedora Release Engineering - 1.7.3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 1.7.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 06 2020 Paul Wouters - 1.7.3.4-1 +- Resolves: rhbz#1787954 socat-1.7.3.4 is available + +* Fri Jul 26 2019 Fedora Release Engineering - 1.7.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jun 24 2019 Paul Wouters - 1.7.3.3-1 +- Resolves: rhbz#1696931 socat-1.7.3.3 is available +- Resolves: rhbz#1612274 Man page scan results for socat +- Disabled --enable-fips as its requires fipsld which we don't have. + +* Sun Feb 17 2019 Igor Gnatenko - 1.7.3.2-9 +- Rebuild for readline 8.0 + +* Sun Feb 03 2019 Fedora Release Engineering - 1.7.3.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.7.3.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.7.3.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 04 2018 Paul Wouters - 1.7.3.2-5 +- Resolves: rhbz#1518784 socat should not require tcp_wrappers + +* Thu Aug 03 2017 Fedora Release Engineering - 1.7.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.7.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Mar 06 2017 Paul Wouters - 1.7.3.2-3 +- Add BuildRequire for tcp_wrappers-devel to gain libwrap support + +* Sat Feb 11 2017 Fedora Release Engineering - 1.7.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 02 2017 Paul Wouters - 1.7.3.2-1 +- Resolves rhbz#1404290 socat build failure on rawhide +- Resolves rhbz#1416597 socat-1.7.3.2 is available +- Resolves rhbz#1417483 Failed DNS resolution causes SIGSEGV and endless loop +- Removed obsoleted patch + +* Thu Jan 12 2017 Igor Gnatenko - 1.7.3.1-2 +- Rebuild for readline 7.x + +* Tue Apr 26 2016 Paul wouters - 1.7.3.1-1 +- Update to 1.7.3.1 (#1186301) + +* Fri Feb 05 2016 Fedora Release Engineering - 1.7.2.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.7.2.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Jan 24 2015 Paul Wouters - 1.7.2.4-4 +- Resolves rhbz#1182005 - socat 1.7.2.4 build failure missing linux/errqueue.h + +* Mon Aug 18 2014 Fedora Release Engineering - 1.7.2.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.7.2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Apr 07 2014 Paul Wouters - 1.7.2.4-1 +- Updated to 1.7.2.4 which contains many bugfixes +- Run tests in make check +- Add build dependancies for make test + +* Wed Jan 29 2014 Paul Wouters - 1.7.2.3-1 +- Updated to 1.7.2.3 for CVE-2014-0019 + +* Sun Aug 04 2013 Fedora Release Engineering - 1.7.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon May 27 2013 Paul Wouters - 1.7.2.2-2 +- Added two patches that fixes some -Wformat warnings. these fix 2 of 3 + failing test cases from test.sh +- Enabled hardening with full relro/pie +- Switch from readline5 to readline(6) + +* Mon May 27 2013 Paul Wouters - 1.7.2.2-1 +- Updated to 1.7.2.2 for CVE-2013-3571, rhbz#967539 + +* Fri Feb 15 2013 Fedora Release Engineering - 1.7.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Fedora Release Engineering - 1.7.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed May 23 2012 Paul Wouters - 1.7.2.1-1 +- Updated to 1.7.2.1 for CVE-2012-0219, rhbz#821553, rhbz#821688 +- Remove patch merged upstream +- Remove --disable-fips from configure + +* Sat Jan 07 2012 Paul Wouters - 1.7.2.0-1 +- Upgraded to 1.7.2.0 which allows tun/tap interfaces without IP address + and introduces options openssl-compress and max-children. + +* Wed Sep 21 2011 Paul Wouters - 1.7.1.3-3 +- support TUN endpoint without IP address (rhbz#706226) [Till Maas] + +* Wed Feb 09 2011 Fedora Release Engineering - 1.7.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Aug 23 2010 Paul Wouters - 1.7.1.3-1 +- Upgrade to 1.7.1.3 +- Includes fix for CVE-2010-2799 Stack overflow by lexical scanning of nested + character patterns +- Resolves https://bugzilla.redhat.com/show_bug.cgi?id=620430 + +* Sat Jan 30 2010 Paul Wouters - 1.7.1.2-1 +- Upgraded to 1.7.1.2 +- Link against compat-readline5 for GPLv2 license (Miroslav Lichvar) + (bz #511310) + +* Sat Aug 29 2009 Caolán McNamara - 1.7.1.1-5 +- recreate autoconf to get correct includes when determining type + sizes in order to build correctly + +* Fri Aug 28 2009 Paul Wouters - 1.7.1.1-4 +- Bump for new openssl + +* Fri Aug 21 2009 Tomas Mraz - 1.7.1.1-3 +- rebuilt with new openssl + +* Sun Jul 26 2009 Fedora Release Engineering - 1.7.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon May 11 2009 Paul Wouters - 1.7.1.1-1 +- Upgraded to 1.7.1.1. +- Patch for configure.in with -Wall + +* Wed Feb 25 2009 Fedora Release Engineering - 1.7.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Jan 20 2009 Paul Wouters 1.6.0.1-3 +- disable the upstream openssl fips support + +* Thu Sep 4 2008 Tom "spot" Callaway 1.6.0.1-2 +- forgot to upload new source + +* Thu Sep 4 2008 Tom "spot" Callaway 1.6.0.1-1 +- fix license tag +- update to 1.6.0.1 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.5.0.0-8 +- Autorebuild for GCC 4.3 + +* Wed Dec 05 2007 Release Engineering - 1.5.0.0-7 + - Rebuild for deps + +* Wed Dec 5 2007 Paul Wouters 1.5.0.0-6 +- Rebuild for updatesd libcrypto + +* Mon Feb 19 2007 Paul Wouters 1.5.0.0-5 +- Tagging failure bug in redhat build system requires bump + +* Mon Feb 19 2007 Paul Wouters 1.5.0.0-4 +- Some filesystem defines moved from their specific (ext2) + filesystem defines into the generic . + +* Mon Sep 11 2006 Paul Wouters 1.5.0.0-3 +- Rebuild requested for PT_GNU_HASH support from gcc + +* Sun Aug 20 2006 Paul Wouters - 1.5.0.0-2 +- Added missing examples to doc section and removed execute bits. + +* Fri Aug 04 2006 Paul Wouters - 1.5.0.0-1 +- Updated to 1.5.0.0 +- removed version cut/mversion, since source untars properly now. + +* Tue May 09 2006 Paul Wouters - 1.4.3.1-1 +- Updated to 1.4.3.1 + +* Thu Jan 26 2006 Paul Wouters 1.4.3.0-2 +- Removed DESTDIR export and fixed two capitals + +* Thu Jan 26 2006 Paul Wouters 1.4.3.0-1 +- Initial version based on Pascal Bleser suse rpm