IPFire-SCM February 2024

ipfire-scm@lists.ipfire.org

1 participants
39 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8e111d6f03f4e8f71bedd21e623700534ae7603b
by Michael Tremer 09 Feb '24

09 Feb '24

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 8e111d6f03f4e8f71bedd21e623700534ae7603b (commit) via 8c2109bc217862207fc405fbbb1f6f9bfde53413 (commit) via 498d5613d6d46ea4392f0239485b2f1af8c91623 (commit) via 49b8893ff5c28abaf717e35d9db2f6b8177ff53d (commit) from 3757d24e470975ab3451a1d8adb36281468c0532 (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 8e111d6f03f4e8f71bedd21e623700534ae7603b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 9 11:26:55 2024 +0000 core184: Ship squid Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8c2109bc217862207fc405fbbb1f6f9bfde53413 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Wed Feb 7 18:37:23 2024 +0100 squid: Update to 6.7 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> For details see: https://github.com/squid-cache/squid/commits/v6 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 498d5613d6d46ea4392f0239485b2f1af8c91623 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 9 11:25:19 2024 +0000 core184: Ship expat Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 49b8893ff5c28abaf717e35d9db2f6b8177ff53d Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Feb 7 12:13:19 2024 +0100 expat: Update to version 2.6.0 - Update from version 2.5.0 to 2.6.0 - Update of rootfile - This update fixes two CVE's. Not sure if IPFire would be vulnerable or not but safer to update anyway. - Changelog 2.6.0 Security fixes: #789 #814 CVE-2023-52425 -- Fix quadratic runtime issues with big tokens that can cause denial of service, in partial where dealing with compressed XML input. Applications that parsed a document in one go -- a single call to functions XML_Parse or XML_ParseBuffer -- were not affected. The smaller the chunks/buffers you use for parsing previously, the bigger the problem prior to the fix. Backporters should be careful to no omit parts of pull request #789 and to include earlier pull request #771, in order to not break the fix. #777 CVE-2023-52426 -- Fix billion laughs attacks for users compiling *without* XML_DTD defined (which is not common). Users with XML_DTD defined have been protected since Expat >=2.4.0 (and that was CVE-2013-0340 back then). Bug fixes: #753 Fix parse-size-dependent "invalid token" error for external entities that start with a byte order mark #780 Fix NULL pointer dereference in setContext via XML_ExternalEntityParserCreate for compilation with XML_DTD undefined #812 #813 Protect against closing entities out of order Other changes: #723 Improve support for arc4random/arc4random_buf #771 #788 Improve buffer growth in XML_GetBuffer and XML_Parse #761 #770 xmlwf: Support --help and --version #759 #770 xmlwf: Support custom buffer size for XML_GetBuffer and read #744 xmlwf: Improve language and URL clickability in help output #673 examples: Add new example "element_declarations.c" #764 Be stricter about macro XML_CONTEXT_BYTES at build time #765 Make inclusion to expat_config.h consistent #726 #727 Autotools: configure.ac: Support --disable-maintainer-mode #678 #705 .. #706 #733 #792 Autotools: Sync CMake templates with CMake 3.26 #795 Autotools: Make installation of shipped man page doc/xmlwf.1 independent of docbook2man availability #815 Autotools|CMake: Add missing -DXML_STATIC to pkg-config file section "Cflags.private" in order to fix compilation against static libexpat using pkg-config on Windows #724 #751 Autotools|CMake: Require a C99 compiler (a de-facto requirement already since Expat 2.2.2 of 2017) #793 Autotools|CMake: Fix PACKAGE_BUGREPORT variable #750 #786 Autotools|CMake: Make test suite require a C++11 compiler #749 CMake: Require CMake >=3.5.0 #672 CMake: Lowercase off_t and size_t to help a bug in Meson #746 CMake: Sort xmlwf sources alphabetically #785 CMake|Windows: Fix generation of DLL file version info #790 CMake: Build tests/benchmark/benchmark.c as well for a build with -DEXPAT_BUILD_TESTS=ON #745 #757 docs: Document the importance of isFinal + adjust tests accordingly #736 docs: Improve use of "NULL" and "null" #713 docs: Be specific about version of XML (XML 1.0r4) and version of C (C99); (XML 1.0r5 will need a sponsor.) #762 docs: reference.html: Promote function XML_ParseBuffer more #779 docs: reference.html: Add HTML anchors to XML_* macros #760 docs: reference.html: Upgrade to OK.css 1.2.0 #763 #739 docs: Fix typos #696 docs|CI: Use HTTPS URLs instead of HTTP at various places #669 #670 .. #692 #703 .. #733 #772 Address compiler warnings #798 #800 Address clang-tidy warnings #775 #776 Version info bumped from 9:10:8 (libexpat*.so.1.8.10) to 10:0:9 (libexpat*.so.1.9.0); see https://verbump.de/ for what these numbers do Infrastructure: #700 #701 docs: Document security policy in file SECURITY.md #766 docs: Improve parse buffer variables in-code documentation #674 #738 .. #740 #747 .. #748 #781 #782 Refactor coverage and conformance tests #714 #716 Refactor debug level variables to unsigned long #671 Improve handling of empty environment variable value in function getDebugLevel (without visible user effect) #755 #774 .. #758 #783 .. #784 #787 tests: Improve test coverage with regard to parse chunk size #660 #797 #801 Fuzzing: Improve fuzzing coverage #367 #799 Fuzzing|CI: Start running OSS-Fuzz fuzzing regression tests #698 #721 CI: Resolve some Travis CI leftovers #669 CI: Be robust towards absence of Git tags #693 #694 CI: Set permissions to "contents: read" for security #709 CI: Pin all GitHub Actions to specific commits for security #739 CI: Reject spelling errors using codespell #798 CI: Enforce clang-tidy clean code #773 #808 .. #809 #810 CI: Upgrade Clang from 15 to 18 #796 CI: Start using Clang's Control Flow Integrity sanitizer #675 #720 #722 CI: Adapt to breaking changes in GitHub Actions Ubuntu images #689 CI: Adapt to breaking changes in Clang/LLVM Debian packaging #763 CI: Adapt to breaking changes in codespell #803 CI: Adapt to breaking changes in Cppcheck Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/expat | 21 +++++++++++---------- .../{oldcore/106 => core/184}/filelists/expat | 0 .../{oldcore/100 => core/184}/filelists/squid | 0 config/rootfiles/core/184/update.sh | 5 +++++ lfs/expat | 8 ++++---- lfs/squid | 6 +++--- 6 files changed, 23 insertions(+), 17 deletions(-) copy config/rootfiles/{oldcore/106 => core/184}/filelists/expat (100%) copy config/rootfiles/{oldcore/100 => core/184}/filelists/squid (100%) Difference in files: diff --git a/config/rootfiles/common/expat b/config/rootfiles/common/expat index 233c46283..499f99f8e 100644 --- a/config/rootfiles/common/expat +++ b/config/rootfiles/common/expat @@ -3,20 +3,21 @@ #usr/include/expat_config.h #usr/include/expat_external.h #usr/lib/cmake -#usr/lib/cmake/expat-2.5.0 -#usr/lib/cmake/expat-2.5.0/expat-config-version.cmake -#usr/lib/cmake/expat-2.5.0/expat-config.cmake -#usr/lib/cmake/expat-2.5.0/expat-noconfig.cmake -#usr/lib/cmake/expat-2.5.0/expat.cmake +#usr/lib/cmake/expat-2.6.0 +#usr/lib/cmake/expat-2.6.0/expat-config-version.cmake +#usr/lib/cmake/expat-2.6.0/expat-config.cmake +#usr/lib/cmake/expat-2.6.0/expat-noconfig.cmake +#usr/lib/cmake/expat-2.6.0/expat.cmake #usr/lib/libexpat.la #usr/lib/libexpat.so usr/lib/libexpat.so.1 -usr/lib/libexpat.so.1.8.10 +usr/lib/libexpat.so.1.9.0 #usr/lib/pkgconfig/expat.pc #usr/share/doc/expat -#usr/share/doc/expat-2.5.0 -#usr/share/doc/expat-2.5.0/ok.min.css -#usr/share/doc/expat-2.5.0/reference.html -#usr/share/doc/expat-2.5.0/style.css +#usr/share/doc/expat-2.6.0 +#usr/share/doc/expat-2.6.0/ok.min.css +#usr/share/doc/expat-2.6.0/reference.html +#usr/share/doc/expat-2.6.0/style.css #usr/share/doc/expat/AUTHORS #usr/share/doc/expat/changelog +#usr/share/man/man1/xmlwf.1 diff --git a/config/rootfiles/core/184/filelists/expat b/config/rootfiles/core/184/filelists/expat new file mode 120000 index 000000000..e1923cf63 --- /dev/null +++ b/config/rootfiles/core/184/filelists/expat @@ -0,0 +1 @@ +../../../common/expat \ No newline at end of file diff --git a/config/rootfiles/core/184/filelists/squid b/config/rootfiles/core/184/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/184/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/184/update.sh b/config/rootfiles/core/184/update.sh index d744b5119..c3593414e 100644 --- a/config/rootfiles/core/184/update.sh +++ b/config/rootfiles/core/184/update.sh @@ -32,6 +32,7 @@ for (( i=1; i<=$core; i++ )); do done # Stop services +/etc/init.d/squid stop /etc/init.d/vnstat stop # Extract files @@ -80,6 +81,10 @@ telinit u /etc/init.d/vnstat start /etc/init.d/collectd restart +if [ -f /var/ipfire/proxy/enable ]; then + /etc/init.d/squid start +fi + # This update needs a reboot... touch /var/run/need_reboot diff --git a/lfs/expat b/lfs/expat index a89b6d114..acfdba6ea 100644 --- a/lfs/expat +++ b/lfs/expat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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,10 +24,10 @@ include Config -VER = 2.5.0 +VER = 2.6.0 THISAPP = expat-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 15a5dcd3af17995fb4299301710b38d609c1fe7a8d6a6284581fedd96e89e0c16526d0342fb55773ac9d678cd65dc5cdb1532c764eeb3a20ccdf1e168b96e337 +$(DL_FILE)_BLAKE2 = 2f0117317bde4e03d8662bcac1ff6c2bbb1af694846b21a82ac12d11ccd43032b481af72fa35298c3cb19b7426dba6a67e703904ca7b05663ffd854a42348bd0 install : $(TARGET) diff --git a/lfs/squid b/lfs/squid index c0f465c16..3a2d1039c 100644 --- a/lfs/squid +++ b/lfs/squid @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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.6 +VER = 6.7 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 7c3c96f5cd5f819f6f020fb3e63ee8d9bb26b7fb4ff4405d7963a643c6766344e6492505bc1b33f3040ad800b3d7a3ad6a4b067b031ac4d178ddcac04c6e74dc +$(DL_FILE)_BLAKE2 = f91b0f617b6b32138c33575d5daec0bc6dfcb0d356939b6c01e9d4c33b77886ffb55c38678f31aeed9bf4d5d5e488c751d41098b846a956383c8b6db8c851cab install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3757d24e470975ab3451a1d8adb36281468c0532
by Michael Tremer 07 Feb '24

07 Feb '24

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 3757d24e470975ab3451a1d8adb36281468c0532 (commit) from b8c898b4824624b802ffda8b92c7009ea5a9db46 (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 3757d24e470975ab3451a1d8adb36281468c0532 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 7 11:21:49 2024 +0000 libvirt: Don't build for riscv64 There seems to be some problem that this package does not build from source, but as we don't currently have any hardware that supports thise, there is no point in debugging it. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/libvirt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/lfs/libvirt b/lfs/libvirt index 3035844f0..ef122cfa7 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -33,7 +33,7 @@ DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -# SUP_ARCH = x86_64 aarch64 +SUP_ARCH = x86_64 aarch64 PROG = libvirt PAK_VER = 34 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b8c898b4824624b802ffda8b92c7009ea5a9db46
by Michael Tremer 07 Feb '24

07 Feb '24

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 b8c898b4824624b802ffda8b92c7009ea5a9db46 (commit) via 9f01011570be542e394503cb8a4c5184eb9be8d1 (commit) via aa07e1bb3eba3606a0b8e647180e0926a411016b (commit) via 182743310ce47d9a78d5fd6d32c510bcbb163762 (commit) via 08c20b8457ec8c8fe24dda561b8d28a6f6b584a3 (commit) via 3dfc7489461d52321bf6cb6a342b15416fd362bb (commit) via 7c9a6cf1631cd68970762cbb61056618f6de4c2e (commit) via b4f6962c4dd5ddd18a376e4acec6a861cf870fa1 (commit) via 216d4bfc3d42bb280ed4f88e066d9147b0f5b5c2 (commit) via d2b423b1dc866dccf70dba93d779da36871c1b84 (commit) via 6aa450ec3b4ab8a9a9ed37c710321c19b4db104d (commit) via 37c5b4b62eb0e6bfb617a7173dd07d473c34f6a5 (commit) via f23555a1c6acb12fbb626a27c2189dee4cb45c0c (commit) via 89645d1bbfbb26bdf0351fe01b69978f73fc0074 (commit) via 7d0f48668b681b4b788f8adffd5a6d0ad56d02a5 (commit) via fb7d13725fc3d16eeddad73e5cfa86a15bc58408 (commit) via 0e16c27908960fd911efe8193489a16eb970455f (commit) via 4b1254520ab884792aa41a342a7e2e31320519db (commit) via c09d2324479fa2fceec9eb5166b5e8e7af45fb0a (commit) via 30dc4c0248a65b70baf89cb46cc5b18993788501 (commit) via 816af4dfb78eb5f7b95390d1bd3e444f7fbb42fe (commit) from 437bfd678013cf2b56b673b67a3eb6d68a0831cd (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 b8c898b4824624b802ffda8b92c7009ea5a9db46 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 7 11:09:50 2024 +0000 core184: Ship vpnmain.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9f01011570be542e394503cb8a4c5184eb9be8d1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 30 17:45:44 2024 +0000 vpnmain.cgi: Add option to regenerate the host certificate This is necessary since we now have a much shorter lifetime for the host certificate. However, it is complicated to do this is which is why we are copying the previous certificate and generate a new CSR. This is then signed. A caveat of this patch is that we do not rollover the key. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit aa07e1bb3eba3606a0b8e647180e0926a411016b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 30 17:45:43 2024 +0000 vpnmain.cgi: Return the entire error message if OpenSSL fails The function did not evaluate the return code which is why it used a hack to figure out if some output is an error or not. This is being fixed in this commit and the entire output is being returned if the return code is non-zero. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 182743310ce47d9a78d5fd6d32c510bcbb163762 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 30 17:45:42 2024 +0000 vpnmain.cgi: Do not use a bad source for randomness Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 08c20b8457ec8c8fe24dda561b8d28a6f6b584a3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 7 11:05:08 2024 +0000 core184: Ship HOSTILE IN/OUT changes Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3dfc7489461d52321bf6cb6a342b15416fd362bb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 6 18:17:26 2024 +0000 firewall: Improve labelling of hostile networks hits Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7c9a6cf1631cd68970762cbb61056618f6de4c2e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 6 18:11:48 2024 +0000 firewall: graphs: Add a line for the total number of hostile hits Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b4f6962c4dd5ddd18a376e4acec6a861cf870fa1 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Jan 21 12:45:53 2024 +0100 optionsfw.cgi: Move Firewall Options Drop commands to before the logging section - Moved the Firewall Options Drop commands to before the logging section, as discussed at January 2024 Video Call. Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 216d4bfc3d42bb280ed4f88e066d9147b0f5b5c2 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Jan 21 12:45:52 2024 +0100 graphs.pl: Fixes bug12981 - Creates in and outgoing drop hostile graph entries - This v3 version of the patch set splits the single hostile networks graph entry into incoming hostile networks and outgoing hostile networks entries. Fixes: bug12981 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d2b423b1dc866dccf70dba93d779da36871c1b84 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Jan 21 12:45:51 2024 +0100 collectd.conf: Fix bug12981 - This creates in and out drop hostile data collection - In this v3 version of the patch set the splitting of drop hostile logging into incoming and outgoing logging means that the data collection and graphs need to have drop hostile also split into incoming and outgoing. Fixes: bug12981 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6aa450ec3b4ab8a9a9ed37c710321c19b4db104d Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Jan 21 12:45:50 2024 +0100 en.pl: Fixes bug12981 - adds english language input for choice of drop hostile logging - In this v3 version have added translations for hostile networks in and hostile networks out and log drop hostile in and log drop hostile out. Fixes: bug12981 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 37c5b4b62eb0e6bfb617a7173dd07d473c34f6a5 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Jan 21 12:45:49 2024 +0100 firewall: Fixes bug12981 - add if loop to log or not log dropped hostile traffic - This v3 version now has two if loops allowing logging of incoming drop hostile or outgoing drop hostile or both or neither. - Dependent on the choice in optionsfw.cgi this loop will either log or not log the dropped hostile traffic. Fixes: bug12981 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f23555a1c6acb12fbb626a27c2189dee4cb45c0c Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Jan 21 12:45:48 2024 +0100 rules.pl: Fixes bug12981 - Add in and out specific actions for drop hostile - This changes the action from HOSTILE_DROP to HOSTILE_DROP_IN for icnoming traffic and HOSTILE_DROP_OUT for outgoing traffic enabling logging decisions to be taken on each independently. Fixes: bug12981 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org> Acked-by: Bernhard Bitsch <bbitsch(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 89645d1bbfbb26bdf0351fe01b69978f73fc0074 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Jan 21 12:45:47 2024 +0100 optionsfw.cgi: Fix bug12981 - Add option to log or not log dropped hostile traffic - This v3 version has split the logging choice for drop hostile to separate the logging of incoming drop hostile and outgoing drop hostile. - The bug originator had no port forwards so all hostile would be dropped normally anyway. However the logs were being swamped by the logging of drop hostile making analysis difficult. So incoming drop hostile was desired to not be logged. However logging of outgoing drop hostile was desired to identify if clients on the internal lan were infected with malware trying to reach home. - Added option with drop hostile section to decide if the dropped traffic should be logged or not. Fixes: bug12981 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org> Tested-by: Bernhard Bitsch <bbitsch(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7d0f48668b681b4b788f8adffd5a6d0ad56d02a5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 7 11:01:25 2024 +0000 elfutils: Don't ship tools I don't think there is any point that we ship these. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fb7d13725fc3d16eeddad73e5cfa86a15bc58408 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 7 10:58:21 2024 +0000 core184: Remove elfutils pakfire metadata (if installed) Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0e16c27908960fd911efe8193489a16eb970455f Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Feb 6 22:27:39 2024 +0100 strace: elfutils moved from addon dependency to core program Fixes: Bug#13516 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4b1254520ab884792aa41a342a7e2e31320519db Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Feb 6 22:27:38 2024 +0100 qemu: elfutils moved from addon dependency to core program Fixes: Bug#13516 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c09d2324479fa2fceec9eb5166b5e8e7af45fb0a Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Feb 6 22:27:37 2024 +0100 ltrace: elfutils moved from addon dependency to core program Fixes: Bug#13516 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 30dc4c0248a65b70baf89cb46cc5b18993788501 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Feb 6 22:27:36 2024 +0100 frr: elfutils moved from addon dependency to core program Fixes: Bug#13516 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 816af4dfb78eb5f7b95390d1bd3e444f7fbb42fe Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Feb 6 22:27:35 2024 +0100 elfutils: Move from addon to core program. Required by suricata-7.0.2 for execution - Updated lfs file to core program type - Moved rootfile from packages to common - Older suricata versions required elfutils only for building but suricata-7.0.2 fails to start if elfutils is not present due to libelf.so.1 being missing. - The requirement for elfutils is not mentioned at all in the changelog. Fixes: Bug#13516 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cfgroot/graphs.pl | 23 ++++++++- config/collectd/collectd.conf | 3 +- config/firewall/rules.pl | 6 +-- config/rootfiles/{packages => common}/elfutils | 36 +++++++------- config/rootfiles/core/184/filelists/files | 5 ++ config/rootfiles/core/184/update.sh | 25 ++++++++++ config/ssl/openssl.cnf | 1 + doc/language_issues.de | 7 +++ doc/language_issues.en | 7 ++- doc/language_issues.es | 7 +++ doc/language_issues.fr | 7 +++ doc/language_issues.it | 7 ++- doc/language_issues.nl | 7 ++- doc/language_issues.pl | 7 ++- doc/language_issues.ru | 7 ++- doc/language_issues.tr | 7 ++- doc/language_missings | 53 ++++++++++++++++++-- html/cgi-bin/optionsfw.cgi | 65 +++++++++++++++++------- html/cgi-bin/vpnmain.cgi | 69 +++++++++++++++++++++++--- langs/en/cgi-bin/en.pl | 7 ++- lfs/elfutils | 11 +--- lfs/frr | 4 +- lfs/ltrace | 6 +-- lfs/qemu | 6 +-- lfs/strace | 6 +-- src/initscripts/system/firewall | 15 ++++-- 26 files changed, 317 insertions(+), 87 deletions(-) rename config/rootfiles/{packages => common}/elfutils (76%) Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 9803dd124..a23e49c98 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -693,7 +693,16 @@ sub updatefwhitsgraph { "DEF:newnotsyn=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-NEWNOTSYN/ipt_bytes-DROP_NEWNOTSYN.rrd:value:AVERAGE", "DEF:portscan=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-PSCAN/ipt_bytes-DROP_PScan.rrd:value:AVERAGE", "DEF:spoofedmartian=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-SPOOFED_MARTIAN/ipt_bytes-DROP_SPOOFED_MARTIAN.rrd:value:AVERAGE", - "DEF:hostile=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE", + "DEF:hostilein=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP_IN/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE", + "DEF:hostileout=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP_OUT/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE", + "DEF:hostilelegacy=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE", + + # This creates a new combined hostile segment. + # Previously we did not split into incoming/outgoing, but we cannot go back in time. This CDEF will take the values + # from the old RRD database unless those are UNKNOWN (i.e. we started collected IN/OUT). If the values are unknown, + # we replace them with them sum of IN + OUT. + "CDEF:hostile=hostilelegacy,UN,hostilein,hostileout,+,hostilelegacy,IF", + "COMMENT:".sprintf("%-26s",$Lang::tr{'caption'}), "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'average'}), @@ -729,7 +738,17 @@ sub updatefwhitsgraph { "GPRINT:spoofedmartian:AVERAGE:%8.1lf %sBps", "GPRINT:spoofedmartian:MIN:%8.1lf %sBps", "GPRINT:spoofedmartian:LAST:%8.1lf %sBps\\j", - "STACK:hostile".$color{"color13"}."A0:".sprintf("%-25s",$Lang::tr{'hostile networks'}), + "STACK:hostilein".$color{"color13"}."A0:".sprintf("%-25s",$Lang::tr{'hostile networks in'}), + "GPRINT:hostilein:MAX:%8.1lf %sBps", + "GPRINT:hostilein:AVERAGE:%8.1lf %sBps", + "GPRINT:hostilein:MIN:%8.1lf %sBps", + "GPRINT:hostilein:LAST:%8.1lf %sBps\\j", + "STACK:hostileout".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'hostile networks out'}), + "GPRINT:hostileout:MAX:%8.1lf %sBps", + "GPRINT:hostileout:AVERAGE:%8.1lf %sBps", + "GPRINT:hostileout:MIN:%8.1lf %sBps", + "GPRINT:hostileout:LAST:%8.1lf %sBps\\j", + "LINE:hostile#000000A0:".sprintf("%-25s",$Lang::tr{'hostile networks total'}), "GPRINT:hostile:MAX:%8.1lf %sBps", "GPRINT:hostile:AVERAGE:%8.1lf %sBps", "GPRINT:hostile:MIN:%8.1lf %sBps", diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index 4ef34ea07..cc49f0ba7 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -51,7 +51,8 @@ include "/etc/collectd.precache" Chain filter POLICYOUT DROP_OUTPUT Chain filter POLICYIN DROP_INPUT Chain filter SPOOFED_MARTIAN DROP_SPOOFED_MARTIAN - Chain filter HOSTILE_DROP DROP_HOSTILE + Chain filter HOSTILE_DROP_IN DROP_HOSTILE + Chain filter HOSTILE_DROP_OUT DROP_HOSTILE </Plugin> #<Plugin logfile> diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 7edb910e2..a47c260a1 100644 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -726,8 +726,8 @@ sub drop_hostile_networks () { &ipset_restore($HOSTILE_CCODE); # Check traffic in incoming/outgoing direction and drop if it matches - run("$IPTABLES -A HOSTILE -i $RED_DEV -m set --match-set $HOSTILE_CCODE src -j HOSTILE_DROP"); - run("$IPTABLES -A HOSTILE -o $RED_DEV -m set --match-set $HOSTILE_CCODE dst -j HOSTILE_DROP"); + run("$IPTABLES -A HOSTILE -i $RED_DEV -m set --match-set $HOSTILE_CCODE src -j HOSTILE_DROP_IN"); + run("$IPTABLES -A HOSTILE -o $RED_DEV -m set --match-set $HOSTILE_CCODE dst -j HOSTILE_DROP_OUT"); } sub ipblocklist () { diff --git a/config/rootfiles/packages/elfutils b/config/rootfiles/common/elfutils similarity index 76% rename from config/rootfiles/packages/elfutils rename to config/rootfiles/common/elfutils index f7d56ad89..830638e2b 100644 --- a/config/rootfiles/packages/elfutils +++ b/config/rootfiles/common/elfutils @@ -1,21 +1,21 @@ -usr/bin/eu-addr2line -usr/bin/eu-ar -usr/bin/eu-elfclassify -usr/bin/eu-elfcmp -usr/bin/eu-elfcompress -usr/bin/eu-elflint -usr/bin/eu-findtextrel -usr/bin/eu-make-debug-archive -usr/bin/eu-nm -usr/bin/eu-objdump -usr/bin/eu-ranlib -usr/bin/eu-readelf -usr/bin/eu-size -usr/bin/eu-srcfiles -usr/bin/eu-stack -usr/bin/eu-strings -usr/bin/eu-strip -usr/bin/eu-unstrip +#usr/bin/eu-addr2line +#usr/bin/eu-ar +#usr/bin/eu-elfclassify +#usr/bin/eu-elfcmp +#usr/bin/eu-elfcompress +#usr/bin/eu-elflint +#usr/bin/eu-findtextrel +#usr/bin/eu-make-debug-archive +#usr/bin/eu-nm +#usr/bin/eu-objdump +#usr/bin/eu-ranlib +#usr/bin/eu-readelf +#usr/bin/eu-size +#usr/bin/eu-srcfiles +#usr/bin/eu-stack +#usr/bin/eu-strings +#usr/bin/eu-strip +#usr/bin/eu-unstrip #usr/include/dwarf.h #usr/include/elfutils #usr/include/elfutils/elf-knowledge.h diff --git a/config/rootfiles/core/184/filelists/files b/config/rootfiles/core/184/filelists/files index 4f1c7ed98..dc8a1b28f 100644 --- a/config/rootfiles/core/184/filelists/files +++ b/config/rootfiles/core/184/filelists/files @@ -1 +1,6 @@ etc/rc.d/init.d/collectd +etc/rc.d/init.d/firewall +srv/web/ipfire/cgi-bin/optionsfw.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +usr/lib/firewall/rules.pl +var/ipfire/graphs.pl diff --git a/config/rootfiles/core/184/update.sh b/config/rootfiles/core/184/update.sh index a5e53a564..d744b5119 100644 --- a/config/rootfiles/core/184/update.sh +++ b/config/rootfiles/core/184/update.sh @@ -37,6 +37,30 @@ done # Extract files extract_files +# Remove dropped elfutils addon +rm -vf \ + /opt/pakfire/db/installed/meta-elfutils \ + /opt/pakfire/db/meta/meta-elfutils \ + /opt/pakfire/db/rootfiles/elfutils \ + /usr/bin/eu-addr2line \ + /usr/bin/eu-ar \ + /usr/bin/eu-elfclassify \ + /usr/bin/eu-elfcmp \ + /usr/bin/eu-elfcompress \ + /usr/bin/eu-elflint \ + /usr/bin/eu-findtextrel \ + /usr/bin/eu-make-debug-archive \ + /usr/bin/eu-nm \ + /usr/bin/eu-objdump \ + /usr/bin/eu-ranlib \ + /usr/bin/eu-readelf \ + /usr/bin/eu-size \ + /usr/bin/eu-srcfiles \ + /usr/bin/eu-stack \ + /usr/bin/eu-strings \ + /usr/bin/eu-strip \ + /usr/bin/eu-unstrip + # Remove files # update linker config @@ -54,6 +78,7 @@ ldconfig # Start services telinit u /etc/init.d/vnstat start +/etc/init.d/collectd restart # This update needs a reboot... touch /var/run/need_reboot diff --git a/config/ssl/openssl.cnf b/config/ssl/openssl.cnf index 3b980fcd4..00c206ed8 100644 --- a/config/ssl/openssl.cnf +++ b/config/ssl/openssl.cnf @@ -23,6 +23,7 @@ default_md = sha256 preserve = no policy = policy_match email_in_dn = no +copy_extensions = copyall [ policy_match ] countryName = optional diff --git a/doc/language_issues.de b/doc/language_issues.de index 4fd5a0819..46fb9ee5a 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -375,6 +375,7 @@ WARNING: translation string unused: host WARNING: translation string unused: host allow WARNING: translation string unused: host configuration WARNING: translation string unused: host deny +WARNING: translation string unused: hostile networks WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 @@ -923,16 +924,22 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string +WARNING: untranslated string: hostile networks in = From Hostile Networks +WARNING: untranslated string: hostile networks out = To Hostile Networks +WARNING: untranslated string: hostile networks total = Total Hostile Networks WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code WARNING: untranslated string: invalid input for subscription code = Invalid input for subscription code WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es) WARNING: untranslated string: ipsec invalid ip address or fqdn for rw endpoint = Invalid IP address or FQDN for Host-to-Net Endpoint WARNING: untranslated string: ipsec roadwarrior endpoint = Host-to-Net Endpoint WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation +WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks +WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: optional = Optional WARNING: untranslated string: pakfire invalid tree = Invalid repository selected +WARNING: untranslated string: regenerate host certificate = Renew Host Certificate WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: required = Required diff --git a/doc/language_issues.en b/doc/language_issues.en index b4327cb78..86d5890f2 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1039,7 +1039,9 @@ WARNING: untranslated string: holdoff = Holdoff time (in seconds) WARNING: untranslated string: host certificate = Host Certificate WARNING: untranslated string: host ip = Host IP address WARNING: untranslated string: host to net vpn = Host-to-Net Virtual Private Network (RoadWarrior) -WARNING: untranslated string: hostile networks = Hostile networks +WARNING: untranslated string: hostile networks in = From Hostile Networks +WARNING: untranslated string: hostile networks out = To Hostile Networks +WARNING: untranslated string: hostile networks total = Total Hostile Networks WARNING: untranslated string: hostname = Hostname WARNING: untranslated string: hostname cant be empty = Hostname cannot be empty. WARNING: untranslated string: hostname not set = Hostname not set. @@ -1247,6 +1249,8 @@ WARNING: untranslated string: locationblock country is allowed = Incoming traffi WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked WARNING: untranslated string: locationblock enable feature = Enable Location based blocking: WARNING: untranslated string: log = Log +WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks +WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking WARNING: untranslated string: log lines per page = Lines per page WARNING: untranslated string: log server address = Syslog server: @@ -1578,6 +1582,7 @@ WARNING: untranslated string: red1 = RED WARNING: untranslated string: references = References WARNING: untranslated string: refresh = Refresh WARNING: untranslated string: refresh index page while connected = Refresh index.cgi page while connected +WARNING: untranslated string: regenerate host certificate = Renew Host Certificate WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: release = Release diff --git a/doc/language_issues.es b/doc/language_issues.es index 45ffdf5d7..30e20ae87 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -415,6 +415,7 @@ WARNING: translation string unused: host WARNING: translation string unused: host allow WARNING: translation string unused: host configuration WARNING: translation string unused: host deny +WARNING: translation string unused: hostile networks WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 @@ -989,12 +990,18 @@ WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities +WARNING: untranslated string: hostile networks in = From Hostile Networks +WARNING: untranslated string: hostile networks out = To Hostile Networks +WARNING: untranslated string: hostile networks total = Total Hostile Networks WARNING: untranslated string: info messages = unknown string WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname +WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks +WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks WARNING: untranslated string: no data = unknown string WARNING: untranslated string: openvpn cert expires soon = Expires Soon WARNING: untranslated string: openvpn cert has expired = Expired WARNING: untranslated string: pakfire ago = ago. +WARNING: untranslated string: regenerate host certificate = Renew Host Certificate WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: route config changed = unknown string diff --git a/doc/language_issues.fr b/doc/language_issues.fr index cacfb1ec6..a53358147 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -402,6 +402,7 @@ WARNING: translation string unused: host WARNING: translation string unused: host allow WARNING: translation string unused: host configuration WARNING: translation string unused: host deny +WARNING: translation string unused: hostile networks WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 @@ -947,7 +948,13 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string +WARNING: untranslated string: hostile networks in = From Hostile Networks +WARNING: untranslated string: hostile networks out = To Hostile Networks +WARNING: untranslated string: hostile networks total = Total Hostile Networks +WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks +WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks WARNING: untranslated string: pakfire ago = ago. +WARNING: untranslated string: regenerate host certificate = Renew Host Certificate WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: route config changed = unknown string diff --git a/doc/language_issues.it b/doc/language_issues.it index 68ff12c86..24efece2b 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1068,7 +1068,9 @@ WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities -WARNING: untranslated string: hostile networks = Hostile networks +WARNING: untranslated string: hostile networks in = From Hostile Networks +WARNING: untranslated string: hostile networks out = To Hostile Networks +WARNING: untranslated string: hostile networks total = Total Hostile Networks WARNING: untranslated string: ids add provider = Add provider WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations... WARNING: untranslated string: ids apply = Apply @@ -1159,6 +1161,8 @@ WARNING: untranslated string: locationblock configuration = Location Configurati WARNING: untranslated string: locationblock country is allowed = Incoming traffic from this country is allowed WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked WARNING: untranslated string: locationblock enable feature = Enable Location based blocking: +WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks +WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking WARNING: untranslated string: log server protocol = protocol: WARNING: untranslated string: masquerade blue = Masquerade BLUE @@ -1215,6 +1219,7 @@ WARNING: untranslated string: rdns = rDNS WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received +WARNING: untranslated string: regenerate host certificate = Renew Host Certificate WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: release = Release diff --git a/doc/language_issues.nl b/doc/language_issues.nl index d1a637215..b6a65fad2 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1073,7 +1073,9 @@ WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities -WARNING: untranslated string: hostile networks = Hostile networks +WARNING: untranslated string: hostile networks in = From Hostile Networks +WARNING: untranslated string: hostile networks out = To Hostile Networks +WARNING: untranslated string: hostile networks total = Total Hostile Networks WARNING: untranslated string: ids add provider = Add provider WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations... WARNING: untranslated string: ids apply = Apply @@ -1166,6 +1168,8 @@ WARNING: untranslated string: locationblock configuration = Location Configurati WARNING: untranslated string: locationblock country is allowed = Incoming traffic from this country is allowed WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked WARNING: untranslated string: locationblock enable feature = Enable Location based blocking: +WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks +WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking WARNING: untranslated string: log server protocol = protocol: WARNING: untranslated string: masquerade blue = Masquerade BLUE @@ -1237,6 +1241,7 @@ WARNING: untranslated string: ptr = PTR WARNING: untranslated string: rdns = rDNS WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received +WARNING: untranslated string: regenerate host certificate = Renew Host Certificate WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: required = Required diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 893f73211..1a4f62870 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1213,7 +1213,9 @@ WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities -WARNING: untranslated string: hostile networks = Hostile networks +WARNING: untranslated string: hostile networks in = From Hostile Networks +WARNING: untranslated string: hostile networks out = To Hostile Networks +WARNING: untranslated string: hostile networks total = Total Hostile Networks WARNING: untranslated string: ids add provider = Add provider WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations... WARNING: untranslated string: ids apply = Apply @@ -1315,6 +1317,8 @@ WARNING: untranslated string: locationblock configuration = Location Configurati WARNING: untranslated string: locationblock country is allowed = Incoming traffic from this country is allowed WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked WARNING: untranslated string: locationblock enable feature = Enable Location based blocking: +WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks +WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking WARNING: untranslated string: log server protocol = protocol: WARNING: untranslated string: mac filter = MAC filter @@ -1418,6 +1422,7 @@ WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received WARNING: untranslated string: red1 = RED +WARNING: untranslated string: regenerate host certificate = Renew Host Certificate WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: release = Release diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 64c9b5095..8da6fe4b6 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1210,7 +1210,9 @@ WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities -WARNING: untranslated string: hostile networks = Hostile networks +WARNING: untranslated string: hostile networks in = From Hostile Networks +WARNING: untranslated string: hostile networks out = To Hostile Networks +WARNING: untranslated string: hostile networks total = Total Hostile Networks WARNING: untranslated string: ids add provider = Add provider WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations... WARNING: untranslated string: ids apply = Apply @@ -1313,6 +1315,8 @@ WARNING: untranslated string: locationblock configuration = Location Configurati WARNING: untranslated string: locationblock country is allowed = Incoming traffic from this country is allowed WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked WARNING: untranslated string: locationblock enable feature = Enable Location based blocking: +WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks +WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking WARNING: untranslated string: log server protocol = protocol: WARNING: untranslated string: mac filter = MAC filter @@ -1413,6 +1417,7 @@ WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received WARNING: untranslated string: red1 = RED +WARNING: untranslated string: regenerate host certificate = Renew Host Certificate WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: release = Release diff --git a/doc/language_issues.tr b/doc/language_issues.tr index eadbd33c7..96fe71f7b 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1010,7 +1010,9 @@ WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities -WARNING: untranslated string: hostile networks = Hostile networks +WARNING: untranslated string: hostile networks in = From Hostile Networks +WARNING: untranslated string: hostile networks out = To Hostile Networks +WARNING: untranslated string: hostile networks total = Total Hostile Networks WARNING: untranslated string: ids add provider = Add provider WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations... WARNING: untranslated string: ids apply = Apply @@ -1089,6 +1091,8 @@ WARNING: untranslated string: ipsec settings = IPsec Settings WARNING: untranslated string: itlb multihit = iTLB MultiHit WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation WARNING: untranslated string: local ip address = Local IP Address +WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks +WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking WARNING: untranslated string: meltdown = Meltdown WARNING: untranslated string: mitigated = Mitigated @@ -1125,6 +1129,7 @@ WARNING: untranslated string: ptr = PTR WARNING: untranslated string: reboot fsck = Reboot & run ‘fsck’ WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received +WARNING: untranslated string: regenerate host certificate = Renew Host Certificate WARNING: untranslated string: reiserfs warning1 = Reiserfs is deprecated and scheduled to be removed from the kernel in 2025. WARNING: untranslated string: reiserfs warning2 = Ensure a fresh installation is made using either ext4 or xfs filesystems before that date. WARNING: untranslated string: release = Release diff --git a/doc/language_missings b/doc/language_missings index 28ae29c2b..c92e1e6a3 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -58,6 +58,9 @@ < extrahd because it it outside the allowed mount path < g.dtm < g.lite +< hostile networks in +< hostile networks out +< hostile networks total < ids automatic rules update < ids subscription code required < insert removable device @@ -66,6 +69,8 @@ < ipsec invalid ip address or fqdn for rw endpoint < ipsec roadwarrior endpoint < link-layer encapsulation +< log drop hostile in +< log drop hostile out < netbios nameserver daemon < no entries < notes @@ -73,6 +78,7 @@ < optional < quick control < random number generator daemon +< regenerate host certificate < reiserfs warning1 < reiserfs warning2 < required @@ -114,9 +120,15 @@ < extrahd not configured < extrahd not mounted < hardware vulnerabilities +< hostile networks in +< hostile networks out +< hostile networks total < invalid ip or hostname +< log drop hostile in +< log drop hostile out < openvpn cert expires soon < openvpn cert has expired +< regenerate host certificate < reiserfs warning1 < reiserfs warning2 < service boot setting unavailable @@ -138,6 +150,12 @@ < extrahd not mounted < g.dtm < g.lite +< hostile networks in +< hostile networks out +< hostile networks total +< log drop hostile in +< log drop hostile out +< regenerate host certificate < reiserfs warning1 < reiserfs warning2 < spec rstack overflow @@ -361,7 +379,9 @@ < guaranteed bandwidth < guardian < hardware vulnerabilities -< hostile networks +< hostile networks in +< hostile networks out +< hostile networks total < ids add provider < ids adjust ruleset < ids apply @@ -464,6 +484,8 @@ < locationblock country name < locationblock enable feature < locationblock flag +< log drop hostile in +< log drop hostile out < log dropped conntrack invalids < log server protocol < masquerade blue @@ -523,6 +545,7 @@ < reboot fsck < rebooting ipfire fsck < received +< regenerate host certificate < reiserfs warning1 < reiserfs warning2 < release @@ -880,7 +903,9 @@ < generate ptr < guardian < hardware vulnerabilities -< hostile networks +< hostile networks in +< hostile networks out +< hostile networks total < ids add provider < ids adjust ruleset < ids apply @@ -985,6 +1010,8 @@ < locationblock country name < locationblock enable feature < locationblock flag +< log drop hostile in +< log drop hostile out < log dropped conntrack invalids < log server protocol < masquerade blue @@ -1063,6 +1090,7 @@ < rdns < rebooting ipfire fsck < received +< regenerate host certificate < reiserfs warning1 < reiserfs warning2 < required @@ -1704,7 +1732,9 @@ < grouptype < guardian < hardware vulnerabilities -< hostile networks +< hostile networks in +< hostile networks out +< hostile networks total < ids add provider < ids adjust ruleset < ids apply @@ -1819,6 +1849,8 @@ < locationblock country name < locationblock enable feature < locationblock flag +< log drop hostile in +< log drop hostile out < log dropped conntrack invalids < log server protocol < mac filter @@ -1943,6 +1975,7 @@ < rebooting ipfire fsck < received < red1 +< regenerate host certificate < reiserfs warning1 < reiserfs warning2 < release @@ -2695,7 +2728,9 @@ < grouptype < guardian < hardware vulnerabilities -< hostile networks +< hostile networks in +< hostile networks out +< hostile networks total < hour-graph < ids add provider < ids adjust ruleset @@ -2812,6 +2847,8 @@ < locationblock country name < locationblock enable feature < locationblock flag +< log drop hostile in +< log drop hostile out < log dropped conntrack invalids < log server protocol < mac filter @@ -2934,6 +2971,7 @@ < rebooting ipfire fsck < received < red1 +< regenerate host certificate < reiserfs warning1 < reiserfs warning2 < release @@ -3280,7 +3318,9 @@ < fw red < generate ptr < hardware vulnerabilities -< hostile networks +< hostile networks in +< hostile networks out +< hostile networks total < ids add provider < ids adjust ruleset < ids apply @@ -3368,6 +3408,8 @@ < legacy architecture warning < link-layer encapsulation < local ip address +< log drop hostile in +< log drop hostile out < log dropped conntrack invalids < meltdown < mitigated @@ -3405,6 +3447,7 @@ < reboot fsck < rebooting ipfire fsck < received +< regenerate host certificate < reiserfs warning1 < reiserfs warning2 < release diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi index fbff67b2f..60b1bdd91 100644 --- a/html/cgi-bin/optionsfw.cgi +++ b/html/cgi-bin/optionsfw.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -94,6 +94,12 @@ if (!$settings{'DROPSPOOFEDMARTIAN'}) { if (!$settings{'DROPHOSTILE'}) { $settings{'DROPHOSTILE'} = 'off'; } +if (!$settings{'LOGDROPHOSTILEIN'}) { + $settings{'LOGDROPHOSTILEIN'} = 'on'; +} +if (!$settings{'LOGDROPHOSTILEOUT'}) { + $settings{'LOGDROPHOSTILEOUT'} = 'on'; +} if (!$settings{'LOGDROPCTINVALID'}) { $settings{'LOGDROPCTINVALID'} = 'on'; } @@ -125,6 +131,12 @@ $checked{'DROPSPOOFEDMARTIAN'}{$settings{'DROPSPOOFEDMARTIAN'}} = "checked='chec $checked{'DROPHOSTILE'}{'off'} = ''; $checked{'DROPHOSTILE'}{'on'} = ''; $checked{'DROPHOSTILE'}{$settings{'DROPHOSTILE'}} = "checked='checked'"; +$checked{'LOGDROPHOSTILEIN'}{'off'} = ''; +$checked{'LOGDROPHOSTILEIN'}{'on'} = ''; +$checked{'LOGDROPHOSTILEIN'}{$settings{'LOGDROPHOSTILEIN'}} = "checked='checked'"; +$checked{'LOGDROPHOSTILEOUT'}{'off'} = ''; +$checked{'LOGDROPHOSTILEOUT'}{'on'} = ''; +$checked{'LOGDROPHOSTILEOUT'}{$settings{'LOGDROPHOSTILEOUT'}} = "checked='checked'"; $checked{'LOGDROPCTINVALID'}{'off'} = ''; $checked{'LOGDROPCTINVALID'}{'on'} = ''; $checked{'LOGDROPCTINVALID'}{$settings{'LOGDROPCTINVALID'}} = "checked='checked'"; @@ -212,6 +224,29 @@ END <br> +<table width='95%' cellspacing='0'> + <tr bgcolor='$color{'color20'}'> + <td colspan='2' align='left'><b>$Lang::tr{'fw red'}</b></td> + </tr> + <tr> + <td align='left' width='60%'>$Lang::tr{'drop hostile'}</td> + <td align='left'> + $Lang::tr{'on'} <input type='radio' name='DROPHOSTILE' value='on' $checked{'DROPHOSTILE'}{'on'} />/ + <input type='radio' name='DROPHOSTILE' value='off' $checked{'DROPHOSTILE'}{'off'} /> $Lang::tr{'off'} + </td> + </tr> +</table> +<br> + +<table width='95%' cellspacing='0'> +<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw blue'}</b></td></tr> +<tr><td align='left' width='60%'>$Lang::tr{'drop proxy'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPPROXY' value='on' $checked{'DROPPROXY'}{'on'} />/ + <input type='radio' name='DROPPROXY' value='off' $checked{'DROPPROXY'}{'off'} /> $Lang::tr{'off'}</td></tr> +<tr><td align='left' width='60%'>$Lang::tr{'drop samba'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPSAMBA' value='on' $checked{'DROPSAMBA'}{'on'} />/ + <input type='radio' name='DROPSAMBA' value='off' $checked{'DROPSAMBA'}{'off'} /> $Lang::tr{'off'}</td></tr> +</table> +<br> + <table width='95%' cellspacing='0'> <tr bgcolor='$color{'color20'}'> <td colspan='2' align='left'><b>$Lang::tr{'fw logging'}</b></td> @@ -279,31 +314,23 @@ END <input type='radio' name='DROPSPOOFEDMARTIAN' value='off' $checked{'DROPSPOOFEDMARTIAN'}{'off'} /> $Lang::tr{'off'} </td> </tr> -</table> -<br/> - -<table width='95%' cellspacing='0'> - <tr bgcolor='$color{'color20'}'> - <td colspan='2' align='left'><b>$Lang::tr{'fw red'}</b></td> + <tr> + <td align='left' width='60%'>$Lang::tr{'log drop hostile in'}</td> + <td align='left'> + $Lang::tr{'on'} <input type='radio' name='LOGDROPHOSTILEIN' value='on' $checked{'LOGDROPHOSTILEIN'}{'on'} />/ + <input type='radio' name='LOGDROPHOSTILEIN' value='off' $checked{'LOGDROPHOSTILEIN'}{'off'} /> $Lang::tr{'off'} + </td> </tr> <tr> - <td align='left' width='60%'>$Lang::tr{'drop hostile'}</td> + <td align='left' width='60%'>$Lang::tr{'log drop hostile out'}</td> <td align='left'> - $Lang::tr{'on'} <input type='radio' name='DROPHOSTILE' value='on' $checked{'DROPHOSTILE'}{'on'} />/ - <input type='radio' name='DROPHOSTILE' value='off' $checked{'DROPHOSTILE'}{'off'} /> $Lang::tr{'off'} + $Lang::tr{'on'} <input type='radio' name='LOGDROPHOSTILEOUT' value='on' $checked{'LOGDROPHOSTILEOUT'}{'on'} />/ + <input type='radio' name='LOGDROPHOSTILEOUT' value='off' $checked{'LOGDROPHOSTILEOUT'}{'off'} /> $Lang::tr{'off'} </td> </tr> </table> -<br> +<br/> -<table width='95%' cellspacing='0'> -<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw blue'}</b></td></tr> -<tr><td align='left' width='60%'>$Lang::tr{'drop proxy'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPPROXY' value='on' $checked{'DROPPROXY'}{'on'} />/ - <input type='radio' name='DROPPROXY' value='off' $checked{'DROPPROXY'}{'off'} /> $Lang::tr{'off'}</td></tr> -<tr><td align='left' width='60%'>$Lang::tr{'drop samba'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPSAMBA' value='on' $checked{'DROPSAMBA'}{'on'} />/ - <input type='radio' name='DROPSAMBA' value='off' $checked{'DROPSAMBA'}{'off'} /> $Lang::tr{'off'}</td></tr> -</table> -<br> <table width='95%' cellspacing='0'> <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw settings'}</b></td></tr> <tr><td align='left' width='60%'>$Lang::tr{'fw settings color'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='SHOWCOLORS' value='on' $checked{'SHOWCOLORS'}{'on'} />/ diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 53507305f..9173a85d8 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -229,13 +229,14 @@ sub callssl ($) { my $opt = shift; my $retssl = `/usr/bin/openssl $opt 2>&1`; #redirect stderr my $ret = ''; - foreach my $line (split (/\n/, $retssl)) { - &General::log("ipsec", "$line") if (0); # 1 for verbose logging - $ret .= '<br>'.$line if ( $line =~ /error|unknown/ ); - } - if ($ret) { - $ret= &Header::cleanhtml($ret); + + if ($?) { + foreach my $line (split (/\n/, $retssl)) { + &General::log("ipsec", "$line") if (0); # 1 for verbose logging + $ret .= '<br>' . &Header::escape($line); + } } + return $ret ? "$Lang::tr{'openssl produced an error'}: $ret" : '' ; } ### @@ -865,6 +866,12 @@ END exit(0); } ### +### Regenerate the host certificate +### +} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'regenerate host certificate'}) { + $errormessage = &regenerate_host_certificate(); + +### ### Form for generating/importing the caroot+host certificate ### } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'generate root/host certificates'} || @@ -2141,7 +2148,7 @@ END &General::log("ipsec", "Creating a cert..."); if (open(STDIN, "-|")) { - my $opt = " req -nodes -rand /proc/interrupts:/proc/net/rt_cache"; + my $opt = " req -nodes"; $opt .= " -newkey rsa:4096"; $opt .= " -keyout ${General::swroot}/certs/$cgiparams{'NAME'}key.pem"; $opt .= " -out ${General::swroot}/certs/$cgiparams{'NAME'}req.pem"; @@ -3611,7 +3618,12 @@ END <input type='hidden' name='ACTION' value="$Lang::tr{'download host certificate'}" /> </form> </td> - <td width='4%' $col2> </td></tr> + <td width='4%' align='center' $col2> + <form method='post' action='$ENV{'SCRIPT_NAME'}'> + <input type='image' name='$Lang::tr{'regenerate host certificate'}' src='/images/reload.gif' alt='$Lang::tr{'regenerate host certificate'}' title='$Lang::tr{'regenerate host certificate'}' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'regenerate host certificate'}' /> + </form> + </td></tr> END ; } else { @@ -3781,3 +3793,44 @@ sub make_subnets($$) { return join(",", @cidr_nets); } + +sub regenerate_host_certificate() { + my $errormessage = ""; + + &General::log("ipsec", "Regenerating host certificate..."); + + # Create a CSR based on the existing certificate + my $opt = " x509 -x509toreq -copy_extensions copyall"; + $opt .= " -signkey ${General::swroot}/certs/hostkey.pem"; + $opt .= " -in ${General::swroot}/certs/hostcert.pem"; + $opt .= " -out ${General::swroot}/certs/hostreq.pem"; + $errormessage = &callssl($opt); + + # Revoke the old certificate + if (!$errormessage) { + &General::log("ipsec", "Revoking the old host cert..."); + + my $opt = " ca -revoke ${General::swroot}/certs/hostcert.pem"; + $errormessage = &callssl($opt); + } + + # Sign the host certificate request + if (!$errormessage) { + &General::log("ipsec", "Self signing host cert..."); + + my $opt = " ca -md sha256 -days 825"; + $opt .= " -batch -notext"; + $opt .= " -in ${General::swroot}/certs/hostreq.pem"; + $opt .= " -out ${General::swroot}/certs/hostcert.pem"; + $errormessage = &callssl ($opt); + + unlink ("${General::swroot}/certs/hostreq.pem"); #no more needed + } + + # Reload the new certificate + if (!$errormessage) { + &General::system('/usr/local/bin/ipsecctrl', 'R'); + } + + return $errormessage; +} diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 16a3061b4..3246102ba 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1409,7 +1409,9 @@ 'host deny' => 'list with denied hosts', 'host ip' => 'Host IP address', 'host to net vpn' => 'Host-to-Net Virtual Private Network (RoadWarrior)', -'hostile networks' => 'Hostile networks', +'hostile networks in' => 'From Hostile Networks', +'hostile networks out' => 'To Hostile Networks', +'hostile networks total' => 'Total Hostile Networks', 'hostname' => 'Hostname', 'hostname and domain already in use' => 'Hostname and domain already in use.', 'hostname cant be empty' => 'Hostname cannot be empty.', @@ -1686,6 +1688,8 @@ 'locationblock enable feature' => 'Enable Location based blocking:', 'locationblock flag' => 'Flag', 'log' => 'Log', +'log drop hostile in' => 'Log dropped packets FROM hostile networks', +'log drop hostile out' => 'Log dropped packets TO hostile networks', 'log dropped conntrack invalids' => 'Log dropped packets classified as INVALID by connection tracking', 'log enabled' => 'Log Enabled', 'log level' => 'Log Level', @@ -2208,6 +2212,7 @@ 'refresh' => 'Refresh', 'refresh index page while connected' => 'Refresh index.cgi page while connected', 'refresh update list' => 'Refresh update list', +'regenerate host certificate' => 'Renew Host Certificate', 'registered user rules' => 'Talos VRT rules for registered users', 'reiserfs warning1' => 'Reiserfs is deprecated and scheduled to be removed from the kernel in 2025.', 'reiserfs warning2' => 'Ensure a fresh installation is made using either ext4 or xfs filesystems before that date.', diff --git a/lfs/elfutils b/lfs/elfutils index 9fb69af62..7dd95caa2 100644 --- a/lfs/elfutils +++ b/lfs/elfutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 = elfutils -PAK_VER = 10 - -DEPS = - -SERVICES = ############################################################################### # Top-level Rules @@ -58,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) b2 : $(subst %,%_BLAKE2,$(objects)) -dist: - @$(PAK) - ############################################################################### # Downloading, checking, b2sum ############################################################################### diff --git a/lfs/frr b/lfs/frr index a1555af64..f0954aae5 100644 --- a/lfs/frr +++ b/lfs/frr @@ -34,9 +34,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = frr -PAK_VER = 7 +PAK_VER = 8 -DEPS = elfutils +DEPS = SERVICES = frr diff --git a/lfs/ltrace b/lfs/ltrace index 3d1fdee3f..f3f07c0b1 100644 --- a/lfs/ltrace +++ b/lfs/ltrace @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -35,9 +35,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ltrace -PAK_VER = 2 +PAK_VER = 3 -DEPS = elfutils +DEPS = SERVICES = diff --git a/lfs/qemu b/lfs/qemu index 2c45d7156..d65282743 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -35,9 +35,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = qemu -PAK_VER = 41 +PAK_VER = 42 -DEPS = alsa elfutils libusbredir spice libseccomp libslirp +DEPS = alsa libusbredir spice libseccomp libslirp SERVICES = diff --git a/lfs/strace b/lfs/strace index 2ce9b26d8..97253340a 100644 --- a/lfs/strace +++ b/lfs/strace @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -35,9 +35,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = strace -PAK_VER = 10 +PAK_VER = 11 -DEPS = elfutils +DEPS = SERVICES = diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall index 3aab7dd75..69bdcb594 100644 --- a/src/initscripts/system/firewall +++ b/src/initscripts/system/firewall @@ -179,9 +179,18 @@ iptables_init() { iptables -A FORWARD -j HOSTILE iptables -A OUTPUT -j HOSTILE - iptables -N HOSTILE_DROP - iptables -A HOSTILE_DROP -m limit --limit 10/second -j LOG --log-prefix "DROP_HOSTILE " - iptables -A HOSTILE_DROP -j DROP -m comment --comment "DROP_HOSTILE" + iptables -N HOSTILE_DROP_IN + if [ "$LOGDROPHOSTILEIN" == "on" ]; then + iptables -A HOSTILE_DROP_IN -m limit --limit 10/second -j LOG --log-prefix "DROP_HOSTILE " + fi + iptables -A HOSTILE_DROP_IN -j DROP -m comment --comment "DROP_HOSTILE" + + iptables -N HOSTILE_DROP_OUT + if [ "$LOGDROPHOSTILEOUT" == "on" ]; then + iptables -A HOSTILE_DROP_OUT -m limit --limit 10/second -j LOG --log-prefix "DROP_HOSTILE " + fi + iptables -A HOSTILE_DROP_OUT -j DROP -m comment --comment "DROP_HOSTILE" + # IP Address Blocklist chains iptables -N BLOCKLISTIN hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 437bfd678013cf2b56b673b67a3eb6d68a0831cd
by Arne Fitzenreiter 05 Feb '24

05 Feb '24

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 437bfd678013cf2b56b673b67a3eb6d68a0831cd (commit) via 6179f056da9a9191d26a0ea7a54dbb231ff97036 (commit) via 2c930773f56b75903c590cf41bcdfe680c743c3c (commit) via bc4b8c485863d4a5d71f083b684080132fa726d2 (commit) via cbf32e7dd20dcc008aafe4c34d5b8898ccea2dd4 (commit) from 8fcd99355b0386522f22fe08c098afc9df375b22 (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 437bfd678013cf2b56b673b67a3eb6d68a0831cd Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Feb 5 11:07:03 2024 +0100 vdr_streamdev: update to 0.6.3 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 6179f056da9a9191d26a0ea7a54dbb231ff97036 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Feb 5 11:06:29 2024 +0100 vdr_epgsearch: update to 2.4.2 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 2c930773f56b75903c590cf41bcdfe680c743c3c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Feb 5 11:05:02 2024 +0100 vdr_eepg: update PLUGVER to new vdr Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit bc4b8c485863d4a5d71f083b684080132fa726d2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Feb 5 11:03:33 2024 +0100 vdr_dvbapi: update pluginver for new vdr Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit cbf32e7dd20dcc008aafe4c34d5b8898ccea2dd4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Feb 5 11:02:25 2024 +0100 vdr: update to 2.6.6 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/vdr_dvbapi | 2 +- config/rootfiles/packages/vdr_eepg | 2 +- config/rootfiles/packages/vdr_epgsearch | 8 ++++---- config/rootfiles/packages/vdr_streamdev | 2 +- lfs/vdr | 10 +++++----- lfs/vdr_dvbapi | 6 +++--- lfs/vdr_eepg | 6 +++--- lfs/vdr_epgsearch | 15 +++++++-------- lfs/vdr_streamdev | 15 +++++++-------- 9 files changed, 32 insertions(+), 34 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/vdr_dvbapi b/config/rootfiles/packages/vdr_dvbapi index b874d9e7e..c6892374d 100644 --- a/config/rootfiles/packages/vdr_dvbapi +++ b/config/rootfiles/packages/vdr_dvbapi @@ -1,3 +1,3 @@ etc/sysconfig/vdr-plugins.d/dvbapi.conf etc/vdr/plugins/dvbapi -usr/lib/vdr/libvdr-dvbapi.so.2.4.7 +usr/lib/vdr/libvdr-dvbapi.so.2.6.6 diff --git a/config/rootfiles/packages/vdr_eepg b/config/rootfiles/packages/vdr_eepg index 4f8389cc9..61f13c812 100644 --- a/config/rootfiles/packages/vdr_eepg +++ b/config/rootfiles/packages/vdr_eepg @@ -1,2 +1,2 @@ etc/vdr/plugins/eepg -usr/lib/vdr/libvdr-eepg.so.2.4.7 +usr/lib/vdr/libvdr-eepg.so.2.6.6 diff --git a/config/rootfiles/packages/vdr_epgsearch b/config/rootfiles/packages/vdr_epgsearch index 9143aec02..765f8fa7e 100644 --- a/config/rootfiles/packages/vdr_epgsearch +++ b/config/rootfiles/packages/vdr_epgsearch @@ -5,10 +5,10 @@ etc/sysconfig/vdr-plugins.d/quickepgsearch.conf etc/vdr/plugins/epgsearch etc/vdr/plugins/epgsearch/conf.d usr/bin/createcats -usr/lib/vdr/libvdr-conflictcheckonly.so.2.4.7 -usr/lib/vdr/libvdr-epgsearch.so.2.4.7 -usr/lib/vdr/libvdr-epgsearchonly.so.2.4.7 -usr/lib/vdr/libvdr-quickepgsearch.so.2.4.7 +usr/lib/vdr/libvdr-conflictcheckonly.so.2.6.6 +usr/lib/vdr/libvdr-epgsearch.so.2.6.6 +usr/lib/vdr/libvdr-epgsearchonly.so.2.6.6 +usr/lib/vdr/libvdr-quickepgsearch.so.2.6.6 #var/lib/vdr #var/lib/vdr/data var/lib/vdr/data/epgsearch diff --git a/config/rootfiles/packages/vdr_streamdev b/config/rootfiles/packages/vdr_streamdev index 3cd8440f0..8e631a3fd 100644 --- a/config/rootfiles/packages/vdr_streamdev +++ b/config/rootfiles/packages/vdr_streamdev @@ -4,4 +4,4 @@ etc/vdr/plugins/streamdev-server etc/vdr/plugins/streamdev-server/streamdevhosts.conf #usr/lib/vdr/bin usr/lib/vdr/bin/externremux.sh -usr/lib/vdr/libvdr-streamdev-server.so.2.4.7 +usr/lib/vdr/libvdr-streamdev-server.so.2.6.6 diff --git a/lfs/vdr b/lfs/vdr index 2fd58ed27..eb761123d 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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,11 +26,11 @@ include Config SUMMARY = Video Disk Recorder -VER = 2.4.7 +VER = 2.6.6 # VDRPLUGVER must match with APIVERSION! in config.h # after change this update also all vdr plugins -VDRPLUGVER = 2.4.7 +VDRPLUGVER = 2.6.6 THISAPP = vdr-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -39,7 +39,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr -PAK_VER = 15 +PAK_VER = 16 DEPS = vdr_streamdev @@ -71,7 +71,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = be4e1ec365330855e4b2b26f44b1f35dc323e4783e96ef344a67b3e9fe2c0499760ab0f3d27c5e3bdddf5a65ebb65b0c81a62092301d34370aa19d0dd63bb1ab +$(DL_FILE)_BLAKE2 = 22ad6d0d4048347ff16a48ad137900f32dda7adfc7fb54bb1501f14cfc426185f942ffa4997de1e0318ca8c6b67a7dfc48d49b30bfda9367d7337b2d601544fc install : $(TARGET) diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi index 17f4c3a17..d36f75d69 100644 --- a/lfs/vdr_dvbapi +++ b/lfs/vdr_dvbapi @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -35,13 +35,13 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr_dvbapi -PAK_VER = 6 +PAK_VER = 7 DEPS = SERVICES = -VDRPLUGVER = 2.4.7 +VDRPLUGVER = 2.6.6 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) diff --git a/lfs/vdr_eepg b/lfs/vdr_eepg index 5836a25de..61c156da3 100644 --- a/lfs/vdr_eepg +++ b/lfs/vdr_eepg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 # @@ -38,13 +38,13 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr_eepg -PAK_VER = 5 +PAK_VER = 6 DEPS = SERVICES = -VDRPLUGVER = 2.4.7 +VDRPLUGVER = 2.6.6 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch index 353f81271..dceea2cc8 100644 --- a/lfs/vdr_epgsearch +++ b/lfs/vdr_epgsearch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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,22 +26,22 @@ include Config SUMMARY = Searchtimer and replacement of the VDR program menu -VER = 2.4.0+git20191101 +VER = 2.4.2 -THISAPP = vdr-plugin-epgsearch_$(VER).orig +THISAPP = vdr-plugin-epgsearch-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/vdr-plugin-epgsearch +DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr_epgsearch -PAK_VER = 11 +PAK_VER = 12 DEPS = SERVICES = -VDRPLUGVER = 2.4.7 +VDRPLUGVER = 2.6.6 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) @@ -55,7 +55,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = d48a3174c451ddca257d36c45747d41f7c628b8963558115f27053ef6d57cc5b3c6d5860a6af46dd37f16d6ad7f29c9fb10c4295be76e60cbfef4943ca456241 +$(DL_FILE)_BLAKE2 = 1e2ed02a2d8ac1ba1e2ffd72b7830c4bb9a3478cebce8affd871e7cac25ac7759f21908447d74652632541dca74cbeb8e4de9773550bad65d279770677b7e146 install : $(TARGET) @@ -89,7 +89,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/vdr-epgsearch-2.4.0-debian-paths.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-epgsearch-2.4.0-gcc1.patch cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev index 7c9f63246..af13b392b 100644 --- a/lfs/vdr_streamdev +++ b/lfs/vdr_streamdev @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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,23 +26,22 @@ include Config SUMMARY = VDR implementation of the VTP (Video Transfer Protocol) -VER = 0.6.1 -GIT_VER = e2a9b979d3fb92967c7a6a8221e674eb7e55c813 +VER = 0.6.3 -THISAPP = vdr-plugin-streamdev-$(GIT_VER) -DL_FILE = $(THISAPP).tar.bz2 +THISAPP = vdr-plugin-streamdev-$(VER) +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr_streamdev -PAK_VER = 7 +PAK_VER = 8 DEPS = SERVICES = -VDRPLUGVER = 2.4.7 +VDRPLUGVER = 2.6.6 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) @@ -56,7 +55,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 4cacadc091ab8d28ccd4318eaf18aaef8f45e6caab86ef461d1b1047039ec921984ebad091d29420779982b5b37606defe5aa6c6828e8f28788886ba9839efea +$(DL_FILE)_BLAKE2 = 300c24aac6f0c59fc438eafa9a300e0b68dbfb43064cf887ab9d1fbdc1b22a8ec5349a38fa5c2188ef78dbc1ac7f238e88abe0ed9d1cbcd01e4a1afde7b890cf install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8fcd99355b0386522f22fe08c098afc9df375b22
by Arne Fitzenreiter 04 Feb '24

04 Feb '24

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cd5d0b7658f67a5db50332434b93f579bda24e74
by Arne Fitzenreiter 03 Feb '24

03 Feb '24

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 cd5d0b7658f67a5db50332434b93f579bda24e74 (commit) from d145574673a2822fc219cda4d1e19184b94c1078 (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 cd5d0b7658f67a5db50332434b93f579bda24e74 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Feb 3 14:47:41 2024 +0000 checkrootfiles: fix search for wrong rootfiles Im not sure when the grep syntax has changed but grep -r not like/ignore the leading "/" anymore. ----------------------------------------------------------------------- Summary of changes: tools/checkrootfiles | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) Difference in files: diff --git a/tools/checkrootfiles b/tools/checkrootfiles index 05b16f368..5036ce2d0 100755 --- a/tools/checkrootfiles +++ b/tools/checkrootfiles @@ -33,31 +33,35 @@ if [ "${?}" == "0" ]; then echo "Comment this and create it at initskript if needed !" fi -grep -r '/x86_64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \ +grep -r 'x86_64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \ --exclude rust-ppv-lite86 --exclude rust-memchr --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64 \ - --exclude update.sh \ + --exclude update.sh --exclude qemu --exclude cmake --exclude xfsprogs \ --exclude-dir oldcore --exclude-dir x86_64 >/dev/null 2>&1 if [ "${?}" == "0" ]; then echo "Error! '/x86_64' in rootfiles files found!" - grep -r '/x86_64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \ + grep -r 'x86_64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \ --exclude rust-ppv-lite86 --exclude rust-memchr --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64 \ - --exclude update.sh \ + --exclude update.sh --exclude qemu --exclude cmake --exclude xfsprogs \ --exclude-dir oldcore --exclude-dir x86_64 echo "Replace by xxxMACHINExxx !" fi -grep -r '/aarch64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude gdb --exclude liburcu --exclude gdb --exclude-dir oldcore --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64 >/dev/null 2>&1 +grep -r 'aarch64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude gdb --exclude liburcu --exclude gdb \ + --exclude qemu --exclude liburcu --exclude abseil-cpp \ + --exclude-dir oldcore --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64 >/dev/null 2>&1 if [ "${?}" == "0" ]; then - echo "Error! '/aarch64' in rootfiles files found!" - grep -r '/aarch64' ./config/rootfiles/ --exclude gcc --exclude rust-libc \ + echo "Error! 'aarch64' in rootfiles files found!" + grep -r 'aarch64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude gdb \ + --exclude qemu --exclude liburcu --exclude abseil-cpp \ --exclude-dir oldcore --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64 echo "Replace by xxxMACHINExxx !" fi -grep -r '/riscv64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude gdb --exclude liburcu --exclude go --exclude-dir oldcore --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64 >/dev/null 2>&1 +grep -r 'riscv64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude gdb --exclude liburcu --exclude go --exclude qemu \ + --exclude-dir oldcore --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64 >/dev/null 2>&1 if [ "${?}" == "0" ]; then - echo "Error! '/riscv64' in rootfiles files found!" - grep -r '/riscv64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude go \ + echo "Error! 'riscv64' in rootfiles files found!" + grep -r 'riscv64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude go --exclude qemu \ --exclude-dir oldcore --exclude-dir aarch64 --exclude-dir riscv64 --exclude-dir x86_64 echo "Replace by xxxMACHINExxx !" fi hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 8c43d1481a99743ce23d8b92879ea04f7e0153c1
by Arne Fitzenreiter 02 Feb '24

02 Feb '24

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, master has been updated via 8c43d1481a99743ce23d8b92879ea04f7e0153c1 (commit) via 7f7cbd68b8fc15de7d8a10569684611704f005b7 (commit) via 664eac84834676fd0bd64b7a90c93e4c612a860c (commit) via fdad4cf48f53556086fea1965b3e79b2c68ed3d5 (commit) from 83338946dc2121d1f0d332d4e5f2f13b1bf078d5 (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 8c43d1481a99743ce23d8b92879ea04f7e0153c1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Feb 2 07:33:38 2024 +0000 kernel: update to 6.6.15 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 7f7cbd68b8fc15de7d8a10569684611704f005b7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 31 21:09:14 2024 +0100 mympd: create/check config before first start this create missing folders for webradio and state. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 664eac84834676fd0bd64b7a90c93e4c612a860c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jan 28 21:29:46 2024 +0100 mympd: new addon to control mpd via WebGUI myMPD is written in C and has a nice WebGUI to play local music and also a WebRadio browser. This is to replace the removec client175. After install it can reached via https://IP_OF_THE_IPFIRE:8800 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fdad4cf48f53556086fea1965b3e79b2c68ed3d5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jan 28 15:42:53 2024 +0100 mpfire: fix initskript uninstall the uninstall with rm /etc/rc*.d/*mpd remove not only the mpd initlinks. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/includes/mympd | 1 + config/kernel/kernel.config.aarch64-ipfire | 6 ++--- config/kernel/kernel.config.riscv64-ipfire | 4 +-- config/kernel/kernel.config.x86_64-ipfire | 2 +- config/rootfiles/common/aarch64/linux | 2 ++ config/rootfiles/packages/mympd | 18 +++++++++++++ lfs/linux | 4 +-- lfs/mpfire | 2 +- lfs/{soxr => mympd} | 37 +++++++++++++++++++------- make.sh | 1 + src/initscripts/packages/{qemu-ga => mympd} | 17 ++++++------ src/paks/mpfire/uninstall.sh | 2 +- src/paks/{fetchmail => mympd}/install.sh | 14 +++++----- src/paks/{igmpproxy => mympd}/uninstall.sh | 5 ++-- src/paks/{amazon-ssm-agent => mympd}/update.sh | 2 +- 15 files changed, 79 insertions(+), 38 deletions(-) create mode 100644 config/backup/includes/mympd create mode 100644 config/rootfiles/packages/mympd copy lfs/{soxr => mympd} (75%) copy src/initscripts/packages/{qemu-ga => mympd} (84%) copy src/paks/{fetchmail => mympd}/install.sh (84%) copy src/paks/{igmpproxy => mympd}/uninstall.sh (93%) copy src/paks/{amazon-ssm-agent => mympd}/update.sh (96%) Difference in files: diff --git a/config/backup/includes/mympd b/config/backup/includes/mympd new file mode 100644 index 000000000..44481decc --- /dev/null +++ b/config/backup/includes/mympd @@ -0,0 +1 @@ +/var/lib/mympd diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 411e95be9..04d65d6ce 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.13-ipfire Kernel Configuration +# Linux/arm64 6.6.15-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -378,7 +378,9 @@ CONFIG_ARM64_ERRATUM_2067961=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2645198=y +CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y CONFIG_ARM64_ERRATUM_2966298=y +CONFIG_ARM64_ERRATUM_3117295=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y @@ -6859,8 +6861,6 @@ CONFIG_MMC_CQHCI=m CONFIG_MMC_BCM2835=y # CONFIG_MMC_MTK is not set # CONFIG_MMC_SDHCI_XENON is not set -# CONFIG_MMC_SDHCI_OMAP is not set -# CONFIG_MMC_SDHCI_AM654 is not set # CONFIG_SCSI_UFSHCD is not set # CONFIG_MEMSTICK is not set CONFIG_NEW_LEDS=y diff --git a/config/kernel/kernel.config.riscv64-ipfire b/config/kernel/kernel.config.riscv64-ipfire index 620854021..52a7c1c45 100644 --- a/config/kernel/kernel.config.riscv64-ipfire +++ b/config/kernel/kernel.config.riscv64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 6.6.13-ipfire Kernel Configuration +# Linux/riscv 6.6.15-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -5820,8 +5820,6 @@ CONFIG_MMC_CQHCI=m # CONFIG_MMC_TOSHIBA_PCI is not set # CONFIG_MMC_MTK is not set CONFIG_MMC_SDHCI_XENON=m -# CONFIG_MMC_SDHCI_OMAP is not set -# CONFIG_MMC_SDHCI_AM654 is not set CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFS_BSG=y CONFIG_SCSI_UFS_CRYPTO=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 96da4cdb7..79375e954 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.13-ipfire Kernel Configuration +# Linux/x86 6.6.15-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index a32c3770e..92c4a4286 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -7263,6 +7263,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2645198 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2658417 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2966298 +#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_3117295 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_819472 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_824069 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_826319 @@ -7294,6 +7295,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_CLEAN_CACHE #lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_REPEAT_TLBI #lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_SPECULATIVE_AT +#lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD #lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_TSB_FLUSH_FAILURE #lib/modules/KVER-ipfire/build/include/config/ARMADA_37XX_CLK #lib/modules/KVER-ipfire/build/include/config/ARMADA_37XX_WATCHDOG diff --git a/config/rootfiles/packages/mympd b/config/rootfiles/packages/mympd new file mode 100644 index 000000000..bc9912b85 --- /dev/null +++ b/config/rootfiles/packages/mympd @@ -0,0 +1,18 @@ +etc/rc.d/init.d/mympd +usr/bin/mympd +usr/bin/mympd-script +#usr/lib/systemd/system/mympd.service +#usr/share/doc/mympd +#usr/share/doc/mympd/CHANGELOG.md +#usr/share/doc/mympd/LICENSE.md +#usr/share/doc/mympd/README.md +#usr/share/doc/mympd/SECURITY.md +#usr/share/man/man1/mympd-script.1.gz +#usr/share/man/man1/mympd.1.gz +var/ipfire/backup/addons/includes/mympd +var/lib/mympd +#var/lib/mympd/config +#var/lib/mympd/config/http +#var/lib/mympd/config/ssl_port +#var/lib/mympd/state +#var/lib/mympd/state/music_directory diff --git a/lfs/linux b/lfs/linux index 023f48a4b..efd3e8533 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.6.13 +VER = 6.6.15 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 1d644e48fa4fd3740712130b0d5756b75d70471cda2a7206083434ec89d288bd7487e633c8954ec038e3784d56d7a787e6cab1c93e5fbfcfc0b44a7b55b0debd +$(DL_FILE)_BLAKE2 = a630bc7b2463bdc312f8936210a54e92bbe4136fc78995c18d0ccafbcdb27cce5b7b0d4a6ba10c378e14e86855ee7e76e355acc0580f7441e4df64e7dbd8a4b7 install : $(TARGET) diff --git a/lfs/mpfire b/lfs/mpfire index f45b02902..590cf31ef 100644 --- a/lfs/mpfire +++ b/lfs/mpfire @@ -32,7 +32,7 @@ THISAPP = mpfire-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpfire -PAK_VER = 15 +PAK_VER = 16 DEPS = mpd mpc diff --git a/lfs/mympd b/lfs/mympd new file mode 100644 index 000000000..ffedcdcce --- /dev/null +++ b/lfs/mympd @@ -0,0 +1,107 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2024 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 # +# 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 + +SUMMARY = Webfrontend for Music Player Daemon + +VER = 13.0.6 + +THISAPP = myMPD-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = mympd +PAK_VER = 1 + +# TODO move mpd initskript and config to mpd package to run without mpfire +DEPS = mpd libmpdclient mpfire + +SERVICES = mympd + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 2ecd8d42b9398e85fc6c149c9e55f760f2039434039d558ac1914b447858a59676ed9300bc89b2a25757b8d9828dec5934376d4587f6b84026d07adbfd2e4a33 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# 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) && mkdir -p build + cd $(DIR_APP)/build && cmake -Wno-dev \ + -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + cd $(DIR_APP)/build && make $(MAKETUNING) + cd $(DIR_APP)/build && make install + + #generate config + mkdir -p /var/lib/mympd/config + echo false > /var/lib/mympd/config/http + echo 8800 > /var/lib/mympd/config/ssl_port + mkdir -p /var/lib/mympd/state + echo /var/mp3 > /var/lib/mympd/state/music_directory + chown nobody:nobody -R /var/lib/mympd + + #install backup include + install -v -m 644 $(DIR_SRC)/config/backup/includes/mympd \ + /var/ipfire/backup/addons/includes/mympd + + #install initscript + $(call INSTALL_INITSCRIPTS,$(SERVICES)) + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 06e09c9a3..f13d283bc 100755 --- a/make.sh +++ b/make.sh @@ -1699,6 +1699,7 @@ buildipfire() { lfsmake2 perl-MIME-Base32 lfsmake2 perl-URI-Encode lfsmake2 rsnapshot + lfsmake2 mympd # Kernelbuild ... current we have no platform that need # multi kernel builds so KCFG is empty diff --git a/src/initscripts/packages/mympd b/src/initscripts/packages/mympd new file mode 100644 index 000000000..a7cb9e523 --- /dev/null +++ b/src/initscripts/packages/mympd @@ -0,0 +1,53 @@ +#!/bin/sh +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2024 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 # +# 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/>. # +# # +############################################################################### + +. /etc/sysconfig/rc +. $rc_functions + +case "$1" in + start) + + boot_mesg "Starting mympd..." + loadproc /usr/bin/mympd -u nobody -s >/dev/null 2>&1 & + evaluate_retval + ;; + + stop) + boot_mesg "Stopping mympd..." + killproc /usr/bin/mympd >/dev/null 2>&1 + evaluate_retval + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + statusproc /usr/bin/mympd + ;; + + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; +esac diff --git a/src/paks/mpfire/uninstall.sh b/src/paks/mpfire/uninstall.sh index e729cb1ff..7dec707ee 100644 --- a/src/paks/mpfire/uninstall.sh +++ b/src/paks/mpfire/uninstall.sh @@ -25,4 +25,4 @@ /etc/init.d/mpd stop make_backup ${NAME} remove_files -rm -f /etc/rc.d/rc*.d/*mpd /var/log/mpd.error.log /var/log/mpd.log /etc/mpd.conf +rm -f /etc/rc.d/rc*.d/???mpd /var/log/mpd.error.log /var/log/mpd.log /etc/mpd.conf diff --git a/src/paks/mympd/install.sh b/src/paks/mympd/install.sh new file mode 100644 index 000000000..529f415e6 --- /dev/null +++ b/src/paks/mympd/install.sh @@ -0,0 +1,33 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007-2024 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +ln -svf /etc/init.d/mympd /etc/rc.d/rc3.d/S66mympd +ln -svf /etc/init.d/mympd /etc/rc.d/rc0.d/K34mympd +ln -svf /etc/init.d/mympd /etc/rc.d/rc6.d/K34mympd +restore_backup ${NAME} +# create/check config +/usr/bin/mympd -u nobody -c +# start service +/etc/init.d/mympd start diff --git a/src/paks/mympd/uninstall.sh b/src/paks/mympd/uninstall.sh new file mode 100644 index 000000000..8ca9ea74e --- /dev/null +++ b/src/paks/mympd/uninstall.sh @@ -0,0 +1,28 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007-2024 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/etc/init.d/mpd stop +make_backup ${NAME} +remove_files +rm -f /etc/rc.d/rc*.d/???mympd diff --git a/src/paks/mympd/update.sh b/src/paks/mympd/update.sh new file mode 100644 index 000000000..31d1d77cc --- /dev/null +++ b/src/paks/mympd/update.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007-2024 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_backup_includes +./uninstall.sh +./install.sh hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d145574673a2822fc219cda4d1e19184b94c1078
by Arne Fitzenreiter 02 Feb '24

02 Feb '24

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 d145574673a2822fc219cda4d1e19184b94c1078 (commit) from e95d12e5ee8dad6a605c306098f4e2618c8d7872 (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 d145574673a2822fc219cda4d1e19184b94c1078 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Feb 2 07:33:38 2024 +0000 kernel: update to 6.6.15 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 6 +++--- config/kernel/kernel.config.riscv64-ipfire | 4 +--- config/kernel/kernel.config.x86_64-ipfire | 2 +- config/rootfiles/common/aarch64/linux | 2 ++ lfs/linux | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 411e95be9..04d65d6ce 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.6.13-ipfire Kernel Configuration +# Linux/arm64 6.6.15-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -378,7 +378,9 @@ CONFIG_ARM64_ERRATUM_2067961=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2645198=y +CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y CONFIG_ARM64_ERRATUM_2966298=y +CONFIG_ARM64_ERRATUM_3117295=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y CONFIG_CAVIUM_ERRATUM_27456=y @@ -6859,8 +6861,6 @@ CONFIG_MMC_CQHCI=m CONFIG_MMC_BCM2835=y # CONFIG_MMC_MTK is not set # CONFIG_MMC_SDHCI_XENON is not set -# CONFIG_MMC_SDHCI_OMAP is not set -# CONFIG_MMC_SDHCI_AM654 is not set # CONFIG_SCSI_UFSHCD is not set # CONFIG_MEMSTICK is not set CONFIG_NEW_LEDS=y diff --git a/config/kernel/kernel.config.riscv64-ipfire b/config/kernel/kernel.config.riscv64-ipfire index 620854021..52a7c1c45 100644 --- a/config/kernel/kernel.config.riscv64-ipfire +++ b/config/kernel/kernel.config.riscv64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 6.6.13-ipfire Kernel Configuration +# Linux/riscv 6.6.15-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -5820,8 +5820,6 @@ CONFIG_MMC_CQHCI=m # CONFIG_MMC_TOSHIBA_PCI is not set # CONFIG_MMC_MTK is not set CONFIG_MMC_SDHCI_XENON=m -# CONFIG_MMC_SDHCI_OMAP is not set -# CONFIG_MMC_SDHCI_AM654 is not set CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFS_BSG=y CONFIG_SCSI_UFS_CRYPTO=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 96da4cdb7..79375e954 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.6.13-ipfire Kernel Configuration +# Linux/x86 6.6.15-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index a32c3770e..92c4a4286 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -7263,6 +7263,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2645198 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2658417 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_2966298 +#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_3117295 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_819472 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_824069 #lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_826319 @@ -7294,6 +7295,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_CLEAN_CACHE #lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_REPEAT_TLBI #lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_SPECULATIVE_AT +#lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD #lib/modules/KVER-ipfire/build/include/config/ARM64_WORKAROUND_TSB_FLUSH_FAILURE #lib/modules/KVER-ipfire/build/include/config/ARMADA_37XX_CLK #lib/modules/KVER-ipfire/build/include/config/ARMADA_37XX_WATCHDOG diff --git a/lfs/linux b/lfs/linux index 023f48a4b..efd3e8533 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.6.13 +VER = 6.6.15 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -72,7 +72,7 @@ objects = \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 1d644e48fa4fd3740712130b0d5756b75d70471cda2a7206083434ec89d288bd7487e633c8954ec038e3784d56d7a787e6cab1c93e5fbfcfc0b44a7b55b0debd +$(DL_FILE)_BLAKE2 = a630bc7b2463bdc312f8936210a54e92bbe4136fc78995c18d0ccafbcdb27cce5b7b0d4a6ba10c378e14e86855ee7e76e355acc0580f7441e4df64e7dbd8a4b7 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e95d12e5ee8dad6a605c306098f4e2618c8d7872
by Michael Tremer 01 Feb '24

01 Feb '24

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 e95d12e5ee8dad6a605c306098f4e2618c8d7872 (commit) via f7520e0addcb4162ba48aad221749a1f429763ff (commit) via 7de5c351b5814e07a8c5d1954e05533648dcaa0d (commit) via 64aa5bf53e80349ed1ea029a1896e193b0dfb897 (commit) via 2b2453568d000771541300b3bb7383277d6acaf8 (commit) via da63a6cc46e7b03b47b440a0e501ff57a077ebbd (commit) via 49758838337a5feebbd170dd30ad9829a5c2cc98 (commit) via fa96ada3a275daf21f68b77549f688db8cd5b5fc (commit) from 88b6ad81123d2258aabc919055df0c2b478d8c00 (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 e95d12e5ee8dad6a605c306098f4e2618c8d7872 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 1 16:09:02 2024 +0000 core184: Ship lzip Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f7520e0addcb4162ba48aad221749a1f429763ff Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Feb 1 09:29:13 2024 +0100 lzip: Update to version 1.24 - Update from version 1.23 to 1.24 - Update of rootfile not required - Changelog 1.24 The option '--empty-error', which forces exit status 2 if any empty member is found, has been added. The option '--marking-error', which forces exit status 2 if the first LZMA byte is non-zero in any member, has been added. File diagnostics have been reformatted as 'PROGRAM: FILE: MESSAGE'. Diagnostics caused by invalid arguments to command-line options now show the argument and the name of the option. The option '-o, --output' now preserves dates, permissions, and ownership of the file when (de)compressing exactly one file. The option '-o, --output' now creates missing intermediate directories when writing to a file. The variable MAKEINFO has been added to configure and Makefile.in. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7de5c351b5814e07a8c5d1954e05533648dcaa0d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 1 16:07:39 2024 +0000 core184: Ship gettext Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 64aa5bf53e80349ed1ea029a1896e193b0dfb897 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Feb 1 09:29:11 2024 +0100 gettext: Update to version 0.22.4 - Update from version 0.22 to 0.22.4 - Update of rootfile - Changelog 0.22.4 * Bug fixes: - AM_GNU_GETTEXT now recognizes a statically built libintl on macOS and AIX. - Build fixes on AIX. 0.22.3 * Portability: - The libintl library now works on macOS 14. (Older versions of libintl crash on macOS 14, due to an incompatible change in macOS.) 0.22.2 * Bug fixes: - The libintl shared library now exports again some symbols that were accidentally missing. <https://savannah.gnu.org/bugs/index.php?64323> This bug was introduced in version 0.22. 0.22.1 * Bug fixes: - xgettext's processing of large Perl files may have led to errors <https://savannah.gnu.org/bugs/index.php?64552> - "xgettext --join-existing" could encounter errors. <https://savannah.gnu.org/bugs/index.php?64490> These bugs were introduced in version 0.22. * Portability: - Building on Android is now supported. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2b2453568d000771541300b3bb7383277d6acaf8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 1 16:07:01 2024 +0000 core184: Ship ed Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit da63a6cc46e7b03b47b440a0e501ff57a077ebbd Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Feb 1 09:29:10 2024 +0100 ed: Update to version 1.20 - Update from version 1.19 to 1.20 - Update of rootfile not required - Changelog 1.20 New command-line options '+line', '+/RE', and '+?RE' have been implemented to set the current line to the line number specified or to the first or last line matching the regular expression 'RE'. (Suggested by Matthew Polk and John Cowan). File names containing control characters 1 to 31 are now rejected unless they are allowed with the command-line option '--unsafe-names'. File names containing control characters 1 to 31 are now printed using octal escape sequences. Ed now rejects file names ending with a slash. Intervening commands that don't set the modified flag no longer make a second 'e' or 'q' command fail with a 'buffer modified' warning. Tilde expansion is now performed on file names supplied to commands; if a file name starts with '~/', the tilde (~) is expanded to the contents of the variable HOME. (Suggested by John Cowan). Ed now warns the first time that a command modifies a buffer loaded from a read-only file. (Suggested by Dan Jacobson). Ed now creates missing intermediate directories when writing to a file. It has been documented that 'e' creates an empty buffer if file does not exist. It has been documented that 'f' sets the default filename, whether or not its argument names an existing file. The description of the exit status has been improved in '--help' and in the manual. The variable MAKEINFO has been added to configure and Makefile.in. It has been documented in INSTALL that when choosing a C standard, the POSIX features need to be enabled explicitly: ./configure CFLAGS+='--std=c99 -D_POSIX_C_SOURCE=2' Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 49758838337a5feebbd170dd30ad9829a5c2cc98 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 1 16:06:10 2024 +0000 core184: Ship diffutils Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fa96ada3a275daf21f68b77549f688db8cd5b5fc Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Feb 1 09:29:09 2024 +0100 diffutils: Update to version 3.10 - Update from version 3.9 to 3.10 - Update of rootfile not required - Changelog 3.10 Bug fixes cmp/diff can again work with file dates past Y2K38 [bug introduced in 3.9] diff -D no longer fails to output #ifndef lines. [bug#61193 introduced in 3.9] Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/gettext | 30 ++++++++++++---------- .../{oldcore/100 => core/184}/filelists/diffutils | 0 .../{oldcore/106 => core/184}/filelists/ed | 0 .../{oldcore/103 => core/184}/filelists/gettext | 0 .../{oldcore/154 => core/184}/filelists/lzip | 0 lfs/diffutils | 10 +++++--- lfs/ed | 11 +++++--- lfs/gettext | 6 ++--- lfs/lzip | 9 ++++--- 9 files changed, 37 insertions(+), 29 deletions(-) copy config/rootfiles/{oldcore/100 => core/184}/filelists/diffutils (100%) copy config/rootfiles/{oldcore/106 => core/184}/filelists/ed (100%) copy config/rootfiles/{oldcore/103 => core/184}/filelists/gettext (100%) copy config/rootfiles/{oldcore/154 => core/184}/filelists/lzip (100%) Difference in files: diff --git a/config/rootfiles/common/gettext b/config/rootfiles/common/gettext index 3560e9601..31dcfa033 100644 --- a/config/rootfiles/common/gettext +++ b/config/rootfiles/common/gettext @@ -38,22 +38,24 @@ usr/bin/gettext.sh #usr/lib/libasprintf.so usr/lib/libasprintf.so.0 usr/lib/libasprintf.so.0.0.0 -usr/lib/libgettextlib-0.22.so +usr/lib/libgettextlib-0.22.4.so +usr/lib/libgettextlib.a #usr/lib/libgettextlib.la #usr/lib/libgettextlib.so #usr/lib/libgettextpo.a #usr/lib/libgettextpo.la #usr/lib/libgettextpo.so usr/lib/libgettextpo.so.0 -usr/lib/libgettextpo.so.0.5.9 -usr/lib/libgettextsrc-0.22.so +usr/lib/libgettextpo.so.0.5.10 +usr/lib/libgettextsrc-0.22.4.so +#usr/lib/libgettextsrc.a #usr/lib/libgettextsrc.la usr/lib/libgettextsrc.so #usr/lib/libtextstyle.a #usr/lib/libtextstyle.la #usr/lib/libtextstyle.so usr/lib/libtextstyle.so.0 -usr/lib/libtextstyle.so.0.2.0 +usr/lib/libtextstyle.so.0.2.1 usr/lib/preloadable_libintl.so #usr/share/aclocal/build-to-host.m4 #usr/share/aclocal/gettext.m4 @@ -1984,16 +1986,16 @@ usr/lib/preloadable_libintl.so #usr/share/doc/libtextstyle/libtextstyle_abt.html #usr/share/doc/libtextstyle/libtextstyle_toc.html #usr/share/gettext -#usr/share/gettext-0.22 -#usr/share/gettext-0.22/its -#usr/share/gettext-0.22/its/glade.loc -#usr/share/gettext-0.22/its/glade1.its -#usr/share/gettext-0.22/its/glade2.its -#usr/share/gettext-0.22/its/gsettings.its -#usr/share/gettext-0.22/its/gsettings.loc -#usr/share/gettext-0.22/its/gtkbuilder.its -#usr/share/gettext-0.22/its/metainfo.its -#usr/share/gettext-0.22/its/metainfo.loc +#usr/share/gettext-0.22.4 +#usr/share/gettext-0.22.4/its +#usr/share/gettext-0.22.4/its/glade.loc +#usr/share/gettext-0.22.4/its/glade1.its +#usr/share/gettext-0.22.4/its/glade2.its +#usr/share/gettext-0.22.4/its/gsettings.its +#usr/share/gettext-0.22.4/its/gsettings.loc +#usr/share/gettext-0.22.4/its/gtkbuilder.its +#usr/share/gettext-0.22.4/its/metainfo.its +#usr/share/gettext-0.22.4/its/metainfo.loc #usr/share/gettext/ABOUT-NLS #usr/share/gettext/archive.dir.tar.xz #usr/share/gettext/config.rpath diff --git a/config/rootfiles/core/184/filelists/diffutils b/config/rootfiles/core/184/filelists/diffutils new file mode 120000 index 000000000..a5c02f3ff --- /dev/null +++ b/config/rootfiles/core/184/filelists/diffutils @@ -0,0 +1 @@ +../../../common/diffutils \ No newline at end of file diff --git a/config/rootfiles/core/184/filelists/ed b/config/rootfiles/core/184/filelists/ed new file mode 120000 index 000000000..0ed331cfa --- /dev/null +++ b/config/rootfiles/core/184/filelists/ed @@ -0,0 +1 @@ +../../../common/ed \ No newline at end of file diff --git a/config/rootfiles/core/184/filelists/gettext b/config/rootfiles/core/184/filelists/gettext new file mode 120000 index 000000000..b6c6c6f4f --- /dev/null +++ b/config/rootfiles/core/184/filelists/gettext @@ -0,0 +1 @@ +../../../common/gettext \ No newline at end of file diff --git a/config/rootfiles/core/184/filelists/lzip b/config/rootfiles/core/184/filelists/lzip new file mode 120000 index 000000000..dd4b832b1 --- /dev/null +++ b/config/rootfiles/core/184/filelists/lzip @@ -0,0 +1 @@ +../../../common/lzip \ No newline at end of file diff --git a/lfs/diffutils b/lfs/diffutils index 7fdfb5d87..80c6f2a95 100644 --- a/lfs/diffutils +++ b/lfs/diffutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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 = 3.9 +VER = 3.10 THISAPP = diffutils-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = d43ed9f1643ac46b69083755974fc9611ad00c3b98b08332c681223d17d762567562233b51342a16f7dad8f28dfc5536999143594e33a64e6624001a71787c8f +$(DL_FILE)_BLAKE2 = 24a90162b3d876e6378243f19a85a1f1bb4cdfe98d130dee684740a902f2987509d5830dd32df4e26678b468b96960f6f9785ffb922e828cb8b4acce0d8587f6 install : $(TARGET) @@ -77,7 +77,9 @@ $(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) && ./configure --prefix=$(PREFIX) --disable-nls + cd $(DIR_APP) && ./configure \ + --prefix=$(PREFIX) \ + --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/ed b/lfs/ed index 0a7014fd7..633ec4055 100644 --- a/lfs/ed +++ b/lfs/ed @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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.19 +VER = 1.20 THISAPP = ed-$(VER) DL_FILE = $(THISAPP).tar.lz @@ -39,7 +39,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 139305a1d64e96f7eadcb462325918e5eee18de229ec8e1b3fac29dc9b8ef58ceea4cd7ffdbd3674fd7f421d90bc0c9e3557318eb57830d7cd46e579828fa95d +$(DL_FILE)_BLAKE2 = d212c6d5302627145332ec25b989ca2d4a064ce5c0ea45ad1ad6b780ffd72037ff2144b933c52667c52192d6f5acd5766b5c31d4a2b5cf5993813c43e1523af3 install : $(TARGET) @@ -69,7 +69,10 @@ $(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) && ./configure --prefix=/usr --exec-prefix="" --disable-nls + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --exec-prefix="" \ + --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/gettext b/lfs/gettext index 57fead8ad..fb7462b5e 100644 --- a/lfs/gettext +++ b/lfs/gettext @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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.22 +VER = 0.22.4 THISAPP = gettext-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = e91c82eb793897bd7ed727503e9d6e72a47027adf51ca76cf5c936437c434e910508814b1d03b12694c5e87156018683cb2c8cc51637b121313ed41155bcd3e5 +$(DL_FILE)_BLAKE2 = 3f93aa5aef8e40d2e01acaa5aeed11efefd0de43ea26d084a0b9e743019685f7584d8e1bf05c1fd5772a5576d21ee1f052b81366f52c7827b6d14bd4d9890edc install : $(TARGET) diff --git a/lfs/lzip b/lfs/lzip index f539494d3..5e7da457f 100644 --- a/lfs/lzip +++ b/lfs/lzip @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2024 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.23 +VER = 1.24 THISAPP = lzip-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 934a35e31b0db76c4dcbe2fe903f04b60471485118aa5d4001599a3c23a7db74f05f703cf430bb299795be7025f71efb225afddff85c8245e962bdadcf82aef7 +$(DL_FILE)_BLAKE2 = ef6b7b51e7369b7b07ca2d5bbdd57a287f3a96866f50b327237a35ce9a4d19b2e3f7586a099ff4191c3c793de2dfe59120a42b8d744e220c4f7652d049df87f5 install : $(TARGET) @@ -75,7 +75,8 @@ $(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) && ./configure --prefix=$(PREFIX) + cd $(DIR_APP) && ./configure \ + --prefix=$(PREFIX) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2024