lol

freebsd: 14.1 → 14.2

+156 -352
+1 -1
pkgs/os-specific/bsd/freebsd/default.nix
··· 3 3 generateSplicesForMkScope, 4 4 callPackage, 5 5 attributePathToSplice ? [ "freebsd" ], 6 - branch ? "release/14.1.0", 6 + branch ? "release/14.2.0", 7 7 }: 8 8 9 9 let
-239
pkgs/os-specific/bsd/freebsd/patches/14.1/ath-hal-clang19.patch
··· 1 - commit 36d486cc2ecdb9c290dba65bd5668b7e50d0d822 2 - Author: Dimitry Andric <dim@FreeBSD.org> 3 - Date: Wed Jul 31 11:43:50 2024 +0200 4 - 5 - Fix enum warning in ath_hal's ar9002 6 - 7 - This fixes a clang 19 warning: 8 - 9 - 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] 10 - 57 | (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) { 11 - | ~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~ 12 - 13 - The `ah_diversity` field of `struct ath_hal_5212` is of type `HAL_BOOL`, 14 - not the enum type `HAL_ANT_SETTING`. In other code, `ah_diversity` is 15 - set to `AH_TRUE` whenever the related field `ah_antControl` is set to 16 - `HAL_ANT_VARIABLE`. 17 - 18 - It is not entirely clear to me what the intended statement is here: the 19 - test as it is written now compares the enum value 0 to `ah_diversity`, 20 - so in effect it enables the following block whenever `ah_diversity` is 21 - `AH_TRUE`. Write it like that, to avoid the compiler warning. 22 - 23 - MFC after: 3 days 24 - 25 - diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c 26 - index 01a224cbbfe9..fb2700771ffa 100644 27 - --- a/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c 28 - +++ b/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c 29 - @@ -54,7 +54,7 @@ ar9285BTCoexAntennaDiversity(struct ath_hal *ah) 30 - !! (ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE)); 31 - 32 - if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ALLOW) || 33 - - (AH5212(ah)->ah_diversity != HAL_ANT_VARIABLE)) { 34 - + (AH5212(ah)->ah_diversity == AH_TRUE)) { 35 - if ((ahp->ah_btCoexFlag & HAL_BT_COEX_FLAG_ANT_DIV_ENABLE) && 36 - (AH5212(ah)->ah_antControl == HAL_ANT_VARIABLE)) { 37 - /* Enable antenna diversity */ 38 - commit 82246ac5d890e031c9978052e5a431e0960182d5 39 - Author: Dimitry Andric <dim@FreeBSD.org> 40 - Date: Wed Jul 31 11:37:20 2024 +0200 41 - 42 - Fix enum warnings in ath_hal's ar9300 43 - 44 - This fixes a number of clang 19 warnings: 45 - 46 - 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] 47 - 709 | freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz); 48 - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 49 - sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ' 50 - 148 | (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) 51 - | ~~~ ^ ~~~~~~~~~~~~~~~~~~ 52 - 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] 53 - 745 | freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz); 54 - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 55 - sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ' 56 - 148 | (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) 57 - | ~~~ ^ ~~~~~~~~~~~~~~~~~~ 58 - 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] 59 - 781 | freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz); 60 - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 61 - sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ' 62 - 148 | (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) 63 - | ~~~ ^ ~~~~~~~~~~~~~~~~~~ 64 - 65 - The `FBIN2FREQ()` and `FREQ2FBIN()` macros in `ar9300eep.h` are invoked 66 - in most places around the `ath_hal` code with a (effectively) boolean 67 - second argument, corresponding to "is this 2GHz?". But in the code that 68 - is warned about, the value `HAL_FREQ_BAND_2GHZ` is of a different 69 - non-boolean type, `HAL_FREQ_BAND`. 70 - 71 - Update the `FBIN2FREQ()` and `FREQ2FBIN()` macros to interpret the 72 - second argument as boolean value, and rename the macro parameter names 73 - to better describe their meaning. 74 - 75 - Reviewed by: adrian, bz 76 - MFC after: 3 days 77 - Differential Revision: https://reviews.freebsd.org/D46201 78 - 79 - diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h 80 - index 9230fd57e2e4..b2a0862c7aee 100644 81 - --- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h 82 - +++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h 83 - @@ -142,10 +142,10 @@ enum Ar9300EepromTemplate 84 - #define OSPREY_EEPMISC_WOW 0x02 85 - #define OSPREY_CUSTOMER_DATA_SIZE 20 86 - 87 - -#define FREQ2FBIN(x,y) \ 88 - - (u_int8_t)(((y) == HAL_FREQ_BAND_2GHZ) ? ((x) - 2300) : (((x) - 4800) / 5)) 89 - -#define FBIN2FREQ(x,y) \ 90 - - (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) 91 - +#define FREQ2FBIN(freq,is_2ghz) \ 92 - + (u_int8_t)((is_2ghz) ? ((freq) - 2300) : (((freq) - 4800) / 5)) 93 - +#define FBIN2FREQ(freq,is_2ghz) \ 94 - + ((is_2ghz) ? (2300 + freq) : (4800 + 5 * freq)) 95 - #define OSPREY_MAX_CHAINS 3 96 - #define OSPREY_ANT_16S 25 97 - #define OSPREY_FUTURE_MODAL_SZ 6 98 - commit 1bd66fac35ec27fa64d6158f82fdcbdc26098679 99 - Author: Dimitry Andric <dim@FreeBSD.org> 100 - Date: Wed Jul 31 13:14:17 2024 +0200 101 - 102 - Fix enum warning in isci 103 - 104 - This fixes a clang 19 warning: 105 - 106 - 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] 107 - 197 | if (completion_status == SCI_FAILURE_RETRY_REQUIRED) 108 - | ~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~ 109 - 110 - The `completion_status` variable is of type `SCI_IO_STATUS`, not 111 - `SCI_STATUS`. In this case, we can seamlessly replace the value with 112 - `SCI_IO_FAILURE_RETRY_REQUIRED`, which is numerically equal to 113 - `SCI_FAILURE_RETRY_REQUIRED`. 114 - 115 - MFC after: 3 days 116 - 117 - diff --git a/sys/dev/isci/scil/scif_sas_smp_remote_device.c b/sys/dev/isci/scil/scif_sas_smp_remote_device.c 118 - index d6055adc13f9..c72402f66889 100644 119 - --- a/sys/dev/isci/scil/scif_sas_smp_remote_device.c 120 - +++ b/sys/dev/isci/scil/scif_sas_smp_remote_device.c 121 - @@ -194,7 +194,7 @@ SCI_STATUS scif_sas_smp_remote_device_decode_smp_response( 122 - 123 - //if Core set the status of this io to be RETRY_REQUIRED, we should 124 - //retry the IO without even decode the response. 125 - - if (completion_status == SCI_FAILURE_RETRY_REQUIRED) 126 - + if (completion_status == SCI_IO_FAILURE_RETRY_REQUIRED) 127 - { 128 - scif_sas_smp_remote_device_continue_current_activity( 129 - fw_device, fw_request, SCI_FAILURE_RETRY_REQUIRED 130 - commit 357378bbdedf24ce2b90e9bd831af4a9db3ec70a 131 - Author: Dimitry Andric <dim@FreeBSD.org> 132 - Date: Wed Jul 31 14:21:25 2024 +0200 133 - 134 - Fix enum warnings in qat 135 - 136 - This fixes a number of clang 19 warnings: 137 - 138 - 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] 139 - 154 | if (CPA_TRUE == pService->comp_device_data.enableDmm) { 140 - | ~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 141 - 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] 142 - 285 | (CPA_TRUE == pService->comp_device_data.enableDmm) ? 143 - | ~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 144 - 145 - The `enableDmm` field of variable `comp_device_data` is of type 146 - `icp_qat_hw_compression_delayed_match_t`, not `CpaBoolean`. In this 147 - case, we can seamlessly replace the value with 148 - `ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED`, which is numerically 149 - equal to `CPA_TRUE`. 150 - 151 - MFC after: 3 days 152 - 153 - diff --git a/sys/dev/qat/qat_api/common/compression/dc_session.c b/sys/dev/qat/qat_api/common/compression/dc_session.c 154 - index c92d6eebdc47..60f4410dac32 100644 155 - --- a/sys/dev/qat/qat_api/common/compression/dc_session.c 156 - +++ b/sys/dev/qat/qat_api/common/compression/dc_session.c 157 - @@ -151,7 +151,8 @@ dcCompHwBlockPopulate(sal_compression_service_t *pService, 158 - } 159 - 160 - /* Set delay match mode */ 161 - - if (CPA_TRUE == pService->comp_device_data.enableDmm) { 162 - + if (ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED == 163 - + pService->comp_device_data.enableDmm) { 164 - dmm = ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED; 165 - } else { 166 - dmm = ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_DISABLED; 167 - @@ -282,7 +283,8 @@ dcCompHwBlockPopulateGen4(sal_compression_service_t *pService, 168 - hw_comp_lower_csr.hash_update = 169 - ICP_QAT_HW_COMP_20_SKIP_HASH_UPDATE_DONT_ALLOW; 170 - hw_comp_lower_csr.edmm = 171 - - (CPA_TRUE == pService->comp_device_data.enableDmm) ? 172 - + (ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED == 173 - + pService->comp_device_data.enableDmm) ? 174 - ICP_QAT_HW_COMP_20_EXTENDED_DELAY_MATCH_MODE_EDMM_ENABLED : 175 - ICP_QAT_HW_COMP_20_EXTENDED_DELAY_MATCH_MODE_EDMM_DISABLED; 176 - 177 - commit 67be1e195acfaec99ce4fffeb17111ce085755f7 178 - Author: Dimitry Andric <dim@FreeBSD.org> 179 - Date: Wed Jul 31 13:01:20 2024 +0200 180 - 181 - Fix enum warning in iavf 182 - 183 - This fixes a clang 19 warning: 184 - 185 - 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] 186 - 514 | if (sc->vf_res->vsi_res[i].vsi_type == IAVF_VSI_SRIOV) 187 - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~ 188 - 189 - The `vsi_type` field of `struct virtchnl_vsi_resource` is of type `enum 190 - virtchnl_vsi_type`, not `enum iavf_vsi_type`. In this case, we can 191 - seamlessly replace the value with `VIRTCHNL_VSI_SRIOV`, which is 192 - numerically equal to `IAVF_VSI_SRIOV`. 193 - 194 - MFC after: 3 days 195 - 196 - diff --git a/sys/dev/iavf/iavf_lib.c b/sys/dev/iavf/iavf_lib.c 197 - index 883a722b3a03..f80e3765448f 100644 198 - --- a/sys/dev/iavf/iavf_lib.c 199 - +++ b/sys/dev/iavf/iavf_lib.c 200 - @@ -511,7 +511,7 @@ iavf_get_vsi_res_from_vf_res(struct iavf_sc *sc) 201 - 202 - for (int i = 0; i < sc->vf_res->num_vsis; i++) { 203 - /* XXX: We only use the first VSI we find */ 204 - - if (sc->vf_res->vsi_res[i].vsi_type == IAVF_VSI_SRIOV) 205 - + if (sc->vf_res->vsi_res[i].vsi_type == VIRTCHNL_VSI_SRIOV) 206 - sc->vsi_res = &sc->vf_res->vsi_res[i]; 207 - } 208 - if (!sc->vsi_res) { 209 - commit 6f25b46721a18cf4f036d041e7e5d275800a00b3 210 - Author: Dimitry Andric <dim@FreeBSD.org> 211 - Date: Tue Jul 30 20:31:47 2024 +0200 212 - 213 - Fix enum warning in heimdal 214 - 215 - This fixes a clang 19 warning: 216 - 217 - 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] 218 - 75 | if (keytype != KEYTYPE_DES || context->etypes_des == NULL) 219 - | ~~~~~~~ ^ ~~~~~~~~~~~ 220 - 221 - In https://github.com/heimdal/heimdal/commit/3bebbe5323 this was solved 222 - by adding a cast. That commit is rather large, so I'm only applying the 223 - one-liner here. 224 - 225 - MFC after: 3 days 226 - 227 - diff --git a/crypto/heimdal/lib/krb5/deprecated.c b/crypto/heimdal/lib/krb5/deprecated.c 228 - index e7c0105ebf7f..02cf7614f932 100644 229 - --- a/crypto/heimdal/lib/krb5/deprecated.c 230 - +++ b/crypto/heimdal/lib/krb5/deprecated.c 231 - @@ -72,7 +72,7 @@ krb5_keytype_to_enctypes_default (krb5_context context, 232 - unsigned int i, n; 233 - krb5_enctype *ret; 234 - 235 - - if (keytype != KEYTYPE_DES || context->etypes_des == NULL) 236 - + if (keytype != (krb5_keytype)KEYTYPE_DES || context->etypes_des == NULL) 237 - return krb5_keytype_to_enctypes (context, keytype, len, val); 238 - 239 - for (n = 0; context->etypes_des[n]; ++n)
pkgs/os-specific/bsd/freebsd/patches/14.1/bmake-no-compiler-rt.patch pkgs/os-specific/bsd/freebsd/patches/14.2/bmake-no-compiler-rt.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/compat-fix-typedefs-locations.patch pkgs/os-specific/bsd/freebsd/patches/14.2/compat-fix-typedefs-locations.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/compat-install-dirs.patch pkgs/os-specific/bsd/freebsd/patches/14.2/compat-install-dirs.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/fsck-path.patch pkgs/os-specific/bsd/freebsd/patches/14.2/fsck-path.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/install-bootstrap-Makefile.patch pkgs/os-specific/bsd/freebsd/patches/14.2/install-bootstrap-Makefile.patch
+2 -2
pkgs/os-specific/bsd/freebsd/patches/14.1/jail-use-path.patch pkgs/os-specific/bsd/freebsd/patches/14.2/jail-use-path.patch
··· 2 2 They even already use execvp! 3 3 4 4 diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c 5 - index 9eabcc5ff53c..2024f6bfb97a 100644 5 + index 9004b4729fec..669e85ed847e 100644 6 6 --- a/usr.sbin/jail/command.c 7 7 +++ b/usr.sbin/jail/command.c 8 8 @@ -363,7 +363,7 @@ run_command(struct cfjail *j) ··· 107 107 setenv("SHELL", 108 108 - *pwd->pw_shell ? pwd->pw_shell : _PATH_BSHELL, 1); 109 109 + *pwd->pw_shell ? pwd->pw_shell : "sh", 1); 110 - if (clean && chdir(pwd->pw_dir) < 0) { 110 + if (clean && username && chdir(pwd->pw_dir) < 0) { 111 111 jail_warnx(j, "chdir %s: %s", 112 112 pwd->pw_dir, strerror(errno));
pkgs/os-specific/bsd/freebsd/patches/14.1/libc-msun-arch-subdir.patch pkgs/os-specific/bsd/freebsd/patches/14.2/libc-msun-arch-subdir.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/libc-no-force--lcompiler-rt.patch pkgs/os-specific/bsd/freebsd/patches/14.2/libc-no-force--lcompiler-rt.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/libcxxrt-headers.patch pkgs/os-specific/bsd/freebsd/patches/14.2/libcxxrt-headers.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/libelf-bootstrapping.patch pkgs/os-specific/bsd/freebsd/patches/14.2/libelf-bootstrapping.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/libifconfig-no-internal.patch pkgs/os-specific/bsd/freebsd/patches/14.2/libifconfig-no-internal.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/libnetbsd-do-install.patch pkgs/os-specific/bsd/freebsd/patches/14.2/libnetbsd-do-install.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/librpcsvc-include-subdir.patch pkgs/os-specific/bsd/freebsd/patches/14.2/librpcsvc-include-subdir.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/localedef.patch pkgs/os-specific/bsd/freebsd/patches/14.2/localedef.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/makefs-rdev.patch pkgs/os-specific/bsd/freebsd/patches/14.2/makefs-rdev.patch
-25
pkgs/os-specific/bsd/freebsd/patches/14.1/mk-werror-clang19.patch
··· 1 - commit d575077527d448ee45b923fa8c6b0cb7216ca5c5 2 - Author: Dimitry Andric <dim@FreeBSD.org> 3 - Date: Tue Jul 30 20:28:51 2024 +0200 4 - 5 - bsd.sys.mk: for clang >= 19, similar to gcc >= 8.1, turn off -Werror for 6 - -Wcast-function-type-mismatch. 7 - 8 - PR: 280562 9 - MFC after: 1 month 10 - 11 - diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk 12 - index 52c3d07746c7..1934a79a5427 100644 13 - --- a/share/mk/bsd.sys.mk 14 - +++ b/share/mk/bsd.sys.mk 15 - @@ -88,6 +88,10 @@ CWARNFLAGS.clang+= -Wno-unused-const-variable 16 - .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150000 17 - CWARNFLAGS.clang+= -Wno-error=unused-but-set-parameter 18 - .endif 19 - +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 190000 20 - +# Similar to gcc >= 8.1 -Wno-error=cast-function-type below 21 - +CWARNFLAGS.clang+= -Wno-error=cast-function-type-mismatch 22 - +.endif 23 - .endif # WARNS <= 6 24 - .if ${WARNS} <= 3 25 - CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-unused-value\
pkgs/os-specific/bsd/freebsd/patches/14.1/mk.patch pkgs/os-specific/bsd/freebsd/patches/14.2/mk.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/mkimg-openbsd.patch pkgs/os-specific/bsd/freebsd/patches/14.2/mkimg-openbsd.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/mount-use-path.patch pkgs/os-specific/bsd/freebsd/patches/14.2/mount-use-path.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/mtree-Makefile.patch pkgs/os-specific/bsd/freebsd/patches/14.2/mtree-Makefile.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/no-perms-BSD.include.dist.patch pkgs/os-specific/bsd/freebsd/patches/14.2/no-perms-BSD.include.dist.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/rc-user.patch pkgs/os-specific/bsd/freebsd/patches/14.2/rc-user.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/rtld-elf-symlink.patch pkgs/os-specific/bsd/freebsd/patches/14.2/rtld-elf-symlink.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/rtld-no-force--lcompiler-rt.patch pkgs/os-specific/bsd/freebsd/patches/14.2/rtld-no-force--lcompiler-rt.patch
-41
pkgs/os-specific/bsd/freebsd/patches/14.1/sys-cdefs-static-assert.patch
··· 1 - From 22cdafe197ac960c5ce839ef6ec699b59f4b0080 Mon Sep 17 00:00:00 2001 2 - From: Warner Losh <imp@FreeBSD.org> 3 - Date: Sat, 20 Jul 2024 09:57:53 -0600 4 - Subject: cdefs.h: Don't define fallback for _Static_assert 5 - 6 - Remove pre 4.6 code to define _Static_assert in terms of _COUNTER. We 7 - no longer need to support compilers this old (in fact support for all 8 - pre gcc 10 compilers has been removed in -current). This is a partial 9 - MFC of that work because removing this fixes a bug that's oft reported 10 - with -pedantic-errors and C++98 compilations. 11 - 12 - PR: 280382, 276738 13 - Sponsored by: Netflix 14 - 15 - This is a direct commit to stable/14. 16 - --- 17 - sys/sys/cdefs.h | 9 --------- 18 - 1 file changed, 9 deletions(-) 19 - 20 - diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h 21 - index 19b7d8fe427d..a52864c5db9d 100644 22 - --- a/sys/sys/cdefs.h 23 - +++ b/sys/sys/cdefs.h 24 - @@ -277,15 +277,6 @@ 25 - #if (defined(__cplusplus) && __cplusplus >= 201103L) || \ 26 - __has_extension(cxx_static_assert) 27 - #define _Static_assert(x, y) static_assert(x, y) 28 - -#elif __GNUC_PREREQ__(4,6) && !defined(__cplusplus) 29 - -/* Nothing, gcc 4.6 and higher has _Static_assert built-in */ 30 - -#elif defined(__COUNTER__) 31 - -#define _Static_assert(x, y) __Static_assert(x, __COUNTER__) 32 - -#define __Static_assert(x, y) ___Static_assert(x, y) 33 - -#define ___Static_assert(x, y) typedef char __assert_ ## y[(x) ? 1 : -1] \ 34 - - __unused 35 - -#else 36 - -#define _Static_assert(x, y) struct __hack 37 - #endif 38 - #endif 39 - 40 - -- 41 - cgit v1.2.3
pkgs/os-specific/bsd/freebsd/patches/14.1/sys-gnu-date.patch pkgs/os-specific/bsd/freebsd/patches/14.2/sys-gnu-date.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/sys-no-explicit-intrinsics-dep.patch pkgs/os-specific/bsd/freebsd/patches/14.2/sys-no-explicit-intrinsics-dep.patch
pkgs/os-specific/bsd/freebsd/patches/14.1/tinfo-host-cc.patch pkgs/os-specific/bsd/freebsd/patches/14.2/tinfo-host-cc.patch
+2
pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix
··· 15 15 export MAKEOBJDIRPREFIX=$TMP/obj 16 16 ''; 17 17 18 + alwaysKeepStatic = true; 19 + 18 20 meta = with lib; { 19 21 platform = platforms.freebsd; 20 22 license = licenses.cddl;
+6
pkgs/os-specific/bsd/freebsd/pkgs/source.nix
··· 7 7 owner = "freebsd"; 8 8 repo = "freebsd-src"; 9 9 inherit (sourceData) rev hash; 10 + 11 + # The GitHub export excludes some files in the git source 12 + # that were marked `export-ignore`. 13 + # A normal git checkout will keep those files, 14 + # matching the update script 15 + forceFetchGit = true; 10 16 }
-6
pkgs/os-specific/bsd/freebsd/pkgs/uudecode.nix
··· 1 - { mkDerivation }: 2 - 3 - mkDerivation { 4 - path = "usr.bin/uudecode"; 5 - MK_TESTS = "no"; 6 - }
+145 -38
pkgs/os-specific/bsd/freebsd/versions.json
··· 1 1 { 2 2 "main": { 3 - "hash": "sha256-jQpuNjo7n5b4yXGgXR9ggTkrb4r4pFPXdunBipetw+c=", 3 + "hash": "sha256-xsgY5Ex/B5ngOTa5OZRauSaSYvET5lWI7veJRrSq1oY=", 4 4 "ref": "main", 5 5 "refType": "branch", 6 - "rev": "82283cad12a417abfb1469d899b2d7cfb1d38f77", 6 + "rev": "c5773d366ecc5271b9bd6e5506c00fb3520f19ae", 7 7 "supported": false, 8 8 "version": { 9 9 "branch": "CURRENT", 10 10 "major": 15, 11 11 "minor": 0, 12 - "reldate": "1500021", 12 + "reldate": "1500035", 13 13 "release": "15.0-CURRENT", 14 14 "revision": "15.0", 15 15 "type": "FreeBSD", ··· 88 88 "version": "FreeBSD 13.3-RELEASE" 89 89 } 90 90 }, 91 + "release/13.4.0": { 92 + "hash": "sha256-ztmoDr8Y4ZpMBT7E1hen5hf3H7na/cydvpjNmuUDmjs=", 93 + "ref": "release/13.4.0", 94 + "refType": "tag", 95 + "rev": "58066db597befb899b2fe59031b2a32fb9183f0f", 96 + "supported": false, 97 + "version": { 98 + "branch": "RELEASE", 99 + "major": 13, 100 + "minor": 4, 101 + "patch": 0, 102 + "reldate": "1304000", 103 + "release": "13.4-RELEASE", 104 + "revision": "13.4", 105 + "type": "FreeBSD", 106 + "version": "FreeBSD 13.4-RELEASE" 107 + } 108 + }, 109 + "release/13.5.0": { 110 + "hash": "sha256-53q7qR3ij5v3QAHx6Wa84F3yRSwFrBaey0NxVcNLMEk=", 111 + "ref": "release/13.5.0", 112 + "refType": "tag", 113 + "rev": "882b9f3f2218b50fc1d2d31ee71b7765c7f09f85", 114 + "supported": false, 115 + "version": { 116 + "branch": "RELEASE", 117 + "major": 13, 118 + "minor": 5, 119 + "patch": 0, 120 + "reldate": "1305000", 121 + "release": "13.5-RELEASE", 122 + "revision": "13.5", 123 + "type": "FreeBSD", 124 + "version": "FreeBSD 13.5-RELEASE" 125 + } 126 + }, 91 127 "release/14.0.0": { 92 128 "hash": "sha256-eBKwCYcOG9Lg7gBA2gZqxQFO/3uMMrcQGtgqi8se6zA=", 93 129 "ref": "release/14.0.0", ··· 124 160 "version": "FreeBSD 14.1-RELEASE" 125 161 } 126 162 }, 163 + "release/14.2.0": { 164 + "hash": "sha256-qZkeuUZbuPOvXZBgP5x6Hii1YN7XdDJzwZeYacIR5BI=", 165 + "ref": "release/14.2.0", 166 + "refType": "tag", 167 + "rev": "c8918d6c7412fce87922e9bd7e4f5c7d7ca96eb7", 168 + "supported": false, 169 + "version": { 170 + "branch": "RELEASE", 171 + "major": 14, 172 + "minor": 2, 173 + "patch": 0, 174 + "reldate": "1402000", 175 + "release": "14.2-RELEASE", 176 + "revision": "14.2", 177 + "type": "FreeBSD", 178 + "version": "FreeBSD 14.2-RELEASE" 179 + } 180 + }, 127 181 "releng/13.0": { 128 182 "hash": "sha256-7PrqTb2o21IQgQ2N+zjavlzX/ju60Rw+MXjMRICmQi0=", 129 183 "ref": "releng/13.0", ··· 179 233 } 180 234 }, 181 235 "releng/13.3": { 182 - "hash": "sha256-jvXIrlNmaGe4gyYCK/3wjm9JWBQOU0sD1LPxWykNddI=", 236 + "hash": "sha256-mVEt1wGvQ2xFRsEzVf+GDfroF8sxUAVooIr0yU/80Yg=", 183 237 "ref": "releng/13.3", 184 238 "refType": "branch", 185 - "rev": "deb948cd8dc2efb341ce96e1b7a56c9fbc662ba1", 239 + "rev": "72aa3d55e9ff8634edf8a28162470969133ea7ca", 240 + "supported": false, 241 + "version": { 242 + "branch": "RELEASE-p8", 243 + "major": 13, 244 + "minor": 3, 245 + "patch": "8", 246 + "reldate": "1303001", 247 + "release": "13.3-RELEASE-p8", 248 + "revision": "13.3", 249 + "type": "FreeBSD", 250 + "version": "FreeBSD 13.3-RELEASE-p8" 251 + } 252 + }, 253 + "releng/13.4": { 254 + "hash": "sha256-y61CplXIRVDkGRtbH2TX9AKr0kiaNaqAT/+fXdkvy6g=", 255 + "ref": "releng/13.4", 256 + "refType": "branch", 257 + "rev": "27f132c05c39138b375591d2bf9f73f680997de3", 186 258 "supported": true, 187 259 "version": { 188 260 "branch": "RELEASE-p4", 189 261 "major": 13, 190 - "minor": 3, 262 + "minor": 4, 191 263 "patch": "4", 192 - "reldate": "1303001", 193 - "release": "13.3-RELEASE-p4", 194 - "revision": "13.3", 264 + "reldate": "1304000", 265 + "release": "13.4-RELEASE-p4", 266 + "revision": "13.4", 267 + "type": "FreeBSD", 268 + "version": "FreeBSD 13.4-RELEASE-p4" 269 + } 270 + }, 271 + "releng/13.5": { 272 + "hash": "sha256-53q7qR3ij5v3QAHx6Wa84F3yRSwFrBaey0NxVcNLMEk=", 273 + "ref": "releng/13.5", 274 + "refType": "branch", 275 + "rev": "882b9f3f2218b50fc1d2d31ee71b7765c7f09f85", 276 + "supported": true, 277 + "version": { 278 + "branch": "RELEASE", 279 + "major": 13, 280 + "minor": 5, 281 + "reldate": "1305000", 282 + "release": "13.5-RELEASE", 283 + "revision": "13.5", 195 284 "type": "FreeBSD", 196 - "version": "FreeBSD 13.3-RELEASE-p4" 285 + "version": "FreeBSD 13.5-RELEASE" 197 286 } 198 287 }, 199 288 "releng/14.0": { 200 - "hash": "sha256-kQ3r/bnBiOZ6kpnouFLKWdpSiJe3FGWJ/XA6VRNFzEc=", 289 + "hash": "sha256-7FjXduO4JCAnrYCR34J7a6WjDQaT/MWufPnUKT9IBr0=", 201 290 "ref": "releng/14.0", 202 291 "refType": "branch", 203 - "rev": "5e23806790ef4825ac09b458d3df941748599fbb", 204 - "supported": true, 292 + "rev": "f10e328cb1921d2f5f0253565f38e0daa667db69", 293 + "supported": false, 205 294 "version": { 206 - "branch": "RELEASE-p8", 295 + "branch": "RELEASE-p11", 207 296 "major": 14, 208 297 "minor": 0, 209 - "patch": "8", 298 + "patch": "11", 210 299 "reldate": "1400097", 211 - "release": "14.0-RELEASE-p8", 300 + "release": "14.0-RELEASE-p11", 212 301 "revision": "14.0", 213 302 "type": "FreeBSD", 214 - "version": "FreeBSD 14.0-RELEASE-p8" 303 + "version": "FreeBSD 14.0-RELEASE-p11" 215 304 } 216 305 }, 217 306 "releng/14.1": { 218 - "hash": "sha256-rURDGcnMzUhz2I873d5ro+wGY+i8IOmiPJ5T+w4TcPA=", 307 + "hash": "sha256-GOLMbuRAdIFB4fQxyrFokhU1/kmDfw7S2zvt8BVTQeM=", 219 308 "ref": "releng/14.1", 220 309 "refType": "branch", 221 - "rev": "dcdea9e8623e83e3aef15fff0d6ead05382ad138", 310 + "rev": "f389e68ca980b7e053a34d9eddde89b4c2a1ee6c", 222 311 "supported": true, 223 312 "version": { 224 - "branch": "RELEASE-p2", 313 + "branch": "RELEASE-p8", 225 314 "major": 14, 226 315 "minor": 1, 227 - "patch": "2", 316 + "patch": "8", 228 317 "reldate": "1401000", 229 - "release": "14.1-RELEASE-p2", 318 + "release": "14.1-RELEASE-p8", 230 319 "revision": "14.1", 231 320 "type": "FreeBSD", 232 - "version": "FreeBSD 14.1-RELEASE-p2" 321 + "version": "FreeBSD 14.1-RELEASE-p8" 322 + } 323 + }, 324 + "releng/14.2": { 325 + "hash": "sha256-XP8BFnXvziaC9wOJj8q31UZXFqCUE7WQ5FdJHEZWGbg=", 326 + "ref": "releng/14.2", 327 + "refType": "branch", 328 + "rev": "ac2cbb46b5f1efa7f7b5d4eb15631337329ec5b2", 329 + "supported": true, 330 + "version": { 331 + "branch": "RELEASE-p2", 332 + "major": 14, 333 + "minor": 2, 334 + "patch": "2", 335 + "reldate": "1402000", 336 + "release": "14.2-RELEASE-p2", 337 + "revision": "14.2", 338 + "type": "FreeBSD", 339 + "version": "FreeBSD 14.2-RELEASE-p2" 233 340 } 234 341 }, 235 342 "stable/13": { 236 - "hash": "sha256-kbz6dpkCVYrTcPNJtKvX0TVQ4qULaOJ/WzCeQ4MYrFU=", 343 + "hash": "sha256-J9SJKeR6Den3Sep2o4r0cqIDd2V5gbY0Ow9eP69Ny0o=", 237 344 "ref": "stable/13", 238 345 "refType": "branch", 239 - "rev": "8d87e47b8d1093a264ca954620b9e58b81fb9b34", 346 + "rev": "a8431b47adae8f8b731206dc38d82b2245ad245e", 240 347 "supported": true, 241 348 "version": { 242 - "branch": "PRERELEASE", 349 + "branch": "STABLE", 243 350 "major": 13, 244 - "minor": 4, 245 - "reldate": "1303503", 246 - "release": "13.4-PRERELEASE", 247 - "revision": "13.4", 351 + "minor": 5, 352 + "reldate": "1305500", 353 + "release": "13.5-STABLE", 354 + "revision": "13.5", 248 355 "type": "FreeBSD", 249 - "version": "FreeBSD 13.4-PRERELEASE" 356 + "version": "FreeBSD 13.5-STABLE" 250 357 } 251 358 }, 252 359 "stable/14": { 253 - "hash": "sha256-ImSKU2m2Ecss1A4uTGvh0Z4ZyhN2jem0If9jlan9tM0=", 360 + "hash": "sha256-tleB6J5Cg1SIN2LCfvV3Cfp4Lxx65UHmiILpin6UYGY=", 254 361 "ref": "stable/14", 255 362 "refType": "branch", 256 - "rev": "2c75d993783ca4b0d1bf8dcdf424643781326e4b", 363 + "rev": "6e510d8fbaf8d91da235fe28250cd48124edda9f", 257 364 "supported": true, 258 365 "version": { 259 366 "branch": "STABLE", 260 367 "major": 14, 261 - "minor": 1, 262 - "reldate": "1401501", 263 - "release": "14.1-STABLE", 264 - "revision": "14.1", 368 + "minor": 2, 369 + "reldate": "1402504", 370 + "release": "14.2-STABLE", 371 + "revision": "14.2", 265 372 "type": "FreeBSD", 266 - "version": "FreeBSD 14.1-STABLE" 373 + "version": "FreeBSD 14.2-STABLE" 267 374 } 268 375 } 269 376 }