diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml index 45a5cf6..067d3ee 100644 --- a/debian/.gitlab-ci.yml +++ b/debian/.gitlab-ci.yml @@ -3,7 +3,7 @@ include: - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml variables: - RELEASE: 'unstable' + RELEASE: 'trixie' SALSA_CI_DISABLE_APTLY: 0 SALSA_CI_DISABLE_AUTOPKGTEST: 0 SALSA_CI_DISABLE_BLHC: 1 diff --git a/debian/changelog b/debian/changelog index 5ff6e70..3a9b589 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,27 +1,3 @@ -monitoring-plugins (2.4.0-5) UNRELEASED; urgency=medium - - * - - -- Jan Wagner Mon, 06 Oct 2025 12:04:34 +0200 - -monitoring-plugins (2.4.0-4) unstable; urgency=medium - - [ Jan Wagner ] - * [bee01b8] d/control: Remove Alexander Wirt from Uploaders - * [7236330] d/control: Adding libsystemd-dev and libsystemd0 as build-dep - (Closes: #1110265) - * [8cd52e3] Adding d/patches/25_check_users_sd_get_uids to fix user count - - [ Bas Couwenberg ] - * [4770fe3] Update lintian overrides. - * [294841c] Drop Priority: optional, default since dpkg 1.22.13. - * [97009f5] Revert "Drop Priority: optional, default since dpkg 1.22.13." - - [ Jan Wagner ] - * [3f438f9] Adding d/p/26_check_mysql_replica from upstream (Closes: #1116027) - - -- Jan Wagner Mon, 06 Oct 2025 11:29:35 +0200 - monitoring-plugins (2.4.0-3) unstable; urgency=medium * Upload to unstable diff --git a/debian/control b/debian/control index fb2c3c5..7b0f0c1 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: monitoring-plugins Section: net Priority: optional Maintainer: Debian Nagios Maintainer Group -Uploaders: Jan Wagner +Uploaders: Jan Wagner , Alexander Wirt Build-Depends: debhelper-compat (= 13), libcurl4-openssl-dev | libcurl4-nss-dev | libcurl4-gnutls-dev, libdbi-dev, @@ -13,8 +13,6 @@ Build-Depends: debhelper-compat (= 13), libnet-snmp-perl, libpq-dev, libssl-dev, - libsystemd0, - libsystemd-dev, liburiparser-dev, mawk | awk, perl, diff --git a/debian/patches/26_check_mysql_replica b/debian/patches/25_check_mysql_replica similarity index 100% rename from debian/patches/26_check_mysql_replica rename to debian/patches/25_check_mysql_replica diff --git a/debian/patches/25_check_users_sd_get_uids b/debian/patches/25_check_users_sd_get_uids deleted file mode 100644 index 9f541ed..0000000 --- a/debian/patches/25_check_users_sd_get_uids +++ /dev/null @@ -1,28 +0,0 @@ -From fb39f96ac6f72bb56d17f3e8694134dfea9186e9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lorenz=20K=C3=A4stle?= - <12514511+RincewindsHat@users.noreply.github.com> -Date: Mon, 11 Aug 2025 21:49:20 +0200 -Subject: [PATCH] check_users: Use sd_get_uids instead of sd_get_session - -Previously check_users in combination with systemd used -sd_get_sessions (3) to aquire the number of users, probably -with the idea that every users opens a session. -Turns out, that a user can have multiple sessions and we only really -want to know how many users there are. - -This commit changes to sd_get_uids (3) to achieve that target. ---- - plugins/check_users.d/users.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/plugins/check_users.c -+++ b/plugins/check_users.c -@@ -92,7 +92,7 @@ - - #ifdef HAVE_LIBSYSTEMD - if (sd_booted () > 0) -- users = sd_get_sessions (NULL); -+ users = sd_get_uids(NULL); - else { - #endif - #if HAVE_WTSAPI32_H diff --git a/debian/patches/series b/debian/patches/series index f540ae3..8c6dcfa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,6 +17,5 @@ 22_check_by_ssh_missing_options 23_sslutils_fix_error_message 24_check_http_deprecation -25_check_users_sd_get_uids -26_check_mysql_replica +25_check_mysql_replica # feature patches diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides deleted file mode 100644 index f4720ca..0000000 --- a/debian/source/lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# Not supported by devscripts in trixie -older-debian-watch-file-standard 4 * -