add dependency on apr-util-1(dbm) so a DBM provider is present

This commit is contained in:
Joe Orton 2023-11-02 14:39:09 +00:00
parent c9253b5bbf
commit ac146d28f9
2 changed files with 37 additions and 1 deletions

View File

@ -0,0 +1,30 @@
--- httpd-2.4.58/modules/dav/fs/dbm.c.properr
+++ httpd-2.4.58/modules/dav/fs/dbm.c
@@ -100,7 +100,7 @@
/* There might not be a <db> if we had problems creating it. */
if (db == NULL) {
errcode = 1;
- errstr = "Could not open property database.";
+ errstr = "Could not open database.";
if (APR_STATUS_IS_EDSOOPEN(status))
ap_log_error(APLOG_MARK, APLOG_CRIT, status, ap_server_conf, APLOGNO(00576)
"The DBM driver could not be loaded");
@@ -147,7 +147,7 @@
"mod_dav_fs: The DBM library '%s' could not be loaded: %s",
err->reason, err->msg);
return dav_new_error(p, HTTP_INTERNAL_SERVER_ERROR, 1, status,
- "Could not load library for property database.");
+ "Could not load library for DBM database.");
}
if ((status = apr_dbm_open2(&file, driver, pathname,
ro ? APR_DBM_READONLY : APR_DBM_RWCREATE,
@@ -162,6 +162,9 @@
!= APR_SUCCESS
&& !ro) {
/* ### do something with 'status' */
+ ap_log_error(APLOG_MARK, APLOG_ERR, status, ap_server_conf,
+ "mod_dav_fs: apr_dbm_open() failed for %s (read-%s)",
+ pathname, ro ? "only" : "write");
/* we can't continue if we couldn't open the file
and we need to write */

View File

@ -24,7 +24,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.4.58
Release: 1%{?dist}
Release: 2%{?dist}
URL: https://httpd.apache.org/
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc
@ -142,6 +142,9 @@ Provides: mod_proxy_uwsgi = %{version}-%{release}
Requires: /etc/mime.types
Requires: httpd-tools = %{version}-%{release}
Requires: httpd-filesystem = %{version}-%{release}
%if 0%{?fedora} > 39 || 0%{?rhel} > 9
Requires: apr-util-1(dbm)%{_isa}
%endif
Requires(pre): httpd-filesystem
Conflicts: apr < 1.5.0-1
Conflicts: httpd < 2.4.53-2
@ -856,6 +859,9 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
* Thu Nov 2 2023 Joe Orton <jorton@redhat.com> - 2.4.58-2
- add dependency on apr-util-1(dbm) so a DBM provider is present
* Fri Oct 20 2023 Luboš Uhliarik <luhliari@redhat.com> - 2.4.58-1
- new version 2.4.58