From: Peter Müller <peter.mueller@ipfire.org>
Date: Fri, 27 Jan 2023 00:12:47 +0000 (+0000)
Subject: Revert "ragel: Update to version 7.0.4"
X-Git-Tag: v2.27-core173~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57372934d47b601319bea2fd3a6475ea5080093d;p=ipfire-2.x.git

Revert "ragel: Update to version 7.0.4"

This reverts commit fcc21cadf34588857f96a075de2ce254784fa282.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---

diff --git a/config/rootfiles/common/ragel b/config/rootfiles/common/ragel
index 9c0b469b20..6b16f03d2a 100644
--- a/config/rootfiles/common/ragel
+++ b/config/rootfiles/common/ragel
@@ -11,12 +11,60 @@
 #usr/bin/ragel-ocaml
 #usr/bin/ragel-ruby
 #usr/bin/ragel-rust
+#usr/include/ragel
+#usr/include/ragel/action.h
+#usr/include/ragel/avlbasic.h
+#usr/include/ragel/avlcommon.h
+#usr/include/ragel/avlibasic.h
+#usr/include/ragel/avlikeyless.h
+#usr/include/ragel/avlimap.h
+#usr/include/ragel/avlimel.h
+#usr/include/ragel/avlimelkey.h
+#usr/include/ragel/avliset.h
+#usr/include/ragel/avlitree.h
+#usr/include/ragel/avlkeyless.h
+#usr/include/ragel/avlmap.h
+#usr/include/ragel/avlmel.h
+#usr/include/ragel/avlmelkey.h
+#usr/include/ragel/avlset.h
+#usr/include/ragel/avltree.h
+#usr/include/ragel/bstcommon.h
+#usr/include/ragel/bstmap.h
+#usr/include/ragel/bstset.h
+#usr/include/ragel/bsttable.h
+#usr/include/ragel/bubblesort.h
+#usr/include/ragel/common.h
+#usr/include/ragel/compare.h
+#usr/include/ragel/config.h
+#usr/include/ragel/dlcommon.h
+#usr/include/ragel/dlist.h
+#usr/include/ragel/dlistmel.h
+#usr/include/ragel/dlistval.h
+#usr/include/ragel/dot.h
+#usr/include/ragel/fsmgraph.h
+#usr/include/ragel/gendata.h
+#usr/include/ragel/insertsort.h
+#usr/include/ragel/mergesort.h
+#usr/include/ragel/quicksort.h
+#usr/include/ragel/ragel.h
+#usr/include/ragel/redfsm.h
+#usr/include/ragel/resize.h
+#usr/include/ragel/sbstmap.h
+#usr/include/ragel/sbstset.h
+#usr/include/ragel/sbsttable.h
+#usr/include/ragel/svector.h
+#usr/include/ragel/table.h
+#usr/include/ragel/vector.h
+#usr/lib/libfsm.la
+#usr/lib/libfsm.so
+#usr/lib/libfsm.so.0
+#usr/lib/libfsm.so.0.0.0
 #usr/lib/libragel.la
 #usr/lib/libragel.so
 #usr/lib/libragel.so.0
 #usr/lib/libragel.so.0.0.0
 #usr/share/doc/ragel
-#usr/share/doc/ragel/ragel.vim
+#usr/share/doc/ragel/CREDITS
+#usr/share/doc/ragel/ChangeLog
 #usr/share/man/man1/ragel.1
-#usr/share/out-go.lm
 #usr/share/ragel.lm
diff --git a/lfs/ragel b/lfs/ragel
index ee6f733038..caca459212 100644
--- a/lfs/ragel
+++ b/lfs/ragel
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
+# 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,7 +24,7 @@
 
 include Config
 
-VER        = 7.0.4
+VER        = 7.0.0.11
 
 THISAPP    = ragel-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = a8fcf7a6c772320ec9183100573a2238c118a8b4ef3b40c9c673a2898d5fd1e7707a773b8712d8e7bfdd22d62a64ba24174748d9a899eb1481e2c56a2ac48e9f
+$(DL_FILE)_BLAKE2 = d967251d4eeb06a0fb2c5f3bf398dbc53fe4499b092113bb948f03b50f9e468cf510b2196055544ae65a47559ad5baed57238ac92c8aae5300873716ddd070b1
 
 install : $(TARGET)
 
@@ -70,11 +70,8 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./autogen.sh
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
-		--with-colm=/usr \
-		--disable-manual \
 		--disable-static
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install