From 7ce7e55c5f8b8e0ac22fd2cc473cdfbdcbbc68d3 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Tue, 28 Jan 2014 20:52:32 -0800 Subject: [PATCH 1/4] * Wed Jan 29 2014 Paul Wouters - 1.7.2.3-1 - Updated to 1.7.2.3 for CVE-2014-0019 --- .gitignore | 1 + socat.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index af74a5e..44d473c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ socat-1.7.1.2.tar.gz socat-1.7.1.3.tar.gz socat-1.7.2.0.tar.gz /socat-1.7.2.2.tar.gz +/socat-1.7.2.3.tar.gz diff --git a/socat.spec b/socat.spec index 6f20740..fc9db8e 100644 --- a/socat.spec +++ b/socat.spec @@ -2,8 +2,8 @@ Summary: Bidirectional data relay between two data channels ('netcat++') Name: socat -Version: 1.7.2.2 -Release: 3%{?dist} +Version: 1.7.2.3 +Release: 1%{?dist} License: GPLv2 Url: http://www.dest-unreach.org/%{name} Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.gz @@ -68,6 +68,9 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/socat.1* %changelog +* 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 diff --git a/sources b/sources index 2768037..8082020 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fe70c821a104378a834c3ed1b5971e54 socat-1.7.2.2.tar.gz +6943f7a5e1ffd553ad2a900bbf05b83a socat-1.7.2.3.tar.gz From 2794524e7f80b7c18738db48c8901bed5d1e96c9 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Mon, 7 Apr 2014 15:32:56 -0400 Subject: [PATCH 2/4] * 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 --- .gitignore | 1 + socat.spec | 24 +++++++++--------------- sources | 2 +- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 44d473c..92c8a41 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ socat-1.7.1.3.tar.gz socat-1.7.2.0.tar.gz /socat-1.7.2.2.tar.gz /socat-1.7.2.3.tar.gz +/socat-1.7.2.4.tar.gz diff --git a/socat.spec b/socat.spec index fc9db8e..06b08bb 100644 --- a/socat.spec +++ b/socat.spec @@ -2,7 +2,7 @@ Summary: Bidirectional data relay between two data channels ('netcat++') Name: socat -Version: 1.7.2.3 +Version: 1.7.2.4 Release: 1%{?dist} License: GPLv2 Url: http://www.dest-unreach.org/%{name} @@ -26,12 +26,8 @@ line editor (readline), a program, or a combination of two of these. %setup -q iconv -f iso8859-1 -t utf-8 CHANGES > CHANGES.utf8 mv CHANGES.utf8 CHANGES -%patch1 -p1 -%patch2 -p1 %build - -autoconf %configure \ --enable-help --enable-stdio \ --enable-fdnum --enable-file --enable-creat \ @@ -43,31 +39,29 @@ autoconf --enable-openssl --enable-sycls --enable-filan \ --enable-retry --enable-libwrap --enable-fips - -chmod 644 *.sh make %{?_smp_mflags} %install -rm -rf %{buildroot} - make DESTDIR=%{buildroot} install +install -d %{buildroot}/%{_docdir}/socat +install -m 0644 *.sh %{buildroot}/%{_docdir}/socat/ -%clean -rm -rf %{buildroot} +%check +make test %files -%defattr(-,root,root) %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 +* 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 + * Wed Jan 29 2014 Paul Wouters - 1.7.2.3-1 - Updated to 1.7.2.3 for CVE-2014-0019 diff --git a/sources b/sources index 8082020..f8524c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6943f7a5e1ffd553ad2a900bbf05b83a socat-1.7.2.3.tar.gz +2a15dc3362f49d543abdbacc267d0a41 socat-1.7.2.4.tar.gz From 3ef891304c39289dd057239b9f07a104bcec8d67 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Tue, 8 Apr 2014 12:41:28 -0400 Subject: [PATCH 3/4] - Add build dependancies for make test --- socat.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/socat.spec b/socat.spec index 06b08bb..f7a935b 100644 --- a/socat.spec +++ b/socat.spec @@ -11,6 +11,7 @@ Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel readline-devel ncurses-devel BuildRequires: autoconf kernel-headers > 2.6.18 +BuildRequires: iproute net-tools Patch1: socat-1.7.2.1-procan-cdefs.patch Patch2: socat-1.7.2.1-errqueue.patch @@ -61,6 +62,7 @@ make test * 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 From 4f38a7bb351755cd8614f463c4e68049ae3b83f6 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Tue, 8 Apr 2014 17:59:40 -0400 Subject: [PATCH 4/4] added more buildrequires for test suite --- socat.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/socat.spec b/socat.spec index f7a935b..6cd6464 100644 --- a/socat.spec +++ b/socat.spec @@ -11,9 +11,8 @@ Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel readline-devel ncurses-devel BuildRequires: autoconf kernel-headers > 2.6.18 -BuildRequires: iproute net-tools -Patch1: socat-1.7.2.1-procan-cdefs.patch -Patch2: socat-1.7.2.1-errqueue.patch +# 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 @@ -48,6 +47,9 @@ install -d %{buildroot}/%{_docdir}/socat install -m 0644 *.sh %{buildroot}/%{_docdir}/socat/ %check +export TERM=ansi +export OD_C=/usr/bin/od +./socat -t 0.1 -u exec:./procan - make test %files