Development January 2023

development@lists.ipfire.org

10 participants
60 discussions

Re: IPFire 2.27 - Core Update 164 is available for testing
by Adolf Belka 28 May '24

28 May '24

Hi All, Just tested out CU164 on my vm testbed system. The update went without any problems. You see the pakfire log status again on the wui page during the update. OpenVPN RW setup ran without any issues. Connection successfully made. IPS has the multiple providers option successfully in place. I eventually found the Force Update of rules button, which was very useful for my vm testbed as it is not running all the time and so the rules were a bit out of date. As far as I can tell everything is working fine on it. No issues detected. I will let it run over the next few days during the daytime and see how things go. Regards, Adolf. On 20/02/2022 18:35, IPFire Project wrote: > IPFire Logo > > there is a new post from Michael Tremer on the IPFire Blog: > > *IPFire 2.27 - Core Update 164 is available for testing* > > It is time to test another release for IPFire: IPFire 2.27 - Core Update 164. It comes with a vastly improved firewall engine, a new kernel and various security and bug fixes. Please help us testing this release and if you would like to support us, please donate. > > Click Here To Read More <https://blog.ipfire.org/post/ipfire-2-27-core-update-164-is-available-for-t…> > > The IPFire Project > Don't like these emails? Unsubscribe <https://people.ipfire.org/unsubscribe>. >

4 8

[PATCH] services.cgi: avoid experimental warnings
by Jon Murphy 09 Feb '23

09 Feb '23

- add single line to code: no warnings 'experimental'; - corrects this issue: https://lists.ipfire.org/pipermail/development/2022-December/015113.html Signed-off-by: Jon Murphy <jon.murphy(a)ipfire.org> --- html/cgi-bin/services.cgi | 1 + 1 file changed, 1 insertion(+) diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 3c0f27f99..0d06ab5fe 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -21,6 +21,7 @@ use strict; use feature "switch"; +no warnings 'experimental'; # enable only the following on debugging purpose #use warnings; #use CGI::Carp 'fatalsToBrowser'; -- 2.30.2

4 5

[PATCH] rust: Update to 1.67.0
by Matthias Fischer 30 Jan '23

30 Jan '23

