Skip to content

Commit d032c11

Browse files
committed
Merge pull request #104521 from Chubercik/pcre2-10.45
pcre2: Update to 10.45
2 parents e10974b + 2c3e302 commit d032c11

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+24102
-12786
lines changed

modules/regex/SCsub

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ if env["builtin_pcre2"]:
2222
"pcre2_chartables.c",
2323
"pcre2_chkdint.c",
2424
"pcre2_compile.c",
25+
"pcre2_compile_class.c",
2526
"pcre2_config.c",
2627
"pcre2_context.c",
2728
"pcre2_convert.c",

thirdparty/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ Patches:
852852
## pcre2
853853

854854
- Upstream: http://www.pcre.org
855-
- Version: 10.43 (3864abdb713f78831dd12d898ab31bbb0fa630b6, 2024)
855+
- Version: 10.45 (2dce7761b1831fd3f82a9c2bd5476259d945da4d, 2025)
856856
- License: BSD-3-Clause
857857

858858
Files extracted from upstream source:
@@ -862,8 +862,8 @@ Files extracted from upstream source:
862862
- `src/pcre2_jit_match.c`
863863
- `src/pcre2_jit_misc.c`
864864
- `src/pcre2_ucptables.c`
865-
- `src/sljit/`
866-
- `AUTHORS` and `LICENCE`
865+
- `deps/sljit/sljit_src`
866+
- `AUTHORS.md` and `LICENCE.md`
867867

868868

869869
## recastnavigation

thirdparty/pcre2/AUTHORS

Lines changed: 0 additions & 36 deletions
This file was deleted.

thirdparty/pcre2/AUTHORS.md

