Attachment #271763 for bug #335563

View | Details | Raw Unified | Return to bug 335563 | Differences between
Collapse All | Expand All




diff -x '*~' -uN openvpn-2.2-RC2/configure openvpn-2.2-RC2-ipv6-0.4.16/configure
--- openvpn-2.2-RC2/configure	2011-03-24 22:05:50.000000000 +0100
+++ openvpn-2.2-RC2-ipv6-0.4.16/configure	2011-03-27 23:50:16.621773000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.66 for OpenVPN 2.2-RC2.
+# Generated by GNU Autoconf 2.67 for OpenVPN 2.2-RC2.
 #
 # Report bugs to <openvpn-users@lists.sourceforge.net>.
 #
@@ -715,6 +715,7 @@
 enable_http
 enable_fragment

   --disable-port-share    Disable TCP server port-share support (--port-share)
   --disable-debug         Disable debugging support (disable gremlin and verb 7+ messages)
   --enable-small          Enable smaller executable size (disable OCC, usage message, and verb 4 parm list)
@@ -1492,7 +1495,7 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 OpenVPN configure 2.2-RC2
-generated by GNU Autoconf 2.66
+generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1564,7 +1567,7 @@
     mv -f conftest.er1 conftest.err
   fi

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -2093,7 +2096,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by OpenVPN $as_me 2.2-RC2, which was
-generated by GNU Autoconf 2.66.  Invocation command line was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
 
@@ -2351,7 +2354,7 @@
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

 
 if test "$MEMCHECK" = "valgrind"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for valgrind tool and Header files..." >&5
@@ -8243,7 +8272,7 @@
 # values after options handling.
 ac_log="
 This file was extended by OpenVPN $as_me 2.2-RC2, which was
-generated by GNU Autoconf 2.66.  Invocation command line was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -8309,7 +8338,7 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 OpenVPN config.status 2.2-RC2
-configured by $0, generated by GNU Autoconf 2.66,
+configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -8330,11 +8359,16 @@
 while test $# != 0
 do

+#ifdef USE_PF_INET6
+  " [PF_INET6]"
+#endif
   " [IPv6 payload 20110424-2 (2.2RC2)]"
   " built on " __DATE__
 ;
 

diff -x '*~' -uN openvpn-2.2-RC2/syshead.h openvpn-2.2-RC2-ipv6-0.4.16/syshead.h
--- openvpn-2.2-RC2/syshead.h	2011-03-24 21:58:25.000000000 +0100
+++ openvpn-2.2-RC2-ipv6-0.4.16/syshead.h	2011-03-27 23:50:13.551773003 +0200
@@ -28,6 +28,10 @@
 /*
  * Only include if not during configure
  */
+#ifdef WIN32
+/* USE_PF_INET6: win32 ipv6 exists only after 0x0501 (XP) */
+#define WINVER 0x0501
+#endif
 #ifndef PACKAGE_NAME
 #include "config.h"
 #endif
@@ -339,6 +343,9 @@
 #ifdef WIN32
 #include <iphlpapi.h>
 #include <wininet.h>
+/* The following two headers are needed of USE_PF_INET6 */
+#include <winsock2.h>
+#include <ws2tcpip.h>
 #endif
 
 #ifdef HAVE_SYS_MMAN_H
@@ -383,9 +390,10 @@
 #endif
 

Return to bug 335563

Lines 85-98 Link Here

