[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dcd828666ae3b6df8d88579a930c7f90f80dc707
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via dcd828666ae3b6df8d88579a930c7f90f80dc707 (commit) via c2cd03024f145375b8e9628fb0bb0a5e6b81e544 (commit) via 5702c62b11a2ea87b1bf254f30fb7c5e8de12eba (commit) via b3d87fa3ea167bb759814b78799b36a79df3b58a (commit) via a070e76010da7ffdec78b85f0db76f6f3470eabb (commit) from 7c180a78545f228bf5c05b6a9db4e10e086c6d46 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit dcd828666ae3b6df8d88579a930c7f90f80dc707 Author: Adolf Belka adolf.belka@ipfire.org Date: Tue Sep 24 12:33:36 2024 +0200
dnsdist: Update to version 1.9.6
- Update from version 1.9.4 to 1.9.6 - Tested building on riscv64 and it built without issues and rootfile is sam as for x86_64 & aarch64. So supported architectures has been removed and dnsdist is available on all three architectures. - Update of rootfile not required - Changelog 1.9.6 New Features Add support for a callback when a new tickets key is added References: pull request 14449 Improvements Make the logging functions available to all Lua environments References: pull request 14438 Handle Quiche >= 0.22.0 References: pull request 14450 Don’t include openssl/engine.h if it’s not going to be used (Sander Hoentjen) References: pull request 14452 Bug Fixes Dedup Prometheus help and type lines for custom metrics with labels¶ References: #14395, pull request 14439 Fix a race in the XSK/AF_XDP backend handling code References: pull request 14436 dns.cc: use pdns::views::UnsignedCharView References: pull request 14437 1.9.5 New Features Add a Lua FFI function to set proxy protocol values References: pull request 14338 Add Lua FFI bindings to generate SVC responses References: pull request 14339 Bug Fixes Use the correct source IP for outgoing QUIC datagrams References: pull request 14166 Reply to HTTP/2 PING frames immediately References: pull request 14163 Log the correct amount of bytes sent for DoH w/ nghttp2 References: pull request 14332 Prevent a race when calling registerWebHandler at runtime References: pull request 14170 Enforce a maximum number of HTTP request fields and a maximum HTTP request line size References: pull request 14333 Fix a race condition with custom Lua web handlers References: pull request 14342 Syslog should be enabled by default References: pull request 14331 Fix a warning when compiling the unit tests without XSK¶ References: pull request 14334 autoconf: allow prerelease systemd versions (Chris Hofstaedtler) References: pull request 14335 Edit the systemd unit file, CAP_BPF is no longer enough References: #14279, pull request 14336 Fix ‘Error creating TCP worker’ error message References: pull request 14337
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c2cd03024f145375b8e9628fb0bb0a5e6b81e544 Author: Adolf Belka adolf.belka@ipfire.org Date: Tue Sep 24 11:43:01 2024 +0200
miniupnpc: Required for build of transmission to replace bundled version
- miniupnpc is required for the build of transmiossion but the bundled version was not working properly with version 4.0.6 and we prefer to not use bundled versions. - Only used for the build so rootfile is 100% commented out. No miniupnpc installed on IPFire.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5702c62b11a2ea87b1bf254f30fb7c5e8de12eba Author: Adolf Belka adolf.belka@ipfire.org Date: Tue Sep 24 11:43:00 2024 +0200
transmission: Update to version 4.0.6
- Update from version 4.0.5 to 4.0.6 - Update of rootfile not required - Bundled miniupnpc not working with build of 4.0.6 As we prefer not to use bundled packages where possible, this patch set builds miniupnpc prior to transmission. As miniupnpc is only required for the build of transmission, nothing is installed from miniupnpc. - miniupnpc-2.2.8 has a problem with transmission and needs a patch to fix it. Added into the transmission lfs file - Changelog 4.0.6 All Platforms Improved parsing HTTP tracker announce response. (#6223) Fixed 4.0.0 bug that caused some user scripts to have an invalid TR_TORRENT_TRACKERS environment variable. (#6434) Fixed 4.0.0 bug where alt-speed-enabled had no effect in settings.json. (#6483) Fixed 4.0.0 bug where the GTK client's "Use authentication" option was not saved between's sessions. (#6514) Fixed 4.0.0 bug where the filename for single-file torrents aren't sanitized. (#6846) macOS Client Fix: Sparkle support for handling beta version updates. (#5263) Fixed app unable to start when having many torrents and TimeMachine enabled. (#6523) Fix: Sparkle Version Comparator. (#6623) Qt Client Fixed 4.0.0 bug where piece size description text and slider state in torrent creation dialog are not always up-to-date. (#6516) GTK Client Fixed build when compiling with GTKMM 4. (#6393) Added developer name to metainfo files. (#6598) Added the launchable desktop-id to metainfo files. (#6779) Fixed build when compiling on BSD. (#6812) Web Client Fixed a 4.0.0 bug where the infinite ratio symbol was displayed incorrectly in the WebUI. (#6491, #6500) Fixed layout issue in speed display. (#6570) General UI improvement related to filterbar and fixes download/upload speed info wrap. (#6761) Daemon Fixed a couple of logging issues. (#6463) Everything Else Updated flatpak release metainfo. (#6357) Fixed libtransmission build on very old cmake versions. (#6418) UTP peer connections follow user-defined speed limits better now. (#6551) Only use a single concurrent queue for timeMachineExclude instead of one queue per torrent (#6523). (#6558) Fixed 4.0.5 bug where svg and png icons in the WebUI might not be displayed. (#6563) Fixed 4.0.0 bug where alt-speed-enabled had no effect in settings.json. (#6564) Fixed 4.0.0 bugs where some RPC methods don't put torrents in recently-active anymore. (#6565) Improved parsing HTTP tracker announce response. (#6567) Fixed compatibility with clang-format 18. (#6690) Fixed build when compiling with mbedtls 3.x . (#6823)
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b3d87fa3ea167bb759814b78799b36a79df3b58a Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Sep 24 10:01:44 2024 +0000
core190: Ship Compress::Raw::Zlib
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a070e76010da7ffdec78b85f0db76f6f3470eabb Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Tue Sep 24 10:30:54 2024 +0200
Ship Compress/Raw/Zlib.pm
This is needed for the captive portal. This was maybe caused by 008eca2c2f2a11739a70c754a367e7a5086773da .
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/miniupnpc | 19 ++++++++++++ config/rootfiles/common/perl | 2 +- config/rootfiles/core/190/filelists/files | 1 + lfs/dnsdist | 10 +++---- lfs/{libpipeline => miniupnpc} | 13 ++++----- lfs/transmission | 7 +++-- make.sh | 1 + ...ransmission-4.0.6-fix_for_miniupnpc-2.2.8.patch | 34 ++++++++++++++++++++++ 8 files changed, 69 insertions(+), 18 deletions(-) create mode 100644 config/rootfiles/common/miniupnpc copy lfs/{libpipeline => miniupnpc} (89%) create mode 100644 src/patches/transmission-4.0.6-fix_for_miniupnpc-2.2.8.patch
Difference in files: diff --git a/config/rootfiles/common/miniupnpc b/config/rootfiles/common/miniupnpc new file mode 100644 index 000000000..616ea6131 --- /dev/null +++ b/config/rootfiles/common/miniupnpc @@ -0,0 +1,19 @@ +#usr/bin/external-ip +#usr/bin/upnp-listdevices +#usr/bin/upnpc +#usr/include/miniupnpc +#usr/include/miniupnpc/igd_desc_parse.h +#usr/include/miniupnpc/miniupnpc.h +#usr/include/miniupnpc/miniupnpc_declspec.h +#usr/include/miniupnpc/miniupnpctypes.h +#usr/include/miniupnpc/miniwget.h +#usr/include/miniupnpc/portlistingparse.h +#usr/include/miniupnpc/upnpcommands.h +#usr/include/miniupnpc/upnpdev.h +#usr/include/miniupnpc/upnperrors.h +#usr/include/miniupnpc/upnpreplyparse.h +#usr/lib/libminiupnpc.a +#usr/lib/libminiupnpc.so +#usr/lib/libminiupnpc.so.18 +#usr/lib/pkgconfig/miniupnpc.pc +#usr/share/man/man3/miniupnpc.3.gz diff --git a/config/rootfiles/common/perl b/config/rootfiles/common/perl index 94e37db0e..d4ceb7083 100644 --- a/config/rootfiles/common/perl +++ b/config/rootfiles/common/perl @@ -1732,7 +1732,7 @@ usr/lib/perl5/5.36.0/xxxMACHINExxx-linux-thread-multi/B #usr/lib/perl5/5.36.0/xxxMACHINExxx-linux-thread-multi/Compress #usr/lib/perl5/5.36.0/xxxMACHINExxx-linux-thread-multi/Compress/Raw #usr/lib/perl5/5.36.0/xxxMACHINExxx-linux-thread-multi/Compress/Raw/Bzip2.pm -#usr/lib/perl5/5.36.0/xxxMACHINExxx-linux-thread-multi/Compress/Raw/Zlib.pm +usr/lib/perl5/5.36.0/xxxMACHINExxx-linux-thread-multi/Compress/Raw/Zlib.pm usr/lib/perl5/5.36.0/xxxMACHINExxx-linux-thread-multi/Config.pm usr/lib/perl5/5.36.0/xxxMACHINExxx-linux-thread-multi/Config.pod usr/lib/perl5/5.36.0/xxxMACHINExxx-linux-thread-multi/Config_git.pl diff --git a/config/rootfiles/core/190/filelists/files b/config/rootfiles/core/190/filelists/files index c7075a38d..0d9f889c1 100644 --- a/config/rootfiles/core/190/filelists/files +++ b/config/rootfiles/core/190/filelists/files @@ -13,6 +13,7 @@ srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/bin/suricata-watcher +usr/lib/perl5/5.36.0/xxxMACHINExxx-linux-thread-multi/Compress/Raw/Zlib.pm var/ipfire/backup/include var/ipfire/graphs.pl var/ipfire/network-functions.pl diff --git a/lfs/dnsdist b/lfs/dnsdist index 5a8c0ac70..8c5c32271 100644 --- a/lfs/dnsdist +++ b/lfs/dnsdist @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 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 # @@ -26,7 +26,7 @@ include Config
SUMMARY = A highly DNS-, DoS- and abuse-aware loadbalancer
-VER = 1.9.4 +VER = 1.9.6
THISAPP = dnsdist-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -34,9 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = dnsdist -PAK_VER = 23 - -SUP_ARCH = x86_64 aarch64 +PAK_VER = 24
DEPS =
@@ -52,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a8cfc5c2da135ed96b857f9f1b6c3caa796b27f66ff7ead6e976b871a5e5db208ef3ce275c23085318bd7ff2f0fa2ec19e28ad36234991d84b8d13e74acb2f34 +$(DL_FILE)_BLAKE2 = adb56707bb768ceae974cd9b725d2bf1f4beaa6e3edc6ede22a7d93920214614f10c82d71dbb773741f56dff04e0f0aa26dc0a0e2d5d405bee89d8ada1130303
install : $(TARGET)
diff --git a/lfs/miniupnpc b/lfs/miniupnpc new file mode 100644 index 000000000..7907bb5b9 --- /dev/null +++ b/lfs/miniupnpc @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2024 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.2.8 + +THISAPP = miniupnpc-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = eae4d97bdf8c494ea6744edfeb870f9d92df8468d23f974e0e44e735fc7c8925189ea58f60a71c37315aebff1269ae69e9413cdf80dc292c4b90df5f12bf58a4 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make + cd $(DIR_APP) && python3 setup.py build + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/transmission b/lfs/transmission index 298c2a0e9..1568b67e7 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -26,7 +26,7 @@ include Config
SUMMARY = A BitTorrent client with multiple UIs
-VER = 4.0.5 +VER = 4.0.6
THISAPP = transmission-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = transmission -PAK_VER = 22 +PAK_VER = 23
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 60caa3bc615137b225d3ac3f25daa352c6960fcc848c91e5ea45488ae109d93b53e314e4683bd7c4ef3f9b2f364d796b6c5bb014ca647d3f44fb5c9df9f8c997 +$(DL_FILE)_BLAKE2 = 3eb1d851322299cb1b79c799f431c09db5aee1be0372fa2877e16508ca6f9e78ea42ed75520ab29a3325e62efcfca63a83559db73c39c981c9e2eddb403ef65a
install : $(TARGET)
@@ -81,6 +81,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/transmission-4.0.6-fix_for_miniupnpc-2.2.8.patch cd $(DIR_APP) && cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/make.sh b/make.sh index cde4c57a7..8e980f392 100755 --- a/make.sh +++ b/make.sh @@ -1984,6 +1984,7 @@ build_system() { lfsmake2 aws-cli lfsmake2 oci-python-sdk lfsmake2 oci-cli + lfsmake2 miniupnpc lfsmake2 transmission lfsmake2 mtr lfsmake2 minidlna diff --git a/src/patches/transmission-4.0.6-fix_for_miniupnpc-2.2.8.patch b/src/patches/transmission-4.0.6-fix_for_miniupnpc-2.2.8.patch new file mode 100644 index 000000000..3426d13bc --- /dev/null +++ b/src/patches/transmission-4.0.6-fix_for_miniupnpc-2.2.8.patch @@ -0,0 +1,34 @@ +From febfe49ca3ecab1a7142ecb34012c1f0b2bcdee8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?C=C5=93ur?= coeur@gmx.fr +Date: Sat, 15 Jun 2024 07:24:06 +0800 +Subject: [PATCH] bump miniupnpc to 2.2.8 (#6907) + +* bump miniupnpc to 2.2.8 + +* Avoid build error "ln: include/miniupnpc/.: Operation not permitted" +--- + Transmission.xcodeproj/project.pbxproj | 2 +- + libtransmission/port-forwarding-upnp.cc | 9 +++++++-- + third-party/miniupnp | 2 +- + 3 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/libtransmission/port-forwarding-upnp.cc b/libtransmission/port-forwarding-upnp.cc +index 6d7bbc7f7c2..a4146e0df13 100644 +--- a/libtransmission/port-forwarding-upnp.cc ++++ b/libtransmission/port-forwarding-upnp.cc +@@ -261,8 +261,13 @@ tr_port_forwarding_state tr_upnpPulse( + + FreeUPNPUrls(&handle->urls); + auto lanaddr = std::array<char, TR_ADDRSTRLEN>{}; +- if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, std::data(lanaddr), std::size(lanaddr) - 1) == +- UPNP_IGD_VALID_CONNECTED) ++ if ( ++#if (MINIUPNPC_API_VERSION >= 18) ++ UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, std::data(lanaddr), std::size(lanaddr) - 1, nullptr, 0) ++#else ++ UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, std::data(lanaddr), std::size(lanaddr) - 1) ++#endif ++ == UPNP_IGD_VALID_CONNECTED) + { + tr_logAddInfo(fmt::format(_("Found Internet Gateway Device '{url}'"), fmt::arg("url", handle->urls.controlURL))); + tr_logAddInfo(fmt::format(_("Local Address is '{address}'"), fmt::arg("address", lanaddr.data())));
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer