[csw-devel] SF.net SVN: gar:[11875] csw/mgar/pkg/socat/trunk
skayser at users.sourceforge.net
skayser at users.sourceforge.net
Fri Dec 10 01:09:31 CET 2010
Revision: 11875
http://gar.svn.sourceforge.net/gar/?rev=11875&view=rev
Author: skayser
Date: 2010-12-10 00:09:31 +0000 (Fri, 10 Dec 2010)
Log Message:
-----------
socat: work towards 1.7.1.3
Modified Paths:
--------------
csw/mgar/pkg/socat/trunk/Makefile
csw/mgar/pkg/socat/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/socat/trunk/files/0001-Escape-nested-double-quotes.patch
Modified: csw/mgar/pkg/socat/trunk/Makefile
===================================================================
--- csw/mgar/pkg/socat/trunk/Makefile 2010-12-09 22:49:29 UTC (rev 11874)
+++ csw/mgar/pkg/socat/trunk/Makefile 2010-12-10 00:09:31 UTC (rev 11875)
@@ -1,5 +1,26 @@
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+# ! Why does OPENSSL_TCP4 fail?
+#
+# $ /opt/csw/bin/bash test.sh OPENSSL_TCP4
+# using temp directory /tmp/skayser/12533
+# test 60 OPENSSL_TCP4: openssl connect... FAILED: ./socat:
+# ./socat -t 0.1 exec:'openssl s_server -accept 12021 -quiet -cert testsrv.pem' pipe &
+# ./socat -t 0.1 - openssl:127.0.0.1:12021,pf=ip4,verify=0,
+# 1d0
+# < test60 Fri Dec 10 00:48:32 CET 2010 31169
+#
+# Client connections to listener service (pipe ^= echo) don't get an
+# immediate response (seems like data is stuck or procs exiting early).
+# Upon the 2nd or 3rd connection, input is usually echoed fine.
+# echo foo | openssl s_client -connect localhost:12021 -quiet -no_ign_eof
+#
+# * Send 0001 patch upstream, if you want to be 100% accurate you could
+# also ask why here strings (<<<) are used over here docs (<<EOM).
+# Solaris 9 bin bash doesn't support here strings.
+#
GARNAME = socat
-GARVERSION = 1.7.1.1
+GARVERSION = 1.7.1.3
CATEGORIES = net
DESCRIPTION = Multipurpose relay for bidirectional data transfer
@@ -13,54 +34,66 @@
"listening" sockets, named pipes, and pseudo terminals.
endef
+VENDOR_URL = http://www.dest-unreach.org/socat/
MASTER_SITES = http://www.dest-unreach.org/socat/download/
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-SPKG_SOURCEURL = http://www.dest-unreach.org/socat/
RUNTIME_DEP_PKGS = CSWosslrt CSWreadline CSWtcpwrap
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+# test.sh uses unescaped nested double quotes (doesn't work with /bin/bash)
+PATCHFILES += 0001-Escape-nested-double-quotes.patch
-# Delete or substitute gcc specific options (-Wall, -Werror, -O0)
-PATCHFILES = cc_compile.patch
-# Amend AC_CHECK_HEADERS check on netinet/ip.h with req. system headers
-PATCHFILES += patch-configure-netinetip.diff
-# Fix some broken tests (pending to push some of it upstream)
-PATCHFILES += patch-test.diff
-# Include utils.h in sycls.c so that setenv() is declared
-PATCHFILES += patch-sycls-utils.diff
-
CONFIGURE_ARGS = $(DIRPATHS)
# 250+ tests take a while. Run them manually when packaging a new version.
-# To do so, change to $(WORKSRC) after building and execute ./test.sh
-TEST_SCRIPTS =
+# Note that test.sh tends to see advanced bash feature creep, don't bother
+# getting them all working with /bin/bash, it's only the test suite.
+#TEST_SCRIPTS = /opt/csw/bin/bash $(WORKSRC)/test.sh
# When you run the tests on a non IPV6 system you can set HAVENOT_IP6
# to shortcut some tests
#TEST_ENV="HAVENOT_IP6=1"
-# socat 1.7.1.1:
+# socat 1.7.1.3:
# --------------
-# Running test.sh on a non IPV6 system as root i get:
+# Running test.sh on an IPV6 system as non-root i get:
#
-# summary: 282 tests; 145 ok, 8 failed, 129 could not be performed
+# summary: 287 tests; 185 ok, 23 failed, 78 could not be performed
#
-# The 8 FAILED ones are
+# The 23 FAILED ones are
#
+# 60 OPENSSL_TCP4: openssl connect
# 126 PTMXWAITSLAVE: test if master pty (ptmx) waits for slave connection
# 214 UDP4SCM_IP_OPTIONS: UDP4 log ancillary message IP_OPTIONS options
+# 216 UDP4SCM_IP_TTL: UDP4 log ancillary message IP_TTL
+# 218 UDP4SCM_IP_PKTINFO: UDP4 log ancillary message IP_PKTINFO locaddr
+# 219 UDP4SCM_IP_PKTINFO: UDP4 log ancillary message IP_PKTINFO dstaddr
+# 220 UDP4SCM_IP_PKTINFO: UDP4 log ancillary message IP_PKTINFO
# 221 UDP4SCM_IP_RECVIF: UDP4 log ancillary message IP_RECVIF if
# 222 UDP4SCM_IP_RECVDSTADDR: UDP4 log ancillary message IP_RECVDSTADDR dstaddr
+# 233 UDP6SCM_IPV6_PKTINFO: UDP6 log ancillary message IPV6_PKTINFO
+# 234 UDP6SCM_IPV6_HOPLIMIT: UDP6 log ancillary message IPV6_HOPLIMIT hoplimit
+# 243 SCTP4LISTENENV: SCTP4-LISTEN fills environment variables with socket addresses
+# 244 SCTP6LISTENENV: SCTP6-LISTEN fills environment variables with socket addresses
# 246 UDP4ENV_IP_OPTIONS: UDP4 ancillary message brings IP_OPTIONS into env
# 248 UDP4ENV_IP_TTL: UDP4 ancillary message brings IP_TTL into environment
+# 250 UDP4ENV_IP_LOCADDR: UDP4 ancillary message brings IP_LOCADDR into environment
+# 251 UDP4ENV_IP_DSTADDR: UDP4 ancillary message brings IP_DSTADDR into environment
+# 252 UDP4ENV_IP_IF: UDP4 ancillary message brings IP_IF into environment
# 253 UDP4ENV_IP_IF: UDP4 ancillary message brings IP_IF into environment
# 254 UDP4ENV_IP_DSTADDR: UDP4 ancillary message brings IP_DSTADDR into env
+# 264 UDP6ENV_IPV6_DSTADDR: UDP6 ancillary message brings IPV6_DSTADDR into environment
+# 265 UDP6ENV_IPV6_HOPLIMIT: UDP6 ancillary message brings IPV6_HOPLIMIT into environment
+# 271 SOCKET_CONNECT_TCP6: socket connect with TCP/IPv6
+# 281 SCTP4STREAM: echo via connection to SCTP V4 socket
+# 282 SCTP6STREAM: echo via connection to SCTP V6 socket
+#
#
-# Most of them (all of them?) relate to ancillary data. Seems as if there are
-# two competing socket libraries on Solaris: 3SOCKET and 3XNET, where only the
-# latter handles ancillary data.
+# Most of them relate to ancillary data. Seems as if there are two competing
+# socket libraries on Solaris: 3SOCKET and 3XNET, where only the latter handles
+# ancillary data.
#
# http://www.mail-archive.com/networking-discuss@opensolaris.org/msg01146.html
#
@@ -90,13 +123,8 @@
include gar/category.mk
-# Run autoconf to re-evaulate the patched configure.in / Makefile.in
-pre-configure-modulated:
- cd $(WORKSRC) && autoconf
- @$(MAKECOOKIE)
-
post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME)
post-install-modulated:
- @ginstall -d $(DOCDEST)
- @cp $(FILEDIR)/changelog.CSW $(FILEDIR)/README.CSW $(DOCDEST)
+ ginstall -d $(DOCDEST)
+ cp $(FILEDIR)/changelog.CSW $(FILEDIR)/README.CSW $(DOCDEST)
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/socat/trunk/checksums
===================================================================
--- csw/mgar/pkg/socat/trunk/checksums 2010-12-09 22:49:29 UTC (rev 11874)
+++ csw/mgar/pkg/socat/trunk/checksums 2010-12-10 00:09:31 UTC (rev 11875)
@@ -1,5 +1 @@
-a3a68cabdfd9145aa6570fc4777be45c download/cc_compile.patch
-76ce5e07c1b8925b33e664accefa1923 download/patch-configure-netinetip.diff
-b6863876e1e8deac45015662f04cb683 download/patch-sycls-utils.diff
-f8d2e302f66b98b5e2236dee155d32be download/patch-test.diff
-52b0216607e35bdfba247560fb85dd82 download/socat-1.7.1.1.tar.gz
+f5cd212c511725864c4b5e08a22d3366 socat-1.7.1.3.tar.gz
Added: csw/mgar/pkg/socat/trunk/files/0001-Escape-nested-double-quotes.patch
===================================================================
--- csw/mgar/pkg/socat/trunk/files/0001-Escape-nested-double-quotes.patch (rev 0)
+++ csw/mgar/pkg/socat/trunk/files/0001-Escape-nested-double-quotes.patch 2010-12-10 00:09:31 UTC (rev 11875)
@@ -0,0 +1,28 @@
+From 5681effaf10777b63024bbd78d384c841cb4287c Mon Sep 17 00:00:00 2001
+From: Sebastian Kayser <skayser at opencsw.org>
+Date: Tue, 26 Oct 2010 12:51:45 +0200
+Subject: [PATCH] Escape nested double quotes
+
+Solaris /bin/bash chokes otherwise.
+---
+ test.sh | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test.sh b/test.sh
+index 230d021..f438ae9 100755
+--- a/test.sh
++++ b/test.sh
+@@ -9051,8 +9051,8 @@ while read PF KEYW ADDR IPPORT SCM_ENABLE SCM_RECV SCM_TYPE SCM_NAME ROOT SCM_VA
+ do
+ if [ -z "$PF" ] || [[ "$PF" == \#* ]]; then continue; fi
+ #
+-pf="$(echo "$PF" |tr A-Z a-z)"
+-proto="$(echo "$KEYW" |tr A-Z a-z)"
++pf="$(echo \"$PF\" |tr A-Z a-z)"
++proto="$(echo \"$KEYW\" |tr A-Z a-z)"
+ NAME=${KEYW}SCM_$SCM_TYPE
+ case "$TESTS" in
+ *%functions%*|*%$pf%*|*%dgram%*|*%udp%*|*%$proto%*|*%recv%*|*%ancillary%*|*%$ROOT%*|*%$NAME%*)
+--
+1.7.3
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list