Date: Friday, October 7, 2022 @ 20:13:57
Author: jelle
Revision: 1324307
archrelease: copy trunk to community-x86_64
Added:
diffoscope/repos/community-x86_64/0001-Support-file-5.43.patch
(from rev 1324306, diffoscope/trunk/0001-Support-file-5.43.patch)
diffoscope/repos/community-x86_64/PKGBUILD
(from rev 1324306, diffoscope/trunk/PKGBUILD)
diffoscope/repos/community-x86_64/keys/
Deleted:
diffoscope/repos/community-x86_64/0001-Support-file-5.43.patch
diffoscope/repos/community-x86_64/PKGBUILD
diffoscope/repos/community-x86_64/keys/
------------------------------+
0001-Support-file-5.43.patch | 58 ++++++------
PKGBUILD | 198 ++++++++++++++++++++---------------------
2 files changed, 128 insertions(+), 128 deletions(-)
Deleted: 0001-Support-file-5.43.patch
===================================================================
--- 0001-Support-file-5.43.patch 2022-10-07 20:13:45 UTC (rev 1324306)
+++ 0001-Support-file-5.43.patch 2022-10-07 20:13:57 UTC (rev 1324307)
@@ -1,29 +0,0 @@
-From 88c08e7e098d2962e1bdbeb56a48d4a20f73f0ae Mon Sep 17 00:00:00 2001
-From: Jelle van der Waa <[email protected]>
-Date: Fri, 23 Sep 2022 14:35:20 +0200
-Subject: [PATCH] Support file 5.43
-
-File 5.43 changed it's output format for pyc files to something new:
-
-Byte-compiled Python module for CPython 3.9, timestamp-based, .py
-timestamp: Sun Sep 5 18:47:25 2021 UTC, .py size: 14217 bytes
----
- diffoscope/comparators/python.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/diffoscope/comparators/python.py
b/diffoscope/comparators/python.py
-index 5cf30c7d..1b9d4220 100644
---- a/diffoscope/comparators/python.py
-+++ b/diffoscope/comparators/python.py
-@@ -36,7 +36,7 @@ re_memory_address = re.compile(r" at 0x\w+(?=, )")
-
- class PycFile(File):
- DESCRIPTION = "Python .pyc files"
-- FILE_TYPE_RE = re.compile(r"^python .*byte-compiled$")
-+ FILE_TYPE_RE = re.compile(r"(^python .*byte-compiled$|^Byte-compiled
Python module for CPython .*)")
- FALLBACK_FILE_EXTENSION_SUFFIX = {".pyc"}
-
- def compare_details(self, other, source=None):
---
-2.37.3
-
Copied: diffoscope/repos/community-x86_64/0001-Support-file-5.43.patch (from
rev 1324306, diffoscope/trunk/0001-Support-file-5.43.patch)
===================================================================
--- 0001-Support-file-5.43.patch (rev 0)
+++ 0001-Support-file-5.43.patch 2022-10-07 20:13:57 UTC (rev 1324307)
@@ -0,0 +1,29 @@
+From 88c08e7e098d2962e1bdbeb56a48d4a20f73f0ae Mon Sep 17 00:00:00 2001
+From: Jelle van der Waa <[email protected]>
+Date: Fri, 23 Sep 2022 14:35:20 +0200
+Subject: [PATCH] Support file 5.43
+
+File 5.43 changed it's output format for pyc files to something new:
+
+Byte-compiled Python module for CPython 3.9, timestamp-based, .py
+timestamp: Sun Sep 5 18:47:25 2021 UTC, .py size: 14217 bytes
+---
+ diffoscope/comparators/python.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/diffoscope/comparators/python.py
b/diffoscope/comparators/python.py
+index 5cf30c7d..1b9d4220 100644
+--- a/diffoscope/comparators/python.py
++++ b/diffoscope/comparators/python.py
+@@ -36,7 +36,7 @@ re_memory_address = re.compile(r" at 0x\w+(?=, )")
+
+ class PycFile(File):
+ DESCRIPTION = "Python .pyc files"
+- FILE_TYPE_RE = re.compile(r"^python .*byte-compiled$")
++ FILE_TYPE_RE = re.compile(r"(^python .*byte-compiled$|^Byte-compiled
Python module for CPython .*)")
+ FALLBACK_FILE_EXTENSION_SUFFIX = {".pyc"}
+
+ def compare_details(self, other, source=None):
+--
+2.37.3
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-10-07 20:13:45 UTC (rev 1324306)
+++ PKGBUILD 2022-10-07 20:13:57 UTC (rev 1324307)
@@ -1,99 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-
-pkgname=diffoscope
-pkgver=223
-pkgrel=1
-pkgdesc='Tool for in-depth comparison of files, archives, and directories'
-url='https://diffoscope.org/'
-arch=('x86_64')
-license=('GPL3')
-depends=('python-magic' 'python-libarchive-c' 'python-distro'
'python-defusedxml'
- 'python-tlsh')
-optdepends=(
- 'acl: access control list utilities support'
- 'binutils: binary utilities support'
- 'binwalk: binwalk support'
- 'bzip2: bzip2 utilities support'
- 'cdrtools: ISO utilities support'
- 'colord: ICC profiles support'
- 'cpio: cpio archive support'
- 'diffutils: diff utilities support'
- 'docx2txt: docx comparing support'
- 'dtc: device tree comparing support'
- 'e2fsprogs: Ext2/3/4 filesystem utilities support'
- 'enjarify: Android dex file support'
- 'hdf5: Hierarchical Data Format support'
- 'imagemagick: ImageMagick identify support'
- 'fpc: Free Pascal utilities support'
- 'java-environment: java utilities support'
- 'libcaca: image compare support'
- 'libxmlb: binary XML blobs support'
- 'llvm: LLVM bitcode files support'
- 'lz4: lz4 compression support'
- 'odt2txt: odt comparing support'
- 'fontforge: bitmap font utilities support'
- 'gettext: GNU internationalization utilities support'
- 'ghc: haskell utilities support'
- 'giflib: gifbuild utilities support'
- 'gnupg: GNU privacy guard support'
- 'gnumeric: GNOME Spreadsheet support'
- 'mono: mono support'
- 'openssh: OpenSSH key comparing support'
- 'openssl: .p7c and .p7b certificates. support'
- 'pgpdump: PGP files support'
- 'poppler: PDF utilities support'
- 'r: R language support'
- 'radare2: decompiler for executables'
- 'sqlite: SQLite support'
- 'squashfs-tools: squashfs filesystem support'
- 'python-guestfs: guestfs filesystem support'
- 'python-argcomplete: completion support'
- 'python-jsbeautifier: javascript beautifier support'
- 'python-progressbar: show progressbar support'
- 'tcpdump: pcap matching support'
- 'uboot-tools: FIT image support'
- 'unzip: zip utilities support'
- 'gzip: gzip utilities support'
- 'tar: tar utilities support'
-# 'wabt: webassembly support' unittest fails
- 'xxd: xxd utilities support'
- 'xz: XZ and LZMA utilities support'
- 'zstd: zst compression'
-)
-makedepends=('help2man' 'python-docutils' 'git')
-checkdepends=(
- 'python-pytest' 'python-jsbeautifier' 'python-h5py' 'acl' 'binutils' 'bzip2'
'cdrtools' 'cpio' 'diffutils' 'e2fsprogs' 'enjarify'
- 'hdf5' 'imagemagick' 'java-environment=11' 'fontforge' 'gettext' 'ghc'
'gnupg' 'mono' 'pgpdump' 'poppler' 'sqlite' 'squashfs-tools'
- 'libxmlb' 'lz4' 'unzip' 'gzip' 'tar' 'tcpdump' 'vim' 'xz' 'llvm' 'colord'
'fpc' 'openssh' 'openssl' 'odt2txt' 'docx2txt' 'r' 'dtc'
- 'giflib' 'gnumeric' 'python-progressbar' 'binwalk' 'python-argcomplete'
'zstd' 'uboot-tools')
-source=(https://diffoscope.org/archive/diffoscope-${pkgver}.tar.bz2{,.asc})
-sha512sums=('01a4947e3e13548bfaedf40073ed06860b8e56c06e8f59beb9a78b47211046f053af71b21754772a0050978c755beae6c6ddf6d9a2418b54a8fb2001380b0b4d'
- 'SKIP')
-b2sums=('4c804e8e5cbcba8bf90cdc2b3c0cdc482198bd65cc907081fd42d43c773d211864b47439476c51781eac76c9c3c8aee52076abdee0f9d555569be4146dfb11a9'
- 'SKIP')
-validpgpkeys=("C2FE4BD271C139B86C533E461E953E27D4311E58") # "Chris Lamb
<[email protected]>"
-
-build() {
- cd ${pkgname}-${pkgver}
- python setup.py build
- make -C doc
-}
-
-check() {
- cd ${pkgname}-${pkgver}
- PYTHONPATH=".:${PYTHONPATH}" PYTHONDONTWRITEBYTECODE=1 py.test \
- -k 'not test_ppu and not test_superblock and not test_wasm and not
test_text_proper_indentation and not test_different and not test_equal'
- # file upstream bug, see 2cd654b450ce82fb86f55223cc01ba1abdac58a8 in
diffoscope.git
- # bug introduced by revert in https://bugs.archlinux.org/task/70261
- # unsquashfs output differs from fixture.
- # ppu bug https://salsa.debian.org/reproducible-builds/diffoscope/issues/9
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- python setup.py install --skip-build -O1 --root="${pkgdir}"
- install -Dm 644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
- install -Dm 644 doc/diffoscope.1 -t "${pkgdir}/usr/share/man/man1"
-}
-
-# vim: ts=2 sw=2 et:
Copied: diffoscope/repos/community-x86_64/PKGBUILD (from rev 1324306,
diffoscope/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-10-07 20:13:57 UTC (rev 1324307)
@@ -0,0 +1,99 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+
+pkgname=diffoscope
+pkgver=224
+pkgrel=1
+pkgdesc='Tool for in-depth comparison of files, archives, and directories'
+url='https://diffoscope.org/'
+arch=('x86_64')
+license=('GPL3')
+depends=('python-magic' 'python-libarchive-c' 'python-distro'
'python-defusedxml'
+ 'python-tlsh')
+optdepends=(
+ 'acl: access control list utilities support'
+ 'binutils: binary utilities support'
+ 'binwalk: binwalk support'
+ 'bzip2: bzip2 utilities support'
+ 'cdrtools: ISO utilities support'
+ 'colord: ICC profiles support'
+ 'cpio: cpio archive support'
+ 'diffutils: diff utilities support'
+ 'docx2txt: docx comparing support'
+ 'dtc: device tree comparing support'
+ 'e2fsprogs: Ext2/3/4 filesystem utilities support'
+ 'enjarify: Android dex file support'
+ 'hdf5: Hierarchical Data Format support'
+ 'imagemagick: ImageMagick identify support'
+ 'fpc: Free Pascal utilities support'
+ 'java-environment: java utilities support'
+ 'libcaca: image compare support'
+ 'libxmlb: binary XML blobs support'
+ 'llvm: LLVM bitcode files support'
+ 'lz4: lz4 compression support'
+ 'odt2txt: odt comparing support'
+ 'fontforge: bitmap font utilities support'
+ 'gettext: GNU internationalization utilities support'
+ 'ghc: haskell utilities support'
+ 'giflib: gifbuild utilities support'
+ 'gnupg: GNU privacy guard support'
+ 'gnumeric: GNOME Spreadsheet support'
+ 'mono: mono support'
+ 'openssh: OpenSSH key comparing support'
+ 'openssl: .p7c and .p7b certificates. support'
+ 'pgpdump: PGP files support'
+ 'poppler: PDF utilities support'
+ 'r: R language support'
+ 'radare2: decompiler for executables'
+ 'sqlite: SQLite support'
+ 'squashfs-tools: squashfs filesystem support'
+ 'python-guestfs: guestfs filesystem support'
+ 'python-argcomplete: completion support'
+ 'python-jsbeautifier: javascript beautifier support'
+ 'python-progressbar: show progressbar support'
+ 'tcpdump: pcap matching support'
+ 'uboot-tools: FIT image support'
+ 'unzip: zip utilities support'
+ 'gzip: gzip utilities support'
+ 'tar: tar utilities support'
+# 'wabt: webassembly support' unittest fails
+ 'xxd: xxd utilities support'
+ 'xz: XZ and LZMA utilities support'
+ 'zstd: zst compression'
+)
+makedepends=('help2man' 'python-docutils' 'git')
+checkdepends=(
+ 'python-pytest' 'python-jsbeautifier' 'python-h5py' 'acl' 'binutils' 'bzip2'
'cdrtools' 'cpio' 'diffutils' 'e2fsprogs' 'enjarify'
+ 'hdf5' 'imagemagick' 'java-environment=11' 'fontforge' 'gettext' 'ghc'
'gnupg' 'mono' 'pgpdump' 'poppler' 'sqlite' 'squashfs-tools'
+ 'libxmlb' 'lz4' 'unzip' 'gzip' 'tar' 'tcpdump' 'vim' 'xz' 'llvm' 'colord'
'fpc' 'openssh' 'openssl' 'odt2txt' 'docx2txt' 'r' 'dtc'
+ 'giflib' 'gnumeric' 'python-progressbar' 'binwalk' 'python-argcomplete'
'zstd' 'uboot-tools')
+source=(https://diffoscope.org/archive/diffoscope-${pkgver}.tar.bz2{,.asc})
+sha512sums=('e8224a77de33fe8d03e7cb6e117e97bccb8cf44bd0d86d32d4c3673bc5f0bc64e82d0ebe09eb78fe3b74bbfb3889a7805ee8fb3e57f4860eb7aabe09b12a479d'
+ 'SKIP')
+b2sums=('6739599b5c899e4ef7986ab66f18b56186520a62334fa60ae0c05e131599b3e59f1580811a469632c19bbcf1a1cd098303ca0211ca47c3376d93b0b95fb55f37'
+ 'SKIP')
+validpgpkeys=("C2FE4BD271C139B86C533E461E953E27D4311E58") # "Chris Lamb
<[email protected]>"
+
+build() {
+ cd ${pkgname}-${pkgver}
+ python setup.py build
+ make -C doc
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ PYTHONPATH=".:${PYTHONPATH}" PYTHONDONTWRITEBYTECODE=1 py.test \
+ -k 'not test_ppu and not test_superblock and not test_wasm and not
test_text_proper_indentation and not test_different and not test_equal'
+ # file upstream bug, see 2cd654b450ce82fb86f55223cc01ba1abdac58a8 in
diffoscope.git
+ # bug introduced by revert in https://bugs.archlinux.org/task/70261
+ # unsquashfs output differs from fixture.
+ # ppu bug https://salsa.debian.org/reproducible-builds/diffoscope/issues/9
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ python setup.py install --skip-build -O1 --root="${pkgdir}"
+ install -Dm 644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
+ install -Dm 644 doc/diffoscope.1 -t "${pkgdir}/usr/share/man/man1"
+}
+
+# vim: ts=2 sw=2 et:
