Menu
▾
▴
nagios-checkins
|
From: Ethan G. <ega...@us...> - 2007-10-24 16:02:23
|
Update of /cvsroot/nagios/nrpe In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10271 Modified Files: Changelog configure configure.in Log Message: Better ssl detection on 64-bit systems Index: Changelog =================================================================== RCS file: /cvsroot/nagios/nrpe/Changelog,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** Changelog 19 Oct 2007 13:18:55 -0000 1.56 --- Changelog 24 Oct 2007 16:02:21 -0000 1.57 *************** *** 5,8 **** --- 5,14 ---- + 2.11 - ??/??/2007 + ----------------- + - Added lib64 library paths to configure script for 64-bit systems (John Maag) + - Added --with-ssl-lib configure script option + + 2.10 - 10/19/2007 ----------------- Index: configure =================================================================== RCS file: /cvsroot/nagios/nrpe/configure,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** configure 19 Oct 2007 13:18:56 -0000 1.55 --- configure 24 Oct 2007 16:02:21 -0000 1.56 *************** *** 854,857 **** --- 854,858 ---- --with-ssl=DIR sets location of the SSL installation --with-ssl-inc=DIR sets location of the SSL include files + --with-ssl-lib=DIR sets location of the SSL libraries --with-kerberos-inc=DIR sets location of the Kerberos include files --with-nrpe-user=<user> sets user name to run NRPE *************** *** 1297,1303 **** PKG_NAME=nrpe ! PKG_VERSION="2.10" PKG_HOME_URL="http://www.nagios.org/" ! PKG_REL_DATE="10-19-2007" ac_aux_dir= --- 1298,1304 ---- PKG_NAME=nrpe ! PKG_VERSION="2.9" PKG_HOME_URL="http://www.nagios.org/" ! PKG_REL_DATE="08-13-2007" ac_aux_dir= *************** *** 6586,6590 **** --- 6587,6593 ---- fi; + ssl_dir= ssl_inc_dir= + ssl_lib_dir= # Check whether --with-ssl or --without-ssl was given. *************** *** 6604,6607 **** --- 6607,6618 ---- fi; + # Check whether --with-ssl-lib or --without-ssl-lib was given. + if test "${with_ssl_lib+set}" = set; then + withval="$with_ssl_lib" + + ssl_lib_dir=$withval + + fi; + # Check whether --with-kerberos-inc or --without-kerberos-inc was given. if test "${with_kerberos_inc+set}" = set; then *************** *** 6613,6618 **** if test x$check_for_ssl = xyes; then ! echo "$as_me:$LINENO: checking for SSL" >&5 ! echo $ECHO_N "checking for SSL... $ECHO_C" >&6 found_ssl=no 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 --- 6624,6629 ---- if test x$check_for_ssl = xyes; then ! echo "$as_me:$LINENO: checking for SSL headers" >&5 ! echo $ECHO_N "checking for SSL headers... $ECHO_C" >&6 found_ssl=no 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 *************** *** 6621,6624 **** --- 6632,6636 ---- found_ssl=yes CFLAGS="$CFLAGS -I$dir/include/openssl -I$ssldir/include" + sslincdir="$dir/include/openssl" break fi *************** *** 6626,6634 **** found_ssl=yes CFLAGS="$CFLAGS -I$dir/include" break fi if test -f "$dir/ssl.h"; then found_ssl=yes ! CFLAGS="$CFLAGS -I$dir/include" ssldir="$dir/.." break --- 6638,6648 ---- found_ssl=yes CFLAGS="$CFLAGS -I$dir/include" + sslincdir="$dir/include" break fi if test -f "$dir/ssl.h"; then found_ssl=yes ! CFLAGS="$CFLAGS -I$dir" ! sslincdir="$dir" ssldir="$dir/.." break *************** *** 6636,6640 **** if test -f "$dir/openssl/ssl.h"; then found_ssl=yes ! CFLAGS="$CFLAGS -I$dir/include" ssldir="$dir/.." break --- 6650,6655 ---- if test -f "$dir/openssl/ssl.h"; then found_ssl=yes ! CFLAGS="$CFLAGS -I$dir/openssl" ! sslincdir="$dir/openssl" ssldir="$dir/.." break *************** *** 6643,6658 **** if test x_$found_ssl != x_yes; then ! { { echo "$as_me:$LINENO: error: Cannot find ssl libraries" >&5 ! echo "$as_me: error: Cannot find ssl libraries" >&2;} { (exit 1); exit 1; }; } else ! printf "SSL found in $ssldir\n"; ! LIBS="$LIBS -lssl -lcrypto"; ! if test x$ssl_lib_dir != x; then ! LDFLAGS="$LDFLAGS -L$ssl_lib_dir"; else ! LDFLAGS="$LDFLAGS -L$ssldir/lib"; ! fi ! cat >>confdefs.h <<_ACEOF #define HAVE_SSL 1 _ACEOF --- 6658,6690 ---- if test x_$found_ssl != x_yes; then ! { { echo "$as_me:$LINENO: error: Cannot find ssl headers" >&5 ! echo "$as_me: error: Cannot find ssl headers" >&2;} { (exit 1); exit 1; }; } else ! ! printf "SSL headers found in $ssldir\n"; ! ! echo "$as_me:$LINENO: checking for SSL libraries" >&5 ! echo $ECHO_N "checking for SSL libraries... $ECHO_C" >&6 ! 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 ! ssllibdir="$dir" ! if test -f "$dir/libssl.so"; then ! found_ssl=yes ! break ! fi ! done ! ! if test x_$found_ssl != x_yes; then ! { { echo "$as_me:$LINENO: error: Cannot find ssl libraries" >&5 ! echo "$as_me: error: Cannot find ssl libraries" >&2;} ! { (exit 1); exit 1; }; } else ! printf "SSL libraries found in $ssllibdir\n"; ! ! LDFLAGS="$LDFLAGS -L$ssllibdir"; ! LIBS="$LIBS -lssl -lcrypto"; ! ! cat >>confdefs.h <<_ACEOF #define HAVE_SSL 1 _ACEOF *************** *** 6660,6672 **** ! echo "" ! echo "*** Generating DH Parameters for SSL/TLS ***" ! if test -f "$ssldir/sbin/openssl"; then ! sslbin=$ssldir/sbin/openssl ! else ! 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 fi --- 6692,6705 ---- ! echo "" ! echo "*** Generating DH Parameters for SSL/TLS ***" ! if test -f "$ssldir/sbin/openssl"; then ! sslbin=$ssldir/sbin/openssl ! else ! 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 fi fi *************** *** 6722,6726 **** - echo "GROUP: $nrpe_group" NRPE_INSTALL_OPTS="-o $nrpe_user -g $nrpe_group" --- 6755,6758 ---- Index: configure.in =================================================================== RCS file: /cvsroot/nagios/nrpe/configure.in,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** configure.in 19 Oct 2007 13:18:56 -0000 1.57 --- configure.in 24 Oct 2007 16:02:21 -0000 1.58 *************** *** 10,16 **** PKG_NAME=nrpe ! PKG_VERSION="2.10" PKG_HOME_URL="http://www.nagios.org/" ! PKG_REL_DATE="10-19-2007" dnl Figure out how to invoke "install" and what install options to use. --- 10,16 ---- PKG_NAME=nrpe ! PKG_VERSION="2.9" PKG_HOME_URL="http://www.nagios.org/" ! PKG_REL_DATE="08-13-2007" dnl Figure out how to invoke "install" and what install options to use. *************** *** 226,230 **** --- 226,232 ---- dnl Optional SSL library and include paths + ssl_dir= ssl_inc_dir= + ssl_lib_dir= AC_ARG_WITH(ssl,--with-ssl=DIR sets location of the SSL installation,[ ssl_dir=$withval *************** *** 233,236 **** --- 235,241 ---- ssl_inc_dir=$withval ]) + AC_ARG_WITH(ssl-lib,--with-ssl-lib=DIR sets location of the SSL libraries,[ + ssl_lib_dir=$withval + ]) AC_ARG_WITH(kerberos-inc,--with-kerberos-inc=DIR sets location of the Kerberos include files,[ kerberos_inc_dir=$withval *************** *** 240,244 **** dnl Modified version of Mark Ethan Trostler's macro <tro...@ju...> if test x$check_for_ssl = xyes; then ! AC_MSG_CHECKING(for SSL) found_ssl=no 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 --- 245,249 ---- dnl Modified version of Mark Ethan Trostler's macro <tro...@ju...> if test x$check_for_ssl = xyes; then ! AC_MSG_CHECKING(for SSL headers) found_ssl=no 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 *************** *** 247,250 **** --- 252,256 ---- found_ssl=yes CFLAGS="$CFLAGS -I$dir/include/openssl -I$ssldir/include" + sslincdir="$dir/include/openssl" break fi *************** *** 252,260 **** found_ssl=yes CFLAGS="$CFLAGS -I$dir/include" break fi if test -f "$dir/ssl.h"; then found_ssl=yes ! CFLAGS="$CFLAGS -I$dir/include" ssldir="$dir/.." break --- 258,268 ---- found_ssl=yes CFLAGS="$CFLAGS -I$dir/include" + sslincdir="$dir/include" break fi if test -f "$dir/ssl.h"; then found_ssl=yes ! CFLAGS="$CFLAGS -I$dir" ! sslincdir="$dir" ssldir="$dir/.." break *************** *** 262,266 **** if test -f "$dir/openssl/ssl.h"; then found_ssl=yes ! CFLAGS="$CFLAGS -I$dir/include" ssldir="$dir/.." break --- 270,275 ---- if test -f "$dir/openssl/ssl.h"; then found_ssl=yes ! CFLAGS="$CFLAGS -I$dir/openssl" ! sslincdir="$dir/openssl" ssldir="$dir/.." break *************** *** 269,294 **** if test x_$found_ssl != x_yes; then ! AC_MSG_ERROR(Cannot find ssl libraries) else ! printf "SSL found in $ssldir\n"; ! LIBS="$LIBS -lssl -lcrypto"; ! if test x$ssl_lib_dir != x; then ! LDFLAGS="$LDFLAGS -L$ssl_lib_dir"; ! else ! LDFLAGS="$LDFLAGS -L$ssldir/lib"; ! fi ! AC_DEFINE_UNQUOTED(HAVE_SSL) ! AC_SUBST(HAVE_SSL) ! ! dnl Generate DH parameters ! echo "" ! echo "*** Generating DH Parameters for SSL/TLS ***" ! if test -f "$ssldir/sbin/openssl"; then ! sslbin=$ssldir/sbin/openssl else ! 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 fi --- 278,319 ---- if test x_$found_ssl != x_yes; then ! AC_MSG_ERROR(Cannot find ssl headers) else ! ! printf "SSL headers found in $ssldir\n"; ! ! 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; do ! ssllibdir="$dir" ! if test -f "$dir/libssl.so"; then ! found_ssl=yes ! break ! fi ! done ! ! if test x_$found_ssl != x_yes; then ! AC_MSG_ERROR(Cannot find ssl libraries) else ! printf "SSL libraries found in $ssllibdir\n"; ! ! LDFLAGS="$LDFLAGS -L$ssllibdir"; ! LIBS="$LIBS -lssl -lcrypto"; ! ! AC_DEFINE_UNQUOTED(HAVE_SSL) ! AC_SUBST(HAVE_SSL) ! ! dnl Generate DH parameters ! echo "" ! echo "*** Generating DH Parameters for SSL/TLS ***" ! if test -f "$ssldir/sbin/openssl"; then ! sslbin=$ssldir/sbin/openssl ! else ! 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 fi fi *************** *** 321,325 **** AC_SUBST(nrpe_user) AC_SUBST(nrpe_group) - echo "GROUP: $nrpe_group" NRPE_INSTALL_OPTS="-o $nrpe_user -g $nrpe_group" AC_SUBST(NRPE_INSTALL_OPTS) --- 346,349 ---- |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X