From 523f8192dccbf9bf3050be6bdd24d536c670c5be Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Sun, 6 Apr 2025 18:38:27 +0000 Subject: [PATCH] =?UTF-8?q?freebsd:=2014.1=20=E2=86=92=2014.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/os-specific/bsd/freebsd/default.nix | 2 +- .../patches/14.1/ath-hal-clang19.patch | 239 ------------------ .../patches/14.1/mk-werror-clang19.patch | 25 -- .../14.1/sys-cdefs-static-assert.patch | 41 --- .../{14.1 => 14.2}/bmake-no-compiler-rt.patch | 0 .../compat-fix-typedefs-locations.patch | 0 .../{14.1 => 14.2}/compat-install-dirs.patch | 0 .../patches/{14.1 => 14.2}/fsck-path.patch | 0 .../install-bootstrap-Makefile.patch | 0 .../{14.1 => 14.2}/jail-use-path.patch | 4 +- .../libc-msun-arch-subdir.patch | 0 .../libc-no-force--lcompiler-rt.patch | 0 .../{14.1 => 14.2}/libcxxrt-headers.patch | 0 .../{14.1 => 14.2}/libelf-bootstrapping.patch | 0 .../libifconfig-no-internal.patch | 0 .../{14.1 => 14.2}/libnetbsd-do-install.patch | 0 .../librpcsvc-include-subdir.patch | 0 .../patches/{14.1 => 14.2}/localedef.patch | 0 .../patches/{14.1 => 14.2}/makefs-rdev.patch | 0 .../freebsd/patches/{14.1 => 14.2}/mk.patch | 0 .../{14.1 => 14.2}/mkimg-openbsd.patch | 0 .../{14.1 => 14.2}/mount-use-path.patch | 0 .../{14.1 => 14.2}/mtree-Makefile.patch | 0 .../no-perms-BSD.include.dist.patch | 0 .../patches/{14.1 => 14.2}/rc-user.patch | 0 .../{14.1 => 14.2}/rtld-elf-symlink.patch | 0 .../rtld-no-force--lcompiler-rt.patch | 0 .../patches/{14.1 => 14.2}/sys-gnu-date.patch | 0 .../sys-no-explicit-intrinsics-dep.patch | 0 .../{14.1 => 14.2}/tinfo-host-cc.patch | 0 pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix | 2 + pkgs/os-specific/bsd/freebsd/pkgs/source.nix | 6 + .../os-specific/bsd/freebsd/pkgs/uudecode.nix | 6 - pkgs/os-specific/bsd/freebsd/versions.json | 189 +++++++++++--- 34 files changed, 159 insertions(+), 355 deletions(-) delete mode 100644 pkgs/os-specific/bsd/freebsd/patches/14.1/ath-hal-clang19.patch delete mode 100644 pkgs/os-specific/bsd/freebsd/patches/14.1/mk-werror-clang19.patch delete mode 100644 pkgs/os-specific/bsd/freebsd/patches/14.1/sys-cdefs-static-assert.patch rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/bmake-no-compiler-rt.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/compat-fix-typedefs-locations.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/compat-install-dirs.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/fsck-path.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/install-bootstrap-Makefile.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/jail-use-path.patch (97%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/libc-msun-arch-subdir.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/libc-no-force--lcompiler-rt.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/libcxxrt-headers.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/libelf-bootstrapping.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/libifconfig-no-internal.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/libnetbsd-do-install.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/librpcsvc-include-subdir.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/localedef.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/makefs-rdev.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/mk.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/mkimg-openbsd.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/mount-use-path.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/mtree-Makefile.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/no-perms-BSD.include.dist.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/rc-user.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/rtld-elf-symlink.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/rtld-no-force--lcompiler-rt.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/sys-gnu-date.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/sys-no-explicit-intrinsics-dep.patch (100%) rename pkgs/os-specific/bsd/freebsd/patches/{14.1 => 14.2}/tinfo-host-cc.patch (100%) delete mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/uudecode.nix diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix index ac4809d7a2fe..91fbd2aa0b68 100644 --- a/pkgs/os-specific/bsd/freebsd/default.nix +++ b/pkgs/os-specific/bsd/freebsd/default.nix @@ -3,7 +3,7 @@ generateSplicesForMkScope, callPackage, attributePathToSplice ? [ "freebsd" ], - branch ? "release/14.1.0", + branch ? "release/14.2.0", }: let diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/ath-hal-clang19.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/ath-hal-clang19.patch deleted file mode 100644 index 09a64e1a3edd..000000000000 --- a/pkgs/os-specific/bsd/freebsd/patches/14.1/ath-hal-clang19.patch +++ /dev/null @@ -1,239 +0,0 @@ -commit 36d486cc2ecdb9c290dba65bd5668b7e50d0d822 -Author: Dimitry Andric -Date: Wed Jul 31 11:43:50 2024 +0200 - - Fix enum warning in ath_hal's ar9002 - - This fixes a clang 19 warning: - - sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c:57:32: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_ANT_SETTING') [-Werror,-Wenum-compare] - 57 | (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) { - | ~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~ - - The `ah_diversity` field of `struct ath_hal_5212` is of type `HAL_BOOL`, - not the enum type `HAL_ANT_SETTING`. In other code, `ah_diversity` is - set to `AH_TRUE` whenever the related field `ah_antControl` is set to - `HAL_ANT_VARIABLE`. - - It is not entirely clear to me what the intended statement is here: the - test as it is written now compares the enum value 0 to `ah_diversity`, - so in effect it enables the following block whenever `ah_diversity` is - `AH_TRUE`. Write it like that, to avoid the compiler warning. - - MFC after: 3 days - -diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c -index 01a224cbbfe9..fb2700771ffa 100644 ---- a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c -+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c -@@ -54,7 +54,7 @@ ar9285BTCoexAntennaDiversity(struct ath_hal *ah) - !! (ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE)); - - if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ALLOW) || -- (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) { -+ (AH5212(ah)->ah_diversity == AH_TRUE)) { - if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE) && - (AH5212(ah)->ah_antControl == HAL_ANT_VARIABLE)) { - /* Enable antenna diversity */ -commit 82246ac5d890e031c9978052e5a431e0960182d5 -Author: Dimitry Andric -Date: Wed Jul 31 11:37:20 2024 +0200 - - Fix enum warnings in ath_hal's ar9300 - - This fixes a number of clang 19 warnings: - - sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c:709:25: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_FREQ_BAND') [-Werror,-Wenum-compare] - 709 | freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ' - 148 | (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) - | ~~~ ^ ~~~~~~~~~~~~~~~~~~ - sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c:745:25: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_FREQ_BAND') [-Werror,-Wenum-compare] - 745 | freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ' - 148 | (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) - | ~~~ ^ ~~~~~~~~~~~~~~~~~~ - sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c:781:25: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_FREQ_BAND') [-Werror,-Wenum-compare] - 781 | freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ' - 148 | (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) - | ~~~ ^ ~~~~~~~~~~~~~~~~~~ - - The `FBIN2FREQ()` and `FREQ2FBIN()` macros in `ar9300eep.h` are invoked - in most places around the `ath_hal` code with a (effectively) boolean - second argument, corresponding to "is this 2GHz?". But in the code that - is warned about, the value `HAL_FREQ_BAND_2GHZ` is of a different - non-boolean type, `HAL_FREQ_BAND`. - - Update the `FBIN2FREQ()` and `FREQ2FBIN()` macros to interpret the - second argument as boolean value, and rename the macro parameter names - to better describe their meaning. - - Reviewed by: adrian, bz - MFC after: 3 days - Differential Revision: https://reviews.freebsd.org/D46201 - -diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h -index 9230fd57e2e4..b2a0862c7aee 100644 ---- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h -+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h -@@ -142,10 +142,10 @@ enum Ar9300EepromTemplate - #define OSPREY_EEPMISC_WOW 0x02 - #define OSPREY_CUSTOMER_DATA_SIZE 20 - --#define FREQ2FBIN(x,y) \ -- (u_int8_t)(((y) == HAL_FREQ_BAND_2GHZ) ? ((x) - 2300) : (((x) - 4800) / 5)) --#define FBIN2FREQ(x,y) \ -- (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) -+#define FREQ2FBIN(freq,is_2ghz) \ -+ (u_int8_t)((is_2ghz) ? ((freq) - 2300) : (((freq) - 4800) / 5)) -+#define FBIN2FREQ(freq,is_2ghz) \ -+ ((is_2ghz) ? (2300 + freq) : (4800 + 5 * freq)) - #define OSPREY_MAX_CHAINS 3 - #define OSPREY_ANT_16S 25 - #define OSPREY_FUTURE_MODAL_SZ 6 -commit 1bd66fac35ec27fa64d6158f82fdcbdc26098679 -Author: Dimitry Andric -Date: Wed Jul 31 13:14:17 2024 +0200 - - Fix enum warning in isci - - This fixes a clang 19 warning: - - sys/dev/isci/scil/scif_sas_smp_remote_device.c:197:26: error: comparison of different enumeration types ('SCI_IO_STATUS' (aka 'enum _SCI_IO_STATUS') and 'enum _SCI_STATUS') [-Werror,-Wenum-compare] - 197 | if (completion_status == SCI_FAILURE_RETRY_REQUIRED) - | ~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~ - - The `completion_status` variable is of type `SCI_IO_STATUS`, not - `SCI_STATUS`. In this case, we can seamlessly replace the value with - `SCI_IO_FAILURE_RETRY_REQUIRED`, which is numerically equal to - `SCI_FAILURE_RETRY_REQUIRED`. - - MFC after: 3 days - -diff --git a/sys/dev/isci/scil/scif_sas_smp_remote_device.c b/sys/dev/isci/scil/scif_sas_smp_remote_device.c -index d6055adc13f9..c72402f66889 100644 ---- a/sys/dev/isci/scil/scif_sas_smp_remote_device.c -+++ b/sys/dev/isci/scil/scif_sas_smp_remote_device.c -@@ -194,7 +194,7 @@ SCI_STATUS scif_sas_smp_remote_device_decode_smp_response( - - //if Core set the status of this io to be RETRY_REQUIRED, we should - //retry the IO without even decode the response. -- if (completion_status == SCI_FAILURE_RETRY_REQUIRED) -+ if (completion_status == SCI_IO_FAILURE_RETRY_REQUIRED) - { - scif_sas_smp_remote_device_continue_current_activity( - fw_device, fw_request, SCI_FAILURE_RETRY_REQUIRED -commit 357378bbdedf24ce2b90e9bd831af4a9db3ec70a -Author: Dimitry Andric -Date: Wed Jul 31 14:21:25 2024 +0200 - - Fix enum warnings in qat - - This fixes a number of clang 19 warnings: - - sys/dev/qat/qat_api/common/compression/dc_session.c:154:15: error: comparison of different enumeration types ('enum _CpaBoolean' and 'icp_qat_hw_compression_delayed_match_t') [-Werror,-Wenum-compare] - 154 | if (CPA_TRUE == pService->comp_device_data.enableDmm) { - | ~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - sys/dev/qat/qat_api/common/compression/dc_session.c:285:17: error: comparison of different enumeration types ('enum _CpaBoolean' and 'icp_qat_hw_compression_delayed_match_t') [-Werror,-Wenum-compare] - 285 | (CPA_TRUE == pService->comp_device_data.enableDmm) ? - | ~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - The `enableDmm` field of variable `comp_device_data` is of type - `icp_qat_hw_compression_delayed_match_t`, not `CpaBoolean`. In this - case, we can seamlessly replace the value with - `ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED`, which is numerically - equal to `CPA_TRUE`. - - MFC after: 3 days - -diff --git a/sys/dev/qat/qat_api/common/compression/dc_session.c b/sys/dev/qat/qat_api/common/compression/dc_session.c -index c92d6eebdc47..60f4410dac32 100644 ---- a/sys/dev/qat/qat_api/common/compression/dc_session.c -+++ b/sys/dev/qat/qat_api/common/compression/dc_session.c -@@ -151,7 +151,8 @@ dcCompHwBlockPopulate(sal_compression_service_t *pService, - } - - /* Set delay match mode */ -- if (CPA_TRUE == pService->comp_device_data.enableDmm) { -+ if (ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED == -+ pService->comp_device_data.enableDmm) { - dmm = ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED; - } else { - dmm = ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_DISABLED; -@@ -282,7 +283,8 @@ dcCompHwBlockPopulateGen4(sal_compression_service_t *pService, - hw_comp_lower_csr.hash_update = - ICP_QAT_HW_COMP_20_SKIP_HASH_UPDATE_DONT_ALLOW; - hw_comp_lower_csr.edmm = -- (CPA_TRUE == pService->comp_device_data.enableDmm) ? -+ (ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED == -+ pService->comp_device_data.enableDmm) ? - ICP_QAT_HW_COMP_20_EXTENDED_DELAY_MATCH_MODE_EDMM_ENABLED : - ICP_QAT_HW_COMP_20_EXTENDED_DELAY_MATCH_MODE_EDMM_DISABLED; - -commit 67be1e195acfaec99ce4fffeb17111ce085755f7 -Author: Dimitry Andric -Date: Wed Jul 31 13:01:20 2024 +0200 - - Fix enum warning in iavf - - This fixes a clang 19 warning: - - sys/dev/iavf/iavf_lib.c:514:39: error: comparison of different enumeration types ('enum virtchnl_vsi_type' and 'enum iavf_vsi_type') [-Werror,-Wenum-compare] - 514 | if (sc->vf_res->vsi_res[i].vsi_type == IAVF_VSI_SRIOV) - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~ - - The `vsi_type` field of `struct virtchnl_vsi_resource` is of type `enum - virtchnl_vsi_type`, not `enum iavf_vsi_type`. In this case, we can - seamlessly replace the value with `VIRTCHNL_VSI_SRIOV`, which is - numerically equal to `IAVF_VSI_SRIOV`. - - MFC after: 3 days - -diff --git a/sys/dev/iavf/iavf_lib.c b/sys/dev/iavf/iavf_lib.c -index 883a722b3a03..f80e3765448f 100644 ---- a/sys/dev/iavf/iavf_lib.c -+++ b/sys/dev/iavf/iavf_lib.c -@@ -511,7 +511,7 @@ iavf_get_vsi_res_from_vf_res(struct iavf_sc *sc) - - for (int i = 0; i < sc->vf_res->num_vsis; i++) { - /* XXX: We only use the first VSI we find */ -- if (sc->vf_res->vsi_res[i].vsi_type == IAVF_VSI_SRIOV) -+ if (sc->vf_res->vsi_res[i].vsi_type == VIRTCHNL_VSI_SRIOV) - sc->vsi_res = &sc->vf_res->vsi_res[i]; - } - if (!sc->vsi_res) { -commit 6f25b46721a18cf4f036d041e7e5d275800a00b3 -Author: Dimitry Andric -Date: Tue Jul 30 20:31:47 2024 +0200 - - Fix enum warning in heimdal - - This fixes a clang 19 warning: - - crypto/heimdal/lib/krb5/deprecated.c:75:17: error: comparison of different enumeration types ('krb5_keytype' (aka 'enum ENCTYPE') and 'enum krb5_keytype_old') [-Werror,-Wenum-compare] - 75 | if (keytype != KEYTYPE_DES || context->etypes_des == NULL) - | ~~~~~~~ ^ ~~~~~~~~~~~ - - In https://github.com/heimdal/heimdal/commit/3bebbe5323 this was solved - by adding a cast. That commit is rather large, so I'm only applying the - one-liner here. - - MFC after: 3 days - -diff --git a/crypto/heimdal/lib/krb5/deprecated.c b/crypto/heimdal/lib/krb5/deprecated.c -index e7c0105ebf7f..02cf7614f932 100644 ---- a/crypto/heimdal/lib/krb5/deprecated.c -+++ b/crypto/heimdal/lib/krb5/deprecated.c -@@ -72,7 +72,7 @@ krb5_keytype_to_enctypes_default (krb5_context context, - unsigned int i, n; - krb5_enctype *ret; - -- if (keytype != KEYTYPE_DES || context->etypes_des == NULL) -+ if (keytype != (krb5_keytype)KEYTYPE_DES || context->etypes_des == NULL) - return krb5_keytype_to_enctypes (context, keytype, len, val); - - for (n = 0; context->etypes_des[n]; ++n) diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/mk-werror-clang19.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/mk-werror-clang19.patch deleted file mode 100644 index 5bc224eaa97e..000000000000 --- a/pkgs/os-specific/bsd/freebsd/patches/14.1/mk-werror-clang19.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit d575077527d448ee45b923fa8c6b0cb7216ca5c5 -Author: Dimitry Andric -Date: Tue Jul 30 20:28:51 2024 +0200 - - bsd.sys.mk: for clang >= 19, similar to gcc >= 8.1, turn off -Werror for - -Wcast-function-type-mismatch. - - PR: 280562 - MFC after: 1 month - -diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk -index 52c3d07746c7..1934a79a5427 100644 ---- a/share/mk/bsd.sys.mk -+++ b/share/mk/bsd.sys.mk -@@ -88,6 +88,10 @@ CWARNFLAGS.clang+= -Wno-unused-const-variable - .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150000 - CWARNFLAGS.clang+= -Wno-error=unused-but-set-parameter - .endif -+.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 190000 -+# Similar to gcc >= 8.1 -Wno-error=cast-function-type below -+CWARNFLAGS.clang+= -Wno-error=cast-function-type-mismatch -+.endif - .endif # WARNS <= 6 - .if ${WARNS} <= 3 - CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-unused-value\ diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-cdefs-static-assert.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-cdefs-static-assert.patch deleted file mode 100644 index b5a054f124d3..000000000000 --- a/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-cdefs-static-assert.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 22cdafe197ac960c5ce839ef6ec699b59f4b0080 Mon Sep 17 00:00:00 2001 -From: Warner Losh -Date: Sat, 20 Jul 2024 09:57:53 -0600 -Subject: cdefs.h: Don't define fallback for _Static_assert - -Remove pre 4.6 code to define _Static_assert in terms of _COUNTER. We -no longer need to support compilers this old (in fact support for all -pre gcc 10 compilers has been removed in -current). This is a partial -MFC of that work because removing this fixes a bug that's oft reported -with -pedantic-errors and C++98 compilations. - -PR: 280382, 276738 -Sponsored by: Netflix - -This is a direct commit to stable/14. ---- - sys/sys/cdefs.h | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h -index 19b7d8fe427d..a52864c5db9d 100644 ---- a/sys/sys/cdefs.h -+++ b/sys/sys/cdefs.h -@@ -277,15 +277,6 @@ - #if (defined(__cplusplus) && __cplusplus >= 201103L) || \ - __has_extension(cxx_static_assert) - #define _Static_assert(x, y) static_assert(x, y) --#elif __GNUC_PREREQ__(4,6) && !defined(__cplusplus) --/* Nothing, gcc 4.6 and higher has _Static_assert built-in */ --#elif defined(__COUNTER__) --#define _Static_assert(x, y) __Static_assert(x, __COUNTER__) --#define __Static_assert(x, y) ___Static_assert(x, y) --#define ___Static_assert(x, y) typedef char __assert_ ## y[(x) ? 1 : -1] \ -- __unused --#else --#define _Static_assert(x, y) struct __hack - #endif - #endif - --- -cgit v1.2.3 diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/bmake-no-compiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/bmake-no-compiler-rt.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/bmake-no-compiler-rt.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/bmake-no-compiler-rt.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/compat-fix-typedefs-locations.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/compat-fix-typedefs-locations.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/compat-fix-typedefs-locations.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/compat-fix-typedefs-locations.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/compat-install-dirs.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/compat-install-dirs.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/compat-install-dirs.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/compat-install-dirs.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/fsck-path.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/fsck-path.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/fsck-path.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/fsck-path.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/install-bootstrap-Makefile.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/install-bootstrap-Makefile.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/install-bootstrap-Makefile.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/install-bootstrap-Makefile.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/jail-use-path.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/jail-use-path.patch similarity index 97% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/jail-use-path.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/jail-use-path.patch index 4dc65933e375..5e254becd142 100644 --- a/pkgs/os-specific/bsd/freebsd/patches/14.1/jail-use-path.patch +++ b/pkgs/os-specific/bsd/freebsd/patches/14.2/jail-use-path.patch @@ -2,7 +2,7 @@ In a NixOS-like system, it doesn't make sense to hardcode these absolute paths. They even already use execvp! diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c -index 9eabcc5ff53c..2024f6bfb97a 100644 +index 9004b4729fec..669e85ed847e 100644 --- a/usr.sbin/jail/command.c +++ b/usr.sbin/jail/command.c @@ -363,7 +363,7 @@ run_command(struct cfjail *j) @@ -107,6 +107,6 @@ index 9eabcc5ff53c..2024f6bfb97a 100644 setenv("SHELL", - *pwd->pw_shell ? pwd->pw_shell : _PATH_BSHELL, 1); + *pwd->pw_shell ? pwd->pw_shell : "sh", 1); - if (clean && chdir(pwd->pw_dir) < 0) { + if (clean && username && chdir(pwd->pw_dir) < 0) { jail_warnx(j, "chdir %s: %s", pwd->pw_dir, strerror(errno)); diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/libc-msun-arch-subdir.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/libc-msun-arch-subdir.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/libc-msun-arch-subdir.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/libc-msun-arch-subdir.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/libc-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/libc-no-force--lcompiler-rt.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/libc-no-force--lcompiler-rt.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/libc-no-force--lcompiler-rt.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/libcxxrt-headers.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/libcxxrt-headers.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/libcxxrt-headers.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/libcxxrt-headers.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/libelf-bootstrapping.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/libelf-bootstrapping.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/libelf-bootstrapping.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/libelf-bootstrapping.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/libifconfig-no-internal.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/libifconfig-no-internal.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/libifconfig-no-internal.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/libifconfig-no-internal.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/libnetbsd-do-install.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/libnetbsd-do-install.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/libnetbsd-do-install.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/libnetbsd-do-install.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/librpcsvc-include-subdir.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/librpcsvc-include-subdir.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/librpcsvc-include-subdir.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/librpcsvc-include-subdir.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/localedef.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/localedef.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/localedef.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/localedef.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/makefs-rdev.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/makefs-rdev.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/makefs-rdev.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/makefs-rdev.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/mk.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/mk.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/mk.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/mk.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/mkimg-openbsd.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/mkimg-openbsd.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/mkimg-openbsd.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/mkimg-openbsd.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/mount-use-path.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/mount-use-path.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/mount-use-path.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/mount-use-path.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/mtree-Makefile.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/mtree-Makefile.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/mtree-Makefile.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/mtree-Makefile.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/no-perms-BSD.include.dist.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/no-perms-BSD.include.dist.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/no-perms-BSD.include.dist.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/no-perms-BSD.include.dist.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/rc-user.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/rc-user.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/rc-user.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/rc-user.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/rtld-elf-symlink.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/rtld-elf-symlink.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/rtld-elf-symlink.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/rtld-elf-symlink.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/rtld-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/rtld-no-force--lcompiler-rt.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/rtld-no-force--lcompiler-rt.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/rtld-no-force--lcompiler-rt.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-gnu-date.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/sys-gnu-date.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/sys-gnu-date.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/sys-gnu-date.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-no-explicit-intrinsics-dep.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/sys-no-explicit-intrinsics-dep.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/sys-no-explicit-intrinsics-dep.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/sys-no-explicit-intrinsics-dep.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/tinfo-host-cc.patch b/pkgs/os-specific/bsd/freebsd/patches/14.2/tinfo-host-cc.patch similarity index 100% rename from pkgs/os-specific/bsd/freebsd/patches/14.1/tinfo-host-cc.patch rename to pkgs/os-specific/bsd/freebsd/patches/14.2/tinfo-host-cc.patch diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix index 963c49ea1952..f8b4859a68eb 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix @@ -15,6 +15,8 @@ mkDerivation { export MAKEOBJDIRPREFIX=$TMP/obj ''; + alwaysKeepStatic = true; + meta = with lib; { platform = platforms.freebsd; license = licenses.cddl; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/source.nix b/pkgs/os-specific/bsd/freebsd/pkgs/source.nix index c14d26559047..9e1c4032ad61 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/source.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/source.nix @@ -7,4 +7,10 @@ fetchFromGitHub { owner = "freebsd"; repo = "freebsd-src"; inherit (sourceData) rev hash; + + # The GitHub export excludes some files in the git source + # that were marked `export-ignore`. + # A normal git checkout will keep those files, + # matching the update script + forceFetchGit = true; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/uudecode.nix b/pkgs/os-specific/bsd/freebsd/pkgs/uudecode.nix deleted file mode 100644 index 7e2341913dc0..000000000000 --- a/pkgs/os-specific/bsd/freebsd/pkgs/uudecode.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ mkDerivation }: - -mkDerivation { - path = "usr.bin/uudecode"; - MK_TESTS = "no"; -} diff --git a/pkgs/os-specific/bsd/freebsd/versions.json b/pkgs/os-specific/bsd/freebsd/versions.json index 198b99957864..e8c3c7ec80c5 100644 --- a/pkgs/os-specific/bsd/freebsd/versions.json +++ b/pkgs/os-specific/bsd/freebsd/versions.json @@ -1,15 +1,15 @@ { "main": { - "hash": "sha256-jQpuNjo7n5b4yXGgXR9ggTkrb4r4pFPXdunBipetw+c=", + "hash": "sha256-xsgY5Ex/B5ngOTa5OZRauSaSYvET5lWI7veJRrSq1oY=", "ref": "main", "refType": "branch", - "rev": "82283cad12a417abfb1469d899b2d7cfb1d38f77", + "rev": "c5773d366ecc5271b9bd6e5506c00fb3520f19ae", "supported": false, "version": { "branch": "CURRENT", "major": 15, "minor": 0, - "reldate": "1500021", + "reldate": "1500035", "release": "15.0-CURRENT", "revision": "15.0", "type": "FreeBSD", @@ -88,6 +88,42 @@ "version": "FreeBSD 13.3-RELEASE" } }, + "release/13.4.0": { + "hash": "sha256-ztmoDr8Y4ZpMBT7E1hen5hf3H7na/cydvpjNmuUDmjs=", + "ref": "release/13.4.0", + "refType": "tag", + "rev": "58066db597befb899b2fe59031b2a32fb9183f0f", + "supported": false, + "version": { + "branch": "RELEASE", + "major": 13, + "minor": 4, + "patch": 0, + "reldate": "1304000", + "release": "13.4-RELEASE", + "revision": "13.4", + "type": "FreeBSD", + "version": "FreeBSD 13.4-RELEASE" + } + }, + "release/13.5.0": { + "hash": "sha256-53q7qR3ij5v3QAHx6Wa84F3yRSwFrBaey0NxVcNLMEk=", + "ref": "release/13.5.0", + "refType": "tag", + "rev": "882b9f3f2218b50fc1d2d31ee71b7765c7f09f85", + "supported": false, + "version": { + "branch": "RELEASE", + "major": 13, + "minor": 5, + "patch": 0, + "reldate": "1305000", + "release": "13.5-RELEASE", + "revision": "13.5", + "type": "FreeBSD", + "version": "FreeBSD 13.5-RELEASE" + } + }, "release/14.0.0": { "hash": "sha256-eBKwCYcOG9Lg7gBA2gZqxQFO/3uMMrcQGtgqi8se6zA=", "ref": "release/14.0.0", @@ -124,6 +160,24 @@ "version": "FreeBSD 14.1-RELEASE" } }, + "release/14.2.0": { + "hash": "sha256-qZkeuUZbuPOvXZBgP5x6Hii1YN7XdDJzwZeYacIR5BI=", + "ref": "release/14.2.0", + "refType": "tag", + "rev": "c8918d6c7412fce87922e9bd7e4f5c7d7ca96eb7", + "supported": false, + "version": { + "branch": "RELEASE", + "major": 14, + "minor": 2, + "patch": 0, + "reldate": "1402000", + "release": "14.2-RELEASE", + "revision": "14.2", + "type": "FreeBSD", + "version": "FreeBSD 14.2-RELEASE" + } + }, "releng/13.0": { "hash": "sha256-7PrqTb2o21IQgQ2N+zjavlzX/ju60Rw+MXjMRICmQi0=", "ref": "releng/13.0", @@ -179,91 +233,144 @@ } }, "releng/13.3": { - "hash": "sha256-jvXIrlNmaGe4gyYCK/3wjm9JWBQOU0sD1LPxWykNddI=", + "hash": "sha256-mVEt1wGvQ2xFRsEzVf+GDfroF8sxUAVooIr0yU/80Yg=", "ref": "releng/13.3", "refType": "branch", - "rev": "deb948cd8dc2efb341ce96e1b7a56c9fbc662ba1", + "rev": "72aa3d55e9ff8634edf8a28162470969133ea7ca", + "supported": false, + "version": { + "branch": "RELEASE-p8", + "major": 13, + "minor": 3, + "patch": "8", + "reldate": "1303001", + "release": "13.3-RELEASE-p8", + "revision": "13.3", + "type": "FreeBSD", + "version": "FreeBSD 13.3-RELEASE-p8" + } + }, + "releng/13.4": { + "hash": "sha256-y61CplXIRVDkGRtbH2TX9AKr0kiaNaqAT/+fXdkvy6g=", + "ref": "releng/13.4", + "refType": "branch", + "rev": "27f132c05c39138b375591d2bf9f73f680997de3", "supported": true, "version": { "branch": "RELEASE-p4", "major": 13, - "minor": 3, + "minor": 4, "patch": "4", - "reldate": "1303001", - "release": "13.3-RELEASE-p4", - "revision": "13.3", + "reldate": "1304000", + "release": "13.4-RELEASE-p4", + "revision": "13.4", "type": "FreeBSD", - "version": "FreeBSD 13.3-RELEASE-p4" + "version": "FreeBSD 13.4-RELEASE-p4" + } + }, + "releng/13.5": { + "hash": "sha256-53q7qR3ij5v3QAHx6Wa84F3yRSwFrBaey0NxVcNLMEk=", + "ref": "releng/13.5", + "refType": "branch", + "rev": "882b9f3f2218b50fc1d2d31ee71b7765c7f09f85", + "supported": true, + "version": { + "branch": "RELEASE", + "major": 13, + "minor": 5, + "reldate": "1305000", + "release": "13.5-RELEASE", + "revision": "13.5", + "type": "FreeBSD", + "version": "FreeBSD 13.5-RELEASE" } }, "releng/14.0": { - "hash": "sha256-kQ3r/bnBiOZ6kpnouFLKWdpSiJe3FGWJ/XA6VRNFzEc=", + "hash": "sha256-7FjXduO4JCAnrYCR34J7a6WjDQaT/MWufPnUKT9IBr0=", "ref": "releng/14.0", "refType": "branch", - "rev": "5e23806790ef4825ac09b458d3df941748599fbb", + "rev": "f10e328cb1921d2f5f0253565f38e0daa667db69", + "supported": false, + "version": { + "branch": "RELEASE-p11", + "major": 14, + "minor": 0, + "patch": "11", + "reldate": "1400097", + "release": "14.0-RELEASE-p11", + "revision": "14.0", + "type": "FreeBSD", + "version": "FreeBSD 14.0-RELEASE-p11" + } + }, + "releng/14.1": { + "hash": "sha256-GOLMbuRAdIFB4fQxyrFokhU1/kmDfw7S2zvt8BVTQeM=", + "ref": "releng/14.1", + "refType": "branch", + "rev": "f389e68ca980b7e053a34d9eddde89b4c2a1ee6c", "supported": true, "version": { "branch": "RELEASE-p8", "major": 14, - "minor": 0, + "minor": 1, "patch": "8", - "reldate": "1400097", - "release": "14.0-RELEASE-p8", - "revision": "14.0", + "reldate": "1401000", + "release": "14.1-RELEASE-p8", + "revision": "14.1", "type": "FreeBSD", - "version": "FreeBSD 14.0-RELEASE-p8" + "version": "FreeBSD 14.1-RELEASE-p8" } }, - "releng/14.1": { - "hash": "sha256-rURDGcnMzUhz2I873d5ro+wGY+i8IOmiPJ5T+w4TcPA=", - "ref": "releng/14.1", + "releng/14.2": { + "hash": "sha256-XP8BFnXvziaC9wOJj8q31UZXFqCUE7WQ5FdJHEZWGbg=", + "ref": "releng/14.2", "refType": "branch", - "rev": "dcdea9e8623e83e3aef15fff0d6ead05382ad138", + "rev": "ac2cbb46b5f1efa7f7b5d4eb15631337329ec5b2", "supported": true, "version": { "branch": "RELEASE-p2", "major": 14, - "minor": 1, + "minor": 2, "patch": "2", - "reldate": "1401000", - "release": "14.1-RELEASE-p2", - "revision": "14.1", + "reldate": "1402000", + "release": "14.2-RELEASE-p2", + "revision": "14.2", "type": "FreeBSD", - "version": "FreeBSD 14.1-RELEASE-p2" + "version": "FreeBSD 14.2-RELEASE-p2" } }, "stable/13": { - "hash": "sha256-kbz6dpkCVYrTcPNJtKvX0TVQ4qULaOJ/WzCeQ4MYrFU=", + "hash": "sha256-J9SJKeR6Den3Sep2o4r0cqIDd2V5gbY0Ow9eP69Ny0o=", "ref": "stable/13", "refType": "branch", - "rev": "8d87e47b8d1093a264ca954620b9e58b81fb9b34", + "rev": "a8431b47adae8f8b731206dc38d82b2245ad245e", "supported": true, "version": { - "branch": "PRERELEASE", + "branch": "STABLE", "major": 13, - "minor": 4, - "reldate": "1303503", - "release": "13.4-PRERELEASE", - "revision": "13.4", + "minor": 5, + "reldate": "1305500", + "release": "13.5-STABLE", + "revision": "13.5", "type": "FreeBSD", - "version": "FreeBSD 13.4-PRERELEASE" + "version": "FreeBSD 13.5-STABLE" } }, "stable/14": { - "hash": "sha256-ImSKU2m2Ecss1A4uTGvh0Z4ZyhN2jem0If9jlan9tM0=", + "hash": "sha256-tleB6J5Cg1SIN2LCfvV3Cfp4Lxx65UHmiILpin6UYGY=", "ref": "stable/14", "refType": "branch", - "rev": "2c75d993783ca4b0d1bf8dcdf424643781326e4b", + "rev": "6e510d8fbaf8d91da235fe28250cd48124edda9f", "supported": true, "version": { "branch": "STABLE", "major": 14, - "minor": 1, - "reldate": "1401501", - "release": "14.1-STABLE", - "revision": "14.1", + "minor": 2, + "reldate": "1402504", + "release": "14.2-STABLE", + "revision": "14.2", "type": "FreeBSD", - "version": "FreeBSD 14.1-STABLE" + "version": "FreeBSD 14.2-STABLE" } } }