[pkgsrc/trunk]: pkgsrc add an option to openvpn to enable using certificates ...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/118f4e608d9d
branches:  trunk
changeset: 399511:118f4e608d9d
user:      spz <spz%pkgsrc.org@localhost>
date:      Mon Sep 21 12:33:31 2009 +0000

description:
add an option to openvpn to enable using certificates on USB sticks
or cards (etc) that are using the PKCS11 protocol

diffstat:

 mk/defaults/options.description      |   1 +
 net/openvpn/Makefile                 |   8 ++++----
 net/openvpn/options.mk               |  16 ++++++++++++++++
 security/pkcs11-helper/buildlink3.mk |   3 +--
 4 files changed, 22 insertions(+), 6 deletions(-)

diffs (74 lines):

diff -r cff660974ebc -r 118f4e608d9d mk/defaults/options.description
--- a/mk/defaults/options.description   Mon Sep 21 10:56:52 2009 +0000
+++ b/mk/defaults/options.description   Mon Sep 21 12:33:31 2009 +0000
@@ -350,6 +350,7 @@
 pgsql                  Enable PostgreSQL support.
 pinepwd                        Enable $HOME/.pinepwd stored IMAP password file.
 pinfo-native-curses    Use NetBSD native curses rather than ncurses.
+pkcs11                 Use certificate-on-a-stick (or card) support.
 png                    Enable PNG support.
 postfix-milter         Build the milter with support for the Postfix MTA.
 postfix-stress         Enable Postfix stress-adaptive behaviour.
diff -r cff660974ebc -r 118f4e608d9d net/openvpn/Makefile
--- a/net/openvpn/Makefile      Mon Sep 21 10:56:52 2009 +0000
+++ b/net/openvpn/Makefile      Mon Sep 21 12:33:31 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/05/19 08:59:27 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2009/09/21 12:33:31 spz Exp $
 #
 
 DISTNAME=      openvpn-2.1_rc13
@@ -59,9 +59,8 @@
 SUBST_STAGE.pkitool=   post-build
 SUBST_MESSAGE.pkitool= Fixing up default paths to grep & openssl in pkitool.
 SUBST_FILES.pkitool=   easy-rsa/2.0/pkitool
-SUBST_SED.pkitool=     \
-       -e "s|\\(GREP\\)=.*|\\1=\""${GREP:Q}"\"|"                       \
-       -e "s|\\(OPENSSL\\)=.*|\\1=\""${SSLBASE:Q}/bin/openssl"\"|"
+SUBST_SED.pkitool=     -e "s|\\(GREP\\)=.*|\\1=\""${GREP:Q}"\"|"
+SUBST_SED.pkitool+=  -e "s|\\(OPENSSL\\)=.*|\\1=\""${SSLBASE:Q}/bin/openssl"\"|"
 
 post-install:
        cd ${WRKSRC:Q}/easy-rsa/2.0; for file in [a-zR]*; do            \
@@ -82,4 +81,5 @@
                ${INSTALL_DATA} $$file ${DESTDIR}${EGDIR:Q}/keys;       \
        done
 
+.include "options.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r cff660974ebc -r 118f4e608d9d net/openvpn/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/openvpn/options.mk    Mon Sep 21 12:33:31 2009 +0000
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2009/09/21 12:33:31 spz Exp $
+
+PKG_OPTIONS_VAR=        PKG_OPTIONS.openvpn
+PKG_SUPPORTED_OPTIONS=  pkcs11
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+# include support for certificates on a stick (or card)
+
+.if !empty(PKG_OPTIONS:Mpkcs11)
+.include "../../security/pkcs11-helper/buildlink3.mk"
+.else
+# it would pick it up halfways when installed, and fail building
+CONFIGURE_ARGS+= --disable-pkcs11
+.endif
diff -r cff660974ebc -r 118f4e608d9d security/pkcs11-helper/buildlink3.mk
--- a/security/pkcs11-helper/buildlink3.mk      Mon Sep 21 10:56:52 2009 +0000
+++ b/security/pkcs11-helper/buildlink3.mk      Mon Sep 21 12:33:31 2009 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.1 2009/09/15 20:03:47 spz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/09/21 12:33:31 spz Exp $
 
 BUILDLINK_TREE+=       pkcs11-helper
 
 .if !defined(PKCS11_HELPER_BUILDLINK3_MK)
 PKCS11_HELPER_BUILDLINK3_MK:=
 
-BUILDLINK_DEPMETHOD.pkcs11-helper?=    build
 BUILDLINK_API_DEPENDS.pkcs11-helper+=  pkcs11-helper>=1.06
 BUILDLINK_PKGSRCDIR.pkcs11-helper?=    ../../security/pkcs11-helper