For details see: https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1670-2023… Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/x86_64/rust | 65 +++++++++++++++-------------- lfs/rust | 12 +++--- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/config/rootfiles/common/x86_64/rust b/config/rootfiles/common/x86_64/rust index 44703b54c..131ae8e28 100644 --- a/config/rootfiles/common/x86_64/rust +++ b/config/rootfiles/common/x86_64/rust @@ -6,10 +6,10 @@ #usr/bin/rustdoc #usr/etc/bash_completion.d #usr/etc/bash_completion.d/cargo -#usr/lib/libLLVM-15-rust-1.65.0-stable.so -#usr/lib/librustc_driver-a21dfa8672cc0cdd.so -#usr/lib/libstd-05737cf45bd30456.so -#usr/lib/libtest-b8b77fa76430964e.so +#usr/lib/libLLVM-15-rust-1.67.0-stable.so +#usr/lib/librustc_driver-2e8cbd5b30733393.so +#usr/lib/libstd-2a15b3cd0948397b.so +#usr/lib/libtest-aa7b246d7b35480c.so #usr/lib/rustlib #usr/lib/rustlib/components #usr/lib/rustlib/etc @@ -34,38 +34,38 @@ #usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/gcc-ld/lld-link #usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/gcc-ld/wasm-ld #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-f14b73d282b0245e.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-f156b880fc73e7f0.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-3fb6d8496dc7d6a6.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-a0d9b33b5161957b.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-272ca28f0b8538d5.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-a1f7b8b60464cc57.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-04ef34c95006bbea.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-2c5b4433ebc1d822.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-b08a86c6880b47a8.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-04cec55a79224c36.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr-098633b847612f3b.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-58adeee671f9ba8e.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-7f13930fcac1846f.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-92361fe3d1d86e03.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-9f873b61fdec9b03.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-1cece883813579b0.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-3395ed33f8a00dbe.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-5d5a85338b125cfb.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-6c93f515800d4657.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-60668236929c1cf5.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-0b6ce813aa5d1704.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-93189d615c3f2d6a.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-c888e061ea504c93.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-6095bf995c453e89.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-3cf84ad460df483a.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-dac6992ac677a0cb.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-f0ffbd64420a69ad.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr-431dd9a65eafb1c5.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-3cd49acf880d0306.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-e8062a7445a64946.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-008ebe2e17c5f91d.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-8f251cec381c549e.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-bfb4a82e06efc4d7.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-9b09c3cec8a5576d.rlib #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.asan.a #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.lsan.a #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.msan.a #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.tsan.a -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-59591a7b405fe395.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-4458c5022988e1ab.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-7d46c016841a97d4.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-4be5790574aecaaa.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-05737cf45bd30456.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-05737cf45bd30456.so -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-384947c6d5f697ff.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-b8b77fa76430964e.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-b8b77fa76430964e.so -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-1c81e618a18568a4.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-02e61e5ec4aa9e8b.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-5a049915d61fbb5d.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-8a30445cf40d74de.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-2fb2d4481260f706.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-6352d71bf8e7bd57.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-2a15b3cd0948397b.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-2a15b3cd0948397b.so +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-aabc21fad3549c98.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-aa7b246d7b35480c.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-aa7b246d7b35480c.so +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-ae66bd5269d6d83c.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-47cbfc4f5b0f6f87.rlib #usr/libexec/cargo-credential-1password #usr/libexec/rust-analyzer-proc-macro-srv #usr/share/cargo @@ -100,6 +100,7 @@ #usr/share/man/man1/cargo-package.1 #usr/share/man/man1/cargo-pkgid.1 #usr/share/man/man1/cargo-publish.1 +#usr/share/man/man1/cargo-remove.1 #usr/share/man/man1/cargo-report.1 #usr/share/man/man1/cargo-run.1 #usr/share/man/man1/cargo-rustc.1 diff --git a/lfs/rust b/lfs/rust index f14648208..d0a200d57 100644 --- a/lfs/rust +++ b/lfs/rust @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 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 = 1.65.0 +VER = 1.67.0 # From https://forge.rust-lang.org/infra/other-installation-methods.html#standalon… @@ -42,10 +42,10 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(THISAPP)-x86_64-unknown-linux-gnu.tar.gz_BLAKE2 = db2dd8518571c5d054502820a0f49483a6cf743ac74747cdb6bb2f3d681b2132de0ed2eb2a5228eaaf7fe737e415cb477764d04d29f565e2bf6cecf6109a468b -$(THISAPP)-aarch64-unknown-linux-gnu.tar.gz_BLAKE2 = 73c0c4d995cf6e81b584b078528035d1fedb12e3c0d0435025945e2ba396850676f7f581ad1e627769122bbba5424591fac734520186b704bff7f7a8ca241385 -$(THISAPP)-arm-unknown-linux-gnueabi.tar.gz_BLAKE2 = 9038b158b2590a8a0a25f72f17ff38d88aff1cb210818a150f24d34dbdff9195f156f21ddccaadf9a3ecd3901161e183b5cb0e15e012f4a26be937a9782e0c6c -$(THISAPP)-riscv64gc-unknown-linux-gnu.tar.gz_BLAKE2 = 76874cfd1e8235eb6d99f75bd9affafa50d1b824664b2edd35c1a5276f51eabaf3f5d5c408070580bbfbdab862e6fe4186f552427e72ac3afa245b2c41c275ae +$(THISAPP)-x86_64-unknown-linux-gnu.tar.gz_BLAKE2 = 3409ed876f430ff22eff792fe9f4a4ca8457f26411def368b8d7fa5b854719c4c1feac5e054d7bccbcc3568bd3601a0e579df8b3bcf5b20c660bb7af4dbbb8f8 +$(THISAPP)-aarch64-unknown-linux-gnu.tar.gz_BLAKE2 = 82c17813fbb4a48451a207dbc7879bd7239e947e249ad24e6e098bd2e250cd8aae79ab37bbc2549cb9ffc3e24ef6e072380bbcaf8a620b02457db24f328d92ea +$(THISAPP)-arm-unknown-linux-gnueabi.tar.gz_BLAKE2 = d099645796f46769e15520b15771bb1886ee040bbee9de00f4983e8fe56c945a9afe1bded33f80c9196354d720ef09588d24468a751a8e2512688fef47a33496 +$(THISAPP)-riscv64gc-unknown-linux-gnu.tar.gz_BLAKE2 = e5b0efa7114840535d5a0934a22510e850b05eb339eab42e561717281da993817df2e0a57082d73ed7898001885e4dbabcce1ebfaec611cf125e51acd5d75e8a install : $(TARGET) -- 2.34.1

