Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package diffoscope for openSUSE:Factory
checked in at 2022-02-17 00:31:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/diffoscope (Old)
and /work/SRC/openSUSE:Factory/.diffoscope.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diffoscope"
Thu Feb 17 00:31:15 2022 rev:28 rq:955466 version:204
Changes:
--------
--- /work/SRC/openSUSE:Factory/diffoscope/diffoscope.changes 2022-02-11
23:12:22.731461262 +0100
+++ /work/SRC/openSUSE:Factory/.diffoscope.new.1956/diffoscope.changes
2022-02-17 00:32:38.457411475 +0100
@@ -1,0 +2,19 @@
+Fri Feb 11 19:14:39 UTC 2022 - Sebastian Wagner <sebix+novell....@sebix.at>
+
+- - update to version 204:
+ - Don't run the binwalk comparator tests as root (or fakeroot) as the
+ latest version of binwalk has some security protection against doing
+ precisely this.
+ - If we fail to scan a file using binwalk, return 'False' from
+ BinwalkFile.recognizes rather than raise a traceback.
+ - If we fail to import the Python "binwalk" module, don't accidentally report
+ that we are missing the "rpm" module instead.
+ - Use dependencies to ensure that "diffoscope" and "diffoscope-minimal"
+ packages always have the precise same version.
+- update to version 203:
+ - Improve documentation for --timeout due to a few misconceptions.
+ Add an allowed-to-fail test regarding a regression in directory handling.
+ - Tidy control flow in Difference._reverse_self a little.
+ - Fix diffing CBFS names that contain spaces.
+
+-------------------------------------------------------------------
Old:
----
diffoscope-203.tar.bz2
diffoscope-203.tar.bz2.asc
New:
----
diffoscope-204.tar.bz2
diffoscope-204.tar.bz2.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ diffoscope.spec ++++++
--- /var/tmp/diff_new_pack.RMTEko/_old 2022-02-17 00:32:39.149411355 +0100
+++ /var/tmp/diff_new_pack.RMTEko/_new 2022-02-17 00:32:39.157411354 +0100
@@ -17,7 +17,7 @@
Name: diffoscope
-Version: 203
+Version: 204
Release: 0
Summary: In-depth comparison of files, archives, and directories
License: GPL-3.0-or-later
++++++ diffoscope-203.tar.bz2 -> diffoscope-204.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diffoscope-203/debian/changelog
new/diffoscope-204/debian/changelog
--- old/diffoscope-203/debian/changelog 2022-02-04 17:13:15.000000000 +0100
+++ new/diffoscope-204/debian/changelog 2022-02-11 19:39:36.000000000 +0100
@@ -1,3 +1,20 @@
+diffoscope (204) unstable; urgency=medium
+
+ [ Chris Lamb ]
+ * Don't run the binwalk comparator tests as root (or fakeroot) as the
+ latest version of binwalk has some security protection against doing
+ precisely this.
+ * If we fail to scan a file using binwalk, return 'False' from
+ BinwalkFile.recognizes rather than raise a traceback.
+ * If we fail to import the Python "binwalk" module, don't accidentally report
+ that we are missing the "rpm" module instead.
+
+ [ Mattia Rizzolo ]
+ * Use dependencies to ensure that "diffoscope" and "diffoscope-minimal"
+ packages always have the precise same version.
+
+ -- Chris Lamb <la...@debian.org> Fri, 11 Feb 2022 10:39:27 -0800
+
diffoscope (203) unstable; urgency=medium
[ Chris Lamb ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diffoscope-203/debian/control
new/diffoscope-204/debian/control
--- old/diffoscope-203/debian/control 2022-02-04 17:13:15.000000000 +0100
+++ new/diffoscope-204/debian/control 2022-02-11 19:39:36.000000000 +0100
@@ -130,7 +130,7 @@
Suggests:
libjs-jquery,
Depends:
- diffoscope-minimal,
+ diffoscope-minimal (= ${source:Version}),
${misc:Depends},
Recommends:
${diffoscope:Recommends},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diffoscope-203/diffoscope/__init__.py
new/diffoscope-204/diffoscope/__init__.py
--- old/diffoscope-203/diffoscope/__init__.py 2022-02-04 17:13:15.000000000
+0100
+++ new/diffoscope-204/diffoscope/__init__.py 2022-02-11 19:39:36.000000000
+0100
@@ -17,4 +17,4 @@
# You should have received a copy of the GNU General Public License
# along with diffoscope. If not, see <https://www.gnu.org/licenses/>.
-VERSION = "203"
+VERSION = "204"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diffoscope-203/diffoscope/comparators/binwalk.py
new/diffoscope-204/diffoscope/comparators/binwalk.py
--- old/diffoscope-203/diffoscope/comparators/binwalk.py 2022-02-04
17:13:15.000000000 +0100
+++ new/diffoscope-204/diffoscope/comparators/binwalk.py 2022-02-11
19:39:36.000000000 +0100
@@ -34,8 +34,8 @@
try:
import binwalk
-except ImportError:
- python_module_missing("rpm")
+except Exception:
+ python_module_missing("binwalk")
binwalk = None
else:
# Disable binwalk's own user configuration for predictable results and to
@@ -89,14 +89,17 @@
unpacked = get_temporary_directory(prefix="binwalk")
logger.debug("Extracting %s to %s", file.path, unpacked.name)
- binwalk.scan(
- file.path,
- dd="cpio:cpio",
- carve=True,
- quiet=True,
- signature=True,
- directory=unpacked.name,
- )
+ try:
+ binwalk.scan(
+ file.path,
+ dd="cpio:cpio",
+ carve=True,
+ quiet=True,
+ signature=True,
+ directory=unpacked.name,
+ )
+ except binwalk.core.exceptions.ModuleException:
+ return False
members = {
"{} file embedded at offset {}".format(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/diffoscope-203/tests/comparators/test_binwalk.py
new/diffoscope-204/tests/comparators/test_binwalk.py
--- old/diffoscope-203/tests/comparators/test_binwalk.py 2022-02-04
17:13:15.000000000 +0100
+++ new/diffoscope-204/tests/comparators/test_binwalk.py 2022-02-11
19:39:36.000000000 +0100
@@ -1,7 +1,7 @@
#
# diffoscope: in-depth comparison of files, archives, and directories
#
-# Copyright ?? 2017, 2020 Chris Lamb <la...@debian.org>
+# Copyright ?? 2017, 2020, 2022 Chris Lamb <la...@debian.org>
#
# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with diffoscope. If not, see <https://www.gnu.org/licenses/>.
+import os
import pytest
from diffoscope.comparators.binwalk import BinwalkFile
@@ -27,13 +28,19 @@
binwalk1 = load_fixture("test1.binwalk")
binwalk2 = load_fixture("test2.binwalk")
+skip_if_root = pytest.mark.skipif(
+ os.getuid() == 0, reason="cannot be run as root"
+)
+
+@skip_if_root
@skip_unless_module_exists("binwalk")
def test_identification(binwalk1, binwalk2):
assert isinstance(binwalk1, BinwalkFile)
assert isinstance(binwalk2, BinwalkFile)
+@skip_if_root
@skip_unless_module_exists("binwalk")
def test_no_differences(binwalk1):
difference = binwalk1.compare(binwalk1)
@@ -45,6 +52,7 @@
return binwalk1.compare(binwalk2)
+@skip_if_root
@skip_unless_tools_exist("cpio")
@skip_unless_module_exists("binwalk")
def test_listing(comparison):
@@ -57,6 +65,7 @@
assert differences[0].details[0].unified_diff == expected_diff
+@skip_if_root
@skip_unless_tools_exist("cpio")
@skip_unless_module_exists("binwalk")
def test_symlink(comparison):
@@ -67,6 +76,7 @@
assert differences[0].details[1].unified_diff == expected_diff
+@skip_if_root
@skip_unless_tools_exist("cpio")
@skip_unless_module_exists("binwalk")
def test_compare_non_existing(monkeypatch, binwalk1):
