From b31b434598e596b3c1e7500fec43199a57a2f159 Mon Sep 17 00:00:00 2001 From: Nokis Mavrogiannopoulos Date: Sun, 29 Jun 2008 19:35:40 +0000 Subject: added tag --- NEWS | 6 ++- configure.ac | 8 ++-- m4/apr_memcache.m4 | 31 ++++++++++---- m4/libgnutls.m4 | 121 +++++++++++++++++++++++++---------------------------- src/gnutls_hooks.c | 6 --- 5 files changed, 91 insertions(+), 81 deletions(-) diff --git a/NEWS b/NEWS index 40a91d9..0c50249 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,8 @@ -** Version 0.5.1 +** Version 0.5.2 (2008-06-29) + +- Depend on gnutls 2.4 which has openpgp support in main library. + +** Version 0.5.1 (2008-03-05) - Added --disable-srp configure option diff --git a/configure.ac b/configure.ac index 62db2af..1e42464 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl -AC_INIT(mod_gnutls, 0.5.1) +AC_INIT(mod_gnutls, 0.5.2) OOO_CONFIG_NICE(config.nice) MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION AC_PREREQ(2.53) @@ -28,11 +28,11 @@ CHECK_APACHE(,$AP_VERSION, dnl LIBTOOL="`${APR_CONFIG} --apr-libtool`" dnl AC_SUBST(LIBTOOL) -MIN_TLS_VERSION=2.2.1 -AM_PATH_LIBGNUTLS_EXTRA($MIN_TLS_VERSION,, +MIN_TLS_VERSION=2.4.0 +AM_PATH_LIBGNUTLS($MIN_TLS_VERSION,, AC_MSG_ERROR([[ *** -*** libgnutls and libgnutls-extra were not found. You may want to get it from +*** libgnutls was not found. You may want to get it from *** http://www.gnutls.org/ *** ]])) diff --git a/m4/apr_memcache.m4 b/m4/apr_memcache.m4 index 71ab2b6..c8f6a7e 100644 --- a/m4/apr_memcache.m4 +++ b/m4/apr_memcache.m4 @@ -9,19 +9,16 @@ AC_ARG_WITH( apr-memcache-prefix, [AC_HELP_STRING([--with-apr-memcache-prefix=PATH],[Install prefix for apr_memcache])], apr_memcache_prefix="$withval", - apr_memcache_prefix="/usr", :) AC_ARG_WITH( apr-memcache-libs, [AC_HELP_STRING([--with-apr-memcache-libs=PATH],[Path to apr_memcache libs])], apr_memcache_libs="$withval", - apr_memcache_libs="$apr_memcache_prefix/lib" :) AC_ARG_WITH( apr-memcache-includes, [AC_HELP_STRING([--with-apr-memcache-includes=PATH],[Path to apr_memcache includes])], apr_memcache_includes="$withval", - apr_memcache_includes="$apr_memcache_prefix/include/apr_memcache-0" :) @@ -30,14 +27,34 @@ AC_LIBTOOL_SYS_DYNAMIC_LINKER dnl # Determine memcache lib directory save_CFLAGS=$CFLAGS save_LDFLAGS=$LDFLAGS -CFLAGS="-I$apr_memcache_includes $APR_INCLUDES $CFLAGS" -LDFLAGS="-L$apr_memcache_libs $LDFLAGS" + +if test -n "$apr_memcache_libs"; then + apr_memcache_libdir=$apr_memcache_libs +elif test -n "$apr_memcache_prefix"; then + apr_memcache_libdir=$apr_memcache_prefix/lib +fi +if test -n "$apr_memcache_libdir"; then + LDFLAGS="-L$apr_memcache_libdir $LDFLAGS" +fi + +if test -n "$apr_memcache_includes"; then + apr_memcache_includedir=$apr_memcache_includes +elif test -n "$apr_memcache_prefix"; then + apr_memcache_includedir=$apr_memcache_prefix/include/apr_memcache-0 +else + apr_memcache_includedir=$includedir/apr_memcache-0 +fi +CFLAGS="-I$apr_memcache_includedir $CFLAGS" + AC_CHECK_LIB( apr_memcache, apr_memcache_create, [ - APR_MEMCACHE_LIBS="-R$apr_memcache_libs -L$apr_memcache_libs -lapr_memcache" - APR_MEMCACHE_CFLAGS="-I$apr_memcache_includes" + APR_MEMCACHE_LIBS="-lapr_memcache" + if test -n "$apr_memcache_libdir"; then + APR_MEMCACHE_LIBS="-R$apr_memcache_libdir -L$apr_memcache_libdir $APR_MEMCACHE_LIBS" + fi + APR_MEMCACHE_CFLAGS="-I$apr_memcache_includedir" ] ) CFLAGS=$save_CFLAGS diff --git a/m4/libgnutls.m4 b/m4/libgnutls.m4 index 960bb2a..8479388 100644 --- a/m4/libgnutls.m4 +++ b/m4/libgnutls.m4 @@ -1,98 +1,97 @@ -dnl Autoconf macros for libgnutls-extra +dnl Autoconf macros for libgnutls dnl $id$ -# Modified for LIBGNUTLS_EXTRA -- nmav +# Modified for LIBGNUTLS -- nmav # Configure paths for LIBGCRYPT # Shamelessly stolen from the one of XDELTA by Owen Taylor # Werner Koch 99-12-09 -dnl AM_PATH_LIBGNUTLS_EXTRA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -dnl Test for libgnutls-extra, and define LIBGNUTLS_EXTRA_CFLAGS and LIBGNUTLS_EXTRA_LIBS +dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS dnl -AC_DEFUN([AM_PATH_LIBGNUTLS_EXTRA], +AC_DEFUN([AM_PATH_LIBGNUTLS], [dnl -dnl Get the cflags and libraries from the libgnutls-extra-config script +dnl Get the cflags and libraries from the libgnutls-config script dnl -AC_ARG_WITH(libgnutls-extra-prefix, - [ --with-libgnutls-extra-prefix=PFX Prefix where libgnutls-extra is installed (optional)], - libgnutls_extra_config_prefix="$withval", libgnutls_extra_config_prefix="") +AC_ARG_WITH(libgnutls-prefix, + [ --with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional)], + libgnutls_config_prefix="$withval", libgnutls_config_prefix="") - if test x$libgnutls_extra_config_prefix != x ; then - if test x${LIBGNUTLS_EXTRA_CONFIG+set} != xset ; then - LIBGNUTLS_EXTRA_CONFIG=$libgnutls_extra_config_prefix/bin/libgnutls-extra-config + if test x$libgnutls_config_prefix != x ; then + if test x${LIBGNUTLS_CONFIG+set} != xset ; then + LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config fi fi - AC_PATH_PROG(LIBGNUTLS_EXTRA_CONFIG, libgnutls-extra-config, no) + AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no) min_libgnutls_version=ifelse([$1], ,0.1.0,$1) AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version) no_libgnutls="" - if test "$LIBGNUTLS_EXTRA_CONFIG" = "no" ; then + if test "$LIBGNUTLS_CONFIG" = "no" ; then no_libgnutls=yes else - LIBGNUTLS_EXTRA_CFLAGS=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --cflags` - LIBGNUTLS_EXTRA_LIBS=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --libs` - libgnutls_extra_config_version=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version` + LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags` + LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` + libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $LIBGNUTLS_EXTRA_CFLAGS" - LIBS="$LIBS $LIBGNUTLS_EXTRA_LIBS" + CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" + LIBS="$LIBS $LIBGNUTLS_LIBS" dnl dnl Now check if the installed libgnutls is sufficiently new. Also sanity -dnl checks the results of libgnutls-extra-config to some extent +dnl checks the results of libgnutls-config to some extent dnl rm -f conf.libgnutlstest AC_TRY_RUN([ #include #include #include -#include +#include int main () { system ("touch conf.libgnutlstest"); - if( strcmp( gnutls_extra_check_version(NULL), "$libgnutls_extra_config_version" ) ) + if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) ) { - printf("\n*** 'libgnutls-extra-config --version' returned %s, but LIBGNUTLS_EXTRA (%s)\n", - "$libgnutls_extra_config_version", gnutls_extra_check_version(NULL) ); - printf("*** was found! If libgnutls-extra-config was correct, then it is best\n"); - printf("*** to remove the old version of LIBGNUTLS_EXTRA. You may also be able to fix the error\n"); + printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n", + "$libgnutls_config_version", gnutls_check_version(NULL) ); + printf("*** was found! If libgnutls-config was correct, then it is best\n"); + printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n"); printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); printf("*** required on your system.\n"); - printf("*** If libgnutls-extra-config was wrong, set the environment variable LIBGNUTLS_EXTRA_CONFIG\n"); - printf("*** to point to the correct copy of libgnutls-extra-config, and remove the file config.cache\n"); + printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n"); + printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n"); printf("*** before re-running configure\n"); } - else if ( strcmp(gnutls_extra_check_version(NULL), LIBGNUTLS_EXTRA_VERSION ) ) + else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) ) { - printf("\n*** LIBGNUTLS_EXTRA header file (version %s) does not match\n", LIBGNUTLS_EXTRA_VERSION); - printf("*** library (version %s). This is may be due to a different version of gnutls\n", gnutls_extra_check_version(NULL) ); - printf("*** and gnutls-extra.\n"); + printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION); + printf("*** library (version %s)\n", gnutls_check_version(NULL) ); } else { - if ( gnutls_extra_check_version( "$min_libgnutls_version" ) ) + if ( gnutls_check_version( "$min_libgnutls_version" ) ) { return 0; } else { - printf("no\n*** An old version of LIBGNUTLS_EXTRA (%s) was found.\n", - gnutls_extra_check_version(NULL) ); - printf("*** You need a version of LIBGNUTLS_EXTRA newer than %s. The latest version of\n", + printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n", + gnutls_check_version(NULL) ); + printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n", "$min_libgnutls_version" ); - printf("*** LIBGNUTLS_EXTRA is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n"); + printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n"); printf("*** \n"); printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the libgnutls-extra-config shell script is\n"); + printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n"); printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of LIBGNUTLS_EXTRA, but you can also set the LIBGNUTLS_EXTRA_CONFIG environment to point to the\n"); - printf("*** correct copy of libgnutls-extra-config. (In this case, you will have to\n"); + printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n"); + printf("*** correct copy of libgnutls-config. (In this case, you will have to\n"); printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); printf("*** so that the correct libraries are found at run-time))\n"); } @@ -113,27 +112,27 @@ main () else AC_MSG_RESULT(no) fi - if test "$LIBGNUTLS_EXTRA_CONFIG" = "no" ; then - echo "*** The libgnutls-extra-config script installed by LIBGNUTLS_EXTRA could not be found" - echo "*** If LIBGNUTLS_EXTRA was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the LIBGNUTLS_EXTRA_CONFIG environment variable to the" - echo "*** full path to libgnutls-extra-config." + if test "$LIBGNUTLS_CONFIG" = "no" ; then + echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found" + echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the" + echo "*** full path to libgnutls-config." else if test -f conf.libgnutlstest ; then : else echo "*** Could not run libgnutls test program, checking why..." - CFLAGS="$CFLAGS $LIBGNUTLS_EXTRA_CFLAGS" - LIBS="$LIBS $LIBGNUTLS_EXTRA_LIBS" + CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" + LIBS="$LIBS $LIBGNUTLS_LIBS" AC_TRY_LINK([ #include #include #include -#include -], [ return !!gnutls_extra_check_version(NULL); ], +#include +], [ return !!gnutls_check_version(NULL); ], [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding LIBGNUTLS_EXTRA or finding the wrong" - echo "*** version of LIBGNUTLS_EXTRA. If it is not finding LIBGNUTLS_EXTRA, you'll need to set your" + echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong" + echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your" echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" echo "*** to the installed location Also, make sure you have run ldconfig if that" echo "*** is required on your system" @@ -142,25 +141,21 @@ main () echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" echo "***" ], [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means LIBGNUTLS_EXTRA was incorrectly installed" - echo "*** or that you have moved LIBGNUTLS_EXTRA since it was installed. In the latter case, you" - echo "*** may want to edit the libgnutls-extra-config script: $LIBGNUTLS_EXTRA_CONFIG" ]) + echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed" + echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you" + echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ]) CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi fi - LIBGNUTLS_EXTRA_CFLAGS="" - LIBGNUTLS_EXTRA_LIBS="" + LIBGNUTLS_CFLAGS="" + LIBGNUTLS_LIBS="" ifelse([$3], , :, [$3]) fi rm -f conf.libgnutlstest - AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS) - AC_SUBST(LIBGNUTLS_EXTRA_LIBS) - LIBGNUTLS_LIBS=$LIBGNUTLS_EXTRA_LIBS - LIBGNUTLS_CFLAGS=$LIBGNUTLS_EXTRA_CFLAGS - LIBGNUTLS_VERSION=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version` - LIBGNUTLS_PREFIX="`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --prefix`" + LIBGNUTLS_VERSION=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` + LIBGNUTLS_PREFIX="`$LIBGNUTLS_CONFIG $libgnutls_config_args --prefix`" GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool" AC_SUBST(LIBGNUTLS_CFLAGS) @@ -168,7 +163,7 @@ main () AC_SUBST(LIBGNUTLS_VERSION) AC_SUBST(LIBGNUTLS_PREFIX) AC_SUBST(LIBGNUTLS_CERTTOOL) - + ]) dnl *-*wedit:notab*-* Please keep this as the last line. diff --git a/src/gnutls_hooks.c b/src/gnutls_hooks.c index ee3c2db..5ced25b 100644 --- a/src/gnutls_hooks.c +++ b/src/gnutls_hooks.c @@ -83,12 +83,6 @@ int ret; return -3; } - ret = gnutls_global_init_extra(); - if (ret < 0) { - fprintf(stderr, "gnutls_global_init_extra: %s\n", gnutls_strerror(ret)); - return -3; - } - apr_pool_cleanup_register(pconf, NULL, mgs_cleanup_pre_config, apr_pool_cleanup_null); -- cgit