update-09.24

This commit is contained in:
github-actions[bot]
2021-09-24 23:37:27 +08:00
parent f9585b6e58
commit 16a922f897
1458 changed files with 321464 additions and 7622 deletions

View File

@@ -0,0 +1,50 @@
#
# Copyright (C) 2010-2013 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_SOURCE_URL:=https://github.com/OpenVPN/easy-rsa.git
PKG_SOURCE_VERSION:=19a20046ca0110ad5435d69f481c5148726af252
PKG_NAME:=openvpn-easy-rsa
PKG_VERSION:=3.0.8
PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
include $(INCLUDE_DIR)/package.mk
define Package/openvpn-easy-rsa-whisky
TITLE:=CLI utility to build and manage a PKI CA.
SECTION:=net
CATEGORY:=Network
URL:=http://openvpn.net
SUBMENU:=VPN
DEPENDS:=+openssl-util
PKGARCH:=all
endef
define Build/Configure
endef
define Build/Compile
endef
define Package/openvpn-easy-rsa-whisky/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/easyrsa3/easyrsa $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc/easy-rsa/x509-types
$(INSTALL_DATA) ./files/vars $(1)/etc/easy-rsa/vars
$(INSTALL_DATA) $(PKG_BUILD_DIR)/easyrsa3/openssl-easyrsa.cnf $(1)/etc/easy-rsa/openssl-easyrsa.cnf
$(INSTALL_DATA) $(PKG_BUILD_DIR)/easyrsa3/x509-types/* $(1)/etc/easy-rsa/x509-types/
endef
$(eval $(call BuildPackage,openvpn-easy-rsa-whisky))

View File

@@ -0,0 +1,11 @@
set_var EASYRSA_KEY_SIZE 1024
set_var EASYRSA_CA_EXPIRE 365
set_var EASYRSA_CERT_EXPIRE 365
set_var EASYRSA_REQ_COUNTRY "TW"
set_var EASYRSA_REQ_PROVINCE "Taiwan"
set_var EASYRSA_REQ_CITY "Taipei"
set_var EASYRSA_REQ_ORG "OpenVPN"
set_var EASYRSA_REQ_EMAIL "OpenVPN@OpenVPN.net"
set_var EASYRSA_REQ_OU "OpenVPN"
set_var EASYRSA_REQ_CN "Easy-RSA CA"
set_var EASYRSA_DN "org"

View File

@@ -0,0 +1,11 @@
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -607,7 +607,7 @@
# Default CN only when not in global EASYRSA_BATCH mode:
# shellcheck disable=SC2015
- [ "$EASYRSA_BATCH" ] && opts="$opts -batch" || export EASYRSA_REQ_CN="Easy-RSA CA"
+ [ "$EASYRSA_BATCH" ] && opts="$opts -batch" || export EASYRSA_REQ_CN="${EASYRSA_REQ_CN:-Easy-RSA CA}"
out_key_tmp="$(easyrsa_mktemp)" || die "Failed to create temporary file"
out_file_tmp="$(easyrsa_mktemp)" || die "Failed to create temporary file"

View File

@@ -0,0 +1,24 @@
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -1557,8 +1557,7 @@
prog_file="$0"
prog_file2="$(which -- "$prog_file" 2>/dev/null)" && prog_file="$prog_file2"
prog_file2="$(readlink -f "$prog_file" 2>/dev/null)" && prog_file="$prog_file2"
- prog_dir="${prog_file%/*}"
- prog_vars="${prog_dir}/vars"
+ prog_vars="/etc/easy-rsa/vars"
# set up PKI path
pki_vars="${EASYRSA_PKI:-$PWD/pki}/vars"
@@ -1588,9 +1587,9 @@
fi
# Set defaults, preferring existing env-vars if present
- set_var EASYRSA "$prog_dir"
+ set_var EASYRSA "/etc/easy-rsa"
set_var EASYRSA_OPENSSL openssl
- set_var EASYRSA_PKI "$PWD/pki"
+ set_var EASYRSA_PKI "/tmp/easyrsa3/pki"
set_var EASYRSA_DN cn_only
set_var EASYRSA_REQ_COUNTRY "US"
set_var EASYRSA_REQ_PROVINCE "California"