Development January 2023

development@lists.ipfire.org

10 participants
60 discussions

[PATCH] ipset: Update to version 7.17
by Adolf Belka 05 Jan '23

05 Jan '23

- Update from version 7.15 to 7.17 - Update of rootfile - Changelog 7.17 - Tests: When verifying comments/timeouts, make sure entries don't expire - Tests: Make sure the internal batches add the correct number of elements - Tests: Verify that hash:net,port,net type can handle 0/0 properly - Makefile: Create LZMA-compressed dist-files (Phil Sutter) 7.16 - Add new ipset_parse_bitmask() function to the library interface - test: Make sure no more than 64 clashing elements can be added to hash:net,iface sets - netfilter: ipset: add tests for the new bitmask feature (Vishwanath Pai) - netfilter: ipset: Update the man page to include netmask/bitmask options (Vishwanath Pai) - netfilter: ipset: Add bitmask support to hash:netnet (Vishwanath Pai) - netfilter: ipset: Add bitmask support to hash:ipport (Vishwanath Pai) - netfilter: ipset: Add bitmask support to hash:ip (Vishwanath Pai) - netfilter: ipset: Add support for new bitmask parameter (Vishwanath Pai) - ipset-translate: allow invoking with a path name (Quentin Armitage) - Fix IPv6 sets nftables translation (Pablo Neira Ayuso) - Fix typo in ipset-translate man page (Bernhard M. Wiedemann) Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/ipset | 2 +- lfs/ipset | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/ipset b/config/rootfiles/common/ipset index 5cea7ad22..f3d9587ba 100644 --- a/config/rootfiles/common/ipset +++ b/config/rootfiles/common/ipset @@ -22,7 +22,7 @@ etc/ipset #usr/lib/libipset.la #usr/lib/libipset.so usr/lib/libipset.so.13 -usr/lib/libipset.so.13.3.0 +usr/lib/libipset.so.13.4.0 #usr/lib/pkgconfig/libipset.pc usr/sbin/ipset #usr/sbin/ipset-translate diff --git a/lfs/ipset b/lfs/ipset index 1dae6f936..f26f0d5de 100644 --- a/lfs/ipset +++ b/lfs/ipset @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 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.15 +VER = 7.17 THISAPP = ipset-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 10acff9741370ad80a2845605be1be4f691e987b271f4dcf1fab3abfe158c63c7d39e6b3453ba7cd361dee3df92f85419cfb70806a71b6806555f6571c70b1ed +$(DL_FILE)_BLAKE2 = 43b74ab7caf5a963787184aa75b6c071388c8d28997681444b72118aba68b843e961b50418c3fa70b451b4cb090ec62940b770abac2156910442115edbf90d41 install : $(TARGET) -- 2.39.0

2 1

[PATCH] iputils: Update to version 20221126
by Adolf Belka 05 Jan '23

05 Jan '23

