[csw-devel] SF.net SVN: gar:[4790] csw/mgar/pkg/socat/trunk

[skayser at users.sourceforge.net]

Revision: 4790
          http://gar.svn.sourceforge.net/gar/?rev=4790&view=rev
Author:   skayser
Date:     2009-05-10 11:58:31 +0000 (Sun, 10 May 2009)

Log Message:
-----------
socat: version bump, fixed autoconf tests for netinet/ip.h

Modified Paths:
--------------
    csw/mgar/pkg/socat/trunk/Makefile
    csw/mgar/pkg/socat/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/socat/trunk/files/patch-configure-netinetip.diff

Modified: csw/mgar/pkg/socat/trunk/Makefile
===================================================================
--- csw/mgar/pkg/socat/trunk/Makefile	2009-05-10 11:36:24 UTC (rev 4789)
+++ csw/mgar/pkg/socat/trunk/Makefile	2009-05-10 11:58:31 UTC (rev 4790)
@@ -1,5 +1,5 @@
 GARNAME = socat
-GARVERSION = 1.7.0.0
+GARVERSION = 1.7.1.1
 CATEGORIES = net
 
 DESCRIPTION = Multipurpose relay for bidirectional data transfer
@@ -22,9 +22,10 @@
 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-# Disable gcc specific options
+# 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
 

Modified: csw/mgar/pkg/socat/trunk/checksums
===================================================================
--- csw/mgar/pkg/socat/trunk/checksums	2009-05-10 11:36:24 UTC (rev 4789)
+++ csw/mgar/pkg/socat/trunk/checksums	2009-05-10 11:58:31 UTC (rev 4790)
@@ -1,2 +1,4 @@
 a3a68cabdfd9145aa6570fc4777be45c  download/cc_compile.patch
+76ce5e07c1b8925b33e664accefa1923  download/patch-configure-netinetip.diff
+0f34e654b9a652278fa2fd1b36d51469  download/patch-test.diff
 52b0216607e35bdfba247560fb85dd82  download/socat-1.7.1.1.tar.gz

Added: csw/mgar/pkg/socat/trunk/files/patch-configure-netinetip.diff
===================================================================
--- csw/mgar/pkg/socat/trunk/files/patch-configure-netinetip.diff	                        (rev 0)
+++ csw/mgar/pkg/socat/trunk/files/patch-configure-netinetip.diff	2009-05-10 11:58:31 UTC (rev 4790)
@@ -0,0 +1,17 @@
+--- socat-1.7.1.1/configure.in.orig	2009-05-10 12:24:59.504739652 +0200
++++ socat-1.7.1.1/configure.in	2009-05-10 12:25:36.909419428 +0200
+@@ -53,7 +53,13 @@
+ AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/param.h sys/ioctl.h sys/time.h syslog.h unistd.h)
+ AC_CHECK_HEADERS(pwd.h grp.h stdint.h sys/types.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
+ AC_CHECK_HEADERS(pty.h)
+-AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h netinet/ip.h netinet/tcp.h)
++AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h)
++AC_CHECK_HEADERS(netinet/ip.h, [], [], [AC_INCLUDES_DEFAULT
++	#if HAVE_NETINET_IN_H && HAVE_NETINET_IN_SYSTM_H
++	#include <netinet/in.h>
++	#include <netinet/in_systm.h>
++	#endif])	# Solaris prerequisites for netinet/ip.h
++AC_CHECK_HEADERS(netinet/tcp.h)
+ AC_CHECK_HEADERS(netinet6/in6.h)	# found on OpenBSD, used for IPV6_*
+ AC_CHECK_HEADERS(net/if.h, [], [], [AC_INCLUDES_DEFAULT
+ 	#if HAVE_SYS_SOCKET_H


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.