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 c00286b609e7721782a233b551dcb988567dd442 (commit) via fd4ee381367337bb6211190efc56ab46b69a3c75 (commit) via 552cf4e825bb55a7a4f05d1e96cfe57bdc109013 (commit) via 869102c0a9969cc3882ca08ba7c495e24c163d24 (commit) via d44788101b573f05583255a5fb541e76964235b8 (commit) via 64feedbcf66bedebb7750d1582862ed4bbaac9b1 (commit) via 095b258b97fdb7940549147d8567f6aa73492083 (commit) via b734e6f7b68f6b8e875e6ce9cc6c059a738d866d (commit) via acf27548808ab085d0519d055439c89e34552cbc (commit) from 7b77ed8c9432c0f550904e5a1c6d049d12517e04 (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 c00286b609e7721782a233b551dcb988567dd442 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Aug 6 09:13:54 2024 +0000
core188: Ship cyrus-sasl
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fd4ee381367337bb6211190efc56ab46b69a3c75 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 3 10:01:23 2024 +0000
cyrus-sasl: Update to 2.1.28
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 552cf4e825bb55a7a4f05d1e96cfe57bdc109013 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 3 09:51:46 2024 +0000
cyrus-sasl: Remove unsed PASS build instructions
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 869102c0a9969cc3882ca08ba7c495e24c163d24 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Aug 6 09:13:08 2024 +0000
core188: Ship libxslt
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d44788101b573f05583255a5fb541e76964235b8 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 3 09:49:42 2024 +0000
libxslt: Update to 1.1.42
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 64feedbcf66bedebb7750d1582862ed4bbaac9b1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 3 09:24:41 2024 +0000
br2684ctl: Drop package
This tool is now part of linux-atm.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 095b258b97fdb7940549147d8567f6aa73492083 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Aug 6 09:12:27 2024 +0000
core188: Ship linux-atm
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b734e6f7b68f6b8e875e6ce9cc6c059a738d866d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 3 09:22:48 2024 +0000
linux-atm: Update to 2.5.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit acf27548808ab085d0519d055439c89e34552cbc Author: Adolf Belka adolf.belka@ipfire.org Date: Tue May 21 16:56:21 2024 +0200
openssl: Update to version 3.3.0
- Update from version 3.2.1 to 3.3.0 - Update of rootfile - Changelog 3.3 This release adds the following new features: * Support for qlog for tracing QUIC connections has been added * Added APIs to allow configuring the negotiated idle timeout for QUIC connections, and to allow determining the number of additional streams that can currently be created for a QUIC connection. * Added APIs to allow disabling implicit QUIC event processing for QUIC SSL objects * Added APIs to allow querying the size and utilisation of a QUIC stream's write buffer * New API `SSL_write_ex2`, which can be used to send an end-of-stream (FIN) condition in an optimised way when using QUIC. * Limited support for polling of QUIC connection and stream objects in a non-blocking manner. * Added a new EVP_DigestSqueeze() API. This allows SHAKE to squeeze multiple times with different output sizes. * Added exporter for CMake on Unix and Windows, alongside the pkg-config exporter. * The BLAKE2s hash algorithm matches BLAKE2b's support for configurable output length. * The EVP_PKEY_fromdata function has been augmented to allow for the derivation of CRT (Chinese Remainder Theorem) parameters when requested * Added API functions SSL_SESSION_get_time_ex(), SSL_SESSION_set_time_ex() using time_t which is Y2038 safe on 32 bit systems when 64 bit time is enabled * Unknown entries in TLS SignatureAlgorithms, ClientSignatureAlgorithms config options and the respective calls to SSL[_CTX]_set1_sigalgs() and SSL[_CTX]_set1_client_sigalgs() that start with `?` character are ignored and the configuration will still be used. * Added `-set_issuer` and `-set_subject` options to `openssl x509` to override the Issuer and Subject when creating a certificate. The `-subj` option now is an alias for `-set_subject`. * Added several new features of CMPv3 defined in RFC 9480 and RFC 9483 * New option `SSL_OP_PREFER_NO_DHE_KEX`, which allows configuring a TLS1.3 server to prefer session resumption using PSK-only key exchange over PSK with DHE, if both are available. * New atexit configuration switch, which controls whether the OPENSSL_cleanup is registered when libcrypto is unloaded. * Added X509_STORE_get1_objects to avoid issues with the existing X509_STORE_get0_objects API in multi-threaded applications. This release incorporates the following potentially significant or incompatible changes: * Applied AES-GCM unroll8 optimisation to Microsoft Azure Cobalt 100 * Optimized AES-CTR for ARM Neoverse V1 and V2 * Enable AES and SHA3 optimisations on Applie Silicon M3-based MacOS systems similar to M1/M2. * Various optimizations for cryptographic routines using RISC-V vector crypto extensions * Added assembly implementation for md5 on loongarch64 * Accept longer context for TLS 1.2 exporters * The activate and soft_load configuration settings for providers in openssl.cnf have been updated to require a value of [1|yes|true|on] (in lower or UPPER case) to enable the setting. Conversely a value of [0|no|false|off] will disable the setting. * In `openssl speed`, changed the default hash function used with `hmac` from `md5` to `sha256`. * The `-verify` option to the `openssl crl` and `openssl req` will make the program exit with 1 on failure. * The d2i_ASN1_GENERALIZEDTIME(), d2i_ASN1_UTCTIME(), ASN1_TIME_check(), and related functions have been augmented to check for a minimum length of the input string, in accordance with ITU-T X.690 section 11.7 and 11.8. * OPENSSL_sk_push() and sk_<TYPE>_push() functions now return 0 instead of -1 if called with a NULL stack argument. * New limit on HTTP response headers is introduced to HTTP client. The default limit is set to 256 header lines. This release incorporates the following bug fixes and mitigations: * The BIO_get_new_index() function can only be called 127 times before it reaches its upper bound of BIO_TYPE_MASK and will now return -1 once its exhausted.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/cyrus-sasl | 1 + config/rootfiles/common/libxslt | 5 +- config/rootfiles/common/linux-atm | 50 ++-- config/rootfiles/common/openssl | 104 ++++++++ .../{oldcore/120 => core/188}/filelists/cyrus-sasl | 0 .../{oldcore/157 => core/188}/filelists/libxslt | 0 .../{oldcore/159 => core/188}/filelists/linux-atm | 0 lfs/br2684ctl | 54 ---- lfs/cyrus-sasl | 26 +- lfs/libxslt | 4 +- lfs/linux-atm | 10 +- lfs/openssl | 4 +- make.sh | 1 - src/br2684ctl/br2684ctl.c | 271 --------------------- src/patches/linux-atm-2.4.1-arpd_includes.patch | 42 ---- src/patches/linux-atm-2.4.1-gcc-4.patch | 161 ------------ src/patches/linux-atm-2.5.2-headers.patch | 30 +++ src/patches/linux-atm-remove-define-hacks.patch | 22 ++ src/patches/linux-atm-use_socklen_t.patch | 13 + 19 files changed, 218 insertions(+), 580 deletions(-) copy config/rootfiles/{oldcore/120 => core/188}/filelists/cyrus-sasl (100%) copy config/rootfiles/{oldcore/157 => core/188}/filelists/libxslt (100%) copy config/rootfiles/{oldcore/159 => core/188}/filelists/linux-atm (100%) delete mode 100644 lfs/br2684ctl delete mode 100644 src/br2684ctl/br2684ctl.c delete mode 100644 src/patches/linux-atm-2.4.1-arpd_includes.patch delete mode 100644 src/patches/linux-atm-2.4.1-gcc-4.patch create mode 100644 src/patches/linux-atm-2.5.2-headers.patch create mode 100644 src/patches/linux-atm-remove-define-hacks.patch create mode 100644 src/patches/linux-atm-use_socklen_t.patch
Difference in files: diff --git a/config/rootfiles/common/cyrus-sasl b/config/rootfiles/common/cyrus-sasl index 411c68d7a2..5a61b1355d 100644 --- a/config/rootfiles/common/cyrus-sasl +++ b/config/rootfiles/common/cyrus-sasl @@ -90,4 +90,5 @@ usr/sbin/testsaslauthd #usr/share/man/man8/saslauthd.8 #usr/share/man/man8/sasldblistusers2.8 #usr/share/man/man8/saslpasswd2.8 +#usr/share/man/man8/testsaslauthd.8 var/lib/sasl diff --git a/config/rootfiles/common/libxslt b/config/rootfiles/common/libxslt index a41c536b43..86e1c0cce5 100644 --- a/config/rootfiles/common/libxslt +++ b/config/rootfiles/common/libxslt @@ -32,16 +32,15 @@ usr/bin/xsltproc #usr/lib/libexslt.la #usr/lib/libexslt.so usr/lib/libexslt.so.0 -usr/lib/libexslt.so.0.8.20 +usr/lib/libexslt.so.0.8.23 #usr/lib/libxslt-plugins #usr/lib/libxslt.la #usr/lib/libxslt.so usr/lib/libxslt.so.1 -usr/lib/libxslt.so.1.1.37 +usr/lib/libxslt.so.1.1.42 #usr/lib/pkgconfig/libexslt.pc #usr/lib/pkgconfig/libxslt.pc #usr/lib/xsltConf.sh -#usr/share/aclocal/libxslt.m4 #usr/share/doc/libxslt #usr/share/doc/libxslt/tutorial #usr/share/doc/libxslt/tutorial/images diff --git a/config/rootfiles/common/linux-atm b/config/rootfiles/common/linux-atm index 70df5fc8a6..7c9e43dc7c 100644 --- a/config/rootfiles/common/linux-atm +++ b/config/rootfiles/common/linux-atm @@ -1,11 +1,17 @@ #etc/atmsigd.conf #etc/hosts.atm +#lib/firmware/pca200e.bin +#lib/firmware/pca200e_ecd.bin2 +#lib/firmware/sba200e_ecd.bin2 #usr/bin/aread #usr/bin/atmdiag #usr/bin/atmdump +#usr/bin/atmswitch #usr/bin/awrite #usr/bin/saaldump #usr/bin/sonetdiag +#usr/bin/svc_recv +#usr/bin/svc_send #usr/bin/ttcp_atm #usr/include/atm.h #usr/include/atmarp.h @@ -14,41 +20,43 @@ #usr/include/atmsap.h #usr/lib/libatm.a #usr/lib/libatm.la -usr/lib/libatm.so +#usr/lib/libatm.so usr/lib/libatm.so.1 usr/lib/libatm.so.1.0.0 -#usr/man/man4 -#usr/man/man4/atmsigd.conf.4 -#usr/man/man7 -#usr/man/man7/qos.7 -#usr/man/man7/sap.7 -#usr/man/man8 -#usr/man/man8/atmaddr.8 -#usr/man/man8/atmarp.8 -#usr/man/man8/atmarpd.8 -#usr/man/man8/atmdiag.8 -#usr/man/man8/atmdump.8 -#usr/man/man8/atmloop.8 -#usr/man/man8/atmsigd.8 -#usr/man/man8/atmtcp.8 -#usr/man/man8/bus.8 -#usr/man/man8/esi.8 -#usr/man/man8/lecs.8 -#usr/man/man8/les.8 -#usr/man/man8/mpcd.8 -#usr/man/man8/zeppelin.8 #usr/sbin/atmaddr #usr/sbin/atmarp #usr/sbin/atmarpd #usr/sbin/atmloop #usr/sbin/atmsigd #usr/sbin/atmtcp +usr/sbin/br2684ctl #usr/sbin/bus #usr/sbin/enitune #usr/sbin/esi +#usr/sbin/hediag #usr/sbin/ilmid +#usr/sbin/ilmidiag #usr/sbin/lecs #usr/sbin/les #usr/sbin/mpcd #usr/sbin/zeppelin #usr/sbin/zntune +#usr/share/man/man4/atmsigd.conf.4 +#usr/share/man/man7/qos.7 +#usr/share/man/man7/sap.7 +#usr/share/man/man8/atmaddr.8 +#usr/share/man/man8/atmarp.8 +#usr/share/man/man8/atmarpd.8 +#usr/share/man/man8/atmdiag.8 +#usr/share/man/man8/atmdump.8 +#usr/share/man/man8/atmloop.8 +#usr/share/man/man8/atmsigd.8 +#usr/share/man/man8/atmtcp.8 +#usr/share/man/man8/br2684ctl.8 +#usr/share/man/man8/bus.8 +#usr/share/man/man8/esi.8 +#usr/share/man/man8/ilmid.8 +#usr/share/man/man8/lecs.8 +#usr/share/man/man8/les.8 +#usr/share/man/man8/mpcd.8 +#usr/share/man/man8/zeppelin.8 diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl index d5f4f38144..d9595bef94 100644 --- a/config/rootfiles/common/openssl +++ b/config/rootfiles/common/openssl @@ -152,6 +152,10 @@ usr/bin/openssl #usr/include/openssl/x509err.h #usr/include/openssl/x509v3.h #usr/include/openssl/x509v3err.h +#usr/lib/cmake +usr/lib/cmake/OpenSSL +usr/lib/cmake/OpenSSL/OpenSSLConfig.cmake +usr/lib/cmake/OpenSSL/OpenSSLConfigVersion.cmake #usr/lib/engines-3 usr/lib/engines-3/afalg.so usr/lib/engines-3/capi.so @@ -769,6 +773,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/doc/openssl/html/man3/SSL_get_shared_sigalgs.html #usr/share/doc/openssl/html/man3/SSL_get_stream_id.html #usr/share/doc/openssl/html/man3/SSL_get_stream_read_state.html +#usr/share/doc/openssl/html/man3/SSL_get_value_uint.html #usr/share/doc/openssl/html/man3/SSL_get_verify_result.html #usr/share/doc/openssl/html/man3/SSL_get_version.html #usr/share/doc/openssl/html/man3/SSL_group_to_name.html @@ -781,6 +786,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/doc/openssl/html/man3/SSL_new.html #usr/share/doc/openssl/html/man3/SSL_new_stream.html #usr/share/doc/openssl/html/man3/SSL_pending.html +#usr/share/doc/openssl/html/man3/SSL_poll.html #usr/share/doc/openssl/html/man3/SSL_read.html #usr/share/doc/openssl/html/man3/SSL_read_early_data.html #usr/share/doc/openssl/html/man3/SSL_rstate_string.html @@ -994,6 +1000,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/doc/openssl/html/man7/openssl-core_names.h.html #usr/share/doc/openssl/html/man7/openssl-env.html #usr/share/doc/openssl/html/man7/openssl-glossary.html +#usr/share/doc/openssl/html/man7/openssl-qlog.html #usr/share/doc/openssl/html/man7/openssl-quic.html #usr/share/doc/openssl/html/man7/openssl-threads.html #usr/share/doc/openssl/html/man7/openssl_user_macros.html @@ -2421,6 +2428,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/ERR_peek_last_error_func.3ossl #usr/share/man/man3/ERR_peek_last_error_line.3ossl #usr/share/man/man3/ERR_peek_last_error_line_data.3ossl +#usr/share/man/man3/ERR_pop.3ossl #usr/share/man/man3/ERR_pop_to_mark.3ossl #usr/share/man/man3/ERR_print_errors.3ossl #usr/share/man/man3/ERR_print_errors_cb.3ossl @@ -2589,6 +2597,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/EVP_DigestSignInit.3ossl #usr/share/man/man3/EVP_DigestSignInit_ex.3ossl #usr/share/man/man3/EVP_DigestSignUpdate.3ossl +#usr/share/man/man3/EVP_DigestSqueeze.3ossl #usr/share/man/man3/EVP_DigestUpdate.3ossl #usr/share/man/man3/EVP_DigestVerify.3ossl #usr/share/man/man3/EVP_DigestVerifyFinal.3ossl @@ -3590,6 +3599,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/OPENSSL_LH_delete.3ossl #usr/share/man/man3/OPENSSL_LH_doall.3ossl #usr/share/man/man3/OPENSSL_LH_doall_arg.3ossl +#usr/share/man/man3/OPENSSL_LH_doall_arg_thunk.3ossl #usr/share/man/man3/OPENSSL_LH_error.3ossl #usr/share/man/man3/OPENSSL_LH_flush.3ossl #usr/share/man/man3/OPENSSL_LH_free.3ossl @@ -3603,6 +3613,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/OPENSSL_LH_num_items.3ossl #usr/share/man/man3/OPENSSL_LH_retrieve.3ossl #usr/share/man/man3/OPENSSL_LH_set_down_load.3ossl +#usr/share/man/man3/OPENSSL_LH_set_thunks.3ossl #usr/share/man/man3/OPENSSL_LH_stats.3ossl #usr/share/man/man3/OPENSSL_LH_stats_bio.3ossl #usr/share/man/man3/OPENSSL_LINE.3ossl @@ -3701,6 +3712,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/OSSL_CMP_CR.3ossl #usr/share/man/man3/OSSL_CMP_CTX_build_cert_chain.3ossl #usr/share/man/man3/OSSL_CMP_CTX_free.3ossl +#usr/share/man/man3/OSSL_CMP_CTX_get0_geninfo_ITAVs.3ossl #usr/share/man/man3/OSSL_CMP_CTX_get0_libctx.3ossl #usr/share/man/man3/OSSL_CMP_CTX_get0_newCert.3ossl #usr/share/man/man3/OSSL_CMP_CTX_get0_newPkey.3ossl @@ -3765,6 +3777,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/OSSL_CMP_CTX_set_transfer_cb_arg.3ossl #usr/share/man/man3/OSSL_CMP_CTX_setup_CRM.3ossl #usr/share/man/man3/OSSL_CMP_CTX_snprint_PKIStatus.3ossl +#usr/share/man/man3/OSSL_CMP_HDR_get0_geninfo_ITAVs.3ossl #usr/share/man/man3/OSSL_CMP_HDR_get0_recipNonce.3ossl #usr/share/man/man3/OSSL_CMP_HDR_get0_transactionID.3ossl #usr/share/man/man3/OSSL_CMP_IR.3ossl @@ -3772,10 +3785,12 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/OSSL_CMP_ITAV_dup.3ossl #usr/share/man/man3/OSSL_CMP_ITAV_free.3ossl #usr/share/man/man3/OSSL_CMP_ITAV_get0_caCerts.3ossl +#usr/share/man/man3/OSSL_CMP_ITAV_get0_certProfile.3ossl #usr/share/man/man3/OSSL_CMP_ITAV_get0_rootCaCert.3ossl #usr/share/man/man3/OSSL_CMP_ITAV_get0_rootCaKeyUpdate.3ossl #usr/share/man/man3/OSSL_CMP_ITAV_get0_type.3ossl #usr/share/man/man3/OSSL_CMP_ITAV_get0_value.3ossl +#usr/share/man/man3/OSSL_CMP_ITAV_new0_certProfile.3ossl #usr/share/man/man3/OSSL_CMP_ITAV_new_caCerts.3ossl #usr/share/man/man3/OSSL_CMP_ITAV_new_rootCaCert.3ossl #usr/share/man/man3/OSSL_CMP_ITAV_new_rootCaKeyUpdate.3ossl @@ -3793,6 +3808,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/OSSL_CMP_LOG_WARNING.3ossl #usr/share/man/man3/OSSL_CMP_MSG_dup.3ossl #usr/share/man/man3/OSSL_CMP_MSG_free.3ossl +#usr/share/man/man3/OSSL_CMP_MSG_get0_certreq_publickey.3ossl #usr/share/man/man3/OSSL_CMP_MSG_get0_header.3ossl #usr/share/man/man3/OSSL_CMP_MSG_get_bodytype.3ossl #usr/share/man/man3/OSSL_CMP_MSG_http_perform.3ossl @@ -3814,6 +3830,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/OSSL_CMP_SRV_CTX_get0_cmp_ctx.3ossl #usr/share/man/man3/OSSL_CMP_SRV_CTX_get0_custom_ctx.3ossl #usr/share/man/man3/OSSL_CMP_SRV_CTX_init.3ossl +#usr/share/man/man3/OSSL_CMP_SRV_CTX_init_trans.3ossl #usr/share/man/man3/OSSL_CMP_SRV_CTX_new.3ossl #usr/share/man/man3/OSSL_CMP_SRV_CTX_set_accept_raverified.3ossl #usr/share/man/man3/OSSL_CMP_SRV_CTX_set_accept_unprotected.3ossl @@ -3821,6 +3838,8 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/OSSL_CMP_SRV_CTX_set_send_unprotected_errors.3ossl #usr/share/man/man3/OSSL_CMP_SRV_certConf_cb_t.3ossl #usr/share/man/man3/OSSL_CMP_SRV_cert_request_cb_t.3ossl +#usr/share/man/man3/OSSL_CMP_SRV_clean_transaction_cb_t.3ossl +#usr/share/man/man3/OSSL_CMP_SRV_delayed_delivery_cb_t.3ossl #usr/share/man/man3/OSSL_CMP_SRV_error_cb_t.3ossl #usr/share/man/man3/OSSL_CMP_SRV_genm_cb_t.3ossl #usr/share/man/man3/OSSL_CMP_SRV_pollReq_cb_t.3ossl @@ -4044,6 +4063,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/OSSL_HTTP_REQ_CTX_new.3ossl #usr/share/man/man3/OSSL_HTTP_REQ_CTX_set1_req.3ossl #usr/share/man/man3/OSSL_HTTP_REQ_CTX_set_expected.3ossl +#usr/share/man/man3/OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines.3ossl #usr/share/man/man3/OSSL_HTTP_REQ_CTX_set_max_response_length.3ossl #usr/share/man/man3/OSSL_HTTP_REQ_CTX_set_request_line.3ossl #usr/share/man/man3/OSSL_HTTP_adapt_proxy.3ossl @@ -4187,6 +4207,27 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/OSSL_PROVIDER_try_load_ex.3ossl #usr/share/man/man3/OSSL_PROVIDER_unload.3ossl #usr/share/man/man3/OSSL_PROVIDER_unquery_operation.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_AEAD_LIMIT_REACHED.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_APPLICATION_ERROR.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_CONNECTION_REFUSED.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_CRYPTO_ERR.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_CRYPTO_ERR_END.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_FINAL_SIZE_ERROR.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_FLOW_CONTROL_ERROR.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_FRAME_ENCODING_ERROR.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_INTERNAL_ERROR.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_INVALID_TOKEN.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_KEY_UPDATE_ERROR.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_NO_ERROR.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_NO_VIABLE_PATH.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_PROTOCOL_VIOLATION.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_STREAM_LIMIT_ERROR.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_STREAM_STATE_ERROR.3ossl +#usr/share/man/man3/OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR.3ossl +#usr/share/man/man3/OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT.3ossl #usr/share/man/man3/OSSL_QUIC_client_method.3ossl #usr/share/man/man3/OSSL_QUIC_client_thread_method.3ossl #usr/share/man/man3/OSSL_SELF_TEST_free.3ossl @@ -5145,6 +5186,29 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/SSL_INCOMING_STREAM_POLICY_AUTO.3ossl #usr/share/man/man3/SSL_INCOMING_STREAM_POLICY_REJECT.3ossl #usr/share/man/man3/SSL_OP_BIT.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_E.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_EC.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_ECD.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_ER.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_EW.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_F.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_I.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_IS.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_ISB.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_ISE.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_ISU.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_NONE.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_OS.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_OSB.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_OSE.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_OSU.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_R.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_RE.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_RW.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_RWE.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_W.3ossl +#usr/share/man/man3/SSL_POLL_EVENT_WE.3ossl +#usr/share/man/man3/SSL_POLL_FLAG_NO_HANDLE_EVENTS.3ossl #usr/share/man/man3/SSL_SESSION_dup.3ossl #usr/share/man/man3/SSL_SESSION_free.3ossl #usr/share/man/man3/SSL_SESSION_get0_alpn_selected.3ossl @@ -5166,6 +5230,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/SSL_SESSION_get_protocol_version.3ossl #usr/share/man/man3/SSL_SESSION_get_ticket_lifetime_hint.3ossl #usr/share/man/man3/SSL_SESSION_get_time.3ossl +#usr/share/man/man3/SSL_SESSION_get_time_ex.3ossl #usr/share/man/man3/SSL_SESSION_get_timeout.3ossl #usr/share/man/man3/SSL_SESSION_has_ticket.3ossl #usr/share/man/man3/SSL_SESSION_is_resumable.3ossl @@ -5185,6 +5250,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/SSL_SESSION_set_max_early_data.3ossl #usr/share/man/man3/SSL_SESSION_set_protocol_version.3ossl #usr/share/man/man3/SSL_SESSION_set_time.3ossl +#usr/share/man/man3/SSL_SESSION_set_time_ex.3ossl #usr/share/man/man3/SSL_SESSION_set_timeout.3ossl #usr/share/man/man3/SSL_SESSION_up_ref.3ossl #usr/share/man/man3/SSL_STREAM_FLAG_ADVANCE.3ossl @@ -5201,6 +5267,23 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/SSL_STREAM_TYPE_NONE.3ossl #usr/share/man/man3/SSL_STREAM_TYPE_READ.3ossl #usr/share/man/man3/SSL_STREAM_TYPE_WRITE.3ossl +#usr/share/man/man3/SSL_VALUE_CLASS_FEATURE_NEGOTIATED.3ossl +#usr/share/man/man3/SSL_VALUE_CLASS_FEATURE_PEER_REQUEST.3ossl +#usr/share/man/man3/SSL_VALUE_CLASS_FEATURE_REQUEST.3ossl +#usr/share/man/man3/SSL_VALUE_CLASS_GENERIC.3ossl +#usr/share/man/man3/SSL_VALUE_EVENT_HANDLING_MODE.3ossl +#usr/share/man/man3/SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT.3ossl +#usr/share/man/man3/SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT.3ossl +#usr/share/man/man3/SSL_VALUE_EVENT_HANDLING_MODE_INHERIT.3ossl +#usr/share/man/man3/SSL_VALUE_QUIC_IDLE_TIMEOUT.3ossl +#usr/share/man/man3/SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL.3ossl +#usr/share/man/man3/SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL.3ossl +#usr/share/man/man3/SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL.3ossl +#usr/share/man/man3/SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL.3ossl +#usr/share/man/man3/SSL_VALUE_STREAM_WRITE_BUF_AVAIL.3ossl +#usr/share/man/man3/SSL_VALUE_STREAM_WRITE_BUF_SIZE.3ossl +#usr/share/man/man3/SSL_VALUE_STREAM_WRITE_BUF_USED.3ossl +#usr/share/man/man3/SSL_WRITE_FLAG_CONCLUDE.3ossl #usr/share/man/man3/SSL_accept.3ossl #usr/share/man/man3/SSL_accept_stream.3ossl #usr/share/man/man3/SSL_add0_chain_cert.3ossl @@ -5312,12 +5395,17 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/SSL_get_default_timeout.3ossl #usr/share/man/man3/SSL_get_early_data_status.3ossl #usr/share/man/man3/SSL_get_error.3ossl +#usr/share/man/man3/SSL_get_event_handling_mode.3ossl #usr/share/man/man3/SSL_get_event_timeout.3ossl #usr/share/man/man3/SSL_get_ex_data.3ossl #usr/share/man/man3/SSL_get_ex_data_X509_STORE_CTX_idx.3ossl #usr/share/man/man3/SSL_get_ex_new_index.3ossl #usr/share/man/man3/SSL_get_extms_support.3ossl #usr/share/man/man3/SSL_get_fd.3ossl +#usr/share/man/man3/SSL_get_feature_negotiated_uint.3ossl +#usr/share/man/man3/SSL_get_feature_peer_request_uint.3ossl +#usr/share/man/man3/SSL_get_feature_request_uint.3ossl +#usr/share/man/man3/SSL_get_generic_value_uint.3ossl #usr/share/man/man3/SSL_get_handshake_rtt.3ossl #usr/share/man/man3/SSL_get_info_callback.3ossl #usr/share/man/man3/SSL_get_key_update_type.3ossl @@ -5340,6 +5428,10 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/SSL_get_privatekey.3ossl #usr/share/man/man3/SSL_get_psk_identity.3ossl #usr/share/man/man3/SSL_get_psk_identity_hint.3ossl +#usr/share/man/man3/SSL_get_quic_stream_bidi_local_avail.3ossl +#usr/share/man/man3/SSL_get_quic_stream_bidi_remote_avail.3ossl +#usr/share/man/man3/SSL_get_quic_stream_uni_local_avail.3ossl +#usr/share/man/man3/SSL_get_quic_stream_uni_remote_avail.3ossl #usr/share/man/man3/SSL_get_quiet_shutdown.3ossl #usr/share/man/man3/SSL_get_rbio.3ossl #usr/share/man/man3/SSL_get_read_ahead.3ossl @@ -5375,6 +5467,9 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/SSL_get_stream_read_error_code.3ossl #usr/share/man/man3/SSL_get_stream_read_state.3ossl #usr/share/man/man3/SSL_get_stream_type.3ossl +#usr/share/man/man3/SSL_get_stream_write_buf_avail.3ossl +#usr/share/man/man3/SSL_get_stream_write_buf_size.3ossl +#usr/share/man/man3/SSL_get_stream_write_buf_used.3ossl #usr/share/man/man3/SSL_get_stream_write_error_code.3ossl #usr/share/man/man3/SSL_get_stream_write_state.3ossl #usr/share/man/man3/SSL_get_time.3ossl @@ -5382,6 +5477,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/SSL_get_tlsext_status_ocsp_resp.3ossl #usr/share/man/man3/SSL_get_tlsext_status_type.3ossl #usr/share/man/man3/SSL_get_tmp_key.3ossl +#usr/share/man/man3/SSL_get_value_uint.3ossl #usr/share/man/man3/SSL_get_verify_callback.3ossl #usr/share/man/man3/SSL_get_verify_depth.3ossl #usr/share/man/man3/SSL_get_verify_mode.3ossl @@ -5419,6 +5515,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/SSL_peek.3ossl #usr/share/man/man3/SSL_peek_ex.3ossl #usr/share/man/man3/SSL_pending.3ossl +#usr/share/man/man3/SSL_poll.3ossl #usr/share/man/man3/SSL_psk_client_cb_func.3ossl #usr/share/man/man3/SSL_psk_find_session_cb_func.3ossl #usr/share/man/man3/SSL_psk_server_cb_func.3ossl @@ -5483,9 +5580,12 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/SSL_set_default_stream_mode.3ossl #usr/share/man/man3/SSL_set_dh_auto.3ossl #usr/share/man/man3/SSL_set_ecdh_auto.3ossl +#usr/share/man/man3/SSL_set_event_handling_mode.3ossl #usr/share/man/man3/SSL_set_ex_data.3ossl #usr/share/man/man3/SSL_set_fd.3ossl +#usr/share/man/man3/SSL_set_feature_request_uint.3ossl #usr/share/man/man3/SSL_set_generate_session_id.3ossl +#usr/share/man/man3/SSL_set_generic_value_uint.3ossl #usr/share/man/man3/SSL_set_hostflags.3ossl #usr/share/man/man3/SSL_set_incoming_stream_policy.3ossl #usr/share/man/man3/SSL_set_info_callback.3ossl @@ -5534,6 +5634,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/SSL_set_tmp_dh_callback.3ossl #usr/share/man/man3/SSL_set_tmp_ecdh.3ossl #usr/share/man/man3/SSL_set_trust.3ossl +#usr/share/man/man3/SSL_set_value_uint.3ossl #usr/share/man/man3/SSL_set_verify.3ossl #usr/share/man/man3/SSL_set_verify_depth.3ossl #usr/share/man/man3/SSL_set_verify_result.3ossl @@ -5575,6 +5676,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/SSL_write.3ossl #usr/share/man/man3/SSL_write_early_data.3ossl #usr/share/man/man3/SSL_write_ex.3ossl +#usr/share/man/man3/SSL_write_ex2.3ossl #usr/share/man/man3/SSLv23_client_method.3ossl #usr/share/man/man3/SSLv23_method.3ossl #usr/share/man/man3/SSLv23_server_method.3ossl @@ -6011,6 +6113,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man3/X509_STORE_get0_objects.3ossl #usr/share/man/man3/X509_STORE_get0_param.3ossl #usr/share/man/man3/X509_STORE_get1_all_certs.3ossl +#usr/share/man/man3/X509_STORE_get1_objects.3ossl #usr/share/man/man3/X509_STORE_get_cert_crl.3ossl #usr/share/man/man3/X509_STORE_get_check_crl.3ossl #usr/share/man/man3/X509_STORE_get_check_issued.3ossl @@ -6857,6 +6960,7 @@ usr/lib/ossl-modules/legacy.so #usr/share/man/man7/openssl-core_names.h.7ossl #usr/share/man/man7/openssl-env.7ossl #usr/share/man/man7/openssl-glossary.7ossl +#usr/share/man/man7/openssl-qlog.7ossl #usr/share/man/man7/openssl-quic.7ossl #usr/share/man/man7/openssl-threads.7ossl #usr/share/man/man7/openssl_user_macros.7ossl diff --git a/config/rootfiles/core/188/filelists/cyrus-sasl b/config/rootfiles/core/188/filelists/cyrus-sasl new file mode 120000 index 0000000000..bb51b4c92c --- /dev/null +++ b/config/rootfiles/core/188/filelists/cyrus-sasl @@ -0,0 +1 @@ +../../../common/cyrus-sasl \ No newline at end of file diff --git a/config/rootfiles/core/188/filelists/libxslt b/config/rootfiles/core/188/filelists/libxslt new file mode 120000 index 0000000000..bf9d76609b --- /dev/null +++ b/config/rootfiles/core/188/filelists/libxslt @@ -0,0 +1 @@ +../../../common/libxslt \ No newline at end of file diff --git a/config/rootfiles/core/188/filelists/linux-atm b/config/rootfiles/core/188/filelists/linux-atm new file mode 120000 index 0000000000..8adccafbd6 --- /dev/null +++ b/config/rootfiles/core/188/filelists/linux-atm @@ -0,0 +1 @@ +../../../common/linux-atm \ No newline at end of file diff --git a/lfs/br2684ctl b/lfs/br2684ctl deleted file mode 100644 index f8ac496ec3..0000000000 --- a/lfs/br2684ctl +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = ipfire - -THISAPP = br2684ctl -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -install : $(TARGET) - -check : - -download : - -b2 : - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_SRC)/br2684ctl - cd $(DIR_SRC) && gcc $(CFLAGS) -latm $(DIR_SRC)/src/br2684ctl/br2684ctl.c -o br2684ctl - cd $(DIR_SRC) && install -v -m 755 br2684ctl /usr/bin/br2684ctl - @rm -rf $(DIR_SRC)/br2684ctl - @$(POSTBUILD) diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl index 060b9ad09a..98fa0a183b 100644 --- a/lfs/cyrus-sasl +++ b/lfs/cyrus-sasl @@ -26,7 +26,7 @@ include Config
SUMMARY = Implementation of Cyrus SASL API
-VER = 2.1.26 +VER = 2.1.28
THISAPP = cyrus-sasl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -53,7 +53,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 08fe5c1624e7cccb4b5e562f6987fddd047e1221b671cedbbb684d5a2f39e09a438ad14ffcedb5f398c203ca0b6e23574106c87f43a632028d50a69619c54970 +$(DL_FILE)_BLAKE2 = 6cca8c26cebb9c2ee5d539c43797d30b6309a476ec4233225789978e1d7315c4ea5d2abbc7f5464be0f3c0de5fd9212706b43fbc92f40b76cd0b1013cc00f823
install : $(TARGET)
@@ -86,12 +86,12 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && sed -i '/sasl_global/s/^static //' lib/client.c - cd $(DIR_APP) && sed -i 's/cat8/man8/' saslauthd/Makefile.am - cd $(DIR_APP) && autoconf
-ifeq "$(PASS)" "" + # Fix build with GCC 14 + cd $(DIR_APP) && sed '/saslint/a #include <time.h>' -i lib/saslutil.c + cd $(DIR_APP) && sed '/plugin_common/a #include <time.h>' -i plugins/cram.c + cd $(DIR_APP) && sed '/plugin_common/a #include <time.h>' -i plugins/digestmd5.c + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ --with-dbpath=/var/lib/sasl/sasldb2 \ --with-saslauthd=/var/run/saslauthd \ @@ -106,17 +106,5 @@ ifeq "$(PASS)" "" #install initscripts $(call INSTALL_INITSCRIPTS,$(SERVICES))
-else - # WITH LDAP SUPPORT AT THIS TIME - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ - --with-dbpath=/var/lib/sasl/sasldb2 \ - --with-saslauthd=/var/run \ - --with-ldap --enable-ldapdb - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make -C include - cd $(DIR_APP) && make -C sasldb - cd $(DIR_APP) && make -C plugins - cd $(DIR_APP) && libtool --mode=install install plugins/libldapdb.la /usr/lib/sasl2 -endif @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libxslt b/lfs/libxslt index 7100884181..12ee998008 100644 --- a/lfs/libxslt +++ b/lfs/libxslt @@ -24,7 +24,7 @@
include Config
-VER = 1.1.37 +VER = 1.1.42
THISAPP = libxslt-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 096d93dd7178bf4483207514b1435f5bf426eea4952ffab7cc00c3e85aa736534c4acb5377af9647aa77a0cd793205194509d997a7bb5cae692f65e326566cd8 +$(DL_FILE)_BLAKE2 = 91b2ca38807ae21b6629b8e19f4ab9d7d19bc0af17f2546e1cf278b2f2fff62b86bbbd996085fff322f3d5ae6c2b20bcfc4e9fb501c301d3fd5d56cf5b205ede
install : $(TARGET)
diff --git a/lfs/linux-atm b/lfs/linux-atm index c027044ae6..e2bbd06983 100644 --- a/lfs/linux-atm +++ b/lfs/linux-atm @@ -24,7 +24,7 @@
include Config
-VER = 2.4.1 +VER = 2.5.2
THISAPP = linux-atm-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = cc3d04d25198a811ebc3c98a28005b1ff62732f59ac1a9979492f5666c0d41dde8545e24b43e17a5b0e7151143802ce7196a2b668b39f59171276b3d53113e0e +$(DL_FILE)_BLAKE2 = 329aad437a1e6a17fd7d7d2b81c976a76c684aaf127006ed3af1e998a0f52df056747cc84fc13c933dc15c07246f1f00e4ff101ac98ef1dd1bea102830a83625
install : $(TARGET)
@@ -73,9 +73,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-atm-2.4.1-gcc-4.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-atm-2.4.1-arpd_includes.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-atm-2.4.1-linux-5.2-SIOCGSTAMP.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-atm-2.5.2-headers.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-atm-use_socklen_t.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-atm-remove-define-hacks.patch + cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-nls cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install diff --git a/lfs/openssl b/lfs/openssl index d6f565df2c..a714d4dcd1 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@
include Config
-VER = 3.2.2 +VER = 3.3.0
THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -72,7 +72,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = f42d44f31dc9ccf26ffe1fdd4a0119506a211808f92e860a34118109eae2ee7bcb5b0f43cbdf9eb811cd185cb53e092e62d652f7c0c0ce55b13289f7489073c9 +$(DL_FILE)_BLAKE2 = c68efaf8aca87961f396e305acc767b56d651b9adf4fd2c9d9b5a3266e35da4b856c6ed34be47d656c782aade975f20317a6759913b33d29d7eb088e638fa501
install : $(TARGET)
diff --git a/make.sh b/make.sh index 10ec607b16..f5dc2a6491 100755 --- a/make.sh +++ b/make.sh @@ -1793,7 +1793,6 @@ build_system() { lfsmake2 strongswan lfsmake2 rng-tools lfsmake2 lsof - lfsmake2 br2684ctl lfsmake2 lm_sensors lfsmake2 libstatgrab lfsmake2 liboping diff --git a/src/br2684ctl/br2684ctl.c b/src/br2684ctl/br2684ctl.c deleted file mode 100644 index 67734d0b84..0000000000 --- a/src/br2684ctl/br2684ctl.c +++ /dev/null @@ -1,271 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <string.h> -#include <syslog.h> -#include <atm.h> -#include <linux/atmdev.h> -#include <linux/atmbr2684.h> - -/* Written by Marcell GAL cell@sch.bme.hu to make use of the */ -/* ioctls defined in the br2684... kernel patch */ -/* Compile with cc -o br2684ctl br2684ctl.c -latm */ - -/* - Modified feb 2001 by Stephen Aaskov (saa@lasat.com) - - Added daemonization code - - Added syslog - - TODO: Delete interfaces after exit? -*/ - - -#define LOG_NAME "RFC1483/2684 bridge" -#define LOG_OPTION LOG_PERROR -#define LOG_FACILITY LOG_LOCAL0 - - -int lastsock, lastitf; - - -void fatal(const char *str, int i) -{ - syslog (LOG_ERR,"Fatal: %s",str); - exit(-2); -}; - - -void exitFunc(void) -{ - syslog (LOG_PID,"Daemon terminated\n"); -} - - -int create_pidfile(int num) -{ - FILE *pidfile = NULL; - char name[32]; - - if (num < 0) return -1; - - snprintf(name, 20, "/var/run/nas%d.pid", num); - pidfile = fopen(name, "w"); - if (pidfile == NULL) return -1; - fprintf(pidfile, "%d", getpid()); - fclose(pidfile); - - return 0; -} - -int create_br(char *nstr) -{ - int num, err; - - if(lastsock<0) { - lastsock = socket(PF_ATMPVC, SOCK_DGRAM, ATM_AAL5); - } - if (lastsock<0) { - syslog(LOG_ERR, "socket creation failed: %s",strerror(errno)); - } else { - /* create the device with ioctl: */ - num=atoi(nstr); - if( num>=0 && num<1234567890){ - struct atm_newif_br2684 ni; - ni.backend_num = ATM_BACKEND_BR2684; - ni.media = BR2684_MEDIA_ETHERNET; - ni.mtu = 1500; - sprintf(ni.ifname, "nas%d", num); - err=ioctl (lastsock, ATM_NEWBACKENDIF, &ni); - - if (err == 0) - syslog(LOG_INFO, "Interface "%s" created sucessfully\n",ni.ifname); - else - syslog(LOG_INFO, "Interface "%s" could not be created, reason: %s\n", - ni.ifname, - strerror(errno)); - lastitf=num; /* even if we didn't create, because existed, assign_vcc wil want to know it! */ - } else { - syslog(LOG_ERR,"err: strange interface number %d", num ); - } - } - return 0; -} - - -int assign_vcc(char *astr, int encap, int bufsize, struct atm_qos qos) -{ - int err; - struct sockaddr_atmpvc addr; - int fd; - struct atm_backend_br2684 be; - - memset(&addr, 0, sizeof(addr)); - err=text2atm(astr,(struct sockaddr *)(&addr), sizeof(addr), T2A_PVC); - if (err!=0) - syslog(LOG_ERR,"Could not parse ATM parameters (error=%d)\n",err); - -#if 0 - addr.sap_family = AF_ATMPVC; - addr.sap_addr.itf = itf; - addr.sap_addr.vpi = 0; - addr.sap_addr.vci = vci; -#endif - syslog(LOG_INFO,"Communicating over ATM %d.%d.%d, encapsulation: %s\n", addr.sap_addr.itf, - addr.sap_addr.vpi, - addr.sap_addr.vci, - encap?"VC mux":"LLC"); - - if ((fd = socket(PF_ATMPVC, SOCK_DGRAM, ATM_AAL5)) < 0) - syslog(LOG_ERR,"failed to create socket %d, reason: %s", errno,strerror(errno)); - - if (qos.aal == 0) { - qos.aal = ATM_AAL5; - qos.txtp.traffic_class = ATM_UBR; - qos.txtp.max_sdu = 1524; - qos.txtp.pcr = ATM_MAX_PCR; - qos.rxtp = qos.txtp; - } - - if ( (err=setsockopt(fd,SOL_SOCKET,SO_SNDBUF, &bufsize ,sizeof(bufsize))) ) - syslog(LOG_ERR,"setsockopt SO_SNDBUF: (%d) %s\n",err, strerror(err)); - - if (setsockopt(fd, SOL_ATM, SO_ATMQOS, &qos, sizeof(qos)) < 0) - syslog(LOG_ERR,"setsockopt SO_ATMQOS %d", errno); - - err = connect(fd, (struct sockaddr*)&addr, sizeof(struct sockaddr_atmpvc)); - - if (err < 0) - fatal("failed to connect on socket", err); - - /* attach the vcc to device: */ - - be.backend_num = ATM_BACKEND_BR2684; - be.ifspec.method = BR2684_FIND_BYIFNAME; - sprintf(be.ifspec.spec.ifname, "nas%d", lastitf); - be.fcs_in = BR2684_FCSIN_NO; - be.fcs_out = BR2684_FCSOUT_NO; - be.fcs_auto = 0; - be.encaps = encap ? BR2684_ENCAPS_VC : BR2684_ENCAPS_LLC; - be.has_vpiid = 0; - be.send_padding = 0; - be.min_size = 0; - err=ioctl (fd, ATM_SETBACKEND, &be); - if (err == 0) - syslog (LOG_INFO,"Interface configured"); - else { - syslog (LOG_ERR,"Could not configure interface:%s",strerror(errno)); - exit(2); - } - return fd ; -} - - -void usage(char *s) -{ - printf("usage: %s [-b] [[-c number] [-e 0|1] [-s sndbuf] [-q qos] [-a [itf.]vpi.vci]*]*\n", s); - exit(1); -} - - - -int main (int argc, char **argv) -{ - int c, background=0, encap=0, sndbuf=8192; - struct atm_qos reqqos; - int itfnum; - lastsock=-1; - lastitf=0; - - /* st qos to 0 */ - memset(&reqqos, 0, sizeof(reqqos)); - - openlog (LOG_NAME,LOG_OPTION,LOG_FACILITY); - if (argc>1) - while ((c = getopt(argc, argv,"q:a:bc:e:s:?h")) !=EOF) - switch (c) { - case 'q': - printf ("optarg : %s",optarg); - if (text2qos(optarg,&reqqos,0)) fprintf(stderr,"QOS parameter invalid\n"); - break; - case 'a': - assign_vcc(optarg, encap, sndbuf, reqqos); - break; - case 'b': - background=1; - break; - case 'c': - create_br(optarg); - itfnum = atoi(optarg); - break; - case 'e': - encap=(atoi(optarg)); - if(encap<0){ - syslog (LOG_ERR, "invalid encapsulation: %s:\n",optarg); - encap=0; - } - break; - case 's': - sndbuf=(atoi(optarg)); - if(sndbuf<0){ - syslog(LOG_ERR, "Invalid sndbuf: %s, using size of 8192 instead\n",optarg); - sndbuf=8192; - } - break; - case '?': - case 'h': - default: - usage(argv[0]); - } - else - usage(argv[0]); - - if (argc != optind) usage(argv[0]); - - if(lastsock>=0) close(lastsock); - - if (background) { - pid_t pid; - - pid=fork(); - if (pid < 0) { - fprintf(stderr,"Error detaching\n"); - exit(2); - } else if (pid) - exit(0); // This is the parent - - // Become a process group and session group leader - if (setsid()<0) { - fprintf (stderr,"Could not set process group\n"); - exit(2); - } - - // Fork again to let process group leader exit - pid = fork(); - if (pid < 0) { - fprintf(stderr,"Error detaching during second fork\n"); - exit(2); - } else if (pid) - exit(0); // This is the parent - - // Now we're ready for buisness - chdir("/"); // Don't keep directories in use - close(0); close(1); close(2); // Close stdin, -out and -error - /* - Note that this implementation does not keep an open - stdout/err. - If we need them they can be opened now - */ - - } - - create_pidfile(itfnum); - - syslog (LOG_INFO, "RFC 1483/2684 bridge daemon started\n"); - atexit (exitFunc); - - while (1) sleep(30); /* to keep the sockets... */ - return 0; -} - diff --git a/src/patches/linux-atm-2.4.1-arpd_includes.patch b/src/patches/linux-atm-2.4.1-arpd_includes.patch deleted file mode 100644 index 1a74ecf81c..0000000000 --- a/src/patches/linux-atm-2.4.1-arpd_includes.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: linux-atm-2.4.1/src/arpd/arp.c -=================================================================== ---- linux-atm-2.4.1.orig/src/arpd/arp.c 2007-10-20 19:19:10.002198470 +0200 -+++ linux-atm-2.4.1/src/arpd/arp.c 2007-10-20 19:19:19.138719139 +0200 -@@ -15,7 +15,6 @@ - #include <sys/types.h> - #include <sys/socket.h> /* for linux/if_arp.h */ - #include <netinet/in.h> /* for ntohs, etc. */ --#define _LINUX_NETDEVICE_H /* very crude hack for glibc2 */ - #include <linux/if_arp.h> - #include <linux/if_ether.h> - #include <atm.h> -Index: linux-atm-2.4.1/src/arpd/io.c -=================================================================== ---- linux-atm-2.4.1.orig/src/arpd/io.c 2007-10-20 19:19:09.994198016 +0200 -+++ linux-atm-2.4.1/src/arpd/io.c 2007-10-20 19:19:19.154720039 +0200 -@@ -16,12 +16,11 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <sys/ioctl.h> --#include <net/if.h> -+#include <linux/if.h> - #include <netinet/in.h> - #include <atm.h> - #include <linux/atmclip.h> /* for CLIP_DEFAULT_IDLETIMER */ - #include <linux/atmarp.h> --#define _LINUX_NETDEVICE_H /* glibc2 */ - #include <linux/if_arp.h> - - #include "atmd.h" -Index: linux-atm-2.4.1/src/arpd/itf.c -=================================================================== ---- linux-atm-2.4.1.orig/src/arpd/itf.c 2007-10-20 19:19:10.010198930 +0200 -+++ linux-atm-2.4.1/src/arpd/itf.c 2007-10-20 19:19:19.186721859 +0200 -@@ -12,7 +12,6 @@ - #include <sys/types.h> - #include <linux/atmclip.h> - #include <sys/socket.h> --#define _LINUX_NETDEVICE_H /* glibc2 */ - #include <linux/if_arp.h> - - #include "atmd.h" diff --git a/src/patches/linux-atm-2.4.1-gcc-4.patch b/src/patches/linux-atm-2.4.1-gcc-4.patch deleted file mode 100644 index f6be9d2f60..0000000000 --- a/src/patches/linux-atm-2.4.1-gcc-4.patch +++ /dev/null @@ -1,161 +0,0 @@ -diff -Naur linux-atm-2.4.1-orig/src/ilmid/atmf_uni.c linux-atm-2.4.1/src/ilmid/atmf_uni.c ---- linux-atm-2.4.1-orig/src/ilmid/atmf_uni.c 2001-09-03 19:41:06.000000000 +0100 -+++ linux-atm-2.4.1/src/ilmid/atmf_uni.c 2005-08-13 10:22:44.000000000 +0100 -@@ -187,7 +187,7 @@ - newPrefix->name = alloc_t(AsnOid); - newPrefix->name->octs = alloc(varBindName->octetLen); - AsnOidCopy(newPrefix->name, varBindName); -- Q_INSERT_BEFORE((NetPrefixNode *) var->value, newPrefix, prefix); -+ Q_INSERT_BEFORE((*((NetPrefixNode **)&var->value)), newPrefix, prefix); - if(atmNetPrefix.octs == NULL) - { - atmNetPrefix.octetLen = varBindName->octetLen - NETPREFIX_LEN - 2; -@@ -197,7 +197,7 @@ - } - else if (varbind->value->a.simple->a.number == INVALID && cmp == AsnOidEqual) - { -- Q_REMOVE((NetPrefixNode *) var->value, prefix); -+ Q_REMOVE((*((NetPrefixNode **) &var->value)), prefix); - } - - return NOERROR; -diff -Naur linux-atm-2.4.1-orig/src/lib/sapequal.c linux-atm-2.4.1/src/lib/sapequal.c ---- linux-atm-2.4.1-orig/src/lib/sapequal.c 2001-09-03 19:41:05.000000000 +0100 -+++ linux-atm-2.4.1/src/lib/sapequal.c 2005-02-06 19:24:37.000000000 +0000 -@@ -65,6 +65,7 @@ - CHECK(l2.itu.window,a.l2.itu.window > b.l2.itu.window); - break; - default: -+ ; - } - switch (a.l3_proto) { - case ATM_L3_X25: -@@ -83,6 +84,7 @@ - if (a.l3.user != b.l3.user) return 0; - break; - default: -+ ; - } - return 1; - } -diff -Naur linux-atm-2.4.1-orig/src/maint/atmtcp.c linux-atm-2.4.1/src/maint/atmtcp.c ---- linux-atm-2.4.1-orig/src/maint/atmtcp.c 2001-09-03 19:41:06.000000000 +0100 -+++ linux-atm-2.4.1/src/maint/atmtcp.c 2005-08-13 10:22:44.000000000 +0100 -@@ -60,7 +60,7 @@ - static IN *inputs = NULL; - static fd_set in_set; - static int fds = 0; --static int debug = 0; -+int debug = 0; - static int links = 0; - - -diff -Naur linux-atm-2.4.1-orig/src/maint/enitune.c linux-atm-2.4.1/src/maint/enitune.c ---- linux-atm-2.4.1-orig/src/maint/enitune.c 2001-09-03 19:41:06.000000000 +0100 -+++ linux-atm-2.4.1/src/maint/enitune.c 2005-02-06 19:24:37.000000000 +0000 -@@ -44,6 +44,7 @@ - if (*end || mult.rx <= 100) usage(name); - break; - default: -+ ; - } - if (argc != optind+1) usage(name); - sioc.number = strtol(argv[optind],&end,0); -diff -Naur linux-atm-2.4.1-orig/src/mpoad/p_factory.c linux-atm-2.4.1/src/mpoad/p_factory.c ---- linux-atm-2.4.1-orig/src/mpoad/p_factory.c 2001-09-03 19:41:06.000000000 +0100 -+++ linux-atm-2.4.1/src/mpoad/p_factory.c 2005-08-13 10:22:44.000000000 +0100 -@@ -31,16 +31,17 @@ - * beginning at location "addr". - */ - uint32_t sum = 0; -+ uint16_t *addr16 = addr; - - while( count > 1 ) { - /* This is the inner loop */ -- sum += * ((uint16_t *) addr)++; -+ sum += * addr16++; - count -= 2; - } - - /* Add left-over byte, if any */ - if( count > 0 ) -- sum += * (unsigned char *) addr; -+ sum += * (unsigned char *) addr16; - - /* Fold 32-bit sum to 16 bits */ - while (sum>>16) -diff -Naur linux-atm-2.4.1-orig/src/qgen/qlib.c linux-atm-2.4.1/src/qgen/qlib.c ---- linux-atm-2.4.1-orig/src/qgen/qlib.c 2001-09-03 19:41:05.000000000 +0100 -+++ linux-atm-2.4.1/src/qgen/qlib.c 2005-08-13 10:22:44.000000000 +0100 -@@ -26,8 +26,6 @@ - #include "op.h" - - --static int debug = 0; -- - - void PREFIX(report)(int severity,const char *msg,...) - { -@@ -830,6 +828,8 @@ - - #ifdef STANDALONE - -+int debug = 0; -+ - int main(int argc,const char **argv) - { - unsigned char msg[5000]; /* should be large enough for that */ -diff -Naur linux-atm-2.4.1-orig/src/qgen/qlib.h linux-atm-2.4.1/src/qgen/qlib.h ---- linux-atm-2.4.1-orig/src/qgen/qlib.h 2001-09-03 19:41:05.000000000 +0100 -+++ linux-atm-2.4.1/src/qgen/qlib.h 2005-08-13 10:22:44.000000000 +0100 -@@ -23,7 +23,6 @@ - #define Q_FATAL -1 - - --extern int q_dump; - extern void q_report(int severity,const char *msg,...); - - #ifdef DUMP_MODE -diff -Naur linux-atm-2.4.1-orig/src/sigd/proto.c linux-atm-2.4.1/src/sigd/proto.c ---- linux-atm-2.4.1-orig/src/sigd/proto.c 2001-09-03 19:41:06.000000000 +0100 -+++ linux-atm-2.4.1/src/sigd/proto.c 2005-02-06 19:24:37.000000000 +0000 -@@ -259,6 +259,7 @@ - break; - } - default: -+ ; - } - va_end(ap); - if ((size = q_close(&dsc)) >= 0) to_signaling(sock->sig,q_buffer,size); -@@ -288,6 +289,7 @@ - } - break; - default: -+ ; - } - va_end(ap); - } -diff -Naur linux-atm-2.4.1-orig/src/switch/debug/debug.c linux-atm-2.4.1/src/switch/debug/debug.c ---- linux-atm-2.4.1-orig/src/switch/debug/debug.c 2001-09-03 19:41:06.000000000 +0100 -+++ linux-atm-2.4.1/src/switch/debug/debug.c 2005-08-13 10:22:44.000000000 +0100 -@@ -18,7 +18,7 @@ - #define COMPONENT "FAB(debug)" - - --#define PRV(call) ((FAB *) (call)->fab) -+#define PRV(call) (*((FAB **) &(call)->fab)) - - - typedef struct _fab { -diff -Naur linux-atm-2.4.1-orig/src/switch/tcp/tcpsw.c linux-atm-2.4.1/src/switch/tcp/tcpsw.c ---- linux-atm-2.4.1-orig/src/switch/tcp/tcpsw.c 2001-09-03 19:41:06.000000000 +0100 -+++ linux-atm-2.4.1/src/switch/tcp/tcpsw.c 2005-08-13 10:22:44.000000000 +0100 -@@ -27,7 +27,7 @@ - - #define COMPONENT "FAB(tcp)" - --#define PRV(call) ((FAB *) (call)->fab) -+#define PRV(call) (*((FAB **) &(call)->fab)) - - #define MAX_VCI 1024 - diff --git a/src/patches/linux-atm-2.5.2-headers.patch b/src/patches/linux-atm-2.5.2-headers.patch new file mode 100644 index 0000000000..edfb38d68b --- /dev/null +++ b/src/patches/linux-atm-2.5.2-headers.patch @@ -0,0 +1,30 @@ +--- linux-atm/src/maint/hediag.c.orig ++++ linux-atm/src/maint/hediag.c +@@ -1,5 +1,6 @@ + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> + #include <unistd.h> + #include <sys/ioctl.h> + #include <sys/types.h> +--- linux-atm/src/qgen/ql_y.y ++++ linux-atm/src/qgen/ql_y.y +@@ -17,6 +17,8 @@ + static STRUCTURE *structures = NULL; + static const char *abort_id; /* indicates abort flag */ + ++void yyerror(const char *s); ++int yylex ( void ); + + static NAME_LIST *get_name_list(const char *name) + { +--- linux-atm/src/test/ispl_y.y ++++ linux-atm/src/test/ispl_y.y +@@ -16,6 +16,7 @@ + + static struct atmsvc_msg msg; + ++int yylex ( void ); + + %} + diff --git a/src/patches/linux-atm-remove-define-hacks.patch b/src/patches/linux-atm-remove-define-hacks.patch new file mode 100644 index 0000000000..cfac43c039 --- /dev/null +++ b/src/patches/linux-atm-remove-define-hacks.patch @@ -0,0 +1,22 @@ +diff -up linux-atm-2.5.1/src/arpd/arp.c.ftbfs linux-atm-2.5.1/src/arpd/arp.c +--- linux-atm-2.5.1/src/arpd/arp.c.ftbfs 2007-07-11 11:27:15.000000000 -0400 ++++ linux-atm-2.5.1/src/arpd/arp.c 2019-05-02 20:15:45.497338836 -0400 +@@ -15,7 +15,6 @@ + #include <sys/types.h> + #include <sys/socket.h> /* for linux/if_arp.h */ + #include <netinet/in.h> /* for ntohs, etc. */ +-#define _LINUX_NETDEVICE_H /* very crude hack for glibc2 */ + #include <linux/types.h> + #include <linux/if_arp.h> + #include <linux/if_ether.h> +diff -up linux-atm-2.5.1/src/arpd/itf.c.ftbfs linux-atm-2.5.1/src/arpd/itf.c +--- linux-atm-2.5.1/src/arpd/itf.c.ftbfs 2007-07-11 11:27:15.000000000 -0400 ++++ linux-atm-2.5.1/src/arpd/itf.c 2019-05-02 20:19:08.046499027 -0400 +@@ -12,7 +12,6 @@ + #include <sys/types.h> + #include <linux/atmclip.h> + #include <sys/socket.h> +-#define _LINUX_NETDEVICE_H /* glibc2 */ + #include <linux/types.h> + #include <linux/if_arp.h> + diff --git a/src/patches/linux-atm-use_socklen_t.patch b/src/patches/linux-atm-use_socklen_t.patch new file mode 100644 index 0000000000..cb630dc9f1 --- /dev/null +++ b/src/patches/linux-atm-use_socklen_t.patch @@ -0,0 +1,13 @@ +diff --git a/src/led/conn.c b/src/led/conn.c +index 99da5e4..89639e1 100644 +--- a/src/led/conn.c ++++ b/src/led/conn.c +@@ -405,7 +405,7 @@ Conn_t *accept_conn(Conn_t *conn) + { + Conn_t *new; + struct sockaddr_atmsvc addr; +- size_t len; ++ socklen_t len; + int fd; + char buff[MAX_ATM_ADDR_LEN+1]; +
hooks/post-receive -- IPFire 2.x development tree