IPFire-SCM March 2023

ipfire-scm@lists.ipfire.org

1 participants
33 discussions

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. cd1320f79f73492864c08631169f3ac358dfb0cc
by Michael Tremer 13 Mar '23

13 Mar '23

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cb51fdda19118faf272d4603bbb84a2c278af453
by Peter Müller 11 Mar '23

11 Mar '23

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 cb51fdda19118faf272d4603bbb84a2c278af453 (commit) via 8014198eb6e0ee73433d781ff8c9d88979a28943 (commit) via 35abb51eb74ec4cb40f93c0e5b0f698657cba18a (commit) via c590c915a48cb3d102a7f5a052a36a475573106d (commit) via 3562922c432cd047e8a6d5904eb2bb70a8010c45 (commit) via f0d693186fc78753bd9453ac090e9da41c2fbfbf (commit) via 71604352ca9f2e8b2f960c4f685834328322b47c (commit) via 14051bfeb51ff5cd127e7e4c3aebaf8b11406fea (commit) via d3aec71828b56614fa08387c33080a6f425e3ce5 (commit) via 83f31dcef217d5d3d2c62d9e4a0608f6877850f3 (commit) via 44ea49fa75f097b21c947d0a9b4438d3cdd4d967 (commit) via 9eef0e16c1819c83f24bc58f08f0d3fc01273a3b (commit) via 0450dce6f6eb02fc539c0f0d0ccc01a281dcad58 (commit) via 1b70ead36dfaf6541677e4ac5d05867273eaa265 (commit) via b80932932a203db174041843252cc17658633a79 (commit) via c35974f87dbdd91ffe70f03a07217308545447d7 (commit) via a71ef763b0b609807125a3a2776e4d0bf8c786b7 (commit) via 078ec1ecc0a84c766b749a1cf7caeb2cac0c200b (commit) via f21d3a5ad3c22d6fad93a07583480a150a11dfdc (commit) via 2e7b68c693b76d613a1ab541e459c309f0b63467 (commit) via b5967dc1aa8221390aa5adbd6af17a8bbdd9805d (commit) via a9bca0f0d8456443dc53cfc54f17bf38c2141e3e (commit) via 6828b9bcd6e8361a4999b0625d2502a753ffdf2f (commit) via aaca122e62f857ddd86e11559f49a7b3ac28ad5d (commit) via d6cb0d43309d3c1ccf9fc36808ae13793ee29453 (commit) via cb9ead7f919a2dc61a6d879597f4848ce9171224 (commit) via 282e3fe4fb6c71942ac37c925ad541f14973365f (commit) via 452fd239f00121e957c932f909409485f26332d6 (commit) via b8e360bab78abe914646b009b0334ce21ed8b452 (commit) via fd5a24daec641bb15cfd92c6a64c833ebf2e367c (commit) via ee1d6a7c3a8a2904d78f83c4a37784ec87f3b368 (commit) via 4face6d99fb7a28044391ad8eb734f2042ebf567 (commit) via 53c4a960ce1f679b7d1e2589c30b7b0c6ad591da (commit) via 38d6ab69c92c1dc48f60c2d99d44b9cd86f65d2d (commit) from 7ad27c50903b55a44d51c08760a085d8d9a73aae (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 cb51fdda19118faf272d4603bbb84a2c278af453 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 11 17:06:41 2023 +0000 Run ./make.sh lang Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 8014198eb6e0ee73433d781ff8c9d88979a28943 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 11 17:06:16 2023 +0000 Run ./make.sh update-contributors Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 35abb51eb74ec4cb40f93c0e5b0f698657cba18a Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 11 17:04:18 2023 +0000 linux-firmware: Do not ship the qca/ directory It only contains firmware files for some Qualcomm Bluetooth devices, for which there is no use on IPFire, since we disabled Bluetooth support in the kernel a long time ago due to security reasons. To save some space (~ 1.9 MByte), do not ship these files, and delete them on existing IPFire installations as well. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit c590c915a48cb3d102a7f5a052a36a475573106d Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 11 17:01:14 2023 +0000 Core Update 174: Ship relevant changes of linux-firmware Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 3562922c432cd047e8a6d5904eb2bb70a8010c45 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Mar 7 23:01:25 2023 +0100 linux-firmware: Update to version 20230210 - Update from version 20221214 to 20230210 - Update of rootfile - Changelog For changes see the commits in the git repo https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git… Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit f0d693186fc78753bd9453ac090e9da41c2fbfbf Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 11 16:36:08 2023 +0000 Core Update 174: Ship proxy.cgi Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 71604352ca9f2e8b2f960c4f685834328322b47c Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Feb 14 14:08:46 2023 +0100 procy.cgi: Fix bug#12701 - remove advproxy wpad notice line - This line is no longer needed with the help button at the top of each WUI page that was implemented by @Leo - Sorry for long time for me to get around to finalising this patch but it is done now. Fixes: bug#12701 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 14051bfeb51ff5cd127e7e4c3aebaf8b11406fea Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Mar 6 18:04:24 2023 +0100 updatexlrator.cgi: Update to naming of variables in css section - This updates the updatexlrator.cgi page to the same central use of extraHead from header.pl and simplifying of css variables where appropriate. - The variables for the percentage bar will also be able to be used in other cgi pages with a percent bar. Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit d3aec71828b56614fa08387c33080a6f425e3ce5 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Mar 6 18:04:23 2023 +0100 dhcp.cgi: Update to naming of variables in css section - After looking at other .cgi files I realised that I had named the variables based on their dhcp usage only. However colouryellow or color20 etc can be used not only in a row but also in a cell or a column. Rather than ending up with multiple copies of the same colour for rows, cells, columns etc I have simplified the variable names to just the colour. They can then be used in whatever situation is wanted. The rest of the cgi code will give the view of what structure the colour is being applied to. - This will limit the number of different css variables defined in the header.pl file Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 83f31dcef217d5d3d2c62d9e4a0608f6877850f3 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 11 16:30:05 2023 +0000 Core Update 174: Ship traffic.cgi Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 44ea49fa75f097b21c947d0a9b4438d3cdd4d967 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Mar 7 12:53:49 2023 +0100 traffic.cgi: Do not use hard-coded red interface name If QMI is used the dial in mode has to be set as ppp dialin but the interface name is red. In such a case the old code tried to display the stats for the ppp0 interface which is wrong. This patch fixes this issue by calling the handy function to get the correct interface name for red. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit 9eef0e16c1819c83f24bc58f08f0d3fc01273a3b Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 11 16:28:20 2023 +0000 Core Update 174: Ship rules.pl and ipblocklist.cgi Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 0450dce6f6eb02fc539c0f0d0ccc01a281dcad58 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Mar 7 13:17:35 2023 +0100 ipblocklist.cgi: Fix settings checkbox handling Checkboxes does not submit any values if they are not checked. Default them to "off" in such a case. This fixes the issue not beeing able to disable the logging. Fixes #12979. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 1b70ead36dfaf6541677e4ac5d05867273eaa265 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Mar 7 13:17:34 2023 +0100 firewall: Silence warnings if blocklist logging is not set. Reference: #12979. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> commit b80932932a203db174041843252cc17658633a79 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 11 16:26:46 2023 +0000 Core Update 174: Ship ids-functions.pl Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit c35974f87dbdd91ffe70f03a07217308545447d7 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Mar 7 13:38:09 2023 +0100 ids-functions.pl: Extract rules files if they are in a providers rules folder. Now the rules files in a subfolder like "<provider>-rules" also will get extracted. Fixes rule file extraction for Snort Community ruleset. Fixes #12948. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org> commit a71ef763b0b609807125a3a2776e4d0bf8c786b7 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 11 16:25:37 2023 +0000 Core Update 174: Ship grep Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 078ec1ecc0a84c766b749a1cf7caeb2cac0c200b Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Mar 7 23:01:24 2023 +0100 grep: Update to version 3.9 - Update from version 3.8 to 3.9 - Update of rootfile not required - Changelog Noteworthy changes in release 3.9 (2023-03-05) [stable] Bug fixes With -P, some non-ASCII UTF8 characters were not recognized as word-constituent due to our omission of the PCRE2_UCP flag. E.g., given f(){ echo Perú|LC_ALL=en_US.UTF-8 grep -Po "$1"; } and this command, echo $(f 'r\w'):$(f '.\b'), before it would print ":r". After the fix, it prints the correct results: "rú:ú". When given multiple patterns the last of which has a back-reference, grep no longer sometimes mistakenly matches lines in some cases. [Bug#36148#13 introduced in grep 3.4] Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> commit f21d3a5ad3c22d6fad93a07583480a150a11dfdc Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Mar 7 23:01:26 2023 +0100 python3-setuptools: Update to version 67.5.1 - Update from version 65.4.1 to 67.5.1 - Update of rootfile - Changelog v67.5.1 Misc * #3836: Fixed interaction between ``setuptools``' package auto-discovery and auto-generated ``htmlcov`` files. Previously, the ``htmlcov`` name was ignored when searching for single-file modules, however the correct behaviour is to ignore it when searching for packages (since it is supposed to be a directory, see `coverage config`_) -- by :user:`yukihiko-shinoda`. .. _coverage config: https://coverage.readthedocs.io/en/stable/config.html#html-directory * #3838: Improved error messages for ``pyproject.toml`` validations. * #3839: Fixed ``pkg_resources`` errors caused when parsing metadata of packages that are already installed but do not conform with PEP 440. v67.5.0 Changes * #3843: Although pkg_resources has been discouraged for use, some projects still consider pkg_resources viable for usage. This change makes it clear that pkg_resources should not be used, emitting a DeprecationWarning when imported. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> commit 2e7b68c693b76d613a1ab541e459c309f0b63467 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Mar 7 23:01:27 2023 +0100 sudo: Update to version 1.9.13p3 - Update from version 1.9.13p2 to 1.9.13p3 - Update of rootfile not required - Changelog What's new in Sudo 1.9.13p3 * Fixed a bug introduced in sudo 1.9.13 that caused a syntax error when "list" was used as a user or host name. GitHub issue #246. * Fixed a bug that could cause sudo to hang when running a command in a pseudo-terminal when there is still input buffered after a command has exited. * Fixed "sudo -U otheruser -l command". This is a regression in sudo 1.9.13. GitHub issue #248. * Fixed "sudo -l command args" when matching a command in sudoers with command line arguments. This is a regression in sudo 1.9.13. GitHub issue #249. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> commit b5967dc1aa8221390aa5adbd6af17a8bbdd9805d Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 11 16:22:10 2023 +0000 Core Update 174: Ship qpdf Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit a9bca0f0d8456443dc53cfc54f17bf38c2141e3e Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Mar 7 23:05:16 2023 +0100 cups-filters: -std=c++17 required due to problem introduced with qpdf-11.3.0 - Add -std=c++17 flag to configure - Disable static libs - Update of rootfile Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 6828b9bcd6e8361a4999b0625d2502a753ffdf2f Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Mar 7 23:05:15 2023 +0100 qpdf: Update to version 11.3.0 - Update from version 10.4.0 to 11.3.0 - Update of rootfile - Build changed to cmake from version 11.0 onwards - find-dependencies run due to lib so bump. Only qpdf and cups-filters are linked to the changed libs. cups-filters being shipped due to a change required because of qpdf-11.3.0 - Changelog is too large to include here. Details can be found in the ChangeLog file in the source tarball. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit aaca122e62f857ddd86e11559f49a7b3ac28ad5d Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 11 16:20:59 2023 +0000 Core Update 174: Ship poppler and poppler-data Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit d6cb0d43309d3c1ccf9fc36808ae13793ee29453 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Mar 7 23:02:18 2023 +0100 poppler-data: Update to version 0.4.12 - Update from version 0.4.11 to 0.4.12 - Update of rootfile not required - No Changelog available but the latest version of poppler-data is required by poppler Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit cb9ead7f919a2dc61a6d879597f4848ce9171224 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Mar 7 23:02:17 2023 +0100 poppler: Update to version 23.03.0 - Update from version 23.01.0 to 23.03.0 - Update of rootfile not required - Changelog Release 23.03.0: core: * PngWriter: Fix potential uninitialized memory use Release 23.02.0: core: * CairoOutputDev: Fix rendering of color type 3 fonts * CairoOutputDev: Add handling matte entry * Fix segfault on wrong nssdir * Fix "NSS could not shutdown" utils: * pdfsig: Point out supports PKCS#11 URIs as nickname Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 282e3fe4fb6c71942ac37c925ad541f14973365f Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Mar 8 15:59:55 2023 +0100 log.dat: Fixes Bug#12922 - adjusts regex to catch hostname for hostname or FQDN - Most of the packages being searched for in the system logs section only put hostname into the logs. However HAProxy puts the FQDN. Reviewing RFC 5424 shows that this is following the requirements. The preferred order fromn the RFC is 1. FQDN 2. Static IP address 3. hostname 4. Dynamic IP address 5. the NILVALUE - Most of the programs are using option 3 but option 1 is valid for HAProxy - The regex change filters out the hostname from the FQDN if an extra 'dot' is present Fixes: Bug#12922 Suggested-by: Michael <ip.fire(a)die-fritzens.de> Tested-by: Michael <ip.fire(a)die-fritzens.de> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 452fd239f00121e957c932f909409485f26332d6 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Mar 8 15:59:54 2023 +0100 log.dat: Fix bug#12922 - add HAProxy to System Log drop down list Fixes: Bug#12922 Suggested-by: Michael <ip.fire(a)die-fritzens.de> Tested-by: Michael <ip.fire(a)die-fritzens.de> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit b8e360bab78abe914646b009b0334ce21ed8b452 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Mar 8 11:33:35 2023 +0100 cups: Update to version 2.4.2 - Update from 2.4.1 to 2.4.2 - Update of rootfile not required - Changelog Changes in CUPS v2.4.2 (26th May 2022) - Fixed certificate strings comparison for Local authorization (CVE-2022-26691) - The `cupsFileOpen` function no longer opens files for append in read-write mode (Issue #291) - The cupsd daemon removed processing temporary queue (Issue #364) - Fixed delay in IPP backend if GNUTLS is used and endpoint doesn't confirm closing the connection (Issue #365) - Fixed conditional jump based on uninitialized value in cups/ppd.c (Issue #329) - Fixed CSS related issues in CUPS Web UI (Issue #344) - Fixed copyright in CUPS Web UI trailer template (Issue #346) - mDNS hostname in device uri is not resolved when installaling a permanent IPP Everywhere queue (Issues #340, #343) - The `lpstat` command now reports when the scheduler is not running (Issue #352) - Updated the man pages concerning the `-h` option (Issue #357) - Re-added LibreSSL/OpenSSL support (Issue #362) - Updated the Solaris smf service file (Issue #368) - Fixed a regression in lpoptions option support (Issue #370) - The scheduler now regenerates the PPD cache information after changing the "cupsd.conf" file (Issue #371) - Updated the scheduler to set "auth-info-required" to "username,password" if a backend reports it needs authentication info but doesn't set a method for authentication (Issue #373) - Updated the configure script to look for the OpenSSL library the old way if pkg-config is not available (Issue #375) - Fixed the prototype for the `httpWriteResponse` function (Issue #380) - Brought back minimal AIX support (Issue #389) - `cupsGetResponse` did not always set the last error. - Fixed a number of old references to the Apple CUPS web page. - Restored the default/generic printer icon file for the web interface. - Removed old stylesheet classes that are no longer used by the web interface. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> commit fd5a24daec641bb15cfd92c6a64c833ebf2e367c Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 11 16:17:48 2023 +0000 Core Update 174: Ship and restart Apache Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit ee1d6a7c3a8a2904d78f83c4a37784ec87f3b368 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Mar 9 17:59:25 2023 +0100 apache: Update to 2.4.56 For details see: https://dlcdn.apache.org/httpd/CHANGES_2.4.56 "Changes with Apache 2.4.56 *) SECURITY: CVE-2023-27522: Apache HTTP Server: mod_proxy_uwsgi HTTP response splitting (cve.mitre.org) HTTP Response Smuggling vulnerability in Apache HTTP Server via mod_proxy_uwsgi. This issue affects Apache HTTP Server: from 2.4.30 through 2.4.55. Special characters in the origin response header can truncate/split the response forwarded to the client. Credits: Dimas Fariski Setyawan Putra (nyxsorcerer) *) SECURITY: CVE-2023-25690: HTTP request splitting with mod_rewrite and mod_proxy (cve.mitre.org) Some mod_proxy configurations on Apache HTTP Server versions 2.4.0 through 2.4.55 allow a HTTP Request Smuggling attack. Configurations are affected when mod_proxy is enabled along with some form of RewriteRule or ProxyPassMatch in which a non-specific pattern matches some portion of the user-supplied request-target (URL) data and is then re-inserted into the proxied request-target using variable substitution. For example, something like: RewriteEngine on RewriteRule "^/here/(.*)" " http://example.com:8080/elsewhere?$1" http://example.com:8080/elsewhere ; [P] ProxyPassReverse /here/ http://example.com:8080/ http://example.com:8080/ Request splitting/smuggling could result in bypass of access controls in the proxy server, proxying unintended URLs to existing origin servers, and cache poisoning. Credits: Lars Krapf of Adobe *) rotatelogs: Add -T flag to allow subsequent rotated logfiles to be truncated without the initial logfile being truncated. [Eric Covener] *) mod_ldap: LDAPConnectionPoolTTL should accept negative values in order to allow connections of any age to be reused. Up to now, a negative value was handled as an error when parsing the configuration file. PR 66421. [nailyk <bzapache nailyk.fr>, Christophe Jaillet] *) mod_proxy_ajp: Report an error if the AJP backend sends an invalid number of headers. [Ruediger Pluem] *) mod_md: - Enabling ED25519 support and certificate transparency information when building with libressl v3.5.0 and newer. Thanks to Giovanni Bechis. - MDChallengeDns01 can now be configured for individual domains. Thanks to JÃ©rÃ´me Billiras (@bilhackmac) for the initial PR. - Fixed a bug found by JÃ©rÃ´me Billiras (@bilhackmac) that caused the challenge teardown not being invoked as it should. [Stefan Eissing] *) mod_http2: client resets of HTTP/2 streams led to unwanted 500 errors reported in access logs and error documents. The processing of the reset was correct, only unneccesary reporting was caused. [Stefan Eissing] *) mod_proxy_uwsgi: Stricter backend HTTP response parsing/validation. [Yann Ylavic]" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> commit 4face6d99fb7a28044391ad8eb734f2042ebf567 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 11 16:16:25 2023 +0000 Core Update 174: Ship ca-certificates Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 53c4a960ce1f679b7d1e2589c30b7b0c6ad591da Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Mar 5 20:39:51 2023 +0000 ca-certificates: Rebase patch for removing TrustCor root CAs This is necessary since the certdata2pem.py script does not take meta information such as "distrust after date" into account, hence Mozilla's changes to TrustCor's root CAs are not sufficient to have them removed from or distrusted on IPFire installations. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 38d6ab69c92c1dc48f60c2d99d44b9cd86f65d2d Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Mar 5 20:39:05 2023 +0000 ca-certificates: Update root CA certificates bundle Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/ca-certificates/certdata.txt | 713 +-------------------- config/cfgroot/header.pl | 35 +- config/cfgroot/ids-functions.pl | 2 +- config/firewall/rules.pl | 2 +- config/rootfiles/common/linux-firmware | 254 ++++---- config/rootfiles/common/qpdf | 29 +- .../{oldcore/114 => core/174}/filelists/apache2 | 0 .../121 => core/174}/filelists/ca-certificates | 0 config/rootfiles/core/174/filelists/files | 89 +++ .../{oldcore/100 => core/174}/filelists/grep | 0 .../{oldcore/110 => core/174}/filelists/poppler | 0 .../151 => core/174}/filelists/poppler-data | 0 .../{oldcore/110 => core/174}/filelists/qpdf | 0 config/rootfiles/core/174/update.sh | 98 +++ config/rootfiles/packages/cups-filters | 2 - config/rootfiles/packages/python3-setuptools | 532 ++++++++------- doc/language_issues.de | 1 + doc/language_issues.en | 1 - doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.it | 1 - doc/language_issues.nl | 1 - doc/language_issues.pl | 1 - doc/language_issues.ru | 1 - doc/language_issues.tr | 1 - doc/language_missings | 4 - html/cgi-bin/credits.cgi | 2 +- html/cgi-bin/dhcp.cgi | 20 +- html/cgi-bin/ipblocklist.cgi | 4 + html/cgi-bin/logs.cgi/log.dat | 8 +- html/cgi-bin/proxy.cgi | 3 - html/cgi-bin/traffic.cgi | 12 +- html/cgi-bin/updatexlrator.cgi | 54 +- lfs/apache2 | 4 +- lfs/ca-certificates | 4 +- lfs/cups | 6 +- lfs/cups-filters | 4 +- lfs/grep | 4 +- lfs/linux-firmware | 4 +- lfs/poppler | 4 +- lfs/poppler-data | 6 +- lfs/python3-setuptools | 8 +- lfs/qpdf | 17 +- lfs/sudo | 4 +- ...ificates-Remove-TrustCor-Systems-root-CAs.patch | 45 +- 45 files changed, 742 insertions(+), 1240 deletions(-) copy config/rootfiles/{oldcore/114 => core/174}/filelists/apache2 (100%) copy config/rootfiles/{oldcore/121 => core/174}/filelists/ca-certificates (100%) copy config/rootfiles/{oldcore/100 => core/174}/filelists/grep (100%) copy config/rootfiles/{oldcore/110 => core/174}/filelists/poppler (100%) copy config/rootfiles/{oldcore/151 => core/174}/filelists/poppler-data (100%) copy config/rootfiles/{oldcore/110 => core/174}/filelists/qpdf (100%) mode change 100644 => 100755 html/cgi-bin/dhcp.cgi Difference in files: diff --git a/config/ca-certificates/certdata.txt b/config/ca-certificates/certdata.txt index 7c5e55ff5..c1c5b7b2d 100644 --- a/config/ca-certificates/certdata.txt +++ b/config/ca-certificates/certdata.txt @@ -2813,174 +2813,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -# -# Certificate "SwissSign Platinum CA - G2" -# -# Issuer: CN=SwissSign Platinum CA - G2,O=SwissSign AG,C=CH -# Serial Number:4e:b2:00:67:0c:03:5d:4f -# Subject: CN=SwissSign Platinum CA - G2,O=SwissSign AG,C=CH -# Not Valid Before: Wed Oct 25 08:36:00 2006 -# Not Valid After : Sat Oct 25 08:36:00 2036 -# Fingerprint (SHA-256): 3B:22:2E:56:67:11:E9:92:30:0D:C0:B1:5A:B9:47:3D:AF:DE:F8:C8:4D:0C:EF:7D:33:17:B4:C1:82:1D:14:36 -# Fingerprint (SHA1): 56:E0:FA:C0:3B:8F:18:23:55:18:E5:D3:11:CA:E8:C2:43:31:AB:66 -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SwissSign Platinum CA - G2" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\111\061\013\060\011\006\003\125\004\006\023\002\103\110\061 -\025\060\023\006\003\125\004\012\023\014\123\167\151\163\163\123 -\151\147\156\040\101\107\061\043\060\041\006\003\125\004\003\023 -\032\123\167\151\163\163\123\151\147\156\040\120\154\141\164\151 -\156\165\155\040\103\101\040\055\040\107\062 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\111\061\013\060\011\006\003\125\004\006\023\002\103\110\061 -\025\060\023\006\003\125\004\012\023\014\123\167\151\163\163\123 -\151\147\156\040\101\107\061\043\060\041\006\003\125\004\003\023 -\032\123\167\151\163\163\123\151\147\156\040\120\154\141\164\151 -\156\165\155\040\103\101\040\055\040\107\062 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\010\116\262\000\147\014\003\135\117 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\005\301\060\202\003\251\240\003\002\001\002\002\010\116 -\262\000\147\014\003\135\117\060\015\006\011\052\206\110\206\367 -\015\001\001\005\005\000\060\111\061\013\060\011\006\003\125\004 -\006\023\002\103\110\061\025\060\023\006\003\125\004\012\023\014 -\123\167\151\163\163\123\151\147\156\040\101\107\061\043\060\041 -\006\003\125\004\003\023\032\123\167\151\163\163\123\151\147\156 -\040\120\154\141\164\151\156\165\155\040\103\101\040\055\040\107 -\062\060\036\027\015\060\066\061\060\062\065\060\070\063\066\060 -\060\132\027\015\063\066\061\060\062\065\060\070\063\066\060\060 -\132\060\111\061\013\060\011\006\003\125\004\006\023\002\103\110 -\061\025\060\023\006\003\125\004\012\023\014\123\167\151\163\163 -\123\151\147\156\040\101\107\061\043\060\041\006\003\125\004\003 -\023\032\123\167\151\163\163\123\151\147\156\040\120\154\141\164 -\151\156\165\155\040\103\101\040\055\040\107\062\060\202\002\042 -\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003 -\202\002\017\000\060\202\002\012\002\202\002\001\000\312\337\242 -\002\342\332\370\374\007\026\261\336\140\252\336\226\134\144\037 -\307\057\176\317\147\372\104\102\326\166\143\225\256\353\257\162 -\040\212\105\107\206\142\170\206\326\040\071\046\364\256\243\375 -\043\347\245\234\265\042\041\031\267\067\223\042\300\120\234\202 -\173\324\325\004\104\134\313\264\302\237\222\276\044\330\173\147 -\042\342\151\137\345\005\170\324\207\331\161\160\063\045\123\264 -\207\073\051\220\050\066\232\125\104\060\150\244\203\227\177\015 -\036\234\166\377\025\235\140\227\000\215\212\205\003\354\200\276 -\352\054\156\020\121\222\314\176\325\243\063\330\326\111\336\130 -\052\257\366\026\353\113\173\220\062\227\271\272\235\130\361\370 -\127\111\004\036\242\135\006\160\335\161\333\371\335\213\232\033 -\214\317\075\243\115\316\313\174\366\273\234\240\372\011\316\043 -\142\262\351\015\037\342\162\050\217\237\254\150\040\175\157\073 -\250\205\061\011\177\013\307\350\145\351\343\170\016\011\147\060 -\213\064\202\373\135\340\314\235\201\155\142\356\010\036\004\054 -\116\233\354\376\251\117\137\375\151\170\357\011\037\241\264\277 -\372\363\357\220\036\114\005\213\036\352\172\221\172\303\327\345 -\373\060\274\154\033\020\130\230\367\032\137\320\051\062\003\023 -\106\115\141\152\205\114\122\164\057\006\037\173\021\342\204\227 -\306\231\363\155\177\327\147\203\176\023\150\330\161\050\132\330 -\316\335\350\020\024\232\376\155\043\207\156\216\132\160\074\325 -\215\011\000\247\252\274\260\061\067\155\310\204\024\036\133\275 -\105\143\040\153\113\164\214\275\333\072\016\301\317\132\026\217 -\245\230\362\166\211\262\023\022\073\013\167\167\254\273\345\074 -\051\112\222\162\312\141\032\053\136\114\342\203\164\167\372\065 -\110\172\205\115\215\232\123\304\337\170\312\227\221\110\053\105 -\053\001\367\034\032\242\355\030\272\012\275\203\372\157\274\215 -\127\223\073\324\324\246\316\036\361\240\261\316\253\375\053\050 -\232\117\033\327\303\162\333\244\304\277\135\114\365\335\173\226 -\151\356\150\200\346\347\230\272\066\267\376\156\355\053\275\040 -\370\145\031\332\125\011\176\045\334\376\141\142\162\371\176\030 -\002\357\143\264\320\373\257\345\073\143\214\147\217\002\003\001 -\000\001\243\201\254\060\201\251\060\016\006\003\125\035\017\001 -\001\377\004\004\003\002\001\006\060\017\006\003\125\035\023\001 -\001\377\004\005\060\003\001\001\377\060\035\006\003\125\035\016 -\004\026\004\024\120\257\314\007\207\025\107\157\070\305\264\145 -\321\336\225\252\351\337\234\314\060\037\006\003\125\035\043\004 -\030\060\026\200\024\120\257\314\007\207\025\107\157\070\305\264 -\145\321\336\225\252\351\337\234\314\060\106\006\003\125\035\040 -\004\077\060\075\060\073\006\011\140\205\164\001\131\001\001\001 -\001\060\056\060\054\006\010\053\006\001\005\005\007\002\001\026 -\040\150\164\164\160\072\057\057\162\145\160\157\163\151\164\157 -\162\171\056\163\167\151\163\163\163\151\147\156\056\143\157\155 -\057\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000 -\003\202\002\001\000\010\205\246\365\026\014\374\104\032\301\143 -\340\371\125\106\010\374\160\034\102\050\226\216\267\305\301\101 -\165\116\011\161\171\345\155\226\312\113\245\210\140\320\060\164 -\270\312\010\334\264\060\236\100\007\026\153\145\225\167\001\256 -\244\267\065\013\201\332\161\025\251\164\027\070\173\130\312\371 -\057\373\300\145\166\215\133\001\271\175\336\202\075\144\270\276 -\024\164\243\012\124\323\054\225\030\027\065\365\121\153\077\217 -\242\226\141\071\170\153\113\345\246\240\370\123\337\121\020\223 -\142\347\200\057\342\321\340\274\216\066\106\167\063\354\270\373 -\216\232\054\211\115\061\021\017\046\236\004\273\267\004\215\013 -\362\271\374\132\235\073\026\267\057\310\230\253\376\212\120\131 -\056\243\073\374\051\135\213\301\113\311\342\212\023\035\261\277 -\273\102\035\122\335\116\330\024\136\020\306\061\007\357\161\047 -\367\033\071\011\334\202\352\213\263\225\206\136\375\365\332\135 -\061\246\340\061\266\224\346\104\111\164\305\026\345\367\037\003 -\141\050\305\310\313\022\240\102\113\371\153\210\010\215\264\062 -\030\363\165\237\304\177\000\117\005\225\234\243\027\002\303\263 -\123\233\252\040\071\051\053\146\372\235\257\136\263\222\322\265 -\246\341\032\371\055\101\151\201\024\264\264\265\355\211\075\316 -\373\251\235\065\102\104\261\034\024\163\201\317\052\001\065\232 -\061\325\055\217\155\204\337\200\115\127\343\077\305\204\165\332 -\211\306\060\273\353\217\313\042\010\240\256\252\361\003\154\072 -\113\115\011\245\016\162\306\126\153\041\102\116\043\045\024\150 -\256\166\012\174\014\007\160\144\371\232\057\366\005\071\046\306 -\014\217\031\177\103\136\156\364\133\025\057\333\141\135\346\147 -\057\077\010\224\371\140\264\230\061\332\164\361\204\223\161\115 -\137\373\140\130\321\373\304\301\155\211\242\273\040\037\235\161 -\221\313\062\233\023\075\076\175\222\122\065\254\222\224\242\323 -\030\302\174\307\352\257\166\005\026\335\147\047\302\176\034\007 -\042\041\363\100\012\033\064\007\104\023\302\204\152\216\337\031 -\132\277\177\353\035\342\032\070\321\134\257\107\222\153\200\265 -\060\245\311\215\330\253\061\201\037\337\302\146\067\323\223\251 -\205\206\171\145\322 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for "SwissSign Platinum CA - G2" -# Issuer: CN=SwissSign Platinum CA - G2,O=SwissSign AG,C=CH -# Serial Number:4e:b2:00:67:0c:03:5d:4f -# Subject: CN=SwissSign Platinum CA - G2,O=SwissSign AG,C=CH -# Not Valid Before: Wed Oct 25 08:36:00 2006 -# Not Valid After : Sat Oct 25 08:36:00 2036 -# Fingerprint (SHA-256): 3B:22:2E:56:67:11:E9:92:30:0D:C0:B1:5A:B9:47:3D:AF:DE:F8:C8:4D:0C:EF:7D:33:17:B4:C1:82:1D:14:36 -# Fingerprint (SHA1): 56:E0:FA:C0:3B:8F:18:23:55:18:E5:D3:11:CA:E8:C2:43:31:AB:66 -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "SwissSign Platinum CA - G2" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\126\340\372\300\073\217\030\043\125\030\345\323\021\312\350\302 -\103\061\253\146 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\311\230\047\167\050\036\075\016\025\074\204\000\270\205\003\346 -END -CKA_ISSUER MULTILINE_OCTAL -\060\111\061\013\060\011\006\003\125\004\006\023\002\103\110\061 -\025\060\023\006\003\125\004\012\023\014\123\167\151\163\163\123 -\151\147\156\040\101\107\061\043\060\041\006\003\125\004\003\023 -\032\123\167\151\163\163\123\151\147\156\040\120\154\141\164\151 -\156\165\155\040\103\101\040\055\040\107\062 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\010\116\262\000\147\014\003\135\117 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - # # Certificate "SwissSign Gold CA - G2" # @@ -3746,152 +3578,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -# -# Certificate "Network Solutions Certificate Authority" -# -# Issuer: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US -# Serial Number:57:cb:33:6f:c2:5c:16:e6:47:16:17:e3:90:31:68:e0 -# Subject: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US -# Not Valid Before: Fri Dec 01 00:00:00 2006 -# Not Valid After : Mon Dec 31 23:59:59 2029 -# Fingerprint (SHA-256): 15:F0:BA:00:A3:AC:7A:F3:AC:88:4C:07:2B:10:11:A0:77:BD:77:C0:97:F4:01:64:B2:F8:59:8A:BD:83:86:0C -# Fingerprint (SHA1): 74:F8:A3:C3:EF:E7:B3:90:06:4B:83:90:3C:21:64:60:20:E5:DF:CE -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Network Solutions Certificate Authority" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162 -\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056 -\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164 -\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103 -\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 -\162\151\164\171 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162 -\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056 -\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164 -\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103 -\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 -\162\151\164\171 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\127\313\063\157\302\134\026\346\107\026\027\343\220\061 -\150\340 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\003\346\060\202\002\316\240\003\002\001\002\002\020\127 -\313\063\157\302\134\026\346\107\026\027\343\220\061\150\340\060 -\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\142 -\061\013\060\011\006\003\125\004\006\023\002\125\123\061\041\060 -\037\006\003\125\004\012\023\030\116\145\164\167\157\162\153\040 -\123\157\154\165\164\151\157\156\163\040\114\056\114\056\103\056 -\061\060\060\056\006\003\125\004\003\023\047\116\145\164\167\157 -\162\153\040\123\157\154\165\164\151\157\156\163\040\103\145\162 -\164\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151 -\164\171\060\036\027\015\060\066\061\062\060\061\060\060\060\060 -\060\060\132\027\015\062\071\061\062\063\061\062\063\065\071\065 -\071\132\060\142\061\013\060\011\006\003\125\004\006\023\002\125 -\123\061\041\060\037\006\003\125\004\012\023\030\116\145\164\167 -\157\162\153\040\123\157\154\165\164\151\157\156\163\040\114\056 -\114\056\103\056\061\060\060\056\006\003\125\004\003\023\047\116 -\145\164\167\157\162\153\040\123\157\154\165\164\151\157\156\163 -\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164 -\150\157\162\151\164\171\060\202\001\042\060\015\006\011\052\206 -\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202 -\001\012\002\202\001\001\000\344\274\176\222\060\155\306\330\216 -\053\013\274\106\316\340\047\226\336\336\371\372\022\323\074\063 -\163\263\004\057\274\161\214\345\237\266\042\140\076\137\135\316 -\011\377\202\014\033\232\121\120\032\046\211\335\325\141\135\031 -\334\022\017\055\012\242\103\135\027\320\064\222\040\352\163\317 -\070\054\006\046\011\172\162\367\372\120\062\370\302\223\323\151 -\242\043\316\101\261\314\344\325\037\066\321\212\072\370\214\143 -\342\024\131\151\355\015\323\177\153\350\270\003\345\117\152\345 -\230\143\151\110\005\276\056\377\063\266\351\227\131\151\370\147 -\031\256\223\141\226\104\025\323\162\260\077\274\152\175\354\110 -\177\215\303\253\252\161\053\123\151\101\123\064\265\260\271\305 -\006\012\304\260\105\365\101\135\156\211\105\173\075\073\046\214 -\164\302\345\322\321\175\262\021\324\373\130\062\042\232\200\311 -\334\375\014\351\177\136\003\227\316\073\000\024\207\047\160\070 -\251\216\156\263\047\166\230\121\340\005\343\041\253\032\325\205 -\042\074\051\265\232\026\305\200\250\364\273\153\060\217\057\106 -\002\242\261\014\042\340\323\002\003\001\000\001\243\201\227\060 -\201\224\060\035\006\003\125\035\016\004\026\004\024\041\060\311 -\373\000\327\116\230\332\207\252\052\320\247\056\261\100\061\247 -\114\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001 -\006\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001 -\001\377\060\122\006\003\125\035\037\004\113\060\111\060\107\240 -\105\240\103\206\101\150\164\164\160\072\057\057\143\162\154\056 -\156\145\164\163\157\154\163\163\154\056\143\157\155\057\116\145 -\164\167\157\162\153\123\157\154\165\164\151\157\156\163\103\145 -\162\164\151\146\151\143\141\164\145\101\165\164\150\157\162\151 -\164\171\056\143\162\154\060\015\006\011\052\206\110\206\367\015 -\001\001\005\005\000\003\202\001\001\000\273\256\113\347\267\127 -\353\177\252\055\267\163\107\205\152\301\344\245\035\344\347\074 -\351\364\131\145\167\265\172\133\132\215\045\066\340\172\227\056 -\070\300\127\140\203\230\006\203\237\271\166\172\156\120\340\272 -\210\054\374\105\314\030\260\231\225\121\016\354\035\270\210\377 -\207\120\034\202\302\343\340\062\200\277\240\013\107\310\303\061 -\357\231\147\062\200\117\027\041\171\014\151\134\336\136\064\256 -\002\265\046\352\120\337\177\030\145\054\311\362\143\341\251\007 -\376\174\161\037\153\063\044\152\036\005\367\005\150\300\152\022 -\313\056\136\141\313\256\050\323\176\302\264\146\221\046\137\074 -\056\044\137\313\130\017\353\050\354\257\021\226\363\334\173\157 -\300\247\210\362\123\167\263\140\136\256\256\050\332\065\054\157 -\064\105\323\046\341\336\354\133\117\047\153\026\174\275\104\004 -\030\202\263\211\171\027\020\161\075\172\242\026\116\365\001\315 -\244\154\145\150\241\111\166\134\103\311\330\274\066\147\154\245 -\224\265\324\314\271\275\152\065\126\041\336\330\303\353\373\313 -\244\140\114\260\125\240\240\173\127\262 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for "Network Solutions Certificate Authority" -# Issuer: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US -# Serial Number:57:cb:33:6f:c2:5c:16:e6:47:16:17:e3:90:31:68:e0 -# Subject: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US -# Not Valid Before: Fri Dec 01 00:00:00 2006 -# Not Valid After : Mon Dec 31 23:59:59 2029 -# Fingerprint (SHA-256): 15:F0:BA:00:A3:AC:7A:F3:AC:88:4C:07:2B:10:11:A0:77:BD:77:C0:97:F4:01:64:B2:F8:59:8A:BD:83:86:0C -# Fingerprint (SHA1): 74:F8:A3:C3:EF:E7:B3:90:06:4B:83:90:3C:21:64:60:20:E5:DF:CE -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Network Solutions Certificate Authority" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\164\370\243\303\357\347\263\220\006\113\203\220\074\041\144\140 -\040\345\337\316 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\323\363\246\026\300\372\153\035\131\261\055\226\115\016\021\056 -END -CKA_ISSUER MULTILINE_OCTAL -\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061 -\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162 -\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056 -\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164 -\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103 -\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 -\162\151\164\171 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\127\313\063\157\302\134\026\346\107\026\027\343\220\061 -\150\340 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - # # Certificate "COMODO ECC Certification Authority" # @@ -7637,208 +7323,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -# -# Certificate "EC-ACC" -# -# Issuer: CN=EC-ACC,OU=Jerarquia Entitats de Certificacio Catalanes,OU=Vegeu https://www.catcert.net/verarrel (c)03,OU=Serveis Publics de Certificacio,O=Agencia Catalana de Certificacio (NIF Q-0801176-I),C=ES -# Serial Number:ee:2b:3d:eb:d4:21:de:14:a8:62:ac:04:f3:dd:c4:01 -# Subject: CN=EC-ACC,OU=Jerarquia Entitats de Certificacio Catalanes,OU=Vegeu https://www.catcert.net/verarrel (c)03,OU=Serveis Publics de Certificacio,O=Agencia Catalana de Certificacio (NIF Q-0801176-I),C=ES -# Not Valid Before: Tue Jan 07 23:00:00 2003 -# Not Valid After : Tue Jan 07 22:59:59 2031 -# Fingerprint (SHA-256): 88:49:7F:01:60:2F:31:54:24:6A:E2:8C:4D:5A:EF:10:F1:D8:7E:BB:76:62:6F:4A:E0:B7:F9:5B:A7:96:87:99 -# Fingerprint (SHA1): 28:90:3A:63:5B:52:80:FA:E6:77:4C:0B:6D:A7:D6:BA:A6:4A:F2:E8 -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "EC-ACC" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\201\363\061\013\060\011\006\003\125\004\006\023\002\105\123 -\061\073\060\071\006\003\125\004\012\023\062\101\147\145\156\143 -\151\141\040\103\141\164\141\154\141\156\141\040\144\145\040\103 -\145\162\164\151\146\151\143\141\143\151\157\040\050\116\111\106 -\040\121\055\060\070\060\061\061\067\066\055\111\051\061\050\060 -\046\006\003\125\004\013\023\037\123\145\162\166\145\151\163\040 -\120\165\142\154\151\143\163\040\144\145\040\103\145\162\164\151 -\146\151\143\141\143\151\157\061\065\060\063\006\003\125\004\013 -\023\054\126\145\147\145\165\040\150\164\164\160\163\072\057\057 -\167\167\167\056\143\141\164\143\145\162\164\056\156\145\164\057 -\166\145\162\141\162\162\145\154\040\050\143\051\060\063\061\065 -\060\063\006\003\125\004\013\023\054\112\145\162\141\162\161\165 -\151\141\040\105\156\164\151\164\141\164\163\040\144\145\040\103 -\145\162\164\151\146\151\143\141\143\151\157\040\103\141\164\141 -\154\141\156\145\163\061\017\060\015\006\003\125\004\003\023\006 -\105\103\055\101\103\103 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\201\363\061\013\060\011\006\003\125\004\006\023\002\105\123 -\061\073\060\071\006\003\125\004\012\023\062\101\147\145\156\143 -\151\141\040\103\141\164\141\154\141\156\141\040\144\145\040\103 -\145\162\164\151\146\151\143\141\143\151\157\040\050\116\111\106 -\040\121\055\060\070\060\061\061\067\066\055\111\051\061\050\060 -\046\006\003\125\004\013\023\037\123\145\162\166\145\151\163\040 -\120\165\142\154\151\143\163\040\144\145\040\103\145\162\164\151 -\146\151\143\141\143\151\157\061\065\060\063\006\003\125\004\013 -\023\054\126\145\147\145\165\040\150\164\164\160\163\072\057\057 -\167\167\167\056\143\141\164\143\145\162\164\056\156\145\164\057 -\166\145\162\141\162\162\145\154\040\050\143\051\060\063\061\065 -\060\063\006\003\125\004\013\023\054\112\145\162\141\162\161\165 -\151\141\040\105\156\164\151\164\141\164\163\040\144\145\040\103 -\145\162\164\151\146\151\143\141\143\151\157\040\103\141\164\141 -\154\141\156\145\163\061\017\060\015\006\003\125\004\003\023\006 -\105\103\055\101\103\103 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\356\053\075\353\324\041\336\024\250\142\254\004\363\335 -\304\001 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\005\126\060\202\004\076\240\003\002\001\002\002\020\356 -\053\075\353\324\041\336\024\250\142\254\004\363\335\304\001\060 -\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201 -\363\061\013\060\011\006\003\125\004\006\023\002\105\123\061\073 -\060\071\006\003\125\004\012\023\062\101\147\145\156\143\151\141 -\040\103\141\164\141\154\141\156\141\040\144\145\040\103\145\162 -\164\151\146\151\143\141\143\151\157\040\050\116\111\106\040\121 -\055\060\070\060\061\061\067\066\055\111\051\061\050\060\046\006 -\003\125\004\013\023\037\123\145\162\166\145\151\163\040\120\165 -\142\154\151\143\163\040\144\145\040\103\145\162\164\151\146\151 -\143\141\143\151\157\061\065\060\063\006\003\125\004\013\023\054 -\126\145\147\145\165\040\150\164\164\160\163\072\057\057\167\167 -\167\056\143\141\164\143\145\162\164\056\156\145\164\057\166\145 -\162\141\162\162\145\154\040\050\143\051\060\063\061\065\060\063 -\006\003\125\004\013\023\054\112\145\162\141\162\161\165\151\141 -\040\105\156\164\151\164\141\164\163\040\144\145\040\103\145\162 -\164\151\146\151\143\141\143\151\157\040\103\141\164\141\154\141 -\156\145\163\061\017\060\015\006\003\125\004\003\023\006\105\103 -\055\101\103\103\060\036\027\015\060\063\060\061\060\067\062\063 -\060\060\060\060\132\027\015\063\061\060\061\060\067\062\062\065 -\071\065\071\132\060\201\363\061\013\060\011\006\003\125\004\006 -\023\002\105\123\061\073\060\071\006\003\125\004\012\023\062\101 -\147\145\156\143\151\141\040\103\141\164\141\154\141\156\141\040 -\144\145\040\103\145\162\164\151\146\151\143\141\143\151\157\040 -\050\116\111\106\040\121\055\060\070\060\061\061\067\066\055\111 -\051\061\050\060\046\006\003\125\004\013\023\037\123\145\162\166 -\145\151\163\040\120\165\142\154\151\143\163\040\144\145\040\103 -\145\162\164\151\146\151\143\141\143\151\157\061\065\060\063\006 -\003\125\004\013\023\054\126\145\147\145\165\040\150\164\164\160 -\163\072\057\057\167\167\167\056\143\141\164\143\145\162\164\056 -\156\145\164\057\166\145\162\141\162\162\145\154\040\050\143\051 -\060\063\061\065\060\063\006\003\125\004\013\023\054\112\145\162 -\141\162\161\165\151\141\040\105\156\164\151\164\141\164\163\040 -\144\145\040\103\145\162\164\151\146\151\143\141\143\151\157\040 -\103\141\164\141\154\141\156\145\163\061\017\060\015\006\003\125 -\004\003\023\006\105\103\055\101\103\103\060\202\001\042\060\015 -\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001 -\017\000\060\202\001\012\002\202\001\001\000\263\042\307\117\342 -\227\102\225\210\107\203\100\366\035\027\363\203\163\044\036\121 -\363\230\212\303\222\270\377\100\220\005\160\207\140\311\000\251 -\265\224\145\031\042\025\027\302\103\154\146\104\232\015\004\076 -\071\157\245\113\172\252\143\267\212\104\235\331\143\221\204\146 -\340\050\017\272\102\343\156\216\367\024\047\223\151\356\221\016 -\243\137\016\261\353\146\242\162\117\022\023\206\145\172\076\333 -\117\007\364\247\011\140\332\072\102\231\307\262\177\263\026\225 -\034\307\371\064\265\224\205\325\231\136\240\110\240\176\347\027 -\145\270\242\165\270\036\363\345\102\175\257\355\363\212\110\144 -\135\202\024\223\330\300\344\377\263\120\162\362\166\366\263\135 -\102\120\171\320\224\076\153\014\000\276\330\153\016\116\052\354 -\076\322\314\202\242\030\145\063\023\167\236\232\135\032\023\330 -\303\333\075\310\227\172\356\160\355\247\346\174\333\161\317\055 -\224\142\337\155\326\365\070\276\077\245\205\012\031\270\250\330 -\011\165\102\160\304\352\357\313\016\310\064\250\022\042\230\014 -\270\023\224\266\113\354\360\320\220\347\047\002\003\001\000\001 -\243\201\343\060\201\340\060\035\006\003\125\035\021\004\026\060 -\024\201\022\145\143\137\141\143\143\100\143\141\164\143\145\162 -\164\056\156\145\164\060\017\006\003\125\035\023\001\001\377\004 -\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377 -\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004 -\024\240\303\213\104\252\067\245\105\277\227\200\132\321\361\170 -\242\233\351\135\215\060\177\006\003\125\035\040\004\170\060\166 -\060\164\006\013\053\006\001\004\001\365\170\001\003\001\012\060 -\145\060\054\006\010\053\006\001\005\005\007\002\001\026\040\150 -\164\164\160\163\072\057\057\167\167\167\056\143\141\164\143\145 -\162\164\056\156\145\164\057\166\145\162\141\162\162\145\154\060 -\065\006\010\053\006\001\005\005\007\002\002\060\051\032\047\126 -\145\147\145\165\040\150\164\164\160\163\072\057\057\167\167\167 -\056\143\141\164\143\145\162\164\056\156\145\164\057\166\145\162 -\141\162\162\145\154\040\060\015\006\011\052\206\110\206\367\015 -\001\001\005\005\000\003\202\001\001\000\240\110\133\202\001\366 -\115\110\270\071\125\065\234\200\172\123\231\325\132\377\261\161 -\073\314\071\011\224\136\326\332\357\276\001\133\135\323\036\330 -\375\175\117\315\240\101\340\064\223\277\313\342\206\234\067\222 -\220\126\034\334\353\051\005\345\304\236\307\065\337\212\014\315 -\305\041\103\351\252\210\345\065\300\031\102\143\132\002\136\244 -\110\030\072\205\157\334\235\274\077\235\234\301\207\270\172\141 -\010\351\167\013\177\160\253\172\335\331\227\054\144\036\205\277 -\274\164\226\241\303\172\022\354\014\032\156\203\014\074\350\162 -\106\237\373\110\325\136\227\346\261\241\370\344\357\106\045\224 -\234\211\333\151\070\276\354\134\016\126\307\145\121\345\120\210 -\210\277\102\325\053\075\345\371\272\236\056\263\312\364\163\222 -\002\013\276\114\146\353\040\376\271\313\265\231\177\346\266\023 -\372\312\113\115\331\356\123\106\006\073\306\116\255\223\132\201 -\176\154\052\113\152\005\105\214\362\041\244\061\220\207\154\145 -\234\235\245\140\225\072\122\177\365\321\253\010\156\363\356\133 -\371\210\075\176\270\157\156\003\344\102 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -# For Server Distrust After: Sat Dec 28 00:00:00 2019 -CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL -\061\071\061\062\062\070\060\060\060\060\060\060\132 -END -# For Email Distrust After: Wed Aug 31 00:00:00 2022 -CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL -\062\062\060\070\063\061\060\060\060\060\060\060\132 -END - -# Trust for "EC-ACC" -# Issuer: CN=EC-ACC,OU=Jerarquia Entitats de Certificacio Catalanes,OU=Vegeu https://www.catcert.net/verarrel (c)03,OU=Serveis Publics de Certificacio,O=Agencia Catalana de Certificacio (NIF Q-0801176-I),C=ES -# Serial Number:ee:2b:3d:eb:d4:21:de:14:a8:62:ac:04:f3:dd:c4:01 -# Subject: CN=EC-ACC,OU=Jerarquia Entitats de Certificacio Catalanes,OU=Vegeu https://www.catcert.net/verarrel (c)03,OU=Serveis Publics de Certificacio,O=Agencia Catalana de Certificacio (NIF Q-0801176-I),C=ES -# Not Valid Before: Tue Jan 07 23:00:00 2003 -# Not Valid After : Tue Jan 07 22:59:59 2031 -# Fingerprint (SHA-256): 88:49:7F:01:60:2F:31:54:24:6A:E2:8C:4D:5A:EF:10:F1:D8:7E:BB:76:62:6F:4A:E0:B7:F9:5B:A7:96:87:99 -# Fingerprint (SHA1): 28:90:3A:63:5B:52:80:FA:E6:77:4C:0B:6D:A7:D6:BA:A6:4A:F2:E8 -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "EC-ACC" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\050\220\072\143\133\122\200\372\346\167\114\013\155\247\326\272 -\246\112\362\350 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\353\365\235\051\015\141\371\102\037\174\302\272\155\343\025\011 -END -CKA_ISSUER MULTILINE_OCTAL -\060\201\363\061\013\060\011\006\003\125\004\006\023\002\105\123 -\061\073\060\071\006\003\125\004\012\023\062\101\147\145\156\143 -\151\141\040\103\141\164\141\154\141\156\141\040\144\145\040\103 -\145\162\164\151\146\151\143\141\143\151\157\040\050\116\111\106 -\040\121\055\060\070\060\061\061\067\066\055\111\051\061\050\060 -\046\006\003\125\004\013\023\037\123\145\162\166\145\151\163\040 -\120\165\142\154\151\143\163\040\144\145\040\103\145\162\164\151 -\146\151\143\141\143\151\157\061\065\060\063\006\003\125\004\013 -\023\054\126\145\147\145\165\040\150\164\164\160\163\072\057\057 -\167\167\167\056\143\141\164\143\145\162\164\056\156\145\164\057 -\166\145\162\141\162\162\145\154\040\050\143\051\060\063\061\065 -\060\063\006\003\125\004\013\023\054\112\145\162\141\162\161\165 -\151\141\040\105\156\164\151\164\141\164\163\040\144\145\040\103 -\145\162\164\151\146\151\143\141\143\151\157\040\103\141\164\141 -\154\141\156\145\163\061\017\060\015\006\003\125\004\003\023\006 -\105\103\055\101\103\103 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\020\356\053\075\353\324\041\336\024\250\142\254\004\363\335 -\304\001 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - # # Certificate "Actalis Authentication Root CA" # @@ -11898,172 +11382,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -# -# Certificate "Staat der Nederlanden EV Root CA" -# -# Issuer: CN=Staat der Nederlanden EV Root CA,O=Staat der Nederlanden,C=NL -# Serial Number: 10000013 (0x98968d) -# Subject: CN=Staat der Nederlanden EV Root CA,O=Staat der Nederlanden,C=NL -# Not Valid Before: Wed Dec 08 11:19:29 2010 -# Not Valid After : Thu Dec 08 11:10:28 2022 -# Fingerprint (SHA-256): 4D:24:91:41:4C:FE:95:67:46:EC:4C:EF:A6:CF:6F:72:E2:8A:13:29:43:2F:9D:8A:90:7A:C4:CB:5D:AD:C1:5A -# Fingerprint (SHA1): 76:E2:7E:C1:4F:DB:82:C1:C0:A6:75:B5:05:BE:3D:29:B4:ED:DB:BB -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Staat der Nederlanden EV Root CA" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\130\061\013\060\011\006\003\125\004\006\023\002\116\114\061 -\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040 -\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061 -\051\060\047\006\003\125\004\003\014\040\123\164\141\141\164\040 -\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040 -\105\126\040\122\157\157\164\040\103\101 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\130\061\013\060\011\006\003\125\004\006\023\002\116\114\061 -\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040 -\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061 -\051\060\047\006\003\125\004\003\014\040\123\164\141\141\164\040 -\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040 -\105\126\040\122\157\157\164\040\103\101 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\004\000\230\226\215 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\005\160\060\202\003\130\240\003\002\001\002\002\004\000 -\230\226\215\060\015\006\011\052\206\110\206\367\015\001\001\013 -\005\000\060\130\061\013\060\011\006\003\125\004\006\023\002\116 -\114\061\036\060\034\006\003\125\004\012\014\025\123\164\141\141 -\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144\145 -\156\061\051\060\047\006\003\125\004\003\014\040\123\164\141\141 -\164\040\144\145\162\040\116\145\144\145\162\154\141\156\144\145 -\156\040\105\126\040\122\157\157\164\040\103\101\060\036\027\015 -\061\060\061\062\060\070\061\061\061\071\062\071\132\027\015\062 -\062\061\062\060\070\061\061\061\060\062\070\132\060\130\061\013 -\060\011\006\003\125\004\006\023\002\116\114\061\036\060\034\006 -\003\125\004\012\014\025\123\164\141\141\164\040\144\145\162\040 -\116\145\144\145\162\154\141\156\144\145\156\061\051\060\047\006 -\003\125\004\003\014\040\123\164\141\141\164\040\144\145\162\040 -\116\145\144\145\162\154\141\156\144\145\156\040\105\126\040\122 -\157\157\164\040\103\101\060\202\002\042\060\015\006\011\052\206 -\110\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202 -\002\012\002\202\002\001\000\343\307\176\211\371\044\113\072\322 -\063\203\065\054\151\354\334\011\244\343\121\250\045\053\171\270 -\010\075\340\221\272\204\205\306\205\244\312\346\311\056\123\244 -\311\044\036\375\125\146\161\135\054\305\140\150\004\267\331\302 -\122\046\070\210\244\326\073\100\246\302\315\077\315\230\223\263 -\124\024\130\226\125\325\120\376\206\255\244\143\177\134\207\366 -\216\346\047\222\147\027\222\002\003\054\334\326\146\164\355\335 -\147\377\301\141\215\143\117\017\233\155\027\060\046\357\253\322 -\037\020\240\371\305\177\026\151\201\003\107\355\036\150\215\162 -\241\115\262\046\306\272\154\137\155\326\257\321\261\023\216\251 -\255\363\136\151\165\046\030\076\101\053\041\177\356\213\135\007 -\006\235\103\304\051\012\053\374\052\076\206\313\074\203\072\371 -\311\015\332\305\231\342\274\170\101\063\166\341\277\057\135\345 -\244\230\120\014\025\335\340\372\234\177\070\150\320\262\246\172 -\247\321\061\275\176\212\130\047\103\263\272\063\221\323\247\230 -\025\134\232\346\323\017\165\331\374\101\230\227\076\252\045\333 -\217\222\056\260\173\014\137\361\143\251\067\371\233\165\151\114 -\050\046\045\332\325\362\022\160\105\125\343\337\163\136\067\365 -\041\154\220\216\065\132\311\323\043\353\323\300\276\170\254\102 -\050\130\146\245\106\155\160\002\327\020\371\113\124\374\135\206 -\112\207\317\177\312\105\254\021\132\265\040\121\215\057\210\107 -\227\071\300\317\272\300\102\001\100\231\110\041\013\153\247\322 -\375\226\325\321\276\106\235\111\340\013\246\240\042\116\070\320 -\301\074\060\274\160\217\054\165\314\320\305\214\121\073\075\224 -\010\144\046\141\175\271\303\145\217\024\234\041\320\252\375\027 -\162\003\217\275\233\214\346\136\123\236\271\235\357\202\273\341 -\274\342\162\101\133\041\224\323\105\067\224\321\337\011\071\135 -\347\043\252\232\035\312\155\250\012\206\205\212\202\276\102\007 -\326\362\070\202\163\332\207\133\345\074\323\236\076\247\073\236 -\364\003\263\371\361\175\023\164\002\377\273\241\345\372\000\171 -\034\246\146\101\210\134\140\127\246\056\011\304\272\375\232\317 -\247\037\100\303\273\314\132\012\125\113\073\070\166\121\270\143 -\213\204\224\026\346\126\363\002\003\001\000\001\243\102\060\100 -\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001 -\377\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001 -\006\060\035\006\003\125\035\016\004\026\004\024\376\253\000\220 -\230\236\044\374\251\314\032\212\373\047\270\277\060\156\250\073 -\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\003 -\202\002\001\000\317\167\054\156\126\276\116\263\266\204\000\224 -\253\107\311\015\322\166\307\206\237\035\007\323\266\264\273\010 -\170\257\151\322\013\111\336\063\305\254\255\302\210\002\175\006 -\267\065\002\301\140\311\277\304\350\224\336\324\323\251\023\045 -\132\376\156\242\256\175\005\334\175\363\154\360\176\246\215\356 -\331\327\316\130\027\350\251\051\256\163\110\207\347\233\312\156 -\051\241\144\137\031\023\367\256\006\020\377\121\306\233\115\125 -\045\117\223\231\020\001\123\165\361\023\316\307\246\101\101\322 -\277\210\245\177\105\374\254\270\245\265\063\014\202\304\373\007 -\366\152\345\045\204\137\006\312\301\206\071\021\333\130\315\167 -\073\054\302\114\017\136\232\343\360\253\076\141\033\120\044\302 -\300\364\361\031\360\021\051\266\245\030\002\233\327\143\114\160 -\214\107\243\003\103\134\271\135\106\240\015\157\377\131\216\276 -\335\237\162\303\133\053\337\214\133\316\345\014\106\154\222\262 -\012\243\114\124\102\030\025\022\030\275\332\374\272\164\156\377 -\301\266\240\144\330\251\137\125\256\237\134\152\166\226\330\163 -\147\207\373\115\177\134\356\151\312\163\020\373\212\251\375\236 -\275\066\070\111\111\207\364\016\024\360\351\207\270\077\247\117 -\172\132\216\171\324\223\344\273\150\122\204\254\154\351\363\230 -\160\125\162\062\371\064\253\053\111\265\315\040\142\344\072\172 -\147\143\253\226\334\155\256\227\354\374\237\166\126\210\056\146 -\317\133\266\311\244\260\327\005\272\341\047\057\223\273\046\052 -\242\223\260\033\363\216\276\035\100\243\271\066\217\076\202\032 -\032\136\210\352\120\370\131\342\203\106\051\013\343\104\134\341 -\225\266\151\220\232\024\157\227\256\201\317\150\357\231\232\276 -\265\347\341\177\370\372\023\107\026\114\314\155\010\100\347\213 -\170\157\120\202\104\120\077\146\006\212\253\103\204\126\112\017 -\040\055\206\016\365\322\333\322\172\212\113\315\245\350\116\361 -\136\046\045\001\131\043\240\176\322\366\176\041\127\327\047\274 -\025\127\114\244\106\301\340\203\036\014\114\115\037\117\006\031 -\342\371\250\364\072\202\241\262\171\103\171\326\255\157\172\047 -\220\003\244\352\044\207\077\331\275\331\351\362\137\120\111\034 -\356\354\327\056 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE - -# Trust for "Staat der Nederlanden EV Root CA" -# Issuer: CN=Staat der Nederlanden EV Root CA,O=Staat der Nederlanden,C=NL -# Serial Number: 10000013 (0x98968d) -# Subject: CN=Staat der Nederlanden EV Root CA,O=Staat der Nederlanden,C=NL -# Not Valid Before: Wed Dec 08 11:19:29 2010 -# Not Valid After : Thu Dec 08 11:10:28 2022 -# Fingerprint (SHA-256): 4D:24:91:41:4C:FE:95:67:46:EC:4C:EF:A6:CF:6F:72:E2:8A:13:29:43:2F:9D:8A:90:7A:C4:CB:5D:AD:C1:5A -# Fingerprint (SHA1): 76:E2:7E:C1:4F:DB:82:C1:C0:A6:75:B5:05:BE:3D:29:B4:ED:DB:BB -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "Staat der Nederlanden EV Root CA" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\166\342\176\301\117\333\202\301\300\246\165\265\005\276\075\051 -\264\355\333\273 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\374\006\257\173\350\032\361\232\264\350\322\160\037\300\365\272 -END -CKA_ISSUER MULTILINE_OCTAL -\060\130\061\013\060\011\006\003\125\004\006\023\002\116\114\061 -\036\060\034\006\003\125\004\012\014\025\123\164\141\141\164\040 -\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\061 -\051\060\047\006\003\125\004\003\014\040\123\164\141\141\164\040 -\144\145\162\040\116\145\144\145\162\154\141\156\144\145\156\040 -\105\126\040\122\157\157\164\040\103\101 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\004\000\230\226\215 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - # # Certificate "IdenTrust Commercial Root CA 1" # @@ -15408,8 +14726,14 @@ CKA_VALUE MULTILINE_OCTAL \132\171\054\031 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE +# For Server Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END +# For Email Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END # Trust for "TrustCor RootCert CA-1" # Issuer: CN=TrustCor RootCert CA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA @@ -15601,8 +14925,15 @@ CKA_VALUE MULTILINE_OCTAL \326\354\011 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE +# For Server Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END +# For Email Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END + # Trust for "TrustCor RootCert CA-2" # Issuer: CN=TrustCor RootCert CA-2,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA @@ -15759,8 +15090,14 @@ CKA_VALUE MULTILINE_OCTAL \264\237\327\346 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE +# For Server Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END +# For Email Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END # Trust for "TrustCor ECA-1" # Issuer: CN=TrustCor ECA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index cd56e574f..955ed2646 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -43,21 +43,46 @@ $Header::viewsize = 150; $Header::errormessage = ''; $Header::extraHead = <<END <style> - .row-color20 { + .color20 { background-color: $color{'color20'}; } - .row-color22 { + .color22 { background-color: $color{'color22'}; } - .row-colouryellow { + .colouryellow { background-color: $Header::colouryellow; } - .cell-orange { + .orange { background-color: orange; } - .cell-red { + .red { background-color: red; } + .table1colour { + background-color: $Header::table1colour; + } + .table2colour { + background-color: $Header::table2colour; + } + .percent-box { + border-style: solid; + border-width: 1px; + border-color: #a0a0a0; + width: 100px; + height: 10px; + } + .percent-bar { + background-color: #a0a0a0; + border-style: solid; + border-width: 1px; + border-color: #e2e2e2; + } + .percent-space { + background-color: #e2e2e2; + border-style: solid; + border-width: 1px; + border-color: #e2e2e2; + } </style> END ; diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl index ec4fdacc5..d97431b4a 100644 --- a/config/cfgroot/ids-functions.pl +++ b/config/cfgroot/ids-functions.pl @@ -572,7 +572,7 @@ sub extractruleset ($) { # Handle rules files. } elsif ($file =~ m/\.rules$/) { # Skip rule files which are not located in the rules directory or archive root. - next unless(($packed_file =~ /^rules\//) || ($packed_file !~ /\//)); + next unless(($packed_file =~ /^rules\//) || ($packed_file =~ /^$provider-rules\//) || ($packed_file !~ /\//)); # Skip deleted.rules. # diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 1b628df16..80985ca53 100644 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -761,7 +761,7 @@ sub ipblocklist () { } # Check if logging is enabled. - if($blocklistsettings{'LOGGING'} eq "on") { + if($blocklistsettings{'LOGGING'}) && ($blocklistsettings{'LOGGING'} eq "on")) { # Create logging rule. run("$IPTABLES -A ${blocklist}_DROP -j LOG -m limit --limit 10/second --log-prefix \"BLKLST_$blocklist \""); } diff --git a/config/rootfiles/common/linux-firmware b/config/rootfiles/common/linux-firmware index 2e147afd1..b173d189d 100644 --- a/config/rootfiles/common/linux-firmware +++ b/config/rootfiles/common/linux-firmware @@ -94,9 +94,11 @@ lib/firmware/amdgpu/cyan_skillfish2_pfp.bin lib/firmware/amdgpu/cyan_skillfish2_rlc.bin lib/firmware/amdgpu/cyan_skillfish2_sdma.bin lib/firmware/amdgpu/cyan_skillfish2_sdma1.bin +lib/firmware/amdgpu/dcn_3_1_4_dmcub.bin lib/firmware/amdgpu/dcn_3_1_5_dmcub.bin lib/firmware/amdgpu/dcn_3_1_6_dmcub.bin lib/firmware/amdgpu/dcn_3_2_0_dmcub.bin +lib/firmware/amdgpu/dcn_3_2_1_dmcub.bin lib/firmware/amdgpu/dimgrey_cavefish_ce.bin lib/firmware/amdgpu/dimgrey_cavefish_dmcub.bin lib/firmware/amdgpu/dimgrey_cavefish_me.bin @@ -140,6 +142,20 @@ lib/firmware/amdgpu/gc_11_0_0_mes.bin lib/firmware/amdgpu/gc_11_0_0_mes1.bin lib/firmware/amdgpu/gc_11_0_0_pfp.bin lib/firmware/amdgpu/gc_11_0_0_rlc.bin +lib/firmware/amdgpu/gc_11_0_1_imu.bin +lib/firmware/amdgpu/gc_11_0_1_me.bin +lib/firmware/amdgpu/gc_11_0_1_mec.bin +lib/firmware/amdgpu/gc_11_0_1_mes.bin +lib/firmware/amdgpu/gc_11_0_1_mes1.bin +lib/firmware/amdgpu/gc_11_0_1_pfp.bin +lib/firmware/amdgpu/gc_11_0_1_rlc.bin +lib/firmware/amdgpu/gc_11_0_2_imu.bin +lib/firmware/amdgpu/gc_11_0_2_me.bin +lib/firmware/amdgpu/gc_11_0_2_mec.bin +lib/firmware/amdgpu/gc_11_0_2_mes.bin +lib/firmware/amdgpu/gc_11_0_2_mes1.bin +lib/firmware/amdgpu/gc_11_0_2_pfp.bin +lib/firmware/amdgpu/gc_11_0_2_rlc.bin lib/firmware/amdgpu/green_sardine_asd.bin lib/firmware/amdgpu/green_sardine_ce.bin lib/firmware/amdgpu/green_sardine_dmcub.bin @@ -350,9 +366,13 @@ lib/firmware/amdgpu/polaris12_uvd.bin lib/firmware/amdgpu/polaris12_vce.bin lib/firmware/amdgpu/psp_13_0_0_sos.bin lib/firmware/amdgpu/psp_13_0_0_ta.bin +lib/firmware/amdgpu/psp_13_0_4_ta.bin +lib/firmware/amdgpu/psp_13_0_4_toc.bin lib/firmware/amdgpu/psp_13_0_5_asd.bin lib/firmware/amdgpu/psp_13_0_5_ta.bin lib/firmware/amdgpu/psp_13_0_5_toc.bin +lib/firmware/amdgpu/psp_13_0_7_sos.bin +lib/firmware/amdgpu/psp_13_0_7_ta.bin lib/firmware/amdgpu/psp_13_0_8_asd.bin lib/firmware/amdgpu/psp_13_0_8_ta.bin lib/firmware/amdgpu/psp_13_0_8_toc.bin @@ -395,6 +415,8 @@ lib/firmware/amdgpu/renoir_vcn.bin lib/firmware/amdgpu/sdma_5_2_6.bin lib/firmware/amdgpu/sdma_5_2_7.bin lib/firmware/amdgpu/sdma_6_0_0.bin +lib/firmware/amdgpu/sdma_6_0_1.bin +lib/firmware/amdgpu/sdma_6_0_2.bin lib/firmware/amdgpu/si58_mc.bin lib/firmware/amdgpu/sienna_cichlid_ce.bin lib/firmware/amdgpu/sienna_cichlid_dmcub.bin @@ -409,6 +431,7 @@ lib/firmware/amdgpu/sienna_cichlid_sos.bin lib/firmware/amdgpu/sienna_cichlid_ta.bin lib/firmware/amdgpu/sienna_cichlid_vcn.bin lib/firmware/amdgpu/smu_13_0_0.bin +lib/firmware/amdgpu/smu_13_0_7.bin lib/firmware/amdgpu/stoney_ce.bin lib/firmware/amdgpu/stoney_me.bin lib/firmware/amdgpu/stoney_mec.bin @@ -462,6 +485,8 @@ lib/firmware/amdgpu/vangogh_toc.bin lib/firmware/amdgpu/vangogh_vcn.bin lib/firmware/amdgpu/vcn_3_1_2.bin lib/firmware/amdgpu/vcn_4_0_0.bin +lib/firmware/amdgpu/vcn_4_0_2.bin +lib/firmware/amdgpu/vcn_4_0_4.bin lib/firmware/amdgpu/vega10_acg_smc.bin lib/firmware/amdgpu/vega10_asd.bin lib/firmware/amdgpu/vega10_ce.bin @@ -838,8 +863,11 @@ lib/firmware/brcm/brcmfmac43340-sdio.meegopad-t08.txt lib/firmware/brcm/brcmfmac43340-sdio.pov-tab-p1006w-data.txt lib/firmware/brcm/brcmfmac43340-sdio.predia-basic.txt lib/firmware/brcm/brcmfmac4335-sdio.bin +lib/firmware/brcm/brcmfmac43362-sdio.WC121.txt lib/firmware/brcm/brcmfmac43362-sdio.bin lib/firmware/brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt +lib/firmware/brcm/brcmfmac43362-sdio.kobo,aura.txt +lib/firmware/brcm/brcmfmac43362-sdio.kobo,tolino-shine2hd.txt lib/firmware/brcm/brcmfmac43362-sdio.lemaker,bananapro.txt lib/firmware/brcm/brcmfmac4339-sdio.bin lib/firmware/brcm/brcmfmac43430-sdio.AP6212.txt @@ -940,7 +968,9 @@ lib/firmware/cbfw-3.2.5.1.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-cali-103c8991.wmfw #lib/firmware/cirrus/cs35l41-dsp1-spk-cali-103c8992.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-cali-103c8992.wmfw +#lib/firmware/cirrus/cs35l41-dsp1-spk-cali-103c8994.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-cali-103c8994.wmfw +#lib/firmware/cirrus/cs35l41-dsp1-spk-cali-103c8995.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-cali-103c8995.wmfw #lib/firmware/cirrus/cs35l41-dsp1-spk-cali-103c89c3-l0.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-cali-103c89c3-l1.bin @@ -965,6 +995,11 @@ lib/firmware/cbfw-3.2.5.1.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-cali-10431e02-spkid1-l0.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-cali-10431e02-spkid1-r0.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-cali-10431e02.wmfw +#lib/firmware/cirrus/cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin +#lib/firmware/cirrus/cs35l41-dsp1-spk-cali-10431e12-spkid0-r0.bin +#lib/firmware/cirrus/cs35l41-dsp1-spk-cali-10431e12-spkid1-l0.bin +#lib/firmware/cirrus/cs35l41-dsp1-spk-cali-10431e12-spkid1-r0.bin +#lib/firmware/cirrus/cs35l41-dsp1-spk-cali-10431e12.wmfw #lib/firmware/cirrus/cs35l41-dsp1-spk-cali-10431f12-spkid0-l0.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-cali-10431f12-spkid0-r0.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-cali-10431f12-spkid1-l0.bin @@ -1012,7 +1047,9 @@ lib/firmware/cbfw-3.2.5.1.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-prot-103c8991.wmfw #lib/firmware/cirrus/cs35l41-dsp1-spk-prot-103c8992.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-prot-103c8992.wmfw +#lib/firmware/cirrus/cs35l41-dsp1-spk-prot-103c8994.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-prot-103c8994.wmfw +#lib/firmware/cirrus/cs35l41-dsp1-spk-prot-103c8995.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-prot-103c8995.wmfw #lib/firmware/cirrus/cs35l41-dsp1-spk-prot-103c89c3-l0.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-prot-103c89c3-l1.bin @@ -1037,6 +1074,11 @@ lib/firmware/cbfw-3.2.5.1.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-prot-10431e02-spkid1-l0.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-prot-10431e02-spkid1-r0.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-prot-10431e02.wmfw +#lib/firmware/cirrus/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin +#lib/firmware/cirrus/cs35l41-dsp1-spk-prot-10431e12-spkid0-r0.bin +#lib/firmware/cirrus/cs35l41-dsp1-spk-prot-10431e12-spkid1-l0.bin +#lib/firmware/cirrus/cs35l41-dsp1-spk-prot-10431e12-spkid1-r0.bin +#lib/firmware/cirrus/cs35l41-dsp1-spk-prot-10431e12.wmfw #lib/firmware/cirrus/cs35l41-dsp1-spk-prot-10431f12-spkid0-l0.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-prot-10431f12-spkid0-r0.bin #lib/firmware/cirrus/cs35l41-dsp1-spk-prot-10431f12-spkid1-l0.bin @@ -1121,15 +1163,15 @@ lib/firmware/cxgb4/configs/t6-config-hashfilter.txt lib/firmware/cxgb4/t4-config.txt lib/firmware/cxgb4/t4fw-1.14.4.0.bin lib/firmware/cxgb4/t4fw-1.15.37.0.bin -lib/firmware/cxgb4/t4fw-1.27.0.0.bin +lib/firmware/cxgb4/t4fw-1.27.1.0.bin lib/firmware/cxgb4/t4fw.bin lib/firmware/cxgb4/t5-config.txt lib/firmware/cxgb4/t5fw-1.14.4.0.bin lib/firmware/cxgb4/t5fw-1.15.37.0.bin -lib/firmware/cxgb4/t5fw-1.27.0.0.bin +lib/firmware/cxgb4/t5fw-1.27.1.0.bin lib/firmware/cxgb4/t5fw.bin lib/firmware/cxgb4/t6-config.txt -lib/firmware/cxgb4/t6fw-1.27.0.0.bin +lib/firmware/cxgb4/t6fw-1.27.1.0.bin lib/firmware/cxgb4/t6fw.bin lib/firmware/cypress lib/firmware/cypress/cyfmac43012-sdio.bin @@ -1230,6 +1272,7 @@ lib/firmware/hfi1_sbus.fw lib/firmware/htc_7010.fw lib/firmware/htc_9271.fw #lib/firmware/i915 +lib/firmware/i915/adlp_dmc.bin lib/firmware/i915/adlp_dmc_ver2_09.bin lib/firmware/i915/adlp_dmc_ver2_10.bin lib/firmware/i915/adlp_dmc_ver2_12.bin @@ -1315,6 +1358,7 @@ lib/firmware/i915/kbl_guc_ver9_14.bin lib/firmware/i915/kbl_guc_ver9_39.bin lib/firmware/i915/kbl_huc_4.0.0.bin lib/firmware/i915/kbl_huc_ver02_00_1810.bin +lib/firmware/i915/mtl_dmc.bin lib/firmware/i915/mtl_dmc_ver2_10.bin lib/firmware/i915/rkl_dmc_ver2_02.bin lib/firmware/i915/rkl_dmc_ver2_03.bin @@ -1473,199 +1517,114 @@ lib/firmware/isdbt_nova_12mhz.inp lib/firmware/isdbt_nova_12mhz_b0.inp lib/firmware/isdbt_rio.inp lib/firmware/iwlwifi-100-5.ucode -lib/firmware/iwlwifi-1000-3.ucode lib/firmware/iwlwifi-1000-5.ucode lib/firmware/iwlwifi-105-6.ucode lib/firmware/iwlwifi-135-6.ucode lib/firmware/iwlwifi-2000-6.ucode lib/firmware/iwlwifi-2030-6.ucode lib/firmware/iwlwifi-3160-17.ucode -lib/firmware/iwlwifi-3168-22.ucode -lib/firmware/iwlwifi-3168-27.ucode lib/firmware/iwlwifi-3168-29.ucode lib/firmware/iwlwifi-3945-2.ucode lib/firmware/iwlwifi-4965-2.ucode -lib/firmware/iwlwifi-5000-1.ucode -lib/firmware/iwlwifi-5000-2.ucode lib/firmware/iwlwifi-5000-5.ucode lib/firmware/iwlwifi-5150-2.ucode lib/firmware/iwlwifi-6000-4.ucode -lib/firmware/iwlwifi-6000g2a-5.ucode lib/firmware/iwlwifi-6000g2a-6.ucode -lib/firmware/iwlwifi-6000g2b-5.ucode lib/firmware/iwlwifi-6000g2b-6.ucode -lib/firmware/iwlwifi-6050-4.ucode lib/firmware/iwlwifi-6050-5.ucode lib/firmware/iwlwifi-7260-17.ucode lib/firmware/iwlwifi-7265-17.ucode -lib/firmware/iwlwifi-7265D-22.ucode -lib/firmware/iwlwifi-7265D-27.ucode lib/firmware/iwlwifi-7265D-29.ucode -lib/firmware/iwlwifi-8000C-22.ucode -lib/firmware/iwlwifi-8000C-27.ucode -lib/firmware/iwlwifi-8000C-31.ucode lib/firmware/iwlwifi-8000C-34.ucode lib/firmware/iwlwifi-8000C-36.ucode -lib/firmware/iwlwifi-8265-22.ucode -lib/firmware/iwlwifi-8265-27.ucode -lib/firmware/iwlwifi-8265-31.ucode lib/firmware/iwlwifi-8265-34.ucode lib/firmware/iwlwifi-8265-36.ucode -lib/firmware/iwlwifi-9000-pu-b0-jf-b0-33.ucode lib/firmware/iwlwifi-9000-pu-b0-jf-b0-34.ucode lib/firmware/iwlwifi-9000-pu-b0-jf-b0-38.ucode -lib/firmware/iwlwifi-9000-pu-b0-jf-b0-41.ucode -lib/firmware/iwlwifi-9000-pu-b0-jf-b0-43.ucode lib/firmware/iwlwifi-9000-pu-b0-jf-b0-46.ucode -lib/firmware/iwlwifi-9260-th-b0-jf-b0-33.ucode lib/firmware/iwlwifi-9260-th-b0-jf-b0-34.ucode lib/firmware/iwlwifi-9260-th-b0-jf-b0-38.ucode -lib/firmware/iwlwifi-9260-th-b0-jf-b0-41.ucode -lib/firmware/iwlwifi-9260-th-b0-jf-b0-43.ucode lib/firmware/iwlwifi-9260-th-b0-jf-b0-46.ucode -lib/firmware/iwlwifi-Qu-b0-hr-b0-48.ucode lib/firmware/iwlwifi-Qu-b0-hr-b0-50.ucode -lib/firmware/iwlwifi-Qu-b0-hr-b0-53.ucode -lib/firmware/iwlwifi-Qu-b0-hr-b0-55.ucode lib/firmware/iwlwifi-Qu-b0-hr-b0-59.ucode -lib/firmware/iwlwifi-Qu-b0-hr-b0-62.ucode -lib/firmware/iwlwifi-Qu-b0-hr-b0-63.ucode lib/firmware/iwlwifi-Qu-b0-hr-b0-66.ucode -lib/firmware/iwlwifi-Qu-b0-hr-b0-68.ucode -lib/firmware/iwlwifi-Qu-b0-hr-b0-71.ucode lib/firmware/iwlwifi-Qu-b0-hr-b0-72.ucode lib/firmware/iwlwifi-Qu-b0-hr-b0-73.ucode lib/firmware/iwlwifi-Qu-b0-hr-b0-74.ucode lib/firmware/iwlwifi-Qu-b0-hr-b0-77.ucode -lib/firmware/iwlwifi-Qu-b0-jf-b0-48.ucode lib/firmware/iwlwifi-Qu-b0-jf-b0-50.ucode -lib/firmware/iwlwifi-Qu-b0-jf-b0-53.ucode -lib/firmware/iwlwifi-Qu-b0-jf-b0-55.ucode lib/firmware/iwlwifi-Qu-b0-jf-b0-59.ucode -lib/firmware/iwlwifi-Qu-b0-jf-b0-62.ucode -lib/firmware/iwlwifi-Qu-b0-jf-b0-63.ucode lib/firmware/iwlwifi-Qu-b0-jf-b0-66.ucode -lib/firmware/iwlwifi-Qu-b0-jf-b0-68.ucode -lib/firmware/iwlwifi-Qu-b0-jf-b0-71.ucode lib/firmware/iwlwifi-Qu-b0-jf-b0-72.ucode lib/firmware/iwlwifi-Qu-b0-jf-b0-73.ucode lib/firmware/iwlwifi-Qu-b0-jf-b0-74.ucode lib/firmware/iwlwifi-Qu-b0-jf-b0-77.ucode -lib/firmware/iwlwifi-Qu-c0-hr-b0-48.ucode lib/firmware/iwlwifi-Qu-c0-hr-b0-50.ucode -lib/firmware/iwlwifi-Qu-c0-hr-b0-53.ucode -lib/firmware/iwlwifi-Qu-c0-hr-b0-55.ucode lib/firmware/iwlwifi-Qu-c0-hr-b0-59.ucode -lib/firmware/iwlwifi-Qu-c0-hr-b0-62.ucode -lib/firmware/iwlwifi-Qu-c0-hr-b0-63.ucode lib/firmware/iwlwifi-Qu-c0-hr-b0-66.ucode -lib/firmware/iwlwifi-Qu-c0-hr-b0-68.ucode -lib/firmware/iwlwifi-Qu-c0-hr-b0-71.ucode lib/firmware/iwlwifi-Qu-c0-hr-b0-72.ucode lib/firmware/iwlwifi-Qu-c0-hr-b0-73.ucode lib/firmware/iwlwifi-Qu-c0-hr-b0-74.ucode lib/firmware/iwlwifi-Qu-c0-hr-b0-77.ucode -lib/firmware/iwlwifi-Qu-c0-jf-b0-48.ucode lib/firmware/iwlwifi-Qu-c0-jf-b0-50.ucode -lib/firmware/iwlwifi-Qu-c0-jf-b0-53.ucode -lib/firmware/iwlwifi-Qu-c0-jf-b0-55.ucode lib/firmware/iwlwifi-Qu-c0-jf-b0-59.ucode -lib/firmware/iwlwifi-Qu-c0-jf-b0-62.ucode -lib/firmware/iwlwifi-Qu-c0-jf-b0-63.ucode lib/firmware/iwlwifi-Qu-c0-jf-b0-66.ucode -lib/firmware/iwlwifi-Qu-c0-jf-b0-68.ucode -lib/firmware/iwlwifi-Qu-c0-jf-b0-71.ucode lib/firmware/iwlwifi-Qu-c0-jf-b0-72.ucode lib/firmware/iwlwifi-Qu-c0-jf-b0-73.ucode lib/firmware/iwlwifi-Qu-c0-jf-b0-74.ucode lib/firmware/iwlwifi-Qu-c0-jf-b0-77.ucode -lib/firmware/iwlwifi-QuZ-a0-hr-b0-48.ucode lib/firmware/iwlwifi-QuZ-a0-hr-b0-50.ucode -lib/firmware/iwlwifi-QuZ-a0-hr-b0-53.ucode -lib/firmware/iwlwifi-QuZ-a0-hr-b0-55.ucode lib/firmware/iwlwifi-QuZ-a0-hr-b0-59.ucode -lib/firmware/iwlwifi-QuZ-a0-hr-b0-62.ucode -lib/firmware/iwlwifi-QuZ-a0-hr-b0-63.ucode lib/firmware/iwlwifi-QuZ-a0-hr-b0-66.ucode -lib/firmware/iwlwifi-QuZ-a0-hr-b0-67.ucode -lib/firmware/iwlwifi-QuZ-a0-hr-b0-68.ucode -lib/firmware/iwlwifi-QuZ-a0-hr-b0-71.ucode lib/firmware/iwlwifi-QuZ-a0-hr-b0-72.ucode lib/firmware/iwlwifi-QuZ-a0-hr-b0-73.ucode lib/firmware/iwlwifi-QuZ-a0-hr-b0-74.ucode lib/firmware/iwlwifi-QuZ-a0-hr-b0-77.ucode -lib/firmware/iwlwifi-QuZ-a0-jf-b0-48.ucode lib/firmware/iwlwifi-QuZ-a0-jf-b0-50.ucode -lib/firmware/iwlwifi-QuZ-a0-jf-b0-53.ucode -lib/firmware/iwlwifi-QuZ-a0-jf-b0-55.ucode lib/firmware/iwlwifi-QuZ-a0-jf-b0-59.ucode -lib/firmware/iwlwifi-QuZ-a0-jf-b0-62.ucode -lib/firmware/iwlwifi-QuZ-a0-jf-b0-63.ucode lib/firmware/iwlwifi-QuZ-a0-jf-b0-66.ucode -lib/firmware/iwlwifi-QuZ-a0-jf-b0-68.ucode -lib/firmware/iwlwifi-QuZ-a0-jf-b0-71.ucode lib/firmware/iwlwifi-QuZ-a0-jf-b0-72.ucode lib/firmware/iwlwifi-QuZ-a0-jf-b0-73.ucode lib/firmware/iwlwifi-QuZ-a0-jf-b0-74.ucode lib/firmware/iwlwifi-QuZ-a0-jf-b0-77.ucode -lib/firmware/iwlwifi-cc-a0-46.ucode -lib/firmware/iwlwifi-cc-a0-48.ucode lib/firmware/iwlwifi-cc-a0-50.ucode -lib/firmware/iwlwifi-cc-a0-53.ucode -lib/firmware/iwlwifi-cc-a0-55.ucode lib/firmware/iwlwifi-cc-a0-59.ucode -lib/firmware/iwlwifi-cc-a0-62.ucode -lib/firmware/iwlwifi-cc-a0-63.ucode lib/firmware/iwlwifi-cc-a0-66.ucode -lib/firmware/iwlwifi-cc-a0-67.ucode -lib/firmware/iwlwifi-cc-a0-68.ucode -lib/firmware/iwlwifi-cc-a0-71.ucode lib/firmware/iwlwifi-cc-a0-72.ucode lib/firmware/iwlwifi-cc-a0-73.ucode lib/firmware/iwlwifi-cc-a0-74.ucode lib/firmware/iwlwifi-cc-a0-77.ucode -lib/firmware/iwlwifi-so-a0-gf-a0-64.ucode -lib/firmware/iwlwifi-so-a0-gf-a0-67.ucode -lib/firmware/iwlwifi-so-a0-gf-a0-68.ucode -lib/firmware/iwlwifi-so-a0-gf-a0-71.ucode lib/firmware/iwlwifi-so-a0-gf-a0-72.ucode lib/firmware/iwlwifi-so-a0-gf-a0-73.ucode lib/firmware/iwlwifi-so-a0-gf-a0-74.ucode lib/firmware/iwlwifi-so-a0-gf-a0-77.ucode +lib/firmware/iwlwifi-so-a0-gf-a0-78.ucode +lib/firmware/iwlwifi-so-a0-gf-a0-79.ucode lib/firmware/iwlwifi-so-a0-gf-a0.pnvm -lib/firmware/iwlwifi-so-a0-gf4-a0-67.ucode -lib/firmware/iwlwifi-so-a0-gf4-a0-68.ucode -lib/firmware/iwlwifi-so-a0-gf4-a0-71.ucode lib/firmware/iwlwifi-so-a0-gf4-a0-72.ucode lib/firmware/iwlwifi-so-a0-gf4-a0-73.ucode lib/firmware/iwlwifi-so-a0-gf4-a0-74.ucode lib/firmware/iwlwifi-so-a0-gf4-a0-77.ucode +lib/firmware/iwlwifi-so-a0-gf4-a0-78.ucode +lib/firmware/iwlwifi-so-a0-gf4-a0-79.ucode lib/firmware/iwlwifi-so-a0-gf4-a0.pnvm -lib/firmware/iwlwifi-so-a0-hr-b0-64.ucode -lib/firmware/iwlwifi-so-a0-hr-b0-68.ucode -lib/firmware/iwlwifi-so-a0-hr-b0-71.ucode lib/firmware/iwlwifi-so-a0-hr-b0-72.ucode lib/firmware/iwlwifi-so-a0-hr-b0-73.ucode lib/firmware/iwlwifi-so-a0-hr-b0-74.ucode lib/firmware/iwlwifi-so-a0-hr-b0-77.ucode -lib/firmware/iwlwifi-so-a0-jf-b0-64.ucode -lib/firmware/iwlwifi-so-a0-jf-b0-68.ucode -lib/firmware/iwlwifi-so-a0-jf-b0-71.ucode +lib/firmware/iwlwifi-so-a0-hr-b0-79.ucode lib/firmware/iwlwifi-so-a0-jf-b0-72.ucode lib/firmware/iwlwifi-so-a0-jf-b0-73.ucode lib/firmware/iwlwifi-so-a0-jf-b0-74.ucode lib/firmware/iwlwifi-so-a0-jf-b0-77.ucode lib/firmware/iwlwifi-ty-a0-gf-a0-59.ucode -lib/firmware/iwlwifi-ty-a0-gf-a0-62.ucode -lib/firmware/iwlwifi-ty-a0-gf-a0-63.ucode lib/firmware/iwlwifi-ty-a0-gf-a0-66.ucode -lib/firmware/iwlwifi-ty-a0-gf-a0-67.ucode -lib/firmware/iwlwifi-ty-a0-gf-a0-68.ucode -lib/firmware/iwlwifi-ty-a0-gf-a0-71.ucode lib/firmware/iwlwifi-ty-a0-gf-a0-72.ucode lib/firmware/iwlwifi-ty-a0-gf-a0-73.ucode lib/firmware/iwlwifi-ty-a0-gf-a0-74.ucode lib/firmware/iwlwifi-ty-a0-gf-a0-77.ucode +lib/firmware/iwlwifi-ty-a0-gf-a0-78.ucode +lib/firmware/iwlwifi-ty-a0-gf-a0-79.ucode lib/firmware/iwlwifi-ty-a0-gf-a0.pnvm #lib/firmware/kaweth lib/firmware/kaweth/new_code.bin @@ -2588,54 +2547,61 @@ lib/firmware/qat_c62x.bin lib/firmware/qat_c62x_mmp.bin lib/firmware/qat_mmp.bin #lib/firmware/qca -lib/firmware/qca/crbtfw21.tlv -lib/firmware/qca/crbtfw32.tlv -lib/firmware/qca/crnv21.bin -lib/firmware/qca/crnv32.bin -lib/firmware/qca/crnv32u.bin -lib/firmware/qca/htbtfw20.tlv -lib/firmware/qca/htnv20.bin -lib/firmware/qca/msbtfw11.mbn -lib/firmware/qca/msbtfw11.tlv -lib/firmware/qca/msnv11.bin -lib/firmware/qca/nvm_00130300.bin -lib/firmware/qca/nvm_00130302.bin -lib/firmware/qca/nvm_00230302.bin -lib/firmware/qca/nvm_00440302.bin -lib/firmware/qca/nvm_00440302_eu.bin -lib/firmware/qca/nvm_00440302_i2s_eu.bin -lib/firmware/qca/nvm_usb_00000200.bin -lib/firmware/qca/nvm_usb_00000201.bin -lib/firmware/qca/nvm_usb_00000300.bin -lib/firmware/qca/nvm_usb_00000302.bin -lib/firmware/qca/nvm_usb_00000302_eu.bin -lib/firmware/qca/nvm_usb_00130200.bin -lib/firmware/qca/nvm_usb_00130200_0104.bin -lib/firmware/qca/nvm_usb_00130200_0105.bin -lib/firmware/qca/nvm_usb_00130200_0106.bin -lib/firmware/qca/nvm_usb_00130200_0107.bin -lib/firmware/qca/nvm_usb_00130200_0109.bin -lib/firmware/qca/nvm_usb_00130200_0110.bin -lib/firmware/qca/nvm_usb_00130201.bin -lib/firmware/qca/nvm_usb_00130201_010a.bin -lib/firmware/qca/nvm_usb_00130201_010b.bin -lib/firmware/qca/nvm_usb_00130201_0303.bin -lib/firmware/qca/nvm_usb_00130201_gf.bin -lib/firmware/qca/nvm_usb_00130201_gf_010a.bin -lib/firmware/qca/nvm_usb_00130201_gf_010b.bin -lib/firmware/qca/nvm_usb_00130201_gf_0303.bin -lib/firmware/qca/nvm_usb_00190200.bin -lib/firmware/qca/rampatch_00130300.bin -lib/firmware/qca/rampatch_00130302.bin -lib/firmware/qca/rampatch_00230302.bin -lib/firmware/qca/rampatch_00440302.bin -lib/firmware/qca/rampatch_usb_00000200.bin -lib/firmware/qca/rampatch_usb_00000201.bin -lib/firmware/qca/rampatch_usb_00000300.bin -lib/firmware/qca/rampatch_usb_00000302.bin -lib/firmware/qca/rampatch_usb_00130200.bin -lib/firmware/qca/rampatch_usb_00130201.bin -lib/firmware/qca/rampatch_usb_00190200.bin +#lib/firmware/qca/crbtfw21.tlv +#lib/firmware/qca/crbtfw32.tlv +#lib/firmware/qca/crnv21.bin +#lib/firmware/qca/crnv32.bin +#lib/firmware/qca/crnv32u.bin +#lib/firmware/qca/hpbtfw21.tlv +#lib/firmware/qca/hpnv21.301 +#lib/firmware/qca/hpnv21.302 +#lib/firmware/qca/hpnv21.bin +#lib/firmware/qca/hpnv21g.301 +#lib/firmware/qca/hpnv21g.302 +#lib/firmware/qca/hpnv21g.bin +#lib/firmware/qca/htbtfw20.tlv +#lib/firmware/qca/htnv20.bin +#lib/firmware/qca/msbtfw11.mbn +#lib/firmware/qca/msbtfw11.tlv +#lib/firmware/qca/msnv11.bin +#lib/firmware/qca/nvm_00130300.bin +#lib/firmware/qca/nvm_00130302.bin +#lib/firmware/qca/nvm_00230302.bin +#lib/firmware/qca/nvm_00440302.bin +#lib/firmware/qca/nvm_00440302_eu.bin +#lib/firmware/qca/nvm_00440302_i2s_eu.bin +#lib/firmware/qca/nvm_usb_00000200.bin +#lib/firmware/qca/nvm_usb_00000201.bin +#lib/firmware/qca/nvm_usb_00000300.bin +#lib/firmware/qca/nvm_usb_00000302.bin +#lib/firmware/qca/nvm_usb_00000302_eu.bin +#lib/firmware/qca/nvm_usb_00130200.bin +#lib/firmware/qca/nvm_usb_00130200_0104.bin +#lib/firmware/qca/nvm_usb_00130200_0105.bin +#lib/firmware/qca/nvm_usb_00130200_0106.bin +#lib/firmware/qca/nvm_usb_00130200_0107.bin +#lib/firmware/qca/nvm_usb_00130200_0109.bin +#lib/firmware/qca/nvm_usb_00130200_0110.bin +#lib/firmware/qca/nvm_usb_00130201.bin +#lib/firmware/qca/nvm_usb_00130201_010a.bin +#lib/firmware/qca/nvm_usb_00130201_010b.bin +#lib/firmware/qca/nvm_usb_00130201_0303.bin +#lib/firmware/qca/nvm_usb_00130201_gf.bin +#lib/firmware/qca/nvm_usb_00130201_gf_010a.bin +#lib/firmware/qca/nvm_usb_00130201_gf_010b.bin +#lib/firmware/qca/nvm_usb_00130201_gf_0303.bin +#lib/firmware/qca/nvm_usb_00190200.bin +#lib/firmware/qca/rampatch_00130300.bin +#lib/firmware/qca/rampatch_00130302.bin +#lib/firmware/qca/rampatch_00230302.bin +#lib/firmware/qca/rampatch_00440302.bin +#lib/firmware/qca/rampatch_usb_00000200.bin +#lib/firmware/qca/rampatch_usb_00000201.bin +#lib/firmware/qca/rampatch_usb_00000300.bin +#lib/firmware/qca/rampatch_usb_00000302.bin +#lib/firmware/qca/rampatch_usb_00130200.bin +#lib/firmware/qca/rampatch_usb_00130201.bin +#lib/firmware/qca/rampatch_usb_00190200.bin #lib/firmware/qcom #lib/firmware/qcom/LENOVO #lib/firmware/qcom/LENOVO/21BX @@ -2711,6 +2677,8 @@ lib/firmware/qcom/vpu-1.0/venus.mbn lib/firmware/qcom/vpu-1.0/venus.mdt lib/firmware/qcom/vpu-2.0 lib/firmware/qcom/vpu-2.0/venus.mbn +lib/firmware/qcom/yamato_pfp.fw +lib/firmware/qcom/yamato_pm4.fw #lib/firmware/qed lib/firmware/qed/qed_init_values-8.10.9.0.bin lib/firmware/qed/qed_init_values-8.14.6.0.bin diff --git a/config/rootfiles/common/qpdf b/config/rootfiles/common/qpdf index 6e59ba345..1afd04a53 100644 --- a/config/rootfiles/common/qpdf +++ b/config/rootfiles/common/qpdf @@ -10,6 +10,7 @@ usr/bin/qpdf #usr/include/qpdf/FileInputSource.hh #usr/include/qpdf/InputSource.hh #usr/include/qpdf/JSON.hh +#usr/include/qpdf/PDFVersion.hh #usr/include/qpdf/Pipeline.hh #usr/include/qpdf/Pl_Buffer.hh #usr/include/qpdf/Pl_Concatenate.hh @@ -17,9 +18,12 @@ usr/bin/qpdf #usr/include/qpdf/Pl_DCT.hh #usr/include/qpdf/Pl_Discard.hh #usr/include/qpdf/Pl_Flate.hh +#usr/include/qpdf/Pl_Function.hh +#usr/include/qpdf/Pl_OStream.hh #usr/include/qpdf/Pl_QPDFTokenizer.hh #usr/include/qpdf/Pl_RunLength.hh #usr/include/qpdf/Pl_StdioFile.hh +#usr/include/qpdf/Pl_String.hh #usr/include/qpdf/PointerHolder.hh #usr/include/qpdf/QIntC.hh #usr/include/qpdf/QPDF.hh @@ -33,6 +37,8 @@ usr/bin/qpdf #usr/include/qpdf/QPDFExc.hh #usr/include/qpdf/QPDFFileSpecObjectHelper.hh #usr/include/qpdf/QPDFFormFieldObjectHelper.hh +#usr/include/qpdf/QPDFJob.hh +#usr/include/qpdf/QPDFLogger.hh #usr/include/qpdf/QPDFMatrix.hh #usr/include/qpdf/QPDFNameTreeObjectHelper.hh #usr/include/qpdf/QPDFNumberTreeObjectHelper.hh @@ -48,22 +54,33 @@ usr/bin/qpdf #usr/include/qpdf/QPDFStreamFilter.hh #usr/include/qpdf/QPDFSystemError.hh #usr/include/qpdf/QPDFTokenizer.hh +#usr/include/qpdf/QPDFUsage.hh #usr/include/qpdf/QPDFWriter.hh #usr/include/qpdf/QPDFXRefEntry.hh #usr/include/qpdf/QTC.hh #usr/include/qpdf/QUtil.hh #usr/include/qpdf/RandomDataProvider.hh #usr/include/qpdf/Types.h +#usr/include/qpdf/auto_job_c_att.hh +#usr/include/qpdf/auto_job_c_copy_att.hh +#usr/include/qpdf/auto_job_c_enc.hh +#usr/include/qpdf/auto_job_c_main.hh +#usr/include/qpdf/auto_job_c_pages.hh +#usr/include/qpdf/auto_job_c_uo.hh #usr/include/qpdf/qpdf-c.h -#usr/lib/libqpdf.la +#usr/include/qpdf/qpdfjob-c.h +#usr/include/qpdf/qpdflogger-c.h +#usr/lib/cmake/qpdf +#usr/lib/cmake/qpdf/libqpdfTargets-noconfig.cmake +#usr/lib/cmake/qpdf/libqpdfTargets.cmake +#usr/lib/cmake/qpdf/qpdfConfig.cmake +#usr/lib/cmake/qpdf/qpdfConfigVersion.cmake #usr/lib/libqpdf.so -usr/lib/libqpdf.so.28 -usr/lib/libqpdf.so.28.4.0 +usr/lib/libqpdf.so.29 +usr/lib/libqpdf.so.29.3.0 #usr/lib/pkgconfig/libqpdf.pc #usr/share/doc/qpdf -#usr/share/doc/qpdf/qpdf-manual.html -#usr/share/doc/qpdf/qpdf-manual.pdf -#usr/share/doc/qpdf/stylesheet.css +#usr/share/doc/qpdf/README-doc.txt #usr/share/man/man1/fix-qdf.1 #usr/share/man/man1/qpdf.1 #usr/share/man/man1/zlib-flate.1 diff --git a/config/rootfiles/core/174/filelists/apache2 b/config/rootfiles/core/174/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/core/174/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/174/filelists/ca-certificates b/config/rootfiles/core/174/filelists/ca-certificates new file mode 120000 index 000000000..320fea8f4 --- /dev/null +++ b/config/rootfiles/core/174/filelists/ca-certificates @@ -0,0 +1 @@ +../../../common/ca-certificates \ No newline at end of file diff --git a/config/rootfiles/core/174/filelists/files b/config/rootfiles/core/174/filelists/files index 305974014..a5ff20b13 100644 --- a/config/rootfiles/core/174/filelists/files +++ b/config/rootfiles/core/174/filelists/files @@ -1,7 +1,96 @@ +lib/firmware/amdgpu/dcn_3_1_4_dmcub.bin +lib/firmware/amdgpu/dcn_3_2_1_dmcub.bin +lib/firmware/amdgpu/gc_11_0_0_me.bin +lib/firmware/amdgpu/gc_11_0_0_mec.bin +lib/firmware/amdgpu/gc_11_0_0_mes1.bin +lib/firmware/amdgpu/gc_11_0_0_mes.bin +lib/firmware/amdgpu/gc_11_0_0_pfp.bin +lib/firmware/amdgpu/gc_11_0_0_rlc.bin +lib/firmware/amdgpu/gc_11_0_1_imu.bin +lib/firmware/amdgpu/gc_11_0_1_me.bin +lib/firmware/amdgpu/gc_11_0_1_mec.bin +lib/firmware/amdgpu/gc_11_0_1_mes1.bin +lib/firmware/amdgpu/gc_11_0_1_mes.bin +lib/firmware/amdgpu/gc_11_0_1_pfp.bin +lib/firmware/amdgpu/gc_11_0_1_rlc.bin +lib/firmware/amdgpu/gc_11_0_2_imu.bin +lib/firmware/amdgpu/gc_11_0_2_me.bin +lib/firmware/amdgpu/gc_11_0_2_mec.bin +lib/firmware/amdgpu/gc_11_0_2_mes1.bin +lib/firmware/amdgpu/gc_11_0_2_mes.bin +lib/firmware/amdgpu/gc_11_0_2_pfp.bin +lib/firmware/amdgpu/gc_11_0_2_rlc.bin +lib/firmware/amdgpu/psp_13_0_0_sos.bin +lib/firmware/amdgpu/psp_13_0_4_ta.bin +lib/firmware/amdgpu/psp_13_0_4_toc.bin +lib/firmware/amdgpu/psp_13_0_7_sos.bin +lib/firmware/amdgpu/psp_13_0_7_ta.bin +lib/firmware/amdgpu/renoir_asd.bin +lib/firmware/amdgpu/renoir_dmcub.bin +lib/firmware/amdgpu/renoir_ta.bin +lib/firmware/amdgpu/sdma_6_0_0.bin +lib/firmware/amdgpu/sdma_6_0_1.bin +lib/firmware/amdgpu/sdma_6_0_2.bin +lib/firmware/amdgpu/smu_13_0_0.bin +lib/firmware/amdgpu/smu_13_0_7.bin +lib/firmware/amdgpu/vangogh_asd.bin +lib/firmware/amdgpu/vangogh_ce.bin +lib/firmware/amdgpu/vangogh_dmcub.bin +lib/firmware/amdgpu/vangogh_me.bin +lib/firmware/amdgpu/vangogh_mec2.bin +lib/firmware/amdgpu/vangogh_mec.bin +lib/firmware/amdgpu/vangogh_pfp.bin +lib/firmware/amdgpu/vangogh_rlc.bin +lib/firmware/amdgpu/vangogh_vcn.bin +lib/firmware/amdgpu/vcn_4_0_0.bin +lib/firmware/amdgpu/vcn_4_0_2.bin +lib/firmware/amdgpu/vcn_4_0_4.bin +lib/firmware/amd-ucode/microcode_amd_fam19h.bin +lib/firmware/brcm/brcmfmac4329-sdio.bin +lib/firmware/brcm/brcmfmac43362-sdio.kobo,aura.txt +lib/firmware/brcm/brcmfmac43362-sdio.kobo,tolino-shine2hd.txt +lib/firmware/brcm/brcmfmac43362-sdio.WC121.txt +lib/firmware/cxgb4/t4fw-1.27.1.0.bin +lib/firmware/cxgb4/t5fw-1.27.1.0.bin +lib/firmware/cxgb4/t6fw-1.27.1.0.bin +lib/firmware/i915/adlp_dmc.bin +lib/firmware/i915/mtl_dmc.bin +lib/firmware/iwlwifi-9000-pu-b0-jf-b0-46.ucode +lib/firmware/iwlwifi-9260-th-b0-jf-b0-46.ucode +lib/firmware/iwlwifi-cc-a0-77.ucode +lib/firmware/iwlwifi-Qu-b0-hr-b0-77.ucode +lib/firmware/iwlwifi-Qu-b0-hr-b0-77.ucode +lib/firmware/iwlwifi-Qu-b0-jf-b0-77.ucode +lib/firmware/iwlwifi-Qu-c0-hr-b0-77.ucode +lib/firmware/iwlwifi-Qu-c0-jf-b0-77.ucode +lib/firmware/iwlwifi-QuZ-a0-hr-b0-77.ucode +lib/firmware/iwlwifi-so-a0-gf4-a0-78.ucode +lib/firmware/iwlwifi-so-a0-gf4-a0-79.ucode +lib/firmware/iwlwifi-so-a0-gf4-a0.pnvm +lib/firmware/iwlwifi-so-a0-gf-a0-78.ucode +lib/firmware/iwlwifi-so-a0-gf-a0-79.ucode +lib/firmware/iwlwifi-so-a0-gf-a0.pnvm +lib/firmware/iwlwifi-so-a0-hr-b0-79.ucode +lib/firmware/iwlwifi-ty-a0-gf-a0-78.ucode +lib/firmware/iwlwifi-ty-a0-gf-a0-79.ucode +lib/firmware/iwlwifi-ty-a0-gf-a0.pnvm +lib/firmware/mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin +lib/firmware/mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin +lib/firmware/mediatek/WIFI_RAM_CODE_MT7922_1.bin +lib/firmware/mediatek/WIFI_RAM_CODE_MT7961_1.bin +lib/firmware/qcom/yamato_pfp.fw +lib/firmware/qcom/yamato_pm4.fw +lib/firmware/rtw88/rtw8822c_fw.bin +lib/firmware/rtw89/rtw8852c_fw.bin srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/ipblocklist.cgi srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/mail.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/traffic.cgi srv/web/ipfire/cgi-bin/updatexlrator.cgi +usr/lib/firewall/rules.pl var/ipfire/header.pl +var/ipfire/ids-functions.pl var/ipfire/network-functions.pl diff --git a/config/rootfiles/core/174/filelists/grep b/config/rootfiles/core/174/filelists/grep new file mode 120000 index 000000000..ab5ef8b0e --- /dev/null +++ b/config/rootfiles/core/174/filelists/grep @@ -0,0 +1 @@ +../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/174/filelists/poppler b/config/rootfiles/core/174/filelists/poppler new file mode 120000 index 000000000..39aa6c263 --- /dev/null +++ b/config/rootfiles/core/174/filelists/poppler @@ -0,0 +1 @@ +../../../common/poppler \ No newline at end of file diff --git a/config/rootfiles/core/174/filelists/poppler-data b/config/rootfiles/core/174/filelists/poppler-data new file mode 120000 index 000000000..957aa9132 --- /dev/null +++ b/config/rootfiles/core/174/filelists/poppler-data @@ -0,0 +1 @@ +../../../common/poppler-data \ No newline at end of file diff --git a/config/rootfiles/core/174/filelists/qpdf b/config/rootfiles/core/174/filelists/qpdf new file mode 120000 index 000000000..2d6c43dec --- /dev/null +++ b/config/rootfiles/core/174/filelists/qpdf @@ -0,0 +1 @@ +../../../common/qpdf \ No newline at end of file diff --git a/config/rootfiles/core/174/update.sh b/config/rootfiles/core/174/update.sh index 9dcdb491f..7acaad64e 100644 --- a/config/rootfiles/core/174/update.sh +++ b/config/rootfiles/core/174/update.sh @@ -32,6 +32,7 @@ for (( i=1; i<=$core; i++ )); do done # Stop services +/etc/rc.d/init.d/apache stop /etc/rc.d/init.d/squid stop /etc/rc.d/init.d/ipsec stop @@ -40,6 +41,102 @@ extract_files # Remove files rm -rfv \ + /lib/firmware/cxgb4/t4fw-1.27.0.0.bin \ + /lib/firmware/cxgb4/t5fw-1.27.0.0.bin \ + /lib/firmware/cxgb4/t6fw-1.27.0.0.bin \ + /lib/firmware/iwlwifi-1000-3.ucode \ + /lib/firmware/iwlwifi-3168-22.ucode \ + /lib/firmware/iwlwifi-3168-27.ucode \ + /lib/firmware/iwlwifi-5000-1.ucode \ + /lib/firmware/iwlwifi-5000-2.ucode \ + /lib/firmware/iwlwifi-6000g2a-5.ucode \ + /lib/firmware/iwlwifi-6000g2b-5.ucode \ + /lib/firmware/iwlwifi-6050-4.ucode \ + /lib/firmware/iwlwifi-7265D-22.ucode \ + /lib/firmware/iwlwifi-7265D-27.ucode \ + /lib/firmware/iwlwifi-8000C-22.ucode \ + /lib/firmware/iwlwifi-8000C-27.ucode \ + /lib/firmware/iwlwifi-8000C-31.ucode \ + /lib/firmware/iwlwifi-8265-22.ucode \ + /lib/firmware/iwlwifi-8265-27.ucode \ + /lib/firmware/iwlwifi-8265-31.ucode \ + /lib/firmware/iwlwifi-9000-pu-b0-jf-b0-33.ucode \ + /lib/firmware/iwlwifi-9000-pu-b0-jf-b0-41.ucode \ + /lib/firmware/iwlwifi-9000-pu-b0-jf-b0-43.ucode \ + /lib/firmware/iwlwifi-9260-th-b0-jf-b0-33.ucode \ + /lib/firmware/iwlwifi-9260-th-b0-jf-b0-41.ucode \ + /lib/firmware/iwlwifi-9260-th-b0-jf-b0-43.ucode \ + /lib/firmware/iwlwifi-Qu-b0-hr-b0-48.ucode \ + /lib/firmware/iwlwifi-Qu-b0-hr-b0-53.ucode \ + /lib/firmware/iwlwifi-Qu-b0-hr-b0-55.ucode \ + /lib/firmware/iwlwifi-Qu-b0-hr-b0-62.ucode \ + /lib/firmware/iwlwifi-Qu-b0-hr-b0-63.ucode \ + /lib/firmware/iwlwifi-Qu-b0-hr-b0-68.ucode \ + /lib/firmware/iwlwifi-Qu-b0-hr-b0-71.ucode \ + /lib/firmware/iwlwifi-Qu-b0-jf-b0-48.ucode \ + /lib/firmware/iwlwifi-Qu-b0-jf-b0-53.ucode \ + /lib/firmware/iwlwifi-Qu-b0-jf-b0-55.ucode \ + /lib/firmware/iwlwifi-Qu-b0-jf-b0-62.ucode \ + /lib/firmware/iwlwifi-Qu-b0-jf-b0-63.ucode \ + /lib/firmware/iwlwifi-Qu-b0-jf-b0-68.ucode \ + /lib/firmware/iwlwifi-Qu-b0-jf-b0-71.ucode \ + /lib/firmware/iwlwifi-Qu-c0-hr-b0-48.ucode \ + /lib/firmware/iwlwifi-Qu-c0-hr-b0-53.ucode \ + /lib/firmware/iwlwifi-Qu-c0-hr-b0-55.ucode \ + /lib/firmware/iwlwifi-Qu-c0-hr-b0-62.ucode \ + /lib/firmware/iwlwifi-Qu-c0-hr-b0-63.ucode \ + /lib/firmware/iwlwifi-Qu-c0-hr-b0-68.ucode \ + /lib/firmware/iwlwifi-Qu-c0-hr-b0-71.ucode \ + /lib/firmware/iwlwifi-Qu-c0-jf-b0-48.ucode \ + /lib/firmware/iwlwifi-Qu-c0-jf-b0-53.ucode \ + /lib/firmware/iwlwifi-Qu-c0-jf-b0-55.ucode \ + /lib/firmware/iwlwifi-Qu-c0-jf-b0-62.ucode \ + /lib/firmware/iwlwifi-Qu-c0-jf-b0-63.ucode \ + /lib/firmware/iwlwifi-Qu-c0-jf-b0-68.ucode \ + /lib/firmware/iwlwifi-Qu-c0-jf-b0-71.ucode \ + /lib/firmware/iwlwifi-QuZ-a0-hr-b0-48.ucode \ + /lib/firmware/iwlwifi-QuZ-a0-hr-b0-53.ucode \ + /lib/firmware/iwlwifi-QuZ-a0-hr-b0-55.ucode \ + /lib/firmware/iwlwifi-QuZ-a0-hr-b0-62.ucode \ + /lib/firmware/iwlwifi-QuZ-a0-hr-b0-63.ucode \ + /lib/firmware/iwlwifi-QuZ-a0-hr-b0-67.ucode \ + /lib/firmware/iwlwifi-QuZ-a0-hr-b0-68.ucode \ + /lib/firmware/iwlwifi-QuZ-a0-hr-b0-71.ucode \ + /lib/firmware/iwlwifi-QuZ-a0-jf-b0-48.ucode \ + /lib/firmware/iwlwifi-QuZ-a0-jf-b0-53.ucode \ + /lib/firmware/iwlwifi-QuZ-a0-jf-b0-55.ucode \ + /lib/firmware/iwlwifi-QuZ-a0-jf-b0-62.ucode \ + /lib/firmware/iwlwifi-QuZ-a0-jf-b0-63.ucode \ + /lib/firmware/iwlwifi-QuZ-a0-jf-b0-68.ucode \ + /lib/firmware/iwlwifi-QuZ-a0-jf-b0-71.ucode \ + /lib/firmware/iwlwifi-cc-a0-46.ucode \ + /lib/firmware/iwlwifi-cc-a0-48.ucode \ + /lib/firmware/iwlwifi-cc-a0-53.ucode \ + /lib/firmware/iwlwifi-cc-a0-55.ucode \ + /lib/firmware/iwlwifi-cc-a0-62.ucode \ + /lib/firmware/iwlwifi-cc-a0-63.ucode \ + /lib/firmware/iwlwifi-cc-a0-67.ucode \ + /lib/firmware/iwlwifi-cc-a0-68.ucode \ + /lib/firmware/iwlwifi-cc-a0-71.ucode \ + /lib/firmware/iwlwifi-so-a0-gf-a0-64.ucode \ + /lib/firmware/iwlwifi-so-a0-gf-a0-67.ucode \ + /lib/firmware/iwlwifi-so-a0-gf-a0-68.ucode \ + /lib/firmware/iwlwifi-so-a0-gf-a0-71.ucode \ + /lib/firmware/iwlwifi-so-a0-gf4-a0-67.ucode \ + /lib/firmware/iwlwifi-so-a0-gf4-a0-68.ucode \ + /lib/firmware/iwlwifi-so-a0-gf4-a0-71.ucode \ + /lib/firmware/iwlwifi-so-a0-hr-b0-64.ucode \ + /lib/firmware/iwlwifi-so-a0-hr-b0-68.ucode \ + /lib/firmware/iwlwifi-so-a0-hr-b0-71.ucode \ + /lib/firmware/iwlwifi-so-a0-jf-b0-64.ucode \ + /lib/firmware/iwlwifi-so-a0-jf-b0-68.ucode \ + /lib/firmware/iwlwifi-so-a0-jf-b0-71.ucode \ + /lib/firmware/iwlwifi-ty-a0-gf-a0-62.ucode \ + /lib/firmware/iwlwifi-ty-a0-gf-a0-63.ucode \ + /lib/firmware/iwlwifi-ty-a0-gf-a0-67.ucode \ + /lib/firmware/iwlwifi-ty-a0-gf-a0-68.ucode \ + /lib/firmware/iwlwifi-ty-a0-gf-a0-71.ucode \ + /lib/firmware/qca \ /usr/bin/srptool \ /usr/lib/libbind9-9.16.37.so \ /usr/lib/libboost*.so.1.76.0 \ @@ -62,6 +159,7 @@ ldconfig # Start services telinit u +/etc/rc.d/init.d/apache start if [ -f /var/ipfire/proxy/enable ]; then /etc/init.d/squid start fi diff --git a/config/rootfiles/packages/cups-filters b/config/rootfiles/packages/cups-filters index 0378162f5..6cdccf203 100644 --- a/config/rootfiles/packages/cups-filters +++ b/config/rootfiles/packages/cups-filters @@ -74,12 +74,10 @@ usr/lib/cups/filter/vectortopdf usr/lib/cups/filter/vectortoubrl usr/lib/cups/filter/wmftopdf usr/lib/cups/filter/xfigtopdf -#usr/lib/libcupsfilters.a #usr/lib/libcupsfilters.la #usr/lib/libcupsfilters.so usr/lib/libcupsfilters.so.1 usr/lib/libcupsfilters.so.1.0.0 -#usr/lib/libfontembed.a #usr/lib/libfontembed.la #usr/lib/libfontembed.so usr/lib/libfontembed.so.1 diff --git a/config/rootfiles/packages/python3-setuptools b/config/rootfiles/packages/python3-setuptools index b9a8bea56..be2f13a44 100644 --- a/config/rootfiles/packages/python3-setuptools +++ b/config/rootfiles/packages/python3-setuptools @@ -1,273 +1,263 @@ #usr/lib/python3.10/site-packages/easy-install.pth -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/EGG-INFO -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/EGG-INFO/PKG-INFO -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/EGG-INFO/SOURCES.txt -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/EGG-INFO/dependency_links.txt -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/EGG-INFO/entry_points.txt -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/EGG-INFO/not-zip-safe -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/EGG-INFO/requires.txt -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/EGG-INFO/top_level.txt -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/_distutils_hack -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/_distutils_hack/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/_distutils_hack/override.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/__init__.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/appdirs.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/importlib_resources -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/_adapters.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/_common.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/_compat.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/_itertools.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/_legacy.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/abc.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/readers.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/simple.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/jaraco -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/jaraco/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/jaraco/context.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/jaraco/functools.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/jaraco/text -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/jaraco/text/__init__.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/more_itertools -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/more_itertools/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/more_itertools/more.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/more_itertools/recipes.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/packaging -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/packaging/__about__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/packaging/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/packaging/_manylinux.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/packaging/_musllinux.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/packaging/_structures.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/packaging/markers.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/packaging/requirements.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/packaging/specifiers.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/packaging/tags.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/packaging/utils.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/packaging/version.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/pyparsing -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/pyparsing/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/pyparsing/actions.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/pyparsing/common.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/pyparsing/core.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/pyparsing/diagram -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/pyparsing/diagram/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/pyparsing/exceptions.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/pyparsing/helpers.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/pyparsing/results.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/pyparsing/testing.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/pyparsing/unicode.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/pyparsing/util.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/_vendor/zipp.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/extern -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/pkg_resources/extern/__init__.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_deprecation_warning.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/_collections.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/_functools.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/_macos_compat.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/_msvccompiler.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/archive_util.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/bcppcompiler.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/ccompiler.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/cmd.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/_framework_compat.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/bdist.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/bdist_dumb.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/bdist_rpm.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/build.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/build_clib.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/build_ext.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/build_py.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/build_scripts.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/check.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/clean.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/config.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/install.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/install_data.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/install_egg_info.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/install_headers.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/install_lib.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/install_scripts.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/py37compat.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/register.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/sdist.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/command/upload.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/config.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/core.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/cygwinccompiler.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/debug.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/dep_util.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/dir_util.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/dist.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/errors.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/extension.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/fancy_getopt.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/file_util.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/filelist.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/log.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/msvc9compiler.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/msvccompiler.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/py38compat.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/py39compat.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/spawn.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/sysconfig.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/text_file.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/unixccompiler.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/util.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/version.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_distutils/versionpredicate.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_entry_points.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_imp.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_importlib.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_itertools.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_path.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_reqs.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/__init__.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_metadata -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_metadata/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_metadata/_adapters.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_metadata/_collections.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_metadata/_compat.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_metadata/_functools.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_metadata/_itertools.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_metadata/_meta.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_metadata/_text.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_resources -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_resources/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_resources/_adapters.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_resources/_common.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_resources/_compat.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_resources/_itertools.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_resources/_legacy.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_resources/abc.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_resources/readers.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/importlib_resources/simple.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/jaraco -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/jaraco/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/jaraco/context.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/jaraco/functools.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/jaraco/text -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/jaraco/text/__init__.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/more_itertools -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/more_itertools/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/more_itertools/more.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/more_itertools/recipes.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/ordered_set.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/packaging -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/packaging/__about__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/packaging/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/packaging/_manylinux.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/packaging/_musllinux.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/packaging/_structures.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/packaging/markers.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/packaging/requirements.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/packaging/specifiers.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/packaging/tags.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/packaging/utils.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/packaging/version.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/pyparsing -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/pyparsing/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/pyparsing/actions.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/pyparsing/common.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/pyparsing/core.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/pyparsing/diagram -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/pyparsing/diagram/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/pyparsing/exceptions.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/pyparsing/helpers.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/pyparsing/results.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/pyparsing/testing.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/pyparsing/unicode.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/pyparsing/util.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/tomli -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/tomli/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/tomli/_parser.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/tomli/_re.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/tomli/_types.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/typing_extensions.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/_vendor/zipp.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/archive_util.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/build_meta.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/cli-32.exe -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/cli-64.exe -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/cli-arm64.exe -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/cli.exe -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/alias.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/bdist_egg.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/bdist_rpm.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/build.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/build_clib.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/build_ext.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/build_py.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/develop.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/dist_info.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/easy_install.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/editable_wheel.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/egg_info.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/install.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/install_egg_info.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/install_lib.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/install_scripts.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/launcher manifest.xml -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/py36compat.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/register.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/rotate.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/saveopts.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/sdist.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/setopt.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/test.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/upload.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/command/upload_docs.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/config -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/config/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/config/_apply_pyprojecttoml.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/config/_validate_pyproject -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/config/_validate_pyproject/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/config/_validate_pyproject/error_reporting.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/config/_validate_pyproject/extra_validations.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/config/_validate_pyproject/fastjsonschema_exceptions.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/config/_validate_pyproject/fastjsonschema_validations.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/config/_validate_pyproject/formats.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/config/expand.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/config/pyprojecttoml.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/config/setupcfg.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/dep_util.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/depends.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/discovery.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/dist.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/errors.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/extension.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/extern -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/extern/__init__.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/glob.py -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/gui-32.exe -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/gui-64.exe -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/gui-arm64.exe -#usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/gui.exe -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/installer.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/launch.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/logging.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/monkey.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/msvc.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/namespaces.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/package_index.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/py34compat.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/sandbox.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/script (dev).tmpl -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/script.tmpl -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/unicode_utils.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/version.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/wheel.py -usr/lib/python3.10/site-packages/setuptools-65.4.1-py3.10.egg/setuptools/windows_support.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/EGG-INFO +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/EGG-INFO/PKG-INFO +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/EGG-INFO/SOURCES.txt +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/EGG-INFO/dependency_links.txt +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/EGG-INFO/entry_points.txt +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/EGG-INFO/not-zip-safe +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/EGG-INFO/requires.txt +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/EGG-INFO/top_level.txt +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/_distutils_hack +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/_distutils_hack/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/_distutils_hack/override.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/__init__.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/__init__.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/importlib_resources +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/_adapters.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/_common.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/_compat.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/_itertools.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/_legacy.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/abc.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/readers.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/importlib_resources/simple.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/jaraco +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/jaraco/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/jaraco/context.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/jaraco/functools.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/jaraco/text +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/jaraco/text/__init__.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/more_itertools +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/more_itertools/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/more_itertools/more.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/more_itertools/recipes.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/packaging +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/packaging/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/packaging/_elffile.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/packaging/_manylinux.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/packaging/_musllinux.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/packaging/_parser.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/packaging/_structures.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/packaging/_tokenizer.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/packaging/markers.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/packaging/requirements.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/packaging/specifiers.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/packaging/tags.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/packaging/utils.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/packaging/version.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/platformdirs +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/platformdirs/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/platformdirs/__main__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/platformdirs/android.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/platformdirs/api.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/platformdirs/macos.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/platformdirs/unix.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/platformdirs/version.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/platformdirs/windows.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/typing_extensions.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/_vendor/zipp.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/extern +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/pkg_resources/extern/__init__.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_deprecation_warning.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/_collections.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/_functools.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/_log.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/_macos_compat.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/_msvccompiler.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/archive_util.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/bcppcompiler.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/ccompiler.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/cmd.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/_framework_compat.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/bdist.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/bdist_dumb.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/bdist_rpm.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/build.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/build_clib.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/build_ext.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/build_py.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/build_scripts.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/check.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/clean.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/config.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/install.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/install_data.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/install_egg_info.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/install_headers.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/install_lib.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/install_scripts.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/py37compat.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/register.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/sdist.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/command/upload.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/config.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/core.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/cygwinccompiler.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/debug.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/dep_util.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/dir_util.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/dist.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/errors.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/extension.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/fancy_getopt.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/file_util.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/filelist.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/log.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/msvc9compiler.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/msvccompiler.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/py38compat.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/py39compat.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/spawn.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/sysconfig.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/text_file.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/unixccompiler.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/util.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/version.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_distutils/versionpredicate.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_entry_points.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_imp.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_importlib.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_itertools.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_normalization.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_path.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_reqs.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/__init__.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_metadata +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_metadata/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_metadata/_adapters.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_metadata/_collections.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_metadata/_compat.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_metadata/_functools.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_metadata/_itertools.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_metadata/_meta.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_metadata/_py39compat.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_metadata/_text.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_resources +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_resources/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_resources/_adapters.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_resources/_common.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_resources/_compat.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_resources/_itertools.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_resources/_legacy.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_resources/abc.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_resources/readers.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/importlib_resources/simple.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/jaraco +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/jaraco/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/jaraco/context.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/jaraco/functools.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/jaraco/text +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/jaraco/text/__init__.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/more_itertools +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/more_itertools/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/more_itertools/more.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/more_itertools/recipes.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/ordered_set.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/packaging +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/packaging/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/packaging/_elffile.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/packaging/_manylinux.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/packaging/_musllinux.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/packaging/_parser.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/packaging/_structures.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/packaging/_tokenizer.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/packaging/markers.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/packaging/requirements.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/packaging/specifiers.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/packaging/tags.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/packaging/utils.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/packaging/version.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/tomli +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/tomli/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/tomli/_parser.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/tomli/_re.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/tomli/_types.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/typing_extensions.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/_vendor/zipp.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/archive_util.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/build_meta.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/cli-32.exe +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/cli-64.exe +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/cli-arm64.exe +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/cli.exe +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/alias.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/bdist_egg.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/bdist_rpm.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/build.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/build_clib.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/build_ext.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/build_py.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/develop.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/dist_info.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/easy_install.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/editable_wheel.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/egg_info.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/install.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/install_egg_info.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/install_lib.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/install_scripts.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/launcher manifest.xml +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/py36compat.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/register.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/rotate.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/saveopts.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/sdist.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/setopt.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/test.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/upload.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/command/upload_docs.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/config +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/config/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/config/_apply_pyprojecttoml.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/config/_validate_pyproject +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/config/_validate_pyproject/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/config/_validate_pyproject/error_reporting.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/config/_validate_pyproject/extra_validations.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/config/_validate_pyproject/fastjsonschema_exceptions.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/config/_validate_pyproject/fastjsonschema_validations.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/config/_validate_pyproject/formats.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/config/expand.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/config/pyprojecttoml.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/config/setupcfg.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/dep_util.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/depends.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/discovery.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/dist.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/errors.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/extension.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/extern +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/extern/__init__.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/glob.py +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/gui-32.exe +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/gui-64.exe +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/gui-arm64.exe +#usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/gui.exe +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/installer.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/launch.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/logging.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/monkey.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/msvc.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/namespaces.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/package_index.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/py34compat.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/sandbox.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/script (dev).tmpl +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/script.tmpl +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/unicode_utils.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/version.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/wheel.py +usr/lib/python3.10/site-packages/setuptools-67.5.1-py3.10.egg/setuptools/windows_support.py #usr/lib/python3.10/site-packages/setuptools.pth diff --git a/doc/language_issues.de b/doc/language_issues.de index 392416192..3ba7b4bcf 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -103,6 +103,7 @@ WARNING: translation string unused: advproxy throttle dskimg WARNING: translation string unused: advproxy throttle mmedia WARNING: translation string unused: advproxy update notification WARNING: translation string unused: advproxy web browser +WARNING: translation string unused: advproxy wpad notice WARNING: translation string unused: again WARNING: translation string unused: age seconds WARNING: translation string unused: age shour diff --git a/doc/language_issues.en b/doc/language_issues.en index 131278a20..de7b09524 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -305,7 +305,6 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org* WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line) WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line) -WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: age second = second diff --git a/doc/language_issues.es b/doc/language_issues.es index 501f60764..e84e38a87 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -105,6 +105,7 @@ WARNING: translation string unused: advproxy throttle mmedia WARNING: translation string unused: advproxy update information WARNING: translation string unused: advproxy update notification WARNING: translation string unused: advproxy web browser +WARNING: translation string unused: advproxy wpad notice WARNING: translation string unused: again WARNING: translation string unused: age seconds WARNING: translation string unused: age shour diff --git a/doc/language_issues.fr b/doc/language_issues.fr index bbf686b74..7677e61c3 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -108,6 +108,7 @@ WARNING: translation string unused: advproxy throttle mmedia WARNING: translation string unused: advproxy update information WARNING: translation string unused: advproxy update notification WARNING: translation string unused: advproxy web browser +WARNING: translation string unused: advproxy wpad notice WARNING: translation string unused: again WARNING: translation string unused: age seconds WARNING: translation string unused: age shour diff --git a/doc/language_issues.it b/doc/language_issues.it index f9fa74de1..19861e7cb 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -906,7 +906,6 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org* WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line) WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line) -WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: aliases default interface = - Default Interface - diff --git a/doc/language_issues.nl b/doc/language_issues.nl index d406e7299..a67057547 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -906,7 +906,6 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org* WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line) WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line) -WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: aliases default interface = - Default Interface - diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 54aba0c66..6f2065be6 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -832,7 +832,6 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org* WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line) WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line) -WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: age second = second diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 05ee8461e..67e3e738f 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -828,7 +828,6 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org* WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line) WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line) -WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: age second = second diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 6871ea35a..bb20aea1d 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -894,7 +894,6 @@ WARNING: untranslated string: advproxy wpad example dst_noproxy_ip = e.g. 192.16 WARNING: untranslated string: advproxy wpad example dst_noproxy_url = e.g. *.ipfire.org* WARNING: untranslated string: advproxy wpad label dst_noproxy_ip = Excluded IP Subnets (one per line) WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL s (one per line) -WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: aliases default interface = - Default Interface - diff --git a/doc/language_missings b/doc/language_missings index 956303c92..72c724243 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -125,10 +125,6 @@ < dhcp fixed ip address in dynamic range < g.dtm < g.lite -< guaranteed bandwidth -< retbleed -< service boot setting unavailable -< show dh < openvpn cert expires soon < openvpn cert has expired < upload fcdsl.o diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index e25193eb9..079fdf494 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -85,8 +85,8 @@ Stephan Feddersen, Robin Roevens, Stéphane Pautrel, Tim FitzGeorge, -Jan Lentfer, Jon Murphy, +Jan Lentfer, Marcus Scholz, Ersan Yildirim, Jörn-Ingo Weigert, diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi old mode 100644 new mode 100755 index 28b00215c..f45703f0b --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -844,11 +844,11 @@ foreach my $line (@current1) { } if ($dhcpsettings{'KEY1'} eq $key) { - print "<tr class='row-colouryellow'>"; + print "<tr class='colouryellow'>"; } elsif ($key % 2) { - print "<tr class='row-color22'>"; + print "<tr class='color22'>"; } else { - print "<tr class='row-color20'>"; + print "<tr class='color20'>"; } print <<END @@ -1078,13 +1078,13 @@ foreach my $line (@current2) { if ($dhcpsettings{'KEY2'} eq $key) { print "<tr>"; - $col="class='row-colouryellow'"; + $col="class='colouryellow'"; } elsif ($key % 2) { print "<tr>"; - $col="class='row-color20'"; + $col="class='color20'"; } else { print "<tr>"; - $col="class='row-color22'"; + $col="class='color22'"; } my $TAG0 = ''; my $TAG1 = ''; @@ -1100,10 +1100,10 @@ foreach my $line (@current2) { $TAG3 = '</b>'; } if ($ipoutside{$temp[1]} > 0) { - $TAG4 = "class='cell-orange'" if ($dhcpsettings{'KEY2'} ne $key); + $TAG4 = "class='orange'" if ($dhcpsettings{'KEY2'} ne $key); } if ($ipinrange{$temp[1]} > 0) { - $TAG4 = "class='cell-red'" if ($dhcpsettings{'KEY2'} ne $key); + $TAG4 = "class='red'" if ($dhcpsettings{'KEY2'} ne $key); } print <<END @@ -1166,9 +1166,9 @@ print <<END <tr> <td> </td> <td> </td> - <td class='base cell-orange'>$Lang::tr{'ip address outside subnets'}</td> + <td class='base orange'>$Lang::tr{'ip address outside subnets'}</td> <td> &nbsp</td> - <td class='base cell-red'>$Lang::tr{'dhcp fixed ip address in dynamic range'}</td> + <td class='base red'>$Lang::tr{'dhcp fixed ip address in dynamic range'}</td> <td> </td> <td> </td> $dup diff --git a/html/cgi-bin/ipblocklist.cgi b/html/cgi-bin/ipblocklist.cgi index bb438129c..b79eb155f 100644 --- a/html/cgi-bin/ipblocklist.cgi +++ b/html/cgi-bin/ipblocklist.cgi @@ -72,6 +72,10 @@ my @blocklists = &IPblocklist::get_blocklists(); # Process actions if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") { + # Assign checkbox values, in case they are not checked. + $cgiparams{'ENABLE'} = "off" unless($cgiparams{'ENABLE'}); + $cgiparams{'LOGGING'} = "off" unless($cgiparams{'LOGGING'}); + # Array to store if blocklists are missing on the system # and needs to be downloaded first. my @missing_blocklists = (); diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index fbc83f48d..53b9073fc 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -60,6 +60,7 @@ my %sections = ( 'dhcp' => '(dhcpd: )', 'dma' => '(dma: |dma\[.*\]: |postfix/\w*\[\d*\]: )', 'guardian' => '(guardian\[.*\]: )', + 'haproxy' => '(haproxy\[.*?\]: )', 'ipblocklist' => '(ipblocklist: )', 'ipfire' => '(ipfire: )', 'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )', @@ -93,6 +94,7 @@ my %trsections = ( 'dhcp' => "$Lang::tr{'dhcp server'}", 'dma' => 'Mail', 'guardian' => "$Lang::tr{'guardian'}", + 'haproxy' => 'HAProxy', 'ipblocklist' => "$Lang::tr{'ipblocklist'}", 'ipfire' => 'IPFire', 'ipsec' => 'IPSec', @@ -229,7 +231,7 @@ while ($gzindex >=0 && $loop) { #&General::log("reading $filestr"); READ:while (<FILE>) { my $line = $_; - if ($line =~ /^${monthstr} ${daystr} ..:..:.. [\w\-]+ ${section}(.*)/) { + if ($line =~ /^${monthstr} ${daystr} ..:..:.. [\w\-\.]+ ${section}(.*)/) { # when standard viewing, just keep in memory the correct slice # it starts a '$start' and size is $viewport # If export, then keep all lines... @@ -274,7 +276,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'export'}) foreach $_ (@log) { - /^... (..) (..:..:..) [\w\-]+ ${section}(.*)$/; + /^... (..) (..:..:..) [\w\-\.]+ ${section}(.*)$/; my $day = $1; $day =~ tr / /0/; my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ; @@ -397,7 +399,7 @@ $lines = 0; #print '<tt>'; foreach $_ (@log) { - /^... (..) (..:..:..) [\w\-]+ ${section}(.*)$/; + /^... (..) (..:..:..) [\w\-\.]+ ${section}(.*)$/; my $day = $1; $day =~ tr / /0/; my $time = $cgiparams{'DAY'} ? "$2" : "$day/$2" ; diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index b4073343e..a718d5771 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -1421,9 +1421,6 @@ print <<END <tr> <td colspan="4"> </td> </tr> -<tr> - <td colspan="4">$Lang::tr{'advproxy wpad notice'}</td> -</tr> </table> <hr size='1'> diff --git a/html/cgi-bin/traffic.cgi b/html/cgi-bin/traffic.cgi index 2f28537d0..67cea7c2e 100644 --- a/html/cgi-bin/traffic.cgi +++ b/html/cgi-bin/traffic.cgi @@ -55,12 +55,12 @@ display_vnstat($netsettings{'GREEN_DEV'}); # Display external network / check if it is PPP or ETH # and dont display if RED_DEV=GREEN_DEV (green only mode) -if ($netsettings{'RED_TYPE'} ne 'PPPOE') { - if ($netsettings{'RED_DEV'} ne $netsettings{'GREEN_DEV'}) { - display_vnstat($netsettings{'RED_DEV'}); - } -} else { - display_vnstat("ppp0"); +if ($netsettings{'RED_DEV'} ne $netsettings{'GREEN_DEV'}) { + # Omit the red interface name. + my $red_iface = &General::get_red_interface(); + + # Display the red stats if a device could be grabbed. + display_vnstat($red_iface) if ($red_iface); } # Check config and display aditional Networks (BLUE and ORANGE) diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi index 47d3cca42..09f9f5de1 100644 --- a/html/cgi-bin/updatexlrator.cgi +++ b/html/cgi-bin/updatexlrator.cgi @@ -105,46 +105,6 @@ my @metadata=(); &General::readhash("${General::swroot}/proxy/settings", \%proxysettings); &General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color); -###--- HTML HEAD ---### -my $extraHead = <<END -<style> - .row-color20 { - background-color: $color{'color20'}; - } - .row-color22 { - background-color: $color{'color22'}; - } - .row-table1colour { - background-color: $Header::table1colour; - } - .row-table2colour { - background-color: $Header::table2colour; - } - .percent-box { - border-style: solid; - border-width: 1px; - border-color: #a0a0a0; - width: 100px; - height: 10px; - } - .percent-bar { - background-color: #a0a0a0; - border-style: solid; - border-width: 1px; - border-color: #e2e2e2; - } - .percent-space { - background-color: #e2e2e2; - border-style: solid; - border-width: 1px; - border-color: #e2e2e2; - } -</style> -END -; -###--- END HTML HEAD ---### - - $xlratorsettings{'ACTION'} = ''; $xlratorsettings{'ENABLE_LOG'} = 'off'; $xlratorsettings{'PASSIVE_MODE'} = 'off'; @@ -409,7 +369,7 @@ $selected{'NOT_ACCESSED_LAST'}{$xlratorsettings{'NOT_ACCESSED_LAST'}} = "selecte &Header::showhttpheaders(); -&Header::openpage($Lang::tr{'updxlrtr configuration'}, 1, $extraHead); +&Header::openpage($Lang::tr{'updxlrtr configuration'}, 1, $Header::extraHead); &Header::openbigbox('100%', 'left', '', $errormessage); @@ -572,9 +532,9 @@ END $id++; if ($id % 2) { - print "<tr class='row-table1colour'>\n"; } + print "<tr class='table1colour'>\n"; } else { - print "<tr class='row-table2colour'>\n"; } + print "<tr class='table2colour'>\n"; } $filesize = $size_updatefile; 1 while $filesize =~ s/^(-?\d+)(\d{3})/$1.$2/; @@ -863,9 +823,9 @@ foreach (@vendors) $id++; if ($id % 2) { - print "<tr class='row-color20'>\n"; } + print "<tr class='color20'>\n"; } else { - print "<tr class='row-color22'>\n"; } + print "<tr class='color22'>\n"; } print "<td class='base' align='center'><nobr> "; @@ -1202,9 +1162,9 @@ END $id++; if ($id % 2) { - print "<tr class='row-table1colour'>\n"; } + print "<tr class='table1colour'>\n"; } else { - print "<tr class='row-table2colour'>\n"; } + print "<tr class='table2colour'>\n"; } $filesize = $size_updatefile; 1 while $filesize =~ s/^(-?\d+)(\d{3})/$1.$2/; diff --git a/lfs/apache2 b/lfs/apache2 index 7e1ef7911..402aa8567 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -25,7 +25,7 @@ include Config -VER = 2.4.55 +VER = 2.4.56 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 98e9ec41aa3ccbbe533672ba6de8421e1f0cb5a4b4a06d0cf26c676945bcd5ebe66a1fd21d941ad8ff2c9183565ce542a5643730bbee5972934008652924945b +$(DL_FILE)_BLAKE2 = f9aaf5038543aeec79d5b8615b1b2120fe321966280574c685070f2356f8f1dba1d55a9a25f46cb5ecdd6e3f03785fe7a4e1b965506896cb889720728aa18101 install : $(TARGET) diff --git a/lfs/ca-certificates b/lfs/ca-certificates index 70f9e0ea6..8a7c1ea25 100644 --- a/lfs/ca-certificates +++ b/lfs/ca-certificates @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 20221201 +VER = 20230305 # From https://hg.mozilla.org/mozilla-central/raw-file/tip/security/nss/lib/ckfw/b… diff --git a/lfs/cups b/lfs/cups index 0b817c7cc..6485f8df4 100644 --- a/lfs/cups +++ b/lfs/cups @@ -24,7 +24,7 @@ include Config -VER = 2.4.1 +VER = 2.4.2 SUMMARY = The Common UNIX Printing System THISAPP = cups-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 32 +PAK_VER = 33 DEPS = avahi cups-filters dbus ghostscript @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 690d9d92f9bc84c2bb360699191cd67e1489ffc3ab219376dfc1a8795379950c95bf58c2033a0dbd2918262c5d104e21e31c4585cb35d229b0fac6cf4967bfd7 +$(DL_FILE)_BLAKE2 = 97053feb502d4fdc28810b806000b6c84a6795d5adcec0789e73e5477d5802d46a99381366d16219f627166df088f6decde5c144bd0c38b5745815dc1e426bc5 install : $(TARGET) diff --git a/lfs/cups-filters b/lfs/cups-filters index b9f9a1939..7f209aa03 100644 --- a/lfs/cups-filters +++ b/lfs/cups-filters @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups-filters -PAK_VER = 11 +PAK_VER = 12 DEPS = cups ghostscript @@ -84,12 +84,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && \ + CXXFLAGS="-std=c++17" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --with-pdftops=hybrid \ --disable-mutool \ + --disable-static \ --disable-avahi cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install diff --git a/lfs/grep b/lfs/grep index deb180348..b1a0ec6aa 100644 --- a/lfs/grep +++ b/lfs/grep @@ -24,7 +24,7 @@ include Config -VER = 3.8 +VER = 3.9 THISAPP = grep-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 24cf6f7aa35c85f59f508969ee9731c5be1e5c613e64e636f464bbdde917bb99ba739e4b82abf08da127ad0400d62e27d139f85142035745121d381982ec6c36 +$(DL_FILE)_BLAKE2 = 33fefce2a831ad6f00f2eb1d8a063cf280635f2d9c481c98981f7a2ff143c846ab570a448c9c02c3ba08cf2c98612cb364d2d033baf92d62c4515315453cc6f9 install : $(TARGET) diff --git a/lfs/linux-firmware b/lfs/linux-firmware index f234dce62..40988eb1c 100644 --- a/lfs/linux-firmware +++ b/lfs/linux-firmware @@ -24,7 +24,7 @@ include Config -VER = 20221214 +VER = 20230210 THISAPP = linux-firmware-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 8e0b1ba65ef4b1e54f4d035e5d4e2b48d62516d65d8d8e8c8ab2e3e1c93fcf3f1a6eb8bb5cdabaae9fecae981e6d10417e11c87b9cb734f760472b7b83c8cb04 +$(DL_FILE)_BLAKE2 = 7b45c0101900a5b106c089aec24119e0d2c0b06f460d590a3505a4c49730b40e207ebb821d4c3a477d622bcc09193dc315f105f65b9dc68b51d9d68b58bb887b install : $(TARGET) diff --git a/lfs/poppler b/lfs/poppler index f7ccb68ba..959eeed0c 100644 --- a/lfs/poppler +++ b/lfs/poppler @@ -24,7 +24,7 @@ include Config -VER = 23.01.0 +VER = 23.03.0 THISAPP = poppler-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 8dd85767a0c101b3d7166719374658a233aff491b0990917aacaa6fb3c5d8e51104b3ac45c78dcfb380286ea48067d1db57c2794d99a93cae9f4d64e9ca3dd07 +$(DL_FILE)_BLAKE2 = 1247b7cf62466f65c46b739f0784e8ba97911940e04f91a7db28bf0663c8fe182f79066aa3925cb338580ccedbf17aecd2a2d2795e859680d1fb721390a1cbe0 install : $(TARGET) diff --git a/lfs/poppler-data b/lfs/poppler-data index 3f9bba8eb..32182c81b 100644 --- a/lfs/poppler-data +++ b/lfs/poppler-data @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 0.4.11 +VER = 0.4.12 THISAPP = poppler-data-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 01f0f9f3d933f45683a702c4d538d8fc59874512290f199b601c16f98f9b596ff249fbc992574d046931cc80f3685f94733248450d3a54f2f961951cdeda7c39 +$(DL_FILE)_BLAKE2 = 0d34ff1fcc9120b5db2baded9d931ca37128106eecdd54892d0256f9736f799d52eacd4017741797432048def914dd13150c6e3bf8d9ea5b8597a799a497d1c7 install : $(TARGET) diff --git a/lfs/python3-setuptools b/lfs/python3-setuptools index b845736fa..0630a769d 100644 --- a/lfs/python3-setuptools +++ b/lfs/python3-setuptools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 65.4.1 +VER = 67.5.1 SUMMARY = Enhancements to distutils for building and distributing Python packages THISAPP = setuptools-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-setuptools -PAK_VER = 6 +PAK_VER = 7 DEPS = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 12e644412c7f910a8bf6fb470e0c7e78bcd11a9403d7d0821eecad156d0a4ed03751de6bd6c51ebc2ce1c0925386120971c0da129ebd7e1b8376feee1f8edc7e +$(DL_FILE)_BLAKE2 = ed063a287787e56850cd4f20a8f07cc8670138bdbbb934a0684ead355f234312e6d3cebabffbbc41fb2dd2df27c493878c6660ea073ea00e65d31cef8a6568c0 install : $(TARGET) diff --git a/lfs/qpdf b/lfs/qpdf index c51883f83..2b7557c27 100644 --- a/lfs/qpdf +++ b/lfs/qpdf @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 10.4.0 +VER = 11.3.0 THISAPP = qpdf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = bc984c742bec582b5b67f7a4f4f00bb22a36e8e14d78b8e8848baed0c94489f6920070bc317928c53aca855c252c2fa5de0fba8b64ba16ba37afc2362d6ae7ba +$(DL_FILE)_BLAKE2 = 80dd2a96f3b82b9e530f26c72cd24cd3b111e2e1cbe821b12af13807e8d54fbc7f5632130f5cbd03df1b7c70de3c94a7e889d4ea4f1a3670a28f726364564b16 install : $(TARGET) @@ -70,9 +70,12 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-static \ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && mkdir -pv build + cd $(DIR_APP)/build && cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_STATIC_LIBS=FALSE \ + -DINSTALL_EXAMPLES=OFF + cd $(DIR_APP)/build && make $(MAKETUNING) + cd $(DIR_APP)/build && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/sudo b/lfs/sudo index bad193d7c..759e3c83a 100644 --- a/lfs/sudo +++ b/lfs/sudo @@ -24,7 +24,7 @@ include Config -VER = 1.9.13p2 +VER = 1.9.13p3 THISAPP = sudo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = a96198e865c644c79b0879e1a39c9dcc5f9db2164d22fe25804805065a78424dd6ed6f9e0995cad2d0809a1a21957c6a059c6bdbd2ebdf26cfdf5488004d9cb4 +$(DL_FILE)_BLAKE2 = 46218ecf4cf06d2280ccf4c257b12a6f697eda17b96a6b7aa56f6c7f22d847ec2a8036b9f615c3328d985656539c95f37a40c6c72dfa5f65786ab45a28cf353f install : $(TARGET) diff --git a/src/patches/ca-certificates-Remove-TrustCor-Systems-root-CAs.patch b/src/patches/ca-certificates-Remove-TrustCor-Systems-root-CAs.patch index 99498a41a..889d5e63a 100644 --- a/src/patches/ca-certificates-Remove-TrustCor-Systems-root-CAs.patch +++ b/src/patches/ca-certificates-Remove-TrustCor-Systems-root-CAs.patch @@ -1,9 +1,10 @@ ---- certdata.txt 2022-12-01 10:23:58.186454756 +0100 -+++ certdata.txt 2022-12-01 10:25:19.587297113 +0100 -@@ -15292,517 +15292,6 @@ +--- certdata.txt ++++ certdata.txt +@@ -14609,536 +14609,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # + +-# -# Certificate "TrustCor RootCert CA-1" -# -# Issuer: CN=TrustCor RootCert CA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA @@ -120,8 +121,14 @@ -\132\171\054\031 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE --CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE --CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE +-# For Server Distrust After: Wed Nov 30 00:00:00 2022 +-CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL +-\062\062\061\061\063\060\060\060\060\060\060\060\132 +-END +-# For Email Distrust After: Wed Nov 30 00:00:00 2022 +-CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL +-\062\062\061\061\063\060\060\060\060\060\060\060\132 +-END - -# Trust for "TrustCor RootCert CA-1" -# Issuer: CN=TrustCor RootCert CA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA @@ -313,8 +320,15 @@ -\326\354\011 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE --CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE --CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE +-# For Server Distrust After: Wed Nov 30 00:00:00 2022 +-CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL +-\062\062\061\061\063\060\060\060\060\060\060\060\132 +-END +-# For Email Distrust After: Wed Nov 30 00:00:00 2022 +-CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL +-\062\062\061\061\063\060\060\060\060\060\060\060\132 +-END +- - -# Trust for "TrustCor RootCert CA-2" -# Issuer: CN=TrustCor RootCert CA-2,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA @@ -471,8 +485,14 @@ -\264\237\327\346 -END -CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE --CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE --CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE +-# For Server Distrust After: Wed Nov 30 00:00:00 2022 +-CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL +-\062\062\061\061\063\060\060\060\060\060\060\060\132 +-END +-# For Email Distrust After: Wed Nov 30 00:00:00 2022 +-CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL +-\062\062\061\061\063\060\060\060\060\060\060\060\132 +-END - -# Trust for "TrustCor ECA-1" -# Issuer: CN=TrustCor ECA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA @@ -514,7 +534,6 @@ -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - --# + # # Certificate "SSL.com Root Certification Authority RSA" # - # Issuer: CN=SSL.com Root Certification Authority RSA,O=SSL Corporation,L=Houston,ST=Texas,C=US hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. e22cda58e51721fd2d0248f05528d68734f1d6d1
by Michael Tremer 09 Mar '23

09 Mar '23

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 3.x development tree". The branch, master has been updated via e22cda58e51721fd2d0248f05528d68734f1d6d1 (commit) from 6e8f918394bee991c7d388ca1c5fd2ce16f5743d (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 e22cda58e51721fd2d0248f05528d68734f1d6d1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 9 11:15:15 2023 +0000 luajit: Ensure this package is being built with SSP Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: luajit/luajit.nm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) Difference in files: diff --git a/luajit/luajit.nm b/luajit/luajit.nm index ac94acd63..c963efe70 100644 --- a/luajit/luajit.nm +++ b/luajit/luajit.nm @@ -5,7 +5,7 @@ name = luajit version = 2.1.0 -release = 0.1-beta3-%{commit} +release = 0.2-beta3-%{commit} thisapp = luajit-2.0-%{commit} # LuaJIT no longer tags releases: @@ -27,8 +27,14 @@ source_dl = https://repo.or.cz/luajit-2.0.git/snapshot/ sources = %{commit}.tar.gz build + prepare_cmds + # Do not disable stack protection + sed -e "s/-fno-stack-protector//" -i src/Makefile + end + build - make amalg PREFIX="%{prefix}" BUILDMODE=dynamic TARGET_STRIP=" @:" + make amalg PREFIX="%{prefix}" BUILDMODE=dynamic Q= TARGET_STRIP=" @:" \ + CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" %{PARALLELISMFLAGS} end install hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 6e8f918394bee991c7d388ca1c5fd2ce16f5743d
by Michael Tremer 09 Mar '23

09 Mar '23

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 3.x development tree". The branch, master has been updated via 6e8f918394bee991c7d388ca1c5fd2ce16f5743d (commit) via d41dc4958c55c7ddfd7a95fff9ebe1079aa5cfc5 (commit) via 1ff51fee8bc53b2e385aace1841e57697eadad30 (commit) via 75faffedac9e36acd910d96ed790c178ed77710d (commit) from 424b6970b4e4951e2202a7b5e9609c091e65cacb (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 6e8f918394bee991c7d388ca1c5fd2ce16f5743d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 9 10:02:02 2023 +0000 Drop all compat-* packages We have been building a fresh bootstrap where all packages have been rebuilt and linked against the current version of those libraries. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d41dc4958c55c7ddfd7a95fff9ebe1079aa5cfc5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 9 10:00:33 2023 +0000 ldapvi: Source cannot be downloaded using HTTPS The server seems to present an invalid certificate. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1ff51fee8bc53b2e385aace1841e57697eadad30 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 8 13:55:07 2023 +0000 lldpd: Disable seccomp support on aarch64 lldpd does not support seccomp on aarch64 and aborts with an corresponding error during compile time when enabled. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 75faffedac9e36acd910d96ed790c178ed77710d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 8 13:54:31 2023 +0000 openssl: Update to 3.0.8 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: compat-cyrus-sasl/compat-cyrus-sasl.nm | 74 ------- .../patches/cyrus-sasl-2.1.23-db5.patch | 22 --- compat-db/compat-db.nm | 219 --------------------- compat-gdbm/compat-gdbm.nm | 63 ------ compat-gmp/compat-gmp.nm | 77 -------- compat-gmp/patches/gmp-fix-tscan.patch0 | 13 -- compat-gnutls/compat-gnutls.nm | 80 -------- compat-gnutls/patches/gnutls-3.1.11-nosrp.patch | 12 -- compat-gnutls/patches/gnutls-3.2.7-rpath.patch | 12 -- compat-icu/compat-icu.nm | 73 ------- compat-isl/compat-isl.nm | 59 ------ compat-libffi/compat-libffi.nm | 48 ----- compat-libgcrypt/compat-libgcrypt.nm | 62 ------ compat-libmpc/compat-libmpc.nm | 68 ------- compat-libpng/compat-libpng.nm | 61 ------ compat-libxcrypt/compat-libxcrypt.nm | 52 ----- .../patches/libxcrypt-4.4.33-hashes.patch | 14 -- compat-mpfr/compat-mpfr.nm | 49 ----- compat-ncurses/compat-ncurses.nm | 123 ------------ .../0001-Fix-errors-in-type-conversion.patch | 153 -------------- compat-nettle/compat-nettle.nm | 64 ------ compat-openssl/compat-openssl.nm | 125 ------------ compat-pcre/compat-pcre.nm | 75 ------- compat-readline/compat-readline.nm | 66 ------- .../patches/readline-5.0-no_rpath.patch | 13 -- compat-xz/compat-xz.nm | 62 ------ ldapvi/ldapvi.nm | 2 +- lldpd/lldpd.nm | 12 +- openssl/openssl.nm | 4 +- 29 files changed, 12 insertions(+), 1745 deletions(-) delete mode 100644 compat-cyrus-sasl/compat-cyrus-sasl.nm delete mode 100644 compat-cyrus-sasl/patches/cyrus-sasl-2.1.23-db5.patch delete mode 100644 compat-db/compat-db.nm delete mode 100644 compat-gdbm/compat-gdbm.nm delete mode 100644 compat-gmp/compat-gmp.nm delete mode 100644 compat-gmp/patches/gmp-fix-tscan.patch0 delete mode 100644 compat-gnutls/compat-gnutls.nm delete mode 100644 compat-gnutls/patches/gnutls-3.1.11-nosrp.patch delete mode 100644 compat-gnutls/patches/gnutls-3.2.7-rpath.patch delete mode 100644 compat-icu/compat-icu.nm delete mode 100644 compat-isl/compat-isl.nm delete mode 100644 compat-libffi/compat-libffi.nm delete mode 100644 compat-libgcrypt/compat-libgcrypt.nm delete mode 100644 compat-libmpc/compat-libmpc.nm delete mode 100644 compat-libpng/compat-libpng.nm delete mode 100644 compat-libxcrypt/compat-libxcrypt.nm delete mode 100644 compat-libxcrypt/patches/libxcrypt-4.4.33-hashes.patch delete mode 100644 compat-mpfr/compat-mpfr.nm delete mode 100644 compat-ncurses/compat-ncurses.nm delete mode 100644 compat-ncurses/patches/0001-Fix-errors-in-type-conversion.patch delete mode 100644 compat-nettle/compat-nettle.nm delete mode 100644 compat-openssl/compat-openssl.nm delete mode 100644 compat-pcre/compat-pcre.nm delete mode 100644 compat-readline/compat-readline.nm delete mode 100644 compat-readline/patches/readline-5.0-no_rpath.patch delete mode 100644 compat-xz/compat-xz.nm Difference in files: diff --git a/compat-cyrus-sasl/compat-cyrus-sasl.nm b/compat-cyrus-sasl/compat-cyrus-sasl.nm deleted file mode 100644 index 38dd9d427..000000000 --- a/compat-cyrus-sasl/compat-cyrus-sasl.nm +++ /dev/null @@ -1,74 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-cyrus-sasl -version = 2.1.25 -release = 2.1 - -thisapp = cyrus-sasl-%{version} - -groups = System/Libraries -url = http://asg.web.cmu.edu/sasl/sasl-library.html -license = BSD -summary = The Cyrus SASL library. - -description - The cyrus-sasl package contains the Cyrus implementation of SASL. - SASL is the Simple Authentication and Security Layer, a method for - adding authentication support to connection-based protocols. -end - -source_dl = ftp://ftp.cyrusimap.org/cyrus-sasl/ - -build - requires - automake - libdb-devel - openssl-devel - pam-devel - end - - prepare_cmds - # for aarch64 - for i in $(find . -name config.guess -or -name config.sub); do - cp -vf %{datadir}/automake-*/config.{guess,sub} $(dirname ${i}) - done - end - - configure_options += \ - --sysconfdir=/etc \ - --with-configdir=%{libdir}/sasl2:/etc/sasl2 \ - --with-plugindir=%{libdir}/sasl2 \ - --with-dbpath=/var/lib/sasl/sasldb2 \ - --with-saslauthd=/var/run/saslauthd \ - --mandir=/usr/share/man - - PARALLELISMFLAGS = # Disabled - - install - # Only install libraries. - mkdir -pv %{BUILDROOT}%{libdir} - install -m 755 lib/.libs/libsasl2.so.2.0.25 %{BUILDROOT}%{libdir} - ln -svf libsasl2.so.2.0.25 %{BUILDROOT}%{libdir}/libpcre.so.2 - end -end - -packages - package %{name} - provides - cyrus-sasl = %{thisver} - cyrus-sasl-libs = %{thisver} - end - - conflicts - cyrus-sasl <= %{thisver} - cyrus-sasl-libs <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-cyrus-sasl/patches/cyrus-sasl-2.1.23-db5.patch b/compat-cyrus-sasl/patches/cyrus-sasl-2.1.23-db5.patch deleted file mode 100644 index ff831cd99..000000000 --- a/compat-cyrus-sasl/patches/cyrus-sasl-2.1.23-db5.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/sasldb/db_berkeley.c -+++ b/sasldb/db_berkeley.c -@@ -100,7 +100,7 @@ static int berkeleydb_open(const sasl_ut - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); ---- a/utils/dbconverter-2.c -+++ b/utils/dbconverter-2.c -@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/compat-db/compat-db.nm b/compat-db/compat-db.nm deleted file mode 100644 index 37d319d8e..000000000 --- a/compat-db/compat-db.nm +++ /dev/null @@ -1,219 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-db -version = %{main_version} -# Release cannot be reset because the sub-packages won't get updated -release = 9 -thisapp = db-%{version} - -maintainer = Michael Tremer <michael.tremer(a)ipfire.org> -groups = System/Libraries -url = http://www.oracle.com/technology/products/berkeley-db/ -license = Proprietary -summary = The Berkeley DB database compatibility library. - -description - Berkeley DB (BDB) is a computer software library that provides - a high-performance embedded database. - - This package contains various version that were used in the - past. Some software may depend on them though. -end - -version_db46 = 4.6.21 -version_db47 = 4.7.25 -version_db48 = 4.8.30 -version_db52 = 5.2.36 -version_db53 = 5.3.28 -versions = %{version_db53} %{version_db52} %{version_db48} %{version_db47} %{version_db46} -main_version = %{version_db53} - -source_dl = http://download.oracle.com/berkeley-db/ -sources = db-%{version_db53}.tar.gz -sources += db-%{version_db52}.tar.gz -sources += db-%{version_db48}.tar.gz -sources += db-%{version_db47}.tar.gz -sources += db-%{version_db46}.tar.gz - -build - requires - gcc-c++ - end - - CFLAGS += -fno-strict-aliasing - CFLAGS += -Wno-format - - configure_options += \ - --enable-compat185 \ - --enable-cxx \ - --disable-static - - build - for version in %{versions}; do - cd %{DIR_SRC}/db-${version}/build_unix - ../dist/configure \ - %{configure_options} - - %{MACRO_FIX_LIBTOOL} - - make %{PARALLELISMFLAGS} - done - end - - install - for version in %{versions}; do - cd %{DIR_SRC}/db-${version}/build_unix - make install DESTDIR=%{BUILDROOT} \ - docdir=%{datadir}/doc/db-${version} - - # Remove unversioned libs. - rm -vf %{BUILDROOT}%{libdir}/libdb*-{5,4}.so - - # Move binaries. - tag=$(echo ${version} | cut -c1,3) - for bin in %{BUILDROOT}%{bindir}/*db_*; do - t=$(echo ${bin} | sed "s/db_/db${tag}_/g") - mv -v ${bin} ${t} - done - - # Move libs. - major=$(echo ${version} | cut -c1-3) - mkdir -pv %{BUILDROOT}%{libdir}/db${version} - pushd %{BUILDROOT}%{libdir}/db${version} - ln -svf ../libdb-${major}.so libdb.so - ln -svf ../libdb_cxx-${major}.so libdb_cxx.so - popd - rm -vf %{BUILDROOT}%{libdir}/libdb{,_cxx}.so - - # Move headers. - mkdir -pv %{BUILDROOT}%{includedir}/db-${version} - mv -v %{BUILDROOT}%{includedir}/*.h \ - %{BUILDROOT}%{includedir}/db-${version}/ - ln -svf --relative \ - %{BUILDROOT}%{includedir}/db-${version} \ - %{BUILDROOT}%{includedir}/db-${major} - - # Remove documentation. - rm -rf %{BUILDROOT}%{datadir}/doc - done - - # Link latest headers into /usr/include - for file in %{BUILDROOT}%{includedir}/db-%{main_version}/*.h; do - ln -svf --relative ${file} %{BUILDROOT}%{includedir}/ - done - end -end - -packages - package %{name} - requires - compat-db53 = %{version_db53}-%{_release} - compat-db52 = %{version_db52}-%{_release} - compat-db48 = %{version_db48}-%{_release} - compat-db47 = %{version_db47}-%{_release} - compat-db46 = %{version_db46}-%{_release} - end - end - - template COMPATDB - version = %{version_db%{version_tag}} - - summary = The Berkeley DB database %{version} compatibility library. - description - The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides - embedded database support for both traditional and client/server applications. - - This package contains Berkeley DB library version %{version} used for compatibility. - end - - files - %{bindir}/berkeley_db%{version_tag}_* - %{bindir}/db%{version_tag}_* - %{libdir}/db%{version} - %{libdir}/libdb*-%{version_major}.so - end - - obsoletes - db4 < 1:%{version_major} - db4-devel < 1:%{version_major} - db4-cxx < 1:%{version_major} - db4-utils < 1:%{version_major} - - libdb <= %{version_major} - end - - conflicts - libdb = %{version_major} - end - end - - package %{name}53 - template COMPATDB - - version_tag = 53 - version_major = 5.3 - end - - package %{name}52 - template COMPATDB - - version_tag = 52 - version_major = 5.2 - end - - package %{name}48 - template COMPATDB - - version_tag = 48 - version_major = 4.8 - end - - package %{name}47 - template COMPATDB - - version_tag = 47 - version_major = 4.7 - end - - package %{name}46 - template COMPATDB - - version_tag = 46 - version_major = 4.6 - end - - package %{name}-headers - summary = The Berkeley DB database compatibility headers. - description - The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides - embedded database support for both traditional and client/server applications. - - This package contains Berkeley DB library headers used for compatibility. - end - - files = %{includedir} - - requires - compat-db = %{main_version}-%{_release} - end - - provides - libdb-devel = %{version_db53} - libdb-devel = %{version_db52} - db4-devel = %{version_db48} - db4-devel = %{version_db47} - db4-devel = %{version_db46} - end - - conflicts - libdb-devel - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-gdbm/compat-gdbm.nm b/compat-gdbm/compat-gdbm.nm deleted file mode 100644 index c86db05db..000000000 --- a/compat-gdbm/compat-gdbm.nm +++ /dev/null @@ -1,63 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-gdbm -version = 1.12 -release = 1 -thisapp = gdbm-%{version} - -groups = Development/Tools -url = http://www.gnu.org/software/gdbm/ -license = GPLv2+ -summary = The GDBM package contains the GNU Database Manager. - -description - The GDBM package contains the GNU Database Manager. This is a disk file \ - format database which stores key/data-pairs in single files. The actual \ - data of any record being stored is indexed by a unique key, which can be \ - retrieved in less time than if it was stored in a text file. -end - -source_dl = https://ftp.gnu.org/gnu/gdbm/ - -build - CFLAGS += -fcommon - - install - make install \ - prefix=%{BUILDROOT}%{prefix} \ - libdir=%{BUILDROOT}%{libdir} \ - includedir=%{BUILDROOT}%{includedir} \ - mandir=%{BUILDROOT}%{mandir} \ - infodir=%{BUILDROOT}%{infodir} - - # Remove all man pages provided by gdbm-devel - rm -rfv %{BUILDROOT}%{mandir}/man3 - end -end - -packages - package %{name} - conflicts - gdbm <= %{version} - end - end - - package %{name}-devel - template DEVEL - - requires - compat-gdbm = %{thisver} - end - - conflicts - gdbm-devel - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-gmp/compat-gmp.nm b/compat-gmp/compat-gmp.nm deleted file mode 100644 index 60168433a..000000000 --- a/compat-gmp/compat-gmp.nm +++ /dev/null @@ -1,77 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-gmp -version = 4.3.2 -release = 1.1 -thisapp = gmp-%{version} - -groups = System/Libraries -url = http://gmplib.org/ -license = LGPLv3+ -summary = A GNU arbitrary precision library. - -description - The gmp package contains GNU MP, a library for arbitrary precision - arithmetic, signed integers operations, rational numbers and floating - point numbers. GNU MP is designed for speed, for both small and very - large operands. GNU MP is fast because it uses fullwords as the basic - arithmetic type, it uses fast algorithms, it carefully optimizes - assembly code for many CPUs' most common inner loops, and it generally - emphasizes speed over simplicity/elegance in its operations. -end - -source_dl += https://gmplib.org/download/gmp/archive/ ftp://ftp.gnu.org/gnu/gmp/ -sources = %{thisapp}.tar.xz - -build - requires - gcc-c++ - m4 - end - - export ABI = standard - - if "%{DISTRO_ARCH}" == "x86_64" - ABI = 64 - end - - if "%{DISTRO_ARCH}" == "i686" - ABI = 32 - end - - configure_options += \ - --enable-cxx \ - --enable-mpbsd \ - --disable-static - - test - export LD_LIBRARY_PATH=$(pwd)/.libs - make check - end - - install - # Install just the library and no headers. - mkdir -pv %{BUILDROOT}%{libdir} - install -m 644 .libs/libgmp.so.3.5.2 %{BUILDROOT}%{libdir} - ln -svf libgmp.so.3.5.2 %{BUILDROOT}%{libdir}/libgmp.so.3 - end -end - -packages - package %{name} - provides - gmp = %{thisver} - end - - obsoletes - gmp <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-gmp/patches/gmp-fix-tscan.patch0 b/compat-gmp/patches/gmp-fix-tscan.patch0 deleted file mode 100644 index cddbfe079..000000000 --- a/compat-gmp/patches/gmp-fix-tscan.patch0 +++ /dev/null @@ -1,13 +0,0 @@ -https://gmplib.org/list-archives/gmp-bugs/2011-October/002417.html - ---- tests/mpz/t-scan.c 2011-05-08 11:49:29.000000000 +0200 -+++ tests/mpz/t-scan.c 2011-10-10 16:37:13.657829003 +0200 -@@ -79,7 +79,7 @@ - - for (isize = 0; isize <= size; isize++) - { -- for (oindex = 0; oindex <= numberof (offset); oindex++) -+ for (oindex = 0; oindex < numberof (offset); oindex++) - { - o = offset[oindex]; - if ((int) isize*GMP_NUMB_BITS < -o) diff --git a/compat-gnutls/compat-gnutls.nm b/compat-gnutls/compat-gnutls.nm deleted file mode 100644 index 3ae618164..000000000 --- a/compat-gnutls/compat-gnutls.nm +++ /dev/null @@ -1,80 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-gnutls -version = %{ver_maj}.%{ver_min} -ver_maj = 3.3 -ver_min = 25 -release = 3.1 -thisapp = gnutls-%{version} - -groups = System/Libraries -url = http://www.gnu.org/software/gnutls/ -license = LGPLv2.1+ -summary = A general-purpose cryptography library. - -description - GnuTLS is a project that aims to develop a library which provides - a secure layer, over a reliable transport layer. Currently the - GnuTLS library implements the proposed standards by the IETF's - TLS working group. -end - -source_dl = https://www.gnupg.org/ftp/gcrypt/gnutls/v%{ver_maj}/ -sources = %{thisapp}.tar.xz - -build - requires - gettext - libgcrypt-devel - libidn-devel - libtasn1-devel >= 3.2 - lzo-devel - nettle-devel >= 3.2 - perl - p11-kit-devel >= 0.23.1 - readline-devel - texinfo - zlib-devel - end - - # Build library without an executable stack. - CFLAGS += -Wa,--noexecstack - - configure_options += \ - --with-included-libcfg \ - --disable-openssl-compatibility \ - --disable-srp-authentication \ - --disable-non-suiteb-curves \ - --disable-guile - - # Test suite does not work when srp is disabled. - test - export LD_LIBRARY_PATH=$(pwd)/lib/.libs - make check - end - - install - # Install just the library and no headers. - mkdir -pv %{BUILDROOT}%{libdir} - cp -avf lib/.libs/libgnutls.so.* %{BUILDROOT}%{libdir} - end -end - -packages - package %{name} - provides - gnutls = %{thisver} - end - - obsoletes - gnutls <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-gnutls/patches/gnutls-3.1.11-nosrp.patch b/compat-gnutls/patches/gnutls-3.1.11-nosrp.patch deleted file mode 100644 index 29227c08c..000000000 --- a/compat-gnutls/patches/gnutls-3.1.11-nosrp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gnutls-3.1.10/tests/srp/mini-srp.c.noecc gnutls-3.1.10/tests/srp/mini-srp.c ---- gnutls-3.1.10/tests/srp/mini-srp.c.noecc 2013-03-21 21:42:28.000000000 +0100 -+++ gnutls-3.1.10/tests/srp/mini-srp.c 2013-03-25 13:42:20.753422209 +0100 -@@ -27,7 +27,7 @@ - #include <stdio.h> - #include <stdlib.h> - --#if defined(_WIN32) -+#if defined(_WIN32) || !defined(ENABLE_SRP) - - int main() - { diff --git a/compat-gnutls/patches/gnutls-3.2.7-rpath.patch b/compat-gnutls/patches/gnutls-3.2.7-rpath.patch deleted file mode 100644 index 4e6aed37a..000000000 --- a/compat-gnutls/patches/gnutls-3.2.7-rpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur gnutls-3.2.7.orig/configure gnutls-3.2.7/configure ---- gnutls-3.2.7.orig/configure 2013-11-23 11:09:49.000000000 +0100 -+++ gnutls-3.2.7/configure 2013-11-25 16:53:05.559440656 +0100 -@@ -39652,7 +39652,7 @@ - shlibpath_overrides_runpath=unknown - version_type=none - dynamic_linker="$host_os ld.so" --sys_lib_dlsearch_path_spec="/lib /usr/lib" -+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64" - need_lib_prefix=unknown - hardcode_into_libs=no - diff --git a/compat-icu/compat-icu.nm b/compat-icu/compat-icu.nm deleted file mode 100644 index 8ca0f6ac5..000000000 --- a/compat-icu/compat-icu.nm +++ /dev/null @@ -1,73 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-icu -version = %{ver_major}.%{ver_minor}.%{ver_plevel} -ver_major = 56 -ver_minor = 1 -ver_plevel = -release = 1 -thisapp = icu-%{version} - -groups = Development/Tools -url = http://www.icu-project.org -license = MIT and UCD and Public Domain -summary = International Components for Unicode. - -description - Tools and utilities for developing with icu. -end - -source_dl = https://github.com/unicode-org/icu/releases/download/release-%{ver_major}-%… -sources = icu4c-%{ver_major}_%{ver_minor}-src.tgz - -build - DIR_APP = %{DIR_SRC}/icu/source - - configure_options += \ - --disable-static \ - --with-data-packaging=library \ - --disable-samples - - prepare_cmds - sed -i 's|-nodefaultlibs -nostdlib||' config/mh-linux - end - - configure_cmds - # There is no source/doc/html/search/ directory - sed -i '/^\s\+\$(INSTALL_DATA) \$(docsrchfiles) \$(DESTDIR)\$(docdir)\/\$(docsubsrchdir)\s*$/d' Makefile - - # The configure --disable-renaming and possibly other options result in icu/source/uconfig.h.prepend - # being created, include that content in icu/source/common/unicode/uconfig.h to propagate to consumer packages. - test -f uconfig.h.prepend && sed -e '/^#define __UCONFIG_H__/ r uconfig.h.prepend' \ - -i common/unicode/uconfig.h - end - - test - make check - end - - install - # Install just the library and no headers. - mkdir -pv %{BUILDROOT}%{libdir} - cp -av lib/*.so.* %{BUILDROOT}%{libdir} - end -end - -packages - package %{name} - provides - icu = %{thisver} - end - - obsoletes - icu <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-isl/compat-isl.nm b/compat-isl/compat-isl.nm deleted file mode 100644 index 04ef22c48..000000000 --- a/compat-isl/compat-isl.nm +++ /dev/null @@ -1,59 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-isl -version = 0.16.1 -release = 1 -thisapp = isl-%{version} - -groups = System/Libraries -url = http://isl.gforge.inria.fr/ -license = MIT -summary = Integer Set Library - -description - isl is a library for manipulating sets and relations of integer points - bounded by linear constraints. Supported operations on sets include - intersection, union, set difference, emptiness check, convex hull, - (integer) affine hull, integer projection, computing the lexicographic - minimum using parametric integer programming, coalescing and parametric - vertex enumeration. -end - -source_dl += https://gcc.gnu.org/pub/gcc/infrastructure/ -sources = %{thisapp}.tar.bz2 - -build - requires - gmp-devel - end - - test - LD_LIBRARY_PATH=%{DIR_APP}/.libs make check - end - - install - # Install just the library and no headers. - mkdir -pv %{BUILDROOT}%{libdir} - install -m 644 .libs/libisl.so.15.1.1 %{BUILDROOT}%{libdir} - ln -svf libisl.so.15.1.1 %{BUILDROOT}%{libdir}/libisl.so.15 - end -end - -packages - package %{name} - provides - isl = %{thisver} - end - - obsoletes - isl <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-libffi/compat-libffi.nm b/compat-libffi/compat-libffi.nm deleted file mode 100644 index 891ee9d5c..000000000 --- a/compat-libffi/compat-libffi.nm +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-libffi -version = 3.2.1 -release = 1 -thisapp = libffi-%{version} - -groups = System/Libraries -url = https://sourceware.org/libffi -license = BSD -summary = A portable foreign function interface library - -description - This package is for compatability to old versions only, and provides no - Development libraries. - - The libffi library provides a portable, high level programming - interface to various calling conventions. This allows a programmer to - call any function specified by a call interface description at run time. -end - -source_dl = ftp://sourceware.org/pub/libffi/ - -build - install_cmds - # Remove all development files, because nothing - # should link against this. - rm -rvf %{BUILDROOT}%{libdir}/pkgconfig - rm -rvf %{BUILDROOT}%{libdir}/libffi-%{version} - rm -rvf %{BUILDROOT}%{libdir}/*.so - rm -rvf %{BUILDROOT}%{mandir} - end -end - -packages - package %{name} - obsoletes - libffi <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-libgcrypt/compat-libgcrypt.nm b/compat-libgcrypt/compat-libgcrypt.nm deleted file mode 100644 index 552399f0b..000000000 --- a/compat-libgcrypt/compat-libgcrypt.nm +++ /dev/null @@ -1,62 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-libgcrypt -version = 1.5.4 -release = 2 -thisapp = libgcrypt-%{version} - -groups = System/Libraries -url = http://www.gnupg.org/ -license = LGPLv2.1+ -summary = A general-purpose cryptography library - -description - Libgcrypt is a general purpose crypto library based on the code used - in GNU Privacy Guard. -end - -source_dl = ftp://ftp.gnupg.org/gcrypt/libgcrypt/ -sources = %{thisapp}.tar.bz2 - -build - requires - gcc-c++ - libgpg-error-devel - end - - export LD_LIBRARY_PATH = %{DIR_APP}/src/.libs - - configure_options += \ - --enable-noexecstack - - test - make check - end - - install - # Install just the library and no headers. - mkdir -pv %{BUILDROOT}%{libdir} - - install -m 755 src/.libs/libgcrypt.so.11.8.3 %{BUILDROOT}%{libdir} - ln -svf libgcrypt.so.11.8.3 %{BUILDROOT}%{libdir}/libgcrypt.so.11 - end -end - -packages - package %{name} - provides - libgcrypt = %{thisver} - end - - obsoletes - libgcrypt <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-libmpc/compat-libmpc.nm b/compat-libmpc/compat-libmpc.nm deleted file mode 100644 index f50e711b1..000000000 --- a/compat-libmpc/compat-libmpc.nm +++ /dev/null @@ -1,68 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-libmpc -version = 0.9 -release = 2 - -thisapp = mpc-%{version} - -groups = System/Libraries -url = http://www.multiprecision.org/ -license = LGPLv2.1+ -summary = Mpc is a C library for the arithmetic of complex numbers. - -description - Mpc is a C library for the arithmetic of complex numbers with - arbitrarily high precision and correct rounding of the result. - It is built upon and follows the same principles as Mpfr. -end - -source_dl = http://www.multiprecision.org/mpc/download/ - -build - requires - gmp-devel >= 4.3.2 - mpfr-devel >= 2.4.2 - end - - export LD_LIBRARY_PATH = %{DIR_APP}/src/.libs - export EGREP = egrep - - configure_options += \ - --disable-static \ - --enable-shared - - test - make check - end - - install - # Only install libraries. - mkdir -pv %{BUILDROOT}%{libdir} - install -m 644 src/.libs/libmpc.so.2.0.0 %{BUILDROOT}%{libdir} - ln -svf libmpc.so.2.0.0 %{BUILDROOT}%{libdir}/libmpc.so.2 - end -end - -packages - package %{name} - provides - mpc = %{thisver} - end - - obsoletes - mpc-compat - end - - conflicts - mpc <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-libpng/compat-libpng.nm b/compat-libpng/compat-libpng.nm deleted file mode 100644 index 44b424b97..000000000 --- a/compat-libpng/compat-libpng.nm +++ /dev/null @@ -1,61 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-libpng -version = 1.5.18 -release = 1 -thisapp = libpng-%{version} - -groups = System/Libraries -url = http://www.libpng.org/pub/png/ -license = zlib -summary = A library of functions for manipulating PNG image format files. - -description - The libpng package contains a library of functions for creating and - manipulating PNG (Portable Network Graphics) image format files. - PNG is a bit-mapped graphics format similar to the GIF format. PNG - was created to replace the GIF format, since GIF uses a patented - data compression algorithm. -end - -source_dl += http://downloads.sourceforge.net/project/libpng/libpng15/%{version}/ -source_dl += http://downloads.sourceforge.net/project/libpng/history/libpng15/%{version}/ - -sources = %{thisapp}.tar.xz - -build - requires - pkg-config - zlib-devel - end - - install - # Install just the library and no headers. - mkdir -pv %{BUILDROOT}%{libdir} - install -m 755 .libs/libpng15.so.15.18.0 %{BUILDROOT}%{libdir} - ln -svf libpng15.so.15.18.0 %{BUILDROOT}%{libdir}/libpng15.so.15 - end -end - -packages - package %{name} - provides - libpng = %{thisver} - end - - obsoletes - libpng-compat - end - - conflicts - libpng <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-libxcrypt/compat-libxcrypt.nm b/compat-libxcrypt/compat-libxcrypt.nm deleted file mode 100644 index de696a2d7..000000000 --- a/compat-libxcrypt/compat-libxcrypt.nm +++ /dev/null @@ -1,52 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-libxcrypt -version = 4.4.33 -release = 1 -thisapp = libxcrypt-%{version} - -groups = System/Libraries -url = https://github.com/besser82/libxcrypt/ -license = LGPLv2.1 -summary = Extended crypt library for descrypt, md5crypt, bcrypt, and others - -description - This package provides a version of libxcrypt which is compatible with - the old glibc interface. -end - -source_dl = https://github.com/besser82/libxcrypt/releases/download/v%{version}/ -sources = %{thisapp}.tar.xz - -build - requires - perl - end - - configure_options += \ - --disable-static \ - --enable-hashes=strong,glibc \ - --enable-obsolete-api=glibc \ - --disable-failure-tokens - - test - LD_LIBRARY_PATH="%{DIR_APP}/.libs" make check - end - - install - mkdir -pv %{BUILDROOT}%{libdir} - install -v -m 755 .libs/libcrypt.so.1.1.0 %{BUILDROOT}%{libdir}/libcrypt.so.1.1.0 - ln -svf libcrypt.so.1.1.0 %{BUILDROOT}%{libdir}/libcrypt.so.1 - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-libxcrypt/patches/libxcrypt-4.4.33-hashes.patch b/compat-libxcrypt/patches/libxcrypt-4.4.33-hashes.patch deleted file mode 100644 index 42f5d67a7..000000000 --- a/compat-libxcrypt/patches/libxcrypt-4.4.33-hashes.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/build-aux/scripts/expand-selected-hashes b/build-aux/scripts/expand-selected-hashes -index 10d0bcc..2558c42 100644 ---- a/build-aux/scripts/expand-selected-hashes -+++ b/build-aux/scripts/expand-selected-hashes -@@ -50,9 +50,6 @@ sub expand_selected { - push @errors, "'$w' is not a hash or group name\n"; - } - } -- if (scalar(%enabled) == 0) { -- push @errors, "no hashes are enabled\n"; -- } - die join q{}, @errors if @errors; - return keys %enabled; - } diff --git a/compat-mpfr/compat-mpfr.nm b/compat-mpfr/compat-mpfr.nm deleted file mode 100644 index f97c1d549..000000000 --- a/compat-mpfr/compat-mpfr.nm +++ /dev/null @@ -1,49 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-mpfr -version = 3.1.6 -release = 1 -thisapp = mpfr-%{version} - -groups = System/Libraries -url = http://www.mpfr.org/ -license = LGPLv2+ and GPLv2+ and GFDL -summary = A C library for multiple-precision floating-point computations. - -description - The MPFR library is a C library for multiple-precision floating-point - computations with correct rounding. The MPFR is efficient and - also has a well-defined semantics. It copies the good ideas from the - ANSI/IEEE-754 standard for double-precision floating-point arithmetic - (53-bit mantissa). MPFR is based on the GMP multiple-precision - library. -end - -source_dl = https://ftp.gnu.org/gnu/mpfr/ - -build - requires - gmp-devel - end - - test - make check LD_LIBRARY_PATH="%{DIR_APP}/src/.libs" - end - - install - mkdir -pv %{BUILDROOT}%{libdir} - install -v -m 755 src/.libs/libmpfr.so.4.1.6 %{BUILDROOT}%{libdir}/libmpfr.so.4.1.6 - ln -svf libmpfr.so.4.1.6 %{BUILDROOT}%{libdir}/libmpfr.so.4 - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-ncurses/compat-ncurses.nm b/compat-ncurses/compat-ncurses.nm deleted file mode 100644 index 6e36d848a..000000000 --- a/compat-ncurses/compat-ncurses.nm +++ /dev/null @@ -1,123 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-ncurses -version = 5.9 -release = 13 -thisapp = ncurses-%{version} - -groups = System/Base -url = http://invisible-island.net/ncurses/ncurses.html -license = MIT -summary = Ncurses support utilities. - -description - The curses library routines are a terminal-independent method of - updating character screens with reasonable optimization. The ncurses - (new curses) library is a freely distributable replacement for the - discontinued 4.4 BSD classic curses library. -end - -source_dl = https://ftp.gnu.org/gnu/ncurses/ - -build - requires - gcc-c++ - end - - export CPPFLAGS += -P - CXXFLAGS += -std=c++98 - - configure_options += \ - --with-shared \ - --without-debug \ - --without-ada \ - --with-ospeed=unsigned \ - --with-chtype=long \ - --enable-hard-tabs \ - --enable-xmc-glitch \ - --enable-colorfgbg \ - --with-terminfo-dirs=%{sysconfdir}/terminfo:%{datadir}/terminfo \ - --enable-overwrite \ - --enable-pc-files \ - --with-termlib=tinfo - - export PKG_CONFIG_LIBDIR=%{libdir}/pkgconfig - - build - mkdir -pv narrowc widec - - # Build narrowc version. - cd narrowc - ln -svf ../configure . - ./configure %{configure_options} --with-ticlib - make %{PARALLELISMFLAGS} libs - make %{PARALLELISMFLAGS} -C progs - - # Build widec version. - cd ../widec - ln -svf ../configure . - ./configure %{configure_options} --enable-widec --without-progs - make %{PARALLELISMFLAGS} libs - cd .. - end - - install - make -C narrowc DESTDIR=%{BUILDROOT} install.libs - rm -rvf %{BUILDROOT}%{libdir}/libtinfo.* - make -C widec DESTDIR=%{BUILDROOT} install.libs - - chmod -v 755 %{BUILDROOT}%{libdir}/lib*.so.*.* - - # don't require -ltinfo when linking with --no-add-needed - for l in %{BUILDROOT}%{libdir}/libncurses{,w}.so; do - soname=$(basename $(readlink $l)) - rm -f $l - echo "INPUT($soname -ltinfo)" > $l - done - - rm -f %{BUILDROOT}%{libdir}/libcurses{,w}.so - echo "INPUT(-lncurses)" > %{BUILDROOT}%{libdir}/libcurses.so - echo "INPUT(-lncursesw)" > %{BUILDROOT}%{libdir}/libcursesw.so - echo "INPUT(-ltinfo)" > %{BUILDROOT}%{libdir}/libtermcap.so - - rm -vf %{BUILDROOT}%{libdir}/terminfo - rm -vf %{BUILDROOT}%{libdir}/pkgconfig/{*_g,ncurses++*}.pc - end -end - -packages - package %{name} - template LIBS - - provides - ncurses-libs = %{thisver} - end - - obsoletes - ncurses-libs <= %{thisver} - end - end - - package compat-ncurses-devel - template DEVEL - - requires - compat-ncurses = %{thisver} - end - - provides - ncurses-devel = %{thisver} - end - - obsoletes - ncurses-devel <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-ncurses/patches/0001-Fix-errors-in-type-conversion.patch b/compat-ncurses/patches/0001-Fix-errors-in-type-conversion.patch deleted file mode 100644 index 18ecf3051..000000000 --- a/compat-ncurses/patches/0001-Fix-errors-in-type-conversion.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 6e12cb73e23e8e9488c6db1c4710bb4b3d2b48c3 Mon Sep 17 00:00:00 2001 -From: Adam Jiang <jiang.adam(a)gmail.com> -Date: Fri, 1 Aug 2014 19:58:40 +0900 -Subject: [PATCH 1/2] Fix errors in type conversion - -Basically, converting to 'void*' is not a good idea. However, if that -conversion is unavoidable, it should be done in a proper way. 'const_cast' -itself could not convert type 'T*' to 'void *', this patch adds -'reintepret_cast' to do it correctly. - -At the same time, function that returns on 'const' member like 'void*' should -not be declared as 'const'. ---- - c++/cursesf.h | 12 +++++++----- - c++/cursesm.h | 10 +++++----- - c++/cursesp.h | 9 +++++---- - 3 files changed, 17 insertions(+), 14 deletions(-) - -diff --git a/c++/cursesf.h b/c++/cursesf.h -index 70a30c3..23b3022 100644 ---- a/c++/cursesf.h -+++ b/c++/cursesf.h -@@ -673,7 +673,8 @@ protected: - const T* p_UserData = STATIC_CAST(T*)(0)) - : NCursesForm(nlines,ncols,begin_y,begin_x) { - if (form) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*> -+ (p_UserData))); - } - - public: -@@ -683,7 +684,7 @@ public: - bool autoDelete_Fields=FALSE) - : NCursesForm (Fields, with_frame, autoDelete_Fields) { - if (form) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); - }; - - NCursesUserForm (NCursesFormField Fields[], -@@ -697,19 +698,20 @@ public: - : NCursesForm (Fields, nlines, ncols, begin_y, begin_x, - with_frame, autoDelete_Fields) { - if (form) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*> -+ (p_UserData))); - }; - - virtual ~NCursesUserForm() { - }; - -- inline T* UserData (void) const { -+ inline T* UserData (void) { - return reinterpret_cast<T*>(get_user ()); - }; - - inline virtual void setUserData (const T* p_UserData) { - if (form) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); - } - - }; -diff --git a/c++/cursesm.h b/c++/cursesm.h -index d9c2273..545ed49 100644 ---- a/c++/cursesm.h -+++ b/c++/cursesm.h -@@ -631,7 +631,7 @@ protected: - const T* p_UserData = STATIC_CAST(T*)(0)) - : NCursesMenu(nlines,ncols,begin_y,begin_x) { - if (menu) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); - } - - public: -@@ -641,7 +641,7 @@ public: - bool autoDelete_Items=FALSE) - : NCursesMenu (Items, with_frame, autoDelete_Items) { - if (menu) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); - }; - - NCursesUserMenu (NCursesMenuItem Items[], -@@ -653,19 +653,19 @@ public: - bool with_frame=FALSE) - : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) { - if (menu) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); - }; - - virtual ~NCursesUserMenu() { - }; - -- inline T* UserData (void) const { -+ inline T* UserData (void) { - return reinterpret_cast<T*>(get_user ()); - }; - - inline virtual void setUserData (const T* p_UserData) { - if (menu) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); - } - }; - -diff --git a/c++/cursesp.h b/c++/cursesp.h -index 9b63d6d..661e4a9 100644 ---- a/c++/cursesp.h -+++ b/c++/cursesp.h -@@ -236,7 +236,8 @@ public: - : NCursesPanel (nlines, ncols, begin_y, begin_x) - { - if (p) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*> -+ (p_UserData))); - }; - // This creates an user panel of the requested size with associated - // user data pointed to by p_UserData. -@@ -244,14 +245,14 @@ public: - NCursesUserPanel(const T* p_UserData = STATIC_CAST(T*)(0)) : NCursesPanel() - { - if (p) -- set_user(const_cast<void *>(p_UserData)); -+ set_user(const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); - }; - // This creates an user panel associated with the ::stdscr and user data - // pointed to by p_UserData. - - virtual ~NCursesUserPanel() {}; - -- T* UserData (void) const -+ T* UserData (void) - { - return reinterpret_cast<T*>(get_user ()); - }; -@@ -260,7 +261,7 @@ public: - virtual void setUserData (const T* p_UserData) - { - if (p) -- set_user (const_cast<void *>(p_UserData)); -+ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); - } - // Associate the user panel with the user data pointed to by p_UserData. - }; --- -1.8.5.2 (Apple Git-48) - diff --git a/compat-nettle/compat-nettle.nm b/compat-nettle/compat-nettle.nm deleted file mode 100644 index 5e17e3df3..000000000 --- a/compat-nettle/compat-nettle.nm +++ /dev/null @@ -1,64 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-nettle -version = 2.7.1 -release = 1 -thisapp = nettle-%{version} - -groups = System/Libraries -url = http://www.lysator.liu.se/~nisse/nettle/ -license = LGPL -summary = A low-level cryptographic library. - -description - Nettle is a cryptographic library that is designed to fit easily in - more or less any context: In crypto toolkits for object-oriented - languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, - or even in kernel space. -end - -source_dl = http://www.lysator.liu.se/~nisse/archive/ - -build - requires - gmp-devel - m4 - end - - configure_options += \ - --enable-shared - - test - make check - end - - install - # Install just the library and no headers. - mkdir -pv %{BUILDROOT}%{libdir} - - install -m 755 libhogweed.so %{BUILDROOT}%{libdir}/libhogweed.so.2.5 - ln -svf libhogweed.so.2.5 %{BUILDROOT}%{libdir}/libhogweed.so.2 - - install -m 755 libnettle.so %{BUILDROOT}%{libdir}/libnettle.so.4.7 - ln -svf libnettle.so.4.7 %{BUILDROOT}%{libdir}/libnettle.so.4 - end -end - -packages - package %{name} - provides - nettle = %{thisver} - end - - obsoletes - nettle <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-openssl/compat-openssl.nm b/compat-openssl/compat-openssl.nm deleted file mode 100644 index ae35bc356..000000000 --- a/compat-openssl/compat-openssl.nm +++ /dev/null @@ -1,125 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-openssl -version = 1.1.1s -release = 2.1 -thisapp = openssl-%{version} - -maintainer = Michael Tremer <michael.tremer(a)ipfire.org> -groups = System/Libraries -url = https://www.openssl.org/ -license = OpenSSL -summary = A general purpose cryptography library with TLS implementation. - -description - The OpenSSL toolkit provides support for secure communications between - machines. OpenSSL includes a certificate management tool and shared - libraries which provide various cryptographic algorithms and protocols. -end - -source_dl = https://openssl.org/source/ - -build - requires - bc - gnutls-devel - perl - perl(FindBin) - perl(File::Copy) - perl(File::Compare) - perl(Test::Harness) - util-linux - zlib-devel - end - - CFLAGS += -DPURIFY - export RPM_OPT_FLAGS = %{CFLAGS} %{LDFLAGS} - - prepare_cmds - sed -e 's/SHLIB_VERSION_NUMBER "1.0.0"/SHLIB_VERSION_NUMBER "%{version}"/' \ - -i include/openssl/opensslv.h - - find crypto/ -name Makefile -exec \ - sed 's/^ASFLAGS=/&-Wa,--noexecstack /' -i {} \; - end - - # Set default ssl_arch. - ssl_arch = linux-%{DISTRO_ARCH} - - build - ./Configure \ - --prefix=/usr \ - --libdir=%{libdir} \ - --openssldir=/etc/pki/tls \ - shared \ - zlib-dynamic \ - enable-camellia \ - enable-md2 \ - enable-seed \ - enable-rfc3779 \ - no-idea \ - no-mdc2 \ - no-rc5 \ - no-ec2m \ - no-srp \ - -DSSL_FORBID_ENULL \ - %{ssl_arch} - - # Build. - make depend - make all - end - - #test - # - # #make test - #end - - install - make install DESTDIR=%{BUILDROOT} - - # Remove man pages and configuration files - rm -rfv %{BUILDROOT}%{sysconfdir} %{BUILDROOT}/usr/share/man* - - # Remove engines - rm -rfv %{BUILDROOT}%{libdir}/{engines,openssl} - - # Remove binaries - rm -rfv %{BUILDROOT}%{bindir} - end -end - -packages - package %{name} - requires - ca-certificates - end - - provides - openssl-libs = %{thisver} - end - - obsoletes - openssl-libs <= %{thisver} - end - end - - package %{name}-devel - template DEVEL - - provides - openssl-devel = %{thisver} - end - - obsoletes - openssl-devel <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-pcre/compat-pcre.nm b/compat-pcre/compat-pcre.nm deleted file mode 100644 index 259d63f07..000000000 --- a/compat-pcre/compat-pcre.nm +++ /dev/null @@ -1,75 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-pcre -version = 8.21 -release = 2 - -thisapp = pcre-%{version} - -groups = System/Libraries -url = http://www.pcre.org/ -license = BSD -summary = Perl-compatible regular expression library. - -description - Perl-compatible regular expression library. PCRE has its own native - API, but a set of "wrapper" functions that are based on the POSIX - API are also supplied in the library libpcreposix. -end - -source_dl = http://sourceforge.net/projects/pcre/files/pcre/%{version}/ - -build - requires - bzip2-devel - gcc-c++ - readline-devel - zlib-devel - end - - configure_options += \ - --disable-static \ - --docdir=/usr/share/doc/pcre-%{version} \ - --disable-jit \ - --enable-pcre8 \ - --enable-pcre16 \ - --enable-pcre32 \ - --enable-utf \ - --enable-unicode-properties \ - --enable-pcretest-libreadline - - test - export LD_LIBRARY_PATH=$(pwd)/.libs - make check - end - - install - # Only install libraries. - mkdir -pv %{BUILDROOT}%{libdir} - install -m 755 .libs/libpcre.so.0.0.1 %{BUILDROOT}%{libdir} - ln -svf libpcre.so.0.0.1 %{BUILDROOT}%{libdir}/libpcre.so.0 - end -end - -packages - package %{name} - provides - pcre = %{thisver} - end - - obsoletes - pcre-compat - end - - conflicts - pcre <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-readline/compat-readline.nm b/compat-readline/compat-readline.nm deleted file mode 100644 index 66727a3ff..000000000 --- a/compat-readline/compat-readline.nm +++ /dev/null @@ -1,66 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-readline -version = 7.0 -release = 1 - -thisapp = readline-%{version} - -groups = System/Libraries -url = ftp://ftp.gnu.org/gnu/readline/ -license = GPLv3+ -summary = A library for editing typed command lines - -description - The Readline library provides a set of functions that allow users to - edit command lines. Both Emacs and vi editing modes are available. - The Readline library includes additional functions for maintaining a - list of previously-entered command lines for recalling or editing - those lines, and for performing csh-like history expansion on - previous commands. -end - -source_dl = ftp://ftp.gnu.org/gnu/readline/ - -build - requires - ncurses-devel - end - - make_build_targets += \ - SHLIB_LIBS=-lncurses - - test - make check - end - - install - # Only install libraries. - mkdir -pv %{BUILDROOT}%{libdir} - - install -m 755 shlib/libhistory.so.7.0 %{BUILDROOT}%{libdir} - ln -svf libhistory.so.7.0 %{BUILDROOT}%{libdir}/libhistory.so.7 - - install -m 755 shlib/libreadline.so.7.0 %{BUILDROOT}%{libdir} - ln -svf libreadline.so.7.0 %{BUILDROOT}%{libdir}/libreadline.so.7 - end -end - -packages - package %{name} - provides - readline = %{thisver} - end - - conflicts - readline <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/compat-readline/patches/readline-5.0-no_rpath.patch b/compat-readline/patches/readline-5.0-no_rpath.patch deleted file mode 100644 index befad63e4..000000000 --- a/compat-readline/patches/readline-5.0-no_rpath.patch +++ /dev/null @@ -1,13 +0,0 @@ -ripped from Fedora - ---- a/support/shobj-conf -+++ b/support/shobj-conf -@@ -102,7 +102,7 @@ - SHOBJ_LD='${CC}' - SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' - -- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' -+ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`' - SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' - ;; - diff --git a/compat-xz/compat-xz.nm b/compat-xz/compat-xz.nm deleted file mode 100644 index 9acf280a2..000000000 --- a/compat-xz/compat-xz.nm +++ /dev/null @@ -1,62 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = compat-xz -version = 4.999.9beta -release = 1 - -thisapp = xz-%{version} - -groups = Applications/Compression -url = http://tukaani.org/xz/ -license = LGPLv2+ -summary = LZMA Utils. - -description - LZMA provides very high compression ratio and fast decompression. The - core of the LZMA utils is Igor Pavlov's LZMA SDK containing the actual - LZMA encoder/decoder. LZMA utils add a few scripts which provide - gzip-like command line interface and a couple of other LZMA related - tools. -end - -source_dl = http://tukaani.org/xz/ -sources = %{thisapp}.tar.xz - -build - configure_options += \ - --disable-rpath - - test - export LD_LIBRARY_PATH=$(pwd)/src/liblzma/.libs - make check - end - - install - # Only install libraries. - mkdir -pv %{BUILDROOT}%{libdir} - cp -vr src/liblzma/.libs/liblzma.so.0* %{BUILDROOT}%{libdir} - end -end - -packages - package %{name} - provides - xz = %{thisver} - end - - obsoletes - xz-compat - end - - conflicts - xz <= %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/ldapvi/ldapvi.nm b/ldapvi/ldapvi.nm index f1b939b0f..7b7bf5da8 100644 --- a/ldapvi/ldapvi.nm +++ b/ldapvi/ldapvi.nm @@ -18,7 +18,7 @@ description it as vipw(1) for LDAP. end -source_dl = https://www.lichteblau.com/download/ +source_dl = http://www.lichteblau.com/download/ build requires diff --git a/lldpd/lldpd.nm b/lldpd/lldpd.nm index 9d35918e6..54f00168d 100644 --- a/lldpd/lldpd.nm +++ b/lldpd/lldpd.nm @@ -5,7 +5,7 @@ name = lldpd version = 1.0.16 -release = 1 +release = 1.1 groups = Networking/Tools url = https://lldpd.github.io @@ -23,7 +23,7 @@ build requires libcap-devel libevent-devel - libseccomp-devel + (libseccomp-devel if arch(x86_64)) libxml2-devel pkg-config readline-devel @@ -33,11 +33,17 @@ build configure_options += \ --without-embedded-libevent \ --with-readline \ - --with-seccomp \ --with-xml \ --with-privsep-user=lldpd \ --with-privsep-group=lldpd + # lldpd does not support seccomp on aarch64. + if "%{DISTRO_ARCH}" == "aarch64" + configure_options += --without-seccomp + else + configure_options += --with-seccomp + end + prepare_cmds %{create_user} end diff --git a/openssl/openssl.nm b/openssl/openssl.nm index e26aa3fba..58d932b1a 100644 --- a/openssl/openssl.nm +++ b/openssl/openssl.nm @@ -4,8 +4,8 @@ ############################################################################### name = openssl -version = 3.0.7 -release = 1.1 +version = 3.0.8 +release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Libraries hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 424b6970b4e4951e2202a7b5e9609c091e65cacb
by Michael Tremer 08 Mar '23

08 Mar '23

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 74379b548cd489e494dab1c3b8d06f4945d415c9
by Michael Tremer 07 Mar '23

07 Mar '23

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 3.x development tree". The branch, master has been updated via 74379b548cd489e494dab1c3b8d06f4945d415c9 (commit) from 0d7e30eedf480a4b0024174290e2d7ea06173935 (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 74379b548cd489e494dab1c3b8d06f4945d415c9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 7 17:18:50 2023 +0000 dhcping: Drop package This seems to be unmaintained for about 20 years. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: dhcping/dhcping.nm | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 dhcping/dhcping.nm Difference in files: diff --git a/dhcping/dhcping.nm b/dhcping/dhcping.nm deleted file mode 100644 index 3d31c728d..000000000 --- a/dhcping/dhcping.nm +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = dhcping -version = 1.2 -release = 1 - -groups = Applications/Internet -url = http://www.mavetju.org/unix/general.php -license = MIT -summary = DHCP daemon ping program - -description - Dhcping allows the system administrator to check if a remote DHCP - server is still functioning. -end - -source_dl = http://www.mavetju.org/download/ - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0d7e30eedf480a4b0024174290e2d7ea06173935
by Michael Tremer 07 Mar '23

07 Mar '23

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 3.x development tree". The branch, master has been updated via 0d7e30eedf480a4b0024174290e2d7ea06173935 (commit) via 9beb846e82dbe75186ad426a40a1c1989fbad46d (commit) from df4bc41f0c06810d2022dc034573874b19f237ab (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 0d7e30eedf480a4b0024174290e2d7ea06173935 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 7 16:28:45 2023 +0000 glibc: Optimise for kernel >= 5.10 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9beb846e82dbe75186ad426a40a1c1989fbad46d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 7 16:27:32 2023 +0000 gdb: Update to 13.1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: gdb/gdb.nm | 7 ++++--- glibc/glibc.nm | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) Difference in files: diff --git a/gdb/gdb.nm b/gdb/gdb.nm index 5d7f25a33..adea165f8 100644 --- a/gdb/gdb.nm +++ b/gdb/gdb.nm @@ -4,7 +4,7 @@ ############################################################################### name = gdb -version = 12.1 +version = 13.1 release = 1 groups = Development/Debuggers @@ -25,6 +25,8 @@ build requires bison expat-devel + gmp-devel + mpfr-devel ncurses-devel python3-devel readline-devel @@ -54,10 +56,9 @@ build --with-system-zlib \ --disable-werror \ --with-expat \ - --with-python \ + --with-python=%{python3} \ --with-lzma \ --without-libexpat-prefix \ - --without-libunwind \ %{DISTRO_MACHINE} install_cmds diff --git a/glibc/glibc.nm b/glibc/glibc.nm index 5b94e0ed9..70c5ae415 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -5,7 +5,7 @@ name = glibc version = 2.37 -release = 1 +release = 2 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Base @@ -28,7 +28,7 @@ sources = %{thisapp}.tar.xz build # Optimize glibc for kernel - OPTIMIZED_KERNEL = 3.2 + OPTIMIZED_KERNEL = 5.10 requires autoconf hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. df4bc41f0c06810d2022dc034573874b19f237ab
by Michael Tremer 07 Mar '23

07 Mar '23

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 3.x development tree". The branch, master has been updated via df4bc41f0c06810d2022dc034573874b19f237ab (commit) via b7ee1c75df266c7bdb0863af8489dc03b6342fde (commit) via b2be9937b759da0d84b61c7dd87b84d1f741dcc7 (commit) via 6f4f600445ef67a98d58265b3729b68083f7f692 (commit) via fa7188edfe138b31f07218530b49d26802a70dde (commit) from 08445b698be12fc4ee16423b295d677fb89e6728 (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 df4bc41f0c06810d2022dc034573874b19f237ab Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon Mar 6 11:55:15 2023 +0000 perl-DBI: FTBFS Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b7ee1c75df266c7bdb0863af8489dc03b6342fde Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon Mar 6 11:53:57 2023 +0000 perl-Net-HTTP: New package Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b2be9937b759da0d84b61c7dd87b84d1f741dcc7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 7 13:50:33 2023 +0000 plymouth: Fix broken logo symlink This reverts commit 08445b698be12fc4ee16423b295d677fb89e6728. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6f4f600445ef67a98d58265b3729b68083f7f692 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon Mar 6 11:52:56 2023 +0000 perl-IO-AIO: Fix build dependencies Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fa7188edfe138b31f07218530b49d26802a70dde Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon Mar 6 11:20:24 2023 +0000 perl-TermReadkey: Update to 2.38 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: perl-DBI/perl-DBI.nm | 1 + perl-IO-AIO/perl-IO-AIO.nm | 5 +++-- .../perl-Net-HTTP.nm | 23 +++++++++++----------- perl-TermReadKey/perl-TermReadKey.nm | 7 +++---- plymouth/plymouth.nm | 12 ++++++++++- 5 files changed, 30 insertions(+), 18 deletions(-) copy perl-IO-All/perl-IO-All.nm => perl-Net-HTTP/perl-Net-HTTP.nm (59%) Difference in files: diff --git a/perl-DBI/perl-DBI.nm b/perl-DBI/perl-DBI.nm index 1ab303d00..3d1d668d4 100644 --- a/perl-DBI/perl-DBI.nm +++ b/perl-DBI/perl-DBI.nm @@ -23,6 +23,7 @@ source_dl = http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/ build requires perl(B) + perl(blib) perl(Carp) perl(Cwd) perl(Data::Dumper) diff --git a/perl-IO-AIO/perl-IO-AIO.nm b/perl-IO-AIO/perl-IO-AIO.nm index f15a05fdf..dd29ef244 100644 --- a/perl-IO-AIO/perl-IO-AIO.nm +++ b/perl-IO-AIO/perl-IO-AIO.nm @@ -5,7 +5,7 @@ name = perl-IO-AIO version = 4.32 -release = 1.1 +release = 1.2 thisapp = IO-AIO-%{version} groups = Development/Libraries @@ -22,11 +22,12 @@ source_dl = http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/ build requires + perl(FindBin) perl(ExtUtils::MakeMaker) perl(ExtUtils::ParseXS) perl(Carp) perl(common::sense) - pakfire >= 0.9.26-3.1 + perl(Test::More) end build diff --git a/perl-Net-HTTP/perl-Net-HTTP.nm b/perl-Net-HTTP/perl-Net-HTTP.nm new file mode 100644 index 000000000..eee400b3f --- /dev/null +++ b/perl-Net-HTTP/perl-Net-HTTP.nm @@ -0,0 +1,51 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = perl-Net-HTTP +version = 6.22 +release = 1 +thisapp = Net-HTTP-%{version} +arch = noarch + +groups = Development/Libraries +url = https://metacpan.org/dist/Net-HTTP +license = GPL+ or Artistic +summary = Low-level HTTP client for perl + +description + The Net::HTTP class is a low-level HTTP client. An instance of the + Net::HTTP class represents a connection to an HTTP server. The HTTP + protocol is described in RFC 2616. + + The Net::HTTP class supports HTTP/1.0 and HTTP/1.1. +end + +source_dl = https://cpan.metacpan.org/authors/id/O/OA/OALDERS/ + +build + requires + perl(ExtUtils::MakeMaker) + perl(Test::More) + perl(URI) + end + + build + perl Makefile.PL INSTALLDIRS=vendor + make %{PARALLELISMFLAGS} + end + + # Testsuite fails. + #test + # make test + #end +end + +packages + package %{name} + requires + perl(:MODULE_COMPAT_%{perl_version}) + end + end +end diff --git a/perl-TermReadKey/perl-TermReadKey.nm b/perl-TermReadKey/perl-TermReadKey.nm index 58acccc2e..e3822cc2d 100644 --- a/perl-TermReadKey/perl-TermReadKey.nm +++ b/perl-TermReadKey/perl-TermReadKey.nm @@ -4,8 +4,8 @@ ############################################################################### name = perl-TermReadKey -version = 2.32 -release = 1.1 +version = 2.38 +release = 1 thisapp = TermReadKey-%{version} groups = Development/Libraries @@ -23,7 +23,7 @@ description good likelyhood of it working. end -source_dl = http://www.cpan.org/authors/id/J/JS/JSTOWE/ +source_dl = https://www.cpan.org/authors/id/J/JS/JSTOWE/ build requires @@ -31,7 +31,6 @@ build perl(Carp) perl(Exporter) perl(ExtUtils::MakeMaker) - pakfire >= 0.9.26-3.1 end build diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm index 5d3ac16b0..429551896 100644 --- a/plymouth/plymouth.nm +++ b/plymouth/plymouth.nm @@ -5,7 +5,7 @@ name = plymouth version = 22.02.122 -release = 3 +release = 4 groups = System/Base url = https://www.freedesktop.org/wiki/Software/Plymouth @@ -33,11 +33,14 @@ build libudev-devel pango-devel >= 1.21.0 systemd-devel + + %{datadir}/pixmaps/system-logo-white.png end configure_options += \ --libexecdir=/usr/lib \ --disable-gtk \ + --with-logo=%{datadir}/pixmaps/system-logo-white.png \ --with-background-start-color-stop=0x880400 \ --with-background-end-color-stop=0x000000 \ --with-background-color=0x880400 \ @@ -49,6 +52,13 @@ build # Fix install location for systemd files make_install_targets += \ SYSTEMD_UNIT_DIR=%{unitdir} + + install_cmds + # HACK: Replace symlink with a copy of the logo + rm -vf %{BUILDROOT}%{datadir}/plymouth/themes/spinfinity/header-image.png + cp -vf %{datadir}/pixmaps/system-logo-white.png \ + %{BUILDROOT}%{datadir}/plymouth/themes/spinfinity/header-image.png + end end packages hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 08445b698be12fc4ee16423b295d677fb89e6728
by Michael Tremer 07 Mar '23

07 Mar '23

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7ad27c50903b55a44d51c08760a085d8d9a73aae
by Peter Müller 06 Mar '23

06 Mar '23

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 7ad27c50903b55a44d51c08760a085d8d9a73aae (commit) via ee80a12db0f1a724eefff241d3db8e7c2394917a (commit) from cf66a3f133428dcd51be0cc36161237c20cda84b (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 7ad27c50903b55a44d51c08760a085d8d9a73aae Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Mar 6 16:43:47 2023 +0000 Core Update 174: Ship and restart strongSwan Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit ee80a12db0f1a724eefff241d3db8e7c2394917a Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Mar 6 16:33:55 2023 +0100 strongswan: Update to version 5.9.10 - Update from version 5.9.9 to 5.9.10 - Update of rootfile not required - Changelog strongswan-5.9.10 - Fixed a vulnerability related to certificate verification in TLS-based EAP methods that leads to an authentication bypass followed by an expired pointer dereference that results in a denial of service and possibly even remote code execution. This vulnerability has been registered as CVE-2023-26463. - Added support for full packet hardware offload for IPsec SAs and policies with Linux 6.2 kernels to the kernel-netlink plugin. - TLS-based EAP methods now use the standardized key derivation when used with TLS 1.3. - The eap-tls plugin properly supports TLS 1.3 according to RFC 9190, by implementing the "protected success indication". - With the `prefer` value for the `childless` setting, initiators will create a childless IKE_SA if the responder supports the extension. - Routes via XFRM interfaces can optionally be installed automatically by enabling the `install_routes_xfrmi` option of the kernel-netlink plugin. - charon-nm now uses XFRM interfaces instead of dummy TUN devices to avoid issues with name resolution if they are supported by the kernel. - The `pki --req` command can encode extendedKeyUsage (EKU) flags in the PKCS#10 certificate signing request. - The `pki --issue` command adopts EKU flags from CSRs but allows modifying them (replace them completely, or adding/removing specific flags). - On Linux 6.2 kernels, the last use times of CHILD_SAs are determined via the IPsec SAs instead of the policies. - For libcurl with MultiSSL support, the curl plugin provides an option to select the SSL/TLS backend. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/106 => core/174}/filelists/strongswan | 0 config/rootfiles/core/174/update.sh | 4 ++++ lfs/strongswan | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) copy config/rootfiles/{oldcore/106 => core/174}/filelists/strongswan (100%) Difference in files: diff --git a/config/rootfiles/core/174/filelists/strongswan b/config/rootfiles/core/174/filelists/strongswan new file mode 120000 index 000000000..90c727e26 --- /dev/null +++ b/config/rootfiles/core/174/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/174/update.sh b/config/rootfiles/core/174/update.sh index 3f8263f22..9dcdb491f 100644 --- a/config/rootfiles/core/174/update.sh +++ b/config/rootfiles/core/174/update.sh @@ -33,6 +33,7 @@ done # Stop services /etc/rc.d/init.d/squid stop +/etc/rc.d/init.d/ipsec stop # Extract files extract_files @@ -64,6 +65,9 @@ telinit u if [ -f /var/ipfire/proxy/enable ]; then /etc/init.d/squid start fi +if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then + /etc/rc.d/init.d/ipsec start +fi # Rebuild initial ramdisk to apply microcode updates dracut --regenerate-all --force diff --git a/lfs/strongswan b/lfs/strongswan index db4607bc2..7cb886fe7 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ include Config -VER = 5.9.9 +VER = 5.9.10 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 9cbc73192527254a2d20b28295e7583a0d9ec81e4d6eb1b7d78e54b30ba8e5304a33e813145d8a47b2b4319d7b49762cd35cdbdaf1d41161d7746d68d3cef1b5 +$(DL_FILE)_BLAKE2 = 757d55aa0c623356c5d8bf0360df63990ec18294d06f50b6dd475273b75a883354ea8723708e4856a8f0acc4d3237ac6bcf5adc40346fded7051d78375b2bcc9 install : $(TARGET) 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 March 2023