summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/openvpn/Makefile9
-rw-r--r--net/openvpn/PLIST3
-rw-r--r--net/openvpn/distinfo14
-rw-r--r--net/openvpn/patches/patch-ac27
-rw-r--r--net/openvpn/patches/patch-ae19
-rw-r--r--net/openvpn/patches/patch-af17
6 files changed, 41 insertions, 48 deletions
diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index ad57604d84e..0682f8aa800 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2008/02/20 04:24:17 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2008/10/09 10:57:23 sborrill Exp $
#
-DISTNAME= openvpn-2.1_rc7
-PKGNAME= openvpn-2.1rc7
-PKGREVISION= 1
+DISTNAME= openvpn-2.1_rc13
+PKGNAME= openvpn-2.1rc13
CATEGORIES= net
MASTER_SITES= http://openvpn.net/release/ \
http://openvpn.net/release/old/
@@ -74,8 +73,6 @@ post-install:
*) ${INSTALL_SCRIPT} $$file ${DESTDIR}${EASYRSADIR:Q} ;; \
esac; \
done
- ${INSTALL_DATA} ${WRKSRC:Q}/management/management-notes.txt \
- ${DESTDIR}${DOCDIR:Q}
cd ${WRKSRC:Q}/sample-config-files; for file in *; do \
${INSTALL_DATA} $$file ${DESTDIR}${EGDIR:Q}/config; \
done
diff --git a/net/openvpn/PLIST b/net/openvpn/PLIST
index 43ed39ea6a4..76208237f72 100644
--- a/net/openvpn/PLIST
+++ b/net/openvpn/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2008/02/13 12:07:24 martti Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/10/09 10:57:23 sborrill Exp $
man/man8/openvpn.8
sbin/openvpn
-share/doc/openvpn/management-notes.txt
share/examples/openvpn/config/README
share/examples/openvpn/config/client.conf
share/examples/openvpn/config/firewall.sh
diff --git a/net/openvpn/distinfo b/net/openvpn/distinfo
index 2a4ca799073..a0ebc31e0cc 100644
--- a/net/openvpn/distinfo
+++ b/net/openvpn/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.14 2008/02/13 12:07:24 martti Exp $
+$NetBSD: distinfo,v 1.15 2008/10/09 10:57:23 sborrill Exp $
-SHA1 (openvpn-2.1_rc7.tar.gz) = f9f57a8ef3af8ab51924784ad2aab5d5f5798581
-RMD160 (openvpn-2.1_rc7.tar.gz) = 67e80d7bfb554046c71c95ec15d478504057f903
-Size (openvpn-2.1_rc7.tar.gz) = 787379 bytes
+SHA1 (openvpn-2.1_rc13.tar.gz) = 904d54249e62f02b6f2c7fc4a35f56babe014b7e
+RMD160 (openvpn-2.1_rc13.tar.gz) = d52261aa1992f46f890793944858f057fa239fdd
+Size (openvpn-2.1_rc13.tar.gz) = 825890 bytes
SHA1 (patch-ab) = d26cdc9166a8813860f31cb5b11bc5b3643b8aa5
-SHA1 (patch-ac) = 21e8e89b03b69cf8e6ec7dbb6eb57885992e8aed
+SHA1 (patch-ac) = f59615702208cae2a094306bc5fa7fb96234e55a
SHA1 (patch-ad) = 69f5fff5105131dc05ab38a1a717e1b363f88c1c
-SHA1 (patch-ae) = 66f7d62588d465daa6195ee550bdad4ac2879db7
-SHA1 (patch-af) = b30791372a097e02250515ec57a62b0a4fde2cdd
+SHA1 (patch-ae) = 362c881da994608baad7b10667100c39143244b6
+SHA1 (patch-af) = dc5dbca74ebbda081e4eaf9a9d5e11b6de11269f
SHA1 (patch-ag) = fe8e59cf177c99c2fd001e7893df86af961e8e4e
diff --git a/net/openvpn/patches/patch-ac b/net/openvpn/patches/patch-ac
index f07d55c7f3b..75fbb6dc194 100644
--- a/net/openvpn/patches/patch-ac
+++ b/net/openvpn/patches/patch-ac
@@ -1,8 +1,7 @@
-$NetBSD: patch-ac,v 1.6 2008/02/13 12:07:24 martti Exp $
-
---- tun.c.orig 2008-01-26 06:39:13.000000000 +0200
-+++ tun.c 2008-02-13 13:32:50.000000000 +0200
-@@ -68,6 +68,7 @@
+$NetBSD: patch-ac,v 1.7 2008/10/09 10:57:23 sborrill Exp $
+--- tun.c.orig 2008-10-06 08:22:21.000000000 +0100
++++ tun.c 2008-10-09 10:06:50.000000000 +0100
+@@ -63,6 +63,7 @@
#ifdef TARGET_SOLARIS
static void solaris_error_close (struct tuntap *tt, const struct env_set *es, const char *actual);
@@ -10,7 +9,7 @@ $NetBSD: patch-ac,v 1.6 2008/02/13 12:07:24 martti Exp $
#endif
bool
-@@ -662,7 +663,12 @@
+@@ -720,7 +721,12 @@
);
}
else
@@ -22,9 +21,9 @@ $NetBSD: patch-ac,v 1.6 2008/02/13 12:07:24 martti Exp $
+ ifconfig_remote_netmask
+ );
- msg (M_INFO, "%s", command_line);
- if (!system_check (command_line, es, 0, "Solaris ifconfig phase-2 failed"))
-@@ -948,7 +954,37 @@
+ argv_msg (M_INFO, &argv);
+ if (!openvpn_execve_check (&argv, es, 0, "Solaris ifconfig phase-2 failed"))
+@@ -1020,7 +1026,37 @@
if (dynamic && !has_digit((unsigned char *)dev))
{
int i;
@@ -63,7 +62,7 @@ $NetBSD: patch-ac,v 1.6 2008/02/13 12:07:24 martti Exp $
{
openvpn_snprintf (tunname, sizeof (tunname),
"/dev/%s%d", dev, i);
-@@ -1310,13 +1346,16 @@
+@@ -1403,13 +1439,16 @@
void
open_tun (const char *dev, const char *dev_type, const char *dev_node, bool ipv6, struct tuntap *tt)
{
@@ -83,7 +82,7 @@ $NetBSD: patch-ac,v 1.6 2008/02/13 12:07:24 martti Exp $
ipv6_support (ipv6, false, tt);
-@@ -1337,9 +1376,10 @@
+@@ -1430,9 +1469,10 @@
}
else if (tt->type == DEV_TYPE_TAP)
{
@@ -95,7 +94,7 @@ $NetBSD: patch-ac,v 1.6 2008/02/13 12:07:24 martti Exp $
dev_tuntap_type = "tap";
link_type = I_PLINK; /* was: I_LINK */
is_tun = false;
-@@ -1366,7 +1406,11 @@
+@@ -1459,7 +1499,11 @@
msg (M_ERR, "Can't open %s", dev_node);
/* Assign a new PPA and get its unit number. */
@@ -108,7 +107,7 @@ $NetBSD: patch-ac,v 1.6 2008/02/13 12:07:24 martti Exp $
msg (M_ERR, "Can't assign new interface");
if ((if_fd = open (dev_node, O_RDWR, 0)) < 0)
-@@ -1375,27 +1419,81 @@
+@@ -1468,27 +1512,81 @@
if (ioctl (if_fd, I_PUSH, "ip") < 0)
msg (M_ERR, "Can't push IP module");
@@ -203,7 +202,7 @@ $NetBSD: patch-ac,v 1.6 2008/02/13 12:07:24 martti Exp $
msg (M_ERR, "Can't set multiplexor id");
}
-@@ -1413,18 +1511,24 @@
+@@ -1506,18 +1604,24 @@
{
if (tt->ip_fd >= 0)
{
diff --git a/net/openvpn/patches/patch-ae b/net/openvpn/patches/patch-ae
index f36516b3d10..6c99df59b44 100644
--- a/net/openvpn/patches/patch-ae
+++ b/net/openvpn/patches/patch-ae
@@ -1,19 +1,18 @@
-$NetBSD: patch-ae,v 1.2 2007/06/21 21:44:42 jlam Exp $
-
---- configure.ac.orig 2007-04-25 17:38:46.000000000 -0400
-+++ configure.ac
-@@ -285,14 +285,17 @@ AC_CHECK_HEADERS(sys/time.h sys/socket.h
+$NetBSD: patch-ae,v 1.3 2008/10/09 10:57:23 sborrill Exp $
+--- configure.ac.orig 2008-10-06 08:22:21.000000000 +0100
++++ configure.ac 2008-10-09 10:03:55.000000000 +0100
+@@ -343,14 +343,17 @@
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 stropts.h sys/sockio.h dnl
-+ net/if_tap.h net/if_tun.h stropts.h sys/sockio.h dnl
+- net/if_tun.h net/tun/if_tun.h stropts.h sys/sockio.h dnl
++ net/if_tap.h net/if_tun.h net/tun/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,,,
+ )
+ AC_CHECK_HEADERS(net/if.h,,,
- [#ifdef HAVE_SYS_SOCKET_H
+ [#ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
@@ -22,7 +21,7 @@ $NetBSD: patch-ae,v 1.2 2007/06/21 21:44:42 jlam Exp $
# include <sys/socket.h>
#endif
])
-@@ -314,6 +317,9 @@ AC_CHECK_HEADERS(netinet/if_ether.h,,,
+@@ -372,6 +375,9 @@
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
diff --git a/net/openvpn/patches/patch-af b/net/openvpn/patches/patch-af
index 62619bc8a77..3b0d294f335 100644
--- a/net/openvpn/patches/patch-af
+++ b/net/openvpn/patches/patch-af
@@ -1,17 +1,16 @@
-$NetBSD: patch-af,v 1.3 2007/06/21 21:44:42 jlam Exp $
-
---- configure.orig 2007-04-25 19:54:40.000000000 -0400
-+++ configure
-@@ -5528,7 +5528,7 @@ fi
+$NetBSD: patch-af,v 1.4 2008/10/09 10:57:23 sborrill Exp $
+--- configure.orig 2008-10-08 06:18:00.000000000 +0100
++++ configure 2008-10-09 10:04:56.000000000 +0100
+@@ -5970,7 +5970,7 @@
--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
+-for ac_header in sys/time.h sys/socket.h sys/un.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/tun/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/un.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/tun/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 { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-@@ -5687,7 +5687,10 @@ _ACEOF
+@@ -6129,7 +6129,10 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23,7 +22,7 @@ $NetBSD: patch-af,v 1.3 2007/06/21 21:44:42 jlam Exp $
# include <sys/socket.h>
#endif
-@@ -5821,6 +5824,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6263,6 +6266,9 @@
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-16 05:10:41 +0000