Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

[people/teissler/ipfire-2.x.git] / lfs / curl

diff --git a/lfs/curl b/lfs/curl
index 13c6ea4193a74791087a6cb88cc9151b0f17146d..715d79d07c305e1f80153fbd159ce37d346a8a53 100644 (file)
--- a/lfs/curl
+++ b/lfs/curl
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 7.15.3
+VER        = 7.31.0
 
 THISAPP    = curl-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d71b2ee8febfde2c7dc30a43638ec0d9
+$(DL_FILE)_MD5 = 6f26843f7e3a2fb06e02f68a55efe8c7
 
 install : $(TARGET)
 
@@ -69,9 +69,11 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr --disable-ipv6
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
+       # Create symlink to new curl lib for old binaries
+       ln -sf libcurl.so.4 /usr/lib/libcurl.so.3
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)