From c5b1e8c3452208300bd6a7a51a10e4514cbff448 Mon Sep 17 00:00:00 2001
From: Tomas Halman <thalman@redhat.com>
Date: Thu, 15 Aug 2024 16:24:31 +0200
Subject: [PATCH] Fixing mellon_create_metadata.sh script and publishing in CRB

Resolves: RHEL-35898
Resolves: RHEL-33585
---
 README.redhat.rst         | 2 +-
 mellon_create_metadata.sh | 6 ++++--
 mod_auth_mellon.spec      | 8 +++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/README.redhat.rst b/README.redhat.rst
index a834aae..dde876c 100644
--- a/README.redhat.rst
+++ b/README.redhat.rst
@@ -33,7 +33,7 @@ ship with two versions of the ``mod_auth_mellon`` Apache module.
    ``/usr/lib*/httpd/modules/mod_auth_mellon.so`` 
 
 2. The ``mod_auth_mellon-diagnostics`` RPM contains the diagnostic
-   version of the Apache module
+   version of the Apache module. It is available in the CRB repository.
    ``/usr/lib*/httpd/modules/mod_auth_mellon-diagnostics.so``
 
 Because each version of the module has a different name both the
diff --git a/mellon_create_metadata.sh b/mellon_create_metadata.sh
index 9c587a6..81404e0 100644
--- a/mellon_create_metadata.sh
+++ b/mellon_create_metadata.sh
@@ -56,8 +56,10 @@ umask 0077
 
 TEMPLATEFILE="$(mktemp -t mellon_create_sp.XXXXXXXXXX)"
 
+dd if=/dev/urandom of=$TEMPLATEFILE.RANDOM bs=256 count=1 2>/dev/null
+
 cat >"$TEMPLATEFILE" <<EOF
-RANDFILE           = /dev/urandom
+RANDFILE           = ${TEMPLATEFILE}.RANDOM
 [req]
 default_bits       = 2048
 default_keyfile    = privkey.pem
@@ -70,7 +72,7 @@ EOF
 
 openssl req -utf8 -batch -config "$TEMPLATEFILE" -new -x509 -days 3652 -nodes -out "$OUTFILE.cert" -keyout "$OUTFILE.key" 2>/dev/null
 
-rm -f "$TEMPLATEFILE"
+rm -f "$TEMPLATEFILE" "${TEMPLATEFILE}.RANDOM"
 
 CERT="$(grep -v '^-----' "$OUTFILE.cert")"
 
diff --git a/mod_auth_mellon.spec b/mod_auth_mellon.spec
index 5ca574c..e14307c 100644
--- a/mod_auth_mellon.spec
+++ b/mod_auth_mellon.spec
@@ -1,7 +1,7 @@
 Summary: A SAML 2.0 authentication module for the Apache Httpd Server
 Name: mod_auth_mellon
 Version: 0.17.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source0: https://github.com/latchset/mod_auth_mellon/releases/download/v0.17.0/mod_auth_mellon-0.17.0.tar.gz
 Source1: auth_mellon.conf
 Source2: 10-auth_mellon.conf
@@ -103,6 +103,12 @@ in the doc directory for instructions on using the diagnostics build.
 %dir %attr(-, apache, apache) /run/%{name}/
 
 %changelog
+* Thu Aug 15 2024 Tomas Halman <thalman@redhat.com> - 0.17.0-9
+- Fixing mellon_create_metadata.sh script
+  Resolves: RHEL-35898
+- Publishing diagnostic module in CRB repository
+  Resolves: RHEL-33585
+
 * Wed Apr 5 2023 Tomas Halman <thalman@redhat.com> - 0.17.0-8
 - Fixing gating issue - rebuild
   Resolves: rhbz#2184763