Merge branch 'master' into f20
Conflicts: .gitignore socat.spec sources
This commit is contained in:
commit
1262c39394
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,3 +6,4 @@ socat-1.7.1.3.tar.gz
|
|||||||
socat-1.7.2.0.tar.gz
|
socat-1.7.2.0.tar.gz
|
||||||
/socat-1.7.2.2.tar.gz
|
/socat-1.7.2.2.tar.gz
|
||||||
/socat-1.7.2.3.tar.gz
|
/socat-1.7.2.3.tar.gz
|
||||||
|
/socat-1.7.2.4.tar.gz
|
||||||
|
31
socat.spec
31
socat.spec
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Summary: Bidirectional data relay between two data channels ('netcat++')
|
Summary: Bidirectional data relay between two data channels ('netcat++')
|
||||||
Name: socat
|
Name: socat
|
||||||
Version: 1.7.2.3
|
Version: 1.7.2.4
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Url: http://www.dest-unreach.org/%{name}
|
Url: http://www.dest-unreach.org/%{name}
|
||||||
@ -11,8 +11,8 @@ Group: Applications/Internet
|
|||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: openssl-devel readline-devel ncurses-devel
|
BuildRequires: openssl-devel readline-devel ncurses-devel
|
||||||
BuildRequires: autoconf kernel-headers > 2.6.18
|
BuildRequires: autoconf kernel-headers > 2.6.18
|
||||||
Patch1: socat-1.7.2.1-procan-cdefs.patch
|
# for make test
|
||||||
Patch2: socat-1.7.2.1-errqueue.patch
|
BuildRequires: iproute net-tools coreutils procps-ng openssl iputils
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Socat is a relay for bidirectional data transfer between two independent data
|
Socat is a relay for bidirectional data transfer between two independent data
|
||||||
@ -26,12 +26,8 @@ line editor (readline), a program, or a combination of two of these.
|
|||||||
%setup -q
|
%setup -q
|
||||||
iconv -f iso8859-1 -t utf-8 CHANGES > CHANGES.utf8
|
iconv -f iso8859-1 -t utf-8 CHANGES > CHANGES.utf8
|
||||||
mv CHANGES.utf8 CHANGES
|
mv CHANGES.utf8 CHANGES
|
||||||
%patch1 -p1
|
|
||||||
%patch2 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
autoconf
|
|
||||||
%configure \
|
%configure \
|
||||||
--enable-help --enable-stdio \
|
--enable-help --enable-stdio \
|
||||||
--enable-fdnum --enable-file --enable-creat \
|
--enable-fdnum --enable-file --enable-creat \
|
||||||
@ -43,31 +39,32 @@ autoconf
|
|||||||
--enable-openssl --enable-sycls --enable-filan \
|
--enable-openssl --enable-sycls --enable-filan \
|
||||||
--enable-retry --enable-libwrap --enable-fips
|
--enable-retry --enable-libwrap --enable-fips
|
||||||
|
|
||||||
|
|
||||||
chmod 644 *.sh
|
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf %{buildroot}
|
|
||||||
|
|
||||||
make DESTDIR=%{buildroot} install
|
make DESTDIR=%{buildroot} install
|
||||||
|
install -d %{buildroot}/%{_docdir}/socat-%{version}
|
||||||
|
install -m 0644 *.sh %{buildroot}/%{_docdir}/socat-%{version}/
|
||||||
|
|
||||||
%clean
|
%check
|
||||||
rm -rf %{buildroot}
|
export TERM=ansi
|
||||||
|
export OD_C=/usr/bin/od
|
||||||
|
make test
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
|
||||||
%doc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ PORTING
|
%doc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ PORTING
|
||||||
%doc COPYING* README SECURITY testcert.conf
|
%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}/socat
|
||||||
%{_bindir}/filan
|
%{_bindir}/filan
|
||||||
%{_bindir}/procan
|
%{_bindir}/procan
|
||||||
%doc %{_mandir}/man1/socat.1*
|
%doc %{_mandir}/man1/socat.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Apr 07 2014 Paul Wouters <pwouters@redhat.com> - 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 <pwouters@redhat.com> - 1.7.2.3-1
|
* Wed Jan 29 2014 Paul Wouters <pwouters@redhat.com> - 1.7.2.3-1
|
||||||
- Updated to 1.7.2.3 for CVE-2014-0019
|
- Updated to 1.7.2.3 for CVE-2014-0019
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user