curl/curl-7.19.7.patch

   1 --- misc/curl-7.19.7/config.sub 2009-11-04 13:26:13.000000000 +0100
   2 +++ misc/build/curl-7.19.7/config.sub   2011-09-26 17:29:12.000000000 +0200
   3 @@ -120,7 +120,7 @@
   4  # Here we must recognize all the valid KERNEL-OS combinations.
   5  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
   6  case $maybe_os in
   7 -  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   8 +  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   9    uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
  10    kopensolaris*-gnu* | \
  11    storm-chaos* | os2-emx* | rtmk-nova*)
  12 @@ -1282,7 +1282,7 @@
  13               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  14               | -chorusos* | -chorusrdb* | -cegcc* \
  15               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  16 -             | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
  17 +             | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
  18               | -uxpv* | -beos* | -mpeix* | -udk* \
  19               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  20               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
  21 --- misc/curl-7.19.7/configure  2009-11-04 13:26:02.000000000 +0100
  22 +++ misc/build/curl-7.19.7/configure    2009-11-18 14:17:25.453125000 +0100
  23 @@ -2735,8 +2735,8 @@
  24
  25  ac_ext=c
  26  ac_cpp='$CPP $CPPFLAGS'
  27 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  28 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  29 +ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  30 +ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  31  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  32
  33
  34 @@ -3783,8 +3783,8 @@
  35    ac_save_CPPFLAGS="$CPPFLAGS"
  36    ac_ext=c
  37  ac_cpp='$CPP $CPPFLAGS'
  38 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  39 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  40 +ac_compile='$CC -c $ADDCFLAGS $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  41 +ac_link='$CC -o conftest$ac_exeext $ADDCFLAGS $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  42  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  43  if test -n "$ac_tool_prefix"; then
  44    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  45 @@ -4434,15 +4434,15 @@
  46    CFLAGS=$ac_save_CFLAGS
  47  elif test $ac_cv_prog_cc_g = yes; then
  48    if test "$GCC" = yes; then
  49 -    CFLAGS="-g -O2"
  50 +    CFLAGS="$ADDCFLAGS -g -O2"
  51    else
  52 -    CFLAGS="-g"
  53 +    CFLAGS="$ADDCFLAGS -g"
  54    fi
  55  else
  56    if test "$GCC" = yes; then
  57 -    CFLAGS="-O2"
  58 +    CFLAGS="$ADDCFLAGS -O2"
  59    else
  60 -    CFLAGS=
  61 +    CFLAGS="$ADDCFLAGS"
  62    fi
  63  fi
  64  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
  65 --- misc/curl-7.19.7/include/curl/curl.h
  66 +++ misc/build/curl-7.19.7/include/curl/curl.h
  67 @@ -74,7 +74,7 @@
  68     require it! */
  69  #if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
  70      defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
  71 -    defined(ANDROID)
  72 +    defined(__ANDROID__)
  73  #include <sys/select.h>
  74  #endif
  75
  76 --- misc/curl-7.19.7/lib/setup.h        2009-10-28 21:21:58.000000000 +0100
  77 +++ misc/build/curl-7.19.7/lib/setup.h  2009-11-18 13:30:42.375000000 +0100
  78 @@ -193,6 +193,7 @@
  79  #    include <winsock2.h>
  80  #    ifdef HAVE_WS2TCPIP_H
  81  #       include <ws2tcpip.h>
  82 +#              include <wspiapi.h>
  83  #    endif
  84  #  else
  85  #    ifdef HAVE_WINSOCK_H
  86 --- misc/curl-7.19.7/ltmain.sh  2009-11-04 13:25:51.000000000 +0100
  87 +++ misc/build/curl-7.19.7/ltmain.sh    2009-11-18 14:37:08.046875000 +0100
  88 @@ -6188,13 +6188,13 @@
  89           # which has an extra 1 added just for fun
  90           #
  91           case $version_type in
  92 -         darwin|linux|osf|windows|none)
  93 +         darwin|linux|osf|windows|freebsd-aout|freebsd-elf|none)
  94             func_arith $number_major + $number_minor
  95             current=$func_arith_result
  96             age="$number_minor"
  97             revision="$number_revision"
  98             ;;
  99 -         freebsd-aout|freebsd-elf|sunos)
 100 +         sunos)
 101             current="$number_major"
 102             revision="$number_minor"
 103             age="0"
 104 @@ -6271,8 +6271,8 @@
 105           ;;
 106
 107         freebsd-elf)
 108 -         major=".$current"
 109 -         versuffix=".$current"
 110 +         major=.`expr $current - $age`
 111 +         versuffix="$major"
 112           ;;
 113
 114         irix | nonstopux)