Lines changed: 200 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
1+
PCRE2 Authorship and Contributors
2+
=================================
3+
4+
COPYRIGHT
5+
---------
6+
7+
Please see the file [LICENCE](./LICENCE.md) in the PCRE2 distribution for
8+
copyright details.
9+
10+
11+
MAINTAINERS
12+
-----------
13+
14+
The PCRE and PCRE2 libraries were authored and maintained by Philip Hazel.
15+
16+
Since 2024, the contributors with administrator access to the project are now
17+
Nicholas Wilson and Zoltán Herczeg. See the file [SECURITY](./SECURITY.md) for
18+
GPG keys.
19+
20+
Both administrators are volunteers acting in a personal capacity.
21+
22+
<table>
23+
<thead>
24+
<tr>
25+
<th>Name</th>
26+
<th>Role</th>
27+
<tr>
28+
</thead>
29+
<tbody>
30+
<tr>
31+
<td>
32+
33+
Nicholas Wilson<br/>
34+
35+
Currently of Microsoft Research Cambridge, UK
36+
37+
</td>
38+
<td>
39+
40+
* General project administration & maintenance
41+
* Release management
42+
* Code maintenance
43+
44+
</td>
45+
</tr>
46+
<tr>
47+
<td>
48+
49+
Zoltán Herczeg<br/>
50+
51+
Currently of the University of Szeged, Hungary
52+
53+
</td>
54+
<td>
55+
56+
* Code maintenance
57+
* Ownership of `sljit` and PCRE2's JIT
58+
59+
</td>
60+
</tr>
61+
</tbody>
62+
</table>
63+
64+
65+
CONTRIBUTORS
66+
------------
67+
68+
Many others have participated and contributed to PCRE2 over its history.
69+
70+
The maintainers are grateful for all contributions and participation over the
71+
years. We apologise for any names we have forgotten.
72+
73+
We are especially grateful to Philip Hazel, creator of PCRE and PCRE2, and
74+
maintainer from 1997 to 2024.
75+
76+
All names listed alphabetically.
77+
78+
### Contributors to PCRE2
79+
80+
This list includes names up until the PCRE2 10.44 release. New names will be
81+
added from the Git history on each release.
82+
83+
Scott Bell
84+
Carlo Marcelo Arenas Belón
85+
Edward Betts
86+
Jan-Willem Blokland
87+
Ross Burton
88+
Dmitry Cherniachenko
89+
Alexey Chupahin
90+
Jessica Clarke
91+
Alejandro Colomar
92+
Jeremie Courreges-Anglas
93+
Addison Crump
94+
Alex Dowad
95+
Daniel Engberg
96+
Daniel Richard G
97+
David Gaussmann
98+
Andrey Gorbachev
99+
Jordan Griege
100+
Jason Hood
101+
Bumsu Hyeon
102+
Roy Ivy
103+
Martin Joerg
104+
Guillem Jover
105+
Ralf Junker
106+
Ayesh Karunaratne
107+
Michael Kaufmann
108+
Yunho Kim
109+
Joshua Kinard
110+
David Korczynski
111+
Uwe Korn
112+
Jonas Kvinge
113+
Kristian Larsson
114+
Kai Lu
115+
Behzod Mansurov
116+
B. Scott Michel
117+
Nathan Moinvaziri
118+
Mike Munday
119+
Marc Mutz
120+
Fabio Pagani
121+
Christian Persch
122+
Tristan Ross
123+
William A Rowe Jr
124+
David Seifert
125+
Yaakov Selkowitz
126+
Rich Siegel
127+
Karl Skomski
128+
Maciej Sroczyński
129+
Wolfgang Stöggl
130+
Thomas Tempelmann
131+
Greg Thain
132+
Lucas Trzesniewski
133+
Theodore Tsirpanis
134+
Matthew Vernon
135+
Rémi Verschelde
136+
Thomas Voss
137+
Ezekiel Warren
138+
Carl Weaver
139+
Chris Wilson
140+
Amin Yahyaabadi
141+
Joe Zhang
142+
143+
### Contributors to PCRE1
144+
145+
These people contributed either by sending patches or reporting serious issues.
146+
147+
Irfan Adilovic
148+
Alexander Barkov
149+
Daniel Bergström
150+
David Burgess
151+
Ross Burton
152+
David Byron
153+
Fred Cox
154+
Christian Ehrlicher
155+
Tom Fortmann
156+
Lionel Fourquaux
157+
Mike Frysinger
158+
Daniel Richard G
159+
Dair Gran
160+
"Graycode" (Red Hat Product Security)
161+
Viktor Griph
162+
Wen Guanxing
163+
Robin Houston
164+
Martin Jerabek
165+
Peter Kankowski
166+
Stephen Kelly
167+
Yunho Kim
168+
Joshua Kinard
169+
Carsten Klein
170+
Evgeny Kotkov
171+
Ronald Landheer-Cieslak
172+
Alan Lehotsky
173+
Dmitry V. Levin
174+
Nuno Lopes
175+
Kai Lu
176+
Giuseppe Maxia
177+
Dan Mooney
178+
Marc Mutz
179+
Markus Oberhumer
180+
Sheri Pierce
181+
Petr Pisar
182+
Ari Pollak
183+
Bob Rossi
184+
Ruiger Rill
185+
Michael Shigorin
186+
Rich Siegel
187+
Craig Silverstein (C++ wrapper)
188+
Karl Skomski
189+
Paul Sokolovsky
190+
Stan Switzer
191+
Ian Taylor
192+
Mark Tetrode
193+
Jeff Trawick
194+
Steven Van Ingelgem
195+
Lawrence Velazquez
196+
Jiong Wang
197+
Stefan Weber
198+
Chris Wilson
199+
200+
Thanks go to Jeffrey Friedl for testing and debugging assistance.

thirdparty/pcre2/LICENCE renamed to thirdparty/pcre2/LICENCE.md

Lines changed: 42 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
PCRE2 LICENCE
2-
-------------
1+
PCRE2 License
2+
=============
3+
4+
| SPDX-License-Identifier: | BSD-3-Clause WITH PCRE2-exception |
5+
|---------|-------|
36

47
PCRE2 is a library of functions to support regular expressions whose syntax
58
and semantics are as close as possible to those of the Perl 5 language.
@@ -16,40 +19,46 @@ optimize pattern matching. This is an optional feature that can be omitted when
1619
the library is built.
1720

1821

19-
THE BASIC LIBRARY FUNCTIONS
20-
---------------------------
22+
COPYRIGHT
23+
---------
24+
25+
### The basic library functions
2126

