[rpms/openssl] rebase_40beta: silence the .rnd write failure as that is auxiliary functionality (#1524833)

[rpms/openssl] rebase_40beta: silence the .rnd write failure as that is auxiliary functionality (#1524833)

[Tomas Mraz]

A new commit has been pushed.

Repo   : rpms/openssl
Branch : rebase_40beta
Commit : 899f2baacb123c0233d13141f8b71d24307b3fe5
Author : Tomas Mraz <tmraz@fedoraproject.org>
Date   : 2018-01-11T18:08:54+01:00
Stats  : +30/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/openssl/c/899f2baacb123c0233d13141f8b71d24307b3fe5?branch=rebase_40beta

Log:
silence the .rnd write failure as that is auxiliary functionality (#1524833)

---
diff --git a/openssl-1.1.0-silent-rnd-write.patch b/openssl-1.1.0-silent-rnd-write.patch
new file mode 100644
index 0000000..79ac878
--- /dev/null
+++ b/openssl-1.1.0-silent-rnd-write.patch
@@ -0,0 +1,24 @@
+diff -up openssl-1.1.0g/apps/app_rand.c.silent-rnd-write openssl-1.1.0g/apps/app_rand.c
+--- openssl-1.1.0g/apps/app_rand.c.silent-rnd-write	2017-05-25 14:46:17.000000000 +0200
++++ openssl-1.1.0g/apps/app_rand.c	2018-01-11 18:05:32.332703425 +0100
+@@ -91,6 +91,7 @@ long app_RAND_load_files(char *name)
+ int app_RAND_write_file(const char *file)
+ {
+     char buffer[200];
++    const char *origfile = file;
+ 
+     if (egdsocket || !seeded)
+         /*
+@@ -103,8 +104,10 @@ int app_RAND_write_file(const char *file
+     if (file == NULL)
+         file = RAND_file_name(buffer, sizeof buffer);
+     if (file == NULL || !RAND_write_file(file)) {
+-        BIO_printf(bio_err, "unable to write 'random state'\n");
+-        return 0;
++        if (origfile != NULL) {
++            BIO_printf(bio_err, "unable to write 'random state'\n");
++            return 0;
++        }
+     }
+     return 1;
+ }

diff --git a/openssl.spec b/openssl.spec
index 2fc8889..bec48c8 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -22,7 +22,7 @@
 Summary: Utilities from the general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.1.0g
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 # We have to remove certain patented algorithms from the openssl source
 # tarball with the hobble-openssl script which is included below.
@@ -60,6 +60,7 @@ Patch41: openssl-1.1.0-system-cipherlist.patch
 Patch42: openssl-1.1.0-fips.patch
 Patch44: openssl-1.1.0-bio-fd-preserve-nl.patch
 Patch45: openssl-1.1.0-weak-ciphers.patch
+Patch46: openssl-1.1.0-silent-rnd-write.patch
 # Backported fixes including security fixes
 
 License: OpenSSL
@@ -161,6 +162,7 @@ cp %{SOURCE13} test/
 %patch42 -p1 -b .fips
 %patch44 -p1 -b .preserve-nl
 %patch45 -p1 -b .weak-ciphers
+%patch46 -p1 -b .silent-rnd-write
 
 %build
 # Figure out which flags we want to use.
@@ -431,6 +433,9 @@ export LD_LIBRARY_PATH
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Jan 11 2018 Tomáš Mráz <tmraz@redhat.com> 1.1.0g-3
+- silence the .rnd write failure as that is auxiliary functionality (#1524833)
+
 * Thu Dec 14 2017 Tomáš Mráz <tmraz@redhat.com> 1.1.0g-2
 - put the Makefile.certificate in pkgdocdir and drop the requirement on make