Update Tunnelblick XOR patch.

PR:		212136
Submitted by:	Franco Fichtner

Fix build with tunnelblick patch.

Sponsored by:	Absolight

Update to new upstream bugfix release 2.3.12, add "stats" to rc script.

* Upstream changes:
<https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn23#OpenVPN2.3.12>
* The cmocka-based unit tests are currently disabled, too much hassle
  and deps to get them running.
* Add patch-configure to drop the unit-test related warnings.
* Extend run control script to understand the "stats" argument, to send
  SIGUSR2 to the process, contributed by Anton Yuzhaninov (with one
  additional line fold).
* Drop patch-629baad8, no longer needed.
* Refresh other patches with make clean extract do-patch makepatch

Fix PolarSSL-based builds.

The upstream backported a change from the master branch that fixes the
PolarSSL-based builds to go with the PolarSSL 1.3.X built-in defaults.

Add a patch picked from the upstream's release/2.3 branch.
Remove the BROKEN= line and conditional.

No PORTREVISION bump because the patch only affects an option that was
formerly marked BROKEN.

(TRYBROKEN users need to force a rebuild and reinstallation manually.)

Security upgrade to OpenVPN 2.3.11, breaking POLARSSL option.

Quoting upstream maintainers' release notes:
"This release fixes two vulnerabilities: a port-share bug with DoS
potential and a buffer overflow by user supplied data when using pam
authentication. In addition a number of small fixes and improvements are
included."

WARNING: this upgrade breaks the PolarSSL-based build due to an
oversight in the cipher suite selection hardening, crashing
PolarSSL-based builds with a 0-pointer deferences.
Marking port BROKEN if POLARSSL is set.

Changelog: https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn23

One more fix for /usr/sbin/service -R.

Work around 10.3-RELEASE's service(8) shortcomings

PR:		208534
Reported by:	allan@saddi.com

Remove ${PORTSDIR}/ from dependencies, categories r, s, t, and u.

With hat:	portmgr
Sponsored by:	Absolight

Add an 'up' script for resolvconf integration, ...

contributed by Bapt@, but not yet touched up.
Needs proper license notice and documentation.
Therefore not yet linked to the build/install.

Upgrade to new upstream release 2.3.10.

Now requires PolarSSL/mbedTLS 1.3.X with X >= 8, PolarSSL 1.2 is EOL.
Match help text to the change.

Make sure the build uses the local unpacked includes before the system
includes, such that portmaster/portupgrade upgrades for PolarSSL work if
2.3.9 or older is pre-installed on the build system.

Update to new upstream release 2.3.9.

Removes the PW_SAVE option, the upstream code always permits saving
passwords to files now (so the feature is always enabled).

ChangeLog:
<https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn23#OpenVPN2.3.9>

Add optional extra patch for Tunnelblick obfuscation.

Adds a --scramble method to the executable but not documentation.
Requires careful review of implications before enabling, and has not
been accepted upstream.  https://tunnelblick.net/cOpenvpn_xorpatch.html

PR:		200215
Submitted by:	Franco Fichtner

Handle OpenSSL/PolarSSL options in the right way,

such that it is maintainable if we add more SSL libs in the future.

To fix fall-out from r399858 and r399982.

Fix build without POLARSSL.

Pointy hat to:	mat
Sponsored by:	Absolight

Use options helpers.

Sponsored by:	Absolight

Bugfix upgrade to new upstream release 2.3.8.

ChangeLog:
https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn23#OpenVPN2.3.8

By default libtool replaces -export-symbols <file> with -retain-symbols-file
<file> on ELF systems, but this doesn't really do what -export-symbols is
meant to do.  On GNU ELF systems it converts <file> to a simple version
script first and then uses -version-script instead of -retain-symbols-file.
Let USES=libtool patch libtool scripts to do this on all systems with GNU
ld(1).

Bump PORTREVISION on all ports where the build log contains -export-symbols.

audio/calf: This port builds a module that now exports only one function,
but it also builds a number of executables that link to this module and
expect to see other functions.  Because it's already a bit dodgy to link to
a module (libtool warns about this) let the module continue to export only
one function and instead build an ordinary library from the same source that
the executables can link to.  Fix a number of other issues in the same

