From fcc21cadf34588857f96a075de2ce254784fa282 Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Mon, 23 Jan 2023 10:06:38 +0100 Subject: [PATCH] ragel: Update to version 7.0.4 - Update from version 7.0.0.11 to 7.0.4 - Update of rootfile - Changelog updated language flags, catch abortcompile throw in non-ragel progs 7.0.3 This version of colm includes a critical fix for big-endian system. Fixes #61. expect colm version 0.14.6 and version bump ragel to 7.0.3 7.0.2 Latest colm includes bugfixes for refcounting, which fixes a ragel issue with includes #58. expect colm 0.14.5 and version bump to 7.0.2 7.0.1 removed accidental commit of ragel/.exrc 7.0.0.12 implemented NfaClear in asm codegen Signed-off-by: Adolf Belka --- config/rootfiles/common/ragel | 52 ++--------------------------------- lfs/ragel | 9 ++++-- 2 files changed, 8 insertions(+), 53 deletions(-) diff --git a/config/rootfiles/common/ragel b/config/rootfiles/common/ragel index 6b16f03d2a..9c0b469b20 100644 --- a/config/rootfiles/common/ragel +++ b/config/rootfiles/common/ragel @@ -11,60 +11,12 @@ #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/CREDITS -#usr/share/doc/ragel/ChangeLog +#usr/share/doc/ragel/ragel.vim #usr/share/man/man1/ragel.1 +#usr/share/out-go.lm #usr/share/ragel.lm diff --git a/lfs/ragel b/lfs/ragel index caca459212..ee6f733038 100644 --- a/lfs/ragel +++ b/lfs/ragel @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2023 IPFire Team # # # # 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.0.11 +VER = 7.0.4 THISAPP = ragel-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = d967251d4eeb06a0fb2c5f3bf398dbc53fe4499b092113bb948f03b50f9e468cf510b2196055544ae65a47559ad5baed57238ac92c8aae5300873716ddd070b1 +$(DL_FILE)_BLAKE2 = a8fcf7a6c772320ec9183100573a2238c118a8b4ef3b40c9c673a2898d5fd1e7707a773b8712d8e7bfdd22d62a64ba24174748d9a899eb1481e2c56a2ac48e9f install : $(TARGET) @@ -70,8 +70,11 @@ $(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