[pkg-nagios-changes] [Git][nagios-team/monitoring-plugins][master] Switch to dh sequencer.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Wed Nov 4 12:25:26 GMT 2026
Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / monitoring-plugins
Commits:
c016ec90 by Bas Couwenberg at 2026-11-04T13:25:08+01:00
Switch to dh sequencer.
- - - - -
6 changed files:
- + debian/monitoring-plugins-basic.install
- debian/monitoring-plugins-basic.postrm.in → debian/monitoring-plugins-basic.postrm
- + debian/monitoring-plugins-common.install
- + debian/monitoring-plugins-standard.install
- debian/monitoring-plugins-standard.postrm.in → debian/monitoring-plugins-standard.postrm
- debian/rules
Changes:
=====================================
debian/monitoring-plugins-basic.install
=====================================
@@ -0,0 +1,63 @@
+usr/lib/nagios/plugins/check_apt
+usr/lib/nagios/plugins/check_by_ssh
+usr/lib/nagios/plugins/check_clamd
+usr/lib/nagios/plugins/check_cluster
+usr/lib/nagios/plugins/check_curl
+usr/lib/nagios/plugins/check_dhcp
+usr/lib/nagios/plugins/check_disk
+usr/lib/nagios/plugins/check_dummy
+usr/lib/nagios/plugins/check_file_age
+usr/lib/nagios/plugins/check_ftp
+usr/lib/nagios/plugins/check_host
+usr/lib/nagios/plugins/check_http.deprecated
+usr/lib/nagios/plugins/check_icmp
+usr/lib/nagios/plugins/check_ide_smart
+usr/lib/nagios/plugins/check_imap
+usr/lib/nagios/plugins/check_ircd
+usr/lib/nagios/plugins/check_jabber
+usr/lib/nagios/plugins/check_load
+usr/lib/nagios/plugins/check_log
+usr/lib/nagios/plugins/check_mrtg
+usr/lib/nagios/plugins/check_mrtgtraf
+usr/lib/nagios/plugins/check_mssql
+usr/lib/nagios/plugins/check_nagios
+usr/lib/nagios/plugins/check_nntp
+usr/lib/nagios/plugins/check_nntps
+usr/lib/nagios/plugins/check_ntp_peer
+usr/lib/nagios/plugins/check_ntp_time
+usr/lib/nagios/plugins/check_ping
+usr/lib/nagios/plugins/check_pop
+usr/lib/nagios/plugins/check_procs
+usr/lib/nagios/plugins/check_real
+usr/lib/nagios/plugins/check_rta_multi
+usr/lib/nagios/plugins/check_sensors
+usr/lib/nagios/plugins/check_simap
+usr/lib/nagios/plugins/check_smtp
+usr/lib/nagios/plugins/check_spop
+usr/lib/nagios/plugins/check_ssh
+usr/lib/nagios/plugins/check_ssmtp
+usr/lib/nagios/plugins/check_swap
+usr/lib/nagios/plugins/check_tcp
+usr/lib/nagios/plugins/check_time
+usr/lib/nagios/plugins/check_udp
+usr/lib/nagios/plugins/check_ups
+usr/lib/nagios/plugins/check_users
+
+debian/pluginconfig/apt.cfg usr/share/monitoring-plugins/templates-basic/
+debian/pluginconfig/curl-http.cfg usr/share/monitoring-plugins/templates-basic/
+debian/pluginconfig/dhcp.cfg usr/share/monitoring-plugins/templates-basic/
+debian/pluginconfig/disk.cfg usr/share/monitoring-plugins/templates-basic/
+debian/pluginconfig/dummy.cfg usr/share/monitoring-plugins/templates-basic/
+debian/pluginconfig/ftp.cfg usr/share/monitoring-plugins/templates-basic/
+debian/pluginconfig/http.cfg usr/share/monitoring-plugins/templates-basic/
+debian/pluginconfig/load.cfg usr/share/monitoring-plugins/templates-basic/
+debian/pluginconfig/mail.cfg usr/share/monitoring-plugins/templates-basic/
+debian/pluginconfig/news.cfg usr/share/monitoring-plugins/templates-basic/
+debian/pluginconfig/ntp.cfg usr/share/monitoring-plugins/templates-basic/
+debian/pluginconfig/ping.cfg usr/share/monitoring-plugins/templates-basic/
+debian/pluginconfig/procs.cfg usr/share/monitoring-plugins/templates-basic/
+debian/pluginconfig/real.cfg usr/share/monitoring-plugins/templates-basic/
+debian/pluginconfig/ssh.cfg usr/share/monitoring-plugins/templates-basic/
+debian/pluginconfig/tcp_udp.cfg usr/share/monitoring-plugins/templates-basic/
+debian/pluginconfig/telnet.cfg usr/share/monitoring-plugins/templates-basic/
+debian/pluginconfig/users.cfg usr/share/monitoring-plugins/templates-basic/
=====================================
debian/monitoring-plugins-basic.postrm.in → debian/monitoring-plugins-basic.postrm
=====================================
@@ -2,7 +2,19 @@
set -e
-BASIC_PLUGINS="@BASIC_PLUGINS@"
+BASIC_PLUGINS="apt"
+BASIC_PLUGINS="${BASIC_PLUGINS} curl-http"
+BASIC_PLUGINS="${BASIC_PLUGINS} dhcp disk dummy"
+BASIC_PLUGINS="${BASIC_PLUGINS} ftp"
+BASIC_PLUGINS="${BASIC_PLUGINS} http"
+BASIC_PLUGINS="${BASIC_PLUGINS} load"
+BASIC_PLUGINS="${BASIC_PLUGINS} mail"
+BASIC_PLUGINS="${BASIC_PLUGINS} news ntp"
+BASIC_PLUGINS="${BASIC_PLUGINS} ping procs"
+BASIC_PLUGINS="${BASIC_PLUGINS} real"
+BASIC_PLUGINS="${BASIC_PLUGINS} ssh"
+BASIC_PLUGINS="${BASIC_PLUGINS} tcp_udp telnet"
+BASIC_PLUGINS="${BASIC_PLUGINS} users"
if [ "$1" = "purge" ]; then
if which ucf >/dev/null 2>&1; then
@@ -13,7 +25,7 @@ if [ "$1" = "purge" ]; then
if [ "$have_ucf" = "yes" ]; then
ucf --purge /etc/nagios-plugins/config/${f}.cfg
fi
- done
+ done
fi
#DEBHELPER#
=====================================
debian/monitoring-plugins-common.install
=====================================
@@ -0,0 +1,6 @@
+usr/lib/nagios/plugins/negate
+usr/lib/nagios/plugins/urlize
+usr/lib/nagios/plugins/utils.pm
+usr/lib/nagios/plugins/utils.sh
+
+debian/functions usr/share/monitoring-plugins/dpkg/
=====================================
debian/monitoring-plugins-standard.install
=====================================
@@ -0,0 +1,41 @@
+usr/lib/nagios/plugins/check_breeze
+usr/lib/nagios/plugins/check_dbi
+usr/lib/nagios/plugins/check_dig
+usr/lib/nagios/plugins/check_disk_smb
+usr/lib/nagios/plugins/check_dns
+usr/lib/nagios/plugins/check_flexlm
+usr/lib/nagios/plugins/check_fping
+usr/lib/nagios/plugins/check_game
+usr/lib/nagios/plugins/check_hpjd
+usr/lib/nagios/plugins/check_ifoperstatus
+usr/lib/nagios/plugins/check_ifstatus
+usr/lib/nagios/plugins/check_ldap
+usr/lib/nagios/plugins/check_ldaps
+usr/lib/nagios/plugins/check_mailq
+usr/lib/nagios/plugins/check_mysql
+usr/lib/nagios/plugins/check_mysql_query
+usr/lib/nagios/plugins/check_oracle
+usr/lib/nagios/plugins/check_pgsql
+usr/lib/nagios/plugins/check_radius
+usr/lib/nagios/plugins/check_rpc
+usr/lib/nagios/plugins/check_snmp
+usr/lib/nagios/plugins/check_wave
+
+debian/pluginconfig/breeze.cfg usr/share/monitoring-plugins/templates-standard/
+debian/pluginconfig/disk-smb.cfg usr/share/monitoring-plugins/templates-standard/
+debian/pluginconfig/dns.cfg usr/share/monitoring-plugins/templates-standard/
+debian/pluginconfig/flexlm.cfg usr/share/monitoring-plugins/templates-standard/
+debian/pluginconfig/fping.cfg usr/share/monitoring-plugins/templates-standard/
+debian/pluginconfig/games.cfg usr/share/monitoring-plugins/templates-standard/
+debian/pluginconfig/hppjd.cfg usr/share/monitoring-plugins/templates-standard/
+debian/pluginconfig/ifstatus.cfg usr/share/monitoring-plugins/templates-standard/
+debian/pluginconfig/ldap.cfg usr/share/monitoring-plugins/templates-standard/
+debian/pluginconfig/mailq.cfg usr/share/monitoring-plugins/templates-standard/
+debian/pluginconfig/mrtg.cfg usr/share/monitoring-plugins/templates-standard/
+debian/pluginconfig/mysql.cfg usr/share/monitoring-plugins/templates-standard/
+debian/pluginconfig/netware.cfg usr/share/monitoring-plugins/templates-standard/
+debian/pluginconfig/nt.cfg usr/share/monitoring-plugins/templates-standard/
+debian/pluginconfig/pgsql.cfg usr/share/monitoring-plugins/templates-standard/
+debian/pluginconfig/radius.cfg usr/share/monitoring-plugins/templates-standard/
+debian/pluginconfig/rpc-nfs.cfg usr/share/monitoring-plugins/templates-standard/
+debian/pluginconfig/snmp.cfg usr/share/monitoring-plugins/templates-standard/
=====================================
debian/monitoring-plugins-standard.postrm.in → debian/monitoring-plugins-standard.postrm
=====================================
@@ -2,7 +2,18 @@
set -e
-STD_PLUGINS="@STD_PLUGINS@"
+STD_PLUGINS="breeze"
+STD_PLUGINS="${STD_PLUGINS} disk-smb dns"
+STD_PLUGINS="${STD_PLUGINS} flexlm fping"
+STD_PLUGINS="${STD_PLUGINS} games"
+STD_PLUGINS="${STD_PLUGINS} hppjd"
+STD_PLUGINS="${STD_PLUGINS} ifstatus"
+STD_PLUGINS="${STD_PLUGINS} ldap"
+STD_PLUGINS="${STD_PLUGINS} mailq mrtg mysql"
+STD_PLUGINS="${STD_PLUGINS} netware nt"
+STD_PLUGINS="${STD_PLUGINS} pgsql"
+STD_PLUGINS="${STD_PLUGINS} radius rpc-nfs"
+STD_PLUGINS="${STD_PLUGINS} snmp"
if [ "$1" = "purge" ]; then
if which ucf >/dev/null 2>&1; then
@@ -13,7 +24,7 @@ if [ "$1" = "purge" ]; then
if [ "$have_ucf" = "yes" ]; then
ucf --purge /etc/nagios-plugins/config/${f}.cfg
fi
- done
+ done
fi
#DEBHELPER#
=====================================
debian/rules
=====================================
@@ -1,55 +1,19 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
# for hardening
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
-PACKAGE = monitoring-plugins
-
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
include /usr/share/dpkg/architecture.mk
DEBIANDIR=$(CURDIR)/debian
NP_LIBEXEC:=/usr/lib/nagios/plugins
-NP_COMMON_DIR:=$(DEBIANDIR)/monitoring-plugins-common
-NP_BASIC_DIR:=$(DEBIANDIR)/monitoring-plugins-basic
-NP_BASIC_TEMPLATES:=$(NP_BASIC_DIR)/usr/share/monitoring-plugins/templates-basic
NP_STD_DIR:=$(DEBIANDIR)/monitoring-plugins-standard
-NP_STD_TEMPLATES:=$(NP_STD_DIR)/usr/share/monitoring-plugins/templates-standard
-
-std_plugins:=check_breeze check_ifoperstatus check_hpjd check_ifstatus \
- check_rpc check_snmp check_wave check_fping check_game \
- check_radius check_mysql check_mysql_query check_pgsql \
- check_disk_smb check_ldap check_ldaps \
- check_mailq \
- check_dns check_dig check_flexlm check_oracle \
- check_dbi
-
-common_files:=negate urlize utils.pm utils.sh
-
-basic_plugin_cfgs:=apt dhcp disk dummy ftp http curl-http load mail news ntp ping procs \
- real ssh tcp_udp telnet users
-std_plugin_cfgs:=breeze disk-smb dns flexlm fping games hppjd ifstatus ldap \
- mailq mrtg mysql netware nt pgsql radius rpc-nfs snmp
-
-PATH = /bin:/sbin:/usr/bin:/usr/sbin
-
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
ifeq ($(DEB_HOST_ARCH_OS),linux)
PING_CONFIGURE_ARGS = --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" \
@@ -59,34 +23,21 @@ PING_CONFIGURE_ARGS = --with-ping-command="/bin/ping -n -w %d -c %d %s" \
--with-ping6-command="/bin/ping6 -n -w %d -c %d %s"
endif
+%:
+ dh $@
-config.status: configure
- export PATH=$(PATH)
- dh_testdir
-
+override_dh_auto_configure:
# if /proc is not mounted, check_nagios and check_procs are
# silently omitted from build.
@if ! [ -d /proc/$$$$ ]; then \
echo "monitoring-plugins needs a mounted /proc to correctly build"; \
exit 1; \
fi
-
- ln -sf /usr/share/misc/config.sub build-aux
- ln -sf /usr/share/misc/config.guess build-aux
- rm -f config.cache
-
- # Add here commands to configure the package.
- # Append 'All warnings', 'Immediate binding' and dpkg-buildflags flags
+
CFLAGS="$$(DEB_CFLAGS_MAINT_APPEND='-Wall -Wl,-z,now' dpkg-buildflags --get CFLAGS)" \
- PATH_TO_APTGET=/usr/bin/apt-get \
- PGINCLUDE="-I`pg_config --includedir`" PGLIBS="-lpq -lcrypt" \
- ./configure \
- --disable-maintainer-mode \
+ dh_auto_configure -- \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
--libexecdir=${NP_LIBEXEC} \
--with-perl=/usr/bin/perl \
--with-openssl=/usr \
@@ -116,121 +67,32 @@ config.status: configure
--enable-extra-opts \
--disable-rpath
+override_dh_auto_test:
+
+execute_after_dh_auto_install:
+ chmod 644 debian/tmp/usr/lib/nagios/plugins/utils.pm
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-
-build-stamp: config.status
- dh_testdir
- $(MAKE)
- touch build-stamp
-
-clean: really-clean
-
-really-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp debian/README.Debian.plugins debian/monitoring-plugins-standard.substvars.in
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
- find -type d -name autom4te.cache -print0 | xargs -0 -r rm -rf \;
- -rm -f platform.h auto-include.h
- find -type d -name build -print0 | xargs -0 -r rm -rf \;
- find \( -name config.sub -o -name config.guess \) -print0 | xargs -0 -r rm -f \;
- -rm -f $(DEBIANDIR)/monitoring-plugins-basic.postrm $(DEBIANDIR)/monitoring-plugins-standard.postrm
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/monitoring-plugins.
- $(MAKE) install DESTDIR=${NP_BASIC_DIR}
- $(MAKE) install-root DESTDIR=${NP_BASIC_DIR}
- chmod 644 ${NP_BASIC_DIR}/usr/lib/nagios/plugins/utils.pm
- # split up basic vs. standard plugins
- for p in ${std_plugins}; do \
- mv ${NP_BASIC_DIR}/${NP_LIBEXEC}/$$p ${NP_STD_DIR}/${NP_LIBEXEC}; \
- done
# rename check_http to check_http_deprecated for making use of update-alternatives
- mv ${NP_BASIC_DIR}/${NP_LIBEXEC}/check_http ${NP_BASIC_DIR}/${NP_LIBEXEC}/check_http.deprecated
- # slit out common files
- for p in ${common_files}; do \
- mv ${NP_BASIC_DIR}/${NP_LIBEXEC}/$$p ${NP_COMMON_DIR}/${NP_LIBEXEC}; \
- done
+ mv debian/tmp${NP_LIBEXEC}/check_http debian/tmp${NP_LIBEXEC}/check_http.deprecated
+
# remove check_uptime for now (conflicting with check_uptime from n-p-c)
- rm ${NP_BASIC_DIR}/${NP_LIBEXEC}/check_uptime
- # now do the same for their configs, copying them into seperate
- # "template" directories outside of /usr/share/doc for ucf to use.
- for c in ${basic_plugin_cfgs}; do \
- cp $(DEBIANDIR)/pluginconfig/$${c}.cfg ${NP_BASIC_TEMPLATES}; \
- done
- for c in ${std_plugin_cfgs}; do \
- cp $(DEBIANDIR)/pluginconfig/$${c}.cfg ${NP_STD_TEMPLATES}; \
- done
- # dynamically create the postrm scripts using a template, so that we
- # don't have to define the same list of plugin configs over and over.
- sed -e 's/@BASIC_PLUGINS@/${basic_plugin_cfgs}/' \
- < $(DEBIANDIR)/monitoring-plugins-basic.postrm.in \
- > $(DEBIANDIR)/monitoring-plugins-basic.postrm
- sed -e 's/@STD_PLUGINS@/${std_plugin_cfgs}/' \
- < $(DEBIANDIR)/monitoring-plugins-standard.postrm.in \
- > $(DEBIANDIR)/monitoring-plugins-standard.postrm
- # copy our dpkg-sourced functions etc into place
- mkdir -p ${NP_COMMON_DIR}/usr/share/monitoring-plugins/dpkg
- install -m 644 -t ${NP_COMMON_DIR}/usr/share/monitoring-plugins/dpkg \
- $(DEBIANDIR)/functions
- # remove /usr/include from monitoring-plugins-basic (in case its empty and exists)
- [ ! -d ${NP_BASIC_DIR}/usr/include ] || rmdir ${NP_BASIC_DIR}/usr/include
+ rm debian/tmp${NP_LIBEXEC}/check_uptime
+
# generate debian/README.Debian.plugins
perl ./debian/bin/gen_plugin_deps.pl
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_installchangelogs -i
- dh_installdocs -i
- dh_link -i
- dh_installexamples -i
- dh_installman -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
+override_dh_installchangelogs:
dh_installchangelogs -p monitoring-plugins-basic -a ChangeLog
- dh_installchangelogs -Nmonitoring-plugins-basic
- dh_installdocs -a
- dh_link -a
- dh_installexamples -a
- dh_installman -a
- dh_installalternatives -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a -X utils.pm
- dh_installdeb -a
- dh_shlibdeps -a -Nmonitoring-plugins-standard
+ dh_installchangelogs -N monitoring-plugins-basic
+
+override_dh_shlibdeps:
+ dh_shlibdeps -N monitoring-plugins-standard
+
dpkg-shlibdeps -Tdebian/monitoring-plugins-standard.substvars \
${NP_STD_DIR}/${NP_LIBEXEC}/check_dns
dpkg-shlibdeps -Tdebian/monitoring-plugins-standard.substvars.in \
-dSuggests ${NP_STD_DIR}/${NP_LIBEXEC}/check_*
+
grep shlibs:Suggests debian/monitoring-plugins-standard.substvars.in \
| sed -e 's/shlibs:Suggests/shlibs:Recommends/' \
>> debian/monitoring-plugins-standard.substvars
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
View it on GitLab: https://salsa.debian.org/nagios-team/monitoring-plugins/-/commit/c016ec90e46f73bdbbdb700cde8ff05edb5b6b5d
--
View it on GitLab: https://salsa.debian.org/nagios-team/monitoring-plugins/-/commit/c016ec90e46f73bdbbdb700cde8ff05edb5b6b5d
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20261104/71b2c865/attachment-0001.htm>
More information about the pkg-nagios-changes
mailing list