[Pkg-nagios-changes] [icinga] 02/02: Imported Debian patch 1.10.1-1
Alexander Wirt
formorer at debian.org
Wed Nov 6 19:05:15 UTC 2013
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch master
in repository icinga.
commit 82549877fdfec8ea0dd1edc359f7bd995f94e22e
Merge: 4ef9215 85b59ef
Author: Alexander Wirt <formorer at debian.org>
Date: Wed Nov 6 09:07:00 2013 +0100
Imported Debian patch 1.10.1-1
Changelog | 18 +
Makefile.in | 2 +-
THANKS | 1 +
base/broker.c | 4 +-
base/checks.c | 40 +-
base/config.c | 139 +-
base/utils.c | 3 -
cgi/cmd.c | 2 +-
cgi/status.c | 4 +-
common/objects.c | 4 -
config.guess | 1510 ++++++++++++++++++
config.sub | 1619 ++++++++++++++++++++
configure | 4 +-
configure.in | 4 +-
debian/changelog | 10 +
debian/rules | 4 +-
html/main.html | 6 +-
icinga.spec | 7 +-
include/broker.h | 4 +-
include/common.h | 4 +-
include/icinga.h | 4 -
include/objects.h | 2 -
.../db/pgsql/upgrade/pgsql-upgrade-1.10.0.sql | 34 +-
module/idoutils/include/common.h | 4 +-
module/idoutils/include/protoapi.h | 3 +-
module/idoutils/src/db.c | 12 +-
module/idoutils/src/dbhandlers.c | 36 +-
module/idoutils/src/dbqueries.c | 58 +-
module/idoutils/src/ido2db.c | 2 -
module/idoutils/src/idomod.c | 10 +-
tests/etc/4967.cfg.disabled | 101 ++
update-version | 4 +-
xdata/xodtemplate.c | 100 ++
xdata/xodtemplate.h | 15 +-
xdata/xsddefault.c | 2 -
35 files changed, 3540 insertions(+), 236 deletions(-)
diff --cc debian/changelog
index 5263483,0000000..7d5581e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,432 -1,0 +1,442 @@@
++icinga (1.10.1-1) unstable; urgency=low
++
++ * [2b8968a] Install sql upgrade files for 1.10
++ * [4ef9215] Add versioned dep to jquery-ui to reenable calendar
++ * [9fbc042] Imported Upstream version 1.10.1
++ - fix problems in postinst (Closes: #728245)
++ * [27e8455] Update sql file installation
++
++ -- Alexander Wirt <formorer at debian.org> Wed, 06 Nov 2013 09:07:00 +0100
++
+icinga (1.10.0-1) unstable; urgency=low
+
+ * [3c852fa] Fix typo
+ * [1e3b0a9] Don't set -e in icingas initscript (Closes: #722261)
+ * [b2e5497] Enable cgi module for apache 2.4
+ * [f9e8662] Imported Upstream version 1.10.0
+ * [604c4f6] Bump standards version
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 24 Oct 2013 17:26:19 +0200
+
+icinga (1.9.3-2) unstable; urgency=low
+
+ * [7e2d81e] Update README.Debian
+ * [35c5ef6] Fix htpasswd handling on apache < 2.4
+
+ -- Alexander Wirt <formorer at debian.org> Wed, 24 Jul 2013 19:47:41 +0200
+
+icinga (1.9.3-1) unstable; urgency=low
+
+ * [db397b3] Remove obsolete debconf po templates
+ * [de82eae] Don't give the htpasswd password on the commandline
+ * [d031d94] Fix path to idoutils example config (Closes: #714240)
+ * [940f7de] Move apache config to /usr/share
+ * [7b2ec2a] Imported Upstream version 1.9.2
+ - Don't crash with fuzzy input (Closes: #716027)
+ * [e188314] Imported Upstream version 1.9.3
+
+ -- Alexander Wirt <formorer at debian.org> Fri, 19 Jul 2013 21:31:19 +0200
+
+icinga (1.9.1-2) unstable; urgency=low
+
+ * [9c53a84] Fix dependency on libgd3 (Closes: #710839)
+
+ -- Alexander Wirt <formorer at debian.org> Mon, 03 Jun 2013 08:08:21 +0200
+
+icinga (1.9.1-1) unstable; urgency=low
+
+ * [fe88365] Fix dependency on on icinga-doc
+ * [e07a105] Imported Upstream version 1.9.1
+ * [ce07681] Depend on new libgd3
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 23 May 2013 06:50:50 +0200
+
+icinga (1.9.0-1) unstable; urgency=low
+
+ * [006e77b] Allow www-data to read those archived logs
+ * [c732717] Don't destroy symlinked icinga configs with sed (Closes: #698137)
+ * [4a63fdf] install jquery-ui
+ * [d905069] Use bundled jquery-ui version
+ * [8110db1] Imported Upstream version 1.9.0
+ - Event profiling is now deprecated (Closes: #614356)
+ * [91e3d0b] Install 1.9.0 sql files
+ * [7d35822] Move stylesheets to cgi (Closes: #682334)
+ * [914bc33] Use debians jquery-ui and fix timepicker locations
+ * [51e1d00] Improve errorhandling in initscript (Closes: #698139)
+ * [0ed174a] Add indonesian debconf translation.
+ Thanks to Mahyuddin Susanto (Closes: #695651)
+ * [bbaa9f6] Recommend icinga-docs in the icinga metapackage (Closes: #682359)
+
+ -- Alexander Wirt <formorer at debian.org> Tue, 07 May 2013 16:18:34 +0200
+
+icinga (1.8.4-1) experimental; urgency=high
+
+ * [a466a1e] Replace /etc/init.d with service
+ * [eb7a611] Imported Upstream version 1.8.4
+ - This release fixes CVE-2012-6096 - buffer overflows
+ in cgis. (Closes: #697931)
+
+ -- Alexander Wirt <formorer at debian.org> Mon, 14 Jan 2013 06:22:39 +0100
+
+icinga (1.8.3-1) experimental; urgency=low
+
+ * [5330072] Imported Upstream version 1.8.3
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 13 Dec 2012 21:41:33 +0100
+
+icinga (1.8.2-1) experimental; urgency=low
+
+ * [868de52] Imported Upstream version 1.8.2
+
+ -- Alexander Wirt <formorer at debian.org> Wed, 28 Nov 2012 17:25:15 +0100
+
+icinga (1.8.1-2) experimental; urgency=low
+
+ * [4fb9f91] Fix broker filename in idoutils README.Debian.
+ Thanks to Michael Friedrich catching this error
+
+ -- Alexander Wirt <formorer at debian.org> Sun, 04 Nov 2012 21:57:50 +0100
+
+icinga (1.8.1-1) experimental; urgency=low
+
+ * [5947e03] Remove useless echo in do_stop of icingas initscript
+ * [fb9c4cb] Imported Upstream version 1.8.1
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 25 Oct 2012 07:04:55 +0200
+
+icinga (1.8.0-1) experimental; urgency=low
+
+ * [5c6b2b6] Remove build-dep on iputils-ping and do a wrap-and-sort
+ * [3e31fec] Even more wrap-and-sort
+ * [0c39b06] Imported Upstream version 1.8.0
+ - Fix Conflicting declarations of variable highlight_table_rows
+ (Closes: #688459)
+ - Remove buggy sql creation script (never used by packages)
+ (Closes: #683320)
+ * [9752230] Remove obsolete patch 80_fix_dbd_handling.dpatch
+ * [74ea069] Remove obsolete patch 99_fix_epn.dpatch
+ * [ebc54b8] jquery was updated
+ * [c3c04db] contexthelp was removed from upstream
+ * [b876c8c] Fix jquery link
+ * [eec91d0] Don't ask question if there is no config (Closes: #689601)
+ * [ce7f089] Fix mainurl
+ * [7c8cb8d] Add indonesian translation (Closes: #677118)
+ * [c0ddb94] Update Polish translation (Closes: #678155)
+ * [7eccc2b] Make apache directory match more strict (Closes: #679476)
+ * [b0d4ee9] Handle /var/run/icinga on our own (Closes: #689551)
+ * [e604f8c] Install update sql files for idoutils
+
+ -- Alexander Wirt <alexander.wirt at credativ.de> Fri, 19 Oct 2012 15:58:46 +0200
+
+icinga (1.7.2-1) experimental; urgency=low
+
+ * [4394714] Imported Upstream version 1.7.2
+ - Fix duplicated events (Closes: #686036)
+ * [683ca22] Cherrypick epn fix from git
+
+ -- Alexander Wirt <formorer at debian.org> Wed, 29 Aug 2012 21:54:35 +0200
+
+icinga (1.7.1-2) unstable; urgency=low
+
+ [ Alexander Wirt ]
+ * [6dee566] Start after postgresql or mysql
+
+ [ Christian Perrier ]
+ * Debconf templates and debian/control reviewed by the debian-l10n-
+ english team as part of the Smith review project. Closes: #674024
+ * [Debconf translation updates]
+ * Debconf templates and debian/control reviewed by the debian-l10n-
+ english team as part of the Smith review project. Closes: #674024
+ * [Debconf translation updates]
+ * Czech (Martin Sin). Closes: #677033
+ * Swedish (Martin Bagge / brother). Closes: #677064
+ * Russian (Yuri Kozlov). Closes: #677178
+ * Slovak (Slavko). Closes: #677240
+ * Portuguese (Américo Monteiro). Closes: #677316
+ * Dutch; (Jeroen Schot). Closes: #677357
+ * Danish (Joe Hansen). Closes: #677808
+ * Italian (Luca Monducci). Closes: #677841
+ * German (Holger Wansing). Closes: #677914
+ * French (Steve Petruzzello). Closes: #677952
+ * Galician (). Closes: #678913
+ * Spanish; (Omar Campagne). Closes: #678944
+
+ -- Alexander Wirt <formorer at debian.org> Fri, 29 Jun 2012 23:02:35 +0200
+
+icinga (1.7.1-1) unstable; urgency=low
+
+ * [b64d290] Imported Upstream version 1.7.1
+ * [bcba7da] 80_fix_typos_in_eventhandlers is now upstream
+ * [abd8b59] icinga 1.7.0 should work with Postgresql >= 9.0
+ * [29506e2] Add a patch for better handling of mysql and
+ pgsql default in ido2b
+ * [29d6787] Check if ucf really exists during purge
+ (Closes: #677064)
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 21 Jun 2012 00:09:52 +0200
+
+icinga (1.7.0-4) unstable; urgency=low
+
+ * [704a3bc] Quote version for dpkg-compare
+ * [6e25045] Add patch to fix typo in handle-master-proc-event script
+ (Closes: #676586)
+
+ -- Alexander Wirt <formorer at debian.org> Sat, 09 Jun 2012 08:37:42 +0200
+
+icinga (1.7.0-3) unstable; urgency=low
+
+ * [7c55fce] Install plpgsql as early as possible into postgres
+ (Closes: #675536)
+
+ -- Alexander Wirt <formorer at debian.org> Sat, 02 Jun 2012 09:06:09 +0200
+
+icinga (1.7.0-2) unstable; urgency=medium
+
+ * [57cc621] Fix example path for idoutils broker
+ * [c27a750] Depend on dpkg >= 1.16.1 for s-s-d --status (Closes: #675041)
+ * [24e3fc9] Move old retention.dat to new locatation (Closes: #675046)
+ * [f365185] make icinga-core.postinst a little bit nicer and more verbose
+ * [e5fd639] Improve retention.dat move
+ * [4b2e286] Don't overwrite existing files during retention.dat move
+ * [d3ba784] Fix status.dat location for cgi (Closes: #671908)
+ * [37d3c92] Remove trailing / in configure (Closes: #675043)
+ * [c57ac90] Fix filenames for dbconfig-common sql files (Closes: #675277)
+
+ -- Alexander Wirt <formorer at debian.org> Fri, 01 Jun 2012 10:12:50 +0200
+
+icinga (1.7.0-1) unstable; urgency=low
+
+ * [8ae8e90] Imported Upstream version 1.7.0~beta1
+ * [e20c16d] 80_fix_tac_json is now upstream
+ * [ab9a6aa] Update rules file for 1.7
+ * [e17e241] Add NEWS file for idoutils broker move
+ * [2f26c8d] Update icinga.cfg patch
+ * [2ebdf35] Update idoutils docs
+ * [5e02b2e] Fix tempfile path
+ * [22b4070] Fix status.dat location
+ * [a938089] Remove not used conf.d from icinga.cfg
+ * [64b812c] Fix ido2db socket path
+ * [c3664d6] Imported Upstream version 1.7.0
+ * [9364846] Bump standards version
+ * [7d6f5f4] Cleanup config.log
+
+ -- Alexander Wirt <formorer at debian.org> Tue, 15 May 2012 23:38:27 +0200
+
+icinga (1.6.1-3) unstable; urgency=medium
+
+ [ Daniel Baumann ]
+ * [548ece5] Adding debconf handling for icinga check_external_commands option (Closes: #592738).
+
+ [ Alexander Wirt ]
+ * [d3c349e] Add alternative for libdbi-dev
+ * [2d0c4bb] Fix broker location in ido example config and enhance README
+ * [4416c9c] Always display debconf note for external command
+ * [9dec07f] Build-depend on libpng-dev (Closes: #662374)
+ * [dfacf10] Add buildalternative for libpng
+ * [c4a5675] Update translationfiles
+ * [181d023] Enable hardening buildflags (Closes: #656866)
+ * [6ec83b0] Fix json output of tac.cgi (Closes: #663224)
+ * [3fc1a26] Fix endlessloop in idoutils during installation (Closes: #652647)
+ * [6ff2be5] Fix postgres escaping with postgres 9.1 (Closes: #659675)
+ * [4c7bac5] Fix db upgrades with postgres (Closes: #663440)
+ * [46dfeea] Add prepared dbc debug flag into idoutils.postinst
+ * [495fe20] Install plpgsql for postgres < 9.0 (Closes: #659675)
+ * [b6bba3b] Remove stale socket on daemon startup and start idoutils before icinga
+ (Closes: #670201, #663678)
+ * [309ba7a] Fix db upgrade for postgres (Closes: #641391)
+ * [c1c3991] Add postgres admin functions for plperl (Closes: #659675)
+ * [6230476] Update polish and dutch po translations (Closes: #659252, #670365)
+ * [dfef271] don't install sample configs for idoutils (Closes: #661797)
+ * [3263424] improve apache configuration.
+ Thanks to Christoph Anton Mitterer for the patch (Closes: #659896)
+
+ -- Alexander Wirt <formorer at debian.org> Fri, 04 May 2012 08:04:12 +0200
+
+icinga (1.6.1-2) unstable; urgency=low
+
+ * [56d53d9] fix template for ido2db_check_proc.cfg
+ * [200d89f] Depend on libdbi-dev (Closes: #653277)
+ * [69370bc] Add indonesian po translation.
+ Thanks to Mahyuddin Susanto for the translation (Closes: #654159)
+
+ -- Alexander Wirt <formorer at debian.org> Tue, 03 Jan 2012 16:51:45 +0100
+
+icinga (1.6.1-1) unstable; urgency=low
+
+ * [0e847f9] Add versioned dep for jquery
+ * [cf78552] Imported Upstream version 1.6.1
+
+ -- Alexander Wirt <formorer at debian.org> Fri, 02 Dec 2011 15:58:11 +0100
+
+icinga (1.6.0-1) unstable; urgency=low
+
+ * [0c69c1a] Fix permissions and remove *.in in contrib files (Closes: #648735)
+ * [a34927a] Refresh 51_commands.cfg-debianize.dpatch
+ * [0808c54] Remove mootools
+ * [0c2f21d] Add changelog
+ * [0ac1d13] phpapi is now deprecated - removed
+ * [1edf848] Cleanup javascript
+ * [ec0f684] Imported Upstream version 1.6.0
+ - removes git metadata in upstream tarball
+ (Closes: #613787)
+ * [b48970b] Add slovak po translation.
+ Thanks to Slavko for the translation (Closes: #641985)
+
+ -- Alexander Wirt <formorer at debian.org> Wed, 30 Nov 2011 15:52:07 +0100
+
+icinga (1.5.1-1) unstable; urgency=low
+
+ * [932cd5e] Imported Upstream version 1.5.1
+
+ -- Alexander Wirt <formorer at debian.org> Sun, 11 Sep 2011 11:16:37 +0200
+
+icinga (1.5.0-3) unstable; urgency=low
+
+ * [37c76c6] Fix p1 location
+
+ -- Alexander Wirt <formorer at debian.org> Mon, 05 Sep 2011 21:34:59 +0200
+
+icinga (1.5.0-2) unstable; urgency=low
+
+ Brown paper bag release. My refresh of icinga.cgi failed...
+
+ * [dbd8173] Fix paths for moste important files
+ * [dab43df] Re-nable embedded perl
+ * [85aa90a] Re-enable environment macros
+
+ -- Alexander Wirt <formorer at debian.org> Fri, 26 Aug 2011 21:50:17 +0200
+
+icinga (1.5.0-1) unstable; urgency=low
+
+ * [06735ad] Imported Upstream version 1.5.0 (Closes: #639271)
+ * [63670cd] Update 51_commands.cfg-debianize.dpatch
+ * [c721a5e] Refresh 52_icinga.cfg-debianize.dpatch
+ * [13699c0] Remove 60_fix_p1.pl_patch_mini_epn (now handled in configure)
+ * [818764e] Improve description (Closes: #628204)
+
+ -- Alexander Wirt <formorer at debian.org> Fri, 26 Aug 2011 08:20:15 +0200
+
+icinga (1.4.2-1) unstable; urgency=low
+
+ * New upstream version 1.4.2
+ - Fix xss bugs (Closes: #629131)
+ These issues are liste at mitre as:
+ CVE-2011-2179 and CVE-2011-1523
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 30 Jun 2011 10:03:39 +0200
+
+icinga (1.4.1-1) unstable; urgency=low
+
+ * Remove useless patch
+ * Imported Upstream version 1.4.1
+ - Fixes CVE-2011-2179
+ - Fixes CVE-2011-1523
+ * Update 70_fix_eventhandler_paths.dpatch
+
+ -- Alexander Wirt <formorer at debian.org> Wed, 08 Jun 2011 22:38:28 +0200
+
+icinga (1.4.0-2) unstable; urgency=low
+
+ * Install /etc/icinga/modules in -common
+ * Remove useles patch
+ * Imported Upstream version 1.4.1
+
+ -- Alexander Wirt <formorer at debian.org> Wed, 08 Jun 2011 22:07:53 +0200
+
+icinga (1.4.0-1) unstable; urgency=low
+
+ * New upstream version
+ * Bump standards version (no changes)
+
+ -- Alexander Wirt <formorer at debian.org> Sat, 14 May 2011 08:26:37 +0200
+
+icinga (1.3.0-1) unstable; urgency=low
+
+ * new upstream version
+
+ -- Alexander Wirt <formorer at debian.org> Sun, 13 Feb 2011 08:04:21 +0100
+
+icinga (1.2.1-2) unstable; urgency=low
+
+ * Fix symlink to mootols
+
+ -- Alexander Wirt <formorer at debian.org> Mon, 01 Nov 2010 11:02:00 +0100
+
+icinga (1.2.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Add apache vhost example (Closes: #599555)
+
+ -- Alexander Wirt <formorer at debian.org> Mon, 25 Oct 2010 08:26:07 +0200
+
+icinga (1.2-1) unstable; urgency=low
+
+ * New upstream version
+ - Remove 80_remove_daemoncheck_cgi (now upstream)
+ * bump standards version (no changes)
+ * Icinga Plugins does not exist
+ * Fix typo in watch file
+ * Add japanese debconf translation (Closes: #598368)
+ Thanks Hideki Yamane
+
+ -- Alexander Wirt <formorer at debian.org> Mon, 09 Aug 2010 18:23:06 +0200
+
+icinga (1.0.2-1) unstable; urgency=low
+
+ * New upstream version
+ * Bump standards version (no changes needed)
+ * Fix eventhandler paths
+ * Remove 40_fix_spurious_dollar_signs_added_to_command_lines -
+ now upstream
+
+ -- Alexander Wirt <formorer at debian.org> Sat, 03 Jul 2010 12:28:08 +0200
+
+icinga (1.0.1-4) unstable; urgency=low
+
+ * Fix mini_epn p1 path
+ * Backport several ido2db fixes from git
+ * Debconf templates and debian/control reviewed by the debian-l10n-
+ english team as part of the Smith review project. Closes: #579934
+ * [Debconf translation updates]
+ * Spanish (Omar Campagne). Closes: #579656,#581823
+ * Czech (Martin Sin). Closes: #580471
+ * Basque (Iñaki Larrañaga Murgoitio). Closes: #580478
+ * Danish (Joe Hansen). Closes: #580571,#580572
+ * Brazilian Portuguese (Bruno Gurgel Gomes de Oliveira).
+ Closes: #580656, #581562
+ * Russian (Yuri Kozlov). Closes: #580765
+ * Italian (Luca Monducci). Closes: #580768
+ * Vietnamese (Clytie Siddall). Closes: #581538
+ * Portuguese (Américo Monteiro). Closes: #582319
+ * German (Matthias Julius). Closes: #582348
+ * French (Steve Petruzzello). Closes: #582643
+ * Swedish (Martin Bagge). Closes: #582699
+
+ -- Alexander Wirt <formorer at debian.org> Tue, 13 Apr 2010 11:52:52 +0200
+
+icinga (1.0.1-3) unstable; urgency=low
+
+ * its nagios-plugins, not icinga-plugins
+ * Use alternatives for mini_epn (Closes: #577493)
+ * Don't depend on non-existing virtual facility $icinga
+ (Closes: #577166)
+ * Update french po translation (Closes: #577152)
+ * Update russian po translation (Closes: #577170)
+ * Update swedish po translation (Closes: #577553)
+ * Update portuguese po translation (Closes: #577137)
+
+ -- Alexander Wirt <formorer at debian.org> Thu, 08 Apr 2010 19:58:16 +0200
+
+icinga (1.0.1-2) unstable; urgency=low
+
+ * Fix maintainer address
+ * Disable context sensitive help
+ * Recommend php5-mysql | php5-pgsql for the phpapi package
+
+ -- Alexander Wirt <formorer at debian.org> Wed, 07 Apr 2010 14:31:39 +0200
+
+icinga (1.0.1-1) unstable; urgency=low
+
+ * Initial packaging (Closes: #573880)
+
+ -- Alexander Wirt <formorer at debian.org> Sat, 27 Mar 2010 09:59:41 +0100
diff --cc debian/patches/50_cgi.cfg-debianize.dpatch
index 6b15351,0000000..6b15351
mode 100755,000000..100644
--- a/debian/patches/50_cgi.cfg-debianize.dpatch
+++ b/debian/patches/50_cgi.cfg-debianize.dpatch
diff --cc debian/patches/51_commands.cfg-debianize.dpatch
index 5182f5f,0000000..5182f5f
mode 100755,000000..100644
--- a/debian/patches/51_commands.cfg-debianize.dpatch
+++ b/debian/patches/51_commands.cfg-debianize.dpatch
diff --cc debian/patches/52_icinga.cfg-debianize.dpatch
index 6c2186a,0000000..6c2186a
mode 100755,000000..100644
--- a/debian/patches/52_icinga.cfg-debianize.dpatch
+++ b/debian/patches/52_icinga.cfg-debianize.dpatch
diff --cc debian/patches/70_fix_eventhandler_paths.dpatch
index ad69eb4,0000000..ad69eb4
mode 100755,000000..100644
--- a/debian/patches/70_fix_eventhandler_paths.dpatch
+++ b/debian/patches/70_fix_eventhandler_paths.dpatch
diff --cc debian/patches/90_disable_standard_conforming_strings.dpatch
index 7417961,0000000..7417961
mode 100755,000000..100644
--- a/debian/patches/90_disable_standard_conforming_strings.dpatch
+++ b/debian/patches/90_disable_standard_conforming_strings.dpatch
diff --cc debian/patches/95_fix_db_upgrade.dpatch
index 282b401,0000000..282b401
mode 100755,000000..100644
--- a/debian/patches/95_fix_db_upgrade.dpatch
+++ b/debian/patches/95_fix_db_upgrade.dpatch
diff --cc debian/rules
index 984d2d1,0000000..ed8dee5
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,228 -1,0 +1,228 @@@
+#!/usr/bin/make -f
+# debian/rules makefile for icinga
+
+# export DH_VERBOSE=1
+
+b := $(shell pwd)/debian
+
+export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = `dpkg-buildflags --get CFLAGS`
+CFLAGS += `dpkg-buildflags --get CPPFLAGS`
+LDFLAGS = `dpkg-buildflags --get LDFLAGS`
+
+SHELL = /bin/sh -e
+CONFIGURE = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --prefix=/usr \
+ --mandir=/usr/share/man \
+ --bindir=/usr/sbin \
+ --sbindir=/usr/lib/cgi-bin/icinga \
+ --datarootdir=/usr/share/icinga/htdocs \
+ --sysconfdir=/etc/icinga \
+ --infodir=/usr/share/info \
+ --libexecdir=/usr/lib/nagios/plugins \
+ --localstatedir=/var/lib/icinga \
+ --with-state-dir=/var/cache/icinga \
+ --enable-event-broker \
+ --with-ido-sockfile=/var/lib/icinga/ido.sock \
+ --enable-embedded-perl \
+ --with-icinga-user=nagios \
+ --with-icinga-group=nagios \
+ --with-command-user=nagios \
+ --with-command-group=nagios \
+ --with-init-dir=/etc/init.d \
+ --with-lockfile=/var/run/icinga/icinga.pid \
+ --with-mail=/usr/bin/mail \
+ --with-perlcache \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --with-htmurl=/icinga \
+ --with-cgiurl=/cgi-bin/icinga \
+ --with-p1-file-dir=/usr/lib/icinga \
+ --enable-idoutils \
+ --with-ido2db-lockfile=/var/run/icinga/ido2db.pid \
+ --with-log-dir=/var/log/icinga \
+ --libdir=/usr/lib/icinga \
+ --with-temp-file=/var/cache/icinga/icinga.tmp \
+ --with-mainurl=/cgi-bin/icinga/tac.cgi
+
+clean: clean-patched unpatch
+clean-patched:
+ dh_testdir -a
+ dh_testroot -a
+ if test -f Makefile; then make distclean; fi
+ rm -f patch-stamp install-stamp configure-stamp build-stamp fix-configs-stamp
+ rm -rf debian-configs
+ -rm contrib/perlxsi.c
+ find -type d -name autom4te.cache -print0 | xargs -0 -r rm -rf \;
+ -rm -f platform.h auto-include.h
+ -rm solaris/pkginfo
+ -rm contrib/eventhandlers/submit_check_result contrib/eventhandlers/disable_active_service_checks
+ -rm contrib/eventhandlers/disable_notifications contrib/eventhandlers/enable_active_service_checks
+ -rm contrib/eventhandlers/enable_notifications
+ -rm config.log
+ 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 \;
+ dh_clean
+ debconf-updatepo
+
+fix-configs: fix-configs-stamp
+fix-configs-stamp: configure-stamp
+ mkdir -p debian-configs
+ sed -e '/Sample CGI/ s/\([0-9]\.[0-9]\.[0-9]\)//' \
+ -e '/Last Modified/,+1 d' \
+ sample-config/cgi.cfg > debian-configs/cgi.cfg
+ sed -i -e 's/local-service/generic-service/' \
+ module/idoutils/config/ido2db_check_proc.cfg
+ sed -i -e 's#/usr/sbin/#/usr/lib/icinga/#' \
+ module/idoutils/config/idoutils.cfg-sample
+ sed -e '/Sample Main Config/ s/\([0-9]\.[0-9]\.[0-9]\)//' \
+ -e '/Last Modified/ d' \
+ sample-config/icinga.cfg > debian-configs/icinga.cfg
+ sed -e '/SAMPLE COMMAND DEFINITIONS/ s/\([0-9]\.[0-9]\.[0-9]\)//' \
+ -e '/Last Modified/,+1 d' \
+ -e '/^#$$/ d' sample-config/template-object/commands.cfg > debian-configs/commands.cfg
+ sed -i \
+ -e "s/^\(db_host=\).*/\1_DBC_DBSERVER_/" \
+ -e "s/^\(db_servertype=\).*/\1_DBC_DBTYPE_/" \
+ -e "s/^\(db_port=\).*/\1_DBC_DBPORT_/" \
+ -e "s/^\(db_name=\).*/\1_DBC_DBNAME_/" \
+ -e "s/^\(db_user=\).*/\1_DBC_DBUSER_/" \
+ -e "s/^\(db_pass=\).*/\1_DBC_DBPASS_/" module/idoutils/config/ido2db.cfg-sample
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir -a
+ @echo "Doing $@"
+ if test -f Makefile; then make clean; fi
+ ln -sf /usr/share/misc/config.sub .
+ ln -sf /usr/share/misc/config.guess .
+ rm -f config.cache
+ $(CONFIGURE)
+ touch configure-stamp
+
+build: build-stamp
+build-stamp: patch-stamp configure-stamp
+ dh_testdir -a
+ @echo "Doing $@"
+ $(MAKE) all
+ make -C contrib
+ touch build-stamp
+
+patch: patch-stamp
+patch-stamp:
+ @echo "Doing $@"
+ dpatch --with-cpp apply-all
+ dpatch --with-cpp cat-all >patch-stamp
+
+unpatch:
+ @echo "Doing $@"
+ dpatch --with-cpp deapply-all
+ rm -rf patch-stamp debian/patched
+
+install: install-stamp
+install-stamp: build-stamp fix-configs-stamp
+ @echo "Doing $@"
+ dh_testdir -a
+ dh_testroot -a
+ dh_installdirs -a -i
+ make install-unstripped DESTDIR=$b/tmp INSTALL_OPTS="" COMMAND_OPTS=""
+ make install-idoutils DESTDIR=$b/icinga-idoutils INSTALL_OPTS="" COMMAND_OPTS=""
+ rm $b/icinga-idoutils/etc/icinga/ido2db.cfg-sample
+ #We have to rename the sample files
+ #mv $b/icinga-idoutils/etc/icinga/ido2db.cfg-sample $b/icinga-idoutils/etc/icinga/ido2db.cfg
+ mv $b/icinga-idoutils/etc/icinga/idomod.cfg-sample $b/icinga-idoutils/etc/icinga/idomod.cfg
+ mkdir -p $b/icinga-idoutils/usr/share/doc/icinga-idoutils/examples
+ mv $b/icinga-idoutils/etc/icinga/modules/idoutils.cfg-sample $b/icinga-idoutils/usr/share/doc/icinga-idoutils/examples
+ cp module/idoutils/db/mysql/mysql.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/install/mysql
+ cp module/idoutils/db/pgsql/pgsql.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/install/pgsql
+ mkdir -p $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/
+ mkdir -p $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/
+ cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.0.2-fix-object-relations.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.2-2
+ cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.0.2.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.2-1
+ cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.0.2-fix-object-relations.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.2-2
+ cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.0.3.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.0.3-1
+ cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.3.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.2.99-1
+ cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.4.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.4.0
+ cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.5.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.5.0-1
+ cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.6.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.6.0-1
+ cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.7.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.7.0-1
+ cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.8.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.8.0-1
+ cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.9.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.9.0-1
- cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.10.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.10.0-2
++ cp module/idoutils/db/mysql/upgrade/mysql-upgrade-1.10.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/mysql/1.10.1-1
+ cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.0.1.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.0.1-1
+ cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.0.3.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.0.3-1
+ cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.3.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.2.99-1
+ cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.4.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.5.0-1
+ cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.6.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.6.0-1
+ cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.7.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.7.0-1
+ cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.8.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.8.0-1
+ cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.9.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.9.0-1
- cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.10.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.10.0-2
++ cp module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.10.0.sql $b/icinga-idoutils/usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.10.1-1
+ # set up /var/cache/icinga for access by www-data
+ chgrp www-data ${b}/icinga-common/var/cache/icinga
+ chmod g+s ${b}/icinga-common/var/cache/icinga
+ chown root:www-data ${b}/icinga-common/var/lib/icinga/rw
+ chmod 700 ${b}/icinga-common/var/lib/icinga/rw
+ dh_install -i
+ rm ${b}/tmp/usr/share/icinga/htdocs/js/jquery-1.8.0.min.js
+ rm -R ${b}/tmp/usr/share/icinga/htdocs/jquery-ui
+ rm ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/*.in
+ chmod +x ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/* ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/distributed-monitoring/* ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/redundancy-scenario1/*
+ # we use the versions in debian
+ dh_link -i
+ dh_lintian
+ dh_installdocs -i
+ dh_installman -a -picinga
+ dh_installexamples
+ dh_installlogrotate
+ dh_installchangelogs -i
+ dh_installinit --name icinga --error-handler=init_failed
+ dh_installinit -n -picinga-idoutils --name ido2db
+ chmod 755 ${b}/icinga-common/var/lib/icinga
+ # the real version is in -cgi
+ rm ${b}/icinga-common/etc/icinga/cgi.cfg
+
+
+binary: binary-arch binary-indep
+binary-arch: install-stamp
+ @echo "Doing $@"
+ dh_testdir -a
+ dh_testroot -a
+ dh_installchangelogs -a
+ dh_installdocs -a
+ dh_installdebconf -a
+ dh_install -a
+ rm -rf ${b}/icinga/usr/share/doc/
+ rm -rf ${b}/icinga-core/usr/share/doc/
+ dh_link -a
+ mkdir -p ${b}/icinga-dbg/usr/bin/
+ mv contrib/mini_epn ${b}/icinga-dbg/usr/bin/mini_epn_icinga
+ chmod 600 ${b}/icinga-common/etc/icinga/resource.cfg
+ # fix permissions of p1
+ chmod 755 ${b}/icinga-core/usr/lib/icinga/p1.pl
+ chmod +x ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/submit_check_result
+ chmod -x ${b}/icinga-idoutils/usr/share/doc/icinga-idoutils/examples/README
+ dh_strip -a --dbg-package=icinga-dbg
+ dh_compress -a -X.sql
+ dh_fixperms -a -X/var/cache/icinga
+ dh_makeshlibs -a -V
+ dh_installdeb -a
+ dh_perl -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary-indep: install-stamp
+ dh_link -i
+ dh_compress -i
+ dh_fixperms -i -Xicinga/resource.cfg
+ dh_installdebconf -i
+ dh_perl -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+.PHONY: binary-indep binary-arch build configure binary install patch unpatch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/icinga.git
More information about the Pkg-nagios-changes
mailing list