[arch-commits] Commit in easy-rsa/repos/extra-any (4 files)

Christian Hesse eworm at archlinux.org
Sat Oct 10 18:53:05 UTC 2020


    Date: Saturday, October 10, 2020 @ 18:53:04
  Author: eworm
Revision: 397933

archrelease: copy trunk to extra-any

Added:
  easy-rsa/repos/extra-any/0001-fix-paths.patch
    (from rev 397932, easy-rsa/trunk/0001-fix-paths.patch)
  easy-rsa/repos/extra-any/PKGBUILD
    (from rev 397932, easy-rsa/trunk/PKGBUILD)
Deleted:
  easy-rsa/repos/extra-any/0001-fix-paths.patch
  easy-rsa/repos/extra-any/PKGBUILD

----------------------+
 0001-fix-paths.patch |   58 +++++++++++++++---------------
 PKGBUILD             |   94 ++++++++++++++++++++++++-------------------------
 2 files changed, 76 insertions(+), 76 deletions(-)

Deleted: 0001-fix-paths.patch
===================================================================
--- 0001-fix-paths.patch	2020-10-10 18:52:56 UTC (rev 397932)
+++ 0001-fix-paths.patch	2020-10-10 18:53:04 UTC (rev 397933)
@@ -1,29 +0,0 @@
-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
-@@ -1660,9 +1660,9 @@ Note: using Easy-RSA configuration from: $vars"
- 	fi
- 	
- 	# Set defaults, preferring existing env-vars if present
--	set_var EASYRSA		"$prog_dir"
-+	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"

Copied: easy-rsa/repos/extra-any/0001-fix-paths.patch (from rev 397932, easy-rsa/trunk/0001-fix-paths.patch)
===================================================================
--- 0001-fix-paths.patch	                        (rev 0)
+++ 0001-fix-paths.patch	2020-10-10 18:53:04 UTC (rev 397933)
@@ -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
+@@ -1660,9 +1660,9 @@ Note: using Easy-RSA configuration from: $vars"
+ 	fi
+ 	
+ 	# Set defaults, preferring existing env-vars if present
+-	set_var EASYRSA		"$prog_dir"
++	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"

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-10 18:52:56 UTC (rev 397932)
+++ PKGBUILD	2020-10-10 18:53:04 UTC (rev 397933)
@@ -1,47 +0,0 @@
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
-
-pkgname=easy-rsa
-pkgver=3.0.8
-pkgrel=1
-pkgdesc='Simple shell based CA utility'
-arch=('any')
-url='https://github.com/OpenVPN/easy-rsa'
-depends=('openssl' 'sh')
-license=('custom')
-backup=('etc/easy-rsa/openssl-easyrsa.cnf'
-	'etc/easy-rsa/vars')
-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}
-        '0001-fix-paths.patch')
-sha256sums=('cae114c212a5be4d89f2253d36c70ab94f68d295f24e8b6711c2cab0fabf7e18'
-            'SKIP'
-            '097c0d4980698004b11cc5e4cf12229d1f4a498fd1bd5d0442f4bec2cf7b11ea')
-
-prepare() {
-	cd EasyRSA-${pkgver}/
-
-	# 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() {
-	cd EasyRSA-${pkgver}/
-
-	install -D -m0755 easyrsa "${pkgdir}"/usr/bin/easyrsa
-
-	install -D -m0644 openssl-easyrsa.cnf "${pkgdir}"/etc/easy-rsa/openssl-easyrsa.cnf
-	install -D -m0644 vars.example "${pkgdir}"/etc/easy-rsa/vars
-	install -d -m0755 "${pkgdir}"/etc/easy-rsa/x509-types/
-	install -m0644 x509-types/* "${pkgdir}"/etc/easy-rsa/x509-types/
-
-	install -d -m0755  "${pkgdir}"/usr/share/doc/easy-rsa/
-	install -m0644 doc/* ChangeLog "${pkgdir}"/usr/share/doc/easy-rsa/
-
-	install -D -m0644 COPYING.md "${pkgdir}"/usr/share/licenses/easy-rsa/COPYING
-}
-

Copied: easy-rsa/repos/extra-any/PKGBUILD (from rev 397932, easy-rsa/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-10-10 18:53:04 UTC (rev 397933)
@@ -0,0 +1,47 @@
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=easy-rsa
+pkgver=3.0.8
+pkgrel=2
+pkgdesc='Simple shell based CA utility'
+arch=('any')
+url='https://github.com/OpenVPN/easy-rsa'
+depends=('openssl' 'sh' 'grep')
+license=('custom')
+backup=('etc/easy-rsa/openssl-easyrsa.cnf'
+	'etc/easy-rsa/vars')
+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}
+        '0001-fix-paths.patch')
+sha256sums=('cae114c212a5be4d89f2253d36c70ab94f68d295f24e8b6711c2cab0fabf7e18'
+            'SKIP'
+            '097c0d4980698004b11cc5e4cf12229d1f4a498fd1bd5d0442f4bec2cf7b11ea')
+
+prepare() {
+	cd EasyRSA-${pkgver}/
+
+	# 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() {
+	cd EasyRSA-${pkgver}/
+
+	install -D -m0755 easyrsa "${pkgdir}"/usr/bin/easyrsa
+
+	install -D -m0644 openssl-easyrsa.cnf "${pkgdir}"/etc/easy-rsa/openssl-easyrsa.cnf
+	install -D -m0644 vars.example "${pkgdir}"/etc/easy-rsa/vars
+	install -d -m0755 "${pkgdir}"/etc/easy-rsa/x509-types/
+	install -m0644 x509-types/* "${pkgdir}"/etc/easy-rsa/x509-types/
+
+	install -d -m0755  "${pkgdir}"/usr/share/doc/easy-rsa/
+	install -m0644 doc/* ChangeLog "${pkgdir}"/usr/share/doc/easy-rsa/
+
+	install -D -m0644 COPYING.md "${pkgdir}"/usr/share/licenses/easy-rsa/COPYING
+}
+


More information about the arch-commits mailing list