* [PATCH v2 1/2] colm: Update to version 0.14.7
@ 2023-02-07 21:52 Adolf Belka
2023-02-07 21:52 ` [PATCH v2 2/2] ragel: Update to version 7.0.4 Adolf Belka
0 siblings, 1 reply; 2+ messages in thread
From: Adolf Belka @ 2023-02-07 21:52 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 7042 bytes --]
- Update from version 0.13.0.6 to 0.14.7
- Update of rootfile
- patch from colm commit fc61ecb required to fix bug of make looking for static and
dynamic libs even if one of them was disabled
- Changelog is not available in source tarball or on website etc. Changes have to be
reviewed by the commits https://github.com/adrian-thurston/colm/commits/0.14.7
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/common/colm | 69 ++++++++++++++++++-
lfs/colm | 9 ++-
...hared-and-link-libcolm-appropriately.patch | 44 ++++++++++++
3 files changed, 118 insertions(+), 4 deletions(-)
create mode 100644 src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch
diff --git a/config/rootfiles/common/colm b/config/rootfiles/common/colm
index 7f0d22396..a3ad4bcdd 100644
--- a/config/rootfiles/common/colm
+++ b/config/rootfiles/common/colm
@@ -1,7 +1,48 @@
#usr/bin/colm
+#usr/bin/colm-wrap
+#usr/include/aapl
+#usr/include/aapl/astring.h
+#usr/include/aapl/avlbasic.h
+#usr/include/aapl/avlcommon.h
+#usr/include/aapl/avlibasic.h
+#usr/include/aapl/avlikeyless.h
+#usr/include/aapl/avlimap.h
+#usr/include/aapl/avlimel.h
+#usr/include/aapl/avlimelkey.h
+#usr/include/aapl/avliset.h
+#usr/include/aapl/avlitree.h
+#usr/include/aapl/avlkeyless.h
+#usr/include/aapl/avlmap.h
+#usr/include/aapl/avlmel.h
+#usr/include/aapl/avlmelkey.h
+#usr/include/aapl/avlset.h
+#usr/include/aapl/avltree.h
+#usr/include/aapl/bstcommon.h
+#usr/include/aapl/bstmap.h
+#usr/include/aapl/bstset.h
+#usr/include/aapl/bsttable.h
+#usr/include/aapl/bubblesort.h
+#usr/include/aapl/buffer.h
+#usr/include/aapl/compare.h
+#usr/include/aapl/dlcommon.h
+#usr/include/aapl/dlist.h
+#usr/include/aapl/dlistmel.h
+#usr/include/aapl/dlistval.h
+#usr/include/aapl/insertsort.h
+#usr/include/aapl/mergesort.h
+#usr/include/aapl/quicksort.h
+#usr/include/aapl/resize.h
+#usr/include/aapl/rope.h
+#usr/include/aapl/sbstmap.h
+#usr/include/aapl/sbstset.h
+#usr/include/aapl/sbsttable.h
+#usr/include/aapl/svector.h
+#usr/include/aapl/table.h
+#usr/include/aapl/vector.h
#usr/include/colm
#usr/include/colm/bytecode.h
#usr/include/colm/colm.h
+#usr/include/colm/colmex.h
#usr/include/colm/config.h
#usr/include/colm/debug.h
#usr/include/colm/defs.h
@@ -14,8 +55,34 @@
#usr/include/colm/struct.h
#usr/include/colm/tree.h
#usr/include/colm/type.h
-#usr/lib/libcolm-0.13.0.6.so
+#usr/include/libfsm
+#usr/include/libfsm/action.h
+#usr/include/libfsm/asm.h
+#usr/include/libfsm/common.h
+#usr/include/libfsm/dot.h
+#usr/include/libfsm/fsmgraph.h
+#usr/include/libfsm/gendata.h
+#usr/include/libfsm/ragel.h
+#usr/include/libfsm/redfsm.h
+#usr/lib/libcolm-0.14.7.so
#usr/lib/libcolm.la
#usr/lib/libcolm.so
+#usr/lib/libfsm-0.14.7.so
+#usr/lib/libfsm.la
+#usr/lib/libfsm.so
#usr/share/doc/colm
#usr/share/doc/colm/colm.vim
+#usr/share/ril.lm
+#usr/share/rlhc-c.lm
+#usr/share/rlhc-crack.lm
+#usr/share/rlhc-csharp.lm
+#usr/share/rlhc-d.lm
+#usr/share/rlhc-go.lm
+#usr/share/rlhc-java.lm
+#usr/share/rlhc-js.lm
+#usr/share/rlhc-julia.lm
+#usr/share/rlhc-main.lm
+#usr/share/rlhc-ocaml.lm
+#usr/share/rlhc-ruby.lm
+#usr/share/rlhc-rust.lm
+#usr/share/runtests
diff --git a/lfs/colm b/lfs/colm
index 5e118336e..4a90f78bd 100644
--- a/lfs/colm
+++ b/lfs/colm
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 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,7 +24,7 @@
include Config
-VER = 0.13.0.6
+VER = 0.14.7
THISAPP = colm-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = e5b00bc276fa3414cc9ec557a6e4ca93194f86cd6b3b1ad11611352962da1ef68aa1acd4aa62d47495ba04313dcc52e2a17588fefabf51572d19826c7bb70fe8
+$(DL_FILE)_BLAKE2 = c8be14001e8dc3340f5c55fbf8140b86237ec9462699e417f618cf44c759307eda0ede9f7a9ef897f5b8bc51d1fdf8b7360872a30b4cf07ba8191e405940030c
install : $(TARGET)
@@ -71,8 +71,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
$(UPDATE_AUTOMAKE)
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch
+ cd $(DIR_APP) && autoreconf
cd $(DIR_APP) && ./configure \
--prefix=/usr \
+ --disable-manual \
--disable-static
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch b/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch
new file mode 100644
index 000000000..966de916d
--- /dev/null
+++ b/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch
@@ -0,0 +1,44 @@
+diff -Naur colm-0.14.7.orig/configure.ac colm-0.14.7/configure.ac
+--- colm-0.14.7.orig/configure.ac 2021-02-10 07:04:55.000000000 +0100
++++ colm-0.14.7/configure.ac 2023-02-07 17:35:08.462977144 +0100
+@@ -45,6 +45,7 @@
+ AC_CHECK_TOOL(AR, ar)
+ AC_PROG_RANLIB
+ AC_PROG_LIBTOOL
++
+ SED_SUBST=["\
+ -e 's|@CXX@|${CXX}|g' \
+ -e 's|@CC@|${CC}|g' \
+@@ -424,6 +425,13 @@
+ echo "#define VERSION \"$VERSION\"" > src/version.h
+ echo "#define PUBDATE \"$PUBDATE\"" >> src/version.h
+
++if test "x$enable_static" = "xyes"; then
++ AC_DEFINE([LINK_STATIC], [1], [Link static lib when invoking C compile and link])
++fi
++
++if test "x$enable_shared" = "xyes"; then
++ AC_DEFINE([LINK_SHARED], [1], [Link shared lib when invoking C compile and link])
++fi
+
+ dnl
+ dnl Wrap up.
+diff -Naur colm-0.14.7.orig/src/main.cc colm-0.14.7/src/main.cc
+--- colm-0.14.7.orig/src/main.cc 2020-12-24 00:37:24.000000000 +0100
++++ colm-0.14.7/src/main.cc 2023-02-07 17:36:51.313669629 +0100
+@@ -485,7 +485,14 @@
+ " -I%s/../aapl"
+ " -I%s/include"
+ " -L%s"
+- " %s/libcolm.a",
++#if defined(LINK_STATIC)
++ " %s/libcolm.a",
++#elif defined(LINK_SHARED)
++ " %s/libcolm.so",
++#else
++# error "must enabled at least one of shared or static libs"
++#endif
++
+ binaryFn, intermedFn, srcLocation,
+ srcLocation, location, location );
+ }
--
2.39.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH v2 2/2] ragel: Update to version 7.0.4
2023-02-07 21:52 [PATCH v2 1/2] colm: Update to version 0.14.7 Adolf Belka
@ 2023-02-07 21:52 ` Adolf Belka
0 siblings, 0 replies; 2+ messages in thread
From: Adolf Belka @ 2023-02-07 21:52 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4441 bytes --]
- 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 <adolf.belka(a)ipfire.org>
---
config/rootfiles/common/ragel | 52 ++---------------------------------
lfs/ragel | 8 ++++--
2 files changed, 7 insertions(+), 53 deletions(-)
diff --git a/config/rootfiles/common/ragel b/config/rootfiles/common/ragel
index 6b16f03d2..9c0b469b2 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 caca45921..b9b99b09f 100644
--- a/lfs/ragel
+++ b/lfs/ragel
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 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,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 = d96444f6b8dc356b9effa6c5032952ffb2526833f90fcb63c7f6c293a73a70ba057995426ba789d237c61dee5e3aa1ab53ec3193bd31c9c4b994193910219d13
install : $(TARGET)
@@ -72,6 +72,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
$(UPDATE_AUTOMAKE)
cd $(DIR_APP) && ./configure \
--prefix=/usr \
+ --with-colm=/usr \
+ --disable-manual \
--disable-static
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
--
2.39.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-07 21:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-07 21:52 [PATCH v2 1/2] colm: Update to version 0.14.7 Adolf Belka
2023-02-07 21:52 ` [PATCH v2 2/2] ragel: Update to version 7.0.4 Adolf Belka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox