[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.7.2-1-13-geec91d0

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 97522304cea1e319eddde452ea9a8a95df2e21e2
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue Oct 16 13:57:15 2012 +0200

    Remove obsolete patch 80_fix_dbd_handling.dpatch

diff --git a/debian/patches/00list b/debian/patches/00list
index 1530c3b..2ad92c3 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,6 +2,5 @@
 51_commands.cfg-debianize.dpatch
 52_icinga.cfg-debianize.dpatch
 70_fix_eventhandler_paths.dpatch
-80_fix_dbd_handling.dpatch
 95_fix_db_upgrade.dpatch
 99_fix_epn.dpatch
diff --git a/debian/patches/80_fix_dbd_handling.dpatch b/debian/patches/80_fix_dbd_handling.dpatch
deleted file mode 100755
index ffe7517..0000000
--- a/debian/patches/80_fix_dbd_handling.dpatch
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 80_fix_dbd_handling.dpatch by Alexander Wirt <formorer at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: See https://dev.icinga.org/issues/2698
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-icinga~/module/idoutils/src/db.c pkg-icinga/module/idoutils/src/db.c
---- pkg-icinga~/module/idoutils/src/db.c	2012-06-21 00:03:10.000000000 +0200
-+++ pkg-icinga/module/idoutils/src/db.c	2012-06-21 00:03:41.470300905 +0200
-@@ -497,8 +497,28 @@
- 		return IDO_ERROR;
- 	}
- 
--	dbi_conn_set_option(idi->dbinfo.dbi_conn, "host", ido2db_db_settings.host);
--	dbi_conn_set_option_numeric(idi->dbinfo.dbi_conn, "port", (int)ido2db_db_settings.port);
-+       /* decide wether to set host and port, or not ... drivers will use socket otherwise */
-+        switch (idi->dbinfo.server_type) {
-+        case IDO2DB_DBSERVER_MYSQL:
-+               if (ido2db_db_settings.host != NULL)
-+                       dbi_conn_set_option(idi->dbinfo.dbi_conn, "host", ido2db_db_settings.host);
-+               if (ido2db_db_settings.port != 0)
-+                       dbi_conn_set_option_numeric(idi->dbinfo.dbi_conn, "port", (int)ido2db_db_settings.port);
-+                break;
-+        case IDO2DB_DBSERVER_PGSQL:
-+               if (ido2db_db_settings.host != NULL)
-+                       dbi_conn_set_option(idi->dbinfo.dbi_conn, "host", ido2db_db_settings.host);
-+               if (ido2db_db_settings.port != 0)
-+                       dbi_conn_set_option_numeric(idi->dbinfo.dbi_conn, "port", (int)ido2db_db_settings.port);
-+                break;
-+        default:
-+               if (ido2db_db_settings.host != NULL)
-+                       dbi_conn_set_option(idi->dbinfo.dbi_conn, "host", ido2db_db_settings.host);
-+               if (ido2db_db_settings.port != 0)
-+                       dbi_conn_set_option_numeric(idi->dbinfo.dbi_conn, "port", (int)ido2db_db_settings.port);
-+                break;
-+        }
-+
- 	dbi_conn_set_option(idi->dbinfo.dbi_conn, "username", ido2db_db_settings.username);
- 	dbi_conn_set_option(idi->dbinfo.dbi_conn, "password", ido2db_db_settings.password);
- 	dbi_conn_set_option(idi->dbinfo.dbi_conn, "dbname", ido2db_db_settings.dbname);

-- 
debian packaging of icinga(-core)