[icinga-checkins] icinga.org: icinga-core/r1.4: update icinga to version 1.4.2

git at icinga.org git at icinga.org
Wed Jun 29 11:06:51 CEST 2011


Module: icinga-core
Branch: r1.4
Commit: c1e7cc23a1b33d76494122b89a3ada8e050ffef6
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=c1e7cc23a1b33d76494122b89a3ada8e050ffef6

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Jun 29 11:02:09 2011 +0200

update icinga to version 1.4.2

---

 Makefile.in                      |    2 +-
 base/icinga.c                    |    2 +-
 base/icingastats.c               |    2 +-
 configure                        |    4 ++--
 configure.in                     |    4 ++--
 html/main.html                   |    6 +++---
 include/common.h                 |    4 ++--
 module/idoutils/include/ido2db.h |    4 ++--
 module/idoutils/include/idomod.h |    4 ++--
 module/idoutils/src/file2sock.c  |    4 ++--
 module/idoutils/src/log2ido.c    |    4 ++--
 module/idoutils/src/sockdebug.c  |    4 ++--
 update-version                   |   20 ++++++++++----------
 13 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 85ffe67..ddf57e6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -75,7 +75,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.4.1
+ICINGA_VERSION=1.4.2
 
 CP=@CP@
 
diff --git a/base/icinga.c b/base/icinga.c
index a7372c3..27cb1f9 100644
--- a/base/icinga.c
+++ b/base/icinga.c
@@ -3,7 +3,7 @@
  * ICINGA.C - Core Program Code For Icinga
  *
  * Program: Icinga
- * Version: 1.4.1
+ * Version: 1.4.2
  * License: GPL
  * Copyright (c) 1999-2009 Ethan Galstad (http://www.nagios.org)
  * Copyright (c) 2009-2011 Nagios Core Development Team and Community Contributors
diff --git a/base/icingastats.c b/base/icingastats.c
index dea7717..9b2c478 100644
--- a/base/icingastats.c
+++ b/base/icingastats.c
@@ -3,7 +3,7 @@
  * ICINGASTATS.C - Displays Icinga Statistics
  *
  * Program: Icingastats
- * Version: 1.4.1
+ * Version: 1.4.2
  * License: GPL
  * Copyright (c) 2003-2008 Ethan Galstad (egalstad at nagios.org)
  * Copyright (c) 2009-2011 Nagios Core Development Team and Community Contributors
diff --git a/configure b/configure
index 09bc3ca..e59fd58 100755
--- a/configure
+++ b/configure
@@ -2399,9 +2399,9 @@ ac_config_headers="$ac_config_headers include/config.h include/snprintf.h"
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.4.1"
+PKG_VERSION="1.4.2"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="05-11-2011"
+PKG_REL_DATE="06-29-2011"
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
diff --git a/configure.in b/configure.in
index 752d3aa..92d5118 100644
--- a/configure.in
+++ b/configure.in
@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h include/snprintf.h)
 AC_PREFIX_DEFAULT(/usr/local/icinga)
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.4.1"
+PKG_VERSION="1.4.2"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="05-11-2011"
+PKG_REL_DATE="06-29-2011"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL
diff --git a/html/main.html b/html/main.html
index 0dec61e..e3a1239 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
 </div>
 
 <div id="currentversioninfo">
-<div class="version">Version 1.4.1</div>
-<div class="releasedate">May 11, 2011</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.4.1</a></div>
+<div class="version">Version 1.4.2</div>
+<div class="releasedate">June 29, 2011</div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.4.2</a></div>
 </div>
 
 <div id="developer">
diff --git a/include/common.h b/include/common.h
index f4fee9d..27fb554 100644
--- a/include/common.h
+++ b/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.4.1"
-#define PROGRAM_MODIFICATION_DATE "05-11-2011"
+#define PROGRAM_VERSION "1.4.2"
+#define PROGRAM_MODIFICATION_DATE "06-29-2011"
 
 /*#define DEBUG_CHECK_IPC 1 */
 /*#define DEBUG_CHECK_IPC2 1*/
