diff -u nagios-plugins-1.4.15/debian/control nagios-plugins-1.4.15/debian/control --- nagios-plugins-1.4.15/debian/control +++ nagios-plugins-1.4.15/debian/control @@ -1,9 +1,10 @@ Source: nagios-plugins Section: net Priority: extra -Maintainer: Debian Nagios Maintainer Group +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Nagios Maintainer Group Uploaders: Jan Wagner , Alexander Wirt -Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9), autotools-dev, libldap2-dev, libpq-dev, libmysqlclient-dev | libmysqlclient16-dev | libmysqlclient15-dev, libradiusclient-ng-dev, libkrb5-dev, libnet-snmp-perl, procps, mawk | awk +Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9), autotools-dev, libldap2-dev, libpq-dev, libmysqlclient-dev, libradiusclient-ng-dev, libkrb5-dev, libnet-snmp-perl, procps, mawk | awk, hardening-wrapper Homepage: http://nagiosplug.sourceforge.net Vcs-Browser: http://svn.debian.org/wsvn/pkg-nagios/nagios-plugins/ Vcs-Svn: svn://svn.debian.org/pkg-nagios/nagios-plugins/trunk/ @@ -34,8 +35,8 @@ Package: nagios-plugins-basic Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, procps, iputils-ping [linux-any], inetutils-ping [kfreebsd-any hurd-any], ucf -Conflicts: nagios-plugins (<= 1.4.2-3) -Replaces: nagios-plugins, nagios-plugins-standard +Conflicts: nagios-plugins (<= 1.4.2-3), nagios-plugins-extra (<= 1.3.1.0) +Replaces: nagios-plugins, nagios-plugins-standard, nagios-plugins-extra (<= 1.3.1.0) Suggests: nagios3 Description: Plugins for the nagios network monitoring and management system Nagios is a host/service/network monitoring and management system. It has @@ -59,8 +60,7 @@ Architecture: any Conflicts: nagios-plugins (<= 1.4.2-3) Replaces: nagios-plugins -Depends: ${shlibs:Depends}, ${misc:Depends}, ucf, nagios-plugins-basic (>= 1.4.5-2) -Recommends: fping, snmp, libnet-snmp-perl, dnsutils, bind9-host | host, smbclient, whois, qstat +Depends: ${shlibs:Depends}, ${misc:Depends}, ucf, nagios-plugins-basic (>= 1.4.5-2), snmp, libnet-snmp-perl, dnsutils, bind9-host, smbclient, whois Suggests: nagios3, postfix | sendmail-bin | exim4-daemon-heavy | exim4-daemon-light Description: Plugins for the nagios network monitoring and management system Nagios is a host/service/network monitoring and management system. It has @@ -79,0 +80,22 @@ + +Package: nagios-plugins-extra +Architecture: any +Conflicts: nagios-plugins (<= 1.4.2-3) +Replaces: nagios-plugins, nagios-plugins-standard ( <= 1.4.8-2) +Depends: ${shlibs:Depends}, ${misc:Depends}, fping, qstat, ucf, nagios-plugins-basic (>= 1.4.5-2) +Suggests: nagios2 | nagios-text | nagios +Description: Plugins for the nagios network monitoring and manegement system. + Nagios is a host/service/network monitoring and management system. It has + the following features: + . + o Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, + PING, etc.) + o Plugin interface to allow for user-developed service checks + o Contact notifications when problems occur and get resolved (via email, + pager, or user-defined method) + o Ability to define event handlers to be run during service or host events + (for proactive problem resolution) + o Web output (current status, notifications, history, log file, etc.) + . + This package provides the suite of plugins that provide extra functionality + to be useful on a central nagios host. diff -u nagios-plugins-1.4.15/debian/changelog nagios-plugins-1.4.15/debian/changelog --- nagios-plugins-1.4.15/debian/changelog +++ nagios-plugins-1.4.15/debian/changelog @@ -1,3 +1,19 @@ +nagios-plugins (1.4.15-2ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #682219), remaining changes: + - debian/control: + + Keep on building with libradius1-dev to avoid pusing radiusclient-ng to + main. + + Don't depend on nagios-plugins-extra, we don't need qstat and fping + in main. + + Add hardening-wrapper to build-depends. + - debian/{control,rules}: add an enable hardened build for PIE. + (Debian bug 542728). + - Build with libmysqlclient-dev only. + - debian/pluginconfig/nt.cfg: Fix syntax error. (LP: #595528) + + -- Lorenzo De Liso Sat, 27 Nov 2010 21:28:25 +0100 + nagios-plugins (1.4.15-2) unstable; urgency=low [ Alexander Wirt ] @@ -40,6 +56,30 @@ -- Jan Wagner Sat, 31 Jul 2010 10:34:04 +0200 +nagios-plugins (1.4.14-5ubuntu3) maverick; urgency=low + + * debian/control: add missed hardening-wrapper to build-depends. + + -- Kees Cook Mon, 30 Aug 2010 10:42:45 -0700 + +nagios-plugins (1.4.14-5ubuntu2) maverick; urgency=low + + * debian/pluginconfig/nt.cfg: Fix syntax error. (LP: #595528) + + -- Chuck Short Mon, 21 Jun 2010 08:58:28 -0400 + +nagios-plugins (1.4.14-5ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Remaining changes: + - debian/control: keep on building with libradius1-dev to avoid pusing radiusclient-ng + to main. + - Don't depend on nagios-plugins-extra, we dont need qstat and fping in main. + - debian/{control,rules}: add an enable hardened build for PIE. + (Debian bug 542728). + - Build with libmysqlclient-dev only. + + -- Chuck Short Mon, 10 May 2010 15:02:18 +0100 + nagios-plugins (1.4.14-5) unstable; urgency=low * Adding links to Debian and Upstream bugreports into most of the patches @@ -105,6 +145,18 @@ -- Jan Wagner Mon, 15 Mar 2010 22:41:29 +0100 +nagios-plugins (1.4.14-1ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: + - debian/control: keep on building with libradius1-dev to avoid pushing + radiusclient-ng to main. + - Don't depend on nagios-plugins-extra, we dont need qset and fping in + main. + - debian/{control,rules}: add and enable hardened build for PIE + (Debian bug 542728). + + -- Chuck Short Mon, 01 Feb 2010 00:24:19 +0000 + nagios-plugins (1.4.14-1) unstable; urgency=low * New upstream release @@ -146,6 +198,30 @@ -- Jan Wagner Sat, 23 Jan 2010 01:07:49 +0100 +nagios-plugins (1.4.13+git200906171200-1ubuntu3) karmic; urgency=low + + * debian/{control,rules}: add and enable hardened build for PIE + (Debian bug 542728). + + -- Kees Cook Thu, 20 Aug 2009 17:54:50 -0700 + +nagios-plugins (1.4.13+git200906171200-1ubuntu2) karmic; urgency=low + + * debian/control: Change build dependencies to MySQL 5.1. + + -- Mathias Gug Tue, 18 Aug 2009 18:01:00 -0400 + +nagios-plugins (1.4.13+git200906171200-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #397312 + - debian/control: keep on building with libradius1-dev to avoid pushing + radiusclient-ng to main + - Don't depend on nagios-plugins-extra, we dont need qstat and fping + in main. + * Fix LP: #382146 + + -- Bhavani Shankar Thu, 09 Jul 2009 12:41:10 +0530 + nagios-plugins (1.4.13+git200906171200-1) unstable; urgency=low * new upstream @@ -182,6 +258,20 @@ -- Jan Wagner Mon, 06 Jul 2009 20:21:42 +0200 +nagios-plugins (1.4.12-5ubuntu1) karmic; urgency=low + + [ Andreas Olsson ] + * Merge from debian unstable (LP: #376459), remaining changes: + - Keeping 99_check_ntp_segfaults.dpatch: Fix for check_ntp and check_ntp_peer + segfaults (LP: #291265 + - debian/control: keep on building with libradius1-dev to avoid pushing + radiusclient-ng to main + - Don't depend on nagios-plugins-extra, we dont need qstat and fping in main. + - Updated translations in po/ + * Adding XSBC-Original-Maintainer to debian/control + + -- Mathias Gug Thu, 14 May 2009 13:15:53 -0400 + nagios-plugins (1.4.12-5) unstable; urgency=low * add missing auth pair parameter to check_https_auth_hostname* command @@ -196,6 +286,23 @@ -- Jan Wagner Fri, 30 Jan 2009 22:50:35 +0100 +nagios-plugins (1.4.12-4ubuntu2) jaunty; urgency=low + + * Added 99_check_ntp_segfaults.dpatch: Fix for check_ntp and check_ntp_peer + segfaults (LP: #291265) + + -- Thierry Carrez Wed, 19 Nov 2008 16:44:27 +0000 + +nagios-plugins (1.4.12-4ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - Don't depend on nagios-plugins-extra, we dont need qstat and fping in main. + - Dropped debian/patches/99_check_http_segfault.dpatch (included upstream) + - debian/control: keep on building with libradius1-dev to avoid pushing radiusclient-ng + to main. + + -- Chuck Short Wed, 05 Nov 2008 02:58:16 +0000 + nagios-plugins (1.4.12-4) unstable; urgency=low * add server_port back to 41_check_http_fix_http_header.dpatch, @@ -291,6 +398,20 @@ -- Jan Wagner Tue, 17 Jun 2008 23:18:32 +0200 +nagios-plugins (1.4.11-2ubuntu2) intrepid; urgency=low + + * Dont depend on nagios-plugins-extras, we dont need qstat and fping in main. + + -- Chuck Short Fri, 17 Oct 2008 09:56:40 -0400 + +nagios-plugins (1.4.11-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches/99_check_http_segfault.dpatch: Fix segfaulting when + using check_http -a -x (LP: #201054) + + -- Chuck Short Mon, 26 May 2008 12:09:21 -0500 + nagios-plugins (1.4.11-2) unstable; urgency=low * Remove Build-depends on libsnmp*-dev since it's not needed anymore @@ -311,6 +432,41 @@ -- Jan Wagner Thu, 06 Mar 2008 22:07:31 +0100 +nagios-plugins (1.4.11-1ubuntu5) hardy; urgency=low + + * debian/control. + - Fix conflicts from dapper -> hardy (LP: #71292) + + -- Chuck Short Wed, 16 Apr 2008 11:42:52 -0400 + +nagios-plugins (1.4.11-1ubuntu4) hardy; urgency=low + + * Removed check_game and check_fping from nagios-plugins-standard and + place them in nagios-plugins-extra. plugins that we don't want to support + in main. This was done for the nagios-plugins MIR. + + -- Chuck Short Tue, 15 Apr 2008 10:19:59 -0400 + +nagios-plugins (1.4.11-1ubuntu3) hardy; urgency=low + + * debian/patches/99_check_http_segfault.dpatch. + - Fix segfaulting when check_http -a x. (LP: #201054) + + -- Chuck Short Mon, 14 Apr 2008 12:47:52 -0400 + +nagios-plugins (1.4.11-1ubuntu2) hardy; urgency=low + + * Replace nagios-plugins-extras. (LP: #212632) + + -- Chuck Short Tue, 08 Apr 2008 15:49:20 -0400 + +nagios-plugins (1.4.11-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Remove build-dep on libsnmp*-dev + + -- Stephan Hermann Thu, 31 Jan 2008 20:21:56 +0100 + nagios-plugins (1.4.11-1) unstable; urgency=low [ Jan Wagner ] @@ -329,6 +485,20 @@ -- Sean Finney Sat, 26 Jan 2008 15:04:00 +0100 +nagios-plugins (1.4.10-1ubuntu2) hardy; urgency=low + + * Rebuild against libldap2.4-2 + + -- Emmet Hikory Thu, 24 Jan 2008 22:02:40 +0900 + +nagios-plugins (1.4.10-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Remove build-dep on libsnmp*-dev + - debian/control: Set Ubuntu MOTU as maintainer + + -- Luca Falavigna Fri, 07 Dec 2007 09:47:04 +0000 + nagios-plugins (1.4.10-1) unstable; urgency=low [ Jan Wagner ] @@ -355,6 +525,15 @@ -- Sean Finney Fri, 07 Dec 2007 00:55:42 +0100 +nagios-plugins (1.4.8-2.2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #158859). Remaining Ubuntu changes: + - Add 50_misc_typos.dpatch + - Remove build-dep on libsnmp*-dev + - debian/control: Set Ubuntu MOTU as maintainer + + -- Luca Falavigna Sun, 28 Oct 2007 22:32:23 +0100 + nagios-plugins (1.4.8-2.2) unstable; urgency=high * Non-maintainer upload by testing-security team. @@ -364,6 +543,15 @@ -- Nico Golde Sun, 28 Oct 2007 16:15:54 +0100 +nagios-plugins (1.4.8-2.1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - Add 50_misc_typos.dpatch + - Remove build-dep on libsnmp*-dev + - debian/control: Set Ubuntu MOTU as maintainer + + -- Luca Falavigna Sun, 14 Oct 2007 15:41:14 +0200 + nagios-plugins (1.4.8-2.1) unstable; urgency=high * Non-maintainer upload by the testing-security team @@ -376,6 +564,20 @@ -- Steffen Joeris Sun, 14 Oct 2007 10:36:01 +0000 +nagios-plugins (1.4.8-2ubuntu2) gutsy; urgency=low + + * Remove build-dep on libsnmp*-dev + + -- Andy Price Wed, 20 Jun 2007 06:44:12 +0100 + +nagios-plugins (1.4.8-2ubuntu1) gutsy; urgency=low + + * Added 50_misc_typos.dpatch based on Malcolm Parsons' patch + (Fixes LP: #64595) + * debian/control: Set Ubuntu MOTU as maintainer + + -- Andy Price Sun, 17 Jun 2007 17:33:47 +0100 + nagios-plugins (1.4.8-2) unstable; urgency=low * fix typo in upstream configure script which caused some plugins diff -u nagios-plugins-1.4.15/debian/rules nagios-plugins-1.4.15/debian/rules --- nagios-plugins-1.4.15/debian/rules +++ nagios-plugins-1.4.15/debian/rules @@ -5,6 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export DEB_BUILD_HARDENING=1 PACKAGE = nagios-plugins @@ -24,18 +25,22 @@ NP_BASIC_TEMPLATES:=$(NP_BASIC_DIR)/usr/share/nagios-plugins/templates-basic NP_STD_DIR:=$(DEBIANDIR)/nagios-plugins-standard NP_STD_TEMPLATES:=$(NP_STD_DIR)/usr/share/nagios-plugins/templates-standard +NP_EXTRAS_DIR:=$(DEBIANDIR)/nagios-plugins-extra +NP_EXTRA_TEMPLATES:=$(NP_STD_DIR)/usr/share/nagios-plugins/templates-extras std_plugins:=check_breeze check_ifoperstatus check_hpjd check_ifstatus \ - check_rpc check_snmp check_wave check_fping check_game \ + check_rpc check_snmp check_wave \ 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 +extra_plugins:=check_fping check_game basic_plugin_cfgs:=apt dhcp disk dummy ftp 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 +extra_plugins_cfgs:=fping games PATH = /bin:/sbin:/usr/bin:/usr/sbin @@ -129,7 +134,7 @@ -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)/nagios-plugins-basic.postrm $(DEBIANDIR)/nagios-plugins-standard.postrm + -rm -f $(DEBIANDIR)/nagios-plugins-basic.postrm $(DEBIANDIR)/nagios-plugins-standard.postrm $(DEBIANDIR)/nagios-plugins-extras.postrm dh_clean install: build @@ -142,10 +147,13 @@ $(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 + # split up basic vs. standard vs extras plugins for p in ${std_plugins}; do \ mv ${NP_BASIC_DIR}/${NP_LIBEXEC}/$$p ${NP_STD_DIR}/${NP_LIBEXEC}; \ done + for p in ${extra_plugins}; do \ + mv ${NP_BASIC_DIR}/${NP_LIBEXEC}/$$p ${NP_EXTRAS_DIR}/${NP_LIBEXEC}; \ + done # 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 \ @@ -154,6 +162,9 @@ for c in ${std_plugin_cfgs}; do \ cp $(DEBIANDIR)/pluginconfig/$${c}.cfg ${NP_STD_TEMPLATES}; \ done + for c in ${extra_plugins_cfgs}; do \ + cp $(DEBIANDIR)/pluginconfig/$${c}.cfg ${NP_EXTRA_TEMPLATES}; \ + done # install check_bgpstate from contrib install -m 755 contrib/check_bgpstate.pl ${NP_STD_DIR}/${NP_LIBEXEC}/check_bgpstate install -m 755 contrib/check_linux_raid.pl ${NP_STD_DIR}/${NP_LIBEXEC}/check_linux_raid diff -u nagios-plugins-1.4.15/debian/pluginconfig/nt.cfg nagios-plugins-1.4.15/debian/pluginconfig/nt.cfg --- nagios-plugins-1.4.15/debian/pluginconfig/nt.cfg +++ nagios-plugins-1.4.15/debian/pluginconfig/nt.cfg @@ -5,7 +5,7 @@ # 'check_nt' command definition define command { command_name check_nt - command_line /usr/lib/nagios/plugins/check_nt -H '$HOSTADDRESS$' -v '$ARG1$' + command_line /usr/lib/nagios/plugins/check_nt -H $HOSTADDRESS$ -v $ARG1$ -v $ARG2$ } # 'check_nscp' command definition only in patch2: unchanged: --- nagios-plugins-1.4.15.orig/debian/nagios-plugins-extra.dirs +++ nagios-plugins-1.4.15/debian/nagios-plugins-extra.dirs @@ -0,0 +1,3 @@ +usr/lib/nagios/plugins +etc/nagios-plugins/config +usr/share/nagios-plugins/templates-standard