From c80756a98c96c587a638ba5b153ee2f06c2c679952985583b2668b61f56c6d8d Mon Sep 17 00:00:00 2001
From: Olav Reinert <seroton10@gmail.com>
Date: Sat, 9 Sep 2017 07:58:43 +0000
Subject: [PATCH] Some cleanup, the result of running:  * spec-cleaner -i
 easy-rsa.spec  * osc service localrun download_files

OBS-URL: https://build.opensuse.org/package/show/network:vpn/easy-rsa?expand=0&rev=11
---
 534f673.patch | 12 ++++++++----
 6436eaf.patch | 11 +++++++----
 d20d2b3.patch | 12 ++++++++----
 e9e8e27.patch | 11 +++++++----
 easy-rsa.spec |  8 +++-----
 5 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/534f673.patch b/534f673.patch
index b3a7f5c..0cac058 100644
--- a/534f673.patch
+++ b/534f673.patch
@@ -1,8 +1,12 @@
-commit 534f67345997603e3b1fbf6b673bbaa65937019e
-Author: Olav Reinert <seroton10@gmail.com>
-Date:   Mon Jun 5 23:30:57 2017 +0200
+From 534f67345997603e3b1fbf6b673bbaa65937019e Mon Sep 17 00:00:00 2001
+From: Olav Reinert <seroton10@gmail.com>
+Date: Mon, 5 Jun 2017 23:30:57 +0200
+Subject: [PATCH] Make $PWD/pki the default PKI location
 
-    Make $PWD/pki the default PKI location
+---
+ doc/EasyRSA-Advanced.md |  3 ++-
+ easyrsa3/easyrsa        | 14 ++++++++------
+ 2 files changed, 10 insertions(+), 7 deletions(-)
 
 diff --git a/doc/EasyRSA-Advanced.md b/doc/EasyRSA-Advanced.md
 index 64b29ae..1bd8c29 100644
diff --git a/6436eaf.patch b/6436eaf.patch
index d567672..eaac82c 100644
--- a/6436eaf.patch
+++ b/6436eaf.patch
@@ -1,8 +1,11 @@
-commit 6436eaf8c1e5e3c44d23c1c7a0a5fef14f19d375
-Author: Martin Schmitt <mas@scsy.de>
-Date:   Fri Jun 30 16:12:13 2017 +0200
+From 6436eaf8c1e5e3c44d23c1c7a0a5fef14f19d375 Mon Sep 17 00:00:00 2001
+From: Martin Schmitt <mas@scsy.de>
+Date: Fri, 30 Jun 2017 16:12:13 +0200
+Subject: [PATCH] Add CN as SAN (if none requested) on server certs by default
 
-    Add CN as SAN (if none requested) on server certs by default
+---
+ easyrsa3/easyrsa | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
 
 diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
 index 088faeb..f5ec797 100755
diff --git a/d20d2b3.patch b/d20d2b3.patch
index f722841..9e38943 100644
--- a/d20d2b3.patch
+++ b/d20d2b3.patch
@@ -1,8 +1,12 @@
-commit d20d2b3c06baed2fc4e098b12331fd203e723f91
-Author: Olav Reinert <seroton10@gmail.com>
-Date:   Thu Jul 27 08:27:27 2017 +0200
+From d20d2b3c06baed2fc4e098b12331fd203e723f91 Mon Sep 17 00:00:00 2001
+From: Olav Reinert <seroton10@gmail.com>
+Date: Thu, 27 Jul 2017 08:27:27 +0200
+Subject: [PATCH] Update docs and examples to fit changes in 534f673
 
-    Update docs and examples to fit changes in 534f673
+---
+ doc/EasyRSA-Advanced.md | 14 +++++++-------
+ easyrsa3/vars.example   | 17 ++++++++++++-----
+ 2 files changed, 19 insertions(+), 12 deletions(-)
 
 diff --git a/doc/EasyRSA-Advanced.md b/doc/EasyRSA-Advanced.md
 index 1bd8c29..5bcd526 100644
diff --git a/e9e8e27.patch b/e9e8e27.patch
index 56a5899..e2f518a 100644
--- a/e9e8e27.patch
+++ b/e9e8e27.patch
@@ -1,8 +1,11 @@
-commit e9e8e272e0eb5225ecfb0d8a0953a5b480c5e85d
-Author: Martin Schmitt <mas@scsy.de>
-Date:   Fri Jun 30 17:04:31 2017 +0200
+From e9e8e272e0eb5225ecfb0d8a0953a5b480c5e85d Mon Sep 17 00:00:00 2001
+From: Martin Schmitt <mas@scsy.de>
+Date: Fri, 30 Jun 2017 17:04:31 +0200
+Subject: [PATCH] Moved @ValdikSS's serial randomization to sign_req
 
-    Moved @ValdikSS's serial randomization to sign_req
+---
+ easyrsa3/easyrsa | 23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
 
 diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
 index f5ec797..cff63f2 100755
diff --git a/easy-rsa.spec b/easy-rsa.spec
index 2ba4b4a..fdce6f3 100644
--- a/easy-rsa.spec
+++ b/easy-rsa.spec
@@ -47,12 +47,11 @@ Patch8:         https://github.com/OpenVPN/easy-rsa/commit/d20d2b3.patch
 # Fix string comprehension
 Patch9:         https://github.com/OpenVPN/easy-rsa/commit/4eac410.patch
 # Fix incorrect "openssl rand" usage
-Patch10:         https://github.com/OpenVPN/easy-rsa/commit/a138c0d.patch
+Patch10:        https://github.com/OpenVPN/easy-rsa/commit/a138c0d.patch
 # Add --copy-ext option
-Patch11:         https://github.com/OpenVPN/easy-rsa/commit/83a1a21.patch
+Patch11:        https://github.com/OpenVPN/easy-rsa/commit/83a1a21.patch
 # openSUSE specific
 Patch100:       easy-rsa-packaging.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 %description
@@ -74,7 +73,7 @@ certificates, including sub-CAs and certificate revokation lists (CRL).
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch100 -p0
+%patch100
 
 # Add this for SLE11, patch tool can't rename file.
 # Next release we should publish .md documentation.
@@ -94,7 +93,6 @@ install -Dm0644 easyrsa3/x509-types/* %{buildroot}/%{_sysconfdir}/easy-rsa/x509-
 install -Dm0755 easyrsa3/easyrsa %{buildroot}/%{_bindir}/easyrsa
 
 %files
-%defattr(-,root,root)
 %doc KNOWN_ISSUES README.md README.quickstart.md COPYING.md
 %doc Licensing/*
 %doc doc/*