Update for numerous lfs-files: removed deprecated configure options

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

diff --git a/lfs/curl b/lfs/curl
index 5df72b809317b175b5e10206a64dd0d93e9b3f61..eb2354485b2525cb5519f7c3896e6b5caf2fd272 100644 (file)
--- a/lfs/curl
+++ b/lfs/curl
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 7.19.4
+VER        = 7.49.1
 
 THISAPP    = curl-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.lzma
 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 = 2734167c1e5f7ce6be99b75d2d371d85
+$(DL_FILE)_MD5 = ae5e5e395da413d1fa0864e1d0a3fa57
 
 install : $(TARGET)
 
@@ -69,11 +69,16 @@ $(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 axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --disable-ipv6 \
+               --disable-static \
+               --enable-threaded-resolver \
+               --with-ca-bundle=/etc/ssl/certs/ca-bundle.crt
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        # Create symlink to new curl lib for old binaries
-       ln -s libcurl.so.4 /usr/lib/libcurl.so.3
+       ln -sf libcurl.so.4 /usr/lib/libcurl.so.3
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)