1 0

rust: Update to 1.67 - wanted - useful? ;-)
by Matthias Fischer 30 Jan '23

30 Jan '23

Hi, after the last drama I hardly dare to ask, but: are we interested in a 'rust 1.67' update, now that the update to 'rust 1.65' is in 'next'? Changelog: => https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1670-2023… First tests and build (I was curious): only lfs and rootfile updates are needed. *duckandcover*... ;-) Best, Matthias

2 5

[PATCH] pango 1.50.6: Fix for rootfile
by Matthias Fischer 30 Jan '23

30 Jan '23

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/pango | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/common/pango b/config/rootfiles/common/pango index 1ca33d42b..3c0fc91fd 100644 --- a/config/rootfiles/common/pango +++ b/config/rootfiles/common/pango @@ -53,3 +53,4 @@ usr/lib/libpangoft2-1.0.so.0.5000.6 #usr/lib/pkgconfig/pangofc.pc #usr/lib/pkgconfig/pangoft2.pc #usr/lib/pkgconfig/pangoot.pc +#usr/share/man/man1/pango-view.1 -- 2.34.1

2 1

[PATCH] grub 2.06: Fix for rootfile
by Matthias Fischer 30 Jan '23

30 Jan '23

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/x86_64/grub | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/config/rootfiles/common/x86_64/grub b/config/rootfiles/common/x86_64/grub index 35a026391..737fa8ccb 100644 --- a/config/rootfiles/common/x86_64/grub +++ b/config/rootfiles/common/x86_64/grub @@ -1230,3 +1230,29 @@ usr/share/grub/unicode.pf2 #usr/share/locale/vi/LC_MESSAGES/grub.mo #usr/share/locale/zh_CN/LC_MESSAGES/grub.mo #usr/share/locale/zh_TW/LC_MESSAGES/grub.mo +#usr/share/man/man1/grub-editenv.1 +#usr/share/man/man1/grub-file.1 +#usr/share/man/man1/grub-fstest.1 +#usr/share/man/man1/grub-glue-efi.1 +#usr/share/man/man1/grub-kbdcomp.1 +#usr/share/man/man1/grub-menulst2cfg.1 +#usr/share/man/man1/grub-mkfont.1 +#usr/share/man/man1/grub-mkimage.1 +#usr/share/man/man1/grub-mklayout.1 +#usr/share/man/man1/grub-mknetdir.1 +#usr/share/man/man1/grub-mkpasswd-pbkdf2.1 +#usr/share/man/man1/grub-mkrelpath.1 +#usr/share/man/man1/grub-mkrescue.1 +#usr/share/man/man1/grub-mkstandalone.1 +#usr/share/man/man1/grub-render-label.1 +#usr/share/man/man1/grub-script-check.1 +#usr/share/man/man1/grub-syslinux2cfg.1 +#usr/share/man/man8/grub-bios-setup.8 +#usr/share/man/man8/grub-install.8 +#usr/share/man/man8/grub-macbless.8 +#usr/share/man/man8/grub-mkconfig.8 +#usr/share/man/man8/grub-ofpathname.8 +#usr/share/man/man8/grub-probe.8 +#usr/share/man/man8/grub-reboot.8 +#usr/share/man/man8/grub-set-default.8 +#usr/share/man/man8/grub-sparc64-setup.8 -- 2.34.1

2 1

[PATCH] kernel: update to 6.1.8
by Arne Fitzenreiter 30 Jan '23

30 Jan '23

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- lfs/linux | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/linux b/lfs/linux index 490feb8f0..49afc7a2f 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.1.7 +VER = 6.1.8 ARM_PATCHES = 6.1.y-ipfire0 THISAPP = linux-$(VER) @@ -78,7 +78,7 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_BLAKE2 = 13c970a5780fd4ed97a0ff5d7c13e2f5cfebf608199ae94973f3a8a109bb961f1effb45bd61a687f5faaf784a84b4c88b5a4bb75b7a1a943f44cab9b6ad37ce1 +$(DL_FILE)_BLAKE2 = 1eeab95bf09757131031ebeaa3fb66f01626ecfe3b72d0044176613d027ac6643c688a0bb8f4493ae6faa3d3bf0c89fcdff3c28d7b8375e59ed6e8bd6d856e44 arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 3ef9a778c5c41ee8bf2942a48f63b21228a632a2910d2123f01155bbf571592898cffffa61c387a5a6c817b62e458947b4c406c6591b23b5401faa47b020337f install : $(TARGET) -- 2.34.1

