This commit is contained in:
parent
c9dcb40024
commit
2ca210f0b9
@ -1,11 +0,0 @@
|
||||
diff -Naur socat-1.5.0.0.org/sysincludes.h socat-1.5.0.0/sysincludes.h
|
||||
--- socat-1.5.0.0.org/sysincludes.h 2007-03-22 10:12:06.250064000 +0100
|
||||
+++ socat-1.5.0.0/sysincludes.h 2007-03-22 10:13:48.210995000 +0100
|
||||
@@ -127,6 +127,7 @@
|
||||
#include <regex.h>
|
||||
#endif
|
||||
#if HAVE_LINUX_EXT2_FS_H
|
||||
+#include <linux/fs.h>
|
||||
#include <linux/ext2_fs.h> /* Linux ext2 filesystem definitions */
|
||||
#endif
|
||||
#if WITH_READLINE
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:36b9f00a0bd2b2a59e51e6d986164eab0f62d9ef7024d8356ba9a818f6fdd624
|
||||
size 309547
|
3
socat-1.6.0.1.tar.bz2
Normal file
3
socat-1.6.0.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0d1ba82db0f735bf5006844b197ec5c980965980adceb6d1ef722f9b819b87b2
|
||||
size 375527
|
@ -1,3 +1,56 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 11 10:24:33 CET 2008 - lmuelle@suse.de
|
||||
|
||||
- Update to version 1.6.0.1.
|
||||
+ exec:...,pty did not kill child process under some circumstances; fixed
|
||||
by correcting typo in xio-progcall.c
|
||||
+ service name resolution failed due to byte order mistake
|
||||
+ socat would hang when invoked with many file descriptors already opened
|
||||
fix: replaced FOPEN_MAX with FD_SETSIZE
|
||||
+ fixed bugs where sub processes would become zombies because the master
|
||||
process did not catch SIGCHLD. this affected addresses UDP-LISTEN,
|
||||
UDP-CONNECT, TCP-CONNECT, OPENSSL, PROXY, UNIX-CONNECT, UNIX-CLIENT,
|
||||
ABSTRACT-CONNECT, ABSTRACT-CLIENT, SOCKSA, SOCKS4A
|
||||
+ fixed a bug where sub processes would become zombies because the master
|
||||
process caught SIGCHLD but did not wait(). this affected addresses
|
||||
UDP-RECVFROM, IP-RECVFROM, UNIX-RECVFROM, ABSTRACT-RECVFROM
|
||||
+ corrected option handling with STDIO; usecase: cool-write
|
||||
+ configure --disable-pty also disabled option waitlock
|
||||
+ fixed small bugs on systems with struct ip_mreq without struct ip_mreqn
|
||||
- Update to version 1.6.0.0.
|
||||
+ new addresses IP-DATAGRAM and UDP-DATAGRAM allow versatile broadcast
|
||||
and multicast modes
|
||||
+ new option ip-add-membership for control of multicast group membership
|
||||
+ new address TUN for generation of Linux TUN/TAP pseudo network
|
||||
interfaces (suggested by Mat Caughron); associated options tun-device,
|
||||
tun-name, tun-type; iff-up, iff-promisc, iff-noarp, iff-no-pi etc.
|
||||
+ new addresses ABSTRACT-CONNECT, ABSTRACT-LISTEN, ABSTRACT-SENDTO,
|
||||
ABSTRACT-RECV, and ABSTRACT-RECVFROM for abstract UNIX domain addresses
|
||||
on Linux (requested by Zeeshan Ali); option unix-tightsocklen controls
|
||||
socklen parameter on system calls.
|
||||
+ option end-close for control of connection closing allows FD sharing
|
||||
by sub processes
|
||||
+ range option supports form address:mask with IPv4
|
||||
+ changed behaviour of SSL-LISTEN to require and verify client
|
||||
certificate per default
|
||||
+ options f-setlkw-rd, f-setlkw-wr, f-setlk-rd, f-setlk-wr allow finer
|
||||
grained locking on regular files
|
||||
+ fixed bug where only first tcpwrap option was applied; fixed bug where
|
||||
tcpwrap IPv6 check always failed
|
||||
and fixing this bug)
|
||||
+ filan (and socat -D) could hang when a socket was involved
|
||||
+ corrected PTYs on HP-UX (and maybe others) using STREAMS
|
||||
+ correct bind with udp6-listen
|
||||
+ corrected filan.c peekbuff[0] which did not compile with Sun Studio Pro
|
||||
+ corrected problem with read data buffered in OpenSSL layer
|
||||
+ corrected problem with option readbytes when input stream stayed idle
|
||||
after so many bytes
|
||||
+ fixed a bug where a datagram receiver with option fork could fork two
|
||||
sub processes per packet
|
||||
- Don't call test.sh as it doesn't pass if called as non root.
|
||||
- Don't remove the buildroot in the install section.
|
||||
- Remove patch as linux/fs.h is included if HAVE_LINUX_FS_H is available.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 22 10:18:31 CET 2007 - ssommer@suse.de
|
||||
|
||||
|
99
socat.spec
99
socat.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package socat (Version 1.5.0.0)
|
||||
# spec file for package socat (Version 1.6.0.1)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
# package are under the same license as the package itself.
|
||||
#
|
||||
@ -10,17 +10,17 @@
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: socat
|
||||
BuildRequires: openssl-devel readline-devel tcpd-devel
|
||||
Version: 1.5.0.0
|
||||
Release: 30
|
||||
License: BSD License and BSD-like, GNU General Public License (GPL)
|
||||
BuildRequires: openssl-devel procps readline-devel tcpd-devel
|
||||
Version: 1.6.0.1
|
||||
Release: 1
|
||||
License: BSD 3-Clause; GPL v2 or later
|
||||
Group: Productivity/Networking/Other
|
||||
URL: http://www.dest-unreach.org/socat/
|
||||
Autoreqprov: on
|
||||
Url: http://www.dest-unreach.org/socat/
|
||||
AutoReqProv: on
|
||||
Summary: Multipurpose relay for bidirectional data transfer
|
||||
Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
|
||||
Patch0: socat-1.5.0.0-fs-include.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -39,7 +39,6 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup
|
||||
%patch -p1
|
||||
|
||||
%build
|
||||
%{?suse_update_config:%{suse_update_config -f}}
|
||||
@ -49,14 +48,10 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
--mandir=%{_mandir} \
|
||||
--sysconfdir=%{_sysconfdir}
|
||||
%{__make} all
|
||||
%ifnarch %arm
|
||||
./test.sh
|
||||
%endif
|
||||
mkdir examples
|
||||
mv daemon.sh ftp.sh mail.sh proxyecho.sh readline.sh examples
|
||||
|
||||
%install
|
||||
[ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT}
|
||||
mkdir -p \
|
||||
${RPM_BUILD_ROOT}/%{_bindir} \
|
||||
${RPM_BUILD_ROOT}/%{_mandir}/man1
|
||||
@ -67,17 +62,67 @@ mkdir -p \
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc BUGREPORTS CHANGES COPYING COPYING.OpenSSL DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY VERSION examples socat.html xio.help
|
||||
%doc BUGREPORTS CHANGES COPYING COPYING.OpenSSL DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY VERSION examples
|
||||
%{_bindir}/socat
|
||||
%{_bindir}/procan
|
||||
%{_bindir}/filan
|
||||
%{_mandir}/man1/socat.1.gz
|
||||
|
||||
%changelog
|
||||
* Thu Mar 22 2007 - ssommer@suse.de
|
||||
* Mon Feb 11 2008 lmuelle@suse.de
|
||||
- Update to version 1.6.0.1.
|
||||
+ exec:...,pty did not kill child process under some circumstances; fixed
|
||||
by correcting typo in xio-progcall.c
|
||||
+ service name resolution failed due to byte order mistake
|
||||
+ socat would hang when invoked with many file descriptors already opened
|
||||
fix: replaced FOPEN_MAX with FD_SETSIZE
|
||||
+ fixed bugs where sub processes would become zombies because the master
|
||||
process did not catch SIGCHLD. this affected addresses UDP-LISTEN,
|
||||
UDP-CONNECT, TCP-CONNECT, OPENSSL, PROXY, UNIX-CONNECT, UNIX-CLIENT,
|
||||
ABSTRACT-CONNECT, ABSTRACT-CLIENT, SOCKSA, SOCKS4A
|
||||
+ fixed a bug where sub processes would become zombies because the master
|
||||
process caught SIGCHLD but did not wait(). this affected addresses
|
||||
UDP-RECVFROM, IP-RECVFROM, UNIX-RECVFROM, ABSTRACT-RECVFROM
|
||||
+ corrected option handling with STDIO; usecase: cool-write
|
||||
+ configure --disable-pty also disabled option waitlock
|
||||
+ fixed small bugs on systems with struct ip_mreq without struct ip_mreqn
|
||||
- Update to version 1.6.0.0.
|
||||
+ new addresses IP-DATAGRAM and UDP-DATAGRAM allow versatile broadcast
|
||||
and multicast modes
|
||||
+ new option ip-add-membership for control of multicast group membership
|
||||
+ new address TUN for generation of Linux TUN/TAP pseudo network
|
||||
interfaces (suggested by Mat Caughron); associated options tun-device,
|
||||
tun-name, tun-type; iff-up, iff-promisc, iff-noarp, iff-no-pi etc.
|
||||
+ new addresses ABSTRACT-CONNECT, ABSTRACT-LISTEN, ABSTRACT-SENDTO,
|
||||
ABSTRACT-RECV, and ABSTRACT-RECVFROM for abstract UNIX domain addresses
|
||||
on Linux (requested by Zeeshan Ali); option unix-tightsocklen controls
|
||||
socklen parameter on system calls.
|
||||
+ option end-close for control of connection closing allows FD sharing
|
||||
by sub processes
|
||||
+ range option supports form address:mask with IPv4
|
||||
+ changed behaviour of SSL-LISTEN to require and verify client
|
||||
certificate per default
|
||||
+ options f-setlkw-rd, f-setlkw-wr, f-setlk-rd, f-setlk-wr allow finer
|
||||
grained locking on regular files
|
||||
+ fixed bug where only first tcpwrap option was applied; fixed bug where
|
||||
tcpwrap IPv6 check always failed
|
||||
and fixing this bug)
|
||||
+ filan (and socat -D) could hang when a socket was involved
|
||||
+ corrected PTYs on HP-UX (and maybe others) using STREAMS
|
||||
+ correct bind with udp6-listen
|
||||
+ corrected filan.c peekbuff[0] which did not compile with Sun Studio Pro
|
||||
+ corrected problem with read data buffered in OpenSSL layer
|
||||
+ corrected problem with option readbytes when input stream stayed idle
|
||||
after so many bytes
|
||||
+ fixed a bug where a datagram receiver with option fork could fork two
|
||||
sub processes per packet
|
||||
- Don't call test.sh as it doesn't pass if called as non root.
|
||||
- Don't remove the buildroot in the install section.
|
||||
- Remove patch as linux/fs.h is included if HAVE_LINUX_FS_H is available.
|
||||
* Thu Mar 22 2007 ssommer@suse.de
|
||||
- fix build with newer kernel headers:
|
||||
some common FS-specific ioctls moved to linux/fs.h
|
||||
* Mon Jul 17 2006 - lmuelle@suse.de
|
||||
* Mon Jul 17 2006 lmuelle@suse.de
|
||||
- Update to version 1.5.0.0.
|
||||
+ new datagram modes for udp, rawip, unix domain sockets
|
||||
+ socat option -T specifies inactivity timeout
|
||||
@ -105,24 +150,24 @@ mkdir -p \
|
||||
+ configure.in became part of distribution
|
||||
+ socats unpack directory now has full version, e.g. socat-1.5.0.0/
|
||||
+ corrected docu of option verify
|
||||
* Wed Jan 25 2006 - mls@suse.de
|
||||
* Wed Jan 25 2006 mls@suse.de
|
||||
- converted neededforbuild to BuildRequires
|
||||
* Tue Apr 26 2005 - uli@suse.de
|
||||
* Tue Apr 26 2005 uli@suse.de
|
||||
- disabled test on ARM (hangs QEMU)
|
||||
* Sun Mar 20 2005 - lmuelle@suse.de
|
||||
* Sun Mar 20 2005 lmuelle@suse.de
|
||||
- Update to version 1.4.2.0.
|
||||
* Sun Dec 12 2004 - lmuelle@suse.de
|
||||
* Sun Dec 12 2004 lmuelle@suse.de
|
||||
- Update to version 1.4.1.0.
|
||||
* Tue Oct 26 2004 - lmuelle@suse.de
|
||||
* Wed Oct 27 2004 lmuelle@suse.de
|
||||
- Update to version 1.4.0.3.
|
||||
* Mon Sep 27 2004 - lmuelle@suse.de
|
||||
* Mon Sep 27 2004 lmuelle@suse.de
|
||||
- Update to version 1.4.0.2.
|
||||
* Sat Aug 28 2004 - lmuelle@suse.de
|
||||
* Sat Aug 28 2004 lmuelle@suse.de
|
||||
- Add readline.sh to the examples.
|
||||
* Fri Aug 27 2004 - lmuelle@suse.de
|
||||
* Fri Aug 27 2004 lmuelle@suse.de
|
||||
- Update to version 1.4.0.1.
|
||||
* Mon Jun 14 2004 - lmuelle@suse.de
|
||||
* Mon Jun 14 2004 lmuelle@suse.de
|
||||
- Add openssl-devel, readline-devel, and tcpd-devel to neededforbuild/
|
||||
BuildRequires.
|
||||
* Mon Jun 14 2004 - lmuelle@suse.de
|
||||
* Mon Jun 14 2004 lmuelle@suse.de
|
||||
- Inital SuSE RPM based on source tar ball spec file.
|
||||
|
Loading…
Reference in New Issue
Block a user