public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/civetweb] f44: rhbz#2512488
Date: Fri, 07 Aug 2026 17:58:08 GMT	[thread overview]
Message-ID: <178612548887.1.11292964726086203821.rpms-civetweb-874c5f832ece@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/civetweb
Branch : f44
Commit : 874c5f832ece17c5e11d3d5d2b4b06450099a33d
Author : Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date   : 2026-08-07T13:57:36-04:00
Stats  : +37/-8 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/civetweb/c/874c5f832ece17c5e11d3d5d2b4b06450099a33d?branch=f44

Log:
rhbz#2512488

---
diff --git a/0001-CMakeLists.txt.patch b/0001-CMakeLists.txt.patch
index 9c3950f..0613554 100644
--- a/0001-CMakeLists.txt.patch
+++ b/0001-CMakeLists.txt.patch
@@ -1,5 +1,5 @@
---- civetweb-1.16/CMakeLists.txt.orig	2026-02-19 13:25:55.181183928 -0500
-+++ civetweb-1.16/CMakeLists.txt	2026-02-19 13:26:24.274831312 -0500
+--- 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)
@@ -11,3 +11,25 @@
  
  # 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 312922d..dde4a98 100644
--- a/civetweb.spec
+++ b/civetweb.spec
@@ -4,14 +4,15 @@
 Name:           civetweb
 Summary:        Embedded C/C++ web server
 Version:        1.16
-Release:        14%{?dev:%{dev}}%{?dist}
+Release:        15%{?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,11 @@ mkdir -p %{buildroot}%{_docdir}/civetweb
 %{_datadir}/pkgconfig/*
 
 %changelog
+* Fri Aug 7 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1.16-15
+- 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
 - enable WEBSOCKETS and X_DOM_SOCKET as requested
 

                 reply	other threads:[~2026-08-07 17:58 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178612548887.1.11292964726086203821.rpms-civetweb-874c5f832ece@fedoraproject.org \
    --to=kkeithle@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox