[Pkg-nagios-devel] Bug#861880: unblock: icinga/1.13.4-2

[Bas Couwenberg]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock

Please unblock package icinga

It fixes the upgrade issue reported in #861077, by dropping the
constraints only if they exist, and supporting both the old and new names.

unblock icinga/1.13.4-2

Kind Regards,

Bas
-------------- next part --------------
diff -Nru icinga-1.13.4/debian/changelog icinga-1.13.4/debian/changelog
--- icinga-1.13.4/debian/changelog	2016-12-23 10:05:44.000000000 +0100
+++ icinga-1.13.4/debian/changelog	2017-05-05 08:57:03.000000000 +0200
@@ -1,3 +1,11 @@
+icinga (1.13.4-2) unstable; urgency=medium
+
+  * Team upload.
+  * Add patch to fix database upgrade to 1.13.0.
+    (closes: #861077)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 05 May 2017 08:57:03 +0200
+
 icinga (1.13.4-1) unstable; urgency=high
 
   * Team upload.
diff -Nru icinga-1.13.4/debian/patches/pgsql-upgrade-1.13.0.patch icinga-1.13.4/debian/patches/pgsql-upgrade-1.13.0.patch
--- icinga-1.13.4/debian/patches/pgsql-upgrade-1.13.0.patch	1970-01-01 01:00:00.000000000 +0100
+++ icinga-1.13.4/debian/patches/pgsql-upgrade-1.13.0.patch	2017-05-03 12:47:00.000000000 +0200
@@ -0,0 +1,24 @@
+Description: Fix database upgrade to 1.13.0.
+ error encountered processing /usr/share/dbconfig-common/data/icinga-idoutils/upgrade/pgsql/1.13.0:
+ ERROR: constraint "uq_servicedependencies" of relation "icinga_servicedependencies" does not exist
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Debian: https://bugs.debian.org/861077
+Forwarded: https://github.com/Icinga/icinga-core/pull/1595
+Applied-Upstream: https://github.com/Icinga/icinga-core/commit/d6ed8875b124205cf61b3a2aad59ec46292e7ff7
+
+--- a/module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.13.0.sql
++++ b/module/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.13.0.sql
+@@ -11,8 +11,11 @@
+ -- #7765 drop unique constraint
+ -- -----------------------------------------
+ 
+-ALTER TABLE icinga_servicedependencies DROP CONSTRAINT uq_servicedependencies;
+-ALTER TABLE icinga_hostdependencies DROP CONSTRAINT uq_hostdependencies;
++ALTER TABLE icinga_servicedependencies DROP CONSTRAINT IF EXISTS icinga_servicedependencies_instance_id_key;
++ALTER TABLE icinga_hostdependencies DROP CONSTRAINT IF EXISTS icinga_hostdependencies_instance_id_key;
++
++ALTER TABLE icinga_servicedependencies DROP CONSTRAINT IF EXISTS UQ_servicedependencies;
++ALTER TABLE icinga_hostdependencies DROP CONSTRAINT IF EXISTS UQ_hostdependencies;
+ 
+ CREATE INDEX idx_servicedependencies ON icinga_servicedependencies(instance_id,config_type,service_object_id,dependent_service_object_id,dependency_type,inherits_parent,fail_on_ok,fail_on_warning,fail_on_unknown,fail_on_critical);
+ CREATE INDEX idx_hostdependencies ON icinga_hostdependencies(instance_id,config_type,host_object_id,dependent_host_object_id,dependency_type,inherits_parent,fail_on_up,fail_on_down,fail_on_unreachable);
diff -Nru icinga-1.13.4/debian/patches/series icinga-1.13.4/debian/patches/series
--- icinga-1.13.4/debian/patches/series	2016-12-20 18:56:51.000000000 +0100
+++ icinga-1.13.4/debian/patches/series	2017-05-02 22:13:46.000000000 +0200
@@ -7,3 +7,4 @@
 99_CVE-2015-8010.patch
 spelling-errors.patch
 53_jquery-ui.patch
+pgsql-upgrade-1.13.0.patch