[rpms/civetweb] f43: Merge remote-tracking branch 'origin/f44' into f43

[rpms/civetweb] f43: Merge remote-tracking branch 'origin/f44' into f43

[Kaleb S. KEITHLEY]

A new commit has been pushed.

Repo   : rpms/civetweb
Branch : f43
Commit : b8db76912e4c66d69b659922324efc159b27fee5
Author : Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date   : 2026-08-07T14:19:07-04:00
Stats  : +47/-28 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/civetweb/c/b8db76912e4c66d69b659922324efc159b27fee5?branch=f43

Log:
Merge remote-tracking branch 'origin/f44' into f43

---
diff --git a/0001-CMakeLists.txt.patch b/0001-CMakeLists.txt.patch
index 028c519..0613554 100644
--- a/0001-CMakeLists.txt.patch
+++ b/0001-CMakeLists.txt.patch
@@ -1,9 +1,35 @@
---- civetweb-1.16/CMakeLists.txt.orig	2025-07-16 07:44:16.982762892 -0400
-+++ civetweb-1.16/CMakeLists.txt	2025-07-16 07:44:32.894505768 -0400
-@@ -1,5 +1,5 @@
+--- civetweb-1.16/CMakeLists.txt.orig	2023-04-08 11:38:36.000000000 -0400
++++ civetweb-1.16/CMakeLists.txt	2026-08-07 13:43:10.279677132 -0400
+@@ -1,8 +1,6 @@
  # Use at least CMake 3.3
 -cmake_minimum_required (VERSION 3.3.0)
-+cmake_minimum_required (VERSION 3.3.0...4.0)
- cmake_policy(VERSION 3.2.2)
- cmake_policy(SET CMP0054 NEW)
- cmake_policy(SET CMP0057 NEW)
+-cmake_policy(VERSION 3.2.2)
+-cmake_policy(SET CMP0054 NEW)
+-cmake_policy(SET CMP0057 NEW)
++cmake_minimum_required (VERSION 3.10)
++cmake_policy(VERSION 3.10)
+ 
+ # Set up the project
+ project (civetweb)
+@@ -88,6 +86,11 @@
+ option(CIVETWEB_ENABLE_WEBSOCKETS "Enable websockets connections" OFF)
+ message(STATUS "Websockets support - ${CIVETWEB_ENABLE_WEBSOCKETS}")
+ 
++# X DOM sockets support
++option(CIVETWEB_ENABLE_X_DOM_SOCKET "Enable X DOM sockets support" OFF)
++message(STATUS "X DOM sockets support - ${CIVETWEB_ENABLE_X_DOM_SOCKET}")
++
++
+ # Server statistics support
+ option(CIVETWEB_ENABLE_SERVER_STATS "Enable server statistics" OFF)
+ message(STATUS "Server statistics support - ${CIVETWEB_ENABLE_SERVER_STATS}")
+@@ -494,6 +497,9 @@
+ if (CIVETWEB_ENABLE_WEBSOCKETS)
+   add_definitions(-DUSE_WEBSOCKET)
+ endif()
++if (CIVETWEB_ENABLE_X_DOM_SOCKET)
++   add_definitions(-DUSE_X_DOM_SOCKET)
++endif()
+ if (CIVETWEB_ENABLE_SERVER_STATS)
+   add_definitions(-DUSE_SERVER_STATS)
+ endif()

diff --git a/civetweb.spec b/civetweb.spec
index 83ceec2..b28d7b3 100644
--- a/civetweb.spec
+++ b/civetweb.spec
@@ -8,10 +8,11 @@ Release:        11%{?dev:%{dev}}%{?dist}
 License:        MIT
 Url:            https://github.com/civetweb/civetweb
 Source:         https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
-Patch:		0001-CMakeLists.txt.patch
-Patch:		0002-src-civetweb.c.patch
-Patch:		0003-src-civetweb.c.patch
+Patch:          0001-CMakeLists.txt.patch
+Patch:          0002-src-civetweb.c.patch
+Patch:          0003-src-civetweb.c.patch
 BuildRequires:  cmake make gcc-c++
+BuildRequires:  zlib-devel
 
 %description
 Civetweb is an easy to use, powerful, C (C/C++) embeddable web server
@@ -39,8 +40,9 @@ Civetweb shared libs and associated header files
     -DBUILD_CONFIG=rpmbuild \
     -DBUILD_SHARED_LIBS:BOOL=ON \
     -DCIVETWEB_ENABLE_CXX:BOOL=ON \
-    -DCIVETWEB_ENABLE_WEBSOCKETS=ON \
-    -DCIVETWEB_ENABLE_X_DOM_SOCKET=ON \
+    -DCIVETWEB_ENABLE_WEBSOCKETS:BOOL=ON \
+    -DCIVETWEB_ENABLE_X_DOM_SOCKET:BOOL=ON \
+    -DCIVETWEB_ENABLE_ZLIB:BOOL=ON \
     -DCIVETWEB_BUILD_TESTING:BOOL=OFF
 
 export GCC_COLORS=
@@ -66,6 +68,10 @@ mkdir -p %{buildroot}%{_docdir}/civetweb
 %{_datadir}/pkgconfig/*
 
 %changelog
+* Fri Aug 7 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1.16-12
+- Add upstream's fix to actually support X_DOM_SOCKET with cmake
+- Enable ZLIB compression support
+
 * Mon Jun 8 2026 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 1.16-11
 - enable WEBSOCKETS and X_DOM_SOCKET as requested
 

diff --git a/civetweb.spec b/civetweb.spec
index dde4a98..b28d7b3 100644
--- a/civetweb.spec
+++ b/civetweb.spec
@@ -4,7 +4,7 @@
 Name:           civetweb
 Summary:        Embedded C/C++ web server
 Version:        1.16
-Release:        15%{?dev:%{dev}}%{?dist}
+Release:        11%{?dev:%{dev}}%{?dist}
 License:        MIT
 Url:            https://github.com/civetweb/civetweb
 Source:         https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -68,26 +68,13 @@ mkdir -p %{buildroot}%{_docdir}/civetweb
 %{_datadir}/pkgconfig/*
 
 %changelog
-* Fri Aug 7 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1.16-15
+* Fri Aug 7 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1.16-12
 - Add upstream's fix to actually support X_DOM_SOCKET with cmake
 - Enable ZLIB compression support
-- rhbz#2512488
 
-* Mon Jun 8 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-14
+* Mon Jun 8 2026 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 1.16-11
 - enable WEBSOCKETS and X_DOM_SOCKET as requested
 
-* Thu Feb 19 2026 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 1.16-13
-- civetweb 1.16, handle cmake-4 doesn't support cmake < 3.5 
-- upstream, civetweb-1.16+ has updated to minimum cmake-3.10, and there
-  don't seem to be any adverse effects building civetweb with that change.
-  And someday there might even be a civetweb-1.17.
-
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
 * Mon Sep 29 2025 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 1.16-10
 - civetweb 1.16, rhbz 2400162-2400166