From 144eacfc255f9b9bb2b983335dc84f8c0975733e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 29 May 2026 11:40:17 +0200
Subject: [PATCH] liblognorm: 2.0.9 -> 2.1.0

https://github.com/rsyslog/liblognorm/blob/v2.1.0/ChangeLog
---
 pkgs/by-name/li/liblognorm/package.nix | 30 +++++++++++++++++++-------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/li/liblognorm/package.nix b/pkgs/by-name/li/liblognorm/package.nix
index c6feb49595e9..5211eaf7e93c 100644
--- a/pkgs/by-name/li/liblognorm/package.nix
+++ b/pkgs/by-name/li/liblognorm/package.nix
@@ -1,34 +1,48 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
+  autoreconfHook,
   pkg-config,
   libestr,
   json_c,
-  pcre,
+  pcre2,
   libfastjson,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "liblognorm";
-  version = "2.0.9";
+  version = "2.1.0";
 
-  src = fetchurl {
-    url = "https://www.liblognorm.com/files/download/liblognorm-${finalAttrs.version}.tar.gz";
-    hash = "sha256-dsfMLLdqPVjncy4M/yORgPg/O2NQAriqBIZciBKFd5M=";
+  src = fetchFromGitHub {
+    owner = "rsyslog";
+    repo = "liblognorm";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-XHfTSLYjfGRNmPUQrLWK+Co4v4cCmtfhZ0wruAC0RNI=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  postPatch = ''
+    patchShebangs tests/*.sh
+  '';
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
   buildInputs = [
     libestr
     json_c
-    pcre
+    pcre2
     libfastjson
   ];
 
   configureFlags = [ "--enable-regexp" ];
 
+  doCheck = true;
+
   meta = {
+    changelog = "https://github.com/rsyslog/liblognorm/blob/${finalAttrs.src.tag}/ChangeLog";
     description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form";
     homepage = "https://www.liblognorm.com/";
     license = lib.licenses.lgpl21;