[Openvpn-commits] sf.net git: OpenVPN main development repository branch, release/2.2, updated. v2.2.0-5-g05485d7

[<ope...@li...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenVPN main development repository".

The branch, release/2.2 has been updated
       via  05485d7f7733ba498262abc127795910fda0d0bb (commit)
       via  4fe914a0ef0424144df3b12de19f2166fc613a0c (commit)
      from  e1f2f5f61e5be20be9abd9c747fa83e8189d34c8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 05485d7f7733ba498262abc127795910fda0d0bb
Author: David Sommerseth <da...@re...>
Date:   Tue May 31 16:59:30 2011 +0200

    Fix compiling issues with pkcs11 when --disable-management is configured
    
    pkcs11.c seems to miss some header files which gets implicitly added when
    the management interface is enabled.
    
    Signed-off-by: David Sommerseth <da...@re...>
    Tested-by: Mr Dash Four <mr....@go...>
    (cherry picked from commit efcdf594f81a6af34b72285c12bacbce35c14b2d)

commit 4fe914a0ef0424144df3b12de19f2166fc613a0c
Author: David Sommerseth <da...@re...>
Date:   Thu May 26 10:16:59 2011 +0200

    Don't define ENABLE_PUSH_PEER_INFO if SSL is not available
    
    The push_peer_info feature depends on the SSL infrastructure and openvpn
    will fail to build if ./configure --disable-crypto --disable-ssl is
    used.  The solution is to not define ENABLE_PUSH_PEER_INFO if we don't
    have crypto/ssl.
    
    Signed-off-by: David Sommerseth <da...@re...>
    Acked-by: Gert Doering <ge...@gr...>
    (cherry picked from commit 21fc2edfc49bcc903d5cfb74c1ba2f41ac8771f0)

-----------------------------------------------------------------------

Summary of changes:
 pkcs11.c  |    2 ++
 syshead.h |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
OpenVPN main development repository