Changeset 15ffe0b in mod_gnutls


Ignore:
Timestamp:
Jan 11, 2013, 12:56:27 AM (8 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports
Children:
2dd044f
Parents:
0ab45ea (diff), 8df5b25 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge tag 'upstream/0.4.3'

Upstream version 0.4.3

Files:
14 edited

Legend:

Unmodified
Added
Removed

  • Makefile.in

    r0ab45ea r15ffe0b  
    7878ACLOCAL = @ACLOCAL@
    7979AMTAR = @AMTAR@
     80APR_CFLAGS = @APR_CFLAGS@
     81APR_CPPFLAGS = @APR_CPPFLAGS@
    8082APR_INCLUDES = @APR_INCLUDES@
     83APR_LDFLAGS = @APR_LDFLAGS@
     84APR_LIBS = @APR_LIBS@
     85APR_LIBTOOL = @APR_LIBTOOL@
    8186APR_MEMCACHE_CFLAGS = @APR_MEMCACHE_CFLAGS@
    8287APR_MEMCACHE_LIBS = @APR_MEMCACHE_LIBS@
    8388APU_INCLUDES = @APU_INCLUDES@
     89APU_LDFLAGS = @APU_LDFLAGS@
     90APU_LIBS = @APU_LIBS@
     91APU_LIBTOOL = @APU_LIBTOOL@
    8492APXS_BIN = @APXS_BIN@
    8593APXS_CFLAGS = @APXS_CFLAGS@
    … …  
    121129F77 = @F77@
    122130FFLAGS = @FFLAGS@
    123 GNUTLS_CERTTOOL = @GNUTLS_CERTTOOL@
    124131GREP = @GREP@
    125 GTLS_BIN = @GTLS_BIN@
    126132INSTALL = @INSTALL@
    127133INSTALL_DATA = @INSTALL_DATA@
    … …  
    130136INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    131137LDFLAGS = @LDFLAGS@
     138LIBGNUTLS_CERTTOOL = @LIBGNUTLS_CERTTOOL@
    132139LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
     140LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
    133141LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
    134142LIBGNUTLS_PREFIX = @LIBGNUTLS_PREFIX@

  • NEWS

    r0ab45ea r15ffe0b  
     1** Version 0.4.3 (2008-03-05)
     2
     3- Added --disable-srp configure option
     4
     5- Better check for memcache (patch by Guillaume Rousse)
     6
     7- Corrected possible memory leak in DBM support for resuming sessions.
     8
    19** Version 0.4.2 (2007-12-10)
    210

  • autogen.sh

    r0ab45ea r15ffe0b  
    11#!/bin/sh
    22
    3 if [ -z $ACLOCAL ]; then
    4         ACLOCAL=aclocal
    5 fi
    6 if [ -z $AUTOCONF ]; then
    7         AUTOCONF=autoconf
    8 fi
    9 if [ -z $AUTOHEADER ]; then
    10         AUTOHEADER=autoheader
    11 fi
    123if [ -z $AUTORECONF ]; then
    134        AUTORECONF=autoreconf
    … …  
    156
    167#rm -rf autom4te.cache
    17 $AUTORECONF -f -i
     8$AUTORECONF -f -v -i
    189#touch stamp-h.in
    1910
    20 for x in providers/*; do
    21         if [ -e $x/autogen.sh ]; then
    22                 echo Generating Config files in $x
    23                 (cd $x; ./autogen.sh $*)
    24         fi
    25 done

  • config.in

    r0ab45ea r15ffe0b  
    11/* config.in.  Generated from configure.ac by autoheader.  */
     2
     3/* Default Module LibExec directory */
     4#undef DEFAULT_EXP_LIBEXECDIR
    25
    36/* Define to 1 if you have the <dlfcn.h> header file. */

  • configure

    r0ab45ea r15ffe0b  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.61 for mod_gnutls 0.4.2.1.
     3# Generated by GNU Autoconf 2.61 for mod_gnutls 0.4.3.
    44#
    55# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    … …  
    727727PACKAGE_NAME='mod_gnutls'
    728728PACKAGE_TARNAME='mod_gnutls'
    729 PACKAGE_VERSION='0.4.2.1'
    730 PACKAGE_STRING='mod_gnutls 0.4.2.1'
     729PACKAGE_VERSION='0.4.3'
     730PACKAGE_STRING='mod_gnutls 0.4.3'
    731731PACKAGE_BUGREPORT=''
    732732
    … …  
    892892AP_SBINDIR
    893893APR_INCLUDES
     894APR_LDFLAGS
     895APR_LIBS
     896APR_LIBTOOL
     897APR_CPPFLAGS
     898APR_CFLAGS
    894899APU_INCLUDES
     900APU_LDFLAGS
     901APU_LIBS
     902APU_LIBTOOL
    895903APXS_EXTENSION
    896904APXS_CFLAGS
    897 GTLS_BIN
     905LIBGNUTLS_CONFIG
     906LIBGNUTLS_CFLAGS
    898907LIBGNUTLS_LIBS
    899 LIBGNUTLS_CFLAGS
    900908LIBGNUTLS_VERSION
    901 GNUTLS_CERTTOOL
    902909LIBGNUTLS_PREFIX
     910LIBGNUTLS_CERTTOOL
    903911APR_MEMCACHE_LIBS
    904912APR_MEMCACHE_CFLAGS
    … …  
    14261434  # This message is too long to be a string in the A/UX 3.1 sh.
    14271435  cat <<_ACEOF
    1428 \`configure' configures mod_gnutls 0.4.2.1 to adapt to many kinds of systems.
     1436\`configure' configures mod_gnutls 0.4.3 to adapt to many kinds of systems.
    14291437
    14301438Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    14971505if test -n "$ac_init_help"; then
    14981506  case $ac_init_help in
    1499      short | recursive ) echo "Configuration of mod_gnutls 0.4.2.1:";;
     1507     short | recursive ) echo "Configuration of mod_gnutls 0.4.3:";;
    15001508   esac
    15011509  cat <<\_ACEOF
    … …  
    15161524  --disable-apxstest      Do not try to compile and run apache version test
    15171525                          program
     1526  --disable-srp           unconditionally disable the SRP functionality
    15181527
    15191528Optional Packages:
    … …  
    15251534  --with-tags[=TAGS]      include additional configurations [automatic]
    15261535  --with-apxs=PATH        Path to apxs
    1527   --with-libgnutls=PATH   Path to libgnutls
    1528   --with-apr-memcache=PATH
    1529                           Path to apr_memcache prefix
     1536  --with-libgnutls-prefix=PFX   Prefix where libgnutls is installed (optional)
     1537  --with-apr-memcache-prefix=PATH
     1538                          Install prefix for apr_memcache
     1539  --with-apr-memcache-libs=PATH
     1540                          Path to apr_memcache libs
     1541  --with-apr-memcache-includes=PATH
     1542                          Path to apr_memcache includes
    15301543
    15311544Some influential environment variables:
    … …  
    16071620if $ac_init_version; then
    16081621  cat <<\_ACEOF
    1609 mod_gnutls configure 0.4.2.1
     1622mod_gnutls configure 0.4.3
    16101623generated by GNU Autoconf 2.61
    16111624
    … …  
    16211634running configure, to aid debugging if configure makes a mistake.
    16221635
    1623 It was created by mod_gnutls $as_me 0.4.2.1, which was
     1636It was created by mod_gnutls $as_me 0.4.3, which was
    16241637generated by GNU Autoconf 2.61.  Invocation command line was
    16251638
    … …  
    19922005  chmod +x config.nice
    19932006
    1994 MOD_GNUTLS_VERSION=0.4.2.1
     2007MOD_GNUTLS_VERSION=0.4.3
    19952008
    19962009
    … …  
    24932506# Define the identity of the package.
    24942507 PACKAGE=mod_gnutls
    2495  VERSION=0.4.2.1
     2508 VERSION=0.4.3
    24962509
    24972510
    … …  
    45384551*-*-irix6*)
    45394552  # Find out which ABI we are using.
    4540   echo '#line 4540 "configure"' > conftest.$ac_ext
     4553  echo '#line 4553 "configure"' > conftest.$ac_ext
    45414554  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    45424555  (eval $ac_compile) 2>&5
    … …  
    72757288   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    72767289   -e 's:$: $lt_compiler_flag:'`
    7277    (eval echo "\"\$as_me:7277: $lt_compile\"" >&5)
     7290   (eval echo "\"\$as_me:7290: $lt_compile\"" >&5)
    72787291   (eval "$lt_compile" 2>conftest.err)
    72797292   ac_status=$?
    72807293   cat conftest.err >&5
    7281    echo "$as_me:7281: \$? = $ac_status" >&5
     7294   echo "$as_me:7294: \$? = $ac_status" >&5
    72827295   if (exit $ac_status) && test -s "$ac_outfile"; then
    72837296     # The compiler can only warn and ignore the option if not recognized
    … …  
    75657578   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    75667579   -e 's:$: $lt_compiler_flag:'`
    7567    (eval echo "\"\$as_me:7567: $lt_compile\"" >&5)
     7580   (eval echo "\"\$as_me:7580: $lt_compile\"" >&5)
    75687581   (eval "$lt_compile" 2>conftest.err)
    75697582   ac_status=$?
    75707583   cat conftest.err >&5
    7571    echo "$as_me:7571: \$? = $ac_status" >&5
     7584   echo "$as_me:7584: \$? = $ac_status" >&5
    75727585   if (exit $ac_status) && test -s "$ac_outfile"; then
    75737586     # The compiler can only warn and ignore the option if not recognized
    … …  
    76697682   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    76707683   -e 's:$: $lt_compiler_flag:'`
    7671    (eval echo "\"\$as_me:7671: $lt_compile\"" >&5)
     7684   (eval echo "\"\$as_me:7684: $lt_compile\"" >&5)
    76727685   (eval "$lt_compile" 2>out/conftest.err)
    76737686   ac_status=$?
    76747687   cat out/conftest.err >&5
    7675    echo "$as_me:7675: \$? = $ac_status" >&5
     7688   echo "$as_me:7688: \$? = $ac_status" >&5
    76767689   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    76777690   then
    … …  
    1003110044  lt_status=$lt_dlunknown
    1003210045  cat > conftest.$ac_ext <<EOF
    10033 #line 10033 "configure"
     10046#line 10046 "configure"
    1003410047#include "confdefs.h"
    1003510048
    … …  
    1013110144  lt_status=$lt_dlunknown
    1013210145  cat > conftest.$ac_ext <<EOF
    10133 #line 10133 "configure"
     10146#line 10146 "configure"
    1013410147#include "confdefs.h"
    1013510148
    … …  
    1255112564   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1255212565   -e 's:$: $lt_compiler_flag:'`
    12553    (eval echo "\"\$as_me:12553: $lt_compile\"" >&5)
     12566   (eval echo "\"\$as_me:12566: $lt_compile\"" >&5)
    1255412567   (eval "$lt_compile" 2>conftest.err)
    1255512568   ac_status=$?
    1255612569   cat conftest.err >&5
    12557    echo "$as_me:12557: \$? = $ac_status" >&5
     12570   echo "$as_me:12570: \$? = $ac_status" >&5
    1255812571   if (exit $ac_status) && test -s "$ac_outfile"; then
    1255912572     # The compiler can only warn and ignore the option if not recognized
    … …  
    1265512668   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1265612669   -e 's:$: $lt_compiler_flag:'`
    12657    (eval echo "\"\$as_me:12657: $lt_compile\"" >&5)
     12670   (eval echo "\"\$as_me:12670: $lt_compile\"" >&5)
    1265812671   (eval "$lt_compile" 2>out/conftest.err)
    1265912672   ac_status=$?
    1266012673   cat out/conftest.err >&5
    12661    echo "$as_me:12661: \$? = $ac_status" >&5
     12674   echo "$as_me:12674: \$? = $ac_status" >&5
    1266212675   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1266312676   then
    … …  
    1423214245   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1423314246   -e 's:$: $lt_compiler_flag:'`
    14234    (eval echo "\"\$as_me:14234: $lt_compile\"" >&5)
     14247   (eval echo "\"\$as_me:14247: $lt_compile\"" >&5)
    1423514248   (eval "$lt_compile" 2>conftest.err)
    1423614249   ac_status=$?
    1423714250   cat conftest.err >&5
    14238    echo "$as_me:14238: \$? = $ac_status" >&5
     14251   echo "$as_me:14251: \$? = $ac_status" >&5
    1423914252   if (exit $ac_status) && test -s "$ac_outfile"; then
    1424014253     # The compiler can only warn and ignore the option if not recognized
    … …  
    1433614349   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1433714350   -e 's:$: $lt_compiler_flag:'`
    14338    (eval echo "\"\$as_me:14338: $lt_compile\"" >&5)
     14351   (eval echo "\"\$as_me:14351: $lt_compile\"" >&5)
    1433914352   (eval "$lt_compile" 2>out/conftest.err)
    1434014353   ac_status=$?
    1434114354   cat out/conftest.err >&5
    14342    echo "$as_me:14342: \$? = $ac_status" >&5
     14355   echo "$as_me:14355: \$? = $ac_status" >&5
    1434314356   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1434414357   then
    … …  
    1653616549   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1653716550   -e 's:$: $lt_compiler_flag:'`
    16538    (eval echo "\"\$as_me:16538: $lt_compile\"" >&5)
     16551   (eval echo "\"\$as_me:16551: $lt_compile\"" >&5)
    1653916552   (eval "$lt_compile" 2>conftest.err)
    1654016553   ac_status=$?
    1654116554   cat conftest.err >&5
    16542    echo "$as_me:16542: \$? = $ac_status" >&5
     16555   echo "$as_me:16555: \$? = $ac_status" >&5
    1654316556   if (exit $ac_status) && test -s "$ac_outfile"; then
    1654416557     # The compiler can only warn and ignore the option if not recognized
    … …  
    1682616839   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1682716840   -e 's:$: $lt_compiler_flag:'`
    16828    (eval echo "\"\$as_me:16828: $lt_compile\"" >&5)
     16841   (eval echo "\"\$as_me:16841: $lt_compile\"" >&5)
    1682916842   (eval "$lt_compile" 2>conftest.err)
    1683016843   ac_status=$?
    1683116844   cat conftest.err >&5
    16832    echo "$as_me:16832: \$? = $ac_status" >&5
     16845   echo "$as_me:16845: \$? = $ac_status" >&5
    1683316846   if (exit $ac_status) && test -s "$ac_outfile"; then
    1683416847     # The compiler can only warn and ignore the option if not recognized
    … …  
    1693016943   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1693116944   -e 's:$: $lt_compiler_flag:'`
    16932    (eval echo "\"\$as_me:16932: $lt_compile\"" >&5)
     16945   (eval echo "\"\$as_me:16945: $lt_compile\"" >&5)
    1693316946   (eval "$lt_compile" 2>out/conftest.err)
    1693416947   ac_status=$?
    1693516948   cat out/conftest.err >&5
    16936    echo "$as_me:16936: \$? = $ac_status" >&5
     16949   echo "$as_me:16949: \$? = $ac_status" >&5
    1693716950   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1693816951   then
    … …  
    1970119714                fi
    1970219715                APR_INCLUDES=`$APR_CONFIG --includes 2>/dev/null`
     19716                APR_LDFLAGS=`$APR_CONFIG --link-ld 2>/dev/null`
     19717                APR_LIBS=`$APR_CONFIG --libs 2>/dev/null`
     19718                APR_LIBTOOL=`$APR_CONFIG --link-libtool 2>/dev/null`
     19719                APR_CPPFLAGS=`$APR_CONFIG --cppflags 2>/dev/null`
     19720                APR_CFLAGS=`$APR_CONFIG --cflags 2>/dev/null`
    1970319721                APR_VERSION=`$APR_CONFIG --version 2>/dev/null`
    1970419722                APU_CONFIG="`$APXS_BIN -q APU_BINDIR 2>/dev/null`/apu-1-config"
    … …  
    1970719725                fi
    1970819726                APU_INCLUDES=`$APU_CONFIG --includes 2>/dev/null`
     19727                APU_LDFLAGS=`$APU_CONFIG --link-ld 2>/dev/null`
     19728                APU_LIBS=`$APU_CONFIG --libs 2>/dev/null`
     19729                APU_LIBTOOL=`$APU_CONFIG --link-libtool 2>/dev/null`
    1970919730                APU_VERSION=`$APU_CONFIG --version 2>/dev/null`
    1971019731
    … …  
    1991619937                APR_INCLUDES=""
    1991719938                APR_VERSION=""
     19939                APR_LDFLAGS=""
     19940                APR_LIBS=""
     19941                APR_LIBTOOL=""
     19942                APR_CFLAGS=""
     19943                APR_CPPFLAGS=""
    1991819944                APU_INCLUDES=""
    1991919945                APU_VERSION=""
     19946                APU_LDFLAGS=""
     19947                APU_LIBS=""
     19948                APU_LIBTOOL=""
    1992019949                { echo "$as_me:$LINENO: checking for Apache 1.3 version >= $min_apache13_version" >&5
    1992119950echo $ECHO_N "checking for Apache 1.3 version >= $min_apache13_version... $ECHO_C" >&6; }
    … …  
    2011320142            fi
    2011420143        fi
     20144        { echo "$as_me:$LINENO: checking whether DEFAULT_EXP_LIBEXECDIR is declared" >&5
     20145echo $ECHO_N "checking whether DEFAULT_EXP_LIBEXECDIR is declared... $ECHO_C" >&6; }
     20146if test "${ac_cv_have_decl_DEFAULT_EXP_LIBEXECDIR+set}" = set; then
     20147  echo $ECHO_N "(cached) $ECHO_C" >&6
     20148else
     20149  cat >conftest.$ac_ext <<_ACEOF
     20150/* confdefs.h.  */
     20151_ACEOF
     20152cat confdefs.h >>conftest.$ac_ext
     20153cat >>conftest.$ac_ext <<_ACEOF
     20154/* end confdefs.h.  */
     20155$ac_includes_default
     20156int
     20157main ()
     20158{
     20159#ifndef DEFAULT_EXP_LIBEXECDIR
     20160  (void) DEFAULT_EXP_LIBEXECDIR;
     20161#endif
     20162
     20163  ;
     20164  return 0;
     20165}
     20166_ACEOF
     20167rm -f conftest.$ac_objext
     20168if { (ac_try="$ac_compile"
     20169case "(($ac_try" in
     20170  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     20171  *) ac_try_echo=$ac_try;;
     20172esac
     20173eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
     20174  (eval "$ac_compile") 2>conftest.er1
     20175  ac_status=$?
     20176  grep -v '^ *+' conftest.er1 >conftest.err
     20177  rm -f conftest.er1
     20178  cat conftest.err >&5
     20179  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     20180  (exit $ac_status); } && {
     20181         test -z "$ac_c_werror_flag" ||
     20182         test ! -s conftest.err
     20183       } && test -s conftest.$ac_objext; then
     20184  ac_cv_have_decl_DEFAULT_EXP_LIBEXECDIR=yes
     20185else
     20186  echo "$as_me: failed program was:" >&5
     20187sed 's/^/| /' conftest.$ac_ext >&5
     20188
     20189        ac_cv_have_decl_DEFAULT_EXP_LIBEXECDIR=no
     20190fi
     20191
     20192rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     20193fi
     20194{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_DEFAULT_EXP_LIBEXECDIR" >&5
     20195echo "${ECHO_T}$ac_cv_have_decl_DEFAULT_EXP_LIBEXECDIR" >&6; }
     20196if test $ac_cv_have_decl_DEFAULT_EXP_LIBEXECDIR = yes; then
     20197  :
     20198else
     20199
     20200cat >>confdefs.h <<_ACEOF
     20201#define DEFAULT_EXP_LIBEXECDIR "$AP_LIBEXECDIR"
     20202_ACEOF
     20203
     20204fi
     20205
     20206
     20207
     20208
     20209
     20210
     20211
     20212
     20213
    2011520214
    2011620215
    … …  
    2013320232
    2013420233
    20135 MIN_TLS_VERSION=2.1.7
    20136 
    20137 
    20138 # Check whether --with-libgnutls was given.
    20139 if test "${with_libgnutls+set}" = set; then
    20140   withval=$with_libgnutls; tls_prefix="$withval"
    20141 else
    20142   tls_prefix="/usr"
    20143 
    20144 fi
    20145 
    20146 
    20147     if test -x $tls_prefix -a ! -d $tls_prefix; then
    20148         GTLS_BIN=$tls_prefix
    20149     else
    20150         test_paths="$tls_prefix:$tls_prefix/bin:$tls_prefix/sbin"
    20151         test_paths="${test_paths}:/usr/bin:/usr/sbin"
    20152         test_paths="${test_paths}:/usr/local/bin:/usr/local/sbin"
    20153         # Extract the first word of "libgnutls-config", so it can be a program name with args.
     20234MIN_TLS_VERSION=2.2.1
     20235
     20236# Check whether --with-libgnutls-prefix was given.
     20237if test "${with_libgnutls_prefix+set}" = set; then
     20238  withval=$with_libgnutls_prefix; libgnutls_config_prefix="$withval"
     20239else
     20240  libgnutls_config_prefix=""
     20241fi
     20242
     20243
     20244  if test x$libgnutls_config_prefix != x ; then
     20245     if test x${LIBGNUTLS_CONFIG+set} != xset ; then
     20246        LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
     20247     fi
     20248  fi
     20249
     20250  # Extract the first word of "libgnutls-config", so it can be a program name with args.
    2015420251set dummy libgnutls-config; ac_word=$2
    2015520252{ echo "$as_me:$LINENO: checking for $ac_word" >&5
    2015620253echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
    20157 if test "${ac_cv_path_GTLS_BIN+set}" = set; then
     20254if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then
    2015820255  echo $ECHO_N "(cached) $ECHO_C" >&6
    2015920256else
    20160   case $GTLS_BIN in
     20257  case $LIBGNUTLS_CONFIG in
    2016120258  [\\/]* | ?:[\\/]*)
    20162   ac_cv_path_GTLS_BIN="$GTLS_BIN" # Let the user override the test with a path.
     20259  ac_cv_path_LIBGNUTLS_CONFIG="$LIBGNUTLS_CONFIG" # Let the user override the test with a path.
    2016320260  ;;
    2016420261  *)
    2016520262  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    20166 for as_dir in $test_paths
     20263for as_dir in $PATH
    2016720264do
    2016820265  IFS=$as_save_IFS
    … …  
    2017020267  for ac_exec_ext in '' $ac_executable_extensions; do
    2017120268  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    20172     ac_cv_path_GTLS_BIN="$as_dir/$ac_word$ac_exec_ext"
     20269    ac_cv_path_LIBGNUTLS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
    2017320270    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
    2017420271    break 2
    … …  
    2017820275IFS=$as_save_IFS
    2017920276
    20180   test -z "$ac_cv_path_GTLS_BIN" && ac_cv_path_GTLS_BIN="no"
     20277  test -z "$ac_cv_path_LIBGNUTLS_CONFIG" && ac_cv_path_LIBGNUTLS_CONFIG="no"
    2018120278  ;;
    2018220279esac
    2018320280fi
    20184 GTLS_BIN=$ac_cv_path_GTLS_BIN
    20185 if test -n "$GTLS_BIN"; then
    20186   { echo "$as_me:$LINENO: result: $GTLS_BIN" >&5
    20187 echo "${ECHO_T}$GTLS_BIN" >&6; }
     20281LIBGNUTLS_CONFIG=$ac_cv_path_LIBGNUTLS_CONFIG
     20282if test -n "$LIBGNUTLS_CONFIG"; then
     20283  { echo "$as_me:$LINENO: result: $LIBGNUTLS_CONFIG" >&5
     20284echo "${ECHO_T}$LIBGNUTLS_CONFIG" >&6; }
    2018820285else
    2018920286  { echo "$as_me:$LINENO: result: no" >&5
    … …  
    2019220289
    2019320290
    20194     fi
    20195 
    20196     if test "$GTLS_BIN" = "no"; then
    20197         { { echo "$as_me:$LINENO: error: *** The libgnutls-config binary installed by GnuTLS could not be found!" >&5
    20198 echo "$as_me: error: *** The libgnutls-config binary installed by GnuTLS could not be found!" >&2;}
     20291  min_libgnutls_version=$MIN_TLS_VERSION
     20292  { echo "$as_me:$LINENO: checking for libgnutls - version >= $min_libgnutls_version" >&5
     20293echo $ECHO_N "checking for libgnutls - version >= $min_libgnutls_version... $ECHO_C" >&6; }
     20294  no_libgnutls=""
     20295  if test "$LIBGNUTLS_CONFIG" = "no" ; then
     20296    no_libgnutls=yes
     20297  else
     20298    LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
     20299    LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
     20300    libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
     20301
     20302
     20303      ac_save_CFLAGS="$CFLAGS"
     20304      ac_save_LIBS="$LIBS"
     20305      CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
     20306      LIBS="$LIBS $LIBGNUTLS_LIBS"
     20307      rm -f conf.libgnutlstest
     20308      if test "$cross_compiling" = yes; then
     20309  echo $ac_n "cross compiling; assumed OK... $ac_c"
     20310else
     20311  cat >conftest.$ac_ext <<_ACEOF
     20312/* confdefs.h.  */
     20313_ACEOF
     20314cat confdefs.h >>conftest.$ac_ext
     20315cat >>conftest.$ac_ext <<_ACEOF
     20316/* end confdefs.h.  */
     20317
     20318#include <stdio.h>
     20319#include <stdlib.h>
     20320#include <string.h>
     20321#include <gnutls/gnutls.h>
     20322
     20323int
     20324main ()
     20325{
     20326    system ("touch conf.libgnutlstest");
     20327
     20328    if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
     20329    {
     20330      printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
     20331             "$libgnutls_config_version", gnutls_check_version(NULL) );
     20332      printf("*** was found! If libgnutls-config was correct, then it is best\n");
     20333      printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
     20334      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
     20335      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
     20336      printf("*** required on your system.\n");
     20337      printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
     20338      printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
     20339      printf("*** before re-running configure\n");
     20340    }
     20341    else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
     20342    {
     20343      printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
     20344      printf("*** library (version %s)\n", gnutls_check_version(NULL) );
     20345    }
     20346    else
     20347    {
     20348      if ( gnutls_check_version( "$min_libgnutls_version" ) )
     20349      {
     20350        return 0;
     20351      }
     20352     else
     20353      {
     20354        printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
     20355                gnutls_check_version(NULL) );
     20356        printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
     20357               "$min_libgnutls_version" );
     20358        printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
     20359        printf("*** \n");
     20360        printf("*** If you have already installed a sufficiently new version, this error\n");
     20361        printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
     20362        printf("*** being found. The easiest way to fix this is to remove the old version\n");
     20363        printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
     20364        printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
     20365        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
     20366        printf("*** so that the correct libraries are found at run-time))\n");
     20367      }
     20368    }
     20369  return 1;
     20370}
     20371
     20372_ACEOF
     20373rm -f conftest$ac_exeext
     20374if { (ac_try="$ac_link"
     20375case "(($ac_try" in
     20376  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     20377  *) ac_try_echo=$ac_try;;
     20378esac
     20379eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
     20380  (eval "$ac_link") 2>&5
     20381  ac_status=$?
     20382  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     20383  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
     20384  { (case "(($ac_try" in
     20385  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     20386  *) ac_try_echo=$ac_try;;
     20387esac
     20388eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
     20389  (eval "$ac_try") 2>&5
     20390  ac_status=$?
     20391  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     20392  (exit $ac_status); }; }; then
     20393  :
     20394else
     20395  echo "$as_me: program exited with status $ac_status" >&5
     20396echo "$as_me: failed program was:" >&5
     20397sed 's/^/| /' conftest.$ac_ext >&5
     20398
     20399( exit $ac_status )
     20400no_libgnutls=yes
     20401fi
     20402rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
     20403fi
     20404
     20405
     20406       CFLAGS="$ac_save_CFLAGS"
     20407       LIBS="$ac_save_LIBS"
     20408  fi
     20409
     20410  if test "x$no_libgnutls" = x ; then
     20411     { echo "$as_me:$LINENO: result: yes" >&5
     20412echo "${ECHO_T}yes" >&6; }
     20413     :
     20414  else
     20415     if test -f conf.libgnutlstest ; then
     20416        :
     20417     else
     20418        { echo "$as_me:$LINENO: result: no" >&5
     20419echo "${ECHO_T}no" >&6; }
     20420     fi
     20421     if test "$LIBGNUTLS_CONFIG" = "no" ; then
     20422       echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
     20423       echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
     20424       echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
     20425       echo "*** full path to libgnutls-config."
     20426     else
     20427       if test -f conf.libgnutlstest ; then
     20428        :
     20429       else
     20430          echo "*** Could not run libgnutls test program, checking why..."
     20431          CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
     20432          LIBS="$LIBS $LIBGNUTLS_LIBS"
     20433          cat >conftest.$ac_ext <<_ACEOF
     20434/* confdefs.h.  */
     20435_ACEOF
     20436cat confdefs.h >>conftest.$ac_ext
     20437cat >>conftest.$ac_ext <<_ACEOF
     20438/* end confdefs.h.  */
     20439
     20440#include <stdio.h>
     20441#include <stdlib.h>
     20442#include <string.h>
     20443#include <gnutls/gnutls.h>
     20444
     20445int
     20446main ()
     20447{
     20448 return !!gnutls_check_version(NULL);
     20449  ;
     20450  return 0;
     20451}
     20452_ACEOF
     20453rm -f conftest.$ac_objext conftest$ac_exeext
     20454if { (ac_try="$ac_link"
     20455case "(($ac_try" in
     20456  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     20457  *) ac_try_echo=$ac_try;;
     20458esac
     20459eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
     20460  (eval "$ac_link") 2>conftest.er1
     20461  ac_status=$?
     20462  grep -v '^ *+' conftest.er1 >conftest.err
     20463  rm -f conftest.er1
     20464  cat conftest.err >&5
     20465  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     20466  (exit $ac_status); } && {
     20467         test -z "$ac_c_werror_flag" ||
     20468         test ! -s conftest.err
     20469       } && test -s conftest$ac_exeext &&
     20470       $as_test_x conftest$ac_exeext; then
     20471   echo "*** The test program compiled, but did not run. This usually means"
     20472          echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
     20473          echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
     20474          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
     20475          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
     20476          echo "*** is required on your system"
     20477          echo "***"
     20478          echo "*** If you have an old version installed, it is best to remove it, although"
     20479          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
     20480          echo "***"
     20481else
     20482  echo "$as_me: failed program was:" >&5
     20483sed 's/^/| /' conftest.$ac_ext >&5
     20484
     20485         echo "*** The test program failed to compile or link. See the file config.log for the"
     20486          echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
     20487          echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
     20488          echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG"
     20489fi
     20490
     20491rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     20492      conftest$ac_exeext conftest.$ac_ext
     20493          CFLAGS="$ac_save_CFLAGS"
     20494          LIBS="$ac_save_LIBS"
     20495       fi
     20496     fi
     20497     LIBGNUTLS_CFLAGS=""
     20498     LIBGNUTLS_LIBS=""
     20499     { { echo "$as_me:$LINENO: error:
     20500***
     20501*** libgnutls were not found. You may want to get it from
     20502*** http://www.gnutls.org/
     20503***
     20504" >&5
     20505echo "$as_me: error:
     20506***
     20507*** libgnutls were not found. You may want to get it from
     20508*** http://www.gnutls.org/
     20509***
     20510" >&2;}
    2019920511   { (exit 1); exit 1; }; }
    20200         { { echo "$as_me:$LINENO: error: *** Use the --with-libgnutls option with the full path to libgnutls-config" >&5
    20201 echo "$as_me: error: *** Use the --with-libgnutls option with the full path to libgnutls-config" >&2;}
    20202    { (exit 1); exit 1; }; }
    20203     else
    20204                 LIBGNUTLS_LIBS="`$GTLS_BIN --libs`"
    20205         LIBGNUTLS_CFLAGS="`$GTLS_BIN --cflags`"
    20206         LIBGNUTLS_VERSION="`$GTLS_BIN --version`"
    20207         LIBGNUTLS_PREFIX="`$GTLS_BIN --prefix`"
    20208         GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool"
    20209 
    20210 
    20211 
    20212 
    20213 
    20214     fi
     20512  fi
     20513  rm -f conf.libgnutlstest
     20514
     20515
     20516
     20517  LIBGNUTLS_VERSION=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
     20518  LIBGNUTLS_PREFIX="`$LIBGNUTLS_CONFIG $libgnutls_config_args --prefix`"
     20519  GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool"
     20520
     20521
     20522
     20523
     20524
     20525
     20526
    2021520527
    2021620528
    … …  
    2021920531
    2022020532
    20221 # Check whether --with-apr-memcache was given.
    20222 if test "${with_apr_memcache+set}" = set; then
    20223   withval=$with_apr_memcache; mc_path="$withval"
    20224 else
    20225   :
    20226 fi
     20533# Check whether --with-apr-memcache-prefix was given.
     20534if test "${with_apr_memcache_prefix+set}" = set; then
     20535  withval=$with_apr_memcache_prefix; apr_memcache_prefix="$withval"
     20536else
     20537  apr_memcache_prefix="/usr"
     20538fi
     20539
     20540
     20541# Check whether --with-apr-memcache-libs was given.
     20542if test "${with_apr_memcache_libs+set}" = set; then
     20543  withval=$with_apr_memcache_libs; apr_memcache_libs="$withval"
     20544else
     20545  apr_memcache_libs="$apr_memcache_prefix/lib"
     20546    :
     20547fi
     20548
     20549
     20550# Check whether --with-apr-memcache-includes was given.
     20551if test "${with_apr_memcache_includes+set}" = set; then
     20552  withval=$with_apr_memcache_includes; apr_memcache_includes="$withval"
     20553else
     20554  apr_memcache_includes="$apr_memcache_prefix/include/apr_memcache-0"
     20555    :
     20556fi
     20557
    2022720558
    2022820559
    … …  
    2085121182
    2085221183
    20853 if test -z $mc_path; then
    20854     test_paths="/usr/local /usr /usr/local/apache2"
    20855 else
    20856     test_paths="${mc_path}"
    20857 fi
    20858 
    20859 if test -n ${AP_PREFIX}; then
    20860     test_paths="${AP_PREFIX} ${test_paths}"
    20861 fi
    20862 
    20863 for x in $test_paths ; do
    20864     amc_shlib="${x}/libapr_memcache${shrext_cmds}"
    20865     { echo "$as_me:$LINENO: checking for apr_memcache library in ${x}/lib" >&5
    20866 echo $ECHO_N "checking for apr_memcache library in ${x}/lib... $ECHO_C" >&6; }
    20867     if test -f ${amc_shlib}; then
    20868         { echo "$as_me:$LINENO: result: yes" >&5
    20869 echo "${ECHO_T}yes" >&6; }
    20870         save_CFLAGS=$CFLAGS
    20871         save_LDFLAGS=$LDFLAGS
    20872         CFLAGS="$CFLAGS"
    20873         LDFLAGS="-L$x/lib $LDFLAGS"
    20874         { echo "$as_me:$LINENO: checking for apr_memcache_create in -lapr_memcache" >&5
     21184save_CFLAGS=$CFLAGS
     21185save_LDFLAGS=$LDFLAGS
     21186CFLAGS="-I$apr_memcache_includes $APR_INCLUDES $CFLAGS"
     21187LDFLAGS="-L$apr_memcache_libs $LDFLAGS"
     21188{ echo "$as_me:$LINENO: checking for apr_memcache_create in -lapr_memcache" >&5
    2087521189echo $ECHO_N "checking for apr_memcache_create in -lapr_memcache... $ECHO_C" >&6; }
    2087621190if test "${ac_cv_lib_apr_memcache_apr_memcache_create+set}" = set; then
    … …  
    2093521249if test $ac_cv_lib_apr_memcache_apr_memcache_create = yes; then
    2093621250
    20937             APR_MEMCACHE_LIBS="-R$x/lib -L$x/lib -lapr_memcache"
    20938             APR_MEMCACHE_CFLAGS="-I$x/include/apr_memcache-0"
    20939 
    20940 fi
    20941 
    20942         CFLAGS=$save_CFLAGS
    20943         LDFLAGS=$save_LDFLAGS
    20944         break
    20945     else
    20946         { echo "$as_me:$LINENO: result: no" >&5
    20947 echo "${ECHO_T}no" >&6; }
    20948     fi
    20949 done
     21251        APR_MEMCACHE_LIBS="-R$apr_memcache_libs -L$apr_memcache_libs -lapr_memcache"
     21252        APR_MEMCACHE_CFLAGS="-I$apr_memcache_includes"
     21253
     21254
     21255fi
     21256
     21257CFLAGS=$save_CFLAGS
     21258LDFLAGS=$save_LDFLAGS
    2095021259
    2095121260
    … …  
    2096421273
    2096521274
    20966 MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
     21275# Check whether --enable-srp was given.
     21276if test "${enable_srp+set}" = set; then
     21277  enableval=$enable_srp; use_srp=$enableval
     21278else
     21279  use_srp=yes
     21280fi
     21281
     21282
     21283SRP_CFLAGS=""
     21284if test "$use_srp" != "no"; then
     21285        SRP_CFLAGS="-DENABLE_SRP=1"
     21286fi
     21287{ echo "$as_me:$LINENO: checking whether to enable SRP functionality" >&5
     21288echo $ECHO_N "checking whether to enable SRP functionality... $ECHO_C" >&6; }
     21289{ echo "$as_me:$LINENO: result: $use_srp" >&5
     21290echo "${ECHO_T}$use_srp" >&6; }
     21291
     21292MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
    2096721293MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"
    2096821294
    … …  
    2139621722# values after options handling.
    2139721723ac_log="
    21398 This file was extended by mod_gnutls $as_me 0.4.2.1, which was
     21724This file was extended by mod_gnutls $as_me 0.4.3, which was
    2139921725generated by GNU Autoconf 2.61.  Invocation command line was
    2140021726
    … …  
    2144921775cat >>$CONFIG_STATUS <<_ACEOF
    2145021776ac_cs_version="\\
    21451 mod_gnutls config.status 0.4.2.1
     21777mod_gnutls config.status 0.4.3
    2145221778configured by $0, generated by GNU Autoconf 2.61,
    2145321779  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
    … …  
    2179522121AP_SBINDIR!$AP_SBINDIR$ac_delim
    2179622122APR_INCLUDES!$APR_INCLUDES$ac_delim
     22123APR_LDFLAGS!$APR_LDFLAGS$ac_delim
     22124APR_LIBS!$APR_LIBS$ac_delim
     22125APR_LIBTOOL!$APR_LIBTOOL$ac_delim
     22126APR_CPPFLAGS!$APR_CPPFLAGS$ac_delim
     22127APR_CFLAGS!$APR_CFLAGS$ac_delim
    2179722128APU_INCLUDES!$APU_INCLUDES$ac_delim
     22129APU_LDFLAGS!$APU_LDFLAGS$ac_delim
     22130APU_LIBS!$APU_LIBS$ac_delim
     22131APU_LIBTOOL!$APU_LIBTOOL$ac_delim
    2179822132APXS_EXTENSION!$APXS_EXTENSION$ac_delim
    2179922133APXS_CFLAGS!$APXS_CFLAGS$ac_delim
    21800 GTLS_BIN!$GTLS_BIN$ac_delim
     22134LIBGNUTLS_CONFIG!$LIBGNUTLS_CONFIG$ac_delim
     22135LIBGNUTLS_CFLAGS!$LIBGNUTLS_CFLAGS$ac_delim
    2180122136LIBGNUTLS_LIBS!$LIBGNUTLS_LIBS$ac_delim
    21802 LIBGNUTLS_CFLAGS!$LIBGNUTLS_CFLAGS$ac_delim
    2180322137LIBGNUTLS_VERSION!$LIBGNUTLS_VERSION$ac_delim
    21804 GNUTLS_CERTTOOL!$GNUTLS_CERTTOOL$ac_delim
    2180522138LIBGNUTLS_PREFIX!$LIBGNUTLS_PREFIX$ac_delim
     22139LIBGNUTLS_CERTTOOL!$LIBGNUTLS_CERTTOOL$ac_delim
    2180622140APR_MEMCACHE_LIBS!$APR_MEMCACHE_LIBS$ac_delim
    2180722141APR_MEMCACHE_CFLAGS!$APR_MEMCACHE_CFLAGS$ac_delim
    … …  
    2181322147_ACEOF
    2181422148
    21815   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 43; then
     22149  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 51; then
    2181622150    break
    2181722151  elif $ac_last_try; then
    … …  
    2241822752echo "   * Apache Modules directory:    ${AP_LIBEXECDIR}"
    2241922753echo "   * GnuTLS Library version:      ${LIBGNUTLS_VERSION}"
     22754echo "   * SRP authentication:          ${use_srp}"
    2242022755echo ""
    2242122756echo "---"

  • configure.ac

    r0ab45ea r15ffe0b  
    11dnl
    2 AC_INIT(mod_gnutls, 0.4.2.1)
     2AC_INIT(mod_gnutls, 0.4.3)
    33OOO_CONFIG_NICE(config.nice)
    44MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
    … …  
    2929dnl AC_SUBST(LIBTOOL)
    3030
    31 MIN_TLS_VERSION=2.1.7
    32 CHECK_LIBGNUTLS($MIN_TLS_VERSION)
     31MIN_TLS_VERSION=2.2.1
     32AM_PATH_LIBGNUTLS($MIN_TLS_VERSION,,
     33        AC_MSG_ERROR([[
     34*** 
     35*** libgnutls were not found. You may want to get it from
     36*** http://www.gnutls.org/
     37***
     38]]))
    3339
    3440dnl CHECK_LUA()
    … …  
    3844AC_SUBST(have_apr_memcache)
    3945
    40 MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
     46AC_ARG_ENABLE(srp,
     47       AS_HELP_STRING([--disable-srp],
     48               [unconditionally disable the SRP functionality]),
     49       use_srp=$enableval, use_srp=yes)
     50
     51SRP_CFLAGS=""
     52if test "$use_srp" != "no"; then
     53        SRP_CFLAGS="-DENABLE_SRP=1"
     54fi
     55AC_MSG_CHECKING([whether to enable SRP functionality])
     56AC_MSG_RESULT($use_srp)
     57
     58MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
    4159MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"
    4260
    … …  
    5068echo "Configuration summary for mod_gnutls:"
    5169echo ""
    52 echo "   * mod_gnutls version:  ${MOD_GNUTLS_VERSION}"
    53 echo "   * Apache Modules directory:    ${AP_LIBEXECDIR}"
    54 echo "   * GnuTLS Library version:      ${LIBGNUTLS_VERSION}"
     70echo "   * mod_gnutls version:          ${MOD_GNUTLS_VERSION}"
     71echo "   * Apache Modules directory:    ${AP_LIBEXECDIR}"
     72echo "   * GnuTLS Library version:      ${LIBGNUTLS_VERSION}"
     73echo "   * SRP authentication:          ${use_srp}"
    5574echo ""
    5675echo "---"

  • m4/apache.m4

    r0ab45ea r15ffe0b  
    6161                fi
    6262                APR_INCLUDES=`$APR_CONFIG --includes 2>/dev/null`
     63                APR_LDFLAGS=`$APR_CONFIG --link-ld 2>/dev/null`
     64                APR_LIBS=`$APR_CONFIG --libs 2>/dev/null`
     65                APR_LIBTOOL=`$APR_CONFIG --link-libtool 2>/dev/null`
     66                APR_CPPFLAGS=`$APR_CONFIG --cppflags 2>/dev/null`
     67                APR_CFLAGS=`$APR_CONFIG --cflags 2>/dev/null`
    6368                APR_VERSION=`$APR_CONFIG --version 2>/dev/null`
    6469                APU_CONFIG="`$APXS_BIN -q APU_BINDIR 2>/dev/null`/apu-1-config"
    … …  
    6772                fi
    6873                APU_INCLUDES=`$APU_CONFIG --includes 2>/dev/null`
     74                APU_LDFLAGS=`$APU_CONFIG --link-ld 2>/dev/null`
     75                APU_LIBS=`$APU_CONFIG --libs 2>/dev/null`
     76                APU_LIBTOOL=`$APU_CONFIG --link-libtool 2>/dev/null`
    6977                APU_VERSION=`$APU_CONFIG --version 2>/dev/null`
    7078
    … …  
    9199                APR_INCLUDES=""
    92100                APR_VERSION=""
     101                APR_LDFLAGS=""
     102                APR_LIBS=""
     103                APR_LIBTOOL=""
     104                APR_CFLAGS=""
     105                APR_CPPFLAGS=""
    93106                APU_INCLUDES=""
    94107                APU_VERSION=""
     108                APU_LDFLAGS=""
     109                APU_LIBS=""
     110                APU_LIBTOOL=""
    95111                AC_MSG_CHECKING(for Apache 1.3 version >= $min_apache13_version)
    96112                TEST_APACHE_VERSION(13,$min_apache13_version,
    … …  
    107123            fi
    108124        fi
     125        AC_CHECK_DECL([DEFAULT_EXP_LIBEXECDIR],,[AC_DEFINE_UNQUOTED([DEFAULT_EXP_LIBEXECDIR],["$AP_LIBEXECDIR"],[Default Module LibExec directory])])
    109126        AC_SUBST(AP_DEFS)
    110127        AC_SUBST(AP_PREFIX)
    … …  
    119136        AC_SUBST(AP_SBINDIR)
    120137        AC_SUBST(APR_INCLUDES)
     138        AC_SUBST(APR_LDFLAGS)
     139        AC_SUBST(APR_LIBS)
     140        AC_SUBST(APR_LIBTOOL)
     141        AC_SUBST(APR_CPPFLAGS)
     142        AC_SUBST(APR_CFLAGS)
    121143        AC_SUBST(APU_INCLUDES)
     144        AC_SUBST(APU_LDFLAGS)
     145        AC_SUBST(APU_LIBS)
     146        AC_SUBST(APU_LIBTOOL)
    122147        AC_SUBST(APXS_EXTENSION)
    123148        AC_SUBST(APXS_BIN)

  • m4/apr_memcache.m4

    r0ab45ea r15ffe0b  
    77
    88AC_ARG_WITH(
    9     apr-memcache,
    10     [AC_HELP_STRING([--with-apr-memcache=PATH],[Path to apr_memcache prefix])],
    11     mc_path="$withval",
     9    apr-memcache-prefix,
     10    [AC_HELP_STRING([--with-apr-memcache-prefix=PATH],[Install prefix for apr_memcache])],
     11    apr_memcache_prefix="$withval",
     12    apr_memcache_prefix="/usr",
    1213    :)
     14AC_ARG_WITH(
     15    apr-memcache-libs,
     16    [AC_HELP_STRING([--with-apr-memcache-libs=PATH],[Path to apr_memcache libs])],
     17    apr_memcache_libs="$withval",
     18    apr_memcache_libs="$apr_memcache_prefix/lib"
     19    :)
     20AC_ARG_WITH(
     21    apr-memcache-includes,
     22    [AC_HELP_STRING([--with-apr-memcache-includes=PATH],[Path to apr_memcache includes])],
     23    apr_memcache_includes="$withval",
     24    apr_memcache_includes="$apr_memcache_prefix/include/apr_memcache-0"
     25    :)
     26
    1327
    1428AC_LIBTOOL_SYS_DYNAMIC_LINKER
    1529
    1630dnl # Determine memcache lib directory
    17 if test -z $mc_path; then
    18     test_paths="/usr/local /usr /usr/local/apache2"
    19 else
    20     test_paths="${mc_path}"
    21 fi
    22 
    23 if test -n ${AP_PREFIX}; then
    24     test_paths="${AP_PREFIX} ${test_paths}"
    25 fi
    26 
    27 for x in $test_paths ; do
    28     amc_shlib="${x}/libapr_memcache${shrext_cmds}"
    29     AC_MSG_CHECKING([for apr_memcache library in ${x}/lib])
    30     if test -f ${amc_shlib}; then
    31         AC_MSG_RESULT([yes])
    32         save_CFLAGS=$CFLAGS
    33         save_LDFLAGS=$LDFLAGS
    34         CFLAGS="$CFLAGS"
    35         LDFLAGS="-L$x/lib $LDFLAGS"
    36         AC_CHECK_LIB(apr_memcache, apr_memcache_create,
    37             [
    38             APR_MEMCACHE_LIBS="-R$x/lib -L$x/lib -lapr_memcache"
    39             APR_MEMCACHE_CFLAGS="-I$x/include/apr_memcache-0"
    40             ])
    41         CFLAGS=$save_CFLAGS
    42         LDFLAGS=$save_LDFLAGS
    43         break
    44     else
    45         AC_MSG_RESULT([no])
    46     fi
    47 done
     31save_CFLAGS=$CFLAGS
     32save_LDFLAGS=$LDFLAGS
     33CFLAGS="-I$apr_memcache_includes $APR_INCLUDES $CFLAGS"
     34LDFLAGS="-L$apr_memcache_libs $LDFLAGS"
     35AC_CHECK_LIB(
     36    apr_memcache,
     37    apr_memcache_create,
     38    [
     39        APR_MEMCACHE_LIBS="-R$apr_memcache_libs -L$apr_memcache_libs -lapr_memcache"
     40        APR_MEMCACHE_CFLAGS="-I$apr_memcache_includes"
     41    ]
     42)
     43CFLAGS=$save_CFLAGS
     44LDFLAGS=$save_LDFLAGS
    4845
    4946AC_SUBST(APR_MEMCACHE_LIBS)

  • m4/libgnutls.m4

    r0ab45ea r15ffe0b  
    1 dnl Check for libgnutls libraries
    2 dnl CHECK_LIBGNUTLS(MINIMUM-VERSION)
    3 AC_DEFUN([CHECK_LIBGNUTLS],
     1dnl Autoconf macros for libgnutls
     2dnl $id$
     3
     4# Modified for LIBGNUTLS -- nmav
     5# Configure paths for LIBGCRYPT
     6# Shamelessly stolen from the one of XDELTA by Owen Taylor
     7# Werner Koch   99-12-09
     8
     9dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
     10dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS
     11dnl
     12AC_DEFUN([AM_PATH_LIBGNUTLS],
    413[dnl
     14dnl Get the cflags and libraries from the libgnutls-config script
     15dnl
     16AC_ARG_WITH(libgnutls-prefix,
     17          [  --with-libgnutls-prefix=PFX   Prefix where libgnutls is installed (optional)],
     18          libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
    519
    6 AC_ARG_WITH(
    7     libgnutls,
    8     [AC_HELP_STRING([--with-libgnutls=PATH],[Path to libgnutls])],
    9     tls_prefix="$withval",
    10     tls_prefix="/usr"
    11     )
     20  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     fi
     24  fi
    1225
    13     if test -x $tls_prefix -a ! -d $tls_prefix; then
    14         GTLS_BIN=$tls_prefix
     26  AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
     27  min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
     28  AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
     29  no_libgnutls=""
     30  if test "$LIBGNUTLS_CONFIG" = "no" ; then
     31    no_libgnutls=yes
     32  else
     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
     37
     38      ac_save_CFLAGS="$CFLAGS"
     39      ac_save_LIBS="$LIBS"
     40      CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
     41      LIBS="$LIBS $LIBGNUTLS_LIBS"
     42dnl
     43dnl Now check if the installed libgnutls is sufficiently new. Also sanity
     44dnl checks the results of libgnutls-config to some extent
     45dnl
     46      rm -f conf.libgnutlstest
     47      AC_TRY_RUN([
     48#include <stdio.h>
     49#include <stdlib.h>
     50#include <string.h>
     51#include <gnutls/gnutls.h>
     52
     53int
     54main ()
     55{
     56    system ("touch conf.libgnutlstest");
     57
     58    if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
     59    {
     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      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
     65      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
     66      printf("*** required on your system.\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      printf("*** before re-running configure\n");
     70    }
     71    else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
     72    {
     73      printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
     74      printf("*** library (version %s)\n", gnutls_check_version(NULL) );
     75    }
    1576    else
    16         test_paths="$tls_prefix:$tls_prefix/bin:$tls_prefix/sbin"
    17         test_paths="${test_paths}:/usr/bin:/usr/sbin"
    18         test_paths="${test_paths}:/usr/local/bin:/usr/local/sbin"
    19         AC_PATH_PROG(GTLS_BIN, libgnutls-config, no, [$test_paths])
    20     fi
     77    {
     78      if ( gnutls_check_version( "$min_libgnutls_version" ) )
     79      {
     80        return 0;
     81      }
     82     else
     83      {
     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",
     87               "$min_libgnutls_version" );
     88        printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
     89        printf("*** \n");
     90        printf("*** If you have already installed a sufficiently new version, this error\n");
     91        printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
     92        printf("*** being found. The easiest way to fix this is to remove the old version\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");
     95        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
     96        printf("*** so that the correct libraries are found at run-time))\n");
     97      }
     98    }
     99  return 1;
     100}
     101],, no_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
     102       CFLAGS="$ac_save_CFLAGS"
     103       LIBS="$ac_save_LIBS"
     104  fi
    21105
    22     if test "$GTLS_BIN" = "no"; then
    23         AC_MSG_ERROR([*** The libgnutls-config binary installed by GnuTLS could not be found!])
    24         AC_MSG_ERROR([*** Use the --with-libgnutls option with the full path to libgnutls-config])
    25     else
    26         dnl TODO: Check versions
    27         LIBGNUTLS_LIBS="`$GTLS_BIN --libs`"
    28         LIBGNUTLS_CFLAGS="`$GTLS_BIN --cflags`"
    29         LIBGNUTLS_VERSION="`$GTLS_BIN --version`"
    30         LIBGNUTLS_PREFIX="`$GTLS_BIN --prefix`"
    31         GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool"       
    32         AC_SUBST(LIBGNUTLS_LIBS)
    33         AC_SUBST(LIBGNUTLS_CFLAGS)
    34         AC_SUBST(LIBGNUTLS_VERSION)
    35         AC_SUBST(GNUTLS_CERTTOOL)
    36         AC_SUBST(LIBGNUTLS_PREFIX)
    37     fi
     106  if test "x$no_libgnutls" = x ; then
     107     AC_MSG_RESULT(yes)
     108     ifelse([$2], , :, [$2])
     109  else
     110     if test -f conf.libgnutlstest ; then
     111        :
     112     else
     113        AC_MSG_RESULT(no)
     114     fi
     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."
     120     else
     121       if test -f conf.libgnutlstest ; then
     122        :
     123       else
     124          echo "*** Could not run libgnutls test program, checking why..."
     125          CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
     126          LIBS="$LIBS $LIBGNUTLS_LIBS"
     127          AC_TRY_LINK([
     128#include <stdio.h>
     129#include <stdlib.h>
     130#include <string.h>
     131#include <gnutls/gnutls.h>
     132],      [ return !!gnutls_check_version(NULL); ],
     133        [ echo "*** The test program compiled, but did not run. This usually means"
     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"
     136          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
     137          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
     138          echo "*** is required on your system"
     139          echo "***"
     140          echo "*** If you have an old version installed, it is best to remove it, although"
     141          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
     142          echo "***" ],
     143        [ echo "*** The test program failed to compile or link. See the file config.log for the"
     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" ])
     147          CFLAGS="$ac_save_CFLAGS"
     148          LIBS="$ac_save_LIBS"
     149       fi
     150     fi
     151     LIBGNUTLS_CFLAGS=""
     152     LIBGNUTLS_LIBS=""
     153     ifelse([$3], , :, [$3])
     154  fi
     155  rm -f conf.libgnutlstest
     156  AC_SUBST(LIBGNUTLS_CFLAGS)
     157  AC_SUBST(LIBGNUTLS_LIBS)
     158
     159  LIBGNUTLS_VERSION=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
     160  LIBGNUTLS_PREFIX="`$LIBGNUTLS_CONFIG $libgnutls_config_args --prefix`"
     161  GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool"
     162
     163  AC_SUBST(LIBGNUTLS_CFLAGS)
     164  AC_SUBST(LIBGNUTLS_LIBS)
     165  AC_SUBST(LIBGNUTLS_VERSION)
     166  AC_SUBST(LIBGNUTLS_PREFIX)
     167  AC_SUBST(LIBGNUTLS_CERTTOOL)
     168
    38169])
     170
     171dnl *-*wedit:notab*-*  Please keep this as the last line.

  • src/Makefile.in

    r0ab45ea r15ffe0b  
    8383ACLOCAL = @ACLOCAL@
    8484AMTAR = @AMTAR@
     85APR_CFLAGS = @APR_CFLAGS@
     86APR_CPPFLAGS = @APR_CPPFLAGS@
    8587APR_INCLUDES = @APR_INCLUDES@
     88APR_LDFLAGS = @APR_LDFLAGS@
     89APR_LIBS = @APR_LIBS@
     90APR_LIBTOOL = @APR_LIBTOOL@
    8691APR_MEMCACHE_CFLAGS = @APR_MEMCACHE_CFLAGS@
    8792APR_MEMCACHE_LIBS = @APR_MEMCACHE_LIBS@
    8893APU_INCLUDES = @APU_INCLUDES@
     94APU_LDFLAGS = @APU_LDFLAGS@
     95APU_LIBS = @APU_LIBS@
     96APU_LIBTOOL = @APU_LIBTOOL@
    8997APXS_BIN = @APXS_BIN@
    9098APXS_CFLAGS = @APXS_CFLAGS@
    … …  
    126134F77 = @F77@
    127135FFLAGS = @FFLAGS@
    128 GNUTLS_CERTTOOL = @GNUTLS_CERTTOOL@
    129136GREP = @GREP@
    130 GTLS_BIN = @GTLS_BIN@
    131137INSTALL = @INSTALL@
    132138INSTALL_DATA = @INSTALL_DATA@
    … …  
    135141INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    136142LDFLAGS = @LDFLAGS@
     143LIBGNUTLS_CERTTOOL = @LIBGNUTLS_CERTTOOL@
    137144LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
     145LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
    138146LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
    139147LIBGNUTLS_PREFIX = @LIBGNUTLS_PREFIX@

  • src/gnutls_cache.c

    r0ab45ea r15ffe0b  
    11/**
    22 *  Copyright 2004-2005 Paul Querna
     3 *  Portions Copyright 2008 Nikos Mavrogiannopoulos
    34 *
    45 *  Licensed under the Apache License, Version 2.0 (the "License");
    … …  
    346347                }
    347348            }
     349            apr_dbm_freedatum( dbm, dbmval);
    348350           
    349351        }
    … …  
    402404
    403405    if (dbmval.dptr == NULL || dbmval.dsize <= sizeof(apr_time_t)) {
     406        apr_dbm_freedatum( dbm, dbmval);
    404407        apr_dbm_close(dbm);
    405408        return data;
    406409    }
    407     apr_dbm_close(dbm);
    408410
    409411    data.size = dbmval.dsize - sizeof(apr_time_t);
    … …  
    411413    data.data = gnutls_malloc(data.size);
    412414    if (data.data == NULL) {
     415        apr_dbm_freedatum( dbm, dbmval);
     416        apr_dbm_close(dbm);
    413417        return data;
    414418    }
    415419   
    416420    memcpy(data.data, dbmval.dptr+sizeof(apr_time_t), data.size);
     421
     422    apr_dbm_freedatum( dbm, dbmval);
     423    apr_dbm_close(dbm);
    417424
    418425    return data;
    … …  
    460467   
    461468    if (rv != APR_SUCCESS) {
    462         ap_log_error(APLOG_MARK, APLOG_NOTICE, rv,
     469        ap_log_error(APLOG_MARK, APLOG_DEBUG, rv,
    463470                     ctxt->c->base_server,
    464471                     "[gnutls_cache] error storing in cache '%s'",

  • src/gnutls_config.c

    r0ab45ea r15ffe0b  
    203203}
    204204
     205#ifdef ENABLE_SRP
     206
    205207const char *mgs_set_srp_tpasswd_file(cmd_parms * parms, void *dummy,
    206208                                     const char *arg)
    … …  
    228230    return NULL;
    229231}
     232
     233#endif
    230234
    231235const char *mgs_set_cache(cmd_parms * parms, void *dummy,
    … …  
    427431    }
    428432
     433#ifdef ENABLE_SRP
    429434    ret = gnutls_srp_allocate_server_credentials(&sc->srp_creds);
    430435    if (ret < 0) {
    … …  
    435440    sc->srp_tpasswd_conf_file = NULL;
    436441    sc->srp_tpasswd_file = NULL;
     442#endif
     443
    437444    sc->privkey_x509 = NULL;
    438445    memset( sc->certs_x509, 0, sizeof(sc->certs_x509));

  • src/gnutls_hooks.c

    r0ab45ea r15ffe0b  
    116116    gnutls_credentials_set(session, GNUTLS_CRD_ANON, ctxt->sc->anon_creds);
    117117
     118#ifdef ENABLE_SRP
    118119    if (ctxt->sc->srp_tpasswd_conf_file != NULL
    119120        && ctxt->sc->srp_tpasswd_file != NULL) {
    … …  
    121122                               ctxt->sc->srp_creds);
    122123    }
     124#endif
    123125
    124126    /* update the priorities - to avoid negotiating a ciphersuite that is not
    … …  
    314316                                                            cert_retrieve_fn);
    315317
     318#ifdef ENABLE_SRP
    316319            if (sc->srp_tpasswd_conf_file != NULL
    317320                && sc->srp_tpasswd_file != NULL) {
    … …  
    330333                }
    331334            }
     335#endif
    332336
    333337            if (sc->certs_x509[0] == NULL
    … …  
    663667                                               (ctxt->session)));
    664668
     669#ifdef ENABLE_SRP
    665670    apr_table_setn(env, "SSL_SRP_USER",
    666671                   gnutls_srp_server_get_username(ctxt->session));
     672#endif
    667673
    668674    if (apr_table_get(env, "SSL_CLIENT_VERIFY") == NULL)
    … …  
    795801    apr_table_setn(env,
    796802       apr_pstrcat(r->pool, MGS_SIDE, "_CERT_TYPE", NULL), "X.509");
    797 #ifdef COMPAT
    798     apr_table_setn(env,
    799        apr_pstrcat(r->pool, MGS_SIDE, "_S_TYPE", NULL), "X.509");
    800 #endif
    801803
    802804    tmp =

  • src/mod_gnutls.c

    r0ab45ea r15ffe0b  
    1717
    1818#include "mod_gnutls.h"
    19 
    2019
    2120static void gnutls_hooks(apr_pool_t * p)
    … …  
    8180                  RSRC_CONF,
    8281                  "SSL Server SRP Password file"),
     82#ifdef ENABLE_SRP
    8383    AP_INIT_TAKE1("GnuTLSSRPPasswdFile", mgs_set_srp_tpasswd_file,
    8484                  NULL,
    … …  
    8989                  RSRC_CONF,
    9090                  "SSL Server SRP Parameters file"),
     91#endif
    9192    AP_INIT_TAKE1("GnuTLSCacheTimeout", mgs_set_cache_timeout,
    9293                  NULL,
Note: See TracChangeset for help on using the changeset viewer.