Merge pull request #41537 from tianon/apparmor-tilde

Also trim "~..." from AppArmor versions

pkg/aaparser/aaparser.go

@@ -58,6 +58,8 @@ func parseVersion(output string) (int, error) {
 
 	// 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, ".")

pkg/aaparser/aaparser_test.go

@@ -43,6 +43,14 @@ Copyright 2009-2012 Canonical Ltd.
 `,
 			version: 205000,
 		},
+		{
+			output: `AppArmor parser version 2.2.0~rc2
+Copyright (C) 1999-2008 Novell Inc.
+Copyright 2009-2012 Canonical Ltd.
+
+`,
+			version: 202000,
+		},
 		{
 			output: `AppArmor parser version 2.9.95
 Copyright (C) 1999-2008 Novell Inc.