2 1

Toolchain Update to GCC 12.2.0 and binutils 2.40
by Michael Tremer 30 Jan '23

30 Jan '23

Hello everyone, this is a patchset that updates the toolchain for IPFire 2. It has been a smooth ride with only three packages needing some extra attention to build this all. So I would say this is safe to be merged. The pre-compiled toolchains have been built and uploaded by me, so this is good to go. However, I do not think that this shoud be a part of Core Update 173 as that is already quite large with a new kernel and so on... Best, -Michael

1 6

[PATCH] libtirpc: Convert from an addon to a core program - fixes Bug 13015
by Adolf Belka 27 Jan '23

27 Jan '23

- libtirpc is required for lsof to work from CU172 onwards. rpc.h is no longer available from glibc. This would normally cause the lsof build to fail but libtirpc as an addon is built before lsof and so is present in the build and lsof is linked to it. When running lsof it fails as the linked libtirpc library is not present unless it has been installed as an addon. - This patch converts the libtirpc lfs from an addon to a core program and moves the rootfile from the packages directory to the common directory. - Tested out on my vm testbed. With CU172 lsof fails to run due to the missing libtirpc With the build based on this patch installed lsof works normally again. - Disabled the static library build in the configure options and updated the rootfile Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Fixes: Bug#13015 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/{packages => common}/libtirpc | 1 - lfs/libtirpc | 18 +++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) rename config/rootfiles/{packages => common}/libtirpc (98%) diff --git a/config/rootfiles/packages/libtirpc b/config/rootfiles/common/libtirpc similarity index 98% rename from config/rootfiles/packages/libtirpc rename to config/rootfiles/common/libtirpc index ed7f33242..7e85a0a25 100644 --- a/config/rootfiles/packages/libtirpc +++ b/config/rootfiles/common/libtirpc @@ -34,7 +34,6 @@ etc/netconfig #usr/include/tirpc/rpcsvc #usr/include/tirpc/rpcsvc/crypt.h #usr/include/tirpc/rpcsvc/crypt.x -#usr/lib/libtirpc.a #usr/lib/libtirpc.la #usr/lib/libtirpc.so usr/lib/libtirpc.so.3 diff --git a/lfs/libtirpc b/lfs/libtirpc index ac897f2eb..09d7b6555 100644 --- a/lfs/libtirpc +++ b/lfs/libtirpc @@ -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 # @@ -33,12 +33,6 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = libtirpc -PAK_VER = 3 - -DEPS = - -SERVICES = CFLAGS += -fcommon @@ -60,9 +54,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) b2 : $(subst %,%_BLAKE2,$(objects)) -dist: - @$(PAK) - ############################################################################### # Downloading, checking, b2sum ############################################################################### @@ -84,7 +75,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-gssapi --disable-ipv6 + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-gssapi \ + --disable-ipv6 \ + --disable-static cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) -- 2.39.1

2 1

[PATCH 1/2] colm: Update to version 0.14.7
by Adolf Belka 27 Jan '23

27 Jan '23

- 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 | 43 ++++++++++++ 3 files changed, 117 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..5a7d22c93 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 = aa2144882a3bc0b7923f86be1d8c45a580a7611254d4815ccf0b69dbc3b0173bac0dd726285272596d2d837ec04a3ccfc741575469e2d7e3a48b101a533dba8f 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) && ./autogen.sh 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..65c7ea30d --- /dev/null +++ b/src/patches/colm-0.14.7-check-enable_static-and-enable_shared-and-link-libcolm-appropriately.patch @@ -0,0 +1,43 @@ +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:13:17.000000000 +0100 ++++ colm-0.14.7/configure.ac 2023-01-22 16:50:04.910666917 +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 2021-02-10 07:13:17.000000000 +0100 ++++ colm-0.14.7/src/main.cc 2023-01-22 16:46:51.225559962 +0100 +@@ -485,7 +485,14 @@ + " -I%s/../aapl" + " -I%s/include" + " -L%s" ++#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.0

2 8

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development January 2023