diff --git a/module/idoutils/include/ido2db.h b/module/idoutils/include/ido2db.h
index f5f1788..6333564 100644
--- a/module/idoutils/include/ido2db.h
+++ b/module/idoutils/include/ido2db.h
@@ -13,8 +13,8 @@
 #include "utils.h"
 
 #define IDO2DB_NAME "IDO2DB"
-#define IDO2DB_DATE "05-11-2011"
-#define IDO2DB_VERSION "1.4.1"
+#define IDO2DB_DATE "06-29-2011"
+#define IDO2DB_VERSION "1.4.2"
 
 #define IDO2DB_SCHEMA_VERSION "1.4.0"
 
diff --git a/module/idoutils/include/idomod.h b/module/idoutils/include/idomod.h
index 6a52ff6..7880b3b 100644
--- a/module/idoutils/include/idomod.h
+++ b/module/idoutils/include/idomod.h
@@ -9,9 +9,9 @@
 #ifndef _NDBXT_IDOMOD_H
 #define _NDBXT_IDOMOD_H
 
-#define IDOMOD_VERSION "1.4.1"
+#define IDOMOD_VERSION "1.4.2"
 #define IDOMOD_NAME "IDOMOD"
-#define IDOMOD_DATE "05-11-2011"
+#define IDOMOD_DATE "06-29-2011"
 
 /************** misc definitions *************/
 
diff --git a/module/idoutils/src/file2sock.c b/module/idoutils/src/file2sock.c
index 0f2e1f3..44194d8 100644
--- a/module/idoutils/src/file2sock.c
+++ b/module/idoutils/src/file2sock.c
@@ -12,9 +12,9 @@
 #include "../include/common.h"
 #include "../include/io.h"
 
-#define FILE2SOCK_VERSION "1.4.1"
+#define FILE2SOCK_VERSION "1.4.2"
 #define FILE2SOCK_NAME "FILE2SOCK"
-#define FILE2SOCK_DATE "05-11-2011"
+#define FILE2SOCK_DATE "06-29-2011"
 
 
 int process_arguments(int,char **);
diff --git a/module/idoutils/src/log2ido.c b/module/idoutils/src/log2ido.c
index 2cdd232..55829ec 100644
--- a/module/idoutils/src/log2ido.c
+++ b/module/idoutils/src/log2ido.c
@@ -11,9 +11,9 @@
 #include "../include/io.h"
 #include "../include/protoapi.h"
 
-#define LOG2IDO_VERSION "1.4.1"
+#define LOG2IDO_VERSION "1.4.2"
 #define LOG2IDO_NAME "LOG2IDO"
-#define LOG2IDO_DATE "05-11-2011"
+#define LOG2IDO_DATE "06-29-2011"
 
 
 
diff --git a/module/idoutils/src/sockdebug.c b/module/idoutils/src/sockdebug.c
index 4d5e4d2..7e28f1e 100644
--- a/module/idoutils/src/sockdebug.c
+++ b/module/idoutils/src/sockdebug.c
@@ -9,9 +9,9 @@
 #include "../../../include/config.h"
 #include "../include/io.h"
 
-#define SOCKDEBUG_VERSION "1.4.1"
+#define SOCKDEBUG_VERSION "1.4.2"
 #define SOCKDEBUG_NAME "SOCKDEBUG"
-#define SOCKDEBUG_DATE "05-11-2011"
+#define SOCKDEBUG_DATE "06-29-2011"
 
 
 int cleanup_socket(int,char *);
diff --git a/update-version b/update-version
index 4f21b95..c8af755 100755
--- a/update-version
+++ b/update-version
@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.4.1
+CURRENTVERSION=1.4.2
 
 # Last date
-LASTDATE=05-11-2011
+LASTDATE=06-29-2011
 
 if [ "x$1" = "x" ]
 then
