* Upgrade to 1.3.2.

* Add init script.

PR:		44436
Submitted by:	maintainer

15 files changed, 93 insertions, 6 deletions

diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile
index 424de0bc1a62..67931d41a49a 100644
--- a/security/openvpn-devel/Makefile
+++ b/security/openvpn-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openvpn
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,6 +24,8 @@ CONFIGURE_ARGS=	--with-lzo-lib=${LOCALBASE}/lib \
 MAN8=		openvpn.8
 
 post-install:
+	${INSTALL_SCRIPT} ${FILESDIR}/openvpn.sh.sample \
+		${PREFIX}/etc/rc.d/openvpn.sh.sample
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for docs in AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL NEWS \
diff --git a/security/openvpn-devel/distinfo b/security/openvpn-devel/distinfo
index 9e382514ed67..48ba3eeb93b8 100644
--- a/security/openvpn-devel/distinfo
+++ b/security/openvpn-devel/distinfo
@@ -1 +1 @@
-MD5 (openvpn-1.3.0.tar.gz) = f82482f0ec8d9091876bd86133a8ff2f
+MD5 (openvpn-1.3.2.tar.gz) = 57f5f92730566401797943561f7cae6e
diff --git a/security/openvpn-devel/files/openvpn.sh.sample b/security/openvpn-devel/files/openvpn.sh.sample
new file mode 100644
index 000000000000..a906ecf44425
--- /dev/null
+++ b/security/openvpn-devel/files/openvpn.sh.sample
@@ -0,0 +1,19 @@
+#! /bin/sh
+# (C) 2002 by Matthias Andree
+
+# This file may be redistributed according to the terms of the GNU General
+# Public License, version 2 (two).
+
+# To use this script, rename it to openvpn.sh and make sure it is
+# executable for the owner.
+
+# This file rouses a security warning at port install time. However, this
+# file itself does not start network services, but it loads a kernel driver.
+# The security of this file therefore depends on the security of kldload and
+# the if_tap driver.
+
+case x$1 in
+  xstart) echo -n ' if_tap' ; exec kldload if_tap ;;
+  xstop)  echo -n ' if_tap' ; exec kldunload if_tap ;;
+  *)      echo >&2 "Usage: $0 {start|stop}"
+esac
diff --git a/security/openvpn-devel/pkg-message b/security/openvpn-devel/pkg-message
index e931c5aa9c97..122c4096ec2a 100644
--- a/security/openvpn-devel/pkg-message
+++ b/security/openvpn-devel/pkg-message
@@ -1,4 +1,8 @@
 ### ---------------------------------------------------------------------- ###
+###  To use the tap driver, you may need to do: kldload if_tap             ###
+###  See ${PREFIX}/etc/rc.d/openvpn.sh.sample for how to do this  	   ###
+###  automatically at system boot-up time.                                 ###
+### ---------------------------------------------------------------------- ###
 ###  To retain backwards compatibility of OpenVPN 1.3.0 with OpenVPN peers ###
 ###  that run older versions (back to 1.1.0), you will have to set the MTU ###
 ###  explicitly by command line options since OpenVPN 1.3.0.               ###
diff --git a/security/openvpn-devel/pkg-plist b/security/openvpn-devel/pkg-plist
index cfa154b24266..f3b09096c538 100644
--- a/security/openvpn-devel/pkg-plist
+++ b/security/openvpn-devel/pkg-plist
@@ -1,4 +1,5 @@
 sbin/openvpn
+etc/rc.d/openvpn.sh.sample
 %%PORTDOCS%%share/doc/openvpn/AUTHORS
 %%PORTDOCS%%share/doc/openvpn/COPYING
 %%PORTDOCS%%share/doc/openvpn/COPYRIGHT.GPL
@@ -10,6 +11,7 @@ sbin/openvpn
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/README
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/build-ca
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/build-dh
+%%PORTDOCS%%share/doc/openvpn/easy-rsa/build-inter
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/build-key
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/build-key-pass
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/build-req
@@ -28,6 +30,8 @@ sbin/openvpn
 %%PORTDOCS%%share/doc/openvpn/sample-config-files/static-office.conf
 %%PORTDOCS%%share/doc/openvpn/sample-config-files/tls-home.conf
 %%PORTDOCS%%share/doc/openvpn/sample-config-files/tls-office.conf
+%%PORTDOCS%%share/doc/openvpn/sample-config-files/xinetd-client-config
+%%PORTDOCS%%share/doc/openvpn/sample-config-files/xinetd-server-config
 %%PORTDOCS%%share/doc/openvpn/sample-scripts/openvpn.init
 %%PORTDOCS%%share/doc/openvpn/sample-scripts/verify-cn
 %%PORTDOCS%%@dirrm share/doc/openvpn/sample-scripts
diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile
index 424de0bc1a62..67931d41a49a 100644
--- a/security/openvpn/Makefile
+++ b/security/openvpn/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openvpn
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,6 +24,8 @@ CONFIGURE_ARGS=	--with-lzo-lib=${LOCALBASE}/lib \
 MAN8=		openvpn.8
 
 post-install:
+	${INSTALL_SCRIPT} ${FILESDIR}/openvpn.sh.sample \
+		${PREFIX}/etc/rc.d/openvpn.sh.sample
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for docs in AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL NEWS \
diff --git a/security/openvpn/distinfo b/security/openvpn/distinfo
index 9e382514ed67..48ba3eeb93b8 100644
--- a/security/openvpn/distinfo
+++ b/security/openvpn/distinfo
@@ -1 +1 @@
-MD5 (openvpn-1.3.0.tar.gz) = f82482f0ec8d9091876bd86133a8ff2f
+MD5 (openvpn-1.3.2.tar.gz) = 57f5f92730566401797943561f7cae6e
diff --git a/security/openvpn/files/openvpn.sh.sample b/security/openvpn/files/openvpn.sh.sample
new file mode 100644
index 000000000000..a906ecf44425
--- /dev/null
+++ b/security/openvpn/files/openvpn.sh.sample
@@ -0,0 +1,19 @@
+#! /bin/sh
+# (C) 2002 by Matthias Andree
+
+# This file may be redistributed according to the terms of the GNU General
+# Public License, version 2 (two).
+
+# To use this script, rename it to openvpn.sh and make sure it is
+# executable for the owner.
+
+# This file rouses a security warning at port install time. However, this
+# file itself does not start network services, but it loads a kernel driver.
+# The security of this file therefore depends on the security of kldload and
+# the if_tap driver.
+
+case x$1 in
+  xstart) echo -n ' if_tap' ; exec kldload if_tap ;;
+  xstop)  echo -n ' if_tap' ; exec kldunload if_tap ;;
+  *)      echo >&2 "Usage: $0 {start|stop}"
+esac
diff --git a/security/openvpn/pkg-message b/security/openvpn/pkg-message
index e931c5aa9c97..122c4096ec2a 100644
--- a/security/openvpn/pkg-message
+++ b/security/openvpn/pkg-message
@@ -1,4 +1,8 @@
 ### ---------------------------------------------------------------------- ###
+###  To use the tap driver, you may need to do: kldload if_tap             ###
+###  See ${PREFIX}/etc/rc.d/openvpn.sh.sample for how to do this  	   ###
+###  automatically at system boot-up time.                                 ###
+### ---------------------------------------------------------------------- ###
 ###  To retain backwards compatibility of OpenVPN 1.3.0 with OpenVPN peers ###
 ###  that run older versions (back to 1.1.0), you will have to set the MTU ###
 ###  explicitly by command line options since OpenVPN 1.3.0.               ###
diff --git a/security/openvpn/pkg-plist b/security/openvpn/pkg-plist
index cfa154b24266..f3b09096c538 100644
--- a/security/openvpn/pkg-plist
+++ b/security/openvpn/pkg-plist
@@ -1,4 +1,5 @@
 sbin/openvpn
+etc/rc.d/openvpn.sh.sample
 %%PORTDOCS%%share/doc/openvpn/AUTHORS
 %%PORTDOCS%%share/doc/openvpn/COPYING
 %%PORTDOCS%%share/doc/openvpn/COPYRIGHT.GPL
@@ -10,6 +11,7 @@ sbin/openvpn
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/README
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/build-ca
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/build-dh
+%%PORTDOCS%%share/doc/openvpn/easy-rsa/build-inter
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/build-key
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/build-key-pass
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/build-req
@@ -28,6 +30,8 @@ sbin/openvpn
 %%PORTDOCS%%share/doc/openvpn/sample-config-files/static-office.conf
 %%PORTDOCS%%share/doc/openvpn/sample-config-files/tls-home.conf
 %%PORTDOCS%%share/doc/openvpn/sample-config-files/tls-office.conf
+%%PORTDOCS%%share/doc/openvpn/sample-config-files/xinetd-client-config
+%%PORTDOCS%%share/doc/openvpn/sample-config-files/xinetd-server-config
 %%PORTDOCS%%share/doc/openvpn/sample-scripts/openvpn.init
 %%PORTDOCS%%share/doc/openvpn/sample-scripts/verify-cn
 %%PORTDOCS%%@dirrm share/doc/openvpn/sample-scripts
