diff --git a/.socat.metadata b/.socat.metadata new file mode 100644 index 0000000..3681159 --- /dev/null +++ b/.socat.metadata @@ -0,0 +1 @@ +588294c17373d52a8ac877dcd599ef26f14b110b SOURCES/socat-1.7.2.2.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/socat-1.7.2.1-errqueue.patch b/SOURCES/socat-1.7.2.1-errqueue.patch new file mode 100644 index 0000000..6aa89e2 --- /dev/null +++ b/SOURCES/socat-1.7.2.1-errqueue.patch @@ -0,0 +1,11 @@ +diff -Naur socat-1.7.2.1-orig/xio-ip.c socat-1.7.2.1/xio-ip.c +--- socat-1.7.2.1-orig/xio-ip.c 2011-12-06 02:45:03.000000000 -0500 ++++ socat-1.7.2.1/xio-ip.c 2012-05-23 16:31:23.000000000 -0400 +@@ -42,6 +42,7 @@ + const struct optdesc opt_ip_hdrincl = { "ip-hdrincl", "hdrincl", OPT_IP_HDRINCL, GROUP_SOCK_IP, PH_PASTSOCKET, TYPE_INT, OFUNC_SOCKOPT, SOL_IP, IP_HDRINCL }; + #endif + #ifdef IP_RECVERR ++# include + const struct optdesc opt_ip_recverr = { "ip-recverr", "recverr", OPT_IP_RECVERR, GROUP_SOCK_IP, PH_PASTSOCKET, TYPE_INT, OFUNC_SOCKOPT, SOL_IP, IP_RECVERR }; + #endif + #ifdef IP_MTU_DISCOVER diff --git a/SOURCES/socat-1.7.2.1-procan-cdefs.patch b/SOURCES/socat-1.7.2.1-procan-cdefs.patch new file mode 100644 index 0000000..5375e02 --- /dev/null +++ b/SOURCES/socat-1.7.2.1-procan-cdefs.patch @@ -0,0 +1,12 @@ +diff -Naur socat-1.7.2.1-orig/procan-cdefs.c socat-1.7.2.1/procan-cdefs.c +--- socat-1.7.2.1-orig/procan-cdefs.c 2010-10-06 03:25:30.000000000 -0400 ++++ socat-1.7.2.1/procan-cdefs.c 2012-11-20 17:15:37.521215330 -0500 +@@ -20,7 +20,7 @@ + fprintf(outfile, "#define FD_SETSIZE %u\n", FD_SETSIZE); + #endif + #ifdef NFDBITS +- fprintf(outfile, "#define NFDBITS "F_Zu"\n", NFDBITS); ++ fprintf(outfile, "#define NFDBITS %u\n", NFDBITS); + #endif + #ifdef O_RDONLY + fprintf(outfile, "#define O_RDONLY %u\n", O_RDONLY); diff --git a/SPECS/socat.spec b/SPECS/socat.spec new file mode 100644 index 0000000..cae5729 --- /dev/null +++ b/SPECS/socat.spec @@ -0,0 +1,178 @@ +%global _hardened_build 1 + +Summary: Bidirectional data relay between two data channels ('netcat++') +Name: socat +Version: 1.7.2.2 +Release: 2%{?dist} +License: GPLv2 +Url: http://www.dest-unreach.org/%{name} +Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.gz +Group: Applications/Internet +BuildRequires: openssl-devel readline-devel ncurses-devel +BuildRequires: autoconf kernel-headers > 2.6.18 + +Patch1: socat-1.7.2.1-procan-cdefs.patch +Patch2: socat-1.7.2.1-errqueue.patch + +%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 +autoconf +export CPPFLAGS="-I%{_includedir}/readline5" LDFLAGS="-L%{_libdir}/readline5" +%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-libwrap + +chmod 644 *.sh +make %{?_smp_mflags} + +# Needs networking +#% check +#sh ./test.sh + +%install +rm -rf %{buildroot} + +make DESTDIR=%{buildroot} install + +%files +%doc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ PORTING +%doc COPYING* README SECURITY testcert.conf +%doc daemon.sh ftp.sh gatherinfo.sh mail.sh proxy.sh +%doc proxyecho.sh readline.sh readline-test.sh +%doc socks4echo.sh socks4a-echo.sh test.sh +%{_bindir}/socat +%{_bindir}/filan +%{_bindir}/procan +%doc %{_mandir}/man1/socat.1* + +%changelog +* Thu Oct 10 2013 Paul Wouters - 1.7.2.2-2 +- Resolves: rhel#1017015 Use readline, not compat-readline5-devel +- Added two patches fixing -Wformat issues +- Enable hardened build +- Cleanup obsolete spec file lines + +* 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