Changeset 8eb6ccd in mod_gnutls


Ignore:
Timestamp:
Jan 11, 2013, 12:53:30 AM (6 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, upstream
Children:
3e94bd3, b67ea18
Parents:
de80d66
Message:

Imported Upstream version 0.1.1

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • Makefile.in

    rde80d66 r8eb6ccd  
    139139MOD_GNUTLS_VERSION = @MOD_GNUTLS_VERSION@
    140140OBJEXT = @OBJEXT@
     141OOO_MAINTAIN = @OOO_MAINTAIN@
    141142PACKAGE = @PACKAGE@
    142143PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  • configure

    rde80d66 r8eb6ccd  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for mod_gnutls 0.1.0.
     3# Generated by GNU Autoconf 2.59 for mod_gnutls 0.1.1.
    44#
    55# Copyright (C) 2003 Free Software Foundation, Inc.
     
    268268PACKAGE_NAME='mod_gnutls'
    269269PACKAGE_TARNAME='mod_gnutls'
    270 PACKAGE_VERSION='0.1.0'
    271 PACKAGE_STRING='mod_gnutls 0.1.0'
     270PACKAGE_VERSION='0.1.1'
     271PACKAGE_STRING='mod_gnutls 0.1.1'
    272272PACKAGE_BUGREPORT=''
    273273
    274274ac_unique_file="src/mod_gnutls.c"
    275 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MOD_GNUTLS_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP APXS_BIN AP_DEFS AP_PREFIX AP_CFLAGS AP_CPPFLAGS AP_INCLUDES AP_INCLUDEDIR AP_LIBEXECDIR AP_VERSION AP_SYSCONFDIR AP_BINDIR AP_SBINDIR APR_INCLUDES APU_INCLUDES APXS_EXTENSION APXS_CFLAGS LIBTOOL GTLS_BIN LIBGNUTLS_LIBS LIBGNUTLS_CFLAGS LIBGNUTLS_VERSION GNUTLS_CERTTOOL LIBGNUTLS_PREFIX APR_MEMCACHE_LIBS APR_MEMCACHE_CFLAGS have_apr_memcache MODULE_CFLAGS MODULE_LIBS LIBOBJS LTLIBOBJS'
     275ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS OOO_MAINTAIN MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MOD_GNUTLS_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP APXS_BIN AP_DEFS AP_PREFIX AP_CFLAGS AP_CPPFLAGS AP_INCLUDES AP_INCLUDEDIR AP_LIBEXECDIR AP_VERSION AP_SYSCONFDIR AP_BINDIR AP_SBINDIR APR_INCLUDES APU_INCLUDES APXS_EXTENSION APXS_CFLAGS LIBTOOL GTLS_BIN LIBGNUTLS_LIBS LIBGNUTLS_CFLAGS LIBGNUTLS_VERSION GNUTLS_CERTTOOL LIBGNUTLS_PREFIX APR_MEMCACHE_LIBS APR_MEMCACHE_CFLAGS have_apr_memcache MODULE_CFLAGS MODULE_LIBS LIBOBJS LTLIBOBJS'
    276276ac_subst_files=''
    277277
     
    738738  # This message is too long to be a string in the A/UX 3.1 sh.
    739739  cat <<_ACEOF
    740 \`configure' configures mod_gnutls 0.1.0 to adapt to many kinds of systems.
     740\`configure' configures mod_gnutls 0.1.1 to adapt to many kinds of systems.
    741741
    742742Usage: $0 [OPTION]... [VAR=VALUE]...
     
    805805if test -n "$ac_init_help"; then
    806806  case $ac_init_help in
    807      short | recursive ) echo "Configuration of mod_gnutls 0.1.0:";;
     807     short | recursive ) echo "Configuration of mod_gnutls 0.1.1:";;
    808808   esac
    809809  cat <<\_ACEOF
     
    812812  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    813813  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
     814  --enable-maintainer     Enable maintainer mode for this project
    814815  --enable-maintainer-mode  enable make rules and dependencies not useful
    815816                          (and sometimes confusing) to the casual installer
     
    934935if $ac_init_version; then
    935936  cat <<\_ACEOF
    936 mod_gnutls configure 0.1.0
     937mod_gnutls configure 0.1.1
    937938generated by GNU Autoconf 2.59
    938939
     
    948949running configure, to aid debugging if configure makes a mistake.
    949950
    950 It was created by mod_gnutls $as_me 0.1.0, which was
     951It was created by mod_gnutls $as_me 0.1.1, which was
    951952generated by GNU Autoconf 2.59.  Invocation command line was
    952953
     
    13021303  chmod +x config.nice
    13031304
    1304 MOD_GNUTLS_VERSION=0.1.0
     1305MOD_GNUTLS_VERSION=0.1.1
    13051306
    13061307
     
    13291330ac_config_sub="$SHELL $ac_aux_dir/config.sub"
    13301331ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
     1332
     1333
     1334  # Check whether --enable-maintainer or --disable-maintainer was given.
     1335if test "${enable_maintainer+set}" = set; then
     1336  enableval="$enable_maintainer"
     1337  echo "$as_me:$LINENO: result: Enabling Maintainer Mode!!" >&5
     1338echo "${ECHO_T}Enabling Maintainer Mode!!" >&6
     1339        OOO_MAINTAIN=1
     1340else
     1341  OOO_MAINTAIN=0
     1342fi;
     1343
    13311344
    13321345echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
     
    17181731# Define the identity of the package.
    17191732 PACKAGE=mod_gnutls
    1720  VERSION=0.1.0
     1733 VERSION=0.1.1
    17211734
    17221735
     
    43224335cat >&5 <<_CSEOF
    43234336
    4324 This file was extended by mod_gnutls $as_me 0.1.0, which was
     4337This file was extended by mod_gnutls $as_me 0.1.1, which was
    43254338generated by GNU Autoconf 2.59.  Invocation command line was
    43264339
     
    43854398cat >>$CONFIG_STATUS <<_ACEOF
    43864399ac_cs_version="\\
    4387 mod_gnutls config.status 0.1.0
     4400mod_gnutls config.status 0.1.1
    43884401configured by $0, generated by GNU Autoconf 2.59,
    43894402  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
     
    45864599s,@ECHO_T@,$ECHO_T,;t t
    45874600s,@LIBS@,$LIBS,;t t
     4601s,@OOO_MAINTAIN@,$OOO_MAINTAIN,;t t
    45884602s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
    45894603s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
  • configure.ac

    rde80d66 r8eb6ccd  
    1 AC_INIT(mod_gnutls, 0.1.0)
     1AC_INIT(mod_gnutls, 0.1.1)
    22OOO_CONFIG_NICE(config.nice)
    33MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
     
    55AC_CONFIG_SRCDIR([src/mod_gnutls.c])
    66AC_CONFIG_AUX_DIR(config)
     7OOO_MAINTAIN_MODE
    78AM_MAINTAINER_MODE
    89AC_CANONICAL_TARGET
  • data/Makefile.in

    rde80d66 r8eb6ccd  
    123123MOD_GNUTLS_VERSION = @MOD_GNUTLS_VERSION@
    124124OBJEXT = @OBJEXT@
     125OOO_MAINTAIN = @OOO_MAINTAIN@
    125126PACKAGE = @PACKAGE@
    126127PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  • include/mod_gnutls.h.in

    rde80d66 r8eb6ccd  
    2626#include "apr_strings.h"
    2727#include "apr_tables.h"
     28#include "ap_release.h"
    2829
    2930#ifndef __mod_gnutls_h_inc
     
    4445
    4546#define MOD_GNUTLS_VERSION "@MOD_GNUTLS_VERSION@"
     47
     48#define MOD_GNUTLS_DEBUG @OOO_MAINTAIN@
     49
     50/* Recent Versions of 2.1 renamed several hooks. This allows us to
     51   compile on 2.0.xx  */
     52#if AP_SERVER_MINORVERSION_NUMBER >= 1
     53#if AP_SERVER_PATCHLEVEL_NUMBER >= 3
     54#define USING_2_1_RECENT 1
     55#endif
     56#endif
     57
     58#ifndef USING_2_1_RECENT
     59#define USING_2_1_RECENT 0
     60#endif
    4661
    4762typedef enum
  • src/Makefile.in

    rde80d66 r8eb6ccd  
    142142MOD_GNUTLS_VERSION = @MOD_GNUTLS_VERSION@
    143143OBJEXT = @OBJEXT@
     144OOO_MAINTAIN = @OOO_MAINTAIN@
    144145PACKAGE = @PACKAGE@
    145146PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  • src/mod_gnutls.c

    rde80d66 r8eb6ccd  
    2222#endif
    2323
     24#if MOD_GNUTLS_DEBUG
    2425static apr_file_t* debug_log_fp;
     26#endif
    2527
    2628static apr_status_t mod_gnutls_cleanup_pre_config(void *data)
     
    3032}
    3133
     34#if MOD_GNUTLS_DEBUG
    3235static void gnutls_debug_log_all( int level, const char* str)
    3336{
    3437    apr_file_printf(debug_log_fp, "<%d> %s\n", level, str);
    3538}
     39#endif
    3640
    3741static int mod_gnutls_hook_pre_config(apr_pool_t * pconf,
     
    4953                              apr_pool_cleanup_null);
    5054
     55#if MOD_GNUTLS_DEBUG
    5156    apr_file_open(&debug_log_fp, "/tmp/gnutls_debug",
    5257                  APR_APPEND|APR_WRITE|APR_CREATE, APR_OS_DEFAULT, pconf);
     
    5459    gnutls_global_set_log_level(9);
    5560    gnutls_global_set_log_function(gnutls_debug_log_all);
     61#endif
    5662
    5763    return OK;
     
    521527    ap_hook_child_init(mod_gnutls_hook_child_init, NULL, NULL,
    522528                        APR_HOOK_MIDDLE);
     529#if USING_2_1_RECENT
    523530    ap_hook_http_scheme(mod_gnutls_hook_http_scheme, NULL, NULL,
    524531                        APR_HOOK_MIDDLE);
     532#else
     533    ap_hook_http_method(mod_gnutls_hook_http_scheme, NULL, NULL,
     534                        APR_HOOK_MIDDLE);
     535#endif
    525536    ap_hook_default_port(mod_gnutls_hook_default_port, NULL, NULL,
    526537                         APR_HOOK_MIDDLE);
Note: See TracChangeset for help on using the changeset viewer.