[cvs] dists/10.4/unstable/main/finkinfo/net socat.patch, NONE, 1.1 socat.info, 1.5, 1.6

Sun, 22 May 2011 14:46:26 -0700 

Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory vz-cvs-3.sog:/tmp/cvs-serv13464

Modified Files:
        socat.info 
Added Files:
        socat.patch 
Log Message:
Update from upstream
Adding patches from debian
Set maintainer from none to myself


--- NEW FILE: socat.patch ---
diff -rauN socat-1.7.1.3/doc/index.html socat-1.7.1.3-debian/doc/index.html
--- socat-1.7.1.3/doc/index.html        1970-01-01 01:00:00.000000000 +0100
+++ socat-1.7.1.3-debian/doc/index.html 2011-05-22 23:25:16.000000000 +0200
@@ -0,0 +1,14 @@
+<html>
+<head>
+<title>Index of socat online documentation</title>
+</head>
+<body>
+<div align=left>
+<h1>Index of socat online documentation</h1>
+<a href="socat.html">Socat Manual Page</a><br><br>
+<a href="socat-genericsocket.html">Generic sockets with Socat</a><br><br>
+<a href="socat-multicast.html">IP Multicasting with Socat</a><br><br>
+<a href="socat-openssltunnel.html">Securing Traffic Between two Socat 
Instances Using SSL</a><br><br>
+<a href="socat-tun.html">Building TUN based virtual networks with 
soca</a><br><br>
+</body>
+</html>
diff -rauN socat-1.7.1.3/doc/socat.1 socat-1.7.1.3-debian/doc/socat.1
--- socat-1.7.1.3/doc/socat.1   2010-07-06 07:38:41.000000000 +0200
+++ socat-1.7.1.3-debian/doc/socat.1    2011-05-22 23:25:30.000000000 +0200
@@ -7,9 +7,9 @@
 .SH "SYNOPSIS"
 \f(CWsocat [options] <address> <address>\fP
 .br 
-\f(CWsocat -V\fP
+\f(CWsocat \-V\fP
 .br 
-\f(CWsocat -h[h[h]] | -?[?[?]]\fP
+\f(CWsocat \-h[h[h]] | \-?[?[?]]\fP
 .br 
 \f(CWfilan\fP
 .br 
@@ -27,7 +27,7 @@
 .PP 
 \fBFilan\fP is a utility that prints information about its active file
 descriptors to stdout\&. It has been written for debugging \fBsocat\fP, but 
might be
-useful for other purposes too\&. Use the -h option to find more infos\&.
+useful for other purposes too\&. Use the \-h option to find more infos\&.
 .PP 
 \fBProcan\fP is a utility that prints information about process parameters to
 stdout\&. It has been written to better understand 
@@ -72,11 +72,11 @@
 Print a help text to stdout describing command line options and available 
address
 types, and exit\&.
 .IP "\fB\f(CW-hh | -??\fP\fP"
-Like -h, plus a list of the short names of all available address options\&. 
Some options are
+Like \-h, plus a list of the short names of all available address options\&. 
Some options are
 platform dependend, so this output is helpful for checking the particular
 implementation\&. 
 .IP "\fB\f(CW-hhh | -???\fP\fP"
-Like -hh, plus a list of all available address option names\&.
+Like \-hh, plus a list of all available address option names\&.
 .IP "\fB\f(CW-d\fP\fP"
 Without this option, only fatal and error messages are generated; applying
 this option also prints warning messages\&. See DIAGNOSTICS
@@ -91,10 +91,10 @@
 .IP "\fB\f(CW-D\fP\fP"
 Logs information about file descriptors before starting the transfer phase\&.
 .IP "\fB\f(CW-ly[<facility>]\fP\fP"
-Writes messages to syslog instead of stderr; severity as defined with -d
+Writes messages to syslog instead of stderr; severity as defined with \-d
 option\&. With optional <facility>, the syslog type can
 be selected, default is "daemon"\&. 
-.IP "\fB\f(CW-lf\fP\fP\f(CW <logfile>\fP"
+.IP "\fB\f(CW-lf<logfile>\fP\fP"
 Writes messages to <logfile> [filename] instead of
 stderr\&. 
 .IP "\fB\f(CW-ls\fP\fP"
@@ -201,7 +201,7 @@
 For filtering the options that are useful with an address
 type, each option is member of one option group\&. For
 each address type there is a set of option groups allowed\&. Only options
-belonging to one of these address groups may be used (except with option 
-g)\&. 
+belonging to one of these address groups may be used (except with option 
\-g)\&.
 .PP 
 Address specifications following the above schema are also called \fIsingle\fP
 address specifications\&.
@@ -213,7 +213,7 @@
 .PP 
 Usually, addresses are opened in read/write
 mode\&. When an address is part of a dual address specification, or when
-option -u or -U is used, an address might be
+option \-u or \-U is used, an address might be
 used only for reading or for writing\&. Considering this is important with some
 address types\&.
 .PP 
@@ -719,7 +719,7 @@
 Listens on <port> [TCP service] and accepts a
 TCP/IP connection\&. The IP version is 4 or the one specified with
 address option pf, socat option
-(-4, -6), or environment variable SOCAT_DEFAULT_LISTEN_IP\&.
+(\-4, \-6), or environment variable SOCAT_DEFAULT_LISTEN_IP\&.
 Note that opening
 this address usually blocks until a client connects\&.
 .br 
@@ -768,7 +768,7 @@
 .br 
 Please note that you can - beyond the options of the specified groups - also
 use options of higher level protocols when you apply socat option
--g\&.
+\-g\&.
 .br 
 Option groups: FD,SOCKET,CHILD,RETRY
 .br 
@@ -795,7 +795,7 @@
 .br 
 Please note that you can - beyond the options of the specified groups - also
 use options of higher level protocols when you apply socat option
--g\&.
+\-g\&.
 .br 
 Option groups: FD,SOCKET,RANGE
 .br 
@@ -823,7 +823,7 @@
 .br 
 Please note that you can - beyond the options of the specified groups - also
 use options of higher level protocols when you apply socat option
--g\&.
+\-g\&.
 .br 
 Option groups: FD,SOCKET,LISTEN,RANGE,CHILD,RETRY
 .br 
@@ -1040,7 +1040,7 @@
 Listens on <port> [TCP service] and accepts a
 TCP/IP connection\&. The IP version is 4 or the one specified with
 address option pf, socat option
-(-4, -6), or environment variable SOCAT_DEFAULT_LISTEN_IP\&.
+(\-4, \-6), or environment variable SOCAT_DEFAULT_LISTEN_IP\&.
 Note that opening
 this address usually blocks until a client connects\&.
 .br 
@@ -1377,7 +1377,7 @@
 .IP "\fB\f(CWUNIX-SENDTO:<filename>\fP\fP"
 Communicates with the specified peer socket, defined by [<filename>] assuming 
it is a UNIX domain datagram socket\&.
 It sends packets to and receives packets from that peer socket only\&.
-Please note that it might be neccessary to bind the
+Please note that it might be necessary to bind the
 local socket to an address (e\&.g\&. \f(CW/tmp/sock1\fP, which must not exist
 before)\&.
 This address type works well with socat UNIX-RECVFROM and UNIX-RECV address
@@ -1469,7 +1469,7 @@
 will fail\&. To catch most useless combinations as early as in the open phase,
 the concept of \fIoption groups\fP was introduced\&. Each option belongs to one
 or more option groups\&. Options can be used only with address types that 
support
-at least one of their option groups (but see option -g)\&.
+at least one of their option groups (but see option \-g)\&.
 .PP 
 Address options have data types that their values must conform to\&. 
 Every address option consists of just a keyword or a keyword followed by
@@ -1532,7 +1532,7 @@
 options may be applied to any address\&. 
 .br 
 Note: Some of these options are also member of another option group, that
-provides an other, non-fd based mechanism\&.
+provides another, non-fd based mechanism\&.
 For these options, it depends on the actual address type and its option groups 
 which mechanism is used\&. The second, non-fd based mechanism is prioritized\&.
 .IP "\fB\f(CWcloexec=<bool>\fP\fP"
@@ -1717,7 +1717,7 @@
 long as there are still links from other processes\&.
 .br 
 Similarly, when an address of type EXEC or SYSTEM is ended, socat usually
-will explicitely kill the sub process\&. With this option, it will just close
+will explicitly kill the sub process\&. With this option, it will just close
 the file descriptors\&.
 .IP "\fB\f(CWshut-none\fP\fP"
 Changes the (address dependent) method of shutting down the write part of a
@@ -1741,7 +1741,7 @@
 .IP "\fB\f(CWioctl-void=<request>\fP\fP"
 Calls \f(CWioctl()\fP with the request value as second argument and NULL as
 third argument\&. This option allows to utilize ioctls that are not
-explicitely implemented in socat\&.
+explicitly implemented in socat\&.
 .IP "\fB\f(CWioctl-int=<request>:<value>\fP\fP"
 Calls \f(CWioctl()\fP with the request value as second argument and the integer
 value as third argument\&.
@@ -2021,7 +2021,7 @@
 Note: socat simply strips all CR characters\&.
 .IP "\fB\f(CWignoreeof\fP\fP"
 When EOF occurs on this channel, \fBsocat\fP ignores it and tries to read more
-data (like "tail -f") (example)\&.
+data (like "tail \-f") (example)\&.
 .IP "\fB\f(CWreadbytes=<bytes>\fP\fP"
 \fBsocat\fP reads only so many bytes from this address (the address provides
 only so many bytes for transfer and pretends to be at EOF afterwards)\&.
@@ -2504,8 +2504,8 @@
 keeps the parent process attempting to produce more connections, either by
 listening or by connecting in a loop (example)\&.
 .br 
-SSL-CONNECT and SSL-LISTEN differ in when they actually fork off the child:
-SSL-LISTEN forks \fIbefore\fP the SSL handshake, while SSL-CONNECT forks
+OPENSSL-CONNECT and SSL-LISTEN differ in when they actually fork off the child:
+OPENSSL-LISTEN forks \fIbefore\fP the SSL handshake, while OPENSSL-CONNECT 
forks
 \fIafterwards\fP\&.
 RETRY and FOREVER options are not inherited by the child process\&.
 .br 
@@ -2555,7 +2555,7 @@
 .IP o 
 the first socat address cannot be OPENSSL or READLINE
 .IP o 
-socat options -b, -t, -D, -l, -v, -x become useless
+socat options \-b, \-t, \-D, \-l, \-v, \-x become useless
 .IP o 
 for both addresses, options ignoreeof, cr, and crnl become useless
 .IP o 
@@ -2617,7 +2617,7 @@
 Disconnects the terminal\&.
 .IP "\fB\f(CWb19200\fP\fP"
 Sets the serial line speed to 19200 baud\&. Some other rates are possible; use
-something like \f(CWsocat -hh |grep \&' b[1-9]\&'\fP to find all speeds 
supported by
+something like \f(CWsocat \-hh |grep \&' b[1-9]\&'\fP to find all speeds 
supported by
 your implementation\&.
 .br 
 Note: On some operating systems, these options may not be
@@ -3114,14 +3114,14 @@
 .IP 
 \.LP
 \.nf
-\fBsocat -d -d READLINE,history=$HOME/.http_history \\ 
+\fBsocat \-d \-d READLINE,history=$HOME/.http_history \\
 TCP4:www.domain.org:www,crnl\fP
 \.fi
 .IP 
 this is similar to the previous example, but you can edit the current line in a
 bash like manner (READLINE) and use the
 history file \&.http_history; \fBsocat\fP prints messages about
-progress (-d -d)\&. The  port is specified by service name
+progress (\-d \-d)\&. The  port is specified by service name
 (www), and correct network line termination characters
 (crnl) instead of NL are used\&.
 .IP 
@@ -3136,7 +3136,7 @@
 .IP 
 \.LP
 \.nf
-\fBsocat -d -d -lmlocal2 \\ 
+\fBsocat \-d \-d \-lmlocal2 \\
 TCP4-LISTEN:80,bind=myaddr1,reuseaddr,fork,su=nobody,range=10.0.0.0/8 \\ 
 TCP4:www.domain.org:80,bind=myaddr2\fP
 \.fi
@@ -3153,7 +3153,7 @@
 (range); due to reuseaddr, it
 allows immediate restart after master process\&'s termination, even if some 
child
 sockets are not completely shut down\&.
-With -lmlocal2, socat logs to stderr until successfully
+With \-lmlocal2, socat logs to stderr until successfully
 reaching the accept loop\&. Further logging is directed to syslog with facility
 local2\&.
 .IP 
@@ -3230,18 +3230,18 @@
 
 .IP 
 this is an example for unidirectional data transfer
-(-u)\&. \fBSocat\fP transfers data 
+(\-u)\&. \fBSocat\fP transfers data
 from file /tmp/readdata (implicit address GOPEN), starting
 at its current end (seek-end=0 lets \fBsocat\fP start 
 reading at current end of file; use seek=0 or no
-seek option to first read the existing data) in a "tail -f" like mode
+seek option to first read the existing data) in a "tail \-f" like mode
 (ignoreeof)\&. The "file" 
 might also be a listening UNIX domain socket (do not use a seek option 
then)\&. 
 .IP 
 \.LP
 \.nf
 \fB(sleep 5; echo PASSWORD; sleep 5; echo ls; sleep 1) | 
-socat - EXEC:'ssh -l user server',pty,setsid,ctty\fP
+socat - EXEC:'ssh \-l user server',pty,setsid,ctty\fP
 \.fi
 .IP 
 EXEC\&'utes an ssh session to server\&. Uses a pty for communication between 
\fBsocat\fP and
@@ -3251,7 +3251,7 @@
 .IP 
 \.LP
 \.nf
-\fBsocat -u TCP4-LISTEN:3334,reuseaddr,fork \\ 
+\fBsocat \-u TCP4-LISTEN:3334,reuseaddr,fork \\
 OPEN:/tmp/in.log,creat,append\fP
 \.fi
 .IP 
@@ -3294,7 +3294,7 @@
 CONNECT method, where they are authenticated as "user" with "pass" 
(proxyauth)\&. The proxy 
 should establish connections to host www\&.domain\&.org on port 22 then\&.
 .IP 
-.IP "\fB\f(CWsocat - 
SSL:server:4443,cafile=server\&.crt,cert=client\&.pem\fP\fP"
+.IP "\fB\f(CWsocat - 
OPENSSL:server:4443,cafile=server\&.crt,cert=client\&.pem\fP\fP"
 
 .IP 
 is an OpenSSL client that tries to establish a secure connection to an SSL
@@ -3308,7 +3308,7 @@
 .br 
 The first address (\&'-\&') can be replaced by almost any other socat 
address\&.
 .IP 
-.IP "\fB\f(CWsocat 
SSL-LISTEN:4443,reuseaddr,pf=ip4,fork,cert=server\&.pem,cafile=client\&.crt 
PIPE\fP\fP"
+.IP "\fB\f(CWsocat 
OPENSSL-LISTEN:4443,reuseaddr,pf=ip4,fork,cert=server\&.pem,cafile=client\&.crt 
PIPE\fP\fP"
 
 .IP 
 is an OpenSSL server that accepts TCP connections, presents the certificate
@@ -3338,7 +3338,7 @@
 connected to the TCP socket (nofork)\&.  The shell starts filan and lets it 
print the socket addresses to
 stderr (your terminal window)\&.
 .IP 
-.IP "\fB\f(CWecho -e "\e0\e14\e0\e0\ec" |socat -u - 
file:/usr/bin/squid\&.exe,seek=0x00074420\fP\fP"
+.IP "\fB\f(CWecho -en '\e0\e14\e0\e0\ec' |socat \-u - 
file:/usr/bin/squid\&.exe,seek=0x00074420\fP\fP"
 
 .IP 
 functions as primitive binary editor: it writes the 4 bytes 000 014 000 000 to
@@ -3366,8 +3366,9 @@
 sends a broadcast to the network 192\&.168\&.1\&.0/24 and receives the replies 
of the
 timeservers there\&. Ignores NTP packets from hosts outside this network\&.
 .IP 
-.IP "\fB\f(CWsocat - 
SOCKET-DATAGRAM:2:2:17:x007bxc0a80100x0000000000000000,bind=x007bx00000000x0000000000000000,setsockopt-int=1:6:1,range=x0000xc0a80100x0000000000000000:x0000xffffff00x0000000000000000\fP\fP"
-
+.ad l
+.IP "\fB\f(CWsocat - 
SOCKET-DATAGRAM:2:2:17:x007bxc0a80100x0000000000000000,b\%ind=x007bx00000000x0000000000000000,setsockopt-int=1:6:1,r\%ange=x0000xc0a80100x0000000000000000:x0000xffffff00x0000000000000000\fP\fP"
+.na
 .IP 
 is semantically equivalent to the previous
 example, but all parameters are
@@ -3411,8 +3412,9 @@
 interface \f(CWhdlc0\fP, and can transfer data between
 both devices\&. Use pppd on device \f(CW/var/run/ppp\fP then\&.
 .IP 
-.IP "\fB\f(CWsocat -T 1 -d -d TCP-L:10081,reuseaddr,fork,crlf SYSTEM:"echo -e 
\e"\e\e\e"HTTP/1\&.0 200 OK\e\e\enDocumentType: text/plain\e\e\en\e\e\endate: 
\e$\e(date\e)\e\e\enserver:\e$SOCAT_SOCKADDR:\e$SOCAT_SOCKPORT\e\e\enclient: 
\e$SOCAT_PEERADDR:\e$SOCAT_PEERPORT\e\e\en\e\e\e"\e"; cat; echo -e 
\e"\e\e\e"\e\e\en\e\e\e"\e""\fP\fP"
-
+.ad l
+.IP "\fB\f(CWsocat -T 1 -d -d TCP-L:10081,reuseaddr,fork,crlf SYSTEM:\(dqecho 
-e \e\(dq\e\e\e\(dqHTTP/1\&.0 200 OK\e\e\enDocumentType: 
text/plain\e\e\en\e\e\endate: 
\e$\e(date\e)\e\e\enserver:\e$SOCAT_SOCKADDR:\e$SOCAT_SOCKPORT\e\e\enclient: 
\e$SOCAT_PEERADDR:\e$SOCAT_PEERPORT\e\e\en\e\e\e\(dq\e\(dq; cat; echo -e 
\e\(dq\e\e\e\(dq\e\e\en\e\e\e\(dq\e\(dq\(dq \fP\fP"
+.na
 .IP 
 creates a simple HTTP echo server: each HTTP client that connects gets a valid
 HTTP reply that contains information about the client address and port as it is
@@ -3436,7 +3438,7 @@
 .PP 
 \fBSocat\fP uses a logging mechanism that allows to filter messages by 
severity\&. The
 severities provided are more or less compatible to the appropriate syslog
-priority\&. With one or up to four occurrences of the -d command line option, 
the
+priority\&. With one or up to four occurrences of the \-d command line option, 
the
 lowest priority of messages that are issued can be selected\&. Each message
 contains a single uppercase character specifying the messages severity (one of
 F, E, W, N, I, or D)
@@ -3445,7 +3447,7 @@
 Conditions that require unconditional and immediate program termination\&.
 .IP "ERROR:"
 Conditions that prevent proper program processing\&. Usually the
-program is terminated (see option -s)\&.
+program is terminated (see option \-s)\&.
 .IP "WARNING:"
 Something did not function correctly or is in a state where
 correct further processing cannot be guaranteed, but might be possible\&.
@@ -3481,13 +3483,13 @@
 .PP 
 In the ou +3483,13 @@ng cannot be guaranteed, but might be 
possible\&.ofhehee\e\e\(dqHTTP/1\&.0 200 OK\e\e\enDocumentType: 
text/plain\e\e\en\e\e\endate: 
\e$\e(date\e)\e\e\enserver:\e$SOCAT_SOCKADDR:\e$SOCAT_SOCKPORT\e\e\enclient: 
\e$SOCAT_PEERADDR:\e$SOCAT_PEERPORT\e\e\en\e\e\e\(dq\e\(dq; cat; echo -e 
\e\(dq\e\e\e\(dq\e\e\en\e\e\e\(dq\e\(dq\(dq \fP\fP" 
o§ÿ"Q¦õl+n¦õl+ o§ÿðP¦õl+ßo§ÿÀÿ&÷l+óX¦õl+ð&÷l+Øô&÷l+¨ù&÷l+Ù§õl+xÃöl+
 o§ÿð
o§ÿëm¦õl+à!à! o§ÿo§ÿÈÍ¢öl+o§ÿ"Q¦õl+n¦õl+ o§ÿðP¦õl+ßo§ÿÐo§ÿÈo§ÿkÇõl+Œp˜o§ÿóX¦õl+Ù§õl+o§ÿÐ
o§ÿëm¦õl+GHIJKMNOP o§ÿo§ÿH…yöl+ o§ÿ"Q¦õl+n¦õl+ o§ÿ0ÿ&÷l+óX¦õl+Ãöl+ ¹Völ+ð&÷l+Øô&÷l+¨ù&÷l+Ù§õl+H…yöl+ o§ÿào§ÿëm¦õl+8…yöl+ o§ÿo§ÿëm¦õl+(…yöl+ o§ÿ@o§ÿëm¦õl+…yöl+ o§ÿpo§ÿëm¦õl+
  ¨þ&÷l+óX¦õl+¨ù&÷l+ð        
o§ÿŠWöl+æW¦õl+Øô&÷l+o§ÿyWöl+æW¦õl+ð&÷l+@o§ÿZWöl+æW¦õl+Ø´Völ+Ãöl+ ¹Völ+ð&÷l+ØÃöl+Øô&÷l+¨ù&÷l+Ù§õl+kÇõl+"öl+o§ÿpKVöl+ðo§ÿÀo§ÿëm¦õl+5678:<=>?@BD o§ÿo§ÿàöl+o§ÿóX¦õl+èdÇõl+po§ÿ"öl+æW¦õl+èdÇõl+Õ_@fÆS
 
Qöl±íÁ£îõl+o§ÿàöl+o§ÿÐo§ÿëm¦õl+u]ÞÓ
      4Q ÷U^Qʉ§¶uª¹ñìò*ēv´"(öl+Po§ÿF Š÷l+F 
Š÷l+?u%öl+o§ÿ o§ÿ0o§ÿßo§ÿÐo§ÿÈo§ÿo§ÿB
 Š÷l+`o§ÿØÃöl+ Ãöl+Ù§õl+ÿÿÿÿÿÿÿÿB 
Š÷l+o§ÿëm¦õtput variables beginning with "SOCAT" 
this prefix is actually replaced
 by the upper case name of the executable or the value of option
--lp\&.
+\-lp\&.
 .PP 
 .IP "\fBSOCAT_DEFAULT_LISTEN_IP\fP (input)"
 (Values 4 or 6) Sets the IP version to
 be used for listen, recv, and recvfrom addresses if no
 pf (protocol-family) option is given\&. Is
-overridden by socat options -4 or -6\&.
+overridden by socat options \-4 or \-6\&.
 .IP 
 .IP "\fBSOCAT_PREFERRED_RESOLVE_IP\fP (input)"
 (Values 0, 4, or 6) Sets the IP
@@ -3595,7 +3597,7 @@
 .IP 
 .IP "\fBHOSTNAME\fP (input)"
 Is used to determine the hostname for logging (see
--lh)\&.
+\-lh)\&.
 .IP 
 .IP "\fBLOGNAME\fP (input)"
 Is used as name for the socks client user name if no
@@ -3654,19 +3656,19 @@
 .PP 
 Address option ftruncate without value uses default 1 instead of 0\&.
 .PP 
-Verbose modes (-x and/or -v) display line termination characters inconsistently
+Verbose modes (\-x and/or \-v) display line termination characters 
inconsistently
 when address options cr or crnl are used: They show the data \fIafter\fP
 conversion in either direction\&.
 .PP 
-The data transfer blocksize setting (-b) is ignored with address readline\&.
+The data transfer blocksize setting (\-b) is ignored with address readline\&.
 .PP 
 Send bug reports to <socat@dest-unreach\&.org>
 .PP 
 .SH "SEE ALSO"
 
 .PP 
-nc\e(1), netcat6\e(1), sock\e(1), rinetd\e(8), cage\e(1), socks\&.conf\e(5), 
openssl\e(1),
-stunnel\e(8), pty\e(1), rlwrap\e(1), setsid\e(1)
+nc(1), netcat6(1), sock(1), rinetd(8), cage(1), socks.conf(5), openssl(1),
+stunnel(8), pty(1), rlwrap(1), setsid(1)
 .PP 
 \fBSocat\fP home page http://www\&.dest-unreach\&.org/socat/
 .PP 
diff -rauN socat-1.7.1.3/xio-unix.c socat-1.7.1.3-debian/xio-unix.c
--- socat-1.7.1.3/xio-unix.c    2010-05-22 19:09:17.000000000 +0200
+++ socat-1.7.1.3-debian/xio-unix.c     2011-05-22 23:25:52.000000000 +0200
@@ -79,7 +79,7 @@
 #ifdef WITH_ABSTRACT_UNIXSOCKET
    if (abstract) {
       if ((pathlen = strlen(path)) >= sizeof(saun->sun_path)) {
-        Warn2("socket address "F_Zu" characters long, truncating to "F_Zu"",
+        Error2("socket address "F_Zu" characters long, max length is "F_Zu"",
               pathlen+1, sizeof(saun->sun_path));
       }
       saun->sun_path[0] = '\0';        /* so it's abstract */
@@ -98,7 +98,7 @@
 #endif /* WITH_ABSTRACT_UNIXSOCKET */
 
    if ((pathlen = strlen(path)) > sizeof(saun->sun_path)) {
-      Warn2("unix socket address "F_Zu" characters long, truncating to "F_Zu"",
+      Error2("unix socket address "F_Zu" characters long, max length is 
"F_Zu"",
            pathlen, sizeof(saun->sun_path));
    }
    strncpy(saun->sun_path, path, sizeof(saun->sun_path));

Index: socat.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/socat.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- socat.info  28 Sep 2010 23:04:48 -0000      1.5
+++ socat.info  22 May 2011 21:46:17 -0000      1.6
@@ -1,18 +1,37 @@
 Package: socat
-Version: 1.7.0.0
-Revision: 1002
-Maintainer: None <[email protected]>
-DescPort: Initial port by Pepe Barbe <[email protected]>
-Source: http://www.dest-unreach.org/socat/download/%n-%v.tar.bz2
-Source-MD5: be5f942c44dafefa58365e9dc3ada81f
+Version: 1.7.1.3
+Revision: 1
+Description: Multipurp. relay for bidirect. data transfer
+License: GPL
+Maintainer: Andreas Gockel <[email protected]>
 Depends: readline-shlibs (>= 4.3-1028)
-BuildDepends: readline (>= 4.3-1028), system-openssl-dev
-ConfigureParams: --enable-openssl
-Conflicts: socat, socat-ssl
-Replaces: socat, socat-ssl
-SetLDFLAGS: -L%p/lib/system-openssl/lib
+BuildDepends: fink (>= 0.24.12), readline (>= 4.3-1028), system-openssl-dev
+Replaces: %n, %n-ssl
+Conflicts: %n, %n-ssl
+Source: http://www.dest-unreach.org/%n/download/%n-%v.tar.bz2
+Source-MD5: 2081987fb0cb0290b8105574058cb329
+PatchFile: %n.patch
+PatchFile-MD5: 17a09f9aecdd2c8a5dcd9c052208b4b5
 SetCPPFLAGS: -I%p/lib/system-openssl/include
+SetLDFLAGS: -L%p/lib/system-openssl/lib
 DocFiles: BUGREPORTS COPYING EXAMPLES FAQ README SECURITY
-Description: Relay for data transfer between two sockets
-License: GPL
-Homepage: http://www.dest-unreach.org/socat/
\ No newline at end of file
+Homepage: http://www.dest-unreach.org/socat/
+Descdetail: <<
+ %n (for SOcket CAT) establishes two bidirectional byte streams
+ and transfers data between them. Data channels may be files, pipes,
+ devices (terminal or modem, etc.), or sockets (Unix, IPv4, IPv6, raw,
+ UDP, TCP, SSL). It provides forking, logging and tracing, different
+ modes for interprocess communication and many more options.
+ .
+ It can be used, for example, as a TCP relay (one-shot or daemon),
+ as an external socksifier, as a shell interface to Unix sockets,
+ as an IPv6 relay, as a netcat and rinetd replacement, to redirect
+ TCP-oriented programs to a serial line, or to establish a relatively
+ secure environment (su and chroot) for running client or server shell
+ scripts inside network connections. %n supports sctp as of 1.7.0.
+<<
+DescPort: <<
+ This build includes debian patches
+ .
+ Initial port by Pepe Barbe <[email protected]>
+<<



------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its 
next-generation tools to help Windows* and Linux* C/C++ and Fortran 
developers boost performance applications - including clusters. 
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to