diff options
Diffstat (limited to 'net/openvpn/patches')
| -rw-r--r-- | net/openvpn/patches/patch-ab | 6 | ||||
| -rw-r--r-- | net/openvpn/patches/patch-ad | 6 | ||||
| -rw-r--r-- | net/openvpn/patches/patch-ae | 35 | ||||
| -rw-r--r-- | net/openvpn/patches/patch-af | 36 | ||||
| -rw-r--r-- | net/openvpn/patches/patch-ag | 14 |
5 files changed, 77 insertions, 20 deletions
diff --git a/net/openvpn/patches/patch-ab b/net/openvpn/patches/patch-ab index a466a6baca7..17d8d90fca3 100644 --- a/net/openvpn/patches/patch-ab +++ b/net/openvpn/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2006/04/11 20:09:52 jlam Exp $ +$NetBSD: patch-ab,v 1.5 2007/06/21 21:44:42 jlam Exp $ ---- syshead.h.orig 2005-12-08 15:57:49.000000000 -0500 +--- syshead.h.orig 2007-04-25 17:38:46.000000000 -0400 +++ syshead.h -@@ -254,6 +254,10 @@ +@@ -262,6 +262,10 @@ #ifdef TARGET_NETBSD diff --git a/net/openvpn/patches/patch-ad b/net/openvpn/patches/patch-ad index adfb2cdf5da..ef5b36832ab 100644 --- a/net/openvpn/patches/patch-ad +++ b/net/openvpn/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1 2006/04/11 20:09:52 jlam Exp $ +$NetBSD: patch-ad,v 1.2 2007/06/21 21:44:42 jlam Exp $ ---- config.h.in.orig 2006-04-05 04:03:07.000000000 -0400 +--- config.h.in.orig 2007-04-25 19:54:40.000000000 -0400 +++ config.h.in -@@ -201,6 +201,9 @@ +@@ -216,6 +216,9 @@ /* Define to 1 if you have the <net/if.h> header file. */ #undef HAVE_NET_IF_H diff --git a/net/openvpn/patches/patch-ae b/net/openvpn/patches/patch-ae index 39ebdf95eab..f36516b3d10 100644 --- a/net/openvpn/patches/patch-ae +++ b/net/openvpn/patches/patch-ae @@ -1,13 +1,34 @@ -$NetBSD: patch-ae,v 1.1 2006/04/11 20:09:52 jlam Exp $ +$NetBSD: patch-ae,v 1.2 2007/06/21 21:44:42 jlam Exp $ ---- configure.ac.orig 2006-04-05 04:02:59.000000000 -0400 +--- configure.ac.orig 2007-04-25 17:38:46.000000000 -0400 +++ configure.ac -@@ -266,7 +266,7 @@ AC_CHECK_HEADERS(sys/time.h sys/socket.h +@@ -285,14 +285,17 @@ AC_CHECK_HEADERS(sys/time.h sys/socket.h sys/mman.h fcntl.h sys/file.h stdlib.h stdint.h dnl stdarg.h unistd.h signal.h stdio.h string.h dnl strings.h ctype.h errno.h syslog.h pwd.h grp.h dnl -- net/if_tun.h net/if.h stropts.h sys/sockio.h dnl -+ net/if_tap.h net/if_tun.h net/if.h stropts.h sys/sockio.h dnl - netinet/in.h netinet/in_systm.h netinet/ip.h dnl - netinet/if_ether.h netinet/tcp.h resolv.h arpa/inet.h dnl +- net/if_tun.h stropts.h sys/sockio.h dnl ++ net/if_tap.h net/if_tun.h stropts.h sys/sockio.h dnl + netinet/in.h netinet/in_systm.h dnl + netinet/tcp.h arpa/inet.h dnl netdb.h sys/uio.h linux/if_tun.h linux/sockios.h dnl + linux/types.h sys/poll.h sys/epoll.h err.h dnl + ) + AC_CHECK_HEADERS(net/if.h,,, +- [#ifdef HAVE_SYS_SOCKET_H ++ [#ifdef HAVE_SYS_TYPES_H ++ # include <sys/types.h> ++ #endif ++ #ifdef HAVE_SYS_SOCKET_H + # include <sys/socket.h> + #endif + ]) +@@ -314,6 +317,9 @@ AC_CHECK_HEADERS(netinet/if_ether.h,,, + #ifdef HAVE_SYS_SOCKET_H + # include <sys/socket.h> + #endif ++ #ifdef HAVE_NET_IF_H ++ # include <net/if.h> ++ #endif + #ifdef HAVE_NETINET_IN_H + # include <netinet/in.h> + #endif diff --git a/net/openvpn/patches/patch-af b/net/openvpn/patches/patch-af index 3fc933ef25d..62619bc8a77 100644 --- a/net/openvpn/patches/patch-af +++ b/net/openvpn/patches/patch-af @@ -1,13 +1,35 @@ -$NetBSD: patch-af,v 1.2 2007/02/20 09:40:49 sborrill Exp $ +$NetBSD: patch-af,v 1.3 2007/06/21 21:44:42 jlam Exp $ ---- configure.orig 2006-10-31 22:53:55.000000000 +0000 -+++ configure 2007-02-12 11:01:39.000000000 +0000 -@@ -4929,7 +4929,7 @@ +--- configure.orig 2007-04-25 19:54:40.000000000 -0400 ++++ configure +@@ -5528,7 +5528,7 @@ fi --for ac_header in sys/time.h sys/socket.h sys/ioctl.h sys/stat.h sys/mman.h fcntl.h sys/file.h stdlib.h stdint.h stdarg.h unistd.h signal.h stdio.h string.h strings.h ctype.h errno.h syslog.h pwd.h grp.h net/if_tun.h net/if.h stropts.h sys/sockio.h netinet/in.h netinet/in_systm.h netinet/ip.h netinet/if_ether.h netinet/tcp.h resolv.h arpa/inet.h netdb.h sys/uio.h linux/if_tun.h linux/sockios.h linux/types.h sys/poll.h sys/epoll.h err.h -+for ac_header in sys/time.h sys/socket.h sys/ioctl.h sys/stat.h sys/mman.h fcntl.h sys/file.h stdlib.h stdint.h stdarg.h unistd.h signal.h stdio.h string.h strings.h ctype.h errno.h syslog.h pwd.h grp.h net/if_tap.h net/if_tun.h net/if.h stropts.h sys/sockio.h netinet/in.h netinet/in_systm.h netinet/ip.h netinet/if_ether.h netinet/tcp.h resolv.h arpa/inet.h netdb.h sys/uio.h linux/if_tun.h linux/sockios.h linux/types.h sys/poll.h sys/epoll.h err.h +-for ac_header in sys/time.h sys/socket.h sys/ioctl.h sys/stat.h sys/mman.h fcntl.h sys/file.h stdlib.h stdint.h stdarg.h unistd.h signal.h stdio.h string.h strings.h ctype.h errno.h syslog.h pwd.h grp.h net/if_tun.h stropts.h sys/sockio.h netinet/in.h netinet/in_systm.h netinet/tcp.h arpa/inet.h netdb.h sys/uio.h linux/if_tun.h linux/sockios.h linux/types.h sys/poll.h sys/epoll.h err.h ++for ac_header in sys/time.h sys/socket.h sys/ioctl.h sys/stat.h sys/mman.h fcntl.h sys/file.h stdlib.h stdint.h stdarg.h unistd.h signal.h stdio.h string.h strings.h ctype.h errno.h syslog.h pwd.h grp.h net/if_tap.h net/if_tun.h stropts.h sys/sockio.h netinet/in.h netinet/in_systm.h netinet/tcp.h arpa/inet.h netdb.h sys/uio.h linux/if_tun.h linux/sockios.h linux/types.h sys/poll.h sys/epoll.h err.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if eval "test \"\${$as_ac_Header+set}\" = set"; then + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +@@ -5687,7 +5687,10 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#ifdef HAVE_SYS_SOCKET_H ++#ifdef HAVE_SYS_TYPES_H ++ # include <sys/types.h> ++ #endif ++ #ifdef HAVE_SYS_SOCKET_H + # include <sys/socket.h> + #endif + +@@ -5821,6 +5824,9 @@ cat >>conftest.$ac_ext <<_ACEOF + #ifdef HAVE_SYS_SOCKET_H + # include <sys/socket.h> + #endif ++ #ifdef HAVE_NET_IF_H ++ # include <net/if.h> ++ #endif + #ifdef HAVE_NETINET_IN_H + # include <netinet/in.h> + #endif diff --git a/net/openvpn/patches/patch-ag b/net/openvpn/patches/patch-ag new file mode 100644 index 00000000000..f1e51c54114 --- /dev/null +++ b/net/openvpn/patches/patch-ag @@ -0,0 +1,14 @@ +$NetBSD: patch-ag,v 1.1 2007/06/21 21:44:42 jlam Exp $ + +--- easy-rsa/2.0/pkitool.orig 2007-04-25 17:38:44.000000000 -0400 ++++ easy-rsa/2.0/pkitool +@@ -134,6 +134,9 @@ CA="ca" + PKCS11_MODULE_PATH="dummy" + PKCS11_PIN="dummy" + ++[ -n "$GREP" ] || GREP=grep ++[ -n "$OPENSSL" ] || OPENSSL=openssl ++ + # Process options + while [ $# -gt 0 ]; do + case "$1" in |