Title: [opsview-base] [216] Updated NRPE to 2.14 due to security exposure with bash commands as arguments
- Revision
- 216
- Author
- tvoon
- Date
- 2013-02-25 14:11:20 +0000 (Mon, 25 Feb 2013)
Log Message
Updated NRPE to 2.14 due to security exposure with bash commands as arguments
Modified Paths
Added Paths
Removed Paths
Property Changed
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- nagios-3.2.3
nagios-plugins-1.4.17-dev
autossh-1.4a
nrpe.cfg
icojoy-webicons-4
dataTables-1.4.3
fabtabulous
easyXDM-2.4.9.102
allmibs.tar.gz
tango-icon-theme-0.8.90
validation-1.5.4.1
check_radius_ih-1.1
jscalendar-1.0
iconsjoy-webicons-3
scriptaculous-js-1.8.3
._fabtabulous
nsca-2.7.2
nagvis-1.4.4
ndoutils-1.4b7
flot
easyXDM-2.4.15.118
opsview-agent.spec
nrpe-2.12
overlib-4.22
jquery.sparkline.uncompressed.1.5.1.js
nmis-4.2.13
opsview-base.spec
hypergraph-0.6.3
showdown-0.9
timeline-libraries-2.3.0
+ nagios-4.0.20130107
nagios-plugins-1.4.17-dev
autossh-1.4a
nrpe.cfg
icojoy-webicons-4
dataTables-1.4.3
fabtabulous
easyXDM-2.4.9.102
allmibs.tar.gz
tango-icon-theme-0.8.90
validation-1.5.4.1
check_radius_ih-1.1
jscalendar-1.0
iconsjoy-webicons-3
scriptaculous-js-1.8.3
._fabtabulous
nsca-2.7.2
nagvis-1.4.4
ndoutils-2-0
flot
easyXDM-2.4.15.118
opsview-agent.spec
nrpe-2.14
overlib-4.22
jquery.sparkline.uncompressed.1.5.1.js
nmis-4.2.13
opsview-base.spec
hypergraph-0.6.3
showdown-0.9
timeline-libraries-2.3.0
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2013-02-18 14:10:45 UTC (rev 215)
+++ trunk/Makefile 2013-02-25 14:11:20 UTC (rev 216)
@@ -34,7 +34,7 @@
NAGIOSPLUG = nagios-plugins-1.4.17-dev
NAGIOSPLUG_CONFIGURE_PERL_MODULES = --enable-perl-modules
CHECK_RADIUS_IH = check_radius_ih-1.1
-NRPE = nrpe-2.12
+NRPE = nrpe-2.14
NSCA = nsca-2.7.2
JSCAL = jscalendar-1.0
SCRIPT = scriptaculous-js-1.8.3
@@ -648,8 +648,9 @@
cd ${NRPE} && patch -p1 < ../patches/nrpe_remove_double_quotes_as_nasty.patch
cd ${NRPE} && patch -p1 < ../patches/nrpe_autodiscover_ssldir.patch
cd ${NRPE} && patch -p1 < ../patches/nrpe_remove_weak_ciphers.patch
- cd ${NRPE} && patch -p1 < ../patches/nrpe_ssl_compile_directory_ubuntu12.patch
cd ${NRPE} && patch -p1 < ../patches/nrpe_show_system_info.patch
+ # Below is required for NRPE 2.14 as autoconf fails otherwise
+ cd ${NRPE} && patch -p1 < ../patches/nrpe_fix_autoconf.patch
cd ${NRPE} && autoconf
#make customer-hook MACRO=patch APP=nrpe DIR=${NRPE}
if [ $(KERNEL_NAME) = SunOS ] ; then \
Deleted: trunk/nrpe-2.12.tar.gz
===================================================================
(Binary files differ)
Added: trunk/nrpe-2.14.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/nrpe-2.14.tar.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/patches/nrpe_autodiscover_ssldir.patch
===================================================================
--- trunk/patches/nrpe_autodiscover_ssldir.patch 2013-02-18 14:10:45 UTC (rev 215)
+++ trunk/patches/nrpe_autodiscover_ssldir.patch 2013-02-25 14:11:20 UTC (rev 216)
@@ -1,20 +1,15 @@
-diff -ur nrpe-2.11.original/configure.in nrpe-2.11/configure.in
---- nrpe-2.11.original/configure.in 2007-12-26 20:25:03.000000000 +0100
-+++ nrpe-2.11/configure.in 2008-03-07 17:01:51.662478536 +0100
-@@ -246,6 +246,7 @@
- if test x$check_for_ssl = xyes; then
- AC_MSG_CHECKING(for SSL headers)
- found_ssl=no
-+ ssldir=
- for dir in $ssl_inc_dir $ssl_dir /usr/local/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/freeware/lib/openssl; do
- ssldir="$dir"
- if test -f "$dir/include/openssl/ssl.h"; then
-@@ -285,7 +286,7 @@
+--- nrpe-2.14.original/configure.in 2013-02-25 13:53:46.000000000 +0000
++++ nrpe-2.14/configure.in 2013-02-25 14:03:40.000000000 +0000
+@@ -303,9 +303,11 @@
+ printf "SSL headers found in $ssldir\n";
+
dnl Now try and find SSL libraries
++ dnl Opsview patch: Added $ssldir/lib /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu
++ dnl Latter two for Ubuntu12
AC_MSG_CHECKING(for SSL libraries)
found_ssl=no
-- for dir in $ssl_lib_dir $ssl_dir /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl; do
-+ for dir in $ssl_lib_dir $ssl_dir /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl $ssldir/lib; do
+- for dir in $ssl_lib_dir $ssl_dir /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl /usr/sfw/lib /opt/freeware/lib; do
++ for dir in $ssl_lib_dir $ssl_dir /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl /usr/sfw/lib /opt/freeware/lib $ssldir/lib /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu; do
ssllibdir="$dir"
- if test -f "$dir/libssl.so"; then
- found_ssl=yes
+ if test "`uname -s`" == "Darwin" ; then
+ soext="dylib"
Added: trunk/patches/nrpe_fix_autoconf.patch
===================================================================
--- trunk/patches/nrpe_fix_autoconf.patch (rev 0)
+++ trunk/patches/nrpe_fix_autoconf.patch 2013-02-25 14:11:20 UTC (rev 216)
@@ -0,0 +1,13 @@
+--- nrpe-2.14/configure.in 2012-12-21 17:22:00.000000000 +0000
++++ nrpe-2.14.fixed/configure.in 2013-02-25 14:03:40.000000000 +0000
+@@ -4,8 +4,8 @@
+ define([AC_CACHE_LOAD],)
+ define([AC_CACHE_SAVE],)
+
+-2.14([nrpe],[2.13],[nagios-us...@lists.sourceforge.net],[nrpe],[http://www.nagios.org])
+-AC_CONFIG_SRCDIR([src/nrpe.c])
++dnl 2.14([nrpe],[2.13],[nagios-us...@lists.sourceforge.net],[nrpe],[http://www.nagios.org])
++AC_INIT([src/nrpe.c])
+ AC_CONFIG_HEADERS([include/config.h])
+ AC_CONFIG_FILES([Makefile
+ subst
Deleted: trunk/patches/nrpe_ssl_compile_directory_ubuntu12.patch
===================================================================
--- trunk/patches/nrpe_ssl_compile_directory_ubuntu12.patch 2013-02-18 14:10:45 UTC (rev 215)
+++ trunk/patches/nrpe_ssl_compile_directory_ubuntu12.patch 2013-02-25 14:11:20 UTC (rev 216)
@@ -1,12 +0,0 @@
-diff -ur nrpe-2.12.original/configure.in nrpe-2.12/configure.in
---- nrpe-2.12.original/configure.in 2012-05-03 09:29:42.000000000 +0000
-+++ nrpe-2.12/configure.in 2012-07-02 09:33:55.000000000 +0000
-@@ -286,7 +286,7 @@
- dnl Now try and find SSL libraries
- AC_MSG_CHECKING(for SSL libraries)
- found_ssl=no
-- for dir in $ssl_lib_dir $ssl_dir /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl $ssldir/lib; do
-+ for dir in $ssl_lib_dir $ssl_dir /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl $ssldir/lib /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu; do
- ssllibdir="$dir"
- if test -f "$dir/libssl.so"; then
- found_ssl=yes
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
