Changeset 8ce897a in mod_gnutls for src

Timestamp:

Jan 11, 2013, 12:57:01 AM (8 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

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

Children:

54b3065, f8ffc43

Parents:

9d9b093

Message:

Imported Upstream version 0.5.2

Location:

src

Files:

• Makefile.in (modified) (10 diffs)
• gnutls_hooks.c (modified) (1 diff)

src/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -64 +64 @@
         $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libmod_gnutls_la_CFLAGS) \
         $(CFLAGS) $(libmod_gnutls_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -126 +126 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
@@ -143 +144 @@
 LIBGNUTLS_CERTTOOL = @LIBGNUTLS_CERTTOOL@
 LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
-LIBGNUTLS_EXTRA_CFLAGS = @LIBGNUTLS_EXTRA_CFLAGS@
-LIBGNUTLS_EXTRA_CONFIG = @LIBGNUTLS_EXTRA_CONFIG@
-LIBGNUTLS_EXTRA_LIBS = @LIBGNUTLS_EXTRA_LIBS@
+LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
 LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
 LIBGNUTLS_PREFIX = @LIBGNUTLS_PREFIX@
@@ -160 +159 @@
 MODULE_LIBS = @MODULE_LIBS@
 MOD_GNUTLS_VERSION = @MOD_GNUTLS_VERSION@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OOO_MAINTAIN = @OOO_MAINTAIN@
@@ -276 +276 @@
           if test -f $$p; then \
             f=$(am__strip_dir) \
-            echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-            $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+            echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+            $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
           else :; fi; \
         done
@@ -285 +285 @@
         @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
           p=$(am__strip_dir) \
-          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-          $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+          echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+          $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
         done
 
@@ -379 +379 @@
             if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
           done | \
-          $(AWK) '    { files[$$0] = 1; } \
-               END { for (i in files) print i; }'`; \
+          $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
         mkid -fID $$unique
 tags: TAGS
@@ -392 +392 @@
             if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
           done | \
-          $(AWK) '    { files[$$0] = 1; } \
-               END { for (i in files) print i; }'`; \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
         if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
           test -n "$$unique" || unique=$$empty_fix; \
@@ -403 +403 @@
                 $(TAGS_FILES) $(LISP)
         tags=; \
-        here=`pwd`; \
         list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
         unique=`for i in $$list; do \
             if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
           done | \
-          $(AWK) '    { files[$$0] = 1; } \
-               END { for (i in files) print i; }'`; \
+          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+              END { if (nonempty) { for (i in files) print i; }; }'`; \
         test -z "$(CTAGS_ARGS)$$tags$$unique" \
           || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

src/gnutls_hooks.c

@@ -84 +84 @@
     }
 
-    ret = gnutls_global_init_extra();
-    if (ret < 0) {
-        fprintf(stderr, "gnutls_global_init_extra: %s\n", gnutls_strerror(ret));
-        return -3;
-    }
-                                            
     apr_pool_cleanup_register(pconf, NULL, mgs_cleanup_pre_config,
                               apr_pool_cleanup_null);