From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcel Lorenz <marcel.lorenz@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 1/5] flex: update to 2.6.1
Date: Sat, 03 Sep 2016 10:28:53 +0200
Message-ID: <20160903082857.8746-2-marcel.lorenz@ipfire.org>
In-Reply-To: <20160903082857.8746-1-marcel.lorenz@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6794426121402803350=="
List-Id: <development.lists.ipfire.org>

--===============6794426121402803350==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
 config/rootfiles/common/flex | 24 +++++++++++++++++++-----
 lfs/flex                     | 10 +++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/config/rootfiles/common/flex b/config/rootfiles/common/flex
index 9b97b57..65b5588 100644
--- 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 0c43e4a..3101c86 100644
--- 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(a)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 @@
=20
 include Config
=20
-VER        =3D 2.5.35
+VER        =3D 2.6.1
=20
 THISAPP    =3D flex-$(VER)
-DL_FILE    =3D $(THISAPP).tar.bz2
+DL_FILE    =3D $(THISAPP).tar.xz
 DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 10714e50cea54dc7a227e3eddcd44d57
+$(DL_FILE)_MD5 =3D cd3c86290fc2676a641aefafeb10848a
=20
 install : $(TARGET)
=20
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
=20
 $(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=3D/usr --disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
--=20
2.9.3


--===============6794426121402803350==--