[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9f2ee0e9bf4708cb899cd7e3b7bef6af5f18956a
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 9f2ee0e9bf4708cb899cd7e3b7bef6af5f18956a (commit) via eea5db042f7870b92b68f0efd84a45dd18b726f7 (commit) via 93ebde9b3be52a2d43d937abdb7b7a73e70880ee (commit) via 1bd27a9a99d878b800000de7b36bb7233d06d8fb (commit) via 3c4baac573566ef6a1d1734d63a377af08f4eece (commit) via a50af14f381867b876419f6229981a882ef6f707 (commit) via c85b97ed5a76eb670ffb79d1377ad642f3ca32ec (commit) via 8bc33c6db3d45fae460181c2651a7830e37fecea (commit) via ce11ea46c63a9b3f60bf9463b0aa689811251845 (commit) via 85ff8d45865d92ec85c33d2f5cb3700d8c6ac785 (commit) via dbdc389bc3e5c94c85458ded4ce6c6bab00274d1 (commit) via 05599e171cfb2876d9708905bbe67272143e7c75 (commit) via ac92c4d9715e4d8ad9b3cc28f6310a1079fb0e69 (commit) via a14c8d7d0fb67d6a5096747d6dcbd54adb883ba8 (commit) via 5aff2d126ff090a960b9d1be9b0e7bfd851f365f (commit) via 1fe39ef505931b2abfe588565ab4d950ff0b09bf (commit) via 10189aa197f4e4c4c8701a86912f516b611ebb36 (commit) via 59fa881ea7380b5ac5f283892c9c4882de6ff28a (commit) via a8996f857cda8bb5b11bf335eeb84cdad040b9b4 (commit) from 7885b1509cfb7d8aed4bc921bbafc18bbf67b62d (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 9f2ee0e9bf4708cb899cd7e3b7bef6af5f18956a Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Apr 14 18:44:47 2021 +0200
cifs-utils: Update to 6.13
- Update from 6.12 to 6.13 - Update of rootfile not needed - Changelog This is a security release to address the following bug: CVE-2021-20208 cifs.upcall kerberos auth leak in container
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit eea5db042f7870b92b68f0efd84a45dd18b726f7 Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Apr 14 13:54:52 2021 +0200
cups: Update to 2.3.3op2
- Update from 2.3.3 to 2.3.3op2 - OpenPrinting statement from March 2021:- CUPS has new home at OpenPrinting Due to the fact that CUPS development at Apple has stopped since the beginning of 2020 we had forked CUPS some months ago to incorporate patches and fixes from the distributions. As Apple did not resume the upstream work on CUPS, we have made OpenPrinting now the official upstream home for CUPS. This especially means that we can now continue developing CUPS, independent of Apple. So we can add features and lead CUPS into the new architecture without PPD files and with Printer Applications. CUPS has a new home page now and what was formerly our fork is now the official CUPS repository. Upcoming releases will be of the new 2.4.x series, without “opX” suffix as now. Also all documentation files which come with it are updated to point to the OpenPrinting resources. - Update of rootfile not required. - Changelog Changes in CUPS v2.3.3op2 - Security: Fixed a buffer (read) overflow in the `ippReadIO` function (CVE-2020-10001) - Clarified the documentation for the "Listen" directive (Issue #53) - Fixed duplicate ColorModel entries for AirPrint printers (Issue 59) - Fixed directory/permission defaults for Debian kfreebsd-based systems (Issue #60, Issue #61) - Fixed crash bug in `ppdOpen` (Issue #64, Issue #78) - Fixed regression in `snprintf` emulation function (Issue #67) - The scheduler's systemd service file now waits for the nslcd service to start (Issue #69) - The libusb-based USB backend now uses a simpler read timer implementation to avoid a regression in a previous change (Issue #72) - The PPD caching code now only tracks the `APPrinterIconPath` value on macOS (Issue #73) - Fixed segfault in help.cgi when searching in man pages (Issue #81) - Root certificates were incorrectly stored in "~/.cups/ssl". Changes in CUPS v2.3.3op1 - The automated test suite can now be activated using `make test` for consistency with other projects and CI environments - the old `make check` continues to work as well, and the previous test server behavior can be accessed by running `make testserver`. - ippeveprinter now supports multiple icons and strings files. - ippeveprinter now uses the system's FQDN with Avahi. - ippeveprinter now supports Get-Printer-Attributes on "/". - ippeveprinter now uses a deterministic "printer-uuid" value. - ippeveprinter now uses system sounds on macOS for Identify-Printer. - Updated ippfind to look for files in "~/Desktop" on Windows. - Updated ippfind to honor `SKIP-XXX` directives with `PAUSE`. - Updated IPP Everywhere support to work around printers that only advertise color raster support but really also support grayscale (Issue #1) - ipptool now supports DNS-SD URIs like `ipps://My%20Printer._ipps._tcp.local` (Issue #5) - The scheduler now allows root backends to have world read permissions but not world execute permissions (Issue #21) - Failures to bind IPv6 listener sockets no longer cause errors if IPv6 is disabled on the host (Issue #25) - The SNMP backend now supports the HP and Ricoh vendor MIBs (Issue #28) - The scheduler no longer includes a timestamp in files it writes (Issue #29) - The systemd service names are now "cups.service" and "cups-lpd.service" (Issue #30, Issue #31) - The scheduler no longer adds the local hostname to the ServerAlias list (Issue #32) - Added `LogFileGroup` directive in "cups-files.conf" to control the group owner of log files (Issue #34) - Added `--with-max-log-size` configure option (Issue #35) - Added `--enable-sync-on-close` configure option (Issue #37) - Added `--with-error-policy` configure option (Issue #38) - IPP Everywhere PPDs could have an "unknown" default InputSlot (Issue #44) - The `httpAddrListen` function now uses a listen backlog of 128. - Added USB quirks (Apple issue #5789, #5823, #5831) - Fixed IPP Everywhere v1.1 conformance issues in ippeveprinter. - Fixed DNS-SD name collision support in ippeveprinter. - Fixed compiler and code analyzer warnings. - Fixed TLS support on Windows. - Fixed ippfind sub-type searches with Avahi. - Fixed the default hostname used by ippeveprinter on macOS. - Fixed resolution of local IPP-USB printers with Avahi. - Fixed coverity issues (Issue #2) - Fixed `httpAddrConnect` issues (Issue #3) - Fixed web interface device URI issue (Issue #4) - Fixed lp/lpr "printer/class not found" error reporting (Issue #6) - Fixed xinetd support for LPD clients (Issue #7) - Fixed libtool build issue (Issue #11) - Fixed a memory leak in the scheduler (Issue #12) - Fixed a potential integer overflow in the PPD hashing code (Issue #13) - Fixed output-bin and print-quality handling issues (Issue #18) - Fixed PPD options getting mapped to odd IPP values like "tray---4" (Issue #23) - Fixed remote access to the cupsd.conf and log files (Issue #24) - Fixed the automated test suite when running in certain build/CI environments (Issue #25) - Fixed a logging regression caused by a previous change for Apple issue #5604 (Issue #25) - Fixed fax phone number handling with GNOME (Issue #40) - Fixed potential rounding error in rastertopwg filter (Issue #41) - Fixed the "uri-security-supported" value from the scheduler (Issue #42) - Fixed IPP backend crash bug with "printer-alert" values (Issue #43) - Removed old Solaris inetconv(1m) reference in cups-lpd man page (Issue #46) - Fixed default options that incorrectly use the "custom" prefix (Issue #48) - Fixed a memory leak when resolving DNS-SD URIs (Issue #49) - Fixed systemd status reporting by adopting the notify interface (Issue #51) - Fixed crash in rastertopwg (Apple issue #5773) - Fixed cupsManualCopies values in IPP Everywhere PPDs (Apple issue #5807)
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 93ebde9b3be52a2d43d937abdb7b7a73e70880ee Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Apr 14 13:55:15 2021 +0200
cups-filters: Update to 1.28.8
- Update from 1.28.7 to 1.28.8 - Update of rootfile not required - Changelog CHANGES IN V1.28.8 - libcupsfilters: Made check whether the driverless PPD to generate should be a fax out PPD more reliable (Issue #343). - foomatic-rip: Options in the 5th command line argument of the CUPS filter command line are separated only by white space and not by comma, also make sure that an option "none" is not considered a custom page size (Issue #348). - implicitclass: Raise timeout for cups-browsed's answer from 20s to 60s (Pull request #346). - libcupsfilters: In the PPD generator really give priority to Apple Raster against PDF (Issue #331).
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1bd27a9a99d878b800000de7b36bb7233d06d8fb Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 14 17:31:16 2021 +0000
netsnmpd: Bump version to link against new lm_sensors
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3c4baac573566ef6a1d1734d63a377af08f4eece Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 14 17:31:01 2021 +0000
core157: Ship lm_sensors & collectd
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a50af14f381867b876419f6229981a882ef6f707 Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Apr 14 13:57:45 2021 +0200
collectd: patch for successful build with updated lm_sensors
- Patch to remove checks for SENSORS_API_VERSION upper limit Patch based on one by Pavel Rochnyack https://git.ipfire.org/?p=thirdparty/collectd.git;a=commitdiff;h=d5a3c020%3E - Without this patch collectd fails to build with the updated lm_sensors version (3-6-0) due to a problem with the version of libsensors used by lm_sensors
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c85b97ed5a76eb670ffb79d1377ad642f3ca32ec Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Apr 14 13:57:44 2021 +0200
lm_sensors: Update to 3-6-0
- Update from 3-4-0 to 3-6-0 - Update of rootfilers in each architecture Only the library version changed in each rootfile - Installed updated lm_sensors. Confirmed updated version was installed. sensors-detect ran successfully but could not confirm successful sensor detection as installation was run on vm testbed and this has no sesnors Testing on real hardware to confirm that sensors are detected and sensor-* directories correctly created in IPFire. - Changelog 3.6.0 (2019-10-18) configs: Added a number of new configuration files fancontrol: AVERAGE env variable can be used to set the number of previ> Makefile: The MACHINE variable has been renamed to ARCH sensord: Add an option -1/--oneline to print chip and adapter on the sa> sensors: Fixed a stray comma bug in the JSON output Fixed Fahrenheit conversion with raw and JSON output Scale voltage and current values in the default output format sensors-detect: Add detection of AMD Family 17h, models 30h, 70h Add detection of some AMD Family 15h models Add detection of AMD Family 16h model 30h power sensors Add detection of Hygon Family 18h thermal sensors Add detection of Nuvoton NCT6797D Add detection of Nuvoton NCT6798D Add detection of Nuvoton NCT6112D/NCT6114D/NCT6116D Fix printing CPU info on non-x86 arches Fix printing lm_sensors version Mark Fintek F75387SG/RG as supported by the f75375s dri> 3.5.0 (2018-11-23) Fixed disappearance of certain hwmon chips with 4.19+ kernels Add the find-driver script for debugging Various documentation and man page improvements Fix various issues found by Coverity Scan Fix compilation with the musl C library Development version string now contains "+git" instead of "+SVN" Updated links in documentation to reflect the new home of lm_sensors sensors.1: Add reference to sensors-detect Document -j option (json output) sensors: Add support for json output Add support for power min, lcrit, min_alarm, lcrit_alarm sensors-detect: Fix systemd paths Add detection of Fintek F81768 Only probe I/O ports on x86 Add detection of Nuvoton NCT6793D Add detection of Microchip MCP9808 Mark F71868A as supported by the f71882fg driver Mark F81768D as supported by the f71882fg driver Mark F81866D as supported by the f71882fg driver Add detection of various ITE chips Add detection of Nuvoton NCT6795D Add detection of DDR4 SPD Add detection of ITE IT8987D Add detection of AMD Family 17h temperature sensors Add detection of AMD KERNCZ SMBus controller Add detection of various Intel SMBus controllers Add detection of Giantec GT30TS00 Add detection of ONS CAT34TS02C and CAT34TS04 Add detection of AMD Family 15h Model 60+ temperature s> Add detection of Nuvoton NCT6796D Add detection of AMD Family 15h Model 70+ temperature s> configs: Add sample configuration files. sensors.conf.default: Add hardwired inputs of NCT6795D Add hardwired inputs of F71868A Add hardwired NCT6796D inputs vt1211_pwm: replaced deprecated sub shell syntax run with bash instead of sh pwmconfig: replaced deprecated sub shell syntax fancontrol: replaced deprecated sub shell syntax save original pwm values fancontrol.8: replaced deprecated sub shell syntax libsensors: Add support for SENSORS_BUS_TYPE_SCSI Add support for power min, lcrit, min_alarm, lcrit_alarm
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8bc33c6db3d45fae460181c2651a7830e37fecea Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Apr 14 13:58:09 2021 +0200
meson: Update to 0.57.2
- Update from 0.56.0 to 0.57.2 - Update of rootfile - Changelog is too large and complicated layout to include here Full details can be seen at https://mesonbuild.com/Release-notes.html
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ce11ea46c63a9b3f60bf9463b0aa689811251845 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 14 17:26:40 2021 +0000
core157: Ship libxcrypt
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 85ff8d45865d92ec85c33d2f5cb3700d8c6ac785 Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Apr 14 13:57:19 2021 +0200
libxcrypt: Update to 4.4.19
- Update from 4.4.17 to 4.4.19 - Update of rootfile not needed - Changelog libxcrypt NEWS -- history of user-visible changes. Version 4.4.19 * Improve fallback implementation of explicit_bzero. * Add glibc-on-CSKY, ARC, and RISCV-32 entries to libcrypt.minver. These were added in GNU libc 2.29, 2.32, and 2.33 respectively (issue #122). * Do not build xcrypt.h if we’re not going to install it. * Do not apply --enable-obsolete-api-enosys mode to fcrypt. * Compilation fix for NetBSD. NetBSD’s <unistd.h> declares encrypt and setkey to return int, contrary to POSIX (which says they return void). Rename those declarations out of the way with macros. * Compilation fixes for building with GCC 11. Basically fixes for explicit type-casting. * Force update of existing symlinks during installation (issue #120). Version 4.4.18 * Fix compilation errors on (Free)BSD (issue #110). * Fix conversion error in lib/alg-gost3411-core.c, which is seen by some sensitive compilers. * Convert build scripts to Perl. The minimum version of Perl required is 5.14.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit dbdc389bc3e5c94c85458ded4ce6c6bab00274d1 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 14 17:23:06 2021 +0000
core157: Ship file
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 05599e171cfb2876d9708905bbe67272143e7c75 Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Apr 14 13:55:53 2021 +0200
file: Update to 5.40
- Update from 5.39 to 5.40 - Update of rootfile not needed - Changelog * release 5.40 * PR/234: Add limit to the number of bytes to scan for encoding * PR/230: Fix /T (trim flag) for regex * PR/77: Trim trailing separator. * PR/211: Convert system read errors from corrupt ELF files into human readable error messages * fix multithreaded decompression file descriptor issue by using close-on-exec (Denys Vlasenko) * Exclude surrogate pairs from utf-8 detection (Michael Liu) * Include # to the list of ignored format chars (Werner Fink)
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ac92c4d9715e4d8ad9b3cc28f6310a1079fb0e69 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 14 17:22:39 2021 +0000
core157: Ship expat
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a14c8d7d0fb67d6a5096747d6dcbd54adb883ba8 Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Apr 14 13:55:35 2021 +0200
expat: Update to 2.3.0
- Update from 2.2.0 (2016) to 2.3.0 (2021) - Update of rootfile - Changelog is too large to include here Full details can be viewed in the Changes file in the source tarball Large number of bug fixes
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5aff2d126ff090a960b9d1be9b0e7bfd851f365f Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 14 17:21:56 2021 +0000
core157: Ship apache
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1fe39ef505931b2abfe588565ab4d950ff0b09bf Author: Peter Müller peter.mueller@ipfire.org Date: Mon Apr 12 23:01:41 2021 +0200
httpd: delete comment blocks and unused directives from our configuration
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 10189aa197f4e4c4c8701a86912f516b611ebb36 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Apr 12 23:01:13 2021 +0200
httpd: apply the same security headers on the captive portal instance as we do elsewhere
The Captive Portal should not be framed or leak sensitive detail via Referrers either.
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 59fa881ea7380b5ac5f283892c9c4882de6ff28a Author: Peter Müller peter.mueller@ipfire.org Date: Mon Apr 12 23:00:46 2021 +0200
httpd: disable sending ETag header completely
These cause caching trouble and pose a potential security risk due to exposing inode numbers of files within the Apache site directories on an IPFire machine.
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a8996f857cda8bb5b11bf335eeb84cdad040b9b4 Author: Peter Müller peter.mueller@ipfire.org Date: Mon Apr 12 23:00:19 2021 +0200
httpd: remove compatibility instructions for very old browsers
These are not in use any more - and if they would, we don't support them.
Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/httpd/default-server.conf | 3 - config/httpd/global.conf | 1 + config/httpd/httpd.conf | 81 ++-------------------- config/httpd/mod_log_config.conf | 33 +-------- config/httpd/server-tuning.conf | 10 --- config/httpd/ssl-global.conf | 45 ++---------- config/httpd/vhosts.d/captive.conf | 2 + config/httpd/vhosts.d/ipfire-interface-ssl.conf | 3 - config/rootfiles/common/aarch64/lm_sensors | 4 +- config/rootfiles/common/armv5tel/lm_sensors | 4 +- config/rootfiles/common/expat | 23 +++--- config/rootfiles/common/i586/lm_sensors | 4 +- config/rootfiles/common/meson | 26 ++++--- config/rootfiles/common/x86_64/lm_sensors | 4 +- .../core/157/filelists/aarch64/lm_sensors | 1 + .../{oldcore/114 => core/157}/filelists/apache2 | 0 .../110 => core/157}/filelists/armv5tel/lm_sensors | 0 .../{oldcore/125 => core/157}/filelists/collectd | 0 .../{oldcore/106 => core/157}/filelists/expat | 0 .../{oldcore/106 => core/157}/filelists/file | 0 .../77 => core/157}/filelists/i586/lm_sensors | 0 .../{oldcore/155 => core/157}/filelists/libxcrypt | 0 .../rootfiles/core/157/filelists/x86_64/lm_sensors | 1 + config/rootfiles/core/157/update.sh | 2 + lfs/cifs-utils | 6 +- lfs/collectd | 1 + lfs/cups | 6 +- lfs/cups-filters | 6 +- lfs/expat | 4 +- lfs/file | 4 +- lfs/libxcrypt | 4 +- lfs/lm_sensors | 10 +-- lfs/meson | 4 +- lfs/netsnmpd | 2 +- ...hecks-for-SENSORS_API_VERSION-upper-limit.patch | 63 +++++++++++++++++ 35 files changed, 146 insertions(+), 211 deletions(-) create mode 120000 config/rootfiles/core/157/filelists/aarch64/lm_sensors copy config/rootfiles/{oldcore/114 => core/157}/filelists/apache2 (100%) copy config/rootfiles/{oldcore/110 => core/157}/filelists/armv5tel/lm_sensors (100%) copy config/rootfiles/{oldcore/125 => core/157}/filelists/collectd (100%) copy config/rootfiles/{oldcore/106 => core/157}/filelists/expat (100%) copy config/rootfiles/{oldcore/106 => core/157}/filelists/file (100%) copy config/rootfiles/{oldcore/77 => core/157}/filelists/i586/lm_sensors (100%) copy config/rootfiles/{oldcore/155 => core/157}/filelists/libxcrypt (100%) create mode 120000 config/rootfiles/core/157/filelists/x86_64/lm_sensors create mode 100644 src/patches/collectd-4.10.9-remove-checks-for-SENSORS_API_VERSION-upper-limit.patch
Difference in files: diff --git a/config/httpd/default-server.conf b/config/httpd/default-server.conf index db082298a..e82dfa088 100644 --- a/config/httpd/default-server.conf +++ b/config/httpd/default-server.conf @@ -2,7 +2,4 @@ # Global configuration that will be applicable for all virtual hosts, unless # deleted here, or overriden elswhere. # - DocumentRoot /srv/web/ipfire/html - -#Include /etc/httpd/conf/conf.d/*.conf diff --git a/config/httpd/global.conf b/config/httpd/global.conf index cc8000379..46878baf5 100644 --- a/config/httpd/global.conf +++ b/config/httpd/global.conf @@ -8,6 +8,7 @@ Include /etc/httpd/conf/hostname.conf HostnameLookups off AddHandler cgi-script .cgi EnableSendfile Off +FileETag None
# Always unset HTTP_PROXY variable, https://httpoxy.org RequestHeader unset Proxy early diff --git a/config/httpd/httpd.conf b/config/httpd/httpd.conf index 14dcc735c..c694bffe2 100644 --- a/config/httpd/httpd.conf +++ b/config/httpd/httpd.conf @@ -1,37 +1,4 @@ -# -# /etc/httpd/conf/httpd.conf -# -# This is the main Apache2 server configuration file for IPFire. -# Plese do not change this file! - -# Overview of include files, chronologically: -# -# httpd.conf -# | -# |-- uid.conf . . . . . . . . . . . . . . UserID/GroupID to run under -# |-- server-tuning.conf . . . . . . . . . sizing of the server (how many processes to start, ...) -# |-- loadmodule.conf . . . . . . . . . . . load these modules -# |-- listen.conf . . . . . . . . . . . . . IP adresses / ports to listen on -# |-- mod_log_config.conf . . . . . . . . . define logging formats -# |-- sysconfig.d/global.conf . . . . . . . server-wide general settings -# |-- mod_status.conf . . . . . . . . . . . restrict access to mod_status (server monitoring) -# |-- mod_info.conf . . . . . . . . . . . . restrict access to mod_info -# |-- mod_usertrack.conf . . . . . . . . . defaults for cookie-based user tracking -# |-- mod_autoindex-defaults.conf . . . . . defaults for displaying of server-generated directory listings -# |-- mod_mime-defaults.conf . . . . . . . defaults for mod_mime configuration -# |-- errors.conf . . . . . . . . . . . . . customize error responses -# |-- ssl-global.conf . . . . . . . . . . . SSL conf that applies to default server _and all_ virtual hosts -# | -# |-- default-server.conf . . . . . . . . . set up the default server that replies to non-virtual-host requests -# | -# `-- vhosts.d/ . . . . . . . . . . . . . . for each virtual host, place one file here -# `-- *.conf . . . . . . . . . . . . . (*.conf is automatically included) -# - -### Global Environment ###################################################### -# -# The directives in this section affect the overall operation of Apache, -# such as the number of concurrent requests. +# Apache2 server configuration file for IPFire
# run under this user/group id Include /etc/httpd/conf/uid.conf @@ -40,17 +7,13 @@ Include /etc/httpd/conf/uid.conf # - usage of KeepAlive Include /etc/httpd/conf/server-tuning.conf
-# ErrorLog: The location of the error log file. -# If you do not specify an ErrorLog directive within a <VirtualHost> -# container, error messages relating to that virtual host will be -# logged here. If you *do* define an error logfile for a <VirtualHost> -# container, that host's errors will be logged there and not here. +# ErrorLog: The location of the error log file ErrorLog /var/log/httpd/error_log
# Load Modules here Include /etc/httpd/conf/loadmodule.conf
-# IP addresses / ports to listen on +# IP addresses and ports to listen on Include /etc/httpd/conf/listen.conf
# predefined logging formats @@ -59,15 +22,10 @@ Include /etc/httpd/conf/mod_log_config.conf # global settings Include /etc/httpd/conf/global.conf
-# optional mod_status, mod_info -#Include /etc/httpd/conf/mod_status.conf -#Include /etc/httpd/conf/mod_info.conf - # associate MIME types with filename extensions TypesConfig /etc/mime.types
-# global (server-wide) SSL configuration, that is not specific to -# any virtual host +# global (server-wide) SSL configuration, that is not specific to any virtual host Include /etc/httpd/conf/ssl-global.conf
<Directory /> @@ -85,35 +43,10 @@ AccessFileName .htaccess # List of resources to look for when the client requests a directory DirectoryIndex index.html index.htm index.shtml index.cgi
-### 'Main' server configuration ############################################# -# -# The directives in this section set up the values used by the 'main' -# server, which responds to any requests that aren't handled by a -# <VirtualHost> definition. These values also provide defaults for -# any <VirtualHost> containers you may define later in the file. -# -# All of these directives may appear inside <VirtualHost> containers, -# in which case these default settings will be overridden for the -# virtual host being defined. -# +# 'Main' server configuration Include /etc/httpd/conf/default-server.conf
- -### Virtual server configuration ############################################ -# -# VirtualHost: If you want to maintain multiple domains/hostnames on your -# machine you can setup VirtualHost containers for them. Most configurations -# use only name-based virtual hosts so the server doesn't need to worry about -# IP addresses. This is indicated by the asterisks in the directives below. -# -# Please see the documentation at -# URL:http://httpd.apache.org/docs-2.0/vhosts/ -# for further details before you try to setup virtual hosts. -# -# You may use the command line option '-S' to verify your virtual host -# configuration. -# +# Virtual server configuration Include /etc/httpd/conf/vhosts.d/*.conf
-# Dummy LoadModule directive to aid module installations -#LoadModule dummy_module /usr/lib/apache2/modules/mod_dummy.so +# EOF diff --git a/config/httpd/mod_log_config.conf b/config/httpd/mod_log_config.conf index 89ad09a80..94151c29d 100644 --- a/config/httpd/mod_log_config.conf +++ b/config/httpd/mod_log_config.conf @@ -1,31 +1,2 @@ -# -# The following directives define some format nicknames for use with -# a CustomLog directive. -# - -# -# Format string: Nickname: -# -LogFormat "%h %l %u %t "%r" %>s %b" common -LogFormat "%v %h %l %u %t "%r" %>s %b" vhost_common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent -LogFormat "%h %l %u %t "%r" %>s %b \ -"%{Referer}i" "%{User-Agent}i"" combined -LogFormat "%v %h %l %u %t "%r" %>s %b \ -"%{Referer}i" "%{User-Agent}i"" vhost_combined - -# To use %I and %O, you need to enable mod_logio -<IfModule mod_logio.c> -LogFormat "%h %l %u %t "%r" %>s %b \ -"%{Referer}i" "%{User-Agent}i" %I %O" combinedio -</IfModule> - -# Use one of these when you want a compact non-error SSL logfile on a virtual -# host basis: -<IfModule mod_ssl.c> -Logformat "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \ -"%r" %b" ssl_common -Logformat "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \ -"%r" %b "%{Referer}i" "%{User-Agent}i"" ssl_combined -</IfModule> +LogFormat "%h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-Agent}i"" combined +LogFormat "%v %h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-Agent}i"" vhost_combined diff --git a/config/httpd/server-tuning.conf b/config/httpd/server-tuning.conf index 5642a1e44..9ee651e45 100644 --- a/config/httpd/server-tuning.conf +++ b/config/httpd/server-tuning.conf @@ -22,13 +22,3 @@ MaxSpareThreads 20 StartServers 2 MaxRequestWorkers 256 ThreadsPerChild 16 - -# -# The following directives modify normal HTTP response behavior to -# handle known problems with browser implementations. -# -BrowserMatch "Mozilla/2" nokeepalive -BrowserMatch "MSIE 4.0b2;" nokeepalive downgrade-1.0 force-response-1.0 -BrowserMatch "RealPlayer 4.0" force-response-1.0 -BrowserMatch "Java/1.0" force-response-1.0 -BrowserMatch "JDK/1.0" force-response-1.0 diff --git a/config/httpd/ssl-global.conf b/config/httpd/ssl-global.conf index 154815cea..0c3a96a6c 100644 --- a/config/httpd/ssl-global.conf +++ b/config/httpd/ssl-global.conf @@ -1,54 +1,17 @@ -## -## SSL Global Context -## -## All SSL configuration in this context applies both to -## the main server and all SSL-enabled virtual hosts. -## - -# These are the configuration directives to instruct the server how to -# serve pages over an https connection. For detailing information about these -# directives see URL:http://httpd.apache.org/docs-2.0/mod/mod_ssl.html -# -# Do NOT simply read the instructions in here without understanding -# what they do. They're here only as hints or reminders. If you are unsure -# consult the online docs. You have been warned. - <IfModule mod_ssl.c>
- # - # Some MIME-types for downloading Certificates and CRLs - # + # Some MIME-types for downloading Certificates and CRLs AddType application/x-x509-ca-cert .crt AddType application/x-pkcs7-crl .crl
- # Pass Phrase Dialog: - # Configure the pass phrase gathering process. - # The filtering dialog program (`builtin' is a internal - # terminal dialog) has to provide the pass phrase on stdout. + # Pass Phrase Dialog SSLPassPhraseDialog builtin
- # Inter-Process Session Cache: - # Configure the SSL Session Cache: First the mechanism - # to use and second the expiring timeout (in seconds). - # shm means the same as shmht. - # Note that on most platforms shared memory segments are not allowed to be on - # network-mounted drives, so in that case you need to use the dbm method. - #SSLSessionCache none - #SSLSessionCache dbm:/var/log/httpd/ssl_scache - #SSLSessionCache shmht:/var/log/httpd/ssl_scache(512000) + # Inter-Process Session Cache SSLSessionCache shmcb:/var/log/httpd/ssl_scache(512000) SSLSessionCacheTimeout 900
- # Pseudo Random Number Generator (PRNG): - # Configure one or more sources to seed the PRNG of the - # SSL library. The seed data should be of good random quality. - # WARNING! On some platforms /dev/random blocks if not enough entropy - # is available. This means you then cannot use the /dev/random device - # because it would lead to very long connection times (as long as - # it requires to make more entropy available). But usually those - # platforms additionally provide a /dev/urandom device which doesn't - # block. So, if available, use this one instead. Read the mod_ssl User - # Manual for more details. + # Pseudo Random Number Generator (PRNG) SSLRandomSeed startup builtin SSLRandomSeed connect builtin
diff --git a/config/httpd/vhosts.d/captive.conf b/config/httpd/vhosts.d/captive.conf index 629fa8180..51af6eac4 100644 --- a/config/httpd/vhosts.d/captive.conf +++ b/config/httpd/vhosts.d/captive.conf @@ -11,6 +11,8 @@ Listen 1013
Header always set X-Content-Type-Options nosniff Header always set Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'" + Header always set Referrer-Policy strict-origin + Header always set X-Frame-Options sameorigin
ScriptAlias /cgi-bin/ /srv/web/ipfire/cgi-bin/captive/ Alias /assets/ /srv/web/ipfire/html/captive/assets/ diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/vhosts.d/ipfire-interface-ssl.conf index de7b8559d..8c4cf3806 100644 --- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf +++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf @@ -64,9 +64,6 @@ SSLOptions +StdEnvVars </Directory> SetEnv HOME /home/nobody - SetEnvIf User-Agent ".*MSIE.*" \ - nokeepalive ssl-unclean-shutdown \ - downgrade-1.0 force-response-1.0 CustomLog /var/log/httpd/ssl_request_log \ "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x "%r" %b"
diff --git a/config/rootfiles/common/aarch64/lm_sensors b/config/rootfiles/common/aarch64/lm_sensors index 1346047b9..f10ad80bd 100644 --- a/config/rootfiles/common/aarch64/lm_sensors +++ b/config/rootfiles/common/aarch64/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a #usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/armv5tel/lm_sensors b/config/rootfiles/common/armv5tel/lm_sensors index 998b02e9f..52514f1ab 100644 --- a/config/rootfiles/common/armv5tel/lm_sensors +++ b/config/rootfiles/common/armv5tel/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/expat b/config/rootfiles/common/expat index 81a8ba7a0..365286f85 100644 --- a/config/rootfiles/common/expat +++ b/config/rootfiles/common/expat @@ -2,15 +2,22 @@ #usr/include/expat.h #usr/include/expat_config.h #usr/include/expat_external.h +#usr/lib/cmake/expat-2.3.0 +#usr/lib/cmake/expat-2.3.0/expat-config-version.cmake +#usr/lib/cmake/expat-2.3.0/expat-config.cmake +#usr/lib/cmake/expat-2.3.0/expat-noconfig.cmake +#usr/lib/cmake/expat-2.3.0/expat.cmake #usr/lib/libexpat.a #usr/lib/libexpat.la -usr/lib/libexpat.so +#usr/lib/libexpat.so usr/lib/libexpat.so.1 -usr/lib/libexpat.so.1.6.2 +usr/lib/libexpat.so.1.7.0 #usr/lib/pkgconfig/expat.pc -#usr/share/doc/expat-2.2.0 -#usr/share/doc/expat-2.2.0/expat.png -#usr/share/doc/expat-2.2.0/reference.html -#usr/share/doc/expat-2.2.0/style.css -#usr/share/doc/expat-2.2.0/valid-xhtml10.png -#usr/share/man/man1/xmlwf.1 +#usr/share/doc/expat +#usr/share/doc/expat-2.3.0 +#usr/share/doc/expat-2.3.0/expat.png +#usr/share/doc/expat-2.3.0/reference.html +#usr/share/doc/expat-2.3.0/style.css +#usr/share/doc/expat-2.3.0/valid-xhtml10.png +#usr/share/doc/expat/AUTHORS +#usr/share/doc/expat/changelog diff --git a/config/rootfiles/common/i586/lm_sensors b/config/rootfiles/common/i586/lm_sensors index 9936e0466..0f7461d4c 100644 --- a/config/rootfiles/common/i586/lm_sensors +++ b/config/rootfiles/common/i586/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/common/meson b/config/rootfiles/common/meson index a9c2d7ad0..ac2ef3ccb 100644 --- a/config/rootfiles/common/meson +++ b/config/rootfiles/common/meson @@ -1,14 +1,13 @@ #usr/bin/meson -#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info -#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/PKG-INFO -#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/SOURCES.txt -#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/dependency_links.txt -#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/entry_points.txt -#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/requires.txt -#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/top_level.txt +#usr/lib/python3.8/site-packages/meson-0.57.2-py3.8.egg-info +#usr/lib/python3.8/site-packages/meson-0.57.2-py3.8.egg-info/PKG-INFO +#usr/lib/python3.8/site-packages/meson-0.57.2-py3.8.egg-info/SOURCES.txt +#usr/lib/python3.8/site-packages/meson-0.57.2-py3.8.egg-info/dependency_links.txt +#usr/lib/python3.8/site-packages/meson-0.57.2-py3.8.egg-info/entry_points.txt +#usr/lib/python3.8/site-packages/meson-0.57.2-py3.8.egg-info/requires.txt +#usr/lib/python3.8/site-packages/meson-0.57.2-py3.8.egg-info/top_level.txt #usr/lib/python3.8/site-packages/mesonbuild #usr/lib/python3.8/site-packages/mesonbuild/__init__.py -#usr/lib/python3.8/site-packages/mesonbuild/_pathlib.py #usr/lib/python3.8/site-packages/mesonbuild/arglist.py #usr/lib/python3.8/site-packages/mesonbuild/ast #usr/lib/python3.8/site-packages/mesonbuild/ast/__init__.py @@ -93,7 +92,12 @@ #usr/lib/python3.8/site-packages/mesonbuild/mconf.py #usr/lib/python3.8/site-packages/mesonbuild/mdist.py #usr/lib/python3.8/site-packages/mesonbuild/mesondata.py -#usr/lib/python3.8/site-packages/mesonbuild/mesonlib.py +#usr/lib/python3.8/site-packages/mesonbuild/mesonlib +#usr/lib/python3.8/site-packages/mesonbuild/mesonlib/__init__.py +#usr/lib/python3.8/site-packages/mesonbuild/mesonlib/platform.py +#usr/lib/python3.8/site-packages/mesonbuild/mesonlib/posix.py +#usr/lib/python3.8/site-packages/mesonbuild/mesonlib/universal.py +#usr/lib/python3.8/site-packages/mesonbuild/mesonlib/win32.py #usr/lib/python3.8/site-packages/mesonbuild/mesonmain.py #usr/lib/python3.8/site-packages/mesonbuild/minit.py #usr/lib/python3.8/site-packages/mesonbuild/minstall.py @@ -115,11 +119,13 @@ #usr/lib/python3.8/site-packages/mesonbuild/modules/qt.py #usr/lib/python3.8/site-packages/mesonbuild/modules/qt4.py #usr/lib/python3.8/site-packages/mesonbuild/modules/qt5.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/qt6.py #usr/lib/python3.8/site-packages/mesonbuild/modules/rpm.py #usr/lib/python3.8/site-packages/mesonbuild/modules/sourceset.py #usr/lib/python3.8/site-packages/mesonbuild/modules/unstable_cuda.py #usr/lib/python3.8/site-packages/mesonbuild/modules/unstable_external_project.py #usr/lib/python3.8/site-packages/mesonbuild/modules/unstable_icestorm.py +#usr/lib/python3.8/site-packages/mesonbuild/modules/unstable_rust.py #usr/lib/python3.8/site-packages/mesonbuild/modules/unstable_simd.py #usr/lib/python3.8/site-packages/mesonbuild/modules/windows.py #usr/lib/python3.8/site-packages/mesonbuild/mparser.py @@ -135,10 +141,10 @@ #usr/lib/python3.8/site-packages/mesonbuild/scripts/clangtidy.py #usr/lib/python3.8/site-packages/mesonbuild/scripts/cleantrees.py #usr/lib/python3.8/site-packages/mesonbuild/scripts/cmake_run_ctgt.py -#usr/lib/python3.8/site-packages/mesonbuild/scripts/commandrunner.py #usr/lib/python3.8/site-packages/mesonbuild/scripts/coverage.py #usr/lib/python3.8/site-packages/mesonbuild/scripts/delwithsuffix.py #usr/lib/python3.8/site-packages/mesonbuild/scripts/depfixer.py +#usr/lib/python3.8/site-packages/mesonbuild/scripts/depscan.py #usr/lib/python3.8/site-packages/mesonbuild/scripts/dirchanger.py #usr/lib/python3.8/site-packages/mesonbuild/scripts/externalproject.py #usr/lib/python3.8/site-packages/mesonbuild/scripts/gettext.py diff --git a/config/rootfiles/common/x86_64/lm_sensors b/config/rootfiles/common/x86_64/lm_sensors index 9936e0466..0f7461d4c 100644 --- a/config/rootfiles/common/x86_64/lm_sensors +++ b/config/rootfiles/common/x86_64/lm_sensors @@ -7,8 +7,8 @@ usr/bin/sensors-conf-convert #usr/include/sensors/sensors.h #usr/lib/libsensors.a usr/lib/libsensors.so -usr/lib/libsensors.so.4 -usr/lib/libsensors.so.4.4.0 +usr/lib/libsensors.so.5 +usr/lib/libsensors.so.5.0.0 #usr/man/man1/sensors.1 #usr/man/man3/libsensors.3 #usr/man/man5/sensors.conf.5 diff --git a/config/rootfiles/core/157/filelists/aarch64/lm_sensors b/config/rootfiles/core/157/filelists/aarch64/lm_sensors new file mode 120000 index 000000000..68ac1285c --- /dev/null +++ b/config/rootfiles/core/157/filelists/aarch64/lm_sensors @@ -0,0 +1 @@ +../../../../common/aarch64/lm_sensors \ No newline at end of file diff --git a/config/rootfiles/core/157/filelists/apache2 b/config/rootfiles/core/157/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/core/157/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/157/filelists/armv5tel/lm_sensors b/config/rootfiles/core/157/filelists/armv5tel/lm_sensors new file mode 120000 index 000000000..eec84cd56 --- /dev/null +++ b/config/rootfiles/core/157/filelists/armv5tel/lm_sensors @@ -0,0 +1 @@ +../../../../common/armv5tel/lm_sensors \ No newline at end of file diff --git a/config/rootfiles/core/157/filelists/collectd b/config/rootfiles/core/157/filelists/collectd new file mode 120000 index 000000000..871b32f14 --- /dev/null +++ b/config/rootfiles/core/157/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/157/filelists/expat b/config/rootfiles/core/157/filelists/expat new file mode 120000 index 000000000..e1923cf63 --- /dev/null +++ b/config/rootfiles/core/157/filelists/expat @@ -0,0 +1 @@ +../../../common/expat \ No newline at end of file diff --git a/config/rootfiles/core/157/filelists/file b/config/rootfiles/core/157/filelists/file new file mode 120000 index 000000000..0c60e43aa --- /dev/null +++ b/config/rootfiles/core/157/filelists/file @@ -0,0 +1 @@ +../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/157/filelists/i586/lm_sensors b/config/rootfiles/core/157/filelists/i586/lm_sensors new file mode 120000 index 000000000..17d6c016e --- /dev/null +++ b/config/rootfiles/core/157/filelists/i586/lm_sensors @@ -0,0 +1 @@ +../../../../common/i586/lm_sensors \ No newline at end of file diff --git a/config/rootfiles/core/157/filelists/libxcrypt b/config/rootfiles/core/157/filelists/libxcrypt new file mode 120000 index 000000000..ad93616b5 --- /dev/null +++ b/config/rootfiles/core/157/filelists/libxcrypt @@ -0,0 +1 @@ +../../../common/libxcrypt \ No newline at end of file diff --git a/config/rootfiles/core/157/filelists/x86_64/lm_sensors b/config/rootfiles/core/157/filelists/x86_64/lm_sensors new file mode 120000 index 000000000..bb454cec4 --- /dev/null +++ b/config/rootfiles/core/157/filelists/x86_64/lm_sensors @@ -0,0 +1 @@ +../../../../common/x86_64/lm_sensors \ No newline at end of file diff --git a/config/rootfiles/core/157/update.sh b/config/rootfiles/core/157/update.sh index b5a10b9b3..4230c8da4 100644 --- a/config/rootfiles/core/157/update.sh +++ b/config/rootfiles/core/157/update.sh @@ -103,6 +103,8 @@ ldconfig /usr/local/bin/filesystem-cleanup
# Start services +/etc/init.d/apache restart +/etc/init.d/collectd restart
# remove lm_sensor config after collectd was started # to reserch sensors at next boot with updated kernel diff --git a/lfs/cifs-utils b/lfs/cifs-utils index c3a98f6d6..a363bb83b 100644 --- a/lfs/cifs-utils +++ b/lfs/cifs-utils @@ -24,7 +24,7 @@
include Config
-VER = 6.12 +VER = 6.13
THISAPP = cifs-utils-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cifs-utils -PAK_VER = 2 +PAK_VER = 3
DEPS =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b49b10692bcae7f28669173a472077dd +$(DL_FILE)_MD5 = 4348921483c530826950e9503b08b033
install : $(TARGET)
diff --git a/lfs/collectd b/lfs/collectd index 7c9744531..36b507868 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -106,6 +106,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/silence-openvpn-errors.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10.9-xfs-compile-fix.patch cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10-libiptc-build-fixes.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10.9-remove-checks-for-SENSORS_API_VERSION-upper-limit.patch cd $(DIR_APP) && autoupdate -v configure.in cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/lfs/cups b/lfs/cups index e219bcf1b..e16fcda6d 100644 --- a/lfs/cups +++ b/lfs/cups @@ -24,7 +24,7 @@
include Config
-VER = 2.3.3 +VER = 2.3.3op2
THISAPP = cups-$(VER) DL_FILE = $(THISAPP)-source.tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 21 +PAK_VER = 22
DEPS = avahi cups-filters dbus ghostscript krb5 libtiff
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 412434ceefbdf3ec71bc9188a035f589 +$(DL_FILE)_MD5 = 524266752cf243c968921547b18ee594
install : $(TARGET)
diff --git a/lfs/cups-filters b/lfs/cups-filters index e7640f307..aedaaf927 100644 --- a/lfs/cups-filters +++ b/lfs/cups-filters @@ -24,7 +24,7 @@
include Config
-VER = 1.28.7 +VER = 1.28.8
THISAPP = cups-filters-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups-filters -PAK_VER = 4 +PAK_VER = 5
DEPS = cups ghostscript
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2efeed97e11ea5e157c5f4f2e0780fe7 +$(DL_FILE)_MD5 = 914fb53d31ff8500dc25d2e2c68ca5c1
install : $(TARGET)
diff --git a/lfs/expat b/lfs/expat index 878b59270..92c42bf82 100644 --- a/lfs/expat +++ b/lfs/expat @@ -24,7 +24,7 @@
include Config
-VER = 2.2.0 +VER = 2.3.0
THISAPP = expat-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2f47841c829facb346eb6e3fab5212e2 +$(DL_FILE)_MD5 = 54ea624caca3f9003cebcab4f0a75c8f
install : $(TARGET)
diff --git a/lfs/file b/lfs/file index ac2db8ceb..4f166d560 100644 --- a/lfs/file +++ b/lfs/file @@ -24,7 +24,7 @@
include Config
-VER = 5.39 +VER = 5.40
THISAPP = file-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1c450306053622803a25647d88f80f25 +$(DL_FILE)_MD5 = 72540ea1cc8c6e1dee35d6100ec66589
install : $(TARGET)
diff --git a/lfs/libxcrypt b/lfs/libxcrypt index 8fb937c9b..c452034c9 100644 --- a/lfs/libxcrypt +++ b/lfs/libxcrypt @@ -24,7 +24,7 @@
include Config
-VER = 4.4.17 +VER = 4.4.19
THISAPP = libxcrypt-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 12118d098ead971f9a8377cacfdd0da7 +$(DL_FILE)_MD5 = a088bd62745b1e29a9318eb5a44c09f7
install : $(TARGET)
diff --git a/lfs/lm_sensors b/lfs/lm_sensors index 8403be6e0..42c55d6d6 100644 --- a/lfs/lm_sensors +++ b/lfs/lm_sensors @@ -24,10 +24,10 @@
include Config
-VER = 3.4.0 +VER = 3-6-0
-THISAPP = lm_sensors-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +THISAPP = lm-sensors-$(VER) +DL_FILE = $(THISAPP).tar.gz 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)_MD5 = c03675ae9d43d60322110c679416901a +$(DL_FILE)_MD5 = f60e47b5eb50bbeed48a9f43bb08dd5e
install : $(TARGET)
@@ -72,7 +72,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make PREFIX=/usr $(MAKETUNING) cd $(DIR_APP) && make PREFIX=/usr install @rm -rf $(DIR_APP) diff --git a/lfs/meson b/lfs/meson index 13c8c8c46..437b0065a 100644 --- a/lfs/meson +++ b/lfs/meson @@ -24,7 +24,7 @@
include Config
-VER = 0.56.0 +VER = 0.57.2
THISAPP = meson-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 67ce2c0c3eab1b8ee9ddaa1c5143e7c0 +$(DL_FILE)_MD5 = 4a07b6d42d7a46a6b6e9604fae7da9aa
install : $(TARGET)
diff --git a/lfs/netsnmpd b/lfs/netsnmpd index 49eb25f3b..4b6cc4fa6 100644 --- a/lfs/netsnmpd +++ b/lfs/netsnmpd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = netsnmpd -PAK_VER = 10 +PAK_VER = 11
DEPS =
diff --git a/src/patches/collectd-4.10.9-remove-checks-for-SENSORS_API_VERSION-upper-limit.patch b/src/patches/collectd-4.10.9-remove-checks-for-SENSORS_API_VERSION-upper-limit.patch new file mode 100644 index 000000000..ae3cc4c7d --- /dev/null +++ b/src/patches/collectd-4.10.9-remove-checks-for-SENSORS_API_VERSION-upper-limit.patch @@ -0,0 +1,63 @@ +Based on patch from Pavel Rochnyack +https://git.ipfire.org/?p=thirdparty/collectd.git;a=commitdiff;h=d5a3c020d33... + +diff -Naur collectd-4.10.9/src/sensors.c.orig collectd-4.10.9/src/sensors.c +--- collectd-4.10.9/src/sensors.c.orig 2013-04-08 08:26:17.000000000 +0200 ++++ collectd-4.10.9/src/sensors.c 2021-04-13 23:17:43.196069346 +0200 +@@ -150,7 +150,7 @@ + # endif + /* #endif SENSORS_API_VERSION < 0x400 */ + +-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) ++#elif (SENSORS_API_VERSION >= 0x400) + typedef struct featurelist + { + const sensors_chip_name *chip; +@@ -162,11 +162,7 @@ + # ifndef SENSORS_CONF_PATH + # define SENSORS_CONF_PATH "/etc/sensors3.conf" + # endif +-/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */ + +-#else /* if SENSORS_API_VERSION >= 0x500 */ +-# error "This version of libsensors is not supported yet. Please report this " \ +- "as bug." + #endif + + static const char *conffile = SENSORS_CONF_PATH; +@@ -394,7 +390,7 @@ + } /* while sensors_get_detected_chips */ + /* #endif SENSORS_API_VERSION < 0x400 */ + +-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) ++#elif (SENSORS_API_VERSION >= 0x400) + chip_num = 0; + while ((chip = sensors_get_detected_chips (NULL, &chip_num)) != NULL) + { +@@ -448,7 +444,7 @@ + } /* while (subfeature) */ + } /* while (feature) */ + } /* while (chip) */ +-#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */ ++#endif /* (SENSORS_API_VERSION >= 0x400) */ + + if (first_feature == NULL) + { +@@ -541,7 +537,7 @@ + } /* for fl = first_feature .. NULL */ + /* #endif SENSORS_API_VERSION < 0x400 */ + +-#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) ++#elif (SENSORS_API_VERSION >= 0x400) + for (fl = first_feature; fl != NULL; fl = fl->next) + { + double value; +@@ -576,7 +572,7 @@ + + sensors_submit (plugin_instance, type, type_instance, value); + } /* for fl = first_feature .. NULL */ +-#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */ ++#endif /* (SENSORS_API_VERSION >= 0x400) */ + + return (0); + } /* int sensors_read */
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer