Changeset 14396


Ignorieren:
Zeitstempel:
07.09.2017 12:43:58 (vor 3 Monaten)
Autor:
er13
Nachricht:

curl:

Ort:
trunk
Dateien:
9 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/CHANGELOG

    r14395 r14396  
    9090    * cifs-utils 6.6 
    9191    * cryptsetup 1.7.0 
    92     * curl 7.54.1 
     92    * curl 7.55.1 
    9393    * davfs2 1.5.2 
    9494    * dbus 1.8.20 
  • trunk/make/curl/Config.in

    r14318 r14396  
    11config FREETZ_PACKAGE_CURL 
    2     bool "Curl 7.54.1 (binary only)" 
     2    bool "Curl 7.55.1 (binary only)" 
    33    default n 
    44    select FREETZ_LIB_libcurl if ! FREETZ_PACKAGE_CURL_STATIC 
  • trunk/make/curl/curl.mk

    r14318 r14396  
    1 $(call PKG_INIT_BIN, 7.54.1) 
     1$(call PKG_INIT_BIN, 7.55.1) 
    22$(PKG)_LIB_VERSION:=4.4.0 
    3 $(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.bz2 
    4 $(PKG)_SOURCE_SHA256:=fdfc4df2d001ee0c44ec071186e770046249263c491fcae48df0e1a3ca8f25a0 
     3$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.xz 
     4$(PKG)_SOURCE_SHA256:=3eafca6e84ecb4af5f35795dee84e643d5428287e88c041122bb8dac18676bb7 
    55$(PKG)_SITE:=http://curl.haxx.se/download 
    66 
  • trunk/make/curl/patches/100-makefile_no_docs.patch

    r14318 r14396  
    11--- Makefile.am 
    22+++ Makefile.am 
    3 @@ -154,8 +154,8 @@ 
    4   
     3@@ -155,7 +155,7 @@ 
    54 bin_SCRIPTS = curl-config 
    65  
    7 -SUBDIRS = lib docs src include 
    8 -DIST_SUBDIRS = $(SUBDIRS) tests packages scripts 
    9 +SUBDIRS = lib      src include 
    10 +DIST_SUBDIRS = $(SUBDIRS)       packages scripts 
     6 SUBDIRS = lib src 
     7-DIST_SUBDIRS = $(SUBDIRS) tests packages scripts include docs 
     8+DIST_SUBDIRS = $(SUBDIRS)       packages scripts include 
    119  
    1210 pkgconfigdir = $(libdir)/pkgconfig 
    1311 pkgconfig_DATA = libcurl.pc 
    14 @@ -275,12 +275,12 @@ 
     12@@ -275,14 +275,14 @@ 
    1513 # We extend the standard install with a custom hook: 
    1614 install-data-hook: 
    1715    cd include && $(MAKE) install 
    1816-   cd docs && $(MAKE) install 
     17-   cd docs/libcurl && $(MAKE) install 
    1918+#  cd docs && $(MAKE) install 
     19+#  cd docs/libcurl && $(MAKE) install 
    2020  
    2121 # We extend the standard uninstall with a custom hook: 
     
    2323    cd include && $(MAKE) uninstall 
    2424-   cd docs && $(MAKE) uninstall 
     25-   cd docs/libcurl && $(MAKE) uninstall 
    2526+#  cd docs && $(MAKE) uninstall 
     27+#  cd docs/libcurl && $(MAKE) uninstall 
    2628  
    2729 ca-bundle: lib/mk-ca-bundle.pl 
     
    2931--- Makefile.in 
    3032+++ Makefile.in 
    31 @@ -622,8 +622,8 @@ 
    32   $(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ) 
     33@@ -625,7 +625,7 @@ 
    3334  
    3435 bin_SCRIPTS = curl-config 
    35 -SUBDIRS = lib docs src include 
    36 -DIST_SUBDIRS = $(SUBDIRS) tests packages scripts 
    37 +SUBDIRS = lib      src include 
    38 +DIST_SUBDIRS = $(SUBDIRS)       packages scripts 
     36 SUBDIRS = lib src 
     37-DIST_SUBDIRS = $(SUBDIRS) tests packages scripts include docs 
     38+DIST_SUBDIRS = $(SUBDIRS)       packages scripts include 
    3939 pkgconfigdir = $(libdir)/pkgconfig 
    4040 pkgconfig_DATA = libcurl.pc 
    4141 LIB_VAUTH_CFILES = vauth/vauth.c vauth/cleartext.c vauth/cram.c         \ 
    42 @@ -1429,12 +1429,12 @@ 
     42@@ -1431,14 +1431,14 @@ 
    4343 # We extend the standard install with a custom hook: 
    4444 install-data-hook: 
    4545    cd include && $(MAKE) install 
    4646-   cd docs && $(MAKE) install 
     47-   cd docs/libcurl && $(MAKE) install 
    4748+#  cd docs && $(MAKE) install 
     49+#  cd docs/libcurl && $(MAKE) install 
    4850  
    4951 # We extend the standard uninstall with a custom hook: 
     
    5153    cd include && $(MAKE) uninstall 
    5254-   cd docs && $(MAKE) uninstall 
     55-   cd docs/libcurl && $(MAKE) uninstall 
    5356+#  cd docs && $(MAKE) uninstall 
     57+#  cd docs/libcurl && $(MAKE) uninstall 
    5458  
    5559 ca-bundle: lib/mk-ca-bundle.pl 
  • trunk/make/curl/patches/101-cross_compile_writable_argv.patch

    r14318 r14396  
    11--- configure 
    22+++ configure 
    3 @@ -22176,7 +22176,9 @@ 
     3@@ -22228,7 +22228,9 @@ 
    44 $as_echo_n "checking if argv can be written to... " >&6; } 
    55 if test "$cross_compiling" = yes; then : 
  • trunk/make/curl/patches/102-binary_static.patch

    r14247 r14396  
    11--- src/Makefile.in 
    22+++ src/Makefile.in 
    3 @@ -225,7 +225,7 @@ 
     3@@ -224,7 +224,7 @@ 
    44 @USE_EXPLICIT_LIB_DEPS_TRUE@   $(top_builddir)/lib/libcurl.la 
    55 curl_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ 
  • trunk/make/curl/patches/103-no_manual_compile_fix.patch

    r14318 r14396  
    11--- src/tool_operate.c 
    22+++ src/tool_operate.c 
    3 @@ -2010,9 +2010,11 @@ 
     3@@ -2022,9 +2022,11 @@ 
    44       /* Check if we were asked for the help */ 
    55       if(res == PARAM_HELP_REQUESTED) 
  • trunk/make/curl/patches/110-gnu_source__reentrant.patch

    r14318 r14396  
    11--- configure 
    22+++ configure 
    3 @@ -3081,6 +3081,24 @@ 
     3@@ -3084,6 +3084,24 @@ 
    44 ## Main body of script. ## 
    55 ## -------------------- ## 
  • trunk/make/curl/patches/130-CPPFLAGS_as_CFLAGS.patch

    r14318 r14396  
    11--- configure 
    22+++ configure 
    3 @@ -4240,13 +4240,16 @@ 
     3@@ -4267,13 +4267,16 @@ 
    44   for xc_word in $CFLAGS; do 
    55     case "$xc_word" in 
     
    2121       -rpath*) 
    2222         xc_bad_var_cflags=yes 
    23 @@ -41372,13 +41375,16 @@ 
     23@@ -41422,13 +41425,16 @@ 
    2424   for xc_word in $CFLAGS; do 
    2525     case "$xc_word" in 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.