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