[arch-commits] Commit in easy-rsa/trunk (0001-fix-paths.patch PKGBUILD)

[Christian Hesse]

    Date: Thursday, September 28, 2017 @ 09:17:49
  Author: eworm
Revision: 306431

upgpkg: easy-rsa 3.0.3-2

fix paths (FS#55298)

Added:
  easy-rsa/trunk/0001-fix-paths.patch
Modified:
  easy-rsa/trunk/PKGBUILD

----------------------+
 0001-fix-paths.patch |   29 +++++++++++++++++++++++++++++
 PKGBUILD             |   11 ++++++++---
 2 files changed, 37 insertions(+), 3 deletions(-)

Added: 0001-fix-paths.patch
===================================================================
--- 0001-fix-paths.patch	                        (rev 0)
+++ 0001-fix-paths.patch	2017-09-28 09:17:49 UTC (rev 306431)
@@ -0,0 +1,29 @@
+From 49facdddb343cefb0cb85bcc7eb52fa01db1f377 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Thu, 28 Sep 2017 11:08:39 +0200
+Subject: [PATCH 1/1] fix paths
+
+We have the easyrsa executable in /usr/bin/ - so use use current working
+directory, not executable path.
+
+Signed-off-by: Christian Hesse <mail at eworm.de>
+---
+ easyrsa | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/easyrsa b/easyrsa
+index 11d2357..c665ab7 100755
+--- a/easyrsa
++++ b/easyrsa
+@@ -1042,9 +1042,9 @@ Note: using Easy-RSA configuration from: $vars"
+ 	fi
+ 	
+ 	# Set defaults, preferring existing env-vars if present
+-	set_var EASYRSA		"${0%/*}"
++	set_var EASYRSA		"$PWD"
+ 	set_var EASYRSA_OPENSSL	openssl
+-	set_var EASYRSA_PKI	"$PWD/pki"
++	set_var EASYRSA_PKI	"$EASYRSA/pki"
+ 	set_var EASYRSA_DN	cn_only
+ 	set_var EASYRSA_REQ_COUNTRY	"US"
+ 	set_var EASYRSA_REQ_PROVINCE	"California"

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-28 08:06:38 UTC (rev 306430)
+++ PKGBUILD	2017-09-28 09:17:49 UTC (rev 306431)
@@ -3,7 +3,7 @@
 
 pkgname=easy-rsa
 pkgver=3.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Simple shell based CA utility'
 arch=('any')
 url='https://github.com/OpenVPN/easy-rsa'
@@ -14,9 +14,11 @@
 validpgpkeys=(
 	'65FF3F24AA08E882CB444C94D731D97A606FD463'	# Josh Cepek <josh.cepek at usa.net>
 	'6F4056821152F03B6B24F2FCF8489F839D7367F3')	# Eric Crist <ecrist at secure-computing.net>
-source=("https://github.com/OpenVPN/easy-rsa/releases/download/v${pkgver}/EasyRSA-${pkgver}.tgz"{,.sig})
+source=("https://github.com/OpenVPN/easy-rsa/releases/download/v${pkgver}/EasyRSA-${pkgver}.tgz"{,.sig}
+        '0001-fix-paths.patch')
 sha256sums=('fb239d67f4bd09f817b0025450d422ed7ae3ee93af737c57d4acd8fdb646079e'
-            'SKIP')
+            'SKIP'
+            'c8287a6c3e79c36dcadbf2bd11b0fe2698f2ec8d6824b0dc22783ade36b8d2f6')
 
 prepare() {
 	cd EasyRSA-${pkgver}/
@@ -23,6 +25,9 @@
 
 	# fix output of help command, we have it in PATH
 	sed -i 's|./easyrsa|easyrsa|' easyrsa
+
+	# fix paths
+	patch -Np1 < "${srcdir}"/0001-fix-paths.patch
 }
 
 package() {