Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package keylime for openSUSE:Factory checked
in at 2022-01-13 00:22:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/keylime (Old)
and /work/SRC/openSUSE:Factory/.keylime.new.1892 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "keylime"
Thu Jan 13 00:22:06 2022 rev:10 rq:945609 version:6.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/keylime/keylime.changes 2022-01-11
00:02:32.397274330 +0100
+++ /work/SRC/openSUSE:Factory/.keylime.new.1892/keylime.changes
2022-01-13 00:22:14.719924836 +0100
@@ -1,0 +2,10 @@
+Tue Jan 11 13:38:19 UTC 2022 - Alberto Planas Dominguez <apla...@suse.com>
+
+- Add 0001-Drop-dataclasses-module-usage.patch, to support Python 3.6
+
+-------------------------------------------------------------------
+Tue Jan 11 12:54:41 UTC 2022 - Alberto Planas Dominguez <apla...@suse.com>
+
+- Fix cfssl bcond logic in Tumbleweed / SLE
+
+-------------------------------------------------------------------
New:
----
0001-Drop-dataclasses-module-usage.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ keylime.spec ++++++
--- /var/tmp/diff_new_pack.jlTX9d/_old 2022-01-13 00:22:15.671925521 +0100
+++ /var/tmp/diff_new_pack.jlTX9d/_new 2022-01-13 00:22:15.675925524 +0100
@@ -38,6 +38,8 @@
Patch2: keylime.conf.diff
# PATCH-FIX-OPENSUSE config-libefivars.diff
Patch3: config-libefivars.diff
+# PATCH-FIX-UPSTREAM 0001-Drop-dataclasses-module-usage.patch
(gh#keylime/keylime!827)
+Patch4: 0001-Drop-dataclasses-module-usage.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: firewall-macros
@@ -124,7 +126,7 @@
%prep
%autosetup -p1 -n %{name}-v%{version}
-%if %{with cfssl}
+%if !%{with cfssl}
sed -i "s/ca_implementation = cfssl/ca_implementation = openssl/g" keylime.conf
%endif
++++++ 0001-Drop-dataclasses-module-usage.patch ++++++
>From 9986afc17621fba80df9493a6bf9343334fce77d Mon Sep 17 00:00:00 2001
From: Alberto Planas <apla...@suse.com>
Date: Tue, 11 Jan 2022 14:32:54 +0100
Subject: [PATCH] Drop dataclasses module usage
Dataclasses module is not present in Python 3.6, an interpreter still
used in some distributions.
Even there is a 3rd party compatibility module, the current usage seems
not properly justified. For example, in one of the dataclasses there is
an user-provided `__init__` constructor.
Signed-off-by: Alberto Planas <apla...@suse.com>
---
keylime/failure.py | 7 ++++---
keylime/ima_ast.py | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
Index: keylime-v6.2.1/keylime/failure.py
===================================================================
--- keylime-v6.2.1.orig/keylime/failure.py
+++ keylime-v6.2.1/keylime/failure.py
@@ -5,7 +5,6 @@ Copyright 2021 Thore Sommer
Tagging of failure events that might cause revocation in Keylime.
'''
import ast
-import dataclasses
import enum
import functools
import json
@@ -19,7 +18,6 @@ logger = keylime_logging.init_logging("f
@functools.total_ordering
-@dataclasses.dataclass(frozen=True)
class SeverityLabel:
"""
Severity label that can be attached to an event.
@@ -30,6 +28,10 @@ class SeverityLabel:
name: str
severity: int
+ def __init__(self, name, severity):
+ self.name = name
+ self.severity = severity
+
def __lt__(self, other):
return self.severity < other.severity
@@ -49,7 +51,6 @@ class Component(enum.Enum):
DEFAULT = "default"
-@dataclasses.dataclass
class Event:
"""
Event that might be the reason for revocation.
Index: keylime-v6.2.1/keylime/ima_ast.py
===================================================================
--- keylime-v6.2.1.orig/keylime/ima_ast.py
+++ keylime-v6.2.1/keylime/ima_ast.py
@@ -13,7 +13,6 @@ import codecs
import hashlib
import struct
import abc
-import dataclasses
from typing import Dict, Callable, Any, Optional
from keylime import config
@@ -33,10 +32,12 @@ NULL_BYTE = ord('\0')
COLON_BYTE = ord(':')
-@dataclasses.dataclass
class Validator:
functions: Dict[Any, Callable]
+ def __init__(self, functions):
+ self.functions = functions
+
def get_validator(self, class_type) -> Callable:
validator = self.functions.get(class_type, None)
if validator is None:
++++++ config-libefivars.diff ++++++
--- /var/tmp/diff_new_pack.jlTX9d/_old 2022-01-13 00:22:15.723925558 +0100
+++ /var/tmp/diff_new_pack.jlTX9d/_new 2022-01-13 00:22:15.727925561 +0100
@@ -1,8 +1,8 @@
-Index: keylime-6.2.0/keylime/config.py
+Index: keylime-v6.2.1/keylime/config.py
===================================================================
---- keylime-6.2.0.orig/keylime/config.py
-+++ keylime-6.2.0/keylime/config.py
-@@ -311,7 +311,7 @@ MEASUREDBOOT_ML = '/sys/kernel/security/
+--- keylime-v6.2.1.orig/keylime/config.py
++++ keylime-v6.2.1/keylime/config.py
+@@ -310,7 +310,7 @@ MEASUREDBOOT_ML = '/sys/kernel/security/
MEASUREDBOOT_IMPORTS = get_config().get('cloud_verifier',
'measured_boot_imports', fallback='').split(',')
MEASUREDBOOT_POLICYNAME = get_config().get('cloud_verifier',
'measured_boot_policy_name', fallback='accept-all')
