A new version of easy-rsa is available which supports LibreSSL.

While here change HOMEPAGE to https.

Tested lightly by making a pki and some client certificates.

OK?


diff --git Makefile Makefile
index 4a99df22d67..0129e2ab2ca 100644
--- Makefile
+++ Makefile
@@ -2,32 +2,30 @@
 
 COMMENT =      small RSA key management package
 
-V =            3.0.4
+V =            3.0.5
 PKGNAME =      easy-rsa-$V
-DISTNAME =     EasyRSA-$V
+DISTNAME =     EasyRSA-nix-$V
 EXTRACT_SUFX = .tgz
 CATEGORIES =   security
 
-HOMEPAGE =     http://openvpn.net/
+HOMEPAGE =     https://openvpn.net/
 
 # GPLv2 only
 PERMIT_PACKAGE_CDROM = Yes
 
 MASTER_SITES = https://github.com/OpenVPN/easy-rsa/releases/download/v$V/
 
-# relies on passing environment variables to $ENV:: in config files
-RUN_DEPENDS =  security/openssl
-
 NO_BUILD =     Yes
 NO_TEST =      Yes
 
+WRKDIST =      ${WRKDIR}/${DISTNAME:S/nix-//}
+
 I =            ${PREFIX}/share/easy-rsa
 
 do-install:
        sed -i s,/usr/local,${LOCALBASE},g ${WRKSRC}/easyrsa
        ${INSTALL_DATA_DIR} $I
        cd ${WRKSRC}; pax -rw * $I
-       rm $I/*.orig
        chown -R ${SHAREOWN}:${SHAREGRP} $I/*
 
 .include <bsd.port.mk>
diff --git distinfo distinfo
index d551ee2e959..0d712abe21f 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (EasyRSA-3.0.4.tgz) = RyFn+XbGy3yGDOxhUKVhbhY64gNlyB8XmBHW7gd57Fo=
-SIZE (EasyRSA-3.0.4.tgz) = 37721
+SHA256 (EasyRSA-nix-3.0.5.tgz) = Xr/n36IACKoVzssTbyswj24j4p8XVolpo7p3KqULuzc=
+SIZE (EasyRSA-nix-3.0.5.tgz) = 50270
diff --git patches/patch-easyrsa patches/patch-easyrsa
deleted file mode 100644
index b785f635cb0..00000000000
--- patches/patch-easyrsa
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-easyrsa,v 1.3 2018/01/31 17:10:47 sthen Exp $
-
-Makes extensive use of passing environment variables and using
-$ENV:: in OpenSSL config files. Bizarrely, parsing of these config
-files is done by the library rather than the openssl(1) command
-line tool, and this was removed from LibreSSL, so easy-rsa won't
-work with LibreSSL without extensive changes, so patching to use
-OpenSSL from ports instead.
-
-Index: easyrsa
---- easyrsa.orig
-+++ easyrsa
-@@ -1061,7 +1061,7 @@ Note: using Easy-RSA configuration from: $vars"
-       
-       # Set defaults, preferring existing env-vars if present
-       set_var EASYRSA         "${0%/*}"
--      set_var EASYRSA_OPENSSL openssl
-+      set_var EASYRSA_OPENSSL "/usr/local/bin/eopenssl"
-       set_var EASYRSA_PKI     "$PWD/pki"
-       set_var EASYRSA_DN      cn_only
-       set_var EASYRSA_REQ_COUNTRY     "US"
diff --git pkg/PLIST pkg/PLIST
index e34caa5e9db..4403bb73a69 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -12,6 +12,7 @@ share/easy-rsa/doc/EasyRSA-Upgrade-Notes.md
 share/easy-rsa/doc/Hacking.md
 share/easy-rsa/doc/Intro-To-PKI.md
 share/easy-rsa/easyrsa
+@comment share/easy-rsa/easyrsa-e
 share/easy-rsa/gpl-2.0.txt
 share/easy-rsa/mktemp.txt
 share/easy-rsa/openssl-easyrsa.cnf

Reply via email to