- Update from version 20210202 to 20221126 - Update of rootfile - none of the removed tools were in the rootfile - Changelog 20221126 * removed tools (issue: #363) - ninfod (commit: 8f0d897, reason: experimental unused protocol) - rarpd (commit: fba7b62, reason: superseded by DHCP protocol) - rdisc (commit: 7447806, reason: superseded by DHCP protocol) * license - use SPDX identifiers for license names * tree - make _GNU_SOURCE mandatory (commit: 2410ed1, PR: #402) * arping - fix: exit 0 if running in deadline mode and we see replies (commit: 854873b, PR: #395) - fix: check correct variable (commit: 8a6a2ce, PR: #395) - man: Mention IPv4 only and ndisc6(8) (commit: 6becbb3) * clockdiff - setcap-setuid.sh: Add cap_sys_nice for clockdiff (commit: 9139397, issue: #326, #422) - document CAP_SYS_NICE requirement (PR: #416) * ping - feature: add option -C to call connect() before sending/receiving - useful when using Path MTU Discovery (commit: 07eca4a, PR: #391) - feature: add option -e to set Identifier field for ICMP ECHO_REQUEST (commit: 43e38f2, PR: #426) - feature: print various debug info on -v (issue: #411) - feature: print config options on -V (PR: #432) - fix: -m (SO_MARK) in 32-bit archs (commit: fecf335, PR: #394, more fixes will come next release) - fix: potential memory leakage on -p option (commit: 626ea66, PR: #409) - fix: socket error reporting (commit: bbe451f, issue: #406) - fix: make ping_rts struct static - fix occasional segfault (commit: 7861af9, issue: #423) - fix: add SA_RESTART to sa_flags - avoid missing output in write on aarch64 (commit: 09f1b37, issue: #424) - security: drop capabilities for IPv4 (commit: 5990843, PR: #400) - print warning on missing '%'-notation (commit: c4b8b44, issue: #398, PR: #405) - man: add "IPV6 LINK-LOCAL DESTINATIONS" section (PR: #405) - man: use "ICMP datagram socket" (PR: #405) * CI - Debian: unstable -> testing (stability) - Ubuntu: xenial -> bionic, groovy -> jammy (EOL) - remove CentOS 8 (EOL, commit: 931504a) * localization - new translations: Georgian (by Temuri Doghonadze) - many updates - 100% translated: Czech, Finnish, Georgian, Korean, Turkish, Ukrainian * tests - don't fail when ip binary missing (issue: #383, PR: #390) 20211215 * removed tools (issue: #363) - tftpd: removing commit: 341975a, PR: #369 replacement: - tftp-hpa (https://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git) - dnsmasq (https://thekelleys.org.uk/dnsmasq/doc.html) - traceroute6: removing commit: a139421, PR: #362 replacement: - mtr (https://www.bitwizard.nl/mtr/) - traceroute (http://traceroute.sourceforge.net/) - tracepath (https://github.com/iputils/iputils/blob/master/tracepath.c) WARNING: More tools (ninfod, rarpd, rdisc) are going to be removed in next release, see issue: #363 * Meson build system - require version 0.40 (due multiple install_dir for custom_target; commit: 65941ab) * arping - fix: ARP protocol field for AX.25 and NETROM (PR: #360) * clockdiff - fix man: remove duplicated word (PR: #384) * ninfod - fix: build with -DNINFOD_MESSAGES=false (commit: a0b3917) - systemd unit: add ProtectHostname, ProtectKernelLogs (PR: #375) * ping - fix: remove 'unsupported IPv6' warning on disabled IPv6 (issue: #293, PR: #370) - fix: ping6 binding to VRF and address (PR: #344) - fix: print reply from Subnet-Router anycast address (issue: #371) - fix: print reply with wrong source with warning (issue: #371) - fix: set mark (SO_MARK) on probe socket (PR: #340) - fix: man: update lowered minimum ping interval (issue: #367) - fix: mark is unsigned int, not signed (PR: #345) * rarpd - systemd unit: add ProtectHostname, ProtectKernelLogs (PR: #375) * rdisc - systemd unit: add ProtectHostname, ProtectKernelLogs (PR: #375) * localization - fix: add missing cs, id, ko languages (commit: be8f704) - new translations: Finnish, Korean - updated translations: German, Japanese, Turkish, Ukrainian * CI - add build with some non-default options (commit: c4a5373) - remove Tumbleweed (not only ocassional bugs: 086de3c, b19df68, but the way how repos are published often breaks using it) - add latest CentOS (currently CentOS 8, commit: 5f3711e) * tests - add -V test for all binaries (commit: 802fade) - make tests optional with -DSKIP_TESTS=true (PR: #359) 20210722 * Meson build system - enable NO_SETCAP_OR_SUID by default * clockdiff - fix missing new line * ping - lower minimal interval for flooding to 2 (issue: #317) - revert f7710a1 ("Add strict pattern matching on response when pattern was provided") to fix broken report of truncated packets (issue: #320, PR: #331) * rdisc - systemd unit: remove PrivateUsers=yes from systemd service file (issue: #314) - systemd unit: support /etc/default/rdisc environment file (for Debian, PR: #356) - systemd unit: Add DynamicUser=yes (PR: #358) - systemd unit: add CAP_NET_ADMIN capability (PR: #351) - Add support for capability/setuid (PR: #347, #348) NOTE: This is strongly discouraged as normal uses could possibly modify routing tables, recommended way is to run it as systemd service which does not require it to be enabled. It's added just for non-systemd users, which should run allow it to run just for dedicated user. - set correct caps in setcap-setuid.sh * traceroute6 - mention -V in usage() (PR: #323) * localization - new translations: Czech (100%), Indonesian (94%) - updated translations: Portuguese (Brazil, 95%), Indonesian (94%), French: (58%), Chinese (Simplified, 53%) - fully translated languages in this release: Czech, Turkish, Ukrainian * CI - migrate from Travis CI to GitHub Actions (PR: #336) - add very basic ping testing (issue: #338, PR: #243) - skip tests on Ubuntu Xenial (commit: 9833cae) - various build.sh improvements * tests - skip tests on disabled IPv6 (commit: f10bfd8) - fix: flood ping test should pass on root (commit: 3dff080) Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/iputils | 8 +++++--- lfs/iputils | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/config/rootfiles/common/iputils b/config/rootfiles/common/iputils index 37e0cb603..83b2e7824 100644 --- a/config/rootfiles/common/iputils +++ b/config/rootfiles/common/iputils @@ -1,14 +1,16 @@ bin/ping -#etc/rc.d/init.d/ninfod.sh #usr/bin/arping #usr/bin/clockdiff usr/bin/ping usr/bin/tracepath -#usr/sbin/ninfod -#usr/sbin/rdisc +#usr/share/locale/cs/LC_MESSAGES/iputils.mo #usr/share/locale/de/LC_MESSAGES/iputils.mo +#usr/share/locale/fi/LC_MESSAGES/iputils.mo #usr/share/locale/fr/LC_MESSAGES/iputils.mo +#usr/share/locale/id/LC_MESSAGES/iputils.mo #usr/share/locale/ja/LC_MESSAGES/iputils.mo +#usr/share/locale/ka/LC_MESSAGES/iputils.mo +#usr/share/locale/ko/LC_MESSAGES/iputils.mo #usr/share/locale/pt_BR/LC_MESSAGES/iputils.mo #usr/share/locale/tr/LC_MESSAGES/iputils.mo #usr/share/locale/uk/LC_MESSAGES/iputils.mo diff --git a/lfs/iputils b/lfs/iputils index 663651e34..d881a0f74 100644 --- a/lfs/iputils +++ b/lfs/iputils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 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 = 20210202 +VER = 20221126 THISAPP = iputils-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 37f3c10ff3918d40fe2eae1e4b19ed711b97c30cd2d682e42f484a11a28ab7c93975a51fbb7a8b1c1d725fc9051ae773bc2e81b9d80a2dd0e6ff55867d54875d +$(DL_FILE)_BLAKE2 = 97bdc49810ce9e517211323e8e8ffd2f2be505704d67533db0e8f296701048b82c61b39062aab4a8fa148b29175636a657c2dcdd65e3a16b1572d2f392b8ecf0 install : $(TARGET) -- 2.39.0

2 1

[PATCH] iw: Update to version 5.19
by Adolf Belka 05 Jan '23

05 Jan '23

- Update from version 5.9 to 5.19 - Update of rootfile not required - Changelog is not avaqilable in the source tarball or on the iw website. Details of changes only available by reviewing all commits between the two versions in the git repository https://git.kernel.org/pub/scm/linux/kernel/git/jberg/iw.git/log/ Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/iw | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/iw b/lfs/iw index 917d7a5e1..46bd8c23c 100644 --- a/lfs/iw +++ b/lfs/iw @@ -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 = 5.9 +VER = 5.19 THISAPP = iw-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = d7abe6c65d408a7570227dbe69fe11e1d72a1f502de21d1fcb7dcff6bfe229804020d5c1ebdda42a3694e31cf87c631faf089746f8df4733b0b1a459c185e2af +$(DL_FILE)_BLAKE2 = 57c14b3be0b171b80abcbc71a45f392115f62cc0c3f8440185cb05b42f7a7c901653969a4d5200878b7ceb7aea356d9cf02e07a9fbb282b34372c23561f4fe0a install : $(TARGET) -- 2.39.0

2 1

[PATCH 01/29] json-c: Update to version 0.16
by Adolf Belka 05 Jan '23

05 Jan '23

- Update from version 0.13.1 to 0.16 - Update of rootfile - json-c moved from building with autotools to building with cmake This required cmake, curl and libarchive to be moved earlier in make.sh than json-c - sobump occurs with this change. Identified 28 addons that are linked to json-c using find-dependencies and added them as additional patches to this patch as a series for shipping with the core update. - Changelog 0.16 (up to commit 66dcdf5, 2022-04-13) Deprecated and removed features: * JSON_C_OBJECT_KEY_IS_CONSTANT is deprecated in favor of JSON_C_OBJECT_ADD_CONSTANT_KEY * Direct access to lh_table and lh_entry structure members is deprecated. Use access functions instead, lh_table_head(), lh_entry_next(), etc... * Drop REFCOUNT_DEBUG code. New features * The 0.16 release introduces no new features Build changes * Add a DISABLE_EXTRA_LIBS option to skip using libbsd * Add a DISABLE_JSON_POINTER option to skip compiling in json_pointer support. Significant changes and bug fixes * Cap string length at INT_MAX to avoid various issues with very long strings. * json_object_deep_copy: fix deep copy of strings containing '\0' * Fix read past end of buffer in the "json_parse" command * Avoid out of memory accesses in the locally provided vasprintf() function (for those platforms that use it) * Handle allocation failure in json_tokener_new_ex * Fix use-after-free in json_tokener_new_ex() in the event of printbuf_new() returning NULL * printbuf_memset(): set gaps to zero - areas within the print buffer which have not been initialized by using printbuf_memset * printbuf: return -1 on invalid arguments (len < 0 or total buffer > INT_MAX) * sprintbuf(): propagate printbuf_memappend errors back to the caller Optimizations * Speed up parsing by replacing ctype functions with simplified, faster non-locale-sensitive ones in json_tokener and json_object_to_json_string. * Neither vertical tab nor formfeed are considered whitespace per the JSON spec * json_object: speed up creation of objects, calloc() -> malloc() + set fields * Avoid needless extra strlen() call in json_c_shallow_copy_default() and json_object_equal() when the object is known to be a json_type_string. Other changes * Validate size arguments in arraylist functions. * Use getrandom() if available; with GRND_NONBLOCK to allow use of json-c very early during boot, such as part of cryptsetup. * Use arc4random() if it's available. * random_seed: on error, continue to next method instead of exiting the process * Close file when unable to read from /dev/urandom in get_dev_random_seed() 0.15 (up to commit 870965e, 2020/07/26) Deprecated and removed features: * Deprecate `array_list_new()` in favor of `array_list_new2()` * Remove the THIS_FUNCTION_IS_DEPRECATED define. * Remove config.h.win32 New features * Add a `JSON_TOKENER_ALLOW_TRAILING_CHARS` flag to allow multiple objects to be parsed even when `JSON_TOKENER_STRICT` is set. * Add `json_object_new_array_ext(int)` and `array_list_new_2(int)` to allow arrays to be allocated with the exact size needed, when known. * Add `json_object_array_shrink()` (and `array_list_shrink()`) and use it in json_tokener to minimize the amount of memory used. * Add a json_parse binary, for use in testing changes (not installed, but available in the apps directory). Build changes * #639/#621 - Add symbol versions to all exported symbols * #508/#634 - Always enable -fPIC to allow use of the json-c static library in other libraries * Build both static and shared libraries at the same time. * #626 - Restore compatibility with cmake 2.8 * #471 - Always create directories with mode 0755, regardless of umask. * #606/#604 - Improve support for OSes like AIX and IBM i, as well as for MINGW32 and old versions of MSVC * #451/#617 - Add a DISABLE_THREAD_LOCAL_STORAGE cmake option to disable the use of thread-local storage. Significant changes and bug fixes * Split the internal json_object structure into several sub-types, one for each json_type (json_object_object, json_object_string, etc...). This improves memory usage and speed, with the benchmark under bench/ report 5.8% faster test time and 6%(max RSS)-12%(peak heap) less memory usage. Memory used just for json_object structures decreased 27%, so use cases with fewer arrays and/or strings would benefit more. * Minimize memory usage in array handling in json_tokener by shrinking arrays to the exact number of elements parsed. On bench/ benchmark: 9% faster test time, 39%(max RSS)-50%(peak heap) less memory usage. Add json_object_array_shrink() and array_list_shrink() functions. * #616 - Parsing of surrogate pairs in unicode escapes now properly handles incremental parsing. * Fix incremental parsing of numbers, especially those with exponents, e.g. so parsing "[0", "e+", "-]" now properly returns an error. Strict mode now rejects missing exponents ("0e"). * Successfully return number objects at the top level even when they are followed by a "-", "." or "e". This makes parsing things like "123-45" behave consistently with things like "123xyz". Other changes * #589 - Detect broken RDRAND during initialization; also, fix segfault in the CPUID check. * #592 - Fix integer overflows to prevert out of bounds write on large input. * Protect against division by zero in linkhash, when created with zero size. * #602 - Fix json_parse_uint64() internal error checking, leaving the retval untouched in more failure cases. * #614 - Prevent truncation when custom double formatters insert extra \0's 0.14 (up to commit 9ed00a6, 2020/04/14) Deprecated and removed features: * bits.h has been removed * lh_abort() has been removed * lh_table_lookup() has been removed, use lh_table_lookup_ex() instead. * Remove TRUE and FALSE defines, use 1 and 0 instead. Build changes: Deprecated and removed features: * bits.h has been removed * lh_abort() has been removed * lh_table_lookup() has been removed, use lh_table_lookup_ex() instead. * Remove TRUE and FALSE defines, use 1 and 0 instead. * autoconf support, including autogen.sh, has been removed. See details about cmake, below. * With the addition of json_tokener_get_parse_end(), access to internal fields of json_tokener, as well as use of many other symbols and types in json_tokener.h, is deprecated now. * The use of Android.configure.mk to build for Android no longer works, and it is unknown how (or if) the new cmake-based build machinery can be used. * Reports of success, or pull requests to correct issues are welcome. Notable improvements and new features Builds and documentation * Build machinery has been switched to CMake. See README.md for details about how to build. * TL;DR: `mkdir build ; cd build ; cmake -DCMAKE_INSTALL_PREFIX=/some/path ../json-c ; make all test install` * To ease the transition, there is a `cmake-configure` wrapper that emulates the old autoconf-based configure script. * This has enabled improvements to the build on Windows system; also all public functions have been fixed to be properly exported. For best results, use Visual Studio 2015 or newer. * The json-c style guide has been updated to specify the use of clang-format, and all code has been reformatted. * Since many lines of code have trivial changes now, when using git blame, be sure to specify -w * Numerous improvements have been made to the documentation including function effects on refcounts, when passing a NULL is safe, and so on. json_tokener changes * Added a json_tokener_get_parse_end() function to replace direct access of tok->char_offset. * The char_offset field, and the rest of the json_tokener structure remain exposed for now, but expect a future release to hide it like is done with json_object_private.h * json_tokener_parse_ex() now accepts a new JSON_TOKENER_VALIDATE_UTF8 flag to validate that input is UTF8. * If validation fails, json_tokener_get_error(tok) will return json_tokener_error_parse_utf8_string (see enum json_tokener_error). Other changes and additions * Add support for unsigned 64-bit integers, uint64_t, to gain one extra bit of magnitude for positive ints. * json_tokener will now parse values up to UINT64_MAX (18446744073709551615) * Existing methods returning int32_t or int64_t will cap out-of-range values at INT32_MAX or INT64_MAX, preserving existing behavior. * The implementation includes the possibility of easily extending this to larger sizes in the future. * A total of 7 new functions were added: * json_object_get_uint64 ( struct json_object const* jso ) * json_object_new_uint64 ( uint64_t i ) * json_object_set_uint64 ( struct json_object* jso, uint64_t new_value ) * json_parse_uint64 ( char const* buf, uint64_t* retval ) * See description of uint64 support, above. * json_tokener_get_parse_end ( struct json_tokener* tok ) * See details under "json_tokener changes", above. * json_object_from_fd_ex ( int fd, int in_depth ) * Allows the max nesting depth to be specified. * json_object_new_null ( ) * Simply returns NULL. Its use is not recommended. * The size of struct json_object has decreased from 96 bytes to 88 bytes. Testing * Many updates were made to test cases, increasing code coverage. * There is now a quick way (JSONC_TEST_TRACE=1) to turn on shell tracing in tests. * To run tests, use `make test`; the old "check" target no longer exists. Significant bug fixes For the full list of issues and pull requests since the previous release, please see issues_closed_for_0.14.md * [Issue #389](https://github.com/json-c/json-c/issues/389): Add an assert to explicitly crash when _ref_count is corrupted, instead of a later "double free" error. * [Issue #407](https://github.com/json-c/json-c/issues/407): fix incorrect casts in calls to ctype functions (isdigit and isspace) so we don't crash when asserts are enabled on certain platforms and characters > 128 are parsed. * [Issue #418](https://github.com/json-c/json-c/issues/418): Fix docs for json_util_from_fd and json_util_from_file to say that they return NULL on failures. * [Issue #422](https://github.com/json-c/json-c/issues/422): json_object.c:set errno in json_object_get_double() when called on a json_type_string object with bad content. * [Issue #453](https://github.com/json-c/json-c/issues/453): Fixed misalignment in JSON serialization when JSON_C_TO_STRING_SPACED and JSON_C_TO_STRING_PRETTY are used together. * [Issue #463](https://github.com/json-c/json-c/issues/463): fix newlocale() call to use LC_NUMERIC_MASK instead of LC_NUMERIC, and remove incorrect comment. * [Issue #486](https://github.com/json-c/json-c/issues/486): append a missing ".0" to negative double values to ensure they are serialized as floating point numbers. * [Issue #488](https://github.com/json-c/json-c/issues/488): use JSON_EXPORT on functions so they are properly exported on Windows. * [Issue #539](https://github.com/json-c/json-c/issues/539): use an internal-only serializer function in json_object_new_double_s() to avoid potential conflicts with user code that uses the json_object_userdata_to_json_string serializer. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/json-c | 11 +++++++---- lfs/json-c | 16 +++++++++------- make.sh | 6 +++--- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/config/rootfiles/common/json-c b/config/rootfiles/common/json-c index 6be4bbe68..58b6916af 100644 --- a/config/rootfiles/common/json-c +++ b/config/rootfiles/common/json-c @@ -1,6 +1,5 @@ #usr/include/json-c #usr/include/json-c/arraylist.h -#usr/include/json-c/bits.h #usr/include/json-c/debug.h #usr/include/json-c/json.h #usr/include/json-c/json_c_version.h @@ -10,12 +9,16 @@ #usr/include/json-c/json_object_iterator.h #usr/include/json-c/json_pointer.h #usr/include/json-c/json_tokener.h +#usr/include/json-c/json_types.h #usr/include/json-c/json_util.h #usr/include/json-c/json_visit.h #usr/include/json-c/linkhash.h #usr/include/json-c/printbuf.h -#usr/lib/libjson-c.la +#usr/lib/cmake/json-c +#usr/lib/cmake/json-c/json-c-config.cmake +#usr/lib/cmake/json-c/json-c-targets-debug.cmake +#usr/lib/cmake/json-c/json-c-targets.cmake #usr/lib/libjson-c.so -usr/lib/libjson-c.so.4 -usr/lib/libjson-c.so.4.0.0 +usr/lib/libjson-c.so.5 +usr/lib/libjson-c.so.5.2.0 #usr/lib/pkgconfig/json-c.pc diff --git a/lfs/json-c b/lfs/json-c index e9be858a6..642afd26a 100644 --- a/lfs/json-c +++ b/lfs/json-c @@ -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.1 +VER = 0.16 THISAPP = json-c-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 +$(DL_FILE)_BLAKE2 = 11457fa39330338c85bfdfb0dd38fc703ad6942e730ba090c9fe017dfb81ef905d7b1bb1c768b9b51f6445a8cf3cf4007d7740be3a9878f8062edc62ba554c66 install : $(TARGET) @@ -73,9 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-static - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && mkdir -pv build + cd $(DIR_APP)/build && cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_STATIC_LIBS=OFF + cd $(DIR_APP)/build && make $(MAKETUNING) + cd $(DIR_APP)/build && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index ae1ebb5af..6488a7738 100755 --- a/make.sh +++ b/make.sh @@ -1178,6 +1178,9 @@ buildipfire() { lfsmake2 expat lfsmake2 libconfig + lfsmake2 curl + lfsmake2 libarchive + lfsmake2 cmake lfsmake2 json-c lfsmake2 tcl lfsmake2 libffi @@ -1208,7 +1211,6 @@ buildipfire() { lfsmake2 libqmi lfsmake2 pam lfsmake2 c-ares - lfsmake2 curl lfsmake2 rust lfsmake2 rust-dissimilar lfsmake2 rust-cfg-if @@ -1325,8 +1327,6 @@ buildipfire() { lfsmake2 libnl-3 lfsmake2 libidn lfsmake2 nasm - lfsmake2 libarchive - lfsmake2 cmake lfsmake2 libjpeg lfsmake2 openjpeg lfsmake2 libexif -- 2.39.0

2 30

[PATCH] libpcap: Update to 1.10.2
by Matthias Fischer 04 Jan '23

04 Jan '23

For details see: https://git.tcpdump.org/libpcap/blob/HEAD:/CHANGES#l42 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/libpcap | 3 ++- lfs/libpcap | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/libpcap b/config/rootfiles/common/libpcap index 514f57558..a3f71b3e6 100644 --- a/config/rootfiles/common/libpcap +++ b/config/rootfiles/common/libpcap @@ -2,6 +2,7 @@ #usr/include/pcap #usr/include/pcap-bpf.h #usr/include/pcap-namedb.h +#usr/include/pcap-util.h #usr/include/pcap.h #usr/include/pcap/bluetooth.h #usr/include/pcap/bpf.h @@ -21,7 +22,7 @@ #usr/lib/libpcap.a usr/lib/libpcap.so usr/lib/libpcap.so.1 -usr/lib/libpcap.so.1.10.1 +usr/lib/libpcap.so.1.10.2 #usr/lib/pkgconfig/libpcap.pc #usr/share/man/man1/pcap-config.1 #usr/share/man/man3/pcap.3pcap diff --git a/lfs/libpcap b/lfs/libpcap index ada120f6f..5293a5a0c 100644 --- a/lfs/libpcap +++ b/lfs/libpcap @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 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.10.1 +VER = 1.10.2 THISAPP = libpcap-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 0ec028e5d026a97b92ba6f23f88daf36b827eee08a752a0162fbabd1b5a2a70141ec403b6ff26dc3eb25ca5c6630c9c2f60f05b33161770da3d5e829c4eecdc6 +$(DL_FILE)_BLAKE2 = f8280c8e12065b4d86e451df8504c834da9c94b25029f0e5c22359d0ce35cf4e3490fa3343d0112209600ea01ffa54249c82c20e2859515884daee759e4a5e9b install : $(TARGET) -- 2.34.1

2 1

[PATCH] tcpdump: Update to 4.99.2
by Matthias Fischer 04 Jan '23

04 Jan '23

For details see: https://git.tcpdump.org/tcpdump/blob/HEAD:/CHANGES#l56 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/tcpdump | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lfs/tcpdump b/lfs/tcpdump index 9c7390037..dd81b7488 100644 --- a/lfs/tcpdump +++ b/lfs/tcpdump @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 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 # @@ -26,7 +26,7 @@ include Config SUMMARY = A Packet Sniffer -VER = 4.99.1 +VER = 4.99.2 THISAPP = tcpdump-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tcpdump -PAK_VER = 13 +PAK_VER = 14 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 0a10fe68afdfe80d3e7e661352fcaf1c47702df27fbed959f52fb0ec81543a1d4ce6b0de16a8b081de48dd43e09a13f5e1f0fb11d7590f92cbff29dc511bea12 +$(DL_FILE)_BLAKE2 = be13fbf493478270c8ebc034a3c1467907a008ce2ed9632a87b7d7b9104b9fda248cd535da7313a1c3d57ca21f324c25593812590b96ec334c474d1ce06f3fd5 install : $(TARGET) -- 2.34.1

2 1

[PATCH] ncurses: Update to 6.4
by Matthias Fischer 04 Jan '23

04 Jan '23

For details see: https://invisible-island.net/ncurses/announce.html#h2-release-notes Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/ncurses | 44 +++++++++++++++++++++++++++++---- lfs/ncurses | 6 ++--- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/config/rootfiles/common/ncurses b/config/rootfiles/common/ncurses index edd73b219..365322b6c 100644 --- a/config/rootfiles/common/ncurses +++ b/config/rootfiles/common/ncurses @@ -34,24 +34,29 @@ usr/bin/tset #usr/lib/libform.so #usr/lib/libformw.so usr/lib/libformw.so.6 -usr/lib/libformw.so.6.3 +usr/lib/libformw.so.6.4 #usr/lib/libmenu.so #usr/lib/libmenuw.so usr/lib/libmenuw.so.6 -usr/lib/libmenuw.so.6.3 +usr/lib/libmenuw.so.6.4 #usr/lib/libncurses++w.a #usr/lib/libncurses.so #usr/lib/libncursesw.so usr/lib/libncursesw.so.6 -usr/lib/libncursesw.so.6.3 +usr/lib/libncursesw.so.6.4 #usr/lib/libpanel.so #usr/lib/libpanelw.so usr/lib/libpanelw.so.6 -usr/lib/libpanelw.so.6.3 +usr/lib/libpanelw.so.6.4 #usr/lib/pkgconfig/form.pc +#usr/lib/pkgconfig/formw.pc #usr/lib/pkgconfig/menu.pc +#usr/lib/pkgconfig/menuw.pc +#usr/lib/pkgconfig/ncurses++w.pc #usr/lib/pkgconfig/ncurses.pc +#usr/lib/pkgconfig/ncursesw.pc #usr/lib/pkgconfig/panel.pc +#usr/lib/pkgconfig/panelw.pc #usr/lib/terminfo #usr/share/man/man1/captoinfo.1m #usr/share/man/man1/clear.1 @@ -1121,6 +1126,7 @@ usr/share/terminfo/E/Eterm-color #usr/share/terminfo/a/adm5 #usr/share/terminfo/a/aepro #usr/share/terminfo/a/aixterm +#usr/share/terminfo/a/aixterm+sl #usr/share/terminfo/a/aixterm-16color #usr/share/terminfo/a/aixterm-m #usr/share/terminfo/a/aixterm-m-old @@ -1173,6 +1179,7 @@ usr/share/terminfo/E/Eterm-color #usr/share/terminfo/a/annarbor4080 usr/share/terminfo/a/ansi #usr/share/terminfo/a/ansi+arrows +#usr/share/terminfo/a/ansi+cpr #usr/share/terminfo/a/ansi+csr #usr/share/terminfo/a/ansi+cup #usr/share/terminfo/a/ansi+enq @@ -1230,6 +1237,7 @@ usr/share/terminfo/a/ansi #usr/share/terminfo/a/ap-vm80 #usr/share/terminfo/a/apl #usr/share/terminfo/a/apollo +#usr/share/terminfo/a/apollo+vt132 #usr/share/terminfo/a/apollo_15P #usr/share/terminfo/a/apollo_19L #usr/share/terminfo/a/apollo_color @@ -1292,6 +1300,7 @@ usr/share/terminfo/a/aterm #usr/share/terminfo/a/att4426 #usr/share/terminfo/a/att500 #usr/share/terminfo/a/att505 +#usr/share/terminfo/a/att505-22 #usr/share/terminfo/a/att505-24 #usr/share/terminfo/a/att510a #usr/share/terminfo/a/att510d @@ -1415,6 +1424,7 @@ usr/share/terminfo/a/aterm #usr/share/terminfo/b/bq300-w #usr/share/terminfo/b/bq300-w-8rv #usr/share/terminfo/b/bq300-w-rv +#usr/share/terminfo/b/bracketed+paste #usr/share/terminfo/b/bsdos-pc #usr/share/terminfo/b/bsdos-pc-m #usr/share/terminfo/b/bsdos-pc-mono @@ -1747,6 +1757,7 @@ usr/share/terminfo/c/cygwin #usr/share/terminfo/d/dec-vt340 #usr/share/terminfo/d/dec-vt400 #usr/share/terminfo/d/decansi +#usr/share/terminfo/d/decid+cpr #usr/share/terminfo/d/decpro #usr/share/terminfo/d/decwriter #usr/share/terminfo/d/delta @@ -2209,6 +2220,7 @@ usr/share/terminfo/j/jfbterm #usr/share/terminfo/k/kermit-am #usr/share/terminfo/k/kitty #usr/share/terminfo/k/kitty+common +#usr/share/terminfo/k/kitty+setal #usr/share/terminfo/k/kitty-direct #usr/share/terminfo/k/klone+acs #usr/share/terminfo/k/klone+color @@ -2348,6 +2360,8 @@ usr/share/terminfo/m/mlterm #usr/share/terminfo/m/modgraph48 #usr/share/terminfo/m/mono-emx #usr/share/terminfo/m/morphos +#usr/share/terminfo/m/mosh +#usr/share/terminfo/m/mosh-256color #usr/share/terminfo/m/mouse-sun usr/share/terminfo/m/mrxvt #usr/share/terminfo/m/mrxvt-256color @@ -2396,8 +2410,10 @@ usr/share/terminfo/m/mrxvt #usr/share/terminfo/n/ncr260intpp #usr/share/terminfo/n/ncr260intwan #usr/share/terminfo/n/ncr260intwpp +#usr/share/terminfo/n/ncr260vp+sl #usr/share/terminfo/n/ncr260vppp #usr/share/terminfo/n/ncr260vpwpp +#usr/share/terminfo/n/ncr260vt+sl #usr/share/terminfo/n/ncr260vt100an #usr/share/terminfo/n/ncr260vt100pp #usr/share/terminfo/n/ncr260vt100wan @@ -2477,6 +2493,7 @@ usr/share/terminfo/m/mrxvt #usr/share/terminfo/n/newscbm33 #usr/share/terminfo/n/next #usr/share/terminfo/n/nextshell +#usr/share/terminfo/n/no+brackets #usr/share/terminfo/n/northstar usr/share/terminfo/n/nsterm #usr/share/terminfo/n/nsterm+7 @@ -2505,6 +2522,7 @@ usr/share/terminfo/n/nsterm #usr/share/terminfo/n/nsterm-build343 #usr/share/terminfo/n/nsterm-build361 #usr/share/terminfo/n/nsterm-build400 +#usr/share/terminfo/n/nsterm-build440 #usr/share/terminfo/n/nsterm-c #usr/share/terminfo/n/nsterm-c-7 #usr/share/terminfo/n/nsterm-c-acs @@ -2852,6 +2870,7 @@ usr/share/terminfo/s/screen-256color #usr/share/terminfo/s/screen-256color-bce #usr/share/terminfo/s/screen-256color-bce-s #usr/share/terminfo/s/screen-256color-s +#usr/share/terminfo/s/screen-base usr/share/terminfo/s/screen-bce #usr/share/terminfo/s/screen-bce.Eterm #usr/share/terminfo/s/screen-bce.gnome @@ -3013,6 +3032,13 @@ usr/share/terminfo/s/sun #usr/share/terminfo/t/tek4207-s #usr/share/terminfo/t/tek4404 #usr/share/terminfo/t/teken +#usr/share/terminfo/t/teken-16color +#usr/share/terminfo/t/teken-2018 +#usr/share/terminfo/t/teken-2022 +#usr/share/terminfo/t/teken-sc +#usr/share/terminfo/t/teken-sc+fkeys +#usr/share/terminfo/t/teken-vt +#usr/share/terminfo/t/teken-vt+fkeys #usr/share/terminfo/t/teleray #usr/share/terminfo/t/teletec usr/share/terminfo/t/teraterm @@ -3073,7 +3099,6 @@ usr/share/terminfo/t/tmux-direct #usr/share/terminfo/t/ts100-sp #usr/share/terminfo/t/ts1p #usr/share/terminfo/t/tt -#usr/share/terminfo/t/tt505-22 #usr/share/terminfo/t/tt52 #usr/share/terminfo/t/tty33 #usr/share/terminfo/t/tty35 @@ -3524,6 +3549,7 @@ usr/share/terminfo/v/vwmterm #usr/share/terminfo/w/wy99gt-w #usr/share/terminfo/w/wy99gt-w-vb #usr/share/terminfo/w/wy99gt-wvb +#usr/share/terminfo/w/wyse+sl #usr/share/terminfo/w/wyse-325 #usr/share/terminfo/w/wyse-75ap #usr/share/terminfo/w/wyse-vp @@ -3627,6 +3653,7 @@ usr/share/terminfo/v/vwmterm #usr/share/terminfo/w/wyse99gt-wvb #usr/share/terminfo/x #usr/share/terminfo/x/x10term +#usr/share/terminfo/x/x10term+sl #usr/share/terminfo/x/x1700 #usr/share/terminfo/x/x1700-lm #usr/share/terminfo/x/x1720 @@ -3641,6 +3668,7 @@ usr/share/terminfo/v/vwmterm #usr/share/terminfo/x/xerox1720 #usr/share/terminfo/x/xerox820 usr/share/terminfo/x/xfce +#usr/share/terminfo/x/xgterm #usr/share/terminfo/x/xiterm #usr/share/terminfo/x/xl83 #usr/share/terminfo/x/xnuppc @@ -3699,14 +3727,17 @@ usr/share/terminfo/x/xterm #usr/share/terminfo/x/xterm+256setaf #usr/share/terminfo/x/xterm+88color #usr/share/terminfo/x/xterm+88color2 +#usr/share/terminfo/x/xterm+acs #usr/share/terminfo/x/xterm+alt+title #usr/share/terminfo/x/xterm+alt1049 +#usr/share/terminfo/x/xterm+alt47 #usr/share/terminfo/x/xterm+app #usr/share/terminfo/x/xterm+direct #usr/share/terminfo/x/xterm+direct16 #usr/share/terminfo/x/xterm+direct2 #usr/share/terminfo/x/xterm+direct256 #usr/share/terminfo/x/xterm+edit +#usr/share/terminfo/x/xterm+focus #usr/share/terminfo/x/xterm+indirect #usr/share/terminfo/x/xterm+kbs #usr/share/terminfo/x/xterm+keypad @@ -3727,6 +3758,7 @@ usr/share/terminfo/x/xterm #usr/share/terminfo/x/xterm+pcfkeys #usr/share/terminfo/x/xterm+r6f2 #usr/share/terminfo/x/xterm+sl +#usr/share/terminfo/x/xterm+sl-alt #usr/share/terminfo/x/xterm+sl-twm #usr/share/terminfo/x/xterm+sm+1002 #usr/share/terminfo/x/xterm+sm+1003 @@ -3761,6 +3793,8 @@ usr/share/terminfo/x/xterm-new usr/share/terminfo/x/xterm-nic usr/share/terminfo/x/xterm-noapp usr/share/terminfo/x/xterm-old +#usr/share/terminfo/x/xterm-p370 +#usr/share/terminfo/x/xterm-p371 usr/share/terminfo/x/xterm-pcolor usr/share/terminfo/x/xterm-r5 usr/share/terminfo/x/xterm-r6 diff --git a/lfs/ncurses b/lfs/ncurses index 63937f04f..bc9bcdf42 100644 --- a/lfs/ncurses +++ b/lfs/ncurses @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 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 = 6.3 +VER = 6.4 THISAPP = ncurses-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -58,7 +58,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = b2c174ac48d587b4d3aa054f04e4ec8bffd8a657a4aff5f090104965c741901e600712c8f8e5e98f3b8a26bc558996a1e14a746f113854832853b855e9d406c3 +$(DL_FILE)_BLAKE2 = 47fd9c2d27f44fa9942552881a471e5067465dbace40bf68b28998dded0556127a1d8662b96de4de4fd76c1c8b98bdae796036553ab4b05ca9f160839d841ba3 install : $(TARGET) -- 2.34.1

2 1

Bugzilla On The Fritz
by Charles Brown 04 Jan '23

04 Jan '23

Getting time-out trying to reach bugzilla https://bugzilla.ipfire.org/ 504 Gateway Time-out The server didn't respond in time.

4 4

Location database update error
by Rob Brewer 04 Jan '23

04 Jan '23

Hi Since early on Saturday I am seeing errors when update-location-database is run from fcron and the update times-out after about 3 minutes. [root@ipfire-dev2 ~]# location verify libloc: loc_database_verify: Error verifying the first signature: error: 0D07207B:asn1 encoding routines:ASN1_get_object:header too long Database successfully verified [root@ipfire-dev2 ~]# location version Sat, 24 Dec 2022 05:20:39 GMT Rob

3 3

[PATCH] linux 5.15.71: Fix rootfile for x86_64
by Matthias Fischer 01 Jan '23

01 Jan '23

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/x86_64/linux | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 518230b39..62037641a 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -17042,6 +17042,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/net/bridge/Makefile #lib/modules/KVER-ipfire/build/net/bridge/netfilter #lib/modules/KVER-ipfire/build/net/bridge/netfilter/Kconfig +#lib/modules/5.15.71-ipfire/build/net/netfilter/Kconfig.orig #lib/modules/KVER-ipfire/build/net/bridge/netfilter/Makefile #lib/modules/KVER-ipfire/build/net/caif #lib/modules/KVER-ipfire/build/net/caif/Kconfig -- 2.34.1

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development January 2023