(-).distfiles/openvpn-2.2-RC2-ipv6-0.4.16.patch (-65 / +1 lines)
85	diff -x '*~' -uN openvpn-2.2-RC2/configure openvpn-2.2-RC2-ipv6-0.4.16/configure	85	diff -x '*~' -uN openvpn-2.2-RC2/configure openvpn-2.2-RC2-ipv6-0.4.16/configure
86	--- openvpn-2.2-RC2/configure 2011-03-24 22:05:50.000000000 +0100	86	--- openvpn-2.2-RC2/configure 2011-03-24 22:05:50.000000000 +0100
87	+++ openvpn-2.2-RC2-ipv6-0.4.16/configure 2011-03-27 23:50:16.621773000 +0200	87	+++ openvpn-2.2-RC2-ipv6-0.4.16/configure 2011-03-27 23:50:16.621773000 +0200
88	@@ -1,6 +1,6 @@
89	#! /bin/sh
90	# Guess values for system-dependent variables and create Makefiles.
91	-# Generated by GNU Autoconf 2.66 for OpenVPN 2.2-RC2.
92	+# Generated by GNU Autoconf 2.67 for OpenVPN 2.2-RC2.
93	#
94	# Report bugs to <openvpn-users@lists.sourceforge.net>.
95	#
96	@@ -715,6 +715,7 @@	88	@@ -715,6 +715,7 @@
97	enable_http	89	enable_http
98	enable_fragment	90	enable_fragment
Lines 121-135 Link Here
121	--disable-port-share Disable TCP server port-share support (--port-share)	113	--disable-port-share Disable TCP server port-share support (--port-share)
122	--disable-debug Disable debugging support (disable gremlin and verb 7+ messages)	114	--disable-debug Disable debugging support (disable gremlin and verb 7+ messages)
123	--enable-small Enable smaller executable size (disable OCC, usage message, and verb 4 parm list)	115	--enable-small Enable smaller executable size (disable OCC, usage message, and verb 4 parm list)
124	@@ -1492,7 +1495,7 @@
125	if $ac_init_version; then
126	cat <<\_ACEOF
127	OpenVPN configure 2.2-RC2
128	-generated by GNU Autoconf 2.66
129	+generated by GNU Autoconf 2.67
130
131	Copyright (C) 2010 Free Software Foundation, Inc.
132	This configure script is free software; the Free Software Foundation
133	@@ -1564,7 +1567,7 @@	116	@@ -1564,7 +1567,7 @@
134	mv -f conftest.er1 conftest.err	117	mv -f conftest.er1 conftest.err
135	fi	118	fi
Lines 148-162 Link Here
148	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5	131	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
149	$as_echo "$ac_header_preproc" >&6; }	132	$as_echo "$ac_header_preproc" >&6; }
150		133
151	@@ -2093,7 +2096,7 @@
152	running configure, to aid debugging if configure makes a mistake.
153
154	It was created by OpenVPN $as_me 2.2-RC2, which was
155	-generated by GNU Autoconf 2.66. Invocation command line was
156	+generated by GNU Autoconf 2.67. Invocation command line was
157
158	$ $0 $@
159
160	@@ -2351,7 +2354,7 @@	134	@@ -2351,7 +2354,7 @@
161	\|\| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5	135	\|\| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
162	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}	136	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
Lines 363-386 Link Here
363		337
364	if test "$MEMCHECK" = "valgrind"; then	338	if test "$MEMCHECK" = "valgrind"; then
365	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for valgrind tool and Header files..." >&5	339	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for valgrind tool and Header files..." >&5
366	@@ -8243,7 +8272,7 @@
367	# values after options handling.
368	ac_log="
369	This file was extended by OpenVPN $as_me 2.2-RC2, which was
370	-generated by GNU Autoconf 2.66. Invocation command line was
371	+generated by GNU Autoconf 2.67. Invocation command line was
372
373	CONFIG_FILES = $CONFIG_FILES
374	CONFIG_HEADERS = $CONFIG_HEADERS
375	@@ -8309,7 +8338,7 @@
376	ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
377	ac_cs_version="\\
378	OpenVPN config.status 2.2-RC2
379	-configured by $0, generated by GNU Autoconf 2.66,
380	+configured by $0, generated by GNU Autoconf 2.67,
381	with options \\"\$ac_cs_config\\"
382
383	Copyright (C) 2010 Free Software Foundation, Inc.
384	@@ -8330,11 +8359,16 @@	340	@@ -8330,11 +8359,16 @@
385	while test $# != 0	341	while test $# != 0
386	do	342	do
Lines 822-827 Link Here
822	+#ifdef USE_PF_INET6	778	+#ifdef USE_PF_INET6
823	+ " [PF_INET6]"	779	+ " [PF_INET6]"
824	+#endif	780	+#endif
		781	" [IPv6 payload 20110424-2 (2.2RC2)]"
825	" built on " __DATE__	782	" built on " __DATE__
826	;	783	;
827		784
Lines 3064-3090 Link Here
3064	diff -x '*~' -uN openvpn-2.2-RC2/syshead.h openvpn-2.2-RC2-ipv6-0.4.16/syshead.h	3021	diff -x '*~' -uN openvpn-2.2-RC2/syshead.h openvpn-2.2-RC2-ipv6-0.4.16/syshead.h
3065	--- openvpn-2.2-RC2/syshead.h 2011-03-24 21:58:25.000000000 +0100	3022	--- openvpn-2.2-RC2/syshead.h 2011-03-24 21:58:25.000000000 +0100
3066	+++ openvpn-2.2-RC2-ipv6-0.4.16/syshead.h 2011-03-27 23:50:13.551773003 +0200	3023	+++ openvpn-2.2-RC2-ipv6-0.4.16/syshead.h 2011-03-27 23:50:13.551773003 +0200
3067	@@ -28,6 +28,10 @@
3068	/*
3069	* Only include if not during configure
3070	*/
3071	+#ifdef WIN32
3072	+/* USE_PF_INET6: win32 ipv6 exists only after 0x0501 (XP) */
3073	+#define WINVER 0x0501
3074	+#endif
3075	#ifndef PACKAGE_NAME
3076	#include "config.h"
3077	#endif
3078	@@ -339,6 +343,9 @@
3079	#ifdef WIN32
3080	#include <iphlpapi.h>
3081	#include <wininet.h>
3082	+/* The following two headers are needed of USE_PF_INET6 */
3083	+#include <winsock2.h>
3084	+#include <ws2tcpip.h>
3085	#endif
3086
3087	#ifdef HAVE_SYS_MMAN_H
3088	@@ -383,9 +390,10 @@	3024	@@ -383,9 +390,10 @@
3089	#endif	3025	#endif
3090		3026