*** ./src/str.c.ORIG	Thu May  5 13:31:06 2011
--- ./src/str.c	Thu May  5 14:14:33 2011
***************
*** 192,197 ****
--- 192,201 ----
      return retval;
  }
  
+ #ifndef va_copy
+ # define va_copy(__list1,__list2) ((void)(__list1 = __list2))
+ #endif
+ 
  char *str_vprintf(const char *format, va_list start_ap) {
      int n, size=64;
      char *p, *np;
*** ./src/prototypes.h.ORIG	Wed May  6 11:10:38 2015
--- ./src/prototypes.h	Wed May  6 11:12:30 2015
***************
*** 580,586 ****
  
  #endif /* USE_WIN32 */
  
! int getnameinfo(const struct sockaddr *, int, char *, int, char *, int, int);
  
  #endif /* !defined HAVE_GETNAMEINFO */
  
--- 580,586 ----
  
  #endif /* USE_WIN32 */
  
! int getnameinfo(const struct sockaddr *, size_t, char *, size_t, char *, size_t, int);
  
  #endif /* !defined HAVE_GETNAMEINFO */
  
*** ./src/resolver.c.ORIG	Wed May  6 11:13:15 2015
--- ./src/resolver.c	Wed May  6 11:13:49 2015
***************
*** 535,542 ****
  /* implementation is limited to functionality needed by stunnel */
  
  #ifndef HAVE_GETNAMEINFO
! int getnameinfo(const struct sockaddr *sa, int salen,
!     char *host, int hostlen, char *serv, int servlen, int flags) {
  
  #if defined(USE_WIN32) && !defined(_WIN32_WCE)
      if(s_getnameinfo)
--- 535,542 ----
  /* implementation is limited to functionality needed by stunnel */
  
  #ifndef HAVE_GETNAMEINFO
! int getnameinfo(const struct sockaddr *sa, size_t salen,
!     char *host, size_t hostlen, char *serv, size_t servlen, int flags) {
  
  #if defined(USE_WIN32) && !defined(_WIN32_WCE)
      if(s_getnameinfo)
*** ./configure.ORIG	Wed May  6 11:14:56 2015
--- ./configure	Wed May  6 11:15:30 2015
***************
*** 5646,5781 ****
  
  
  
- for flag in -fstack-protector; do
-   as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
- $as_echo_n "checking whether C compiler accepts $flag... " >&6; }
- if eval \${$as_CACHEVAR+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-   ax_check_save_flags=$CFLAGS
-   CFLAGS="$CFLAGS  $flag"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
- main ()
- {
- 
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
-   eval "$as_CACHEVAR=yes"
- else
-   eval "$as_CACHEVAR=no"
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   CFLAGS=$ax_check_save_flags
- fi
- eval ac_res=\$$as_CACHEVAR
- 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
- if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-   if ${CFLAGS+:} false; then :
-   case " $CFLAGS " in
-     *" $flag "*)
-       { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
-   (: CFLAGS already contains $flag) 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }
-       ;;
-     *)
-       { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-   (: CFLAGS="$CFLAGS $flag") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }
-       CFLAGS="$CFLAGS $flag"
-       ;;
-    esac
- else
-   CFLAGS="$flag"
- fi
- 
- else
-   :
- fi
- 
- done
- 
- 
- 
- 
- 
- for flag in -fPIE; do
-   as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
- $as_echo_n "checking whether C compiler accepts $flag... " >&6; }
- if eval \${$as_CACHEVAR+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-   ax_check_save_flags=$CFLAGS
-   CFLAGS="$CFLAGS  $flag"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
- main ()
- {
- 
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
-   eval "$as_CACHEVAR=yes"
- else
-   eval "$as_CACHEVAR=no"
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   CFLAGS=$ax_check_save_flags
- fi
- eval ac_res=\$$as_CACHEVAR
- 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
- if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-   if ${CFLAGS+:} false; then :
-   case " $CFLAGS " in
-     *" $flag "*)
-       { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
-   (: CFLAGS already contains $flag) 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }
-       ;;
-     *)
-       { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-   (: CFLAGS="$CFLAGS $flag") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }
-       CFLAGS="$CFLAGS $flag"
-       ;;
-    esac
- else
-   CFLAGS="$flag"
- fi
- 
- else
-   :
- fi
- 
- done
- 
- 
- 
- 
- 
  for flag in -D_FORTIFY_SOURCE=2; do
    as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh`
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
--- 5646,5651 ----