Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package scap-security-guide for
openSUSE:Factory checked in at 2024-12-10 23:49:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scap-security-guide (Old)
and /work/SRC/openSUSE:Factory/.scap-security-guide.new.29675 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scap-security-guide"
Tue Dec 10 23:49:38 2024 rev:38 rq:1229844 version:0.1.75
Changes:
--------
--- /work/SRC/openSUSE:Factory/scap-security-guide/scap-security-guide.changes
2024-12-05 17:10:45.506914125 +0100
+++
/work/SRC/openSUSE:Factory/.scap-security-guide.new.29675/scap-security-guide.changes
2024-12-10 23:49:53.072431778 +0100
@@ -1,0 +2,6 @@
+Thu Dec 5 20:18:21 UTC 2024 - Marcus Meissner <meiss...@suse.com>
+
+- ssg-reproducable.patch: replace two date injections by SOURCE_DATE_EPOCH
+ to make reproducible. bsc#1230361
+
+-------------------------------------------------------------------
New:
----
ssg-reproducable.patch
BETA DEBUG BEGIN:
New:
- ssg-reproducable.patch: replace two date injections by SOURCE_DATE_EPOCH
to make reproducible. bsc#1230361
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scap-security-guide.spec ++++++
--- /var/tmp/diff_new_pack.QWfe8R/_old 2024-12-10 23:49:53.560452121 +0100
+++ /var/tmp/diff_new_pack.QWfe8R/_new 2024-12-10 23:49:53.564452288 +0100
@@ -52,6 +52,7 @@
Packager: SUSE Security Team <secur...@suse.de>
%endif
Source:
https://github.com/ComplianceAsCode/content/archive/v%{version}.tar.gz
+Patch0: ssg-reproducable.patch
# explicit require what is needed by the detection logic in the scripts
Requires: coreutils
@@ -195,6 +196,7 @@
%prep
%setup -q -n content-%version
+%patch -P 0 -p1
%build
cd build
++++++ ssg-reproducable.patch ++++++
Index: content-0.1.75/utils/create_scap_delta_tailoring.py
===================================================================
--- content-0.1.75.orig/utils/create_scap_delta_tailoring.py
+++ content-0.1.75/utils/create_scap_delta_tailoring.py
@@ -2,6 +2,7 @@
import argparse
import datetime
+import time
import json
import os
import re
@@ -165,10 +166,11 @@ setup_tailoring_profile.__annotations__
def _get_datetime():
- try:
- return datetime.datetime.now(datetime.UTC).isoformat()
- except AttributeError:
- return datetime.datetime.utcnow().isoformat()
+ return
datetime.datetime.fromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH',
time.time()))).isoformat()
+ #try:
+ # return datetime.datetime.now(datetime.UTC).isoformat()
+ #except AttributeError:
+ # return datetime.datetime.utcnow().isoformat()
def create_tailoring(args):
Index: content-0.1.75/ssg/build_yaml.py
===================================================================
--- content-0.1.75.orig/ssg/build_yaml.py
+++ content-0.1.75/ssg/build_yaml.py
@@ -3,6 +3,7 @@ from __future__ import print_function
from copy import deepcopy
import datetime
+import time
import json
import os
import os.path
@@ -423,7 +424,7 @@ class Benchmark(XCCDFEntity):
root.set('xml:lang', 'en-US')
status = ET.SubElement(root, '{%s}status' % XCCDF12_NS)
- status.set('date', datetime.date.today().strftime("%Y-%m-%d"))
+ status.set('date', time.strftime( "%Y-%m-%d",
time.gmtime(int(os.environ.get('SOURCE_DATE_EPOCH', time.time())))))
status.text = self.status
add_sub_element(root, "title", XCCDF12_NS, self.title)
