[Pkg-nagios-changes] [icinga] 03/19: New upstream version 1.14.2
Bas Couwenberg
sebastic at debian.org
Mon Jan 1 19:33:04 UTC 2018
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository icinga.
commit 59d3fff8f8bdb5a68ac775d9a98cf35a0e168185
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Jan 1 18:45:57 2018 +0100
New upstream version 1.14.2
---
Changelog | 9 +++++++++
Makefile.in | 6 +++---
configure | 22 +++++-----------------
configure.in | 8 ++++----
html/main.html | 6 +++---
icinga.spec | 2 +-
include/common.h | 4 ++--
module/idoutils/include/common.h | 4 ++--
update-version | 6 +++---
9 files changed, 32 insertions(+), 35 deletions(-)
diff --git a/Changelog b/Changelog
index d027da9..a78f69b 100644
--- a/Changelog
+++ b/Changelog
@@ -21,6 +21,15 @@ patches for 1.14.x, feature/bug patches are EOL.
Consider a migration to Icinga 2: https://www.icinga.com/docs
+1.14.2 - 12/20/2017
+
+SECURITY FIXES
+
+* Don't change ownership of STATEDIR
+* Change --with-tmp-{file,path} to default to $localstatedir instead of /tmp
+
+Again, this only affects source installations. Packages are safe.
+
1.14.1 - 12/19/2017
SECURITY FIXES
diff --git a/Makefile.in b/Makefile.in
index 3003a15..074a1a0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,7 +89,7 @@ MKDIR=/bin/mkdir
###############################
# Global
###############################
-ICINGA_VERSION=1.14.1
+ICINGA_VERSION=1.14.2
CP=@CP@
@@ -368,7 +368,7 @@ install:
cd $(SRC_CGI) && $(MAKE) $@
cd $(SRC_HTM) && $(MAKE) $@
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(STATEDIR)
+ $(INSTALL) -m 775 -d $(DESTDIR)$(STATEDIR)
$(INSTALL) -m 775 -d $(DESTDIR)$(LIBEXECDIR)
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
@@ -564,7 +564,7 @@ install-classicui-standalone-conf: install-cgiconf install-webconf
install-classicui-standalone: install-cgis install-html
# make sure we keep all the needed dirs for data
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(STATEDIR)
+ $(INSTALL) -m 775 -d $(DESTDIR)$(STATEDIR)
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR)
diff --git a/configure b/configure
index 7a296cc..f2a6179 100755
--- a/configure
+++ b/configure
@@ -752,7 +752,6 @@ infodir
docdir
oldincludedir
includedir
-runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -887,7 +886,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1140,15 +1138,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
- -runstatedir | --runstatedir | --runstatedi | --runstated \
- | --runstate | --runstat | --runsta | --runst | --runs \
- | --run | --ru | --r)
- ac_prev=runstatedir ;;
- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
- | --run=* | --ru=* | --r=*)
- runstatedir=$ac_optarg ;;
-
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1286,7 +1275,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir runstatedir
+ libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1439,7 +1428,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -2523,9 +2511,9 @@ ac_config_headers="$ac_config_headers include/config.h"
PKG_NAME=icinga-core
-PKG_VERSION="1.14.1"
+PKG_VERSION="1.14.2"
PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="12-19-2017"
+PKG_REL_DATE="12-20-2017"
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -5404,7 +5392,7 @@ else
fi
if test x$TMPDIR = xno; then
- TMPDIR="/tmp"
+ TMPDIR="$localstatedir"
fi
@@ -5418,7 +5406,7 @@ else
fi
if test x$TMPFILE = xno; then
- TMPFILE="/tmp/icinga.tmp"
+ TMPFILE="$localstatedir/icinga.tmp"
fi
diff --git a/configure.in b/configure.in
index dbbec67..af8aa9a 100644
--- a/configure.in
+++ b/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.14.1"
+PKG_VERSION="1.14.2"
PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="12-19-2017"
+PKG_REL_DATE="12-20-2017"
dnl Figure out how to invoke "install" and what install options to use.
AC_PROG_INSTALL
@@ -318,7 +318,7 @@ dnl Location of temp path
TMPDIR=no
AC_ARG_WITH(temp-dir,AC_HELP_STRING([--with-temp-dir=<path>],[sets path to temp directory path where Icinga can create temp files for service/host check results]),TMPDIR=$withval,TMPDIR=no)
if test x$TMPDIR = xno; then
- TMPDIR="/tmp"
+ TMPDIR="$localstatedir"
fi
AC_SUBST(TMPDIR)
@@ -326,7 +326,7 @@ dnl Location of temp file
TMPFILE=no
AC_ARG_WITH(temp-file,AC_HELP_STRING([--with-temp-file=<filepath>],[sets path to an Icinga exclusive update temp file i.e. /tmp/icinga.tmp]),TMPFILE=$withval,TMPFILE=no)
if test x$TMPFILE = xno; then
- TMPFILE="/tmp/icinga.tmp"
+ TMPFILE="$localstatedir/icinga.tmp"
fi
AC_SUBST(TMPFILE)
diff --git a/html/main.html b/html/main.html
index 979b44f..fb0bb32 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
</div>
<div id="currentversioninfo">
-<div class="version">Version 1.14.1</div>
-<div class="releasedate">December 19, 2017</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.14.1</a></div>
+<div class="version">Version 1.14.2</div>
+<div class="releasedate">December 20, 2017</div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.14.2</a></div>
</div>
<div id="developer">
diff --git a/icinga.spec b/icinga.spec
index e35b8d3..20b6b78 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -54,7 +54,7 @@
Summary: Open Source host, service and network monitoring program
Name: icinga
-Version: 1.14.1
+Version: 1.14.2
Release: %{revision}%{?dist}
License: GPLv2
Group: Applications/System
diff --git a/include/common.h b/include/common.h
index 7ffcfba..4130b00 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.14.1"
-#define PROGRAM_MODIFICATION_DATE "12-19-2017"
+#define PROGRAM_VERSION "1.14.2"
+#define PROGRAM_MODIFICATION_DATE "12-20-2017"
/*#define DEBUG_CHECK_IPC 1 */
/*#define DEBUG_CHECK_IPC2 1*/
diff --git a/module/idoutils/include/common.h b/module/idoutils/include/common.h
index 79f6134..d844a13 100644
--- a/module/idoutils/include/common.h
+++ b/module/idoutils/include/common.h
@@ -22,8 +22,8 @@
#define LOG2IDO_NAME "LOG2IDO"
/* only one space for update-version matching */
-#define IDO_DATE "12-19-2017"
-#define IDO_VERSION "1.14.1"
+#define IDO_DATE "12-20-2017"
+#define IDO_VERSION "1.14.2"
#define IDO_SCHEMA_VERSION "1.13.0"
diff --git a/update-version b/update-version
index 1699eaf..b11b4b4 100755
--- a/update-version
+++ b/update-version
@@ -10,10 +10,10 @@ else
fi
# Current version number
-CURRENTVERSION=1.14.1
+CURRENTVERSION=1.14.2
# Last date
-LASTDATE=12-19-2017
+LASTDATE=12-20-2017
if [ "x$1" = "x" ]
then
@@ -50,7 +50,7 @@ perl -i -p -e "s/Version: .*/Version: $newversion/;" icinga.spec
# Update version number in Makefile.in
perl -i -p -e "s/ICINGA_VERSION=.*/ICINGA_VERSION=$newversion/;" Makefile.in
# needs to be done in current Makefile too (not dependant on configure!)
-perl -i -p -e "s/ICINGA_VERSION=.*/ICINGA_VERSION=$newversion/;" Makefile
+#perl -i -p -e "s/ICINGA_VERSION=.*/ICINGA_VERSION=$newversion/;" Makefile
# Update version number and release date in main HTML page
perl -i -p -e "s/>Version .*</>Version $newversion</;" html/main.html
--
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