From f8c1454e8b66bc7ecd65ff65209d6ff9e7843bca Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Tue, 6 May 2025 22:12:59 +0000
Subject: [PATCH 1/3] rsyslog: update to 8.2504.0 and addon (1)

---
 packages/addons/service/rsyslog/package.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/addons/service/rsyslog/package.mk b/packages/addons/service/rsyslog/package.mk
index 068deb78d0..1422df3c03 100644
--- a/packages/addons/service/rsyslog/package.mk
+++ b/packages/addons/service/rsyslog/package.mk
@@ -2,9 +2,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rsyslog"
-PKG_VERSION="8.2502.0"
-PKG_SHA256="02fa197d21d519f5a25a928deb9397cd387ba7382b9b449782ba31d8f3118206"
-PKG_REV="0"
+PKG_VERSION="8.2504.0"
+PKG_SHA256="5092a20ed40987c74cc604ebfcd6c749e47eb9fc34adc1c2637e6553e7f047ab"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/rsyslog"

From 2d87aa4dba2c3d032e0316f6b5622c858f62f97c Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 7 May 2025 01:35:28 +0000
Subject: [PATCH 2/3] nmap: update to 7.96

- changelog: https://svn.nmap.org/nmap-releases/nmap-7.96/CHANGELOG
---
 .../network-tools-depends/nmap/package.mk              |  7 ++++---
 .../nmap-0001-allow-build-with-automake-1-17.patch     | 10 +++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/addons/addon-depends/network-tools-depends/nmap/package.mk b/packages/addons/addon-depends/network-tools-depends/nmap/package.mk
index 25aa5205a0..1ec1fe904e 100644
--- a/packages/addons/addon-depends/network-tools-depends/nmap/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/nmap/package.mk
@@ -2,12 +2,12 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="nmap"
-PKG_VERSION="7.95"
-PKG_SHA256="e14ab530e47b5afd88f1c8a2bac7f89cd8fe6b478e22d255c5b9bddb7a1c5778"
+PKG_VERSION="7.96"
+PKG_SHA256="98ae7a4f2fb66c1a3d482af8f00137283b917223446b46e7a20b06eabedf8c8a"
 PKG_LICENSE="GPL"
 PKG_SITE="https://nmap.org/"
 PKG_URL="https://nmap.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain openssl"
+PKG_DEPENDS_TARGET="toolchain openssl dbus libnl"
 PKG_LONGDESC="Free Security Scanned for Network."
 PKG_BUILD_FLAGS="-sysroot"
 
@@ -28,4 +28,5 @@ pre_configure_target() {
     rm -rf .${TARGET_NAME}
 
   export CPPFLAGS="${CPPFLAGS} -Iliblua"
+  export LIBS="${LIBS} -ldbus-1 -lnl-3 -lnl-genl-3"
 }
diff --git a/packages/addons/addon-depends/network-tools-depends/nmap/patches/nmap-0001-allow-build-with-automake-1-17.patch b/packages/addons/addon-depends/network-tools-depends/nmap/patches/nmap-0001-allow-build-with-automake-1-17.patch
index 8f4812afe9..cfaaf121bf 100644
--- a/packages/addons/addon-depends/network-tools-depends/nmap/patches/nmap-0001-allow-build-with-automake-1-17.patch
+++ b/packages/addons/addon-depends/network-tools-depends/nmap/patches/nmap-0001-allow-build-with-automake-1-17.patch
@@ -1,7 +1,7 @@
 diff -Nur a/libpcre/aclocal.m4 b/libpcre/aclocal.m4
 --- a/libpcre/aclocal.m4	2023-06-24 01:53:07.000000000 +0000
 +++ b/libpcre/aclocal.m4	2024-07-29 11:29:45.699525807 +0000
-@@ -32,10 +32,10 @@
+@@ -376,10 +376,10 @@
  # generated from the m4 files accompanying Automake X.Y.
  # (This private macro should not be called outside this file.)
  AC_DEFUN([AM_AUTOMAKE_VERSION],
@@ -14,7 +14,7 @@ diff -Nur a/libpcre/aclocal.m4 b/libpcre/aclocal.m4
        [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
  ])
  
-@@ -51,7 +51,7 @@
+@@ -395,7 +395,7 @@
  # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
  # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
@@ -26,7 +26,7 @@ diff -Nur a/libpcre/aclocal.m4 b/libpcre/aclocal.m4
 diff -Nur a/libpcre/configure b/libpcre/configure
 --- a/libpcre/configure	2024-02-28 16:06:30.000000000 +0000
 +++ b/libpcre/configure	2024-07-29 11:25:14.134081052 +0000
-@@ -2758,7 +2758,7 @@
+@@ -2832,7 +2832,7 @@
  
  
  
@@ -63,10 +63,10 @@ diff -Nur a/libssh2/aclocal.m4 b/libssh2/aclocal.m4
 diff -Nur a/libssh2/configure b/libssh2/configure
 --- a/libssh2/configure	2024-02-28 17:39:06.000000000 +0000
 +++ b/libssh2/configure	2024-07-29 11:25:39.590945455 +0000
-@@ -3236,7 +3236,7 @@
+@@ -3243,7 +3243,7 @@
  fi
  
- LIBSSH2VER=`$SED -ne 's/^#define LIBSSH2_VERSION *"\(.*\)"/\1/p' ${srcdir}/include/libssh2.h`
+ LIBSSH2_VERSION=`$SED -ne 's/^#define LIBSSH2_VERSION *"\(.*\)"/\1/p' ${srcdir}/include/libssh2.h`
 -am__api_version='1.16'
 +am__api_version='1.17'
  

From 61f80fb353a1acb64eefa2426019ae6b2583f2c4 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Mon, 12 May 2025 05:17:57 +0000
Subject: [PATCH 3/3] network-tools: update addon (3)

- nmap: update to 7.96
---
 packages/addons/tools/network-tools/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/addons/tools/network-tools/package.mk b/packages/addons/tools/network-tools/package.mk
index 3c96042556..b8ff24bc43 100644
--- a/packages/addons/tools/network-tools/package.mk
+++ b/packages/addons/tools/network-tools/package.mk
@@ -3,7 +3,7 @@
 
 PKG_NAME="network-tools"
 PKG_VERSION="1.0"
-PKG_REV="2"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"