package/network/services/openvpn-easy-rsa/patches/100-run-ootb.patch

   1 --- a/easy-rsa/2.0/build-ca
   2 +++ b/easy-rsa/2.0/build-ca
   3 @@ -5,4 +5,4 @@
   4  #
   5
   6  export EASY_RSA="${EASY_RSA:-.}"
   7 -"$EASY_RSA/pkitool" --interact --initca $*
   8 +"/usr/sbin/pkitool" --interact --initca $*
   9 --- a/easy-rsa/2.0/build-dh
  10 +++ b/easy-rsa/2.0/build-dh
  11 @@ -1,5 +1,7 @@
  12  #!/bin/sh
  13
  14 +. /etc/easy-rsa/vars
  15 +
  16  # Build Diffie-Hellman parameters for the server side
  17  # of an SSL/TLS connection.
  18
  19 --- a/easy-rsa/2.0/build-inter
  20 +++ b/easy-rsa/2.0/build-inter
  21 @@ -4,4 +4,4 @@
  22  # root certificate.
  23
  24  export EASY_RSA="${EASY_RSA:-.}"
  25 -"$EASY_RSA/pkitool" --interact --inter $*
  26 +"/usr/sbin/pkitool" --interact --inter $*
  27 --- a/easy-rsa/2.0/build-key
  28 +++ b/easy-rsa/2.0/build-key
  29 @@ -4,4 +4,4 @@
  30  # root certificate.
  31
  32  export EASY_RSA="${EASY_RSA:-.}"
  33 -"$EASY_RSA/pkitool" --interact $*
  34 +"/usr/sbin/pkitool" --interact $*
  35 --- a/easy-rsa/2.0/build-key-pass
  36 +++ b/easy-rsa/2.0/build-key-pass
  37 @@ -4,4 +4,4 @@
  38  # with a password.
  39
  40  export EASY_RSA="${EASY_RSA:-.}"
  41 -"$EASY_RSA/pkitool" --interact --pass $*
  42 +"/usr/sbin/pkitool" --interact --pass $*
  43 --- a/easy-rsa/2.0/build-key-pkcs12
  44 +++ b/easy-rsa/2.0/build-key-pkcs12
  45 @@ -5,4 +5,4 @@
  46  # the CA certificate as well.
  47
  48  export EASY_RSA="${EASY_RSA:-.}"
  49 -"$EASY_RSA/pkitool" --interact --pkcs12 $*
  50 +"/usr/sbin/pkitool" --interact --pkcs12 $*
  51 --- a/easy-rsa/2.0/build-key-server
  52 +++ b/easy-rsa/2.0/build-key-server
  53 @@ -7,4 +7,4 @@
  54  # extension in the openssl.cnf file.
  55
  56  export EASY_RSA="${EASY_RSA:-.}"
  57 -"$EASY_RSA/pkitool" --interact --server $*
  58 +"/usr/sbin/pkitool" --interact --server $*
  59 --- a/easy-rsa/2.0/build-req
  60 +++ b/easy-rsa/2.0/build-req
  61 @@ -4,4 +4,4 @@
  62  # when your root certificate and key is not available locally.
  63
  64  export EASY_RSA="${EASY_RSA:-.}"
  65 -"$EASY_RSA/pkitool" --interact --csr $*
  66 +"/usr/sbin/pkitool" --interact --csr $*
  67 --- a/easy-rsa/2.0/build-req-pass
  68 +++ b/easy-rsa/2.0/build-req-pass
  69 @@ -4,4 +4,4 @@
  70  # with a password.
  71
  72  export EASY_RSA="${EASY_RSA:-.}"
  73 -"$EASY_RSA/pkitool" --interact --csr --pass $*
  74 +"/usr/sbin/pkitool" --interact --csr --pass $*
  75 --- a/easy-rsa/2.0/clean-all
  76 +++ b/easy-rsa/2.0/clean-all
  77 @@ -1,5 +1,7 @@
  78  #!/bin/sh
  79
  80 +. /etc/easy-rsa/vars
  81 +
  82  # Initialize the $KEY_DIR directory.
  83  # Note that this script does a
  84  # rm -rf on $KEY_DIR so be careful!
  85 --- a/easy-rsa/2.0/inherit-inter
  86 +++ b/easy-rsa/2.0/inherit-inter
  87 @@ -1,5 +1,7 @@
  88  #!/bin/sh
  89
  90 +. /etc/easy-rsa/vars
  91 +
  92  # Build a new PKI which is rooted on an intermediate certificate generated
  93  # by ./build-inter or ./pkitool --inter from a parent PKI.  The new PKI should
  94  # have independent vars settings, and must use a different KEY_DIR directory
  95 --- a/easy-rsa/2.0/list-crl
  96 +++ b/easy-rsa/2.0/list-crl
  97 @@ -1,5 +1,7 @@
  98  #!/bin/sh
  99
 100 +. /etc/easy-rsa/vars
 101 +
 102  # list revoked certificates
 103
 104  CRL="${1:-crl.pem}"
 105 --- a/easy-rsa/2.0/pkitool
 106 +++ b/easy-rsa/2.0/pkitool
 107 @@ -1,5 +1,7 @@
 108  #!/bin/sh
 109
 110 +. /etc/easy-rsa/vars
 111 +
 112  #  OpenVPN -- An application to securely tunnel IP networks
 113  #             over a single TCP/UDP port, with support for SSL/TLS-based
 114  #             session authentication and key exchange,
 115 --- a/easy-rsa/2.0/revoke-full
 116 +++ b/easy-rsa/2.0/revoke-full
 117 @@ -1,5 +1,7 @@
 118  #!/bin/sh
 119
 120 +. /etc/easy-rsa/vars
 121 +
 122  # revoke a certificate, regenerate CRL,
 123  # and verify revocation
 124
 125 --- a/easy-rsa/2.0/sign-req
 126 +++ b/easy-rsa/2.0/sign-req
 127 @@ -4,4 +4,4 @@
 128  # with a local root certificate and key.
 129
 130  export EASY_RSA="${EASY_RSA:-.}"
 131 -"$EASY_RSA/pkitool" --interact --sign $*
 132 +"/usr/sbin/pkitool" --interact --sign $*
 133 --- a/easy-rsa/2.0/vars
 134 +++ b/easy-rsa/2.0/vars
 135 @@ -12,7 +12,7 @@
 136  # This variable should point to
 137  # the top level of the easy-rsa
 138  # tree.
 139 -export EASY_RSA="`pwd`"
 140 +export EASY_RSA="/etc/easy-rsa"
 141
 142  #
 143  # This variable should point to
 144 @@ -26,7 +26,7 @@
 145  # This variable should point to
 146  # the openssl.cnf file included
 147  # with easy-rsa.
 148 -export KEY_CONFIG=`$EASY_RSA/whichopensslcnf $EASY_RSA`
 149 +export KEY_CONFIG=`/usr/sbin/whichopensslcnf $EASY_RSA`
 150
 151  # Edit this variable to point to
 152  # your soon-to-be-created key