Date: Wed, 24 Aug 2016 22:33:26 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420825 - in head/security/openvpn: . files Message-ID: <201608242233.u7OMXQUX049616@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Wed Aug 24 22:33:25 2016 New Revision: 420825 URL: https://svnweb.freebsd.org/changeset/ports/420825 Log: 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 Added: head/security/openvpn/files/patch-configure (contents, props changed) Deleted: head/security/openvpn/files/patch-629baad8 Modified: head/security/openvpn/Makefile head/security/openvpn/distinfo head/security/openvpn/files/openvpn.in head/security/openvpn/files/patch-sample__sample-config-files__loopback-client head/security/openvpn/files/patch-sample__sample-config-files__loopback-server head/security/openvpn/files/patch-tests__t_cltsrv.sh Modified: head/security/openvpn/Makefile ============================================================================== --- head/security/openvpn/Makefile Wed Aug 24 20:23:18 2016 (r420824) +++ head/security/openvpn/Makefile Wed Aug 24 22:33:25 2016 (r420825) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openvpn -DISTVERSION= 2.3.11 +DISTVERSION= 2.3.12 CATEGORIES= security net MASTER_SITES= http://swupdate.openvpn.net/community/releases/ \ http://build.openvpn.net/downloads/releases/ @@ -19,6 +19,8 @@ USES= cpe libtool pkgconfig shebangfix SHEBANG_FILES= sample/sample-scripts/verify-cn \ sample/sample-scripts/auth-pam.pl \ sample/sample-scripts/ucn.pl +# avoid picking up CMAKE, we don't have cmocka anyways. +CONFIGURE_ARGS+= CMAKE="" # let OpenVPN's configure script pick up the requisite libraries, # but do not break the plugin build if an older version is installed @@ -53,7 +55,7 @@ X509ALTUSERNAME_CONFIGURE_ENABLE= x509-a X509ALTUSERNAME_PREVENTS= POLARSSL X509ALTUSERNAME_PREVENTS_MSG= OpenVPN ${DISTVERSION} cannot use --x509-username-field with PolarSSL. Disable X509ALTUSERNAME, or use OpenSSL instead -OPENSSL_USE= openssl=yes +OPENSSL_USES= ssl OPENSSL_CONFIGURE_ON= --with-crypto-library=openssl # Pin the libmbedtls version because the 2.3.x port can't work with .so.10 or Modified: head/security/openvpn/distinfo ============================================================================== --- head/security/openvpn/distinfo Wed Aug 24 20:23:18 2016 (r420824) +++ head/security/openvpn/distinfo Wed Aug 24 22:33:25 2016 (r420825) @@ -1,2 +1,3 @@ -SHA256 (openvpn-2.3.11.tar.xz) = 0f5f1ca1dc5743fa166d93dd4ec952f014b5f33bafd88f0ea34b455cae1434a7 -SIZE (openvpn-2.3.11.tar.xz) = 833496 +TIMESTAMP = 1472073931 +SHA256 (openvpn-2.3.12.tar.xz) = 13b963414e2430215981868c77b9795d93653ee535a2d73576f7bb2c28200abc +SIZE (openvpn-2.3.12.tar.xz) = 827756 Modified: head/security/openvpn/files/openvpn.in ============================================================================== --- head/security/openvpn/files/openvpn.in Wed Aug 24 20:23:18 2016 (r420824) +++ head/security/openvpn/files/openvpn.in Wed Aug 24 22:33:25 2016 (r420825) @@ -101,10 +101,18 @@ softrestart() exit $? } +openvpn_stats() +{ + sig_reload=USR2 + run_rc_command ${rc_prefix}reload $rc_extra_args +} + # reload: support SIGHUP to reparse configuration file # softrestart: support SIGUSR1 to reconnect without superuser privileges -extra_commands="reload softrestart" +# stats: support SIGUSR2 to write statistics to the syslog +extra_commands="reload softrestart stats" softrestart_cmd="softrestart" +stats_cmd="openvpn_stats" # pidfile pidfile="/var/run/${name}.pid" Added: head/security/openvpn/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvpn/files/patch-configure Wed Aug 24 22:33:25 2016 (r420825) @@ -0,0 +1,11 @@ +--- configure.orig 2016-08-23 14:19:07 UTC ++++ configure +@@ -17160,8 +17160,6 @@ fi + $as_echo "!! WARNING !! The cmoka git submodule has not been initialized or updated. Unit testing cannot be performed." >&6; } + fi + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: !! WARNING !! CMake is NOT available. Unit testing cannot be performed." >&5 +-$as_echo "!! WARNING !! CMake is NOT available. Unit testing cannot be performed." >&6; } + if false; then + CMOCKA_INITIALIZED_TRUE= + CMOCKA_INITIALIZED_FALSE='#' Modified: head/security/openvpn/files/patch-sample__sample-config-files__loopback-client ============================================================================== --- head/security/openvpn/files/patch-sample__sample-config-files__loopback-client Wed Aug 24 20:23:18 2016 (r420824) +++ head/security/openvpn/files/patch-sample__sample-config-files__loopback-client Wed Aug 24 22:33:25 2016 (r420825) @@ -1,4 +1,4 @@ ---- sample/sample-config-files/loopback-client.orig 2014-11-29 14:59:45 UTC +--- sample/sample-config-files/loopback-client.orig 2016-08-23 14:16:22 UTC +++ sample/sample-config-files/loopback-client @@ -9,8 +9,8 @@ # ./openvpn --config sample-config-files/loopback-client (In one window) Modified: head/security/openvpn/files/patch-sample__sample-config-files__loopback-server ============================================================================== --- head/security/openvpn/files/patch-sample__sample-config-files__loopback-server Wed Aug 24 20:23:18 2016 (r420824) +++ head/security/openvpn/files/patch-sample__sample-config-files__loopback-server Wed Aug 24 22:33:25 2016 (r420825) @@ -1,4 +1,4 @@ ---- sample/sample-config-files/loopback-server.orig 2014-11-29 14:59:45 UTC +--- sample/sample-config-files/loopback-server.orig 2016-08-23 14:16:22 UTC +++ sample/sample-config-files/loopback-server @@ -9,8 +9,8 @@ # ./openvpn --config sample-config-files/loopback-client (In one window) Modified: head/security/openvpn/files/patch-tests__t_cltsrv.sh ============================================================================== --- head/security/openvpn/files/patch-tests__t_cltsrv.sh Wed Aug 24 20:23:18 2016 (r420824) +++ head/security/openvpn/files/patch-tests__t_cltsrv.sh Wed Aug 24 22:33:25 2016 (r420825) @@ -1,4 +1,4 @@ ---- tests/t_cltsrv.sh.orig 2014-11-29 14:59:46 UTC +--- tests/t_cltsrv.sh.orig 2016-08-23 13:10:22 UTC +++ tests/t_cltsrv.sh @@ -1,7 +1,7 @@ #! /bin/sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608242233.u7OMXQUX049616>