commit easy-rsa-git 3.0.1.r14.g5a429d2-1

2 files changed, 34 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d93aedfd8cfa..0b709408fed7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Fri Jul 15 16:56:19 UTC 2016
 pkgbase = easy-rsa-git
 	pkgdesc = An easy-to-use, robust, and highly configurable VPN (Virtual Private Network) - git checkout
-	pkgver = 3.0.0.rc2.r2.g171834d
+	pkgver = 3.0.1.r14.g5a429d2
 	pkgrel = 1
 	url = https://github.com/OpenVPN/easy-rsa
 	arch = i686
@@ -11,6 +13,8 @@ pkgbase = easy-rsa-git
 	provides = easy-rsa
 	conflicts = easy-rsa
 	conflicts = openvpn
+	backup = etc/easy-rsa/openssl-1.0.cnf
+	backup = etc/easy-rsa/vars
 	source = git://github.com/OpenVPN/easy-rsa.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index f599733b7fb7..51cb1eed70e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Christian Hesse <mail@eworm.de>
 
 pkgname=easy-rsa-git
-pkgver=3.0.0.rc2.r2.g171834d
+pkgver=3.0.1.r14.g5a429d2
 pkgrel=1
 pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network) - git checkout"
 arch=('i686' 'x86_64')
@@ -11,6 +11,8 @@ makedepends=('git')
 conflicts=('easy-rsa' 'openvpn')
 provides=('easy-rsa')
 license=('custom')
+backup=('etc/easy-rsa/openssl-1.0.cnf'
+	'etc/easy-rsa/vars')
 source=('git://github.com/OpenVPN/easy-rsa.git')
 sha256sums=('SKIP')
 
@@ -18,25 +20,40 @@ pkgver() {
 	cd easy-rsa/
 
 	if GITTAG="$(git describe --abbrev=0 --tags 2>/dev/null)"; then
-		echo "$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG}).r$(git rev-list --count ${GITTAG}..).g$(git log -1 --format="%h")"
+		printf '%s.r%s.g%s' \
+			"$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG})" \
+			"$(git rev-list --count ${GITTAG}..)" \
+			"$(git log -1 --format='%h')"
 	else
-		echo "0.r$(git rev-list --count master).g$(git log -1 --format="%h")"
+		printf '0.r%s.g%s' \
+			"$(git rev-list --count master)" \
+			"$(git log -1 --format='%h')"
 	fi
 }
 
+prepare() {
+	cd easy-rsa/
+
+	# change path for configuration in /etc
+	sed -i "/set_var EASYRSA\t/c \\\tset_var EASYRSA\t\t\"/etc/easy-rsa\"" easyrsa3/easyrsa
+
+	# fix output of help command, we have it in PATH
+	sed -i 's|./easyrsa|easyrsa|' easyrsa3/easyrsa
+}
+
 package() {
 	cd easy-rsa/
 
-	# doc and license
-	install -d ${pkgdir}/usr/share/doc/easy-rsa/
-	mv doc/* ${pkgdir}/usr/share/doc/easy-rsa/
-	rmdir doc
+	install -D -m0755 easyrsa3/easyrsa "${pkgdir}"/usr/bin/easyrsa
+
+	install -D -m0644 easyrsa3/openssl-1.0.cnf "${pkgdir}"/etc/easy-rsa/openssl-1.0.cnf
+	install -D -m0644 easyrsa3/vars.example "${pkgdir}"/etc/easy-rsa/vars
+	install -d -m0755 "${pkgdir}"/etc/easy-rsa/x509-types/
+	install -m0644 easyrsa3/x509-types/* "${pkgdir}"/etc/easy-rsa/x509-types/
 
-	install -d ${pkgdir}/usr/share/licenses/easy-rsa/
-	mv ChangeLog COPYING KNOWN_ISSUES ${pkgdir}/usr/share/licenses/easy-rsa/
+	install -d -m0755  ${pkgdir}/usr/share/doc/easy-rsa/
+	install -m0644 doc/* ChangeLog KNOWN_ISSUES ${pkgdir}/usr/share/doc/easy-rsa/
 
-	# Install easy-rsa
-	install -d ${pkgdir}/usr/share/easy-rsa/
-	mv * ${pkgdir}/usr/share/easy-rsa/
+	install -D -m0644 COPYING.md ${pkgdir}/usr/share/licenses/easy-rsa/COPYING.md
 }