Changeset b67ea18 in mod_gnutls

Timestamp:

Jan 11, 2013, 12:53:31 AM (8 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports

Children:

1c87791

Parents:

de80d66 (diff), 8eb6ccd (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.1.1'

Upstream version 0.1.1

Files:

• Makefile.in (modified) (1 diff)
• configure (modified) (13 diffs)
• configure.ac (modified) (2 diffs)
• data/Makefile.in (modified) (1 diff)
• include/mod_gnutls.h.in (modified) (2 diffs)
• src/Makefile.in (modified) (1 diff)
• src/mod_gnutls.c (modified) (5 diffs)

Makefile.in

@@ -139 +139 @@
 MOD_GNUTLS_VERSION = @MOD_GNUTLS_VERSION@
 OBJEXT = @OBJEXT@
+OOO_MAINTAIN = @OOO_MAINTAIN@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for mod_gnutls 0.1.0.
+# Generated by GNU Autoconf 2.59 for mod_gnutls 0.1.1.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
@@ -268 +268 @@
 PACKAGE_NAME='mod_gnutls'
 PACKAGE_TARNAME='mod_gnutls'
-PACKAGE_VERSION='0.1.0'
-PACKAGE_STRING='mod_gnutls 0.1.0'
+PACKAGE_VERSION='0.1.1'
+PACKAGE_STRING='mod_gnutls 0.1.1'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src/mod_gnutls.c"
-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'
+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 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'
 ac_subst_files=''
 
@@ -738 +738 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mod_gnutls 0.1.0 to adapt to many kinds of systems.
+\`configure' configures mod_gnutls 0.1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -805 +805 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mod_gnutls 0.1.0:";;
+     short | recursive ) echo "Configuration of mod_gnutls 0.1.1:";;
    esac
   cat <<\_ACEOF
@@ -812 +812 @@
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-maintainer     Enable maintainer mode for this project
   --enable-maintainer-mode  enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer
@@ -934 +935 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-mod_gnutls configure 0.1.0
+mod_gnutls configure 0.1.1
 generated by GNU Autoconf 2.59
 
@@ -948 +949 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mod_gnutls $as_me 0.1.0, which was
+It was created by mod_gnutls $as_me 0.1.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
@@ -1302 +1303 @@
   chmod +x config.nice
 
-MOD_GNUTLS_VERSION=0.1.0
+MOD_GNUTLS_VERSION=0.1.1
 
 
@@ -1329 +1330 @@
 ac_config_sub="$SHELL $ac_aux_dir/config.sub"
 ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
+
+  # Check whether --enable-maintainer or --disable-maintainer was given.
+if test "${enable_maintainer+set}" = set; then
+  enableval="$enable_maintainer"
+  echo "$as_me:$LINENO: result: Enabling Maintainer Mode!!" >&5
+echo "${ECHO_T}Enabling Maintainer Mode!!" >&6
+        OOO_MAINTAIN=1
+else
+  OOO_MAINTAIN=0
+fi;
+
 
 echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
@@ -1718 +1731 @@
 # Define the identity of the package.
  PACKAGE=mod_gnutls
- VERSION=0.1.0
+ VERSION=0.1.1
 
 
@@ -4322 +4335 @@
 cat >&5 <<_CSEOF
 
-This file was extended by mod_gnutls $as_me 0.1.0, which was
+This file was extended by mod_gnutls $as_me 0.1.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
@@ -4385 +4398 @@
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-mod_gnutls config.status 0.1.0
+mod_gnutls config.status 0.1.1
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -4586 +4599 @@
 s,@ECHO_T@,$ECHO_T,;t t
 s,@LIBS@,$LIBS,;t t
+s,@OOO_MAINTAIN@,$OOO_MAINTAIN,;t t
 s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
 s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t

configure.ac

@@ -1 @@
-AC_INIT(mod_gnutls, 0.1.0)
+AC_INIT(mod_gnutls, 0.1.1)
 OOO_CONFIG_NICE(config.nice)
 MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
@@ -5 +5 @@
 AC_CONFIG_SRCDIR([src/mod_gnutls.c])
 AC_CONFIG_AUX_DIR(config)
+OOO_MAINTAIN_MODE
 AM_MAINTAINER_MODE
 AC_CANONICAL_TARGET

data/Makefile.in

@@ -123 +123 @@
 MOD_GNUTLS_VERSION = @MOD_GNUTLS_VERSION@
 OBJEXT = @OBJEXT@
+OOO_MAINTAIN = @OOO_MAINTAIN@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

include/mod_gnutls.h.in

@@ -26 +26 @@
 #include "apr_strings.h"
 #include "apr_tables.h"
+#include "ap_release.h"
 
 #ifndef __mod_gnutls_h_inc
@@ -44 +45 @@
 
 #define MOD_GNUTLS_VERSION "@MOD_GNUTLS_VERSION@"
+
+#define MOD_GNUTLS_DEBUG @OOO_MAINTAIN@
+
+/* Recent Versions of 2.1 renamed several hooks. This allows us to 
+   compile on 2.0.xx  */
+#if AP_SERVER_MINORVERSION_NUMBER >= 1
+#if AP_SERVER_PATCHLEVEL_NUMBER >= 3
+#define USING_2_1_RECENT 1
+#endif
+#endif 
+
+#ifndef USING_2_1_RECENT
+#define USING_2_1_RECENT 0
+#endif
 
 typedef enum 

src/Makefile.in

@@ -142 +142 @@
 MOD_GNUTLS_VERSION = @MOD_GNUTLS_VERSION@
 OBJEXT = @OBJEXT@
+OOO_MAINTAIN = @OOO_MAINTAIN@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

src/mod_gnutls.c

@@ -22 +22 @@
 #endif
 
+#if MOD_GNUTLS_DEBUG
 static apr_file_t* debug_log_fp;
+#endif
 
 static apr_status_t mod_gnutls_cleanup_pre_config(void *data)
@@ -30 +32 @@
 }
 
+#if MOD_GNUTLS_DEBUG
 static void gnutls_debug_log_all( int level, const char* str)
 {
     apr_file_printf(debug_log_fp, "<%d> %s\n", level, str);
 }
+#endif
 
 static int mod_gnutls_hook_pre_config(apr_pool_t * pconf,
@@ -49 +53 @@
                               apr_pool_cleanup_null);
 
+#if MOD_GNUTLS_DEBUG
     apr_file_open(&debug_log_fp, "/tmp/gnutls_debug",
                   APR_APPEND|APR_WRITE|APR_CREATE, APR_OS_DEFAULT, pconf);
@@ -54 +59 @@
     gnutls_global_set_log_level(9);
     gnutls_global_set_log_function(gnutls_debug_log_all);
+#endif
 
     return OK;
@@ -521 +527 @@
     ap_hook_child_init(mod_gnutls_hook_child_init, NULL, NULL,
                         APR_HOOK_MIDDLE);
+#if USING_2_1_RECENT
     ap_hook_http_scheme(mod_gnutls_hook_http_scheme, NULL, NULL,
                         APR_HOOK_MIDDLE);
+#else
+    ap_hook_http_method(mod_gnutls_hook_http_scheme, NULL, NULL,
+                        APR_HOOK_MIDDLE);
+#endif
     ap_hook_default_port(mod_gnutls_hook_default_port, NULL, NULL,
                          APR_HOOK_MIDDLE);