Index: head/security/easy-rsa/Makefile =================================================================== --- head/security/easy-rsa/Makefile (revision 479837) +++ head/security/easy-rsa/Makefile (revision 479838) @@ -1,53 +1,52 @@ # $FreeBSD$ PORTNAME= easy-rsa DISTVERSION= 3.0.5 +PORTREVISION= 1 CATEGORIES= security net-mgmt MASTER_SITES= https://github.com/OpenVPN/easy-rsa/releases/download/v${DISTVERSION}/ DISTNAME= EasyRSA-nix-${DISTVERSION} # Eric F. Crist does not require my # approval for changes to this package. -- mandree@FreeBSD.org MAINTAINER= mandree@FreeBSD.org COMMENT= Small RSA key management package based on openssl LICENSE= GPLv2 CONFLICTS_INSTALL=easy-rsa2-* - -BROKEN= regression for common configurations, patch in a few hours USES= tar:tgz NO_BUILD= yes WRKSRC= ${WRKDIR}/EasyRSA-${DISTVERSION} OPTIONS_DEFINE= DOCS EXAMPLES PORTDATA= x509-types/ _pd_files= ChangeLog README.quickstart.md _pd_dirs= doc/ PORTDOCS= ${_pd_files} ${_pd_dirs} SUB_FILES= easyrsa do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DATADIR}/x509-types/ ${INSTALL_SCRIPT} ${WRKDIR}/easyrsa ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_SCRIPT} ${WRKSRC}/easyrsa ${STAGEDIR}${DATADIR}/easyrsa.real ${INSTALL_DATA} ${WRKSRC}/vars.example ${STAGEDIR}${DATADIR}/ ${INSTALL_DATA} ${WRKSRC}/openssl-easyrsa.cnf ${STAGEDIR}${DATADIR}/openssl-easyrsa.cnf.example (cd ${WRKSRC}/x509-types/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/x509-types/) do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${_pd_files} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .for i in ${_pd_dirs} ${MKDIR} ${STAGEDIR}${DOCSDIR}/${i} (cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${i}) .endfor .include Index: head/security/easy-rsa/files/patch-c5ff31e8 =================================================================== --- head/security/easy-rsa/files/patch-c5ff31e8 (revision 479837) +++ head/security/easy-rsa/files/patch-c5ff31e8 (nonexistent) @@ -1,11 +0,0 @@ ---- easyrsa -+++ easyrsa -@@ -546,7 +546,7 @@ current CA keypair. If you intended to start a new CA, run init-pki first." - if [ $sub_ca ]; then - notice "\ - NOTE: Your sub-CA request is at $out_file --and now must be sent to you parent CA for signing. Place your resulting cert -+and now must be sent to your parent CA for signing. Place your resulting cert - at $EASYRSA_PKI/ca.crt prior to signing operations. - " - else notice "\ Property changes on: head/security/easy-rsa/files/patch-c5ff31e8 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/easy-rsa/files/patch-easyrsa =================================================================== --- head/security/easy-rsa/files/patch-easyrsa (nonexistent) +++ head/security/easy-rsa/files/patch-easyrsa (revision 479838) @@ -0,0 +1,46 @@ +--- easyrsa~ 2018-09-14 23:21:19.000000000 -0500 ++++ easyrsa 2018-09-15 10:21:49.241886000 -0500 +@@ -415,7 +415,6 @@ + + # init-pki backend: + init_pki() { +- vars_source_check + + # If EASYRSA_PKI exists, confirm before we rm -rf (skiped with EASYRSA_BATCH) + if [ -e "$EASYRSA_PKI" ]; then +@@ -432,6 +431,11 @@ + for i in private reqs; do + mkdir -p "$EASYRSA_PKI/$i" || die "Failed to create PKI file structure (permissions?)" + done ++ ++ if [ ! -f "$EASYRSA_PKI/openssl-easyrsa.cnf" -a -f "$EASYRSA/openssl-easyrsa.cnf" ]; ++ then ++ cp "$EASYRSA/openssl-easyrsa.cnf" "$EASYRSA_PKI/openssl-easyrsa.cnf" ++ fi + + notice "\ + init-pki complete; you may now create a CA or requests. +@@ -1180,18 +1184,15 @@ + set_var EASYRSA_REQ_CN ChangeMe + set_var EASYRSA_DIGEST sha256 + +- # Detect openssl config, preferring EASYRSA_PKI over EASYRSA +- if [ -f "$EASYRSA_PKI/openssl-easyrsa.cnf" ]; then +- set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf" +- set_var EASYRSA_SAFE_CONF "$EASYRSA_PKI/safessl-easyrsa.cnf" +- else set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-easyrsa.cnf" +- set_var EASYRSA_SAFE_CONF "$EASYRSA/safessl-easyrsa.cnf" +- fi ++ set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf" ++ set_var EASYRSA_SAFE_CONF "$EASYRSA_PKI/safessl-easyrsa.cnf" + + # Same as above for the x509-types extensions dir + if [ -d "$EASYRSA_PKI/x509-types" ]; then + set_var EASYRSA_EXT_DIR "$EASYRSA_PKI/x509-types" +- else set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types" ++ else ++ #TODO: This should be removed. Not really suitable for packaging. ++ set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types" + fi + + # EASYRSA_ALGO_PARAMS must be set depending on selected algo Property changes on: head/security/easy-rsa/files/patch-easyrsa ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/easy-rsa/files/patch-zgit-c5ff31e8 =================================================================== --- head/security/easy-rsa/files/patch-zgit-c5ff31e8 (nonexistent) +++ head/security/easy-rsa/files/patch-zgit-c5ff31e8 (revision 479838) @@ -0,0 +1,11 @@ +--- easyrsa ++++ easyrsa +@@ -546,7 +546,7 @@ current CA keypair. If you intended to start a new CA, run init-pki first." + if [ $sub_ca ]; then + notice "\ + NOTE: Your sub-CA request is at $out_file +-and now must be sent to you parent CA for signing. Place your resulting cert ++and now must be sent to your parent CA for signing. Place your resulting cert + at $EASYRSA_PKI/ca.crt prior to signing operations. + " + else notice "\ Property changes on: head/security/easy-rsa/files/patch-zgit-c5ff31e8 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property