Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/net
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5459/dists/10.4/stable/main/finkinfo/net
Modified Files:
socat.info socat.patch
Log Message:
Update from upstream
sync versions
Index: socat.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/socat.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- socat.patch 17 Nov 2011 03:36:36 -0000 1.2
+++ socat.patch 9 Jun 2013 11:38:38 -0000 1.3
@@ -363,3 +363,87 @@
ip4_mreqn.mreq.imr_multiaddr,
ip4_mreqn.mreq.imr_interface,
sizeof(ip4_mreqn.mreq),
+diff -rauN socat-2.0.0-b4/doc/index.html socat-2.0.0-b4-p1/doc/index.html
+--- socat-2.0.0-b4/doc/index.html 1970-01-01 02:00:00.000000000 +0200
++++ socat-2.0.0-b4-p1/doc/index.html 2012-07-07 01:04:22.000000000 +0200
+@@ -0,0 +1,16 @@
++<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
socat</a><br><br>
++<a href="socat-addresschain.html">Socat address chains</a><br><br>
++<a href="socat-exec.html">Execute programs using soca</a><br><br>
++</body>
++</html>
+diff -rauN socat-2.0.0-b4/sslcls.c socat-2.0.0-b4-p1/sslcls.c
+--- socat-2.0.0-b4/sslcls.c 1970-01-01 02:00:00.000000000 +0200
++++ socat-2.0.0-b4-p1/sslcls.c 2012-07-07 01:04:22.000000000 +0200
+@@ -35,6 +35,7 @@
+ return result;
+ }
+
++#ifndef OPENSSL_NO_SSL2
+ SSL_METHOD *sycSSLv2_client_method(void) {
+ SSL_METHOD *result;
+ Debug("SSLv2_client_method()");
+@@ -50,6 +51,7 @@
+ Debug1("SSLv2_server_method() -> %p", result);
+ return result;
+ }
++#endif
+
+ SSL_METHOD *sycSSLv3_client_method(void) {
+ SSL_METHOD *result;
+diff -rauN socat-2.0.0-b4/xio-openssl.c socat-2.0.0-b4-p1/xio-openssl.c
+--- socat-2.0.0-b4/xio-openssl.c 1970-01-01 02:00:00.000000000 +0200
++++ socat-2.0.0-b4-p1/xio-openssl.c 2012-07-07 01:04:22.000000000 +0200
+@@ -798,9 +798,12 @@
+
+ if (!server) {
+ if (me_str != 0) {
++#ifndef OPENSSL_NO_SSL2
+ if (!strcasecmp(me_str, "SSLv2") || !strcasecmp(me_str, "SSL2")) {
+ method = sycSSLv2_client_method();
+- } else if (!strcasecmp(me_str, "SSLv3") || !strcasecmp(me_str,
"SSL3")) {
++ } else
++#endif
++ if (!strcasecmp(me_str, "SSLv3") || !strcasecmp(me_str, "SSL3")) {
+ method = sycSSLv3_client_method();
+ } else if (!strcasecmp(me_str, "SSLv23") || !strcasecmp(me_str,
"SSL23") ||
+ !strcasecmp(me_str, "SSL")) {
+@@ -817,9 +820,12 @@
+ }
+ } else /* server */ {
+ if (me_str != 0) {
++#ifndef OPENSSL_NO_SSL2
+ if (!strcasecmp(me_str, "SSLv2") || !strcasecmp(me_str, "SSL2")) {
+ method = sycSSLv2_server_method();
+- } else if (!strcasecmp(me_str, "SSLv3") || !strcasecmp(me_str,
"SSL3")) {
++ } else
++#endif
++ if (!strcasecmp(me_str, "SSLv3") || !strcasecmp(me_str, "SSL3")) {
+ method = sycSSLv3_server_method();
+ } else if (!strcasecmp(me_str, "SSLv23") || !strcasecmp(me_str,
"SSL23") ||
+ !strcasecmp(me_str, "SSL")) {
+diff -rauN socat-2.0.0-b4/sslcls.h socat-2.0.0-b4-p1/sslcls.h
+--- socat-2.0.0-b4/sslcls.h 1970-01-01 02:00:00.000000000 +0200
++++ socat-2.0.0-b4-p1/sslcls.h 2012-07-07 01:04:22.000000000 +0200
+@@ -10,8 +10,10 @@
+
+ void sycSSL_load_error_strings(void);
+ int sycSSL_library_init(void);
++#ifndef OPENSSL_NO_SSL2
+ SSL_METHOD *sycSSLv2_client_method(void);
+ SSL_METHOD *sycSSLv2_server_method(void);
++#endif
+ SSL_METHOD *sycSSLv3_client_method(void);
+ SSL_METHOD *sycSSLv3_server_method(void);
+ SSL_METHOD *sycSSLv23_client_method(void);
Index: socat.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/socat.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- socat.info 17 Nov 2011 03:36:36 -0000 1.5
+++ socat.info 9 Jun 2013 11:38:38 -0000 1.6
@@ -1,6 +1,6 @@
Package: socat
-Version: 2.0.0
-Revision: b4
+Version: 2.0.0-b6
+Revision: 1
Description: Multipurp. relay for bidirect. data transfer
License: GPL
Maintainer: Andreas Gockel <fink-so...@unixforge.de>
@@ -8,12 +8,15 @@
BuildDepends: fink (>= 0.24.12), readline5, system-openssl-dev
Replaces: %n, %n-ssl
Conflicts: %n, %n-ssl
-Source: http://www.dest-unreach.org/%n/download/%n-%v-%r.tar.bz2
-Source-MD5: b51a00937d0a56fc8eccd36175e9d068
+Source: http://www.dest-unreach.org/%n/download/%n-%v.tar.gz
+Source-MD5: d559bc51a0c2148c5518acc6b2068502
PatchFile: %n.patch
-PatchFile-MD5: bc4859df85b03832df770c38c1627a19
-SetCPPFLAGS: -I%p/lib/system-openssl/include -D__APPLE_USE_RFC_2292
-SetLDFLAGS: -L%p/lib/system-openssl/lib
+PatchFile-MD5: 69fa98b7dc95b020b630720a8e14746d
+SetCFLAGS: -g -O2 -D_GNU_SOURCE -fstack-protector -Wformat
-Werror=format-security -fPIE
+SetCPPFLAGS: -D_FORTIFY_SOURCE=2 -I%p/lib/system-openssl/include
-D__APPLE_USE_RFC_2292
+SetCXXFLAGS: -g -O2 -D_GNU_SOURCE -fstack-protector --param=ssp-buffer-size=4
-Wformat -Werror=format-security -fPIE
+SetLDFLAGS: -Wl,-read_only_stubs -Wl,-bind_at_load -fPIE -Wl,-pie
-L%p/lib/system-openssl/lib
+ConfigureParams: --disable-maintainer-mode --disable-dependency-tracking
DocFiles: BUGREPORTS COPYING EXAMPLES FAQ README SECURITY
Homepage: http://www.dest-unreach.org/socat/
Descdetail: <<
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