@@ -81,10 +81,10 @@ perl -i -p -e "s/^LASTDATE=.*/LASTDATE=$SHORTDATE/;" update-version
 # Update version number and release date in IDOUtils
 perl -i -p -e "s/IDOMOD_VERSION \".*\"/IDOMOD_VERSION \"$newversion\"/;" module/idoutils/include/idomod.h
 perl -i -p -e "s/IDOMOD_DATE \".*\"/IDOMOD_DATE \"$SHORTDATE\"/;" module/idoutils/include/idomod.h
-perl -i -p -e "s/thisversion=\".*\"/thisversion=\"$newversion\"/;" module/idoutils/db/scripts/upgradedb.in
-perl -i -p -e "s/lastversion=\".*\"/lastversion=\"$newversion\"/;" module/idoutils/db/scripts/upgradedb.in
-perl -i -p -e "s/legacyversion=\".*\"/legacyversion=\"$newversion\"/;" module/idoutils/db/scripts/upgradedb.in
-perl -i -p -e "s/thisversion=\".*\"/thisversion=\"$newversion\"/;" module/idoutils/db/scripts/installdb.in
+#perl -i -p -e "s/thisversion=\".*\"/thisversion=\"$newversion\"/;" module/idoutils/db/scripts/upgradedb.in
+#perl -i -p -e "s/lastversion=\".*\"/lastversion=\"$newversion\"/;" module/idoutils/db/scripts/upgradedb.in
+#perl -i -p -e "s/legacyversion=\".*\"/legacyversion=\"$newversion\"/;" module/idoutils/db/scripts/upgradedb.in
+#perl -i -p -e "s/thisversion=\".*\"/thisversion=\"$newversion\"/;" module/idoutils/db/scripts/installdb.in
 perl -i -p -e "s/IDO2DB_VERSION \".*\"/IDO2DB_VERSION \"$newversion\"/;" module/idoutils/include/ido2db.h
 perl -i -p -e "s/IDO2DB_DATE \".*\"/IDO2DB_DATE \"$SHORTDATE\"/;" module/idoutils/include/ido2db.h
 perl -i -p -e "s/SOCKDEBUG_VERSION \".*\"/SOCKDEBUG_VERSION \"$newversion\"/;" module/idoutils/src/sockdebug.c
@@ -99,9 +99,9 @@ perl -i -p -e "s/LOG2IDO_DATE \".*\"/LOG2IDO_DATE \"$SHORTDATE\"/;" module/idout
 # pgsql SELECT updatedbversion('1.3.0');
 # oracle DEFINE ICINGA_VERSION=1.3.0
 
-perl -i -p -e "s/VALUES \(\'idoutils\', \'.*\'\)/VALUES \(\'idoutils\', \'$newversion\'\)/;" module/idoutils/db/mysql/mysql.sql
-perl -i -p -e "s/version=\'.*\'/version=\'$newversion\'/;" module/idoutils/db/mysql/mysql.sql
-perl -i -p -e "s/updatedbversion\(\'.*\'\)/updatedbversion\(\'$newversion\'\)/;" module/idoutils/db/pgsql/pgsql.sql
-perl -i -p -e "s/ICINGA_VERSION=.*/ICINGA_VERSION=$newversion/;" module/idoutils/db/oracle/oracle.sql
+#perl -i -p -e "s/VALUES \(\'idoutils\', \'.*\'\)/VALUES \(\'idoutils\', \'$newversion\'\)/;" module/idoutils/db/mysql/mysql.sql
+#perl -i -p -e "s/version=\'.*\'/version=\'$newversion\'/;" module/idoutils/db/mysql/mysql.sql
+#perl -i -p -e "s/updatedbversion\(\'.*\'\)/updatedbversion\(\'$newversion\'\)/;" module/idoutils/db/pgsql/pgsql.sql
+#perl -i -p -e "s/ICINGA_VERSION=.*/ICINGA_VERSION=$newversion/;" module/idoutils/db/oracle/oracle.sql
 
 





More information about the icinga-checkins mailing list