Date: Thursday, June 14, 2018 @ 20:37:06 Author: anthraxx Revision: 343196
archrelease: copy trunk to community-x86_64 Added: diffoscope/repos/community-x86_64/PKGBUILD (from rev 343195, diffoscope/trunk/PKGBUILD) diffoscope/repos/community-x86_64/fix-libarchive-2.8-compatibility.patch (from rev 343195, diffoscope/trunk/fix-libarchive-2.8-compatibility.patch) Deleted: diffoscope/repos/community-x86_64/PKGBUILD ----------------------------------------+ PKGBUILD | 177 +++++++++++++++---------------- fix-libarchive-2.8-compatibility.patch | 29 +++++ 2 files changed, 119 insertions(+), 87 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-06-14 20:36:59 UTC (rev 343195) +++ PKGBUILD 2018-06-14 20:37:06 UTC (rev 343196) @@ -1,87 +0,0 @@ -# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> - -pkgname=diffoscope -pkgver=95 -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-setuptools' 'python-distro' 'python-defusedxml') -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' - 'imagemagick: ImageMagick identify support' - 'fpc: Free Pascal utilities support' - 'java-environment: java utilities support' - 'libcaca: image compare support' - 'llvm: LLVM bitcode files 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' - 'poppler: PDF utilities support' - 'r: R language support' - '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' - 'tlsh: fuzzy matching supprt' - 'unzip: zip utilities support' - 'gzip: gzip utilities support' - 'tar: tar utilities support' - 'xxd: xxd utilities support' - 'xz: XZ and LZMA utilities support' -) -makedepends=('help2man' 'python-docutils') -checkdepends=( - 'python-pytest' 'python-jsbeautifier' 'acl' 'binutils' 'bzip2' 'cdrtools' 'cpio' 'diffutils' 'e2fsprogs' 'enjarify' 'imagemagick' - 'java-environment>=8' 'fontforge' 'gettext' 'ghc' 'gnupg' 'mono' 'mono-tools' 'poppler' 'sqlite' 'squashfs-tools' - 'tlsh' 'unzip' 'gzip' 'tar' 'tcpdump' 'vim' 'xz' 'llvm' 'colord' 'fpc' 'openssh' 'odt2txt' 'docx2txt' 'r' 'dtc' 'giflib' - 'gnumeric' 'python-progressbar' 'binwalk' 'python-argcomplete') -source=(${pkgname}-${pkgver}.tar.bz2::https://salsa.debian.org/reproducible-builds/${pkgname}/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha512sums=('ad058e5691094ff06dcc71e1b715410b338e6973da59bd8d6076a9916d1afc29a868f5917752325189f9158d7cec910e8315d7a588b076014f83f67200a74441') - -prepare() { - cd ${pkgname}-${pkgver} - sed '/python-magic/d' -i setup.py -} - -build() { - cd ${pkgname}-${pkgver} - python setup.py build - make -C doc -} - -check() { - cd ${pkgname}-${pkgver} - PYTHONPATH=".:${PYTHONPATH}" py.test \ - -k 'not test_rlib and not test_progress and not test_ppu and not test_elf and not test_icc and not test_berkeley_db' -} - -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 343195, diffoscope/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-06-14 20:37:06 UTC (rev 343196) @@ -0,0 +1,90 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> + +pkgname=diffoscope +pkgver=95 +pkgrel=2 +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-setuptools' 'python-distro' 'python-defusedxml') +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' + 'imagemagick: ImageMagick identify support' + 'fpc: Free Pascal utilities support' + 'java-environment: java utilities support' + 'libcaca: image compare support' + 'llvm: LLVM bitcode files 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' + 'poppler: PDF utilities support' + 'r: R language support' + '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' + 'tlsh: fuzzy matching supprt' + 'unzip: zip utilities support' + 'gzip: gzip utilities support' + 'tar: tar utilities support' + 'xxd: xxd utilities support' + 'xz: XZ and LZMA utilities support' +) +makedepends=('help2man' 'python-docutils') +checkdepends=( + 'python-pytest' 'python-jsbeautifier' 'acl' 'binutils' 'bzip2' 'cdrtools' 'cpio' 'diffutils' 'e2fsprogs' 'enjarify' 'imagemagick' + 'java-environment>=8' 'fontforge' 'gettext' 'ghc' 'gnupg' 'mono' 'mono-tools' 'poppler' 'sqlite' 'squashfs-tools' + 'tlsh' 'unzip' 'gzip' 'tar' 'tcpdump' 'vim' 'xz' 'llvm' 'colord' 'fpc' 'openssh' 'odt2txt' 'docx2txt' 'r' 'dtc' 'giflib' + 'gnumeric' 'python-progressbar' 'binwalk' 'python-argcomplete') +source=(${pkgname}-${pkgver}.tar.bz2::https://salsa.debian.org/reproducible-builds/${pkgname}/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + fix-libarchive-2.8-compatibility.patch) +sha512sums=('ad058e5691094ff06dcc71e1b715410b338e6973da59bd8d6076a9916d1afc29a868f5917752325189f9158d7cec910e8315d7a588b076014f83f67200a74441' + 'c5fb2c6149b9e50c80e9fd4cdb94f2ef6e90021b44aa98e940c2ca95c441a9dd36a642cd3df6abd646a10c9d6dbc8a8d08284e5299772c735bd029351068d366') + +prepare() { + cd ${pkgname}-${pkgver} + sed '/python-magic/d' -i setup.py + patch -p1 < ../fix-libarchive-2.8-compatibility.patch +} + +build() { + cd ${pkgname}-${pkgver} + python setup.py build + make -C doc +} + +check() { + cd ${pkgname}-${pkgver} + PYTHONPATH=".:${PYTHONPATH}" py.test \ + -k 'not test_rlib and not test_progress and not test_ppu and not test_elf and not test_icc and not test_berkeley_db' +} + +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/fix-libarchive-2.8-compatibility.patch (from rev 343195, diffoscope/trunk/fix-libarchive-2.8-compatibility.patch) =================================================================== --- fix-libarchive-2.8-compatibility.patch (rev 0) +++ fix-libarchive-2.8-compatibility.patch 2018-06-14 20:37:06 UTC (rev 343196) @@ -0,0 +1,29 @@ +From 466be17181ba7b78006f982c5fa39a2397ffd748 Mon Sep 17 00:00:00 2001 +From: anthraxx <leve...@leventepolyak.net> +Date: Thu, 14 Jun 2018 22:22:03 +0200 +Subject: [PATCH] libarchive: add compatibility with python-libarchive >= 2.8 + +Python librarchive 2.8 removed the mtime_nsec property from +ArchiveEntry so lets wire the ffi function if available +--- + diffoscope/comparators/utils/libarchive.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/diffoscope/comparators/utils/libarchive.py b/diffoscope/comparators/utils/libarchive.py +index f427ede..7bb20c0 100644 +--- a/diffoscope/comparators/utils/libarchive.py ++++ b/diffoscope/comparators/utils/libarchive.py +@@ -64,6 +64,10 @@ if not hasattr(libarchive.ffi, 'entry_uname'): + if not hasattr(libarchive.ffi, 'entry_gname'): + libarchive.ffi.ffi('entry_gname', [libarchive.ffi.c_archive_entry_p], ctypes.c_char_p) + libarchive.ArchiveEntry.gname = property(lambda self: libarchive.ffi.entry_gname(self._entry_p)) ++# Monkeypatch libarchive-c (<< 2.8) ++if not hasattr(libarchive.ArchiveEntry, 'mtime_nsec') and hasattr(libarchive.ffi, 'entry_mtime_nsec'): ++ libarchive.ArchiveEntry.mtime_nsec = property( ++ lambda self: libarchive.ffi.entry_mtime_nsec(self._entry_p)) + + # Monkeypatch libarchive-c so we always get pathname as (Unicode) str + # Otherwise, we'll get sometimes str and sometimes bytes and always pain. +-- +2.17.1 +