blob: 0abe9b3db65818adab5ed53565e095754dc71a4b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
From 5c81adc3d2e24ac13a98f1eed35ad239eb948b1d Mon Sep 17 00:00:00 2001
From: Valentin Rothberg <vrothberg@redhat.com>
Date: Fri, 6 Oct 2023 11:40:49 +0200
Subject: [PATCH] apparmor: fix parsing beta/alpha version
Copied from github.com/moby/moby who already has a fix for it.
Tested manually on a Ubuntu 23.10 (beta) VM.
Fixes: #containers/podman/issues/20278
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
---
pkg/apparmor/apparmor_linux.go | 5 +++++
1 file changed, 5 insertions(+)
Index: golang-github-containers-common/pkg/apparmor/apparmor_linux.go
===================================================================
--- golang-github-containers-common.orig/pkg/apparmor/apparmor_linux.go
+++ golang-github-containers-common/pkg/apparmor/apparmor_linux.go
@@ -217,6 +217,11 @@ func parseAAParserVersion(output string)
// also trim "~..." suffix used historically (https://gitlab.com/apparmor/apparmor/-/commit/bca67d3d27d219d11ce8c9cc70612bd637f88c10)
version = strings.SplitN(version, "~", 2)[0]
+ // trim "-beta1" suffix from version="3.0.0-beta1" if exists
+ version = strings.SplitN(version, "-", 2)[0]
+ // also trim "~..." suffix used historically (https://gitlab.com/apparmor/apparmor/-/commit/bca67d3d27d219d11ce8c9cc70612bd637f88c10)
+ version = strings.SplitN(version, "~", 2)[0]
+
// split by major minor version
v := strings.Split(version, ".")
if len(v) == 0 || len(v) > 3 {
|
