Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/
Date: Sat, 28 Dec 2019 20:34:44
Message-Id: 1577565273.46fe7b1894a7fbbf7e29e7515eac4e5c78d4eee6.mgorny@gentoo
1 commit: 46fe7b1894a7fbbf7e29e7515eac4e5c78d4eee6
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 28 20:29:45 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 28 20:34:33 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46fe7b18
7
8 sys-kernel/vanilla-kernel: Verify version passed to has_version
9
10 Verify the version read from /usr/src/linux symlink and make sure
11 that it consists of plain [0-9.] before passing it to has_version.
12 If it doesn't conform, it isn't our symlink anyway.
13
14 Closes: https://bugs.gentoo.org/703822
15 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
16
17 sys-kernel/vanilla-kernel/vanilla-kernel-5.4.6-r1.ebuild | 5 +++--
18 1 file changed, 3 insertions(+), 2 deletions(-)
19
20 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.6-r1.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.6-r1.ebuild
21 index 7e340bb4433..62465876eca 100644
22 --- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.6-r1.ebuild
23 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.6-r1.ebuild
24 @@ -174,8 +174,9 @@ pkg_postinst() {
25 fi
26
27 local symlink_target=$(readlink "${EROOT}"/usr/src/linux)
28 - if [[ ${symlink_target} == linux-[0-9]* ]]; then
29 - local symlink_ver=${symlink_target#linux-}
30 + local symlink_ver=${symlink_target#linux-}
31 + if [[ ${symlink_target} == linux-* && -z ${symlink_ver//[0-9.]/} ]]
32 + then
33 local symlink_pkg=${CATEGORY}/${PN}-${symlink_ver}
34 # if the current target is either being replaced, or still
35 # installed (probably depclean candidate), update the symlink