From 03b136561c2b46d153ded0ce6caa2a078d869f09 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 25 Oct 2026 14:26:09 +0100
Subject: [PATCH] rsyslog: 8.2608.0 -> 8.2610.0

Changelog: https://raw.githubusercontent.com/rsyslog/rsyslog/v8.2610.0/ChangeLog
(cherry picked from commit affa0b4bf626510ae066f70c612a7d017c96f239)
---
 pkgs/by-name/rs/rsyslog/package.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/rs/rsyslog/package.nix b/pkgs/by-name/rs/rsyslog/package.nix
index b827dc882941..6bdd6e604909 100644
--- a/pkgs/by-name/rs/rsyslog/package.nix
+++ b/pkgs/by-name/rs/rsyslog/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   pkg-config,
   autoreconfHook,
   autoconf-archive,
@@ -66,22 +65,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rsyslog";
-  version = "8.2608.0";
+  version = "8.2610.0";
 
   src = fetchurl {
     url = "https://www.rsyslog.com/files/download/rsyslog/rsyslog-${finalAttrs.version}.tar.gz";
-    hash = "sha256-49YMg0BSaMQi+V/ux0BFWhzEuRHQC9hCTV0ScrxQmxo=";
+    hash = "sha256-e9+V6B6mwO5dWGNC1X0qbjlbCJ+zxnMYoNxVWBbeQEs=";
   };
 
-  patches = [
-    # Remove with the first rsyslog release containing this fix.
-    (fetchpatch {
-      name = "CVE-2026-78002.patch";
-      url = "https://github.com/rsyslog/rsyslog/commit/667e3f61aec5ee02c5c2ee6f0f8accf6fe4301a9.patch";
-      hash = "sha256-QsxOJCvr6VBbLbXzednwgvCfisSvNm6zfxPaMFxXVT0=";
-    })
-  ];
-
   nativeBuildInputs = [
     pkg-config
     autoreconfHook
@@ -206,10 +196,10 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://www.rsyslog.com/";
     description = "Enhanced syslog implementation";
-    mainProgram = "rsyslogd";
     changelog = "https://raw.githubusercontent.com/rsyslog/rsyslog/v${finalAttrs.version}/ChangeLog";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = [ ];
+    mainProgram = "rsyslogd";
   };
 })