Add an openvpn-polarssl that selects PolarSSL for its default TLS provider.

Update to new upstream release 2.3.7.

Fixes
PR:		194745

Add experimental patch by Gert Doring to fix PR #194745.
Must be enabled through the options framework ("make config").

PR:		194745

+ Update patch set for crypto engine fix [1].
  Change option name so it is presented anew, default disabled.

+ Add openvpn-client wrapper script and up/down scripts to trigger
  resolvconf, with minor edits. [2]

+ Set proper PLUGIN_LIBDIR so that plugins in the default directory can
  be found with relative paths.

+ Compile shipped plugins with -fPIC.

PR:		195004 [1]
PR:		199529 [2]
Submitted by:	yuri@rawbw.com [2]
Obtained from:	https://community.openvpn.net/openvpn/ticket/480#comment:21

Specify library version when depending on libpolarssl and switch ports to
PolarSSL 1.3 when they fail to build with 1.2.

Add an experimental patch for bug #195004.
Needs to be enabled through a port option.

PR: 195004

Add a X509ALTUSERNAME port option to enable the --x509-username-field
run-time option.

Bump PORTREVISION.

PR:		198896
Submitted by:	bastian+freebsd.org@waldi.eu.org

Add CPE data.

Requested by:	des

Security Update to 2.3.6.

Approved by:	so
MFH:		2014Q4
Security:	23ab5c3e-79c3-11e4-8b1e-d050992ecde8

Add three patches from Git to unwedge the build after certs expired,
and two other fixes (bumping PORTREVISION):

44294568 Fix assertion error when using --cipher none
e9b07dc9 Fix to --shaper documentation on the man-page
b77c27a1 Modernize sample keys and sample configs

Upgrade to new upstream release 2.3.5.

Changelog: https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn23

While here, drop @dirrm from pkg-plist.

Add DOCS to OPTIONS_DEFINE to ports that check for PORT_OPTIONS:MDOCS.

Update to new upstream release 2.3.4.
Changes:
<https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn23#OpenVPN2.3.4>

Add USES=libtool and drop .la files.

Upgrade to new upstream 2.3.3 release. Misc bugfixes.

Changes:
<https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn23#OpenVPN2.3.3>

Note that PKCS#11 helper support requires a pkcs11-helper upgrade from
<http://www.freebsd.org/cgi/query-pr.cgi?pr=188442> to be committed.

Fix several compilation issues where the upstream's configure script
required pkg-config, for instance, the PKCS11 option.

Submitted by:	mat@

- Repair PKCS11 option [1].
- Use the opportunity to simplify Makefile: leverage some of the
  OptionsNG and Staging features, removing our homebrew predecessors.
- QA: Strip .so libraries, fix shebang paths in samples.

Obtained from:	<https://forums.freebsd.org/viewtopic.php?f=7&t=44866> [1]

Fix self-tests and their non-fatal auto-skip on RedPorts.

Add patch-tests__t_cltsrv.sh to properly skip self-tests when no
inet/inet6 addresses are available, and to properly use udp6 when only
inet6 is available (for instance, on RedPorts).

Drop patch-src__openvpn__syshead.h, had already been integrated upstream.

PR:		ports/185439 (related)

Convert from port-specific to official STAGEDIR support.

Add NO_STAGE all over the place in preparation for the staging support (cat:
security)

Update to new upstream release

2013.05.31 -- Version 2.3.2
Arne Schwabe (3):
      Only print script warnings when a script is used. Remove stray mention of
script-security system.
      Move settings of user script into set_user_script function
      Move checking of script file access into set_user_script

Davide Brini (1):
      Provide more accurate warning message

Gert Doering (2):
      Fix NULL-pointer crash in route_list_add_vpn_gateway().
      Fix problem with UDP tunneling due to mishandled pktinfo structures.

security upgrade to OpenVPN 2.3.1; upstream release notes are

  "This release adds supports for PolarSSL 1.2. It also adds a fix to
  prevent potential side-channel attacks by switching to a constant-time
  memcmp when comparing HMACs in the openvpn_decrypt function. In
  addition, it contains several bugfixes and documentation updates, as
  well as some minor enhancements."

