From fcd0516cff12d05b5016b47021a74c8a006aca41 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Nov 28 2024 02:12:04 +0000
Subject: Don't use /etc/pki/tls/cert.pem


/etc/pki/tls/cert.pem has been removed in Rawhide. See
https://fedoraproject.org/wiki/Changes/dropingOfCertPemFile (yes,
even though that's a pending Change, this already happened). This
causes tests of httpd to fail:
```
:: [ 12:50:27 ] :: [  ERROR   ] :: rlFileBackup: File /etc/pki/tls/cert.pem does not exist.
:: [ 12:50:27 ] :: [   FAIL   ] :: creating backup of /etc/pki/tls/cert.pem (Expected 0, got 8)
```
Fix this by using the preferred path for this bundle as produced
by update-ca-trust.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/httpd/http/lib.sh b/httpd/http/lib.sh
index fff8e21..20cff26 100755
--- a/httpd/http/lib.sh
+++ b/httpd/http/lib.sh
@@ -150,7 +150,7 @@ httpNSS_DBDIR=${httpNSS_DBDIR:-/etc/httpd/alias}
 httpHTTPD=${httpHTTPD:-httpd}
 httpSSL_CRT=${httpSSL_CRT:-/etc/pki/tls/certs/localhost.crt}
 httpSSL_KEY=${httpSSL_KEY:-/etc/pki/tls/private/localhost.key}
-httpSSL_PEM=${httpSSL_PEM:-/etc/pki/tls/cert.pem}
+httpSSL_PEM=${httpSSL_PEM:-/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem}
 httpSSL_O=${httpSSL_O:-`hostname`}
 httpSSL_CN=${httpSSL_CN:-`hostname`}
 httpLOGDIR=${httpLOGDIR:-/var/log/httpd}