Changeset 1897a1c in mod_gnutls
- Timestamp:
- Jun 29, 2008, 3:31:37 PM (15 years ago)
- Branches:
- asyncio, debian/master, debian/stretch-backports, jessie-backports, master, msva, proxy-ticket, upstream
- Children:
- e7d7e3f
- Parents:
- 0e277f2
- git-author:
- Nikos Mavrogiannopoulos <nmav@…> (06/29/08 15:31:37)
- git-committer:
- Nokis Mavrogiannopoulos <nmav@…> (06/29/08 15:31:37)
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
NEWS
r0e277f2 r1897a1c 1 ** Version 0.5.2 (2008-06-29) 2 3 - Depend on gnutls 2.4 which has openpgp support in main library. 4 1 5 ** Version 0.5.1 (2008-03-05) 2 6 -
configure.ac
r0e277f2 r1897a1c 29 29 dnl AC_SUBST(LIBTOOL) 30 30 31 MIN_TLS_VERSION=2. 2.132 AM_PATH_LIBGNUTLS _EXTRA($MIN_TLS_VERSION,,31 MIN_TLS_VERSION=2.4.0 32 AM_PATH_LIBGNUTLS($MIN_TLS_VERSION,, 33 33 AC_MSG_ERROR([[ 34 34 *** 35 *** libgnutls and libgnutls-extra werenot found. You may want to get it from35 *** libgnutls was not found. You may want to get it from 36 36 *** http://www.gnutls.org/ 37 37 *** -
m4/libgnutls.m4
r0e277f2 r1897a1c 1 dnl Autoconf macros for libgnutls -extra1 dnl Autoconf macros for libgnutls 2 2 dnl $id$ 3 3 4 # Modified for LIBGNUTLS _EXTRA-- nmav4 # Modified for LIBGNUTLS -- nmav 5 5 # Configure paths for LIBGCRYPT 6 6 # Shamelessly stolen from the one of XDELTA by Owen Taylor 7 7 # Werner Koch 99-12-09 8 8 9 dnl AM_PATH_LIBGNUTLS _EXTRA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])10 dnl Test for libgnutls -extra, and define LIBGNUTLS_EXTRA_CFLAGS and LIBGNUTLS_EXTRA_LIBS9 dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) 10 dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS 11 11 dnl 12 AC_DEFUN([AM_PATH_LIBGNUTLS _EXTRA],12 AC_DEFUN([AM_PATH_LIBGNUTLS], 13 13 [dnl 14 dnl Get the cflags and libraries from the libgnutls- extra-config script14 dnl Get the cflags and libraries from the libgnutls-config script 15 15 dnl 16 AC_ARG_WITH(libgnutls- extra-prefix,17 [ --with-libgnutls- extra-prefix=PFX Prefix where libgnutls-extrais installed (optional)],18 libgnutls_ extra_config_prefix="$withval", libgnutls_extra_config_prefix="")16 AC_ARG_WITH(libgnutls-prefix, 17 [ --with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional)], 18 libgnutls_config_prefix="$withval", libgnutls_config_prefix="") 19 19 20 if test x$libgnutls_ extra_config_prefix != x ; then21 if test x${LIBGNUTLS_ EXTRA_CONFIG+set} != xset ; then22 LIBGNUTLS_ EXTRA_CONFIG=$libgnutls_extra_config_prefix/bin/libgnutls-extra-config20 if test x$libgnutls_config_prefix != x ; then 21 if test x${LIBGNUTLS_CONFIG+set} != xset ; then 22 LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config 23 23 fi 24 24 fi 25 25 26 AC_PATH_PROG(LIBGNUTLS_ EXTRA_CONFIG, libgnutls-extra-config, no)26 AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no) 27 27 min_libgnutls_version=ifelse([$1], ,0.1.0,$1) 28 28 AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version) 29 29 no_libgnutls="" 30 if test "$LIBGNUTLS_ EXTRA_CONFIG" = "no" ; then30 if test "$LIBGNUTLS_CONFIG" = "no" ; then 31 31 no_libgnutls=yes 32 32 else 33 LIBGNUTLS_ EXTRA_CFLAGS=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --cflags`34 LIBGNUTLS_ EXTRA_LIBS=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --libs`35 libgnutls_ extra_config_version=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version`33 LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags` 34 LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` 35 libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` 36 36 37 37 38 38 ac_save_CFLAGS="$CFLAGS" 39 39 ac_save_LIBS="$LIBS" 40 CFLAGS="$CFLAGS $LIBGNUTLS_ EXTRA_CFLAGS"41 LIBS="$LIBS $LIBGNUTLS_ EXTRA_LIBS"40 CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" 41 LIBS="$LIBS $LIBGNUTLS_LIBS" 42 42 dnl 43 43 dnl Now check if the installed libgnutls is sufficiently new. Also sanity 44 dnl checks the results of libgnutls- extra-config to some extent44 dnl checks the results of libgnutls-config to some extent 45 45 dnl 46 46 rm -f conf.libgnutlstest … … 49 49 #include <stdlib.h> 50 50 #include <string.h> 51 #include <gnutls/ extra.h>51 #include <gnutls/gnutls.h> 52 52 53 53 int … … 56 56 system ("touch conf.libgnutlstest"); 57 57 58 if( strcmp( gnutls_ extra_check_version(NULL), "$libgnutls_extra_config_version" ) )58 if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) ) 59 59 { 60 printf("\n*** 'libgnutls- extra-config --version' returned %s, but LIBGNUTLS_EXTRA(%s)\n",61 "$libgnutls_ extra_config_version", gnutls_extra_check_version(NULL) );62 printf("*** was found! If libgnutls- extra-config was correct, then it is best\n");63 printf("*** to remove the old version of LIBGNUTLS _EXTRA. You may also be able to fix the error\n");60 printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n", 61 "$libgnutls_config_version", gnutls_check_version(NULL) ); 62 printf("*** was found! If libgnutls-config was correct, then it is best\n"); 63 printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n"); 64 64 printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); 65 65 printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); 66 66 printf("*** required on your system.\n"); 67 printf("*** If libgnutls- extra-config was wrong, set the environment variable LIBGNUTLS_EXTRA_CONFIG\n");68 printf("*** to point to the correct copy of libgnutls- extra-config, and remove the file config.cache\n");67 printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n"); 68 printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n"); 69 69 printf("*** before re-running configure\n"); 70 70 } 71 else if ( strcmp(gnutls_ extra_check_version(NULL), LIBGNUTLS_EXTRA_VERSION ) )71 else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) ) 72 72 { 73 printf("\n*** LIBGNUTLS_EXTRA header file (version %s) does not match\n", LIBGNUTLS_EXTRA_VERSION); 74 printf("*** library (version %s). This is may be due to a different version of gnutls\n", gnutls_extra_check_version(NULL) ); 75 printf("*** and gnutls-extra.\n"); 73 printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION); 74 printf("*** library (version %s)\n", gnutls_check_version(NULL) ); 76 75 } 77 76 else 78 77 { 79 if ( gnutls_ extra_check_version( "$min_libgnutls_version" ) )78 if ( gnutls_check_version( "$min_libgnutls_version" ) ) 80 79 { 81 80 return 0; … … 83 82 else 84 83 { 85 printf("no\n*** An old version of LIBGNUTLS _EXTRA(%s) was found.\n",86 gnutls_ extra_check_version(NULL) );87 printf("*** You need a version of LIBGNUTLS _EXTRAnewer than %s. The latest version of\n",84 printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n", 85 gnutls_check_version(NULL) ); 86 printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n", 88 87 "$min_libgnutls_version" ); 89 printf("*** LIBGNUTLS _EXTRAis always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");88 printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n"); 90 89 printf("*** \n"); 91 90 printf("*** If you have already installed a sufficiently new version, this error\n"); 92 printf("*** probably means that the wrong copy of the libgnutls- extra-config shell script is\n");91 printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n"); 93 92 printf("*** being found. The easiest way to fix this is to remove the old version\n"); 94 printf("*** of LIBGNUTLS _EXTRA, but you can also set the LIBGNUTLS_EXTRA_CONFIG environment to point to the\n");95 printf("*** correct copy of libgnutls- extra-config. (In this case, you will have to\n");93 printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n"); 94 printf("*** correct copy of libgnutls-config. (In this case, you will have to\n"); 96 95 printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); 97 96 printf("*** so that the correct libraries are found at run-time))\n"); … … 114 113 AC_MSG_RESULT(no) 115 114 fi 116 if test "$LIBGNUTLS_ EXTRA_CONFIG" = "no" ; then117 echo "*** The libgnutls- extra-config script installed by LIBGNUTLS_EXTRAcould not be found"118 echo "*** If LIBGNUTLS _EXTRAwas installed in PREFIX, make sure PREFIX/bin is in"119 echo "*** your path, or set the LIBGNUTLS_ EXTRA_CONFIG environment variable to the"120 echo "*** full path to libgnutls- extra-config."115 if test "$LIBGNUTLS_CONFIG" = "no" ; then 116 echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found" 117 echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in" 118 echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the" 119 echo "*** full path to libgnutls-config." 121 120 else 122 121 if test -f conf.libgnutlstest ; then … … 124 123 else 125 124 echo "*** Could not run libgnutls test program, checking why..." 126 CFLAGS="$CFLAGS $LIBGNUTLS_ EXTRA_CFLAGS"127 LIBS="$LIBS $LIBGNUTLS_ EXTRA_LIBS"125 CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" 126 LIBS="$LIBS $LIBGNUTLS_LIBS" 128 127 AC_TRY_LINK([ 129 128 #include <stdio.h> 130 129 #include <stdlib.h> 131 130 #include <string.h> 132 #include <gnutls/ extra.h>133 ], [ return !!gnutls_ extra_check_version(NULL); ],131 #include <gnutls/gnutls.h> 132 ], [ return !!gnutls_check_version(NULL); ], 134 133 [ echo "*** The test program compiled, but did not run. This usually means" 135 echo "*** that the run-time linker is not finding LIBGNUTLS _EXTRAor finding the wrong"136 echo "*** version of LIBGNUTLS _EXTRA. If it is not finding LIBGNUTLS_EXTRA, you'll need to set your"134 echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong" 135 echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your" 137 136 echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" 138 137 echo "*** to the installed location Also, make sure you have run ldconfig if that" … … 143 142 echo "***" ], 144 143 [ echo "*** The test program failed to compile or link. See the file config.log for the" 145 echo "*** exact error that occured. This usually means LIBGNUTLS _EXTRAwas incorrectly installed"146 echo "*** or that you have moved LIBGNUTLS _EXTRAsince it was installed. In the latter case, you"147 echo "*** may want to edit the libgnutls- extra-config script: $LIBGNUTLS_EXTRA_CONFIG" ])144 echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed" 145 echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you" 146 echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ]) 148 147 CFLAGS="$ac_save_CFLAGS" 149 148 LIBS="$ac_save_LIBS" 150 149 fi 151 150 fi 152 LIBGNUTLS_ EXTRA_CFLAGS=""153 LIBGNUTLS_ EXTRA_LIBS=""151 LIBGNUTLS_CFLAGS="" 152 LIBGNUTLS_LIBS="" 154 153 ifelse([$3], , :, [$3]) 155 154 fi 156 155 rm -f conf.libgnutlstest 157 AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)158 AC_SUBST(LIBGNUTLS_EXTRA_LIBS)159 156 160 LIBGNUTLS_LIBS=$LIBGNUTLS_EXTRA_LIBS 161 LIBGNUTLS_CFLAGS=$LIBGNUTLS_EXTRA_CFLAGS 162 LIBGNUTLS_VERSION=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version` 163 LIBGNUTLS_PREFIX="`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --prefix`" 157 LIBGNUTLS_VERSION=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` 158 LIBGNUTLS_PREFIX="`$LIBGNUTLS_CONFIG $libgnutls_config_args --prefix`" 164 159 GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool" 165 160 … … 169 164 AC_SUBST(LIBGNUTLS_PREFIX) 170 165 AC_SUBST(LIBGNUTLS_CERTTOOL) 171 166 172 167 ]) 173 168 -
src/gnutls_hooks.c
r0e277f2 r1897a1c 84 84 } 85 85 86 ret = gnutls_global_init_extra();87 if (ret < 0) {88 fprintf(stderr, "gnutls_global_init_extra: %s\n", gnutls_strerror(ret));89 return -3;90 }91 92 86 apr_pool_cleanup_register(pconf, NULL, mgs_cleanup_pre_config, 93 87 apr_pool_cleanup_null);
Note: See TracChangeset
for help on using the changeset viewer.