Accepting request 95859 from home:msmeissn:branches:network:utilities

updated to 1.7.2.0

OBS-URL: https://build.opensuse.org/request/show/95859
OBS-URL: https://build.opensuse.org/package/show/network:utilities/socat?expand=0&rev=10
This commit is contained in:
OBS User mrdocs 2011-12-07 21:34:17 +00:00 committed by Git OBS Bridge
parent 46c011690b
commit f27e2d4955
5 changed files with 26 additions and 40 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2a14f42e2166e1a9d5413cc7f743f2f3b16e58427c848cd711688568219b7c42
size 426350

3
socat-1.7.2.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:59b3bde927c14fbc3f9e42c782971710da8a89bbf46f7531f09a681754041802
size 432031

View File

@ -1,21 +0,0 @@
Index: socat-1.7.1.2/sysutils.c
===================================================================
--- socat-1.7.1.2.orig/sysutils.c
+++ socat-1.7.1.2/sysutils.c
@@ -215,10 +215,14 @@ char *sockaddr_unix_info(const struct so
} else
#endif /* WITH_ABSTRACT_UNIXSOCKET */
{
- nextc =
- sanitize_string(sa->sun_path,
+ if (salen <= XIOUNIXSOCKOVERHEAD) {
+ nextc = sanitize_string ("<anon>", MIN(UNIX_PATH_MAX, strlen("<anon>")),
+ ubuff, XIOSAN_DEFAULT_BACKSLASH_OCT_3);
+ } else {
+ nextc = sanitize_string(sa->sun_path,
MIN(UNIX_PATH_MAX, strlen(sa->sun_path)),
ubuff, XIOSAN_DEFAULT_BACKSLASH_OCT_3);
+ }
*nextc = '\0';
strncpy(buff, ubuff, blen);
}

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Dec 7 17:49:55 CET 2011 - meissner@suse.de
- updated to 1.7.2.0
This release allows tun/tap interfaces without IP addresses and
introduces the options openssl-compress and max-children. It fixes 18
bugs and has 11 changes for improved platform support, especially Mac
OS X Lion, DragonFly, and Android.
- socat-unixsalen.patch now upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 2 18:23:27 CET 2011 - meissner@suse.de Wed Feb 2 18:23:27 CET 2011 - meissner@suse.de
@ -39,7 +49,7 @@ Thu Oct 16 09:56:41 CEST 2008 - meissner@suse.de
- A new option escape allows it to interrupt raw terminal connections. - A new option escape allows it to interrupt raw terminal connections.
- Listening and receiving sockets can set a couple of environment variables. - Listening and receiving sockets can set a couple of environment variables.
- Base control of System V STREAMS has been added. - Base control of System V STREAMS has been added.
- Many corrections were performed. - Many corrections were performed.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 11 10:24:33 CET 2008 - lmuelle@suse.de Mon Feb 11 10:24:33 CET 2008 - lmuelle@suse.de
@ -62,7 +72,7 @@ Mon Feb 11 10:24:33 CET 2008 - lmuelle@suse.de
+ fixed small bugs on systems with struct ip_mreq without struct ip_mreqn + fixed small bugs on systems with struct ip_mreq without struct ip_mreqn
- Update to version 1.6.0.0. - Update to version 1.6.0.0.
+ new addresses IP-DATAGRAM and UDP-DATAGRAM allow versatile broadcast + new addresses IP-DATAGRAM and UDP-DATAGRAM allow versatile broadcast
and multicast modes and multicast modes
+ new option ip-add-membership for control of multicast group membership + new option ip-add-membership for control of multicast group membership
+ new address TUN for generation of Linux TUN/TAP pseudo network + new address TUN for generation of Linux TUN/TAP pseudo network
interfaces (suggested by Mat Caughron); associated options tun-device, interfaces (suggested by Mat Caughron); associated options tun-device,
@ -80,7 +90,7 @@ Mon Feb 11 10:24:33 CET 2008 - lmuelle@suse.de
grained locking on regular files grained locking on regular files
+ fixed bug where only first tcpwrap option was applied; fixed bug where + fixed bug where only first tcpwrap option was applied; fixed bug where
tcpwrap IPv6 check always failed tcpwrap IPv6 check always failed
and fixing this bug) and fixing this bug)
+ filan (and socat -D) could hang when a socket was involved + filan (and socat -D) could hang when a socket was involved
+ corrected PTYs on HP-UX (and maybe others) using STREAMS + corrected PTYs on HP-UX (and maybe others) using STREAMS
+ correct bind with udp6-listen + correct bind with udp6-listen
@ -154,7 +164,7 @@ Sun Dec 12 15:51:50 CET 2004 - lmuelle@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 26 23:18:18 CEST 2004 - lmuelle@suse.de Tue Oct 26 23:18:18 CEST 2004 - lmuelle@suse.de
- Update to version 1.4.0.3. - Update to version 1.4.0.3.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 27 00:26:39 CEST 2004 - lmuelle@suse.de Mon Sep 27 00:26:39 CEST 2004 - lmuelle@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package socat (Version 1.7.1.3) # spec file for package socat
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Pascal Bleser <pascal.bleser@opensuse.org> # Copyright (c) 2010 Pascal Bleser <pascal.bleser@opensuse.org>
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -21,14 +21,14 @@
Name: socat Name: socat
BuildRequires: openssl-devel procps readline-devel tcpd-devel BuildRequires: openssl-devel procps readline-devel tcpd-devel
Version: 1.7.1.3 Version: 1.7.2.0
Release: 1 Release: 6
License: BSD3c ; GPLv2+ License: BSD-3-Clause ; GPL-2.0+
Group: Productivity/Networking/Other Group: Productivity/Networking/Other
Url: http://www.dest-unreach.org/socat/ Url: http://www.dest-unreach.org/socat/
Summary: Multipurpose relay for bidirectional data transfer Summary: Multipurpose relay for bidirectional data transfer
# 1.7.2.0: md5 eb563dd00b9d39a49fb62a677fc941fe
Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2 Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
Patch0: socat-unixsalen.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -41,15 +41,11 @@ combination of two of these.
%prep %prep
%setup %setup
%patch0 -p1
%build %build
%{?suse_update_config:%{suse_update_config -f}} %{?suse_update_config:%{suse_update_config -f}}
export CFLAGS="%{optflags} -fno-strict-aliasing" export RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing"
./configure \ %configure
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--sysconfdir=%{_sysconfdir}
%{__make} all %{__make} all
mkdir examples mkdir examples
mv daemon.sh ftp.sh mail.sh proxyecho.sh readline.sh examples mv daemon.sh ftp.sh mail.sh proxyecho.sh readline.sh examples
@ -70,4 +66,5 @@ mkdir -p \
%{_bindir}/procan %{_bindir}/procan
%{_bindir}/filan %{_bindir}/filan
%{_mandir}/man1/socat.1%{ext_man} %{_mandir}/man1/socat.1%{ext_man}
%changelog %changelog