Skip to content

Commit b482d33

Browse files
authored
chore: order patches by advisory year and number (#97)
This should make it easier to maintain our patches since you can easily predict where in the file a patch for a particular advisory will be - at this point I don't think we need a script to enforce this since we'll hopefully only have a handful of patches at any one time
1 parent 76b56fa commit b482d33

1 file changed

Lines changed: 28 additions & 27 deletions

File tree

patches.toml

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# this file defines "patches" for specific drupal.org advisories
22

3-
[SA-CONTRIB-2024-025]
3+
[SA-CONTRIB-2019-019]
44
field_affected_versions = [
5-
'<1.0.13 || >=1.1.0 <1.1.0-beta3',
6-
'<1.0.13 || >=1.1.0-beta1 <1.1.0-beta3'
5+
'<1.25.0 || >=2.0.0 >2.3.0',
6+
'<1.25.0 || >=2.0.0 <2.3.0'
77
]
8+
89
[SA-CORE-2022-002]
910
field_affected_versions = [
1011
'>7.0 <=7.86',
@@ -17,16 +18,10 @@ field_affected_versions = [
1718
'<1.6.0'
1819
]
1920

20-
[SA-CONTRIB-2024-042]
21-
field_affected_versions = [
22-
'<1.8.0 || >=2.0.0 <2.0.0-beta3',
23-
'<1.8.0 || >=2.0.0-beta1 <2.0.0-beta3'
24-
]
25-
26-
[SA-CONTRIB-2019-019]
21+
[SA-CONTRIB-2022-028]
2722
field_affected_versions = [
28-
'<1.25.0 || >=2.0.0 >2.3.0',
29-
'<1.25.0 || >=2.0.0 <2.3.0'
23+
'<1.17.0 || =2.0.0',
24+
'<1.17.0 || 2.0.0'
3025
]
3126

3227
[SA-CONTRIB-2023-013]
@@ -35,28 +30,40 @@ field_affected_versions = [
3530
'<1.6'
3631
]
3732

33+
[SA-CONTRIB-2023-030]
34+
field_affected_versions = [
35+
'^1 <= 1.0.0',
36+
'>=1.0.0 <1.1.0'
37+
]
38+
39+
[SA-CONTRIB-2023-031]
40+
field_affected_versions = [
41+
'<1.2.2 || >=1.3.0 <1.3.0-rc3',
42+
'<1.2.2 || >=1.3.0-beta1 <1.3.0-rc3'
43+
]
44+
3845
[SA-CONTRIB-2024-004]
3946
field_affected_versions = [
4047
'<12.05',
4148
'<12.0.5'
4249
]
4350

44-
[SA-CONTRIB-2024-038]
51+
[SA-CONTRIB-2024-025]
4552
field_affected_versions = [
46-
'<12.3.8 || >=12.4.0 <12.4.5 || >=13.0.0 <13.0.0-alpha11',
47-
'<12.3.8 || >=12.4.0 <12.4.5 || >=13.0.0-alpha1 <13.0.0-alpha11'
53+
'<1.0.13 || >=1.1.0 <1.1.0-beta3',
54+
'<1.0.13 || >=1.1.0-beta1 <1.1.0-beta3'
4855
]
4956

50-
[SA-CONTRIB-2022-028]
57+
[SA-CONTRIB-2024-038]
5158
field_affected_versions = [
52-
'<1.17.0 || =2.0.0',
53-
'<1.17.0 || 2.0.0'
59+
'<12.3.8 || >=12.4.0 <12.4.5 || >=13.0.0 <13.0.0-alpha11',
60+
'<12.3.8 || >=12.4.0 <12.4.5 || >=13.0.0-alpha1 <13.0.0-alpha11'
5461
]
5562

56-
[SA-CONTRIB-2023-031]
63+
[SA-CONTRIB-2024-042]
5764
field_affected_versions = [
58-
'<1.2.2 || >=1.3.0 <1.3.0-rc3',
59-
'<1.2.2 || >=1.3.0-beta1 <1.3.0-rc3'
65+
'<1.8.0 || >=2.0.0 <2.0.0-beta3',
66+
'<1.8.0 || >=2.0.0-beta1 <2.0.0-beta3'
6067
]
6168

6269
[SA-CONTRIB-2025-001]
@@ -71,12 +78,6 @@ field_affected_versions = [
7178
'>=1.0.0 <1.0.2'
7279
]
7380

74-
[SA-CONTRIB-2023-030]
75-
field_affected_versions = [
76-
'^1 <= 1.0.0',
77-
'>=1.0.0 <1.1.0'
78-
]
79-
8081
[SA-CONTRIB-2025-087]
8182
field_affected_versions = [
8283
'>1.0.0 < 1.2.4',

0 commit comments

Comments
 (0)