22-
Written by: Philip Hazel
23-
Email local part: Philip.Hazel
24-
Email domain: gmail.com
27+
Written by: Philip Hazel
28+
Email local part: Philip.Hazel
29+
Email domain: gmail.com
2530

26-
Retired from University of Cambridge Computing Service,
27-
Cambridge, England.
31+
Retired from University of Cambridge Computing Service,
32+
Cambridge, England.
2833

29-
Copyright (c) 1997-2024 University of Cambridge
30-
All rights reserved.
34+
Copyright (c) 1997-2007 University of Cambridge
35+
Copyright (c) 2007-2024 Philip Hazel
36+
All rights reserved.
3137

38+
### PCRE2 Just-In-Time compilation support
3239

33-
PCRE2 JUST-IN-TIME COMPILATION SUPPORT
34-
--------------------------------------
40+
Written by: Zoltan Herczeg
41+
Email local part: hzmester
42+
Email domain: freemail.hu
3543

36-
Written by: Zoltan Herczeg
37-
Email local part: hzmester
38-
Email domain: freemail.hu
44+
Copyright (c) 2010-2024 Zoltan Herczeg
45+
All rights reserved.
3946

40-
Copyright(c) 2010-2024 Zoltan Herczeg
41-
All rights reserved.
47+
### Stack-less Just-In-Time compiler
4248

49+
Written by: Zoltan Herczeg
50+
Email local part: hzmester
51+
Email domain: freemail.hu
4352

44-
STACK-LESS JUST-IN-TIME COMPILER
45-
--------------------------------
53+
Copyright (c) 2009-2024 Zoltan Herczeg
54+
All rights reserved.
4655

47-
Written by: Zoltan Herczeg
48-
Email local part: hzmester
49-
Email domain: freemail.hu
56+
### All other contributions
5057

51-
Copyright(c) 2009-2024 Zoltan Herczeg
52-
All rights reserved.
58+
Many other contributors have participated in the authorship of PCRE2. As PCRE2
59+
has never required a Contributor Licensing Agreement, or other copyright
60+
assignment agreement, all contributions have copyright retained by each
61+
original contributor or their employer.
5362

5463

5564
THE "BSD" LICENCE
@@ -58,16 +67,16 @@ THE "BSD" LICENCE
5867
Redistribution and use in source and binary forms, with or without
5968
modification, are permitted provided that the following conditions are met:
6069

61-
* Redistributions of source code must retain the above copyright notices,
62-
this list of conditions and the following disclaimer.
70+
* Redistributions of source code must retain the above copyright notices,
71+
this list of conditions and the following disclaimer.
6372

64-
* Redistributions in binary form must reproduce the above copyright
65-
notices, this list of conditions and the following disclaimer in the
66-
documentation and/or other materials provided with the distribution.
73+
* Redistributions in binary form must reproduce the above copyright
74+
notices, this list of conditions and the following disclaimer in the
75+
documentation and/or other materials provided with the distribution.
6776

68-
* Neither the name of the University of Cambridge nor the names of any
69-
contributors may be used to endorse or promote products derived from this
70-
software without specific prior written permission.
77+
* Neither the name of the University of Cambridge nor the names of any
78+
contributors may be used to endorse or promote products derived from this
79+
software without specific prior written permission.
7180

7281
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
7382
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorApple.c renamed to thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitExecAllocatorApple.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@
4141
#include <sys/utsname.h>
4242
#include <stdlib.h>
4343

44-
#define SLJIT_MAP_JIT (get_map_jit_flag())
4544
#define SLJIT_UPDATE_WX_FLAGS(from, to, enable_exec)
4645

46+
#ifdef MAP_JIT
47+
#define SLJIT_MAP_JIT (get_map_jit_flag())
4748
static SLJIT_INLINE int get_map_jit_flag(void)
4849
{
4950
size_t page_size;
@@ -70,6 +71,9 @@ static SLJIT_INLINE int get_map_jit_flag(void)
7071
}
7172
return map_jit_flag;
7273
}
74+
#else /* !defined(MAP_JIT) */
75+
#define SLJIT_MAP_JIT (0)
76+
#endif
7377

7478
#elif defined(SLJIT_CONFIG_ARM) && SLJIT_CONFIG_ARM
7579

0 commit comments

Comments
 (0)