flex: update to 2.6.1

Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/flex b/config/rootfiles/common/flex
index 9b97b57f7921c04bd6f7cff6bad90779324c2f46..65b558834ccd8417b81b551da50ce7b471e3d30a 100644 (file)
--- a/config/rootfiles/common/flex
+++ b/config/rootfiles/common/flex
@@ -1,11 +1,25 @@
 #usr/bin/flex
+#usr/bin/flex++
 #usr/bin/lex
 #usr/include/FlexLexer.h
-#usr/info/dir
-#usr/info/flex.info
-#usr/info/flex.info-1
-#usr/info/flex.info-2
 #usr/lib/libfl.a
+#usr/lib/libfl.la
+#usr/lib/libfl.so
+usr/lib/libfl.so.2
+usr/lib/libfl.so.2.0.0
 #usr/lib/libfl_pic.a
+#usr/lib/libfl_pic.la
+#usr/lib/libfl_pic.so
+usr/lib/libfl_pic.so.2
+usr/lib/libfl_pic.so.2.0.0
 #usr/lib/libl.a
-#usr/man/man1/flex.1
+#usr/share/doc/flex
+#usr/share/doc/flex/AUTHORS
+#usr/share/doc/flex/COPYING
+#usr/share/doc/flex/NEWS
+#usr/share/doc/flex/ONEWS
+#usr/share/doc/flex/README
+#usr/share/info/flex.info
+#usr/share/info/flex.info-1
+#usr/share/info/flex.info-2
+#usr/share/man/man1/flex.1

diff --git a/lfs/flex b/lfs/flex
index 0c43e4acdfa9f35583cc45f6dc0c4ab3d38fed65..3101c86a169f21d6f7698fdf4d0bd5fa31ff58bf 100644 (file)
--- a/lfs/flex
+++ b/lfs/flex
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2016 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,10 +24,10 @@
 
 include Config
 
-VER        = 2.5.35
+VER        = 2.6.1
 
 THISAPP    = flex-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 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 = 10714e50cea54dc7a227e3eddcd44d57
+$(DL_FILE)_MD5 = cd3c86290fc2676a641aefafeb10848a
 
 install : $(TARGET)
 
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install