Bugfixes from upstream

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

.gitignore

@@ -20,3 +20,4 @@
 /sscg-2.5.0.tar.xz
 /sscg-2.5.1.tar.xz
 /sscg-2.6.0.tar.xz
+/sscg-2.6.1.tar.xz

0001-Fix-help-message-for-client-key-file.patch

@@ -1,29 +0,0 @@
-From 3754c48ec570c5c08fa05c46a31b00e961abbf96 Mon Sep 17 00:00:00 2001
-From: Stephen Gallagher <sgallagh@redhat.com>
-Date: Fri, 13 Dec 2019 11:51:43 -0500
-Subject: [PATCH] Fix help message for --client-key-file
-
-Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
----
- src/sscg.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/sscg.c b/src/sscg.c
-index 02e690860e092d4f154c74cd2eaf03ac0392f31b..035e89882e85ad07e4bf60f62cc95509bf2e31a9 100644
---- a/src/sscg.c
-+++ b/src/sscg.c
-@@ -737,9 +737,8 @@ main (int argc, const char **argv)
-       &client_key_file,
-       0,
-       _ ("Path where the client's private key will be stored. "
--         "(default is client-file with a .key suffix, if "
--         "--client-file was passed, otherwise this file will not "
--         "be generated.)"),
-+         "(default is the client-file, if --client-file was passed, "
-+         "otherwise this file will not be generated.)"),
-       NULL,
-     },
- 
--- 
-2.23.0
-

sources

@@ -1 +1 @@
-SHA512 (sscg-2.6.0.tar.xz) = 37434fd7d349ae9a5542081fb967886ee0d07f8f58805be8baf29ba7b0735a31088c61b4d7aefa283d14175c850f958ae6d9ffac6e9481d681146e628897c7f6
+SHA512 (sscg-2.6.1.tar.xz) = ed250d66e351da72a1a79bd9b93fedbd9ac709d8b06673db4b8c33d46919768ee0aeabf9fdbe8273ddc74d29c3fbe912540592be7bfc76ba1970ea8628b007b4

sscg.spec

@@ -8,8 +8,8 @@
 
 
 Name:           sscg
-Version:        2.6.0
+Version:        2.6.1
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Simple SSL certificate generator
 
 License:        BSD
@@ -27,8 +27,6 @@ BuildRequires:  help2man
 BuildRequires:  clang
 
 
-Patch0001: 0001-Fix-help-message-for-client-key-file.patch
-
 
 %description
 A utility to aid in the creation of more secure "self-signed"
@@ -62,6 +60,9 @@ false signatures from the service certificate.
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* Thu Jan 09 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.6.1-1
+- Bugfixes from upstream
+
 * Fri Dec 13 2019 Stephen Gallagher <sgallagh@redhat.com> - 2.6.0-2
 - Fix incorrect help description for --client-key-file