diffoscope 297__tar.gz → 299__tar.gz

{diffoscope-297/diffoscope.egg-info → diffoscope-299}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diffoscope
-Version: 297
+Version: 299
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers

{diffoscope-297 → diffoscope-299}/diffoscope/__init__.py

@@ -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 = "297"
+VERSION = "299"

{diffoscope-297 → diffoscope-299}/diffoscope/comparators/rpm.py

@@ -3,7 +3,7 @@
 #
 # Copyright © 2015 Reiner Herrmann <reiner@reiner-h.de>
 # Copyright © 2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2015-2022 Chris Lamb <lamby@debian.org>
+# Copyright © 2015-2022, 2025 Chris Lamb <lamby@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
@@ -61,6 +61,7 @@ def convert_header_field(io, header):
 
 def get_rpm_header(path, ts):
     s = io.StringIO()
+
     with open(path, "r") as f:
         try:
             hdr = ts.hdrFromFdno(f)
@@ -70,9 +71,27 @@ def get_rpm_header(path, ts):
         for rpmtag in sorted(rpm.tagnames):
             if rpmtag not in hdr:
                 continue
+
+            if rpmtag in {
+                rpm.RPMTAG_HEADERSIGNATURES,
+                rpm.RPMTAG_HEADERIMMUTABLE,
+            }:
+                # Handle HEADERSIGNATURES and HEADERIMMUTABLE differently to
+                # avoid unnecessarily large diffs. (#410)
+                region = hdr[rpmtag]
+                # First 4 bytes are the index count
+                idx_count = int.from_bytes(region[:4], "big")
+                # ... the next 4 bytes are the data length
+                data_len = int.from_bytes(region[4:8], "big")
+                s.write(
+                    f"{rpm.tagnames[rpmtag]}: [{idx_count} indexes, {data_len} bytes]\n"
+                )
+                continue
+
             s.write("{}: ".format(rpm.tagnames[rpmtag]))
             convert_header_field(s, hdr[rpmtag])
             s.write("\n")
+
     return s.getvalue()
 
 

