From 92559b7330a56778dde383225bae47e225de4861 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 27 Mar 2022 21:15:36 +0200 Subject: [PATCH 1/2] chromium: get-commit-message.py: Support releases with 1 security fix There was an out-of-band security release with only a single security fix: https://chromereleases.googleblog.com/2022/03/stable-channel-update-for-desktop_25.html --- .../networking/browsers/chromium/get-commit-message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index 833b6b8283d0..45f4282582f5 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -38,7 +38,7 @@ for entry in feed.entries: else: print('chromium: TODO -> ' + version + '\n') print(url) - if fixes := re.search(r'This update includes .+ security fixes\.', content): + if fixes := re.search(r'This update includes .+ security fix(es)?\.', content): fixes = fixes.group(0) if zero_days := re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content): fixes += " " + zero_days.group(0) From dbf02e3a52d3e37759328e2c90b38ee8ba95b2f2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 10 Apr 2022 21:44:08 +0200 Subject: [PATCH 2/2] chromiumDev: 102.0.4972.0 -> 102.0.4987.0 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a27752bda8a6..c26edc50b24b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "102.0.4972.0", - "sha256": "1aihdym7h8sd52wiybnrgjrd618f3yby4bpbkc26xyrl8gviz31d", - "sha256bin64": "0mb67cfr397aclkiy0v9xqga07c166qdylq257k2kmhj7df1gcvn", + "version": "102.0.4987.0", + "sha256": "0rs6smmda0wlhwbvmhmyz0vi43rkb9gyfbm49bn2084bd1x3qpzy", + "sha256bin64": "1knrnjhn98bln81qf3646gz9znn848kgjayyjl5ik0x0fimx524x", "deps": { "gn": { - "version": "2022-03-29", + "version": "2022-04-05", "url": "https://gn.googlesource.com/gn", - "rev": "e39d5251c25155b9dfdb96adeab31b795095fd3b", - "sha256": "1clr0f847rmwwpmsl9zv4q6rw1shn09my775666v480szpahj9pk" + "rev": "5eb3845ec2d8296b4f41da4eca85302eb111fe69", + "sha256": "04yy4d77bw3bhb32q1szlqn6lmif6qaah2c0ns6by0cbnkliyaza" } } },