Imported Upstream version 1.8.3

Changelog

@@ -12,6 +12,12 @@ UPGRADE NOTES
 	- core, classic ui: sample-config/updates/
 	- idoutils: module/idoutils/config/updates
 
+1.8.3 - 12/12/2012
+
+FIXES
+* idoutils: fix unknown column contactaddress_id (thx fmbiete) #3483 - MF
+
+
 1.8.2 - 28/11/2012
 
 FIXES

Makefile.in

@@ -78,7 +78,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.8.2
+ICINGA_VERSION=1.8.3
 
 CP=@CP@
 

configure

@@ -2456,9 +2456,9 @@ ac_config_headers="$ac_config_headers include/config.h"
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.8.2"
+PKG_VERSION="1.8.3"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="11-28-2012"
+PKG_REL_DATE="12-12-2012"
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do

configure.in

@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h)
 AC_PREFIX_DEFAULT(/usr/local/icinga)
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.8.2"
+PKG_VERSION="1.8.3"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="11-28-2012"
+PKG_REL_DATE="12-12-2012"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL

html/main.html

@@ -18,9 +18,9 @@
 </div>
 
 <div id="currentversioninfo">
-<div class="version">Version 1.8.2</div>
-<div class="releasedate">November 28, 2012</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.8.2</a></div>
+<div class="version">Version 1.8.3</div>
+<div class="releasedate">December 12, 2012</div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.8.3</a></div>
 </div>
 
 <div id="developer">

icinga.spec

@@ -20,7 +20,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.8.2
+Version: 1.8.3
 Release: %{revision}%{?dist}
 License: GPLv2
 Group: Applications/System
@@ -408,6 +408,9 @@ fi
 
 
 %changelog
+* Wed Dec 12 2012 Michael Friedrich <michael.friedrich@netways.de> - 1.8.3-1
+- 1.8.3 bump
+
 * Tue Oct 30 2012 Michael Friedrich <michael.friedrich@gmail.com> - 1.8.2-1
 - 1.8.2 bump
 

include/common.h

@@ -27,8 +27,8 @@
 #define PROGRAM_NAME "Icinga"
 #define PROGRAM_NAME_UC "ICINGA"
 #define PROGRAM_NAME_LC "icinga"
-#define PROGRAM_VERSION "1.8.2"
-#define PROGRAM_MODIFICATION_DATE "11-28-2012"
+#define PROGRAM_VERSION "1.8.3"
+#define PROGRAM_MODIFICATION_DATE "12-12-2012"
 
 /*#define DEBUG_CHECK_IPC 1 */
 /*#define DEBUG_CHECK_IPC2 1*/

module/idoutils/include/common.h

@@ -22,8 +22,8 @@
 #define LOG2IDO_NAME 		"LOG2IDO"
 
 /* only one space for update-version matching */
-#define IDO_DATE "11-28-2012"
-#define IDO_VERSION "1.8.2"
+#define IDO_DATE "12-12-2012"
+#define IDO_VERSION "1.8.3"
 
 #define IDO_SCHEMA_VERSION "1.8.0"
 

module/idoutils/src/dbqueries.c

@@ -10945,7 +10945,7 @@ int ido2db_query_insert_or_update_contactdefinition_addresses_add(ido2db_idi *id
         char * query = NULL;
         char * query1 = NULL;
         char * query2 = NULL;
-        unsigned long contactaddress_id;
+        unsigned long contact_address_id;
         int mysql_update = FALSE;
 #endif
 	ido2db_log_debug_info(IDO2DB_DEBUGL_PROCESSINFO, 2, "ido2db_query_insert_or_update_contactdefinition_addresses_add() start\n");
@@ -10976,7 +10976,7 @@ int ido2db_query_insert_or_update_contactdefinition_addresses_add(ido2db_idi *id
                 	idi->dbinfo.dbi_result = NULL;
 
 
-                        dummy = asprintf(&query, "SELECT contactaddress_id FROM %s WHERE contact_id=%lu AND address_number=%d",
+                        dummy = asprintf(&query, "SELECT contact_address_id FROM %s WHERE contact_id=%lu AND address_number=%d",
                                 ido2db_db_tablenames[IDO2DB_DBTABLE_CONTACTADDRESSES],
                                  *(unsigned long *) data[1],    /* unique constraint start */
                                  *(int *) data[2]               /* unique constraint end */
@@ -10986,7 +10986,7 @@ int ido2db_query_insert_or_update_contactdefinition_addresses_add(ido2db_idi *id
                         if ((result = ido2db_db_query(idi, query)) == IDO_OK) {
                                 if (idi->dbinfo.dbi_result != NULL) {
                                         if (dbi_result_next_row(idi->dbinfo.dbi_result)) {
-                                                contactaddress_id = dbi_result_get_ulonglong(idi->dbinfo.dbi_result, "contactaddress_id");
+                                                contact_address_id = dbi_result_get_ulonglong(idi->dbinfo.dbi_result, "contact_address_id");
                                                 mysql_update = TRUE;
                                         } else {
                                                 mysql_update = FALSE;

update-version

@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.8.2
+CURRENTVERSION=1.8.3
 
 # Last date
-LASTDATE=11-28-2012
+LASTDATE=12-12-2012
 
 if [ "x$1" = "x" ]
 then