lp:~ubuntu-branches/ubuntu/oneiric/nagios-plugins/oneiric-201109071712

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/oneiric/nagios-plugins

Ubuntu branches: Pending requested 2011-09-07

Diff: 3158 lines (+18/-3116) (has conflicts)

3 files modified

build-aux/config.guess (+0/-1500)
build-aux/config.sub (+0/-1616)
debian/patches/90_hardened_build_fixes.dpatch (+18/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

43. By Kees Cook on 2011-09-07

releasing version 1.4.15-4ubuntu2

42. By Kees Cook on 2011-09-07

re-enable hardened builds (LP: #837085)

41. By Scott Moser on 2011-05-28

* Merge from debian unstable (LP: #789347). 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 qstat and fping in main.
  - 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.
* Add 13_check_smtp_greeting.dpatch (Closes: #611914), thanks Daniel Piddock
  for spotting and Holger Weiss for providing a fix
  - Abort immediately if we don't receive a server greeting or if the
    greeting doesn't contain the "--expect"ed string (by default: "220")
    instead of blindly sending the EHLO/HELO line.
* Add 14_check_icmp_multiple_ips.dpatch (Closes: #623702), thanks Max Kosmach
  for spotting and Sebastian Harl for providing a fix
  - When specifying a host-name on the command line, each of its IPs is added
    to the host table (and each one is pinged). So, the buffer has to be large
    enough to hold all of the respective host objects. (argc - 1) only fits
    hosts with a single IP.
* Move libraries linked at compile time against checks of
  nagios-plugins-standard from Depends to Recommends (Closes: #569028)
  - Add slightly modified bin/gen_plugin_deps.pl from collectd source package
  - Add linked libraries via bin/gen_plugin_deps.pl into
    /usr/share/doc/nagios-plugins-standard/README.Debian.plugins
  - Build-Depend on perl
  - Create customized substvars for nagios-plugins-standard via
    dpkg-shlibdeps in debian/rules
  - Remove temporary files via clean target in debian/rules
  - Add hint to NEWS.Debian

40. By Chuck Short on 2010-12-24

* Merge from debian unstable. 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 qstat and fping in main.
  - 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)

39. By Chuck Short on 2010-09-27

* 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.
  - debian/pluginconfig/nt.cfg: Fix syntax error. (LP: #595528)

38. By Kees Cook on 2010-08-30

debian/control: add missed hardening-wrapper to build-depends.

37. By Chuck Short on 2010-06-21

debian/pluginconfig/nt.cfg: Fix syntax error. (LP: #595528)

36. By Chuck Short on 2010-05-10

* 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.

35. By Chuck Short on 2010-02-01

* 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).

34. By Kees Cook on 2009-08-20

debian/{control,rules}: add and enable hardened build for PIE
(Debian bug 542728).