Merge branch 'master' into windows

matomo-org · Oct 28, 2024 · 48cbbe9 · 48cbbe9
2 parents c2731b9 + 150ac62
commit 48cbbe9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/Tests/Parser/fixtures/oss.yml b/Tests/Parser/fixtures/oss.yml
@@ -5319,3 +5319,19 @@
     Sec-CH-UA-Platform-Version: 0.0.0
     Sec-CH-UA-Arch: x86
     Sec-CH-UA-Bitness: "64"
+-
+  user_agent: Safari/20620.1.11 CFNetwork/1568.300.61 Darwin/24.2.0
+  os:
+    name: Mac
+    short_name: MAC
+    version: "15.2"
+    platform: ""
+    family: Mac
+-
+  user_agent: Podcasts/4024.310.31.1 CFNetwork/1568.300.61 Darwin/24.2.0
+  os:
+    name: iOS
+    short_name: IOS
+    version: "18.2"
+    platform: ""
+    family: iOS
diff --git a/regexes/oss.yml b/regexes/oss.yml
@@ -1325,6 +1325,8 @@
 - regex: '^(?!com\.apple\.Safari\.SearchHelper|Safari).*(?:CFNetwork|Mana)/.+ Darwin/(\d+[\.\d]+)(?!.*(?:x86_64|i386|PowerMac|Power%20Macintosh))'
   name: 'iOS'
   versions:
+    - regex: 'Darwin/24\.2\.0'
+      version: '18.2'
     - regex: 'Darwin/24\.1\.0'
       version: '18.1'
     - regex: 'Darwin/24\.0\.0'
@@ -1554,6 +1556,8 @@
 - regex: '(?:CFNetwork|Mana|StudioDisplay)/.+Darwin(?:/|; )(?:[\d\.]+).+(?:x86_64|i386|Power%20Macintosh)|(?:x86_64-apple-)?darwin(?:[\d\.]+)|C?Python.*Darwin|PowerMac|com\.apple\.Safari\.SearchHelper|^Safari'
   name: 'Mac'
   versions:
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?24\.2\.0'
+      version: '15.2'
     - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?24\.1\.0'
       version: '15.1'
     - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?24\.0\.0'