Skip to content

Commit d2c92a9

Browse files
authored
Merge branch 'blead' into dev/enomem/fix-crashes-on-unitialized-string-hash
2 parents 0ad853a + d6f09a8 commit d2c92a9

File tree

10 files changed

+216
-149
lines changed

10 files changed

+216
-149
lines changed

.github/workflows/testsuite.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# - CI_FORCE_LINUX_I386: if set to a true value: run the 'linux-i386' job;
1818
# - CI_FORCE_INSTALL: if set to a true value: run the 'install' job;
1919
# - CI_FORCE_MACOS: if set to a true value: run the 'smoke-macos-14' job;
20-
# - CI_FORCE_MSVC142: if set to a true value: run the 'windows-msvc142' job;
20+
# - CI_FORCE_MSVC143: if set to a true value: run the 'windows-msvc143' job;
2121
# - CI_FORCE_MINGW64: if set to a true value: run the 'mingw64' job;
2222
# - CI_FORCE_CYGWIN: if set to a true value: run the 'cygwin' job;
2323
# - CI_FORCE_MINITEST: if set to a true value: run the 'miniperl' job;
@@ -139,7 +139,7 @@ jobs:
139139
ci_force_linux_i386: ${{ steps.ci_config.outputs.ci_force_linux_i386 }}
140140
ci_force_install: ${{ steps.ci_config.outputs.ci_force_install }}
141141
ci_force_macos: ${{ steps.ci_config.outputs.ci_force_macos }}
142-
ci_force_msvc142: ${{ steps.ci_config.outputs.ci_force_msvc142 }}
142+
ci_force_msvc143: ${{ steps.ci_config.outputs.ci_force_msvc143 }}
143143
ci_force_mingw64: ${{ steps.ci_config.outputs.ci_force_mingw64 }}
144144
ci_force_cygwin: ${{ steps.ci_config.outputs.ci_force_cygwin }}
145145
ci_force_minitest: ${{ steps.ci_config.outputs.ci_force_minitest }}
@@ -160,7 +160,7 @@ jobs:
160160
CI_FORCE_LINUX_I386: ${{ vars.CI_FORCE_LINUX_I386 }}
161161
CI_FORCE_INSTALL: ${{ vars.CI_FORCE_INSTALL }}
162162
CI_FORCE_MACOS: ${{ vars.CI_FORCE_MACOS }}
163-
CI_FORCE_MSVC142: ${{ vars.CI_FORCE_MSVC142 }}
163+
CI_FORCE_MSVC143: ${{ vars.CI_FORCE_MSVC143 }}
164164
CI_FORCE_MINGW64: ${{ vars.CI_FORCE_MINGW64 }}
165165
CI_FORCE_CYGWIN: ${{ vars.CI_FORCE_CYGWIN }}
166166
CI_FORCE_MINITEST: ${{ vars.CI_FORCE_MINITEST }}
@@ -174,7 +174,7 @@ jobs:
174174
[[ -n "${CI_FORCE_LINUX_I386}" ]] && [[ "${CI_FORCE_LINUX_I386%[!0 ]*}" != "${CI_FORCE_LINUX_I386}" ]] && echo "ci_force_linux_i386=true" >> "$GITHUB_OUTPUT"
175175
[[ -n "${CI_FORCE_INSTALL}" ]] && [[ "${CI_FORCE_INSTALL%[!0 ]*}" != "${CI_FORCE_INSTALL}" ]] && echo "ci_force_install=true" >> "$GITHUB_OUTPUT"
176176
[[ -n "${CI_FORCE_MACOS}" ]] && [[ "${CI_FORCE_MACOS%[!0 ]*}" != "${CI_FORCE_MACOS}" ]] && echo "ci_force_macos=true" >> "$GITHUB_OUTPUT"
177-
[[ -n "${CI_FORCE_MSVC142}" ]] && [[ "${CI_FORCE_MSVC142%[!0 ]*}" != "${CI_FORCE_MSVC142}" ]] && echo "ci_force_msvc142=true" >> "$GITHUB_OUTPUT"
177+
[[ -n "${CI_FORCE_MSVC143}" ]] && [[ "${CI_FORCE_MSVC143%[!0 ]*}" != "${CI_FORCE_MSVC143}" ]] && echo "ci_force_msvc143=true" >> "$GITHUB_OUTPUT"
178178
[[ -n "${CI_FORCE_MINGW64}" ]] && [[ "${CI_FORCE_MINGW64%[!0 ]*}" != "${CI_FORCE_MINGW64}" ]] && echo "ci_force_mingw64=true" >> "$GITHUB_OUTPUT"
179179
[[ -n "${CI_FORCE_CYGWIN}" ]] && [[ "${CI_FORCE_CYGWIN%[!0 ]*}" != "${CI_FORCE_CYGWIN}" ]] && echo "ci_force_cygwin=true" >> "$GITHUB_OUTPUT"
180180
[[ -n "${CI_FORCE_MINITEST}" ]] && [[ "${CI_FORCE_MINITEST%[!0 ]*}" != "${CI_FORCE_MINITEST}" ]] && echo "ci_force_minitest=true" >> "$GITHUB_OUTPUT"
@@ -457,12 +457,12 @@ jobs:
457457
# \ V V / | ' \/ _` / _ \ V V (_-<
458458
# \_/\_/|_|_||_\__,_\___/\_/\_//__/
459459
460-
windows-msvc142:
461-
name: "Windows msvc142"
462-
runs-on: windows-2019
460+
windows-msvc143:
461+
name: "Windows msvc143"
462+
runs-on: windows-2025
463463
timeout-minutes: 120
464464
needs: sanity_check
465-
if: (! cancelled() && (needs.sanity_check.outputs.run_all_jobs == 'true' || needs.sanity_check.outputs.ci_force_msvc142 == 'true'))
465+
if: (! cancelled() && (needs.sanity_check.outputs.run_all_jobs == 'true' || needs.sanity_check.outputs.ci_force_msvc143 == 'true'))
466466
467467
steps:
468468
- run: git config --global core.autocrlf false
@@ -491,9 +491,9 @@ jobs:
491491
- name: Build
492492
shell: cmd
493493
run: |
494-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
494+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
495495
cd win32
496-
nmake CCTYPE=MSVC142 CFG=Debug
496+
nmake CCTYPE=MSVC143 CFG=Debug
497497
- name: Show Config
498498
shell: cmd
499499
run: |
@@ -502,9 +502,9 @@ jobs:
502502
- name: Run Tests
503503
shell: cmd
504504
run: |
505-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
505+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
506506
cd win32
507-
nmake CCTYPE=MSVC142 CFG=Debug test
507+
nmake CCTYPE=MSVC143 CFG=Debug test
508508
509509
# _ __ _ _
510510
# _ __ ___ (_)_ __ __ ___ __/ /_ | || |
@@ -515,7 +515,7 @@ jobs:
515515
516516
mingw64:
517517
name: "Windows mingw64"
518-
runs-on: windows-2019
518+
runs-on: windows-2025
519519
timeout-minutes: 120
520520
needs: sanity_check
521521
if: (! cancelled() && (needs.sanity_check.outputs.run_all_jobs == 'true' || needs.sanity_check.outputs.ci_force_mingw64 == 'true'))
@@ -566,7 +566,7 @@ jobs:
566566
567567
cygwin:
568568
name: "cygwin"
569-
runs-on: windows-2019
569+
runs-on: windows-2025
570570
timeout-minutes: 120
571571
needs: sanity_check
572572
if: (! cancelled() && (needs.sanity_check.outputs.run_all_jobs == 'true' || needs.sanity_check.outputs.ci_force_cygwin == 'true'))

