Revision: 25633 http://sourceforge.net/p/gar/code/25633 Author: janholzh Date: 2016-03-29 08:40:50 +0000 (Tue, 29 Mar 2016) Log Message: ----------- nrpe/trunk: repackage und change dh_param
Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2016-03-24 21:29:55 UTC (rev 25632) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2016-03-29 08:40:50 UTC (rev 25633) @@ -26,6 +26,7 @@ PATCHFILES_isa-pentium_pro-size-8k = 0002-changing-packetbuffer-length-to-8k.patch # needs autoconf! PATCHFILES += 0003-remove-chown-on-install.patch +PATCHFILES += 0003-chage_dh_param_to_2048.patch # # replace /usr/local @@ -35,7 +36,7 @@ REINPLACE_USRLOCAL += .*/nrpe-2.15/README REINPLACE_USRLOCAL += sample-config/nrpe.cfg.in -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 solaris11-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 solaris11-i386 solaris11-sparc # GARCOMPILER = GCC5 @@ -56,20 +57,20 @@ IPS_PACKAGE_PREFIX = diagnostic/ PACKAGES += CSWnrpe SPKG_DESC_CSWnrpe = Nagios remote plugin executor -# PKGFILES_CSWnrpe += /opt/csw/bin/nrpe_1k -# PKGFILES_CSWnrpe += /opt/csw/bin/nrpe_8k -# PKGFILES_CSWnrpe += /opt/csw/bin/nrpe -# PKGFILES_CSWnrpe += /etc/opt/csw/nrpe.cfg -# PKGFILES_CSWnrpe += /etc/opt/csw/init.d/cswnrpe -# PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe -# PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/NRPE.pdf -# PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/LEGAL -# PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/license -# PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/README +PKGFILES_CSWnrpe += /opt/csw/bin/nrpe_1k +PKGFILES_CSWnrpe += /opt/csw/bin/nrpe_8k +PKGFILES_CSWnrpe += /opt/csw/bin/nrpe +PKGFILES_CSWnrpe += /etc/opt/csw/nrpe.cfg.CSW +PKGFILES_CSWnrpe += /etc/opt/csw/init.d/cswnrpe +PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe +PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/NRPE.pdf +PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/LEGAL +PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/license +PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/README PKGFILES_CSWnrpe_SHARED += /opt/csw/share/doc/nrpe/README_8k -# PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/README.SSL -# PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/SECURITY -# PKGFILES_CSWnrpe += /opt/csw/nagios +PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/README.SSL +PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/SECURITY +PKGFILES_CSWnrpe += /opt/csw/nagios RUNTIME_DEP_PKGS_CSWnrpe += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWnrpe += CSWlibssl1-0-0 @@ -95,6 +96,7 @@ RUNTIME_DEP_PKGS_CSWnrpe-plugin += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWnrpe-plugin += CSWnrpe + # # migrate configuration # Added: csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch (rev 0) +++ csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch 2016-03-29 08:40:50 UTC (rev 25633) @@ -0,0 +1,39 @@ +From a733ca5b0f5e5e8f8a17730c43164c338c79161e Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter <j...@opencsw.org> +Date: Tue, 29 Mar 2016 10:16:49 +0200 +Subject: [PATCH] chage_dh_param_to_2048 + +--- + configure.in | 2 +- + src/nrpe.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index f0dfa09..1993140 100644 +--- a/configure.in ++++ b/configure.in +@@ -340,7 +340,7 @@ if test x$check_for_ssl = xyes; then + sslbin=$ssldir/bin/openssl + fi + # awk to strip off meta data at bottom of dhparam output +- $sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h ++ $sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h + fi + fi + +diff --git a/src/nrpe.c b/src/nrpe.c +index 381f0ac..6234492 100644 +--- a/src/nrpe.c ++++ b/src/nrpe.c +@@ -266,7 +266,7 @@ int main(int argc, char **argv){ + + /* use anonymous DH ciphers */ + SSL_CTX_set_cipher_list(ctx,"ADH"); +- dh=get_dh512(); ++ dh=get_dh2048(); + SSL_CTX_set_tmp_dh(ctx,dh); + DH_free(dh); + if(debug==TRUE) +-- +2.4.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.