diff --git a/security/openvpn20/Makefile b/security/openvpn20/Makefile
index 424de0bc1a62..67931d41a49a 100644
--- a/security/openvpn20/Makefile
+++ b/security/openvpn20/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openvpn
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,6 +24,8 @@ CONFIGURE_ARGS=	--with-lzo-lib=${LOCALBASE}/lib \
 MAN8=		openvpn.8
 
 post-install:
+	${INSTALL_SCRIPT} ${FILESDIR}/openvpn.sh.sample \
+		${PREFIX}/etc/rc.d/openvpn.sh.sample
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for docs in AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL NEWS \
diff --git a/security/openvpn20/distinfo b/security/openvpn20/distinfo
index 9e382514ed67..48ba3eeb93b8 100644
--- a/security/openvpn20/distinfo
+++ b/security/openvpn20/distinfo
@@ -1 +1 @@
-MD5 (openvpn-1.3.0.tar.gz) = f82482f0ec8d9091876bd86133a8ff2f
+MD5 (openvpn-1.3.2.tar.gz) = 57f5f92730566401797943561f7cae6e
diff --git a/security/openvpn20/files/openvpn.sh.sample b/security/openvpn20/files/openvpn.sh.sample
new file mode 100644
index 000000000000..a906ecf44425
--- /dev/null
+++ b/security/openvpn20/files/openvpn.sh.sample
@@ -0,0 +1,19 @@
+#! /bin/sh
+# (C) 2002 by Matthias Andree
+
+# This file may be redistributed according to the terms of the GNU General
+# Public License, version 2 (two).
+
+# To use this script, rename it to openvpn.sh and make sure it is
+# executable for the owner.
+
+# This file rouses a security warning at port install time. However, this
+# file itself does not start network services, but it loads a kernel driver.
+# The security of this file therefore depends on the security of kldload and
+# the if_tap driver.
+
+case x$1 in
+  xstart) echo -n ' if_tap' ; exec kldload if_tap ;;
+  xstop)  echo -n ' if_tap' ; exec kldunload if_tap ;;
+  *)      echo >&2 "Usage: $0 {start|stop}"
+esac
diff --git a/security/openvpn20/pkg-message b/security/openvpn20/pkg-message
index e931c5aa9c97..122c4096ec2a 100644
--- a/security/openvpn20/pkg-message
+++ b/security/openvpn20/pkg-message
@@ -1,4 +1,8 @@
 ### ---------------------------------------------------------------------- ###
+###  To use the tap driver, you may need to do: kldload if_tap             ###
+###  See ${PREFIX}/etc/rc.d/openvpn.sh.sample for how to do this  	   ###
+###  automatically at system boot-up time.                                 ###
+### ---------------------------------------------------------------------- ###
 ###  To retain backwards compatibility of OpenVPN 1.3.0 with OpenVPN peers ###
 ###  that run older versions (back to 1.1.0), you will have to set the MTU ###
 ###  explicitly by command line options since OpenVPN 1.3.0.               ###
diff --git a/security/openvpn20/pkg-plist b/security/openvpn20/pkg-plist
index cfa154b24266..f3b09096c538 100644
--- a/security/openvpn20/pkg-plist
+++ b/security/openvpn20/pkg-plist
@@ -1,4 +1,5 @@
 sbin/openvpn
+etc/rc.d/openvpn.sh.sample
 %%PORTDOCS%%share/doc/openvpn/AUTHORS
 %%PORTDOCS%%share/doc/openvpn/COPYING
 %%PORTDOCS%%share/doc/openvpn/COPYRIGHT.GPL
@@ -10,6 +11,7 @@ sbin/openvpn
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/README
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/build-ca
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/build-dh
+%%PORTDOCS%%share/doc/openvpn/easy-rsa/build-inter
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/build-key
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/build-key-pass
 %%PORTDOCS%%share/doc/openvpn/easy-rsa/build-req
@@ -28,6 +30,8 @@ sbin/openvpn
 %%PORTDOCS%%share/doc/openvpn/sample-config-files/static-office.conf
 %%PORTDOCS%%share/doc/openvpn/sample-config-files/tls-home.conf
 %%PORTDOCS%%share/doc/openvpn/sample-config-files/tls-office.conf
+%%PORTDOCS%%share/doc/openvpn/sample-config-files/xinetd-client-config
+%%PORTDOCS%%share/doc/openvpn/sample-config-files/xinetd-server-config
 %%PORTDOCS%%share/doc/openvpn/sample-scripts/openvpn.init
 %%PORTDOCS%%share/doc/openvpn/sample-scripts/verify-cn
 %%PORTDOCS%%@dirrm share/doc/openvpn/sample-scripts