Configure

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7686,22 +7686,25 @@ EOPL
76867686
# of three digit per group separate by '.'s or '_'s. Names are extended
76877687
# with ".0.0" to ensure at least three elements for the pack.
76887688
# -- H.Merijn Brand (m)'06 23-10-2006
7689+
# pack "s>" was introduced in perl-5.10, so I had to rewrite this to an
7690+
# sprintf approach to support bases systems with 5.6.x and 5.8.x
7691+
# -- H.Merijn Brand (m)'25 16-05-2025
76897692

76907693
my @inc_version_list;
76917694
my @candidates;
76927695
# XXX Redo to do opendir/readdir?
76937696
if (-d $stem) {
76947697
chdir($stem);
76957698
;@candidates = map {
7696-
[ $_, pack "s>s>s>", split m/[._]/, "$_.0.0" ] } glob("5.*");
7699+
[ $_, sprintf "%04d%04d%04d", (split m/[._]/, "$_.0.0")[0,1,2] ] } glob("5.*");
76977700
;@candidates = sort { $a->[1] cmp $b->[1]} @candidates;
76987701
}
76997702
else {
77007703
;@candidates = ();
77017704
}
77027705

77037706
my ($pversion, $aversion, $vsn5005) = map {
7704-
pack "s>s>s>", split m/[._]/, "$_.0.0" } $version, $api_versionstring, "5.005";
7707+
sprintf "%04d%04d%04d", (split m/[._]/, "$_.0.0")[0,1,2] } $version, $api_versionstring, "5.005";
77057708
foreach my $d (@candidates) {
77067709
if ($d->[1] lt $pversion) {
77077710
if ($d->[1] ge $aversion) {
@@ -13345,10 +13348,6 @@ esac
1334513348
set i_fcntl
1334613349
eval $setvar
1334713350

13348-
: see if fdopendir exists
13349-
set fdopendir d_fdopendir
13350-
eval $inlibc
13351-
1335213351
: see if fork exists
1335313352
set fork d_fork
1335413353
eval $inlibc
@@ -14066,6 +14065,10 @@ eval $inlibc
1406614065
set fdim d_fdim
1406714066
eval $inlibc
1406814067

14068+
: see if fdopendir exists
14069+
set fdopendir d_fdopendir
14070+
eval $inlibc
14071+
1406914072
: see if fegetround exists
1407014073
set fegetround d_fegetround
1407114074
eval $inlibc
@@ -25044,6 +25047,7 @@ d_fd_macros='$d_fd_macros'
2504425047
d_fd_set='$d_fd_set'
2504525048
d_fdclose='$d_fdclose'
2504625049
d_fdim='$d_fdim'
25050+
d_fdopendir='$d_fdopendir'
2504725051
d_fds_bits='$d_fds_bits'
2504825052
d_fegetround='$d_fegetround'
2504925053
d_ffs='$d_ffs'
@@ -25057,7 +25061,6 @@ d_flockproto='$d_flockproto'
2505725061
d_fma='$d_fma'
2505825062
d_fmax='$d_fmax'
2505925063
d_fmin='$d_fmin'
25060-
d_fdopendir='$d_fdopendir'
2506125064
d_fork='$d_fork'
2506225065
d_fp_class='$d_fp_class'
2506325066
d_fp_classify='$d_fp_classify'

Cross/config.sh-arm-linux

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ d_fd_macros='define'
212212
d_fd_set='define'
213213
d_fdclose='undef'
214214
d_fdim='undef'
215-
d_fdopendir=undef
215+
d_fdopendir='undef'
216216
d_fds_bits='undef'
217217
d_fegetround='define'
218218
d_ffs='undef'

Cross/config.sh-arm-linux-n770

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ d_fd_macros='define'
211211
d_fd_set='define'
212212
d_fdclose='undef'
213213
d_fdim='undef'
214-
d_fdopendir=undef
214+
d_fdopendir='undef'
215215
d_fds_bits='undef'
216216
d_fegetround='define'
217217
d_ffs='undef'

config_h.SH

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
143143
#$d_fcntl HAS_FCNTL /**/
144144
145145
/* HAS_FDOPENDIR:
146-
* This symbol, if defined, indicates that the fdopen routine is
146+
* This symbol, if defined, indicates that the fdopendir routine is
147147
* available to open a directory descriptor.
148148
*/
149149
#$d_fdopendir HAS_FDOPENDIR /**/

dist/Net-Ping/t/450_service.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ is($p->ping("127.0.0.1"), 1, 'first port is reachable');
7878
$p->{port_num} = $port2;
7979

8080
{
81-
local $TODO = "Believed not to work on $^O" if $^O =~ /^(?:MSWin32|os390)$/;
81+
local $TODO = "Believed not to work on $^O" if $^O =~ /^(?:MSWin32|os390|cygwin)$/;
8282
is($p->ping("127.0.0.1"), 1, 'second port is reachable');
8383
}
8484

@@ -133,7 +133,7 @@ SKIP: {
133133

134134
{
135135
local $TODO = "Believed not to work on $^O"
136-
if $^O =~ /^(?:MSWin32|os390)$/;
136+
if $^O =~ /^(?:MSWin32|os390|cygwin)$/;
137137
is($p->ack(), '127.0.0.1', 'IP should be reachable');
138138
}
139139
}

plan9/config_sh.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ d_fd_macros='undef'
212212
d_fd_set='undef'
213213
d_fdclose='undef'
214214
d_fdim='undef'
215-
d_fdopendir=undef
215+
d_fdopendir='undef'
216216
d_fds_bits='undef'
217217
d_fegetround='undef'
218218
d_ffs='undef'

0 commit comments

Comments
 (0)