Full ChangeLog:
<https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn23>

The port upgrade also offers an option to use the GPLv2+-licensed
PolarSSL instead of OpenSSL (which brings in a license mix).

PR:		ports/177517
Reviewed by:	miwi
Approved by:	portmgr (miwi)
Security:	92f30415-9935-11e2-ad4c-080027ef73ec

- When installing from port, do not tamper with permissions of other files
  in ${PREFIX}/sbin and ${PREFIX}/lib. [1]

- Do not install plugin .la/.so files with the executable bit set, they
  are not executable.

PR:		ports/175434 [1]
Submitted by:	Benjamin Lorenz [1]

- Fix NOPORTDOCS regression [1], by installing to DESTDIR= and then installing
from
  there, rather than tweaking the Makefiles.
- Move examples to EXAMPLESDIR, and heed NOPORTEXAMPLES
- Remove a leftover SUB_LIST addition.
- Switch comment to my FreeBSD e-mail address.
- Use PORTDOCS=* and PORTEXAMPLES=* to remove pkg-plist cruft
- Sort PORT_OPTIONS .ifs and stuff.

PR:		ports/175283 [1]
Submitted by:	Alexey Markov [1]

Add a new security/easy-rsa package that contains the bits that got
split out of OpenVPN prior to the current 2.3.0 release, and make that
security/openvpn RUN_DEPENDS on it. Also update UPDATING record.

OpenVPN changes, upgrades and fixes:

- Upgrade security/openvpn to v2.3.0 (changes installed layout a bit),
  splitting and re-diffing patches.
- Retain v2.2.2 as security/openvpn22
- Mark security/openvpn20 as deprecated and to expire 6 months from now
- Fix TCP_NODELAY option (openvpn 2.3, 2.2), see
  <http://community.openvpn.net/openvpn/ticket/158>
- Fix PassTOS option (openvpn 2.2, 2.0), see
  http://community.openvpn.net/openvpn/ticket/135

- Convert to OptionsNG
- Strip Makefile header
- Drop LIB_DEPENDS ABI versions

Move the rc.d scripts of the form *.sh.in to *.in

Where necessary add $FreeBSD$ to the file

No PORTREVISION bump necessary because this is a no-op

In the rc.d scripts, change assignments to rcvar to use the
literal name_enable wherever possible, and ${name}_enable
when it's not, to prepare for the demise of set_rcvar().

In cases where I had to hand-edit unusual instances also
modify formatting slightly to be more uniform (and in
some cases, correct). This includes adding some $FreeBSD$
tags, and most importantly moving rcvar= to right after
name= so it's clear that one is derived from the other.

Update to new upstream release v2.2.2.

Changelog:
http://openvpn.net/index.php/open-source/documentation/change-log/425-changelog-for-openvpn-22.html

Remove more tags from pkg-descr files fo the form:

- Name
em@i.l

or variations thereof. While I'm here also fix some whitespace and other
formatting errors, including moving WWW: to the last line in the file.

Update and demote CONFLICTS to CONFLICTS_INSTALL.

Use required_modules rather than _precmd.

To fix failures with 'restart'.

Reported by: Miroslav Lachman

Fix skipping t_cltsrv when IP missing. Really this time.

Cause was a   trap "... ; exit 1" 0   shell construct that needs to be
cancelled for the exit 77 to take effect. trap 0 inserted to that end.

Fix NOPORTDOCS support, though differently than suggested

Reported by: pgollucci
PR:          ports/159610

Skip self-test more readily without addresses.

- Turn off self-tests on pointyhat, they fail

Reported by:    pointyhat

Avoid jamming the build if the jail is without address, skip self-test.

Update to upstream release 2.2.1.

NOTE: the easy-rsa/2.0 openssl.cnf file has been removed and replaced by
an openssl-0.9.8.cnf and an openssl-1.0.0.cnf file.

Changelog URL:
http://openvpn.net/index.php/open-source/documentation/change-log/425-changelog-for-openvpn-22.html

Patch hardwired gcc to ${CC}, fixing clang-ports builds [1].
Use full ${MAKE} environment from do-build, for consistency.

Found by: -exp run [1].

Remove painful examples of foo="", with particular prejudice against
constructions that parse out to [ -z "$foo" ] && foo=""

These are bad examples that get copied and pasted into new code, so the
hope is that with less bad examples there will be less need for me to
bring this up in review.

In a few of these files all that were changed were comments so that next
time I search for these patterns I won't trip on the file for no reason.

In a few places, add $FreeBSD$

No functional changes, so no PORTREVISION bumps

Remove support for lzo-1.

Update to 2.2.0. Add LICENSE (GPLv2). Add a local mirror of the distfile (file
has been uploaded and will propagate soonish).

Changelog:
http://openvpn.net/index.php/open-source/documentation/change-log/425-changelog-for-openvpn-22.html

Streamline a bit:
- remove subshell to use basename, and use ## substitution [1]
- remove FreeBSD 5.X compatibility comment [1]
- remove FreeBSD 5.X compatibility code

The parts marked with [1] above were
Submitted by: dougb (Doug Barton)

Switch to XZ distribution format.

Update to new upstream release 2.1.4.
Update MASTER_SITES.

Submitted by: Eric F. Crist <ecrist@secure-computing.net>
PR: ports/151962

Update to 2.1.3

No functional changes, but avoids 'have you seen new release'
type mail flood. :)

Update to new upstream version 2.1.2.

Contains various bugfixes and improvements.

Add openvpn-beta-[0-9]* to CONFLICTS variable.

Submitted by: Eric F. Crist
PR: ports/149617

Support /etc/rc.d/openvpn softrestart
to send SIGUSR1 (rather than SIGHUP) to OpenVPN processes.

Suggested by: Nick Hibma (in private email)

Fix bashisms (source FILE -> . FILE)
replace shebang-lines /bin/bash -> /bin/sh
bump portrevision (changed files)

based on:
PR: ports/147472
Submitted by: Olli Hauer <ohauer@gmx.de>

Approved by: miwi (mentor)

RC_SUBR_SUFFIX has not been needed for a long time now, all supported
versions of FreeBSD now use /etc/rc.subr and rc.d scripts without .sh
appended to the script name.

Begin the process of deprecating sysutils/rc_subr by
s#. %%RC_SUBR%%#. /etc/rc.subr#

Move security/openvpn to security/openvpn20 (after previous repocopy).
Update security/openvpn20 to 2.0.9, revising pkg-message.

Move security/openvpn-devel to security/openvpn and
update security/openvpn to 2.1.1.

Remove security/openvpn-devel, adding a MOVED entry.

Update security/Makefile to remove openvpn-devel and add openvpn20 to
SUBDIRS.

Add a UPDATING entry for this shuffle.  Currently without upgrade
instructions since neither portupgrade nor portmaster are up to the
task (because of the CONFLICTS).

Approved by:  garga@ (mentor)

Fix a few "bad example" problems in the rc.d scripts that have been
propogated by copy and paste.

1. Primarily the "empty variable" default assignment, which is mostly
${name}_flags="", but fix a few others as well.
2. Where they are not already documented, add the existence of the _flags
(or other deleted empties) option to the comments, and in some cases add
comments from scratch.
3. Replace things that look like:
prefix=%%PREFIX%%
command=${prefix}/sbin/foo
to just use %%PREFIX%%. In many cases the $prefix variable is only used
once, and in some cases it is not used at all.
4. In a few cases remove ${name}_flags from command_args
5. Remove a long-stale comment about putting the port's rc.d script in
/etc/rc.d (which is no longer necessary).

No PORTREVISION bumps because all of these changes are noops.

- Add logging knob

PR:             ports/130893
Submitted by:   Michael Scheidell <scheidell@secnap.net>
Approved by:    Matthias Andree <matthias.andree@gmx.de> (maintainer)

