[med-svn] [Git][med-team/civetweb][master] 2 commits: fix ENABLE_XDOM with cmake: backport upstream patch, in master but not released

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / civetweb


Commits:
347ef6a8 by Fernando Hueso at 2026-08-11T15:18:54+02:00
fix ENABLE_XDOM with cmake: backport upstream patch, in master but not released

- - - - -
74149cde by Andreas Tille at 2026-08-11T15:18:54+02:00
Merge branch 'patch-2' into 'master'

fix ENABLE_XDOM with cmake: backport upstream patch, in master but not released

See merge request med-team/civetweb!3
- - - - -


3 changed files:

- debian/changelog
- + debian/patches/cmake_xdom.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -2,6 +2,8 @@ civetweb (1.16+dfsg-5) UNRELEASED; urgency=medium
 
   * d/rules: Add -DCIVETWEB_ENABLE_X_DOM_SOCKET=ON as requested per
     https://github.com/root-project/root-ci-images/pull/116
+  * d/patches: Backport fix for ignored -DCIVETWEB_ENABLE_X_DOM_SOCKET=ON flag
+    when using CMake (see https://github.com/civetweb/civetweb/pull/1225)
   * d/rules: Add -DCIVETWEB_ENABLE_ZLIB=ON as requested per
     https://github.com/root-project/root-ci-images/pull/116
 


=====================================
debian/patches/cmake_xdom.patch
=====================================
@@ -0,0 +1,38 @@
+From 08b7241f4bce808c3a932a5fddc1181acee5c0c1 Mon Sep 17 00:00:00 2001
+From: Sergey Linev <S.Linev at gsi.de>
+Date: Mon, 11 Dec 2023 10:57:43 +0100
+Subject: [PATCH] [cmake] let enable X DOM sockets
+
+Missing in cmake
+---
+ CMakeLists.txt | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a435a975..44cebaec 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -88,6 +88,11 @@ message(STATUS "IP Version 6 - ${CIVETWEB_ENABLE_IPV6}")
+ 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}")
+@@ -497,6 +502,9 @@ endif()
+ 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()
+-- 
+2.55.0


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ soversion
 webdav-uploads
 CVE-2025-55763.patch
 0001-Make-parsing-of-URL-encoded-forms-more-robust.patch
+cmake_xdom.patch



View it on GitLab: https://salsa.debian.org/med-team/civetweb/-/compare/02a71ffd1e03bad76627cbeea0fc8b76698ed664...74149cde2f0ae1b1e98c5ce6a2a8d654367e84dc

-- 
View it on GitLab: https://salsa.debian.org/med-team/civetweb/-/compare/02a71ffd1e03bad76627cbeea0fc8b76698ed664...74149cde2f0ae1b1e98c5ce6a2a8d654367e84dc
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260811/30a17fae/attachment-0001.htm>