debian/.gitlab-ci.yml

@@ -9,6 +9,7 @@ variables:
   SALSA_CI_DISABLE_BLHC: 1
   SALSA_CI_DISABLE_LINTIAN: 0
   SALSA_CI_DISABLE_PIUPARTS: 0
-  SALSA_CI_DISABLE_DEBREBUILD: 0
+  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

debian/patches/27_check_mysql_fix_replica

@@ -1,51 +0,0 @@
-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;
- 				}
- 			}
- 

debian/patches/series

@@ -20,4 +20,3 @@
 25_check_users_sd_get_uids
 26_check_mysql_replica
 # feature patches
-27_check_mysql_fix_replica