{diffoscope-297 → diffoscope-299/diffoscope.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diffoscope
-Version: 297
+Version: 299
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers

diffoscope-299/tests/data/rpm_header_expected_diff

@@ -0,0 +1,57 @@
+@@ -1,47 +1,47 @@
+ HEADERIMMUTABLE: [48 indexes, 432 bytes]
+ HEADERI18NTABLE: 
+  - C
+-SIGSIZE: 1583
+-SIGMD5: 06166011d2d66f8433d50b417358a31d
+-SHA1HEADER: 331667229aa7e4d600f682e9cd0c6372b93b082a
++SIGSIZE: 1722
++SIGMD5: 746686e44fc68a5836e8043f722e436a
++SHA1HEADER: 2780015bd7bd365949d05e29618fa833e62e4604
+ NAME: test
+ VERSION: 0
+ RELEASE: 0
+ SUMMARY: Test package for debbindiff
+ DESCRIPTION: Test package
+-BUILDTIME: 1435168523
++BUILDTIME: 1435168561
+ BUILDHOST: loar
+-SIZE: 446
++SIZE: 671
+ LICENSE: Public
+ GROUP: Applications/System
+ OS: linux
+ ARCH: x86_64
+ FILESIZES: 
+- - 446
++ - 671
+ FILEMODES: 
+  - 33188
+ FILERDEVS: 
+  - 0
+ FILEMTIMES: 
+- - 1435168518
++ - 1435168559
+ FILEMD5S: 
+- - 7873b606429a70284d63f0674e6787bc
++ - 17866262a0c60d916e3cf3219724b2e7
+ FILELINKTOS: 
+  - 
+ FILEFLAGS: 
+  - 0
+ FILEUSERNAME: 
+  - root
+ FILEGROUPNAME: 
+  - root
+ SOURCERPM: test-0-0.src.rpm
+ FILEVERIFYFLAGS: 
+  - 4294967295
+-ARCHIVESIZE: 696
++ARCHIVESIZE: 920
+ PROVIDES: 
+  - test
+  - test(x86-64)
+ REQUIREFLAGS: 
+  - 16777226
+  - 16777226
+ REQUIRES: 

diffoscope-297/tests/data/rpm_header_expected_diff

@@ -1,75 +0,0 @@
-@@ -10,62 +10,62 @@
- 00dc000000020000041a00000008000001170000000200000428000000060000012500000001000004470000000400000130
- 00000001000004480000000400000134000000010000044900000008000001380000000100000458000000040000013c0000
- 0002000004590000000800000144000000020000045c000000040000014c000000010000045d000000080000015000000001
- 0000045e00000008000001550000000100000462000000060000015b00000001000004640000000600000162000000010000
- 046500000006000001670000000100000466000000060000016c000000010000046c000000060000016e0000000100000474
- 0000000400000184000000010000047500000004000001880000000100000476000000080000018c00000001000004770000
- 0004000001980000000100000478000000040000019c00000001430074657374003000300054657374207061636b61676520
--666f722064656262696e646966660054657374207061636b61676500558aef0b6c6f617200000000000001be5075626c6963
--004170706c69636174696f6e732f53797374656d006c696e7578007838365f363400000001be81a40000558aef0637383733
--623630363432396137303238346436336630363734653637383762630000000000000000726f6f7400726f6f740074657374
-+666f722064656262696e646966660054657374207061636b61676500558aef316c6f6172000000000000029f5075626c6963
-+004170706c69636174696f6e732f53797374656d006c696e7578007838365f3634000000029f81a40000558aef2f31373836
-+363236326130633630643931366533636633323139373234623265370000000000000000726f6f7400726f6f740074657374
- 2d302d302e7372632e72706d0000ffffffff746573740074657374287838362d3634290000000100000a0100000a72706d6c
- 696228436f6d7072657373656446696c654e616d6573290072706d6c6962285061796c6f616446696c657348617665507265
- 6669782900332e302e342d3100342e302d3100342e31322e302e310000000000000100000001000000000000000800000008
- 302d3000302d30000000000074657874002f6469722f002d4f32202d67006370696f00677a69700039007838365f36342d64
- 656269616e2d6c696e7578000000000000000000000041534349492074657874000000000000000000000000003f00000007
- fffffd0000000010
- HEADERI18NTABLE: 
-  - C
--SIGSIZE: 1583
--SIGMD5: 06166011d2d66f8433d50b417358a31d
--SHA1HEADER: 331667229aa7e4d600f682e9cd0c6372b93b082a
-+SIGSIZE: 1722
-+SIGMD5: 746686e44fc68a5836e8043f722e436a
-+SHA1HEADER: 2780015bd7bd365949d05e29618fa833e62e4604
- NAME: test
- VERSION: 0
- RELEASE: 0
- SUMMARY: Test package for debbindiff
- DESCRIPTION: Test package
--BUILDTIME: 1435168523
-+BUILDTIME: 1435168561
- BUILDHOST: loar
--SIZE: 446
-+SIZE: 671
- LICENSE: Public
- GROUP: Applications/System
- OS: linux
- ARCH: x86_64
- FILESIZES: 
-- - 446
-+ - 671
- FILEMODES: 
-  - 33188
- FILERDEVS: 
-  - 0
- FILEMTIMES: 
-- - 1435168518
-+ - 1435168559
- FILEMD5S: 
-- - 7873b606429a70284d63f0674e6787bc
-+ - 17866262a0c60d916e3cf3219724b2e7
- FILELINKTOS: 
-  - 
- FILEFLAGS: 
-  - 0
- FILEUSERNAME: 
-  - root
- FILEGROUPNAME: 
-  - root
- SOURCERPM: test-0-0.src.rpm
- FILEVERIFYFLAGS: 
-  - 4294967295
--ARCHIVESIZE: 696
-+ARCHIVESIZE: 920
- PROVIDES: 
-  - test
-  - test(x86-64)
- REQUIREFLAGS: 
-  - 16777226
-  - 16777226
- REQUIRES: