svn commit: r405813 - in head: . security security/easy-rsa security/easy-rsa/files security/easy-rsa2

Matthias Andree mandree at FreeBSD.org
Mon Jan 11 23:23:04 UTC 2016 

Author: mandree
Date: Mon Jan 11 23:23:01 2016
New Revision: 405813
URL: https://svnweb.freebsd.org/changeset/ports/405813

Log:
  Update security/easy-rsa to major release 3.0.1.
  
  Move a copy of the older package to security/easy-rsa2,
  add CONFLICTS_INSTALL markers, and an UPDATING entry.
  
  Changelog: <https://github.com/OpenVPN/easy-rsa/releases>

Added:
  head/security/easy-rsa/files/
  head/security/easy-rsa/files/easyrsa.in   (contents, props changed)
  head/security/easy-rsa2/
     - copied from r405532, head/security/easy-rsa/
Modified:
  head/UPDATING
  head/security/Makefile
  head/security/easy-rsa/Makefile
  head/security/easy-rsa/distinfo
  head/security/easy-rsa/pkg-plist
  head/security/easy-rsa2/Makefile
  head/security/easy-rsa2/pkg-plist

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Mon Jan 11 21:33:03 2016	(r405812)
+++ head/UPDATING	Mon Jan 11 23:23:01 2016	(r405813)
@@ -5,6 +5,16 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20160111:
+  AFFECTS: users of security/easy-rsa
+  AUTHOR: mandree at FreeBSD.org
+
+  The port has been upgraded to version 3. This incurs major changes,
+  please see ${PREFIX}/share/doc/easy-rsa/doc/EasyRSA-Upgrade-Notes.md
+  for details.
+
+  The old version 2.2.2 has been retained as security/easy-rsa2.
+
 20151227:
   AFFECTS: users of games/nethack34
   AUTHOR: glewis at FreeBSD.org

Modified: head/security/Makefile
==============================================================================
--- head/security/Makefile	Mon Jan 11 21:33:03 2016	(r405812)
+++ head/security/Makefile	Mon Jan 11 23:23:01 2016	(r405813)
@@ -110,6 +110,7 @@
     SUBDIR += dsniff
     SUBDIR += duo
     SUBDIR += easy-rsa
+    SUBDIR += easy-rsa2
     SUBDIR += easypg
     SUBDIR += elixir-comeonin
     SUBDIR += elixir-comeonin_i18n

Modified: head/security/easy-rsa/Makefile
==============================================================================
--- head/security/easy-rsa/Makefile	Mon Jan 11 21:33:03 2016	(r405812)
+++ head/security/easy-rsa/Makefile	Mon Jan 11 23:23:01 2016	(r405813)
@@ -1,8 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	easy-rsa
-DISTVERSION=	2.2.2
+DISTVERSION=	3.0.1
 CATEGORIES=	security net-mgmt
+MASTER_SITES=	https://github.com/OpenVPN/easy-rsa/releases/download/${DISTVERSION}/
+DISTNAME=	EasyRSA-${DISTVERSION}
 
 # Eric F. Crist <ecrist at secure-computing.net> does not require my
 # approval for changes to this package. -- mandree at FreeBSD.org
@@ -11,10 +13,35 @@ COMMENT=	Small RSA key management packag
 
 LICENSE=	GPLv2
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	OpenVPN
+CONFLICTS_INSTALL=easy-rsa2-*
 
-GNU_CONFIGURE=	yes
-USES=		autoreconf
+USES=		tar:tgz
+NO_BUILD=	yes
+
+OPTIONS_DEFINE=		DOCS EXAMPLES
+
+PORTDATA=	x509-types/
+PORTDOCS=	ChangeLog README.quickstart.md doc/
+
+SUB_FILES=	easyrsa
+
+do-install:
+		${MKDIR} ${STAGEDIR}${PREFIX}/bin
+		${INSTALL_SCRIPT} ${WRKDIR}/easyrsa ${STAGEDIR}${PREFIX}/bin/
+		${MKDIR} ${STAGEDIR}${DATADIR}/x509-types/
+		${INSTALL_SCRIPT} ${WRKSRC}/easyrsa ${STAGEDIR}${DATADIR}/easyrsa.real
+		${INSTALL_DATA} ${WRKSRC}/vars.example ${STAGEDIR}${DATADIR}
+		(cd ${WRKSRC}/x509-types/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/x509-types/)
+
+do-install-DOCS-on:
+		${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ${PORTDOCS}
+.if "" != ${i:M*/}
+		${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
+		(cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${i})
+.else
+		${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
+.endif
+.endfor
 
 .include <bsd.port.mk>

Modified: head/security/easy-rsa/distinfo
==============================================================================
--- head/security/easy-rsa/distinfo	Mon Jan 11 21:33:03 2016	(r405812)
+++ head/security/easy-rsa/distinfo	Mon Jan 11 23:23:01 2016	(r405813)
@@ -1,2 +1,2 @@
-SHA256 (OpenVPN-easy-rsa-2.2.2_GH0.tar.gz) = 38f1f84e9b966df8b312365c7c75a455bdf003abdd5156e7106fa9c7771583ae
-SIZE (OpenVPN-easy-rsa-2.2.2_GH0.tar.gz) = 24453
+SHA256 (EasyRSA-3.0.1.tgz) = dbdaf5b9444b99e0c5221fd4bcf15384c62380c1b63cea23d42239414d7b2d4e
+SIZE (EasyRSA-3.0.1.tgz) = 40960

Added: head/security/easy-rsa/files/easyrsa.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/easy-rsa/files/easyrsa.in	Mon Jan 11 23:23:01 2016	(r405813)
@@ -0,0 +1,4 @@
+#! /bin/sh
+: ${EASYRSA:="%%PREFIX%%/share/easy-rsa"}
+export EASYRSA
+exec "%%PREFIX%%/share/easy-rsa/easyrsa.real" "$@"

Modified: head/security/easy-rsa/pkg-plist
==============================================================================
--- head/security/easy-rsa/pkg-plist	Mon Jan 11 21:33:03 2016	(r405812)
+++ head/security/easy-rsa/pkg-plist	Mon Jan 11 23:23:01 2016	(r405813)
@@ -1,23 +1,3 @@
-%%DOCSDIR%%/README-2.0
-%%DOCSDIR%%/COPYRIGHT.GPL
-%%DOCSDIR%%/COPYING
-share/easy-rsa/build-ca
-share/easy-rsa/vars
-share/easy-rsa/sign-req
-share/easy-rsa/revoke-full
-share/easy-rsa/pkitool
-share/easy-rsa/openssl-1.0.0.cnf
-share/easy-rsa/openssl-0.9.8.cnf
-share/easy-rsa/openssl-0.9.6.cnf
-share/easy-rsa/list-crl
-share/easy-rsa/inherit-inter
-share/easy-rsa/clean-all
-share/easy-rsa/build-req-pass
-share/easy-rsa/build-req
-share/easy-rsa/build-key-server
-share/easy-rsa/build-key-pkcs12
-share/easy-rsa/build-key-pass
-share/easy-rsa/build-key
-share/easy-rsa/build-inter
-share/easy-rsa/build-dh
-share/easy-rsa/whichopensslcnf
+bin/easyrsa
+%%DATADIR%%/easyrsa.real
+ at sample %%DATADIR%%/vars.example %%DATADIR%%/vars

Modified: head/security/easy-rsa2/Makefile
==============================================================================
--- head/security/easy-rsa/Makefile	Fri Jan  8 06:20:27 2016	(r405532)
+++ head/security/easy-rsa2/Makefile	Mon Jan 11 23:23:01 2016	(r405813)
@@ -3,6 +3,7 @@
 PORTNAME=	easy-rsa
 DISTVERSION=	2.2.2
 CATEGORIES=	security net-mgmt
+PKGNAMESUFFIX=	2
 
 # Eric F. Crist <ecrist at secure-computing.net> does not require my
 # approval for changes to this package. -- mandree at FreeBSD.org
@@ -11,10 +12,14 @@ COMMENT=	Small RSA key management packag
 
 LICENSE=	GPLv2
 
+CONFLICTS_INSTALL=easy-rsa-3*
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenVPN
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf
 
+WRKSRC=		${WRKDIR}/easy-rsa-${DISTVERSION}
+
 .include <bsd.port.mk>

Modified: head/security/easy-rsa2/pkg-plist
==============================================================================
--- head/security/easy-rsa/pkg-plist	Fri Jan  8 06:20:27 2016	(r405532)
+++ head/security/easy-rsa2/pkg-plist	Mon Jan 11 23:23:01 2016	(r405813)
@@ -1,23 +1,23 @@
 %%DOCSDIR%%/README-2.0
 %%DOCSDIR%%/COPYRIGHT.GPL
 %%DOCSDIR%%/COPYING
-share/easy-rsa/build-ca
-share/easy-rsa/vars
-share/easy-rsa/sign-req
-share/easy-rsa/revoke-full
-share/easy-rsa/pkitool
-share/easy-rsa/openssl-1.0.0.cnf
-share/easy-rsa/openssl-0.9.8.cnf
-share/easy-rsa/openssl-0.9.6.cnf
-share/easy-rsa/list-crl
-share/easy-rsa/inherit-inter
-share/easy-rsa/clean-all
-share/easy-rsa/build-req-pass
-share/easy-rsa/build-req
-share/easy-rsa/build-key-server
-share/easy-rsa/build-key-pkcs12
-share/easy-rsa/build-key-pass
-share/easy-rsa/build-key
-share/easy-rsa/build-inter
-share/easy-rsa/build-dh
-share/easy-rsa/whichopensslcnf
+%%DATADIR%%/build-ca
+%%DATADIR%%/vars
+%%DATADIR%%/sign-req
+%%DATADIR%%/revoke-full
+%%DATADIR%%/pkitool
+%%DATADIR%%/openssl-1.0.0.cnf
+%%DATADIR%%/openssl-0.9.8.cnf
+%%DATADIR%%/openssl-0.9.6.cnf
+%%DATADIR%%/list-crl
+%%DATADIR%%/inherit-inter
+%%DATADIR%%/clean-all
+%%DATADIR%%/build-req-pass
+%%DATADIR%%/build-req
+%%DATADIR%%/build-key-server
+%%DATADIR%%/build-key-pkcs12
+%%DATADIR%%/build-key-pass
+%%DATADIR%%/build-key
+%%DATADIR%%/build-inter
+%%DATADIR%%/build-dh
+%%DATADIR%%/whichopensslcnf

More information about the svn-ports-all mailing list