nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-19 14:20:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[25.05] civetweb: 1.15 -> 1.16, apply patch for CVE-2025-55763 (#449178)

Browse Source
This commit is contained in:
Leona Maroni
2025-10-10 13:31:49 +00:00
committed by GitHub
parent 5fc4b0755c 0e976d12b6
commit 6d99e68bef
2 changed files with 58 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
pkgs/by-name/ci/civetweb/fix-pkg-config-files.patch Normal file
View File

@@ -0,0 +1,43 @@
From 69b825ef5daebdb6e3b51ce23663003807028634 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 28 Sep 2025 21:45:34 +0200
Subject: [PATCH] Use `@CMAKE_INSTALL_FULL_*DIR@` in pkg-config files
This make possible to install to absolute paths and not only to relative
paths.
---
cmake/civetweb-cpp.pc.in | 4 ++--
cmake/civetweb.pc.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmake/civetweb-cpp.pc.in b/cmake/civetweb-cpp.pc.in
index ca1232c5..dc2d99e3 100644
--- a/cmake/civetweb-cpp.pc.in
+++ b/cmake/civetweb-cpp.pc.in
@@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
Name: @PROJECT_NAME@-cpp
Description: generic graph library
diff --git a/cmake/civetweb.pc.in b/cmake/civetweb.pc.in
index 27cea8f1..dd669c5f 100644
--- a/cmake/civetweb.pc.in
+++ b/cmake/civetweb.pc.in
@@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
Name: @PROJECT_NAME@
Description: generic graph library
--
2.51.0

20
pkgs/by-name/ci/civetweb/package.nix
View File

@@ -2,20 +2,30 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "civetweb";
version = "1.15";
version = "1.16";
src = fetchFromGitHub {
owner = "civetweb";
repo = "civetweb";
rev = "v${version}";
sha256 = "sha256-Qh6BGPk7a01YzCeX42+Og9M+fjXRs7kzNUCyT4mYab4=";
tag = "v${finalAttrs.version}";
hash = "sha256-eXb5f2jhtfxDORG+JniSy17kzB7A4vM0UnUQAfKTquU=";
};
patches = [
./fix-pkg-config-files.patch
(fetchpatch {
name = "CVE-2025-55763.patch";
url = "https://github.com/civetweb/civetweb/commit/76e222bcb77ba8452e5da4e82ae6cecd499c25e0.patch";
hash = "sha256-gv2FR53SxmRCCTRjj17RhIjoHkgOz5ENs9oHmcfFmw8=";
})
];
outputs = [
"out"
"dev"
@@ -48,4 +58,4 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/civetweb/civetweb";
license = [ lib.licenses.mit ];
};
}
})