Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package diffoscope for openSUSE:Factory checked in at 2021-06-09 21:52:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/diffoscope (Old) and /work/SRC/openSUSE:Factory/.diffoscope.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diffoscope" Wed Jun 9 21:52:37 2021 rev:12 rq:898403 version:177 Changes: -------- --- /work/SRC/openSUSE:Factory/diffoscope/diffoscope.changes 2021-06-05 23:32:10.812505585 +0200 +++ /work/SRC/openSUSE:Factory/.diffoscope.new.32437/diffoscope.changes 2021-06-09 21:52:59.298548129 +0200 @@ -1,0 +2,6 @@ +Tue Jun 8 10:29:34 UTC 2021 - Ferdinand Thiessen <[email protected]> + +- Update to version 177 + * Improve support for Apple "provisioning profiles". + +------------------------------------------------------------------- Old: ---- diffoscope-176.tar.bz2 diffoscope-176.tar.bz2.asc New: ---- diffoscope-177.tar.bz2 diffoscope-177.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ diffoscope.spec ++++++ --- /var/tmp/diff_new_pack.F92a4Z/_old 2021-06-09 21:52:59.798549020 +0200 +++ /var/tmp/diff_new_pack.F92a4Z/_new 2021-06-09 21:52:59.798549020 +0200 @@ -17,7 +17,7 @@ Name: diffoscope -Version: 176 +Version: 177 Release: 0 Summary: In-depth comparison of files, archives, and directories License: GPL-3.0-or-later ++++++ diffoscope-176.tar.bz2 -> diffoscope-177.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-176/debian/changelog new/diffoscope-177/debian/changelog --- old/diffoscope-176/debian/changelog 2021-05-28 11:52:28.000000000 +0200 +++ new/diffoscope-177/debian/changelog 2021-06-04 11:03:08.000000000 +0200 @@ -1,3 +1,11 @@ +diffoscope (177) unstable; urgency=medium + + [ Keith Smiley ] + * Improve support for Apple "provisioning profiles". + * Fix ignoring objdump tests on MacOS. + + -- Chris Lamb <[email protected]> Fri, 04 Jun 2021 10:03:04 +0100 + diffoscope (176) unstable; urgency=medium * Update ffmpeg tests to work with ffmpeg 4.4. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-176/diffoscope/__init__.py new/diffoscope-177/diffoscope/__init__.py --- old/diffoscope-176/diffoscope/__init__.py 2021-05-28 11:52:28.000000000 +0200 +++ new/diffoscope-177/diffoscope/__init__.py 2021-06-04 11:03:08.000000000 +0200 @@ -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 = "176" +VERSION = "177" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-176/diffoscope/comparators/openssl.py new/diffoscope-177/diffoscope/comparators/openssl.py --- old/diffoscope-176/diffoscope/comparators/openssl.py 2021-05-28 11:52:28.000000000 +0200 +++ new/diffoscope-177/diffoscope/comparators/openssl.py 2021-06-04 11:03:08.000000000 +0200 @@ -16,11 +16,13 @@ # You should have received a copy of the GNU General Public License # along with diffoscope. If not, see <https://www.gnu.org/licenses/>. +import plistlib + from diffoscope.tools import tool_required from diffoscope.difference import Difference from .utils.file import File -from .utils.command import Command +from .utils.command import Command, our_check_output class OpenSSLPKCS7(Command): @@ -29,23 +31,6 @@ return ("openssl", "pkcs7", "-print", "-noout", "-in", self.path) -class OpenSSLSMIME(Command): - MASK_STDERR = True - - @tool_required("openssl") - def cmdline(self): - return ( - "openssl", - "smime", - "-inform", - "der", - "-verify", - "-noverify", - "-in", - self.path, - ) - - class Pkcs7File(File): DESCRIPTION = "Public Key Cryptography Standards (PKCS) files (version #7)" FILE_TYPE_HEADER_PREFIX = b"-----BEGIN PKCS7-----"[:16] @@ -65,9 +50,36 @@ DESCRIPTION = "Apple Xcode mobile provisioning files" FILE_EXTENSION_SUFFIX = {".mobileprovision"} + @staticmethod + @tool_required("openssl") + def _get_structured_profile_text(path): + openssl_output = our_check_output( + [ + "openssl", + "smime", + "-inform", + "der", + "-verify", + "-noverify", + "-in", + path, + ] + ) + return plistlib.dumps(plistlib.loads(openssl_output), sort_keys=True) + def compare_details(self, other, source=None): + my_content = MobileProvisionFile._get_structured_profile_text( + self.path + ) + other_content = MobileProvisionFile._get_structured_profile_text( + other.path + ) return [ - Difference.from_operation( - OpenSSLSMIME, self.path, other.path, source="openssl smime" + Difference.from_text( + my_content, + other_content, + self.name, + other.name, + source="openssl smime", ) ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-176/tests/utils/tools.py new/diffoscope-177/tests/utils/tools.py --- old/diffoscope-176/tests/utils/tools.py 2021-05-28 11:52:28.000000000 +0200 +++ new/diffoscope-177/tests/utils/tools.py 2021-06-04 11:03:08.000000000 +0200 @@ -177,11 +177,14 @@ @functools.lru_cache() def get_supported_elf_formats(): - return set( - subprocess.check_output(("objdump", "--info")) - .decode("utf-8") - .splitlines() - ) + try: + return set( + subprocess.check_output(("objdump", "--info")) + .decode("utf-8") + .splitlines() + ) + except (subprocess.CalledProcessError, FileNotFoundError): + return set() def module_is_not_importable(x):
