[packages/apache-mod_watch] Build fix

arekm arekm at pld-linux.org
Tue May 12 19:15:22 CEST 2026


commit 3b0c85dd1f8f84645c8aff0a6d3c9d45393d4fe3
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue May 12 19:15:09 2026 +0200

    Build fix

 apache-mod_watch-gcc15-c23.patch | 48 ++++++++++++++++++++++++++++++++++++++++
 apache-mod_watch.spec            |  4 +++-
 2 files changed, 51 insertions(+), 1 deletion(-)
---
diff --git a/apache-mod_watch.spec b/apache-mod_watch.spec
index 1eb3e6d..668dad0 100644
--- a/apache-mod_watch.spec
+++ b/apache-mod_watch.spec
@@ -7,7 +7,7 @@ Summary:	Apache module: Monitoring Interface for MRTG
 Summary(pl.UTF-8):	Moduł do apache: Interfejs do monitorowania za pomocą MRTG
 Name:		apache-mod_%{mod_name}
 Version:	4.03
-Release:	10.1
+Release:	10.2
 License:	BSD
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.snert.com/Software/download/mod_watch%(echo %{version} | tr -d .).tgz
@@ -17,6 +17,7 @@ Patch0:		%{name}-apr-fix.patch
 Patch1:		%{name}-shm-fix.patch
 Patch2:		%{name}-mutex.patch
 Patch3:		%{name}-apache24.patch
+Patch4:		%{name}-gcc15-c23.patch
 URL:		http://www.snert.com/Software/mod_watch/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0.52-2
@@ -51,6 +52,7 @@ wspiera mod_vhost_alias oraz mod_gzip.
 %patch -P1 -p1
 %patch -P2 -p1
 %patch -P3 -p1
+%patch -P4 -p1
 
 %build
 %{__make} -f Makefile.dso build \
diff --git a/apache-mod_watch-gcc15-c23.patch b/apache-mod_watch-gcc15-c23.patch
new file mode 100644
index 0000000..dec78f1
--- /dev/null
+++ b/apache-mod_watch-gcc15-c23.patch
@@ -0,0 +1,48 @@
+--- mod_watch-4.3/mod_watch.c.orig	2026-05-12 00:40:47.372236931 +0200
++++ mod_watch-4.3/mod_watch.c	2026-05-12 00:44:05.289765240 +0200
+@@ -70,6 +70,7 @@
+ #include "http_log.h"
+ #include "http_protocol.h"
+ #include "http_request.h"
++#include "http_connection.h"
+ 
+ #include "apr.h"
+ #include "apr_lib.h"
+@@ -187,6 +188,7 @@
+  *** Shared Memory Hash Table Routines
+  ***********************************************************************/
+ 
++#include "Memory.h"
+ #include "SharedHash.h"
+ 
+ static int shTableSize;
+@@ -1625,11 +1627,11 @@
+  * context: global
+  */
+ static const char *
+-WatchLogAll(cmd_parms *cmd, void *dconf, const char *bool)
++WatchLogAll(cmd_parms *cmd, void *dconf, const char *boolval)
+ {
+-	watch_log_all = ml_istrue(bool);
++	watch_log_all = ml_istrue(boolval);
+ 
+-	if (watch_log_all || ml_isfalse(bool))
++	if (watch_log_all || ml_isfalse(boolval))
+ 		return (const char *) 0;
+ 
+ 	return "Boolean word must be either true/false, on/off, yes/no, or 1/0";
+@@ -1655,11 +1657,11 @@
+  * context: global
+  */
+ static const char *
+-WatchDynamicVirtualHost(cmd_parms *cmd, void *dconf, const char *bool)
++WatchDynamicVirtualHost(cmd_parms *cmd, void *dconf, const char *boolval)
+ {
+-	watchDynamicVirtualHost = ml_istrue(bool);
++	watchDynamicVirtualHost = ml_istrue(boolval);
+ 
+-	if (watchDynamicVirtualHost || ml_isfalse(bool))
++	if (watchDynamicVirtualHost || ml_isfalse(boolval))
+ 		return (const char *) 0;
+ 
+ 	return "Boolean word must be either true/false, on/off, yes/no, or 1/0";
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apache-mod_watch.git/commitdiff/3b0c85dd1f8f84645c8aff0a6d3c9d45393d4fe3



More information about the pld-cvs-commit mailing list