Update for numerous lfs-files: removed deprecated configure options

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

diff --git a/lfs/curl b/lfs/curl
index bf014c55a59e3c9db03316052cfb22f70eae4028..eb2354485b2525cb5519f7c3896e6b5caf2fd272 100644 (file)
--- a/lfs/curl
+++ b/lfs/curl
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,10 +24,10 @@
 
 include Config
 
-VER        = 7.15.3
+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)
@@ -42,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d71b2ee8febfde2c7dc30a43638ec0d9
+$(DL_FILE)_MD5 = ae5e5e395da413d1fa0864e1d0a3fa57
 
 install : $(TARGET)
 
@@ -71,9 +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 -sf libcurl.so.4 /usr/lib/libcurl.so.3
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)