Ticket #7251: curl.patch

File curl.patch, 5.8 KB (added by sav, 7 years ago)

Update curl to v7.20.1

  • Makefile

    diff -durN curl.old/Makefile curl/Makefile
    old new  
    88include $(TOPDIR)/rules.mk 
    99 
    1010PKG_NAME:=curl 
    11 PKG_VERSION:=7.19.6 
     11PKG_VERSION:=7.20.1 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    1919        ftp://ftp.planetmirror.com/pub/curl/ \ 
    2020        http://www.mirrormonster.com/curl/download/ \ 
    2121        http://curl.mirrors.cyberservers.net/download/ 
    22 PKG_MD5SUM:=8402c1f654c51ad7287aad57c3aa79be 
     22PKG_MD5SUM:=244b16b2a38c70e47130c8494b7371b9 
    2323 
    2424PKG_FIXUP = libtool 
    2525 
     
    7878        --with-zlib="$(STAGING_DIR)/usr" \ 
    7979 
    8080CONFIGURE_VARS += \ 
    81         LDFLAGS="$$$$LDFLAGS -lcrypto -lssl -lz" \ 
    8281        CC="$(filter-out ccache,$(TARGET_CC))" 
    8382 
    8483define Build/Configure 
     
    9897        $(CP) $(PKG_INSTALL_DIR)/usr/include/curl $(1)/usr/include/ 
    9998        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.{a,so*} $(1)/usr/lib/ 
    10099        $(CP) $(PKG_BUILD_DIR)/libcurl.pc $(1)/usr/lib/pkgconfig/ 
    101         $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/curl-config 
    102         $(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/libcurl.pc 
     100        $(SED) 's/^Libs.private: //' $(1)/usr/lib/pkgconfig/libcurl.pc 
     101        $(SED) '/-lcurl/N;s/\n//' $(1)/usr/lib/pkgconfig/libcurl.pc 
    103102        ln -sf $(STAGING_DIR)/usr/bin/curl-config $(2)/bin/ 
    104103endef 
    105104 
     
    110109 
    111110define Package/libcurl/install 
    112111        $(INSTALL_DIR) $(1)/usr/lib 
    113         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(1)/usr/lib/ 
     112        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so* $(1)/usr/lib/ 
    114113endef 
    115114 
    116115$(eval $(call BuildPackage,curl)) 
  • patches/100-cross_compile.patch

    diff -durN curl.old/patches/100-cross_compile.patch curl/patches/100-cross_compile.patch
    old new  
    1 --- a/configure 
    2 +++ b/configure 
    3 @@ -25479,16 +25479,6 @@ fi 
    4  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 
    5    fi 
    6   
    7 -  if test "$OPENSSL_ENABLED" = "1"; then 
    8 -    if test -n "$LIB_OPENSSL"; then 
    9 - 
    10 -       LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" 
    11 -       export LD_LIBRARY_PATH 
    12 -       { $as_echo "$as_me:$LINENO: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5 
    13 -$as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;} 
    14 -    fi 
    15 -  fi 
    16 - 
    17  fi 
    18   
    19   
    20 @@ -26486,19 +26476,6 @@ else 
    21  fi 
    22   
    23   
    24 -      if test "x$USE_GNUTLS" = "xyes"; then 
    25 -        { $as_echo "$as_me:$LINENO: detected GnuTLS version $version" >&5 
    26 -$as_echo "$as_me: detected GnuTLS version $version" >&6;} 
    27 - 
    28 -        if test -n "$gtlslib"; then 
    29 - 
    30 -          LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib" 
    31 -          export LD_LIBRARY_PATH 
    32 -          { $as_echo "$as_me:$LINENO: Added $gtlslib to LD_LIBRARY_PATH" >&5 
    33 -$as_echo "$as_me: Added $gtlslib to LD_LIBRARY_PATH" >&6;} 
    34 -        fi 
    35 -      fi 
    36 - 
    37      fi 
    38   
    39    fi 
    40 --- a/configure.ac 
    41 +++ b/configure.ac 
    42 @@ -1332,18 +1332,6 @@ if test X"$OPT_SSL" != Xno; then 
    43      ]) 
    44    fi 
    45   
    46 -  if test "$OPENSSL_ENABLED" = "1"; then 
    47 -    if test -n "$LIB_OPENSSL"; then 
    48 -       dnl when the ssl shared libs were found in a path that the run-time 
    49 -       dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH 
    50 -       dnl to prevent further configure tests to fail due to this 
    51 - 
    52 -       LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" 
    53 -       export LD_LIBRARY_PATH 
    54 -       AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH]) 
    55 -    fi 
    56 -  fi 
    57 - 
    58  fi 
    59   
    60  dnl ********************************************************************** 
    61 @@ -1617,21 +1605,6 @@ if test "$OPENSSL_ENABLED" != "1"; then 
    62           CPPFLAGS="$CLEANCPPFLAGS" 
    63         ]) 
    64   
    65 -      if test "x$USE_GNUTLS" = "xyes"; then 
    66 -        AC_MSG_NOTICE([detected GnuTLS version $version]) 
    67 - 
    68 -        if test -n "$gtlslib"; then 
    69 -          dnl when shared libs were found in a path that the run-time 
    70 -          dnl linker doesn't search through, we need to add it to 
    71 -          dnl LD_LIBRARY_PATH to prevent further configure tests to fail 
    72 -          dnl due to this 
    73 - 
    74 -          LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib" 
    75 -          export LD_LIBRARY_PATH 
    76 -          AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH]) 
    77 -        fi 
    78 -      fi 
    79 - 
    80      fi 
    81   
    82    fi dnl GNUTLS not disabled 
  • patches/510-no_sslv2.patch

    diff -durN curl.old/patches/510-no_sslv2.patch curl/patches/510-no_sslv2.patch
    old new  
    11--- a/lib/ssluse.c 
    22+++ b/lib/ssluse.c 
    3 @@ -1384,10 +1384,12 @@ ossl_connect_step1(struct connectdata *c 
    4    case CURL_SSLVERSION_TLSv1: 
     3@@ -1397,10 +1397,12 @@ 
    54     req_method = TLSv1_client_method(); 
     5     use_sni(TRUE); 
    66     break; 
    77+#ifndef OPENSSL_NO_SSL2 
    88   case CURL_SSLVERSION_SSLv2: 
    99     req_method = SSLv2_client_method(); 
    10      sni = FALSE; 
     10     use_sni(FALSE); 
    1111     break; 
    1212+#endif 
    1313   case CURL_SSLVERSION_SSLv3: 
    1414     req_method = SSLv3_client_method(); 
    15      sni = FALSE; 
     15     use_sni(FALSE); 
    1616--- a/src/main.c 
    1717+++ b/src/main.c 
    18 @@ -824,7 +824,9 @@ static void help(void) 
    19  #endif 
    20      " -Y/--speed-limit   Stop transfer if below speed-limit for 'speed-time' secs", 
     18@@ -880,7 +880,9 @@ 
    2119     " -y/--speed-time    Time needed to trig speed-limit abort. Defaults to 30", 
     20     "    --ssl           Try SSL/TLS (FTP, IMAP, POP3, SMTP)", 
     21     "    --ssl-reqd      Require SSL/TLS (FTP, IMAP, POP3, SMTP)", 
    2222+#ifndef OPENSSL_NO_SSL2 
    2323     " -2/--sslv2         Use SSLv2 (SSL)", 
    2424+#endif 
    2525     " -3/--sslv3         Use SSLv3 (SSL)", 
    2626     "    --stderr <file> Where to redirect stderr. - means stdout", 
    2727     "    --tcp-nodelay   Use the TCP_NODELAY option", 
    28 @@ -2228,10 +2230,12 @@ static ParameterError getparameter(char  
     28@@ -2313,10 +2315,12 @@ 
    2929       /* TLS version 1 */ 
    3030       config->ssl_version = CURL_SSLVERSION_TLSv1; 
    3131       break;