From 28e92e3f8c3bd06ecbade1873f2c255c354672c2 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 3 Jun 2022 13:36:02 +0200 Subject: [PATCH] luci-app-opkg: fix parsing package dependencies with version constraints Due to improper ordering of regexp alternatives, version constraint operators might get undermatched. Fixes: https://github.com/openwrt/openwrt/issues/9982 Signed-off-by: Jo-Philipp Wich (cherry picked from commit b84791bd029c2aaa67cbc06a15d23828f62f4608) --- .../luci-app-opkg/htdocs/luci-static/resources/view/opkg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js index 57f2006e53..de725ea00a 100644 --- a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js +++ b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js @@ -571,7 +571,7 @@ function renderDependencies(depends, info) if (deps[i] === 'libc') continue; - if (deps[i].match(/^(.+)\s+\((<=|<|>|>=|=|<<|>>)(.+)\)$/)) { + if (deps[i].match(/^(.+)\s+\((<=|>=|<<|>>|<|>|=)(.+)\)$/)) { dep = RegExp.$1.trim(); vop = RegExp.$2.trim(); ver = RegExp.$3.trim();