Update CONFIGURE_ARGS for how we pass CONFIGURE_TARGET to configure script.
Specifically, newer autoconf (> 2.13) has different semantic of the
configure target. In short, one should use --build=CONFIGURE_TARGET
instead of CONFIGURE_TARGET directly. Otherwise, you will get a warning
and the old semantic may be removed in later autoconf releases.

To workaround this issue, many ports hack the CONFIGURE_TARGET variable
so that it contains the ``--build='' prefix.

To solve this issue, under the fact that some ports still have
configure script generated by the old autoconf, we use runtime detection
in the do-configure target so that the proper argument can be used.

Changes to Mk/*:
 - Add runtime detection magic in bsd.port.mk

- Force commit to correct the previous commit log:

Correct permissions/owner of DOCSDIR-installed files

PR:             125726 / 125727
Request by:     maintainer via im

- Respect NOPORTDOCS

PR:             125726
Submitted by:   Matthias Andree <matthias.andree@gmx.de> (maintainer)

- Run opensvn with --daemon ${name} in order to get distinguishable and
  useful syslog tags

PR:             ports/120862
Submitted by:   Matthias Andree <matthias.andree at gmx.de> (maintainer)

Remove spurious empty BEFORE: lines

Approved by:    maintainer

rcfile:
- fix for FreeBSD releases before rcorder integration
- update copyright notice
- replace shell backticks by $().

Port:
- bump revision
- reformat comment

PR:             ports/109856
Submitted by:   Matthias Andree <matthias.andree@gmx.de> (maintainer)
Approved by:    miwi (mentor)

Fix a bug I introduced with last commit which resulted in openvpn not
being started during boot. The reason for this is that at boot $0 is not
/usr/local/etc/rc.d/openvpn but /etc/rc. The fix is a bit hackish because
it retrieves the script name from $_file - variable used in run_rc_script().

Reported by:    bazzoola <bazzoola@gmail.com>

use $() instead of ``

Requested by:   Matthias Andree <matthias.andree@gmx.de> (maintainer)

* Add support for running multiple instances of openvpn to the startup script
  Inspired by [1]
* Bump PORTREVISION
* Update the comment which says not to send notices about 2.0.8 to 2.0.9 since
  2.0.9 also introduces only Windows changes. Remove maintainer's name from
  this comment since he did not explicitly state this.

PR:             ports/108371 [1]
Submitted by:   Denis Shaposhnikov <dsh@vlink.ru>, Gleb Kozyrev
<gkozyrev@gmail.com> [1]
Approved by:    matthias.andree@gmx.de (maintainer timeout, 28 days)

- Use newly added RC_SUBR_SUFFIX

Approved by:    Matthias Andree <matthias.andree at gmx.de> (maintainer)

- Fix build failures that arose from an accidentally omitted -fPIC.
- Portrevision bumped since the change affects all architectures,
  not just those that were failing.

PR:             ports/103863
Submitted by:   Matthias Andree <matthias.andree@gmx.de> (maintainer)
Reported by:    pointyhat

- Install additional auth-pam plugin

PR:             ports/103833
Submitted by:   Matthias Andree <matthias.andree at gmx.de> (maintainer)
Suggested by:   Michael Helmeste
Tested by:      Michael Helmeste

- Update comments for OpenVPN 2.0.8

PR:             ports/103243
Submitted by:   Matthias Andree <matthias.andree at gmx.de> (maintainer)

- conflicts with openvpn-devel-[0-9]*
- bump PORTREVISION

PR:             ports/102301
Submitted by:   Matthias Andree (maintainer)

1 - build and install lib/openvpn-down-root.so plugin (see --plugin option in
    the man page) and README.openvpn-down-root
2 - match rc.d filename as printed post install in pkg-message to actual file
    name on newer systems (which use openvpn rather than openvpn.sh)
Reported by:    Jean-Baptiste Quenot (Bcc'd)
The maintainer wishes to thank Jean-Baptiste for his report and patience.
3 - add a pkg-req script to prevent installation of 6.1 packages on older
    machines, which is a frequent source of "rc.d script doesn't work"
    complaints.

Added file(s):
- files/pkg-req.in

PR:             ports/100917
Submitted by:   Matthias Andree (maintainer)

Add a message explaining why it won't be upgraded to 2.0.7 version, to
prevent a lot of people asking maintainer about it:

# -----------------------------------------------------
# DO NOT BOTHER TO SEND NOTICES ABOUT 2.0.7 AS IT FIXES
# A WINDOWS-ONLY BUG THAT DOESN'T AFFECT *BSD AND THUS
# DOES NOT WARRANT A PORT UPGRADE! AND UPGRADE REQUESTS
# WILL BE DROPPED.       -- Matthias Andree, 2006-04-26
# -----------------------------------------------------

PR:             ports/96383
Submitted by:   maintainer

- Update to 2.0.6
  * security fix for client LD_PRELOAD code injection vulnerability
    through compromised upstream servers
    (FreeBSD VuXML Vuln VID be4ccb7b-c48b-11da-ae12-0002b3b60e4c,
     filed in separate PR)
    CVE id not known yet
  * 2 other changes only relevant for Linux and NetBSD, not detailed here.

PR:             ports/95345
Submitted by:   maintainer
Security:       VuXML be4ccb7b-c48b-11da-ae12-0002b3b60e4c

Fix FreeBSD 4 jail build

PR:             ports/93833
Patch by:       dinoex
Submitted by:   Matthias Andree <matthias.andree@gmx.de> (maintainer)
Approved by:    portmgr (marcus)

Remove the FreeBSD KEYWORD from all rc.d scripts where it appears.
We have not checked for this KEYWORD for a long time now, so this
is a complete noop, and thus no PORTREVISION bump. Removing it at
this point is mostly for pedantic reasons, and partly to avoid
perpetuating this anachronism by copy and paste to future scripts.

- CATEGORY CHANGE: add "net" secondary category
- fix jail build on FreeBSD 4 (no security.jail.jailed oid in sysctl)
- catch jail IP misconfiguration and print clear error message
- add SHA256 checksum
- revise pkg-message and pkg-descr

PR:             ports/88785
Submitted by:   maintainer

Enables self-tests with WITH_JAIL
Bump PORTREVISION

PR:             88488
Submitted by:   Matthias Andree <matthias.andree@gmx.de> (maintainer)

- Update to 2.0.5

PR:             ports/88437
Submitted by:   maintainer

Update to 2.0.4

PR:             88379
Submitted by:   Matthias Andree <matthias.andree@gmx.de> (maintainer)
Security:       CVE-2005-3393, CVE-2005-3409

- fix build in jail

maintainer emailed 2005-10-04
Approved by:    (maintainer timeout)

FreeBSD 6 no longer adds debug.if_* sysctl variables in its default kernel
(according to the release notes), so our heuristic assumes the module is
missing and tries to load it, which fails as the module already exists.

PR:             ports/86286
Submitted by:   maintainer

- Update to 2.0.2 that brings these upstream changes:

  - fix bug that would exhaust file descriptors as the routing table was
modified
    (this had already been part of the port previously)
  - fix bug that would block the management socket until the peer connected
  - fix pkitool sh incompatibilities (from NetBSD)

PR:             ports/85299
Submitted by:   maintainer

Fix a typo in the new rc file, where documentation didn't match the
actual variables.

PR:             ports/85156
Submitted by:   maintainer
Reported by:    Benjamin Lutz <benlutz@datacomm.ch>
Approved by:    portmgr (krion)

- Security update to version 2.0.1, fixing four denial of service bugs,
  CAN-2005-2531, CAN-2005-2532, CAN-2005-2533, CAN-2005-2534
- Drop old init script and add a modern rcNG script in its place,
  requested by Matthias Grimm and Dirk Gouders (although the script below is
  one I, Matthias Andree, wrote). It can automatically load tun/tap drivers.
- move pkg-message to files/pkg-message.in, revise it, list it in SUB_FILES
  to expand ${PREFIX}.
- print pkg-message after installation from port
- switch to official "make check" as smoke-test, rather than wiring our own.
- prefer LZO2 in most situations, as OpenVPN will pick up LZO2 rather than
  LZO1 if both are installed.

PR:             ports/85109
Submitted by:   maintainer
Approved by:    portmgr (krion)