Changeset 15ffe0b in mod_gnutls
- Timestamp:
- Jan 11, 2013, 12:56:27 AM (8 years ago)
- 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. - Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile.in
r0ab45ea r15ffe0b 78 78 ACLOCAL = @ACLOCAL@ 79 79 AMTAR = @AMTAR@ 80 APR_CFLAGS = @APR_CFLAGS@ 81 APR_CPPFLAGS = @APR_CPPFLAGS@ 80 82 APR_INCLUDES = @APR_INCLUDES@ 83 APR_LDFLAGS = @APR_LDFLAGS@ 84 APR_LIBS = @APR_LIBS@ 85 APR_LIBTOOL = @APR_LIBTOOL@ 81 86 APR_MEMCACHE_CFLAGS = @APR_MEMCACHE_CFLAGS@ 82 87 APR_MEMCACHE_LIBS = @APR_MEMCACHE_LIBS@ 83 88 APU_INCLUDES = @APU_INCLUDES@ 89 APU_LDFLAGS = @APU_LDFLAGS@ 90 APU_LIBS = @APU_LIBS@ 91 APU_LIBTOOL = @APU_LIBTOOL@ 84 92 APXS_BIN = @APXS_BIN@ 85 93 APXS_CFLAGS = @APXS_CFLAGS@ … … 121 129 F77 = @F77@ 122 130 FFLAGS = @FFLAGS@ 123 GNUTLS_CERTTOOL = @GNUTLS_CERTTOOL@124 131 GREP = @GREP@ 125 GTLS_BIN = @GTLS_BIN@126 132 INSTALL = @INSTALL@ 127 133 INSTALL_DATA = @INSTALL_DATA@ … … 130 136 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ 131 137 LDFLAGS = @LDFLAGS@ 138 LIBGNUTLS_CERTTOOL = @LIBGNUTLS_CERTTOOL@ 132 139 LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ 140 LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ 133 141 LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ 134 142 LIBGNUTLS_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 1 9 ** Version 0.4.2 (2007-12-10) 2 10 -
autogen.sh
r0ab45ea r15ffe0b 1 1 #!/bin/sh 2 2 3 if [ -z $ACLOCAL ]; then4 ACLOCAL=aclocal5 fi6 if [ -z $AUTOCONF ]; then7 AUTOCONF=autoconf8 fi9 if [ -z $AUTOHEADER ]; then10 AUTOHEADER=autoheader11 fi12 3 if [ -z $AUTORECONF ]; then 13 4 AUTORECONF=autoreconf … … 15 6 16 7 #rm -rf autom4te.cache 17 $AUTORECONF -f - i8 $AUTORECONF -f -v -i 18 9 #touch stamp-h.in 19 10 20 for x in providers/*; do21 if [ -e $x/autogen.sh ]; then22 echo Generating Config files in $x23 (cd $x; ./autogen.sh $*)24 fi25 done -
config.in
r0ab45ea r15ffe0b 1 1 /* config.in. Generated from configure.ac by autoheader. */ 2 3 /* Default Module LibExec directory */ 4 #undef DEFAULT_EXP_LIBEXECDIR 2 5 3 6 /* Define to 1 if you have the <dlfcn.h> header file. */ -
configure
r0ab45ea r15ffe0b 1 1 #! /bin/sh 2 2 # 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. 4 4 # 5 5 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, … … 727 727 PACKAGE_NAME='mod_gnutls' 728 728 PACKAGE_TARNAME='mod_gnutls' 729 PACKAGE_VERSION='0.4. 2.1'730 PACKAGE_STRING='mod_gnutls 0.4. 2.1'729 PACKAGE_VERSION='0.4.3' 730 PACKAGE_STRING='mod_gnutls 0.4.3' 731 731 PACKAGE_BUGREPORT='' 732 732 … … 892 892 AP_SBINDIR 893 893 APR_INCLUDES 894 APR_LDFLAGS 895 APR_LIBS 896 APR_LIBTOOL 897 APR_CPPFLAGS 898 APR_CFLAGS 894 899 APU_INCLUDES 900 APU_LDFLAGS 901 APU_LIBS 902 APU_LIBTOOL 895 903 APXS_EXTENSION 896 904 APXS_CFLAGS 897 GTLS_BIN 905 LIBGNUTLS_CONFIG 906 LIBGNUTLS_CFLAGS 898 907 LIBGNUTLS_LIBS 899 LIBGNUTLS_CFLAGS900 908 LIBGNUTLS_VERSION 901 GNUTLS_CERTTOOL902 909 LIBGNUTLS_PREFIX 910 LIBGNUTLS_CERTTOOL 903 911 APR_MEMCACHE_LIBS 904 912 APR_MEMCACHE_CFLAGS … … 1426 1434 # This message is too long to be a string in the A/UX 3.1 sh. 1427 1435 cat <<_ACEOF 1428 \`configure' configures mod_gnutls 0.4. 2.1to adapt to many kinds of systems.1436 \`configure' configures mod_gnutls 0.4.3 to adapt to many kinds of systems. 1429 1437 1430 1438 Usage: $0 [OPTION]... [VAR=VALUE]... … … 1497 1505 if test -n "$ac_init_help"; then 1498 1506 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:";; 1500 1508 esac 1501 1509 cat <<\_ACEOF … … 1516 1524 --disable-apxstest Do not try to compile and run apache version test 1517 1525 program 1526 --disable-srp unconditionally disable the SRP functionality 1518 1527 1519 1528 Optional Packages: … … 1525 1534 --with-tags[=TAGS] include additional configurations [automatic] 1526 1535 --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 1530 1543 1531 1544 Some influential environment variables: … … 1607 1620 if $ac_init_version; then 1608 1621 cat <<\_ACEOF 1609 mod_gnutls configure 0.4. 2.11622 mod_gnutls configure 0.4.3 1610 1623 generated by GNU Autoconf 2.61 1611 1624 … … 1621 1634 running configure, to aid debugging if configure makes a mistake. 1622 1635 1623 It was created by mod_gnutls $as_me 0.4. 2.1, which was1636 It was created by mod_gnutls $as_me 0.4.3, which was 1624 1637 generated by GNU Autoconf 2.61. Invocation command line was 1625 1638 … … 1992 2005 chmod +x config.nice 1993 2006 1994 MOD_GNUTLS_VERSION=0.4. 2.12007 MOD_GNUTLS_VERSION=0.4.3 1995 2008 1996 2009 … … 2493 2506 # Define the identity of the package. 2494 2507 PACKAGE=mod_gnutls 2495 VERSION=0.4. 2.12508 VERSION=0.4.3 2496 2509 2497 2510 … … 4538 4551 *-*-irix6*) 4539 4552 # Find out which ABI we are using. 4540 echo '#line 45 40"configure"' > conftest.$ac_ext4553 echo '#line 4553 "configure"' > conftest.$ac_ext 4541 4554 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 4542 4555 (eval $ac_compile) 2>&5 … … 7275 7288 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7276 7289 -e 's:$: $lt_compiler_flag:'` 7277 (eval echo "\"\$as_me:72 77: $lt_compile\"" >&5)7290 (eval echo "\"\$as_me:7290: $lt_compile\"" >&5) 7278 7291 (eval "$lt_compile" 2>conftest.err) 7279 7292 ac_status=$? 7280 7293 cat conftest.err >&5 7281 echo "$as_me:72 81: \$? = $ac_status" >&57294 echo "$as_me:7294: \$? = $ac_status" >&5 7282 7295 if (exit $ac_status) && test -s "$ac_outfile"; then 7283 7296 # The compiler can only warn and ignore the option if not recognized … … 7565 7578 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7566 7579 -e 's:$: $lt_compiler_flag:'` 7567 (eval echo "\"\$as_me:75 67: $lt_compile\"" >&5)7580 (eval echo "\"\$as_me:7580: $lt_compile\"" >&5) 7568 7581 (eval "$lt_compile" 2>conftest.err) 7569 7582 ac_status=$? 7570 7583 cat conftest.err >&5 7571 echo "$as_me:75 71: \$? = $ac_status" >&57584 echo "$as_me:7584: \$? = $ac_status" >&5 7572 7585 if (exit $ac_status) && test -s "$ac_outfile"; then 7573 7586 # The compiler can only warn and ignore the option if not recognized … … 7669 7682 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7670 7683 -e 's:$: $lt_compiler_flag:'` 7671 (eval echo "\"\$as_me:76 71: $lt_compile\"" >&5)7684 (eval echo "\"\$as_me:7684: $lt_compile\"" >&5) 7672 7685 (eval "$lt_compile" 2>out/conftest.err) 7673 7686 ac_status=$? 7674 7687 cat out/conftest.err >&5 7675 echo "$as_me:76 75: \$? = $ac_status" >&57688 echo "$as_me:7688: \$? = $ac_status" >&5 7676 7689 if (exit $ac_status) && test -s out/conftest2.$ac_objext 7677 7690 then … … 10031 10044 lt_status=$lt_dlunknown 10032 10045 cat > conftest.$ac_ext <<EOF 10033 #line 100 33"configure"10046 #line 10046 "configure" 10034 10047 #include "confdefs.h" 10035 10048 … … 10131 10144 lt_status=$lt_dlunknown 10132 10145 cat > conftest.$ac_ext <<EOF 10133 #line 101 33"configure"10146 #line 10146 "configure" 10134 10147 #include "confdefs.h" 10135 10148 … … 12551 12564 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 12552 12565 -e 's:$: $lt_compiler_flag:'` 12553 (eval echo "\"\$as_me:125 53: $lt_compile\"" >&5)12566 (eval echo "\"\$as_me:12566: $lt_compile\"" >&5) 12554 12567 (eval "$lt_compile" 2>conftest.err) 12555 12568 ac_status=$? 12556 12569 cat conftest.err >&5 12557 echo "$as_me:125 57: \$? = $ac_status" >&512570 echo "$as_me:12570: \$? = $ac_status" >&5 12558 12571 if (exit $ac_status) && test -s "$ac_outfile"; then 12559 12572 # The compiler can only warn and ignore the option if not recognized … … 12655 12668 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 12656 12669 -e 's:$: $lt_compiler_flag:'` 12657 (eval echo "\"\$as_me:126 57: $lt_compile\"" >&5)12670 (eval echo "\"\$as_me:12670: $lt_compile\"" >&5) 12658 12671 (eval "$lt_compile" 2>out/conftest.err) 12659 12672 ac_status=$? 12660 12673 cat out/conftest.err >&5 12661 echo "$as_me:126 61: \$? = $ac_status" >&512674 echo "$as_me:12674: \$? = $ac_status" >&5 12662 12675 if (exit $ac_status) && test -s out/conftest2.$ac_objext 12663 12676 then … … 14232 14245 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 14233 14246 -e 's:$: $lt_compiler_flag:'` 14234 (eval echo "\"\$as_me:142 34: $lt_compile\"" >&5)14247 (eval echo "\"\$as_me:14247: $lt_compile\"" >&5) 14235 14248 (eval "$lt_compile" 2>conftest.err) 14236 14249 ac_status=$? 14237 14250 cat conftest.err >&5 14238 echo "$as_me:142 38: \$? = $ac_status" >&514251 echo "$as_me:14251: \$? = $ac_status" >&5 14239 14252 if (exit $ac_status) && test -s "$ac_outfile"; then 14240 14253 # The compiler can only warn and ignore the option if not recognized … … 14336 14349 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 14337 14350 -e 's:$: $lt_compiler_flag:'` 14338 (eval echo "\"\$as_me:143 38: $lt_compile\"" >&5)14351 (eval echo "\"\$as_me:14351: $lt_compile\"" >&5) 14339 14352 (eval "$lt_compile" 2>out/conftest.err) 14340 14353 ac_status=$? 14341 14354 cat out/conftest.err >&5 14342 echo "$as_me:143 42: \$? = $ac_status" >&514355 echo "$as_me:14355: \$? = $ac_status" >&5 14343 14356 if (exit $ac_status) && test -s out/conftest2.$ac_objext 14344 14357 then … … 16536 16549 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16537 16550 -e 's:$: $lt_compiler_flag:'` 16538 (eval echo "\"\$as_me:165 38: $lt_compile\"" >&5)16551 (eval echo "\"\$as_me:16551: $lt_compile\"" >&5) 16539 16552 (eval "$lt_compile" 2>conftest.err) 16540 16553 ac_status=$? 16541 16554 cat conftest.err >&5 16542 echo "$as_me:165 42: \$? = $ac_status" >&516555 echo "$as_me:16555: \$? = $ac_status" >&5 16543 16556 if (exit $ac_status) && test -s "$ac_outfile"; then 16544 16557 # The compiler can only warn and ignore the option if not recognized … … 16826 16839 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16827 16840 -e 's:$: $lt_compiler_flag:'` 16828 (eval echo "\"\$as_me:168 28: $lt_compile\"" >&5)16841 (eval echo "\"\$as_me:16841: $lt_compile\"" >&5) 16829 16842 (eval "$lt_compile" 2>conftest.err) 16830 16843 ac_status=$? 16831 16844 cat conftest.err >&5 16832 echo "$as_me:168 32: \$? = $ac_status" >&516845 echo "$as_me:16845: \$? = $ac_status" >&5 16833 16846 if (exit $ac_status) && test -s "$ac_outfile"; then 16834 16847 # The compiler can only warn and ignore the option if not recognized … … 16930 16943 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16931 16944 -e 's:$: $lt_compiler_flag:'` 16932 (eval echo "\"\$as_me:169 32: $lt_compile\"" >&5)16945 (eval echo "\"\$as_me:16945: $lt_compile\"" >&5) 16933 16946 (eval "$lt_compile" 2>out/conftest.err) 16934 16947 ac_status=$? 16935 16948 cat out/conftest.err >&5 16936 echo "$as_me:169 36: \$? = $ac_status" >&516949 echo "$as_me:16949: \$? = $ac_status" >&5 16937 16950 if (exit $ac_status) && test -s out/conftest2.$ac_objext 16938 16951 then … … 19701 19714 fi 19702 19715 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` 19703 19721 APR_VERSION=`$APR_CONFIG --version 2>/dev/null` 19704 19722 APU_CONFIG="`$APXS_BIN -q APU_BINDIR 2>/dev/null`/apu-1-config" … … 19707 19725 fi 19708 19726 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` 19709 19730 APU_VERSION=`$APU_CONFIG --version 2>/dev/null` 19710 19731 … … 19916 19937 APR_INCLUDES="" 19917 19938 APR_VERSION="" 19939 APR_LDFLAGS="" 19940 APR_LIBS="" 19941 APR_LIBTOOL="" 19942 APR_CFLAGS="" 19943 APR_CPPFLAGS="" 19918 19944 APU_INCLUDES="" 19919 19945 APU_VERSION="" 19946 APU_LDFLAGS="" 19947 APU_LIBS="" 19948 APU_LIBTOOL="" 19920 19949 { echo "$as_me:$LINENO: checking for Apache 1.3 version >= $min_apache13_version" >&5 19921 19950 echo $ECHO_N "checking for Apache 1.3 version >= $min_apache13_version... $ECHO_C" >&6; } … … 20113 20142 fi 20114 20143 fi 20144 { echo "$as_me:$LINENO: checking whether DEFAULT_EXP_LIBEXECDIR is declared" >&5 20145 echo $ECHO_N "checking whether DEFAULT_EXP_LIBEXECDIR is declared... $ECHO_C" >&6; } 20146 if test "${ac_cv_have_decl_DEFAULT_EXP_LIBEXECDIR+set}" = set; then 20147 echo $ECHO_N "(cached) $ECHO_C" >&6 20148 else 20149 cat >conftest.$ac_ext <<_ACEOF 20150 /* confdefs.h. */ 20151 _ACEOF 20152 cat confdefs.h >>conftest.$ac_ext 20153 cat >>conftest.$ac_ext <<_ACEOF 20154 /* end confdefs.h. */ 20155 $ac_includes_default 20156 int 20157 main () 20158 { 20159 #ifndef DEFAULT_EXP_LIBEXECDIR 20160 (void) DEFAULT_EXP_LIBEXECDIR; 20161 #endif 20162 20163 ; 20164 return 0; 20165 } 20166 _ACEOF 20167 rm -f conftest.$ac_objext 20168 if { (ac_try="$ac_compile" 20169 case "(($ac_try" in 20170 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 20171 *) ac_try_echo=$ac_try;; 20172 esac 20173 eval "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 20185 else 20186 echo "$as_me: failed program was:" >&5 20187 sed 's/^/| /' conftest.$ac_ext >&5 20188 20189 ac_cv_have_decl_DEFAULT_EXP_LIBEXECDIR=no 20190 fi 20191 20192 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 20193 fi 20194 { echo "$as_me:$LINENO: result: $ac_cv_have_decl_DEFAULT_EXP_LIBEXECDIR" >&5 20195 echo "${ECHO_T}$ac_cv_have_decl_DEFAULT_EXP_LIBEXECDIR" >&6; } 20196 if test $ac_cv_have_decl_DEFAULT_EXP_LIBEXECDIR = yes; then 20197 : 20198 else 20199 20200 cat >>confdefs.h <<_ACEOF 20201 #define DEFAULT_EXP_LIBEXECDIR "$AP_LIBEXECDIR" 20202 _ACEOF 20203 20204 fi 20205 20206 20207 20208 20209 20210 20211 20212 20213 20115 20214 20116 20215 … … 20133 20232 20134 20233 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. 20234 MIN_TLS_VERSION=2.2.1 20235 20236 # Check whether --with-libgnutls-prefix was given. 20237 if test "${with_libgnutls_prefix+set}" = set; then 20238 withval=$with_libgnutls_prefix; libgnutls_config_prefix="$withval" 20239 else 20240 libgnutls_config_prefix="" 20241 fi 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. 20154 20251 set dummy libgnutls-config; ac_word=$2 20155 20252 { echo "$as_me:$LINENO: checking for $ac_word" >&5 20156 20253 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 20157 if test "${ac_cv_path_ GTLS_BIN+set}" = set; then20254 if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then 20158 20255 echo $ECHO_N "(cached) $ECHO_C" >&6 20159 20256 else 20160 case $ GTLS_BINin20257 case $LIBGNUTLS_CONFIG in 20161 20258 [\\/]* | ?:[\\/]*) 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. 20163 20260 ;; 20164 20261 *) 20165 20262 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 20166 for as_dir in $ test_paths20263 for as_dir in $PATH 20167 20264 do 20168 20265 IFS=$as_save_IFS … … 20170 20267 for ac_exec_ext in '' $ac_executable_extensions; do 20171 20268 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" 20173 20270 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 20174 20271 break 2 … … 20178 20275 IFS=$as_save_IFS 20179 20276 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" 20181 20278 ;; 20182 20279 esac 20183 20280 fi 20184 GTLS_BIN=$ac_cv_path_GTLS_BIN 20185 if test -n "$ GTLS_BIN"; then20186 { echo "$as_me:$LINENO: result: $ GTLS_BIN" >&520187 echo "${ECHO_T}$ GTLS_BIN" >&6; }20281 LIBGNUTLS_CONFIG=$ac_cv_path_LIBGNUTLS_CONFIG 20282 if test -n "$LIBGNUTLS_CONFIG"; then 20283 { echo "$as_me:$LINENO: result: $LIBGNUTLS_CONFIG" >&5 20284 echo "${ECHO_T}$LIBGNUTLS_CONFIG" >&6; } 20188 20285 else 20189 20286 { echo "$as_me:$LINENO: result: no" >&5 … … 20192 20289 20193 20290 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 20293 echo $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" 20310 else 20311 cat >conftest.$ac_ext <<_ACEOF 20312 /* confdefs.h. */ 20313 _ACEOF 20314 cat confdefs.h >>conftest.$ac_ext 20315 cat >>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 20323 int 20324 main () 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 20373 rm -f conftest$ac_exeext 20374 if { (ac_try="$ac_link" 20375 case "(($ac_try" in 20376 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 20377 *) ac_try_echo=$ac_try;; 20378 esac 20379 eval "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;; 20387 esac 20388 eval "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 : 20394 else 20395 echo "$as_me: program exited with status $ac_status" >&5 20396 echo "$as_me: failed program was:" >&5 20397 sed 's/^/| /' conftest.$ac_ext >&5 20398 20399 ( exit $ac_status ) 20400 no_libgnutls=yes 20401 fi 20402 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 20403 fi 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 20412 echo "${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 20419 echo "${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 20436 cat confdefs.h >>conftest.$ac_ext 20437 cat >>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 20445 int 20446 main () 20447 { 20448 return !!gnutls_check_version(NULL); 20449 ; 20450 return 0; 20451 } 20452 _ACEOF 20453 rm -f conftest.$ac_objext conftest$ac_exeext 20454 if { (ac_try="$ac_link" 20455 case "(($ac_try" in 20456 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 20457 *) ac_try_echo=$ac_try;; 20458 esac 20459 eval "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 "***" 20481 else 20482 echo "$as_me: failed program was:" >&5 20483 sed '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" 20489 fi 20490 20491 rm -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 20505 echo "$as_me: error: 20506 *** 20507 *** libgnutls were not found. You may want to get it from 20508 *** http://www.gnutls.org/ 20509 *** 20510 " >&2;} 20199 20511 { (exit 1); exit 1; }; } 20200 { { echo "$as_me:$LINENO: error: *** Use the --with-libgnutls option with the full path to libgnutls-config" >&520201 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 20215 20527 20216 20528 … … 20219 20531 20220 20532 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. 20534 if test "${with_apr_memcache_prefix+set}" = set; then 20535 withval=$with_apr_memcache_prefix; apr_memcache_prefix="$withval" 20536 else 20537 apr_memcache_prefix="/usr" 20538 fi 20539 20540 20541 # Check whether --with-apr-memcache-libs was given. 20542 if test "${with_apr_memcache_libs+set}" = set; then 20543 withval=$with_apr_memcache_libs; apr_memcache_libs="$withval" 20544 else 20545 apr_memcache_libs="$apr_memcache_prefix/lib" 20546 : 20547 fi 20548 20549 20550 # Check whether --with-apr-memcache-includes was given. 20551 if test "${with_apr_memcache_includes+set}" = set; then 20552 withval=$with_apr_memcache_includes; apr_memcache_includes="$withval" 20553 else 20554 apr_memcache_includes="$apr_memcache_prefix/include/apr_memcache-0" 20555 : 20556 fi 20557 20227 20558 20228 20559 … … 20851 21182 20852 21183 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 21184 save_CFLAGS=$CFLAGS 21185 save_LDFLAGS=$LDFLAGS 21186 CFLAGS="-I$apr_memcache_includes $APR_INCLUDES $CFLAGS" 21187 LDFLAGS="-L$apr_memcache_libs $LDFLAGS" 21188 { echo "$as_me:$LINENO: checking for apr_memcache_create in -lapr_memcache" >&5 20875 21189 echo $ECHO_N "checking for apr_memcache_create in -lapr_memcache... $ECHO_C" >&6; } 20876 21190 if test "${ac_cv_lib_apr_memcache_apr_memcache_create+set}" = set; then … … 20935 21249 if test $ac_cv_lib_apr_memcache_apr_memcache_create = yes; then 20936 21250 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 21255 fi 21256 21257 CFLAGS=$save_CFLAGS 21258 LDFLAGS=$save_LDFLAGS 20950 21259 20951 21260 … … 20964 21273 20965 21274 20966 MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}" 21275 # Check whether --enable-srp was given. 21276 if test "${enable_srp+set}" = set; then 21277 enableval=$enable_srp; use_srp=$enableval 21278 else 21279 use_srp=yes 21280 fi 21281 21282 21283 SRP_CFLAGS="" 21284 if test "$use_srp" != "no"; then 21285 SRP_CFLAGS="-DENABLE_SRP=1" 21286 fi 21287 { echo "$as_me:$LINENO: checking whether to enable SRP functionality" >&5 21288 echo $ECHO_N "checking whether to enable SRP functionality... $ECHO_C" >&6; } 21289 { echo "$as_me:$LINENO: result: $use_srp" >&5 21290 echo "${ECHO_T}$use_srp" >&6; } 21291 21292 MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}" 20967 21293 MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}" 20968 21294 … … 21396 21722 # values after options handling. 21397 21723 ac_log=" 21398 This file was extended by mod_gnutls $as_me 0.4. 2.1, which was21724 This file was extended by mod_gnutls $as_me 0.4.3, which was 21399 21725 generated by GNU Autoconf 2.61. Invocation command line was 21400 21726 … … 21449 21775 cat >>$CONFIG_STATUS <<_ACEOF 21450 21776 ac_cs_version="\\ 21451 mod_gnutls config.status 0.4. 2.121777 mod_gnutls config.status 0.4.3 21452 21778 configured by $0, generated by GNU Autoconf 2.61, 21453 21779 with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" … … 21795 22121 AP_SBINDIR!$AP_SBINDIR$ac_delim 21796 22122 APR_INCLUDES!$APR_INCLUDES$ac_delim 22123 APR_LDFLAGS!$APR_LDFLAGS$ac_delim 22124 APR_LIBS!$APR_LIBS$ac_delim 22125 APR_LIBTOOL!$APR_LIBTOOL$ac_delim 22126 APR_CPPFLAGS!$APR_CPPFLAGS$ac_delim 22127 APR_CFLAGS!$APR_CFLAGS$ac_delim 21797 22128 APU_INCLUDES!$APU_INCLUDES$ac_delim 22129 APU_LDFLAGS!$APU_LDFLAGS$ac_delim 22130 APU_LIBS!$APU_LIBS$ac_delim 22131 APU_LIBTOOL!$APU_LIBTOOL$ac_delim 21798 22132 APXS_EXTENSION!$APXS_EXTENSION$ac_delim 21799 22133 APXS_CFLAGS!$APXS_CFLAGS$ac_delim 21800 GTLS_BIN!$GTLS_BIN$ac_delim 22134 LIBGNUTLS_CONFIG!$LIBGNUTLS_CONFIG$ac_delim 22135 LIBGNUTLS_CFLAGS!$LIBGNUTLS_CFLAGS$ac_delim 21801 22136 LIBGNUTLS_LIBS!$LIBGNUTLS_LIBS$ac_delim 21802 LIBGNUTLS_CFLAGS!$LIBGNUTLS_CFLAGS$ac_delim21803 22137 LIBGNUTLS_VERSION!$LIBGNUTLS_VERSION$ac_delim 21804 GNUTLS_CERTTOOL!$GNUTLS_CERTTOOL$ac_delim21805 22138 LIBGNUTLS_PREFIX!$LIBGNUTLS_PREFIX$ac_delim 22139 LIBGNUTLS_CERTTOOL!$LIBGNUTLS_CERTTOOL$ac_delim 21806 22140 APR_MEMCACHE_LIBS!$APR_MEMCACHE_LIBS$ac_delim 21807 22141 APR_MEMCACHE_CFLAGS!$APR_MEMCACHE_CFLAGS$ac_delim … … 21813 22147 _ACEOF 21814 22148 21815 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 43; then22149 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 51; then 21816 22150 break 21817 22151 elif $ac_last_try; then … … 22418 22752 echo " * Apache Modules directory: ${AP_LIBEXECDIR}" 22419 22753 echo " * GnuTLS Library version: ${LIBGNUTLS_VERSION}" 22754 echo " * SRP authentication: ${use_srp}" 22420 22755 echo "" 22421 22756 echo "---" -
configure.ac
r0ab45ea r15ffe0b 1 1 dnl 2 AC_INIT(mod_gnutls, 0.4. 2.1)2 AC_INIT(mod_gnutls, 0.4.3) 3 3 OOO_CONFIG_NICE(config.nice) 4 4 MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION … … 29 29 dnl AC_SUBST(LIBTOOL) 30 30 31 MIN_TLS_VERSION=2.1.7 32 CHECK_LIBGNUTLS($MIN_TLS_VERSION) 31 MIN_TLS_VERSION=2.2.1 32 AM_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 ]])) 33 39 34 40 dnl CHECK_LUA() … … 38 44 AC_SUBST(have_apr_memcache) 39 45 40 MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}" 46 AC_ARG_ENABLE(srp, 47 AS_HELP_STRING([--disable-srp], 48 [unconditionally disable the SRP functionality]), 49 use_srp=$enableval, use_srp=yes) 50 51 SRP_CFLAGS="" 52 if test "$use_srp" != "no"; then 53 SRP_CFLAGS="-DENABLE_SRP=1" 54 fi 55 AC_MSG_CHECKING([whether to enable SRP functionality]) 56 AC_MSG_RESULT($use_srp) 57 58 MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}" 41 59 MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}" 42 60 … … 50 68 echo "Configuration summary for mod_gnutls:" 51 69 echo "" 52 echo " * mod_gnutls version: ${MOD_GNUTLS_VERSION}" 53 echo " * Apache Modules directory: ${AP_LIBEXECDIR}" 54 echo " * GnuTLS Library version: ${LIBGNUTLS_VERSION}" 70 echo " * mod_gnutls version: ${MOD_GNUTLS_VERSION}" 71 echo " * Apache Modules directory: ${AP_LIBEXECDIR}" 72 echo " * GnuTLS Library version: ${LIBGNUTLS_VERSION}" 73 echo " * SRP authentication: ${use_srp}" 55 74 echo "" 56 75 echo "---" -
m4/apache.m4
r0ab45ea r15ffe0b 61 61 fi 62 62 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` 63 68 APR_VERSION=`$APR_CONFIG --version 2>/dev/null` 64 69 APU_CONFIG="`$APXS_BIN -q APU_BINDIR 2>/dev/null`/apu-1-config" … … 67 72 fi 68 73 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` 69 77 APU_VERSION=`$APU_CONFIG --version 2>/dev/null` 70 78 … … 91 99 APR_INCLUDES="" 92 100 APR_VERSION="" 101 APR_LDFLAGS="" 102 APR_LIBS="" 103 APR_LIBTOOL="" 104 APR_CFLAGS="" 105 APR_CPPFLAGS="" 93 106 APU_INCLUDES="" 94 107 APU_VERSION="" 108 APU_LDFLAGS="" 109 APU_LIBS="" 110 APU_LIBTOOL="" 95 111 AC_MSG_CHECKING(for Apache 1.3 version >= $min_apache13_version) 96 112 TEST_APACHE_VERSION(13,$min_apache13_version, … … 107 123 fi 108 124 fi 125 AC_CHECK_DECL([DEFAULT_EXP_LIBEXECDIR],,[AC_DEFINE_UNQUOTED([DEFAULT_EXP_LIBEXECDIR],["$AP_LIBEXECDIR"],[Default Module LibExec directory])]) 109 126 AC_SUBST(AP_DEFS) 110 127 AC_SUBST(AP_PREFIX) … … 119 136 AC_SUBST(AP_SBINDIR) 120 137 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) 121 143 AC_SUBST(APU_INCLUDES) 144 AC_SUBST(APU_LDFLAGS) 145 AC_SUBST(APU_LIBS) 146 AC_SUBST(APU_LIBTOOL) 122 147 AC_SUBST(APXS_EXTENSION) 123 148 AC_SUBST(APXS_BIN) -
m4/apr_memcache.m4
r0ab45ea r15ffe0b 7 7 8 8 AC_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", 12 13 :) 14 AC_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 :) 20 AC_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 13 27 14 28 AC_LIBTOOL_SYS_DYNAMIC_LINKER 15 29 16 30 dnl # 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 31 save_CFLAGS=$CFLAGS 32 save_LDFLAGS=$LDFLAGS 33 CFLAGS="-I$apr_memcache_includes $APR_INCLUDES $CFLAGS" 34 LDFLAGS="-L$apr_memcache_libs $LDFLAGS" 35 AC_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 ) 43 CFLAGS=$save_CFLAGS 44 LDFLAGS=$save_LDFLAGS 48 45 49 46 AC_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], 1 dnl Autoconf macros for libgnutls 2 dnl $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 9 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 dnl 12 AC_DEFUN([AM_PATH_LIBGNUTLS], 4 13 [dnl 14 dnl Get the cflags and libraries from the libgnutls-config script 15 dnl 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="") 5 19 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 12 25 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" 42 dnl 43 dnl Now check if the installed libgnutls is sufficiently new. Also sanity 44 dnl checks the results of libgnutls-config to some extent 45 dnl 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 53 int 54 main () 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 } 15 76 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 21 105 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 38 169 ]) 170 171 dnl *-*wedit:notab*-* Please keep this as the last line. -
src/Makefile.in
r0ab45ea r15ffe0b 83 83 ACLOCAL = @ACLOCAL@ 84 84 AMTAR = @AMTAR@ 85 APR_CFLAGS = @APR_CFLAGS@ 86 APR_CPPFLAGS = @APR_CPPFLAGS@ 85 87 APR_INCLUDES = @APR_INCLUDES@ 88 APR_LDFLAGS = @APR_LDFLAGS@ 89 APR_LIBS = @APR_LIBS@ 90 APR_LIBTOOL = @APR_LIBTOOL@ 86 91 APR_MEMCACHE_CFLAGS = @APR_MEMCACHE_CFLAGS@ 87 92 APR_MEMCACHE_LIBS = @APR_MEMCACHE_LIBS@ 88 93 APU_INCLUDES = @APU_INCLUDES@ 94 APU_LDFLAGS = @APU_LDFLAGS@ 95 APU_LIBS = @APU_LIBS@ 96 APU_LIBTOOL = @APU_LIBTOOL@ 89 97 APXS_BIN = @APXS_BIN@ 90 98 APXS_CFLAGS = @APXS_CFLAGS@ … … 126 134 F77 = @F77@ 127 135 FFLAGS = @FFLAGS@ 128 GNUTLS_CERTTOOL = @GNUTLS_CERTTOOL@129 136 GREP = @GREP@ 130 GTLS_BIN = @GTLS_BIN@131 137 INSTALL = @INSTALL@ 132 138 INSTALL_DATA = @INSTALL_DATA@ … … 135 141 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ 136 142 LDFLAGS = @LDFLAGS@ 143 LIBGNUTLS_CERTTOOL = @LIBGNUTLS_CERTTOOL@ 137 144 LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ 145 LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ 138 146 LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ 139 147 LIBGNUTLS_PREFIX = @LIBGNUTLS_PREFIX@ -
src/gnutls_cache.c
r0ab45ea r15ffe0b 1 1 /** 2 2 * Copyright 2004-2005 Paul Querna 3 * Portions Copyright 2008 Nikos Mavrogiannopoulos 3 4 * 4 5 * Licensed under the Apache License, Version 2.0 (the "License"); … … 346 347 } 347 348 } 349 apr_dbm_freedatum( dbm, dbmval); 348 350 349 351 } … … 402 404 403 405 if (dbmval.dptr == NULL || dbmval.dsize <= sizeof(apr_time_t)) { 406 apr_dbm_freedatum( dbm, dbmval); 404 407 apr_dbm_close(dbm); 405 408 return data; 406 409 } 407 apr_dbm_close(dbm);408 410 409 411 data.size = dbmval.dsize - sizeof(apr_time_t); … … 411 413 data.data = gnutls_malloc(data.size); 412 414 if (data.data == NULL) { 415 apr_dbm_freedatum( dbm, dbmval); 416 apr_dbm_close(dbm); 413 417 return data; 414 418 } 415 419 416 420 memcpy(data.data, dbmval.dptr+sizeof(apr_time_t), data.size); 421 422 apr_dbm_freedatum( dbm, dbmval); 423 apr_dbm_close(dbm); 417 424 418 425 return data; … … 460 467 461 468 if (rv != APR_SUCCESS) { 462 ap_log_error(APLOG_MARK, APLOG_ NOTICE, rv,469 ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, 463 470 ctxt->c->base_server, 464 471 "[gnutls_cache] error storing in cache '%s'", -
src/gnutls_config.c
r0ab45ea r15ffe0b 203 203 } 204 204 205 #ifdef ENABLE_SRP 206 205 207 const char *mgs_set_srp_tpasswd_file(cmd_parms * parms, void *dummy, 206 208 const char *arg) … … 228 230 return NULL; 229 231 } 232 233 #endif 230 234 231 235 const char *mgs_set_cache(cmd_parms * parms, void *dummy, … … 427 431 } 428 432 433 #ifdef ENABLE_SRP 429 434 ret = gnutls_srp_allocate_server_credentials(&sc->srp_creds); 430 435 if (ret < 0) { … … 435 440 sc->srp_tpasswd_conf_file = NULL; 436 441 sc->srp_tpasswd_file = NULL; 442 #endif 443 437 444 sc->privkey_x509 = NULL; 438 445 memset( sc->certs_x509, 0, sizeof(sc->certs_x509)); -
src/gnutls_hooks.c
r0ab45ea r15ffe0b 116 116 gnutls_credentials_set(session, GNUTLS_CRD_ANON, ctxt->sc->anon_creds); 117 117 118 #ifdef ENABLE_SRP 118 119 if (ctxt->sc->srp_tpasswd_conf_file != NULL 119 120 && ctxt->sc->srp_tpasswd_file != NULL) { … … 121 122 ctxt->sc->srp_creds); 122 123 } 124 #endif 123 125 124 126 /* update the priorities - to avoid negotiating a ciphersuite that is not … … 314 316 cert_retrieve_fn); 315 317 318 #ifdef ENABLE_SRP 316 319 if (sc->srp_tpasswd_conf_file != NULL 317 320 && sc->srp_tpasswd_file != NULL) { … … 330 333 } 331 334 } 335 #endif 332 336 333 337 if (sc->certs_x509[0] == NULL … … 663 667 (ctxt->session))); 664 668 669 #ifdef ENABLE_SRP 665 670 apr_table_setn(env, "SSL_SRP_USER", 666 671 gnutls_srp_server_get_username(ctxt->session)); 672 #endif 667 673 668 674 if (apr_table_get(env, "SSL_CLIENT_VERIFY") == NULL) … … 795 801 apr_table_setn(env, 796 802 apr_pstrcat(r->pool, MGS_SIDE, "_CERT_TYPE", NULL), "X.509"); 797 #ifdef COMPAT798 apr_table_setn(env,799 apr_pstrcat(r->pool, MGS_SIDE, "_S_TYPE", NULL), "X.509");800 #endif801 803 802 804 tmp = -
src/mod_gnutls.c
r0ab45ea r15ffe0b 17 17 18 18 #include "mod_gnutls.h" 19 20 19 21 20 static void gnutls_hooks(apr_pool_t * p) … … 81 80 RSRC_CONF, 82 81 "SSL Server SRP Password file"), 82 #ifdef ENABLE_SRP 83 83 AP_INIT_TAKE1("GnuTLSSRPPasswdFile", mgs_set_srp_tpasswd_file, 84 84 NULL, … … 89 89 RSRC_CONF, 90 90 "SSL Server SRP Parameters file"), 91 #endif 91 92 AP_INIT_TAKE1("GnuTLSCacheTimeout", mgs_set_cache_timeout, 92 93 NULL,
Note: See TracChangeset
for help on using the changeset viewer.