strongswan: Do not create any NAT rules when using VTI/GRE

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

diff --git a/lfs/tcl b/lfs/tcl
index a62b4e6b052101953bad19b923a46e70ba27ef99..bb2e3cdadc56c4bd790ba4f26e1afeaf21c94b8e 100644 (file)
--- a/lfs/tcl
+++ b/lfs/tcl
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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,14 +24,14 @@
 
 include Config
 
-VER        = 8.4.13
+VER        = 8.6.6
 
 THISAPP    = tcl$(VER)
 DL_FILE    = $(THISAPP)-src.tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-ifeq "$(LFS_PASS)" "toolchain"
+ifneq "$(ROOT)" ""
 TARGET     = $(DIR_INFO)/$(THISAPP)-tools
 else
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c6b655ad5db095ee73227113220c0523
+$(DL_FILE)_MD5 = 5193aea8107839a79df8ac709552ecb7
 
 install : $(TARGET)
 
@@ -75,18 +75,14 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(LFS_PASS)" "toolchain"
-       cd $(DIR_APP)/unix && ./configure --prefix=/tools --disable-nls
-else
-       cd $(DIR_APP)/unix && ./configure --prefix=/usr --disable-nls
-endif
+       cd $(DIR_APP)/unix && ./configure --prefix=$(PREFIX)
        cd $(DIR_APP)/unix && make $(MAKETUNING)
        cd $(DIR_APP)/unix && make install
-ifeq "$(LFS_PASS)" "toolchain"
+ifneq "$(ROOT)" ""
        cd $(DIR_APP)/unix && make install-private-headers
-       ln -sf tclsh8.4 /tools/bin/tclsh
+       ln -sf tclsh8.6 $(TOOLS_DIR)/bin/tclsh
 else
-       ln -sf tclsh8.4 /usr/bin/tclsh
+       ln -sf tclsh8.6 /usr/bin/tclsh
 endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)