From 7968540314355a0c9be0b1c89537de7b336f487f Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Jul 06 2017 15:27:20 +0000
Subject: fix build (#1431612)

fix Perl autoreqs (#1413917)
Resolves: rhbz#1431612
Resolves: rhbz#1413917

---

diff --git a/certext.c b/certext.c
index ee94171..09864e4 100644
--- a/certext.c
+++ b/certext.c
@@ -258,8 +258,8 @@ Gets_s(char *buff, size_t size) {
 static SECStatus
 PrintChoicesAndGetAnswer(char* str, char* rBuff, int rSize)
 {
-    fprintf(stdout, str);
-    fprintf(stdout, " > ");
+    fputs(str, stdout);
+    fputs(" > ", stdout);
     fflush (stdout);
     if (Gets_s(rBuff, rSize) == NULL) {
         PORT_SetError(SEC_ERROR_INPUT_LEN);
diff --git a/crypto-utils.spec b/crypto-utils.spec
index e1a8b0e..840f4fb 100644
--- a/crypto-utils.spec
+++ b/crypto-utils.spec
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.4.1
-Release: 66%{?dist}
+Release: 67%{?dist}
 Group: Applications/System
 # certwatch.c is GPLv2
 # pemutil.c etc are (MPLv1.1+ or GPLv2+ or LPGLv2+)
@@ -122,6 +122,7 @@ sed -e "s|^\$bindir.*$|\$bindir = \"%{_bindir}\";|" \
     -e "s/'Challenge',/'Email','Challenge',/g" \
     -e "/@EXTRA@/d" \
   < %{SOURCE1} > $RPM_BUILD_ROOT%{_bindir}/genkey
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/genkey
 
 chmod -R u+w $RPM_BUILD_ROOT
 
@@ -135,6 +136,10 @@ chmod -R u+w $RPM_BUILD_ROOT
 %{perl_vendorarch}/auto/Crypt
 
 %changelog
+* Thu Jul  6 2017 Joe Orton <jorton@redhat.com> - 2.4.1-67
+- fix build (#1431612)
+- fix Perl autoreqs (#1413917)
+
 * Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 2.4.1-66
 - Perl 5.26 rebuild
 
diff --git a/keyutil.c b/keyutil.c
index aeed4c8..7f403d6 100644
--- a/keyutil.c
+++ b/keyutil.c
@@ -956,19 +956,19 @@ UpdateRNG(void)
     char meter[] = {
       "\r|                                                            |" };
 
-#define FPS fprintf(stderr,
-    FPS "\n");
-    FPS "A random seed must be generated that will be used in the\n");
-    FPS "creation of your key.  One of the easiest ways to create a\n");
-    FPS "random seed is to use the timing of keystrokes on a keyboard.\n");
-    FPS "\n");
-    FPS "To begin, type keys on the keyboard until this progress meter\n");
-    FPS "is full.  DO NOT USE THE AUTOREPEAT FUNCTION ON YOUR KEYBOARD!\n");
-    FPS "\n");
-    FPS "\n");
-    FPS "Continue typing until the progress meter is full:\n\n");
-    FPS meter);
-    FPS "\r|");
+#define FPS(s_) fputs(s_, stderr)
+    FPS("\n");
+    FPS("A random seed must be generated that will be used in the\n");
+    FPS("creation of your key.  One of the easiest ways to create a\n");
+    FPS("random seed is to use the timing of keystrokes on a keyboard.\n");
+    FPS("\n");
+    FPS("To begin, type keys on the keyboard until this progress meter\n");
+    FPS("is full.  DO NOT USE THE AUTOREPEAT FUNCTION ON YOUR KEYBOARD!\n");
+    FPS("\n");
+    FPS("\n");
+    FPS("Continue typing until the progress meter is full:\n\n");
+    FPS(meter);
+    FPS("\r|");
 
     /* turn off echo on stdin & return on 1 char instead of NL */
     fd = fileno(stdin);
@@ -994,20 +994,20 @@ UpdateRNG(void)
     randbuf[count] = c;
     if (count == 0 || c != randbuf[count-1]) {
         count++;
-        FPS "*");
+        FPS("*");
     }
     }
     PK11_RandomUpdate(randbuf, sizeof randbuf);
     memset(randbuf, 0, sizeof randbuf);
 
-    FPS "\n\n");
-    FPS "Finished.  Press enter to continue: ");
+    FPS("\n\n");
+    FPS("Finished.  Press enter to continue: ");
 
     while ((c = getc(stdin)) != '\n' && c != EOF)
         ;
     if (c == EOF)
     rv = -1;
-    FPS "\n");
+    FPS("\n");
 
 #undef FPS