From 52d9fc3bc35607d34b7f8c2bae53b08013965017 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Sat, 25 Oct 2025 12:49:13 +0200 Subject: [PATCH 1/4] Use test-build-validate-cleanup instead of test-build-twice. --- debian/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml index 45a5cf6..3afdb7e 100644 --- a/debian/.gitlab-ci.yml +++ b/debian/.gitlab-ci.yml @@ -12,4 +12,4 @@ variables: SALSA_CI_DISABLE_REPROTEST: 0 SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 0 SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: 0 - SALSA_CI_ENABLE_BUILD_PACKAGE_TWICE: 1 + SALSA_CI_ENABLE_VALIDATE_PACKAGE_CLEAN_UP: 1 From f047b0543dab7b7d89c5d28cc7a415466898f1ba Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Fri, 28 Nov 2025 12:16:26 +0100 Subject: [PATCH 2/4] Use debrebuild instead of reprotest. --- debian/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml index 3afdb7e..1d860d4 100644 --- a/debian/.gitlab-ci.yml +++ b/debian/.gitlab-ci.yml @@ -9,7 +9,7 @@ variables: SALSA_CI_DISABLE_BLHC: 1 SALSA_CI_DISABLE_LINTIAN: 0 SALSA_CI_DISABLE_PIUPARTS: 0 - SALSA_CI_DISABLE_REPROTEST: 0 + SALSA_CI_DISABLE_DEBREBUILD: 0 SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 0 SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: 0 SALSA_CI_ENABLE_VALIDATE_PACKAGE_CLEAN_UP: 1 From 861c613c8abb523ee3391b07edc1f887e7c60a91 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Fri, 28 Nov 2025 14:31:15 +0100 Subject: [PATCH 3/4] Don't use test-build-validate-cleanup, fails where pbuilder --twice succeeds. dpkg trolerates removal of generated autotools files, the CI job has no tolerance whatsoever. --- debian/.gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml index 1d860d4..c957a74 100644 --- a/debian/.gitlab-ci.yml +++ b/debian/.gitlab-ci.yml @@ -12,4 +12,3 @@ variables: SALSA_CI_DISABLE_DEBREBUILD: 0 SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 0 SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: 0 - SALSA_CI_ENABLE_VALIDATE_PACKAGE_CLEAN_UP: 1 From dfe02ab0206c78170419bc3263d8673d6170f6fe Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Fri, 28 Nov 2025 12:47:47 +0000 Subject: [PATCH 4/4] Adding d/p/27_check_mysql_fix_replica, Fixes reported regression for MariaDB 10.11.14-0+deb12u2 (Closes: #1116027) --- debian/patches/27_check_mysql_fix_replica | 51 +++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 52 insertions(+) create mode 100644 debian/patches/27_check_mysql_fix_replica diff --git a/debian/patches/27_check_mysql_fix_replica b/debian/patches/27_check_mysql_fix_replica new file mode 100644 index 0000000..3cce88f --- /dev/null +++ b/debian/patches/27_check_mysql_fix_replica @@ -0,0 +1,51 @@ +Backport of https://patch-diff.githubusercontent.com/raw/monitoring-plugins/monitoring-plugins/pull/2184.patch + +--- a/plugins/check_mysql.c ++++ b/plugins/check_mysql.c +@@ -300,32 +300,20 @@ + num_fields = mysql_num_fields(res); + fields = mysql_fetch_fields(res); + for(i = 0; i < num_fields; i++) { +- if (use_deprecated_slave_status) { +- if (strcmp(fields[i].name, "Slave_IO_Running") == 0) { +- slave_io_field = i; +- continue; +- } +- if (strcmp(fields[i].name, "Slave_SQL_Running") == 0) { +- slave_sql_field = i; +- continue; +- } +- if (strcmp(fields[i].name, "Seconds_Behind_Master") == 0) { +- seconds_behind_field = i; +- continue; +- } +- } else { +- if (strcmp(fields[i].name, "Replica_IO_Running") == 0) { +- slave_io_field = i; +- continue; +- } +- if (strcmp(fields[i].name, "Replica_SQL_Running") == 0) { +- slave_sql_field = i; +- continue; +- } +- if (strcmp(fields[i].name, "Seconds_Behind_Source") == 0) { +- seconds_behind_field = i; +- continue; +- } ++ if ((strcmp(fields[i].name, "Slave_IO_Running") == 0) || ++ (strcmp(fields[i].name, "Replica_IO_Running") == 0)) { ++ slave_io_field = i; ++ continue; ++ } ++ if ((strcmp(fields[i].name, "Slave_SQL_Running") == 0) || ++ (strcmp(fields[i].name, "Replica_SQL_Running") == 0)) { ++ slave_sql_field = i; ++ continue; ++ } ++ if ((strcmp(fields[i].name, "Seconds_Behind_Master") == 0) || ++ (strcmp(fields[i].name, "Seconds_Behind_Source") == 0)) { ++ seconds_behind_field = i; ++ continue; + } + } + diff --git a/debian/patches/series b/debian/patches/series index f540ae3..d3f523d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -20,3 +20,4 @@ 25_check_users_sd_get_uids 26_check_mysql_replica # feature patches +27_check_mysql_fix_replica