Jelle van der Waa pushed to branch main at Arch Linux / Packaging / Packages / 
python-libarchive-c


Commits:
16442fd4 by Jelle van der Waa at 2024-11-17T11:32:39+01:00
upgpkg: 5.1-3: Rebuild for Python 3.13

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- + libarchive-version-compat.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = python-libarchive-c
        pkgdesc = Python interface to libarchive
        pkgver = 5.1
-       pkgrel = 2
+       pkgrel = 3
        url = https://github.com/Changaco/python-libarchive-c
        arch = any
        license = CC0-1.0
@@ -10,7 +10,10 @@ pkgbase = python-libarchive-c
        depends = python
        depends = libarchive
        source = 
https://github.com/Changaco/python-libarchive-c/archive/5.1/python-libarchive-c-5.1.tar.gz
-       sha512sums = 
a2026aba3ef325f10e981e15e50de0435d7371642b0e6df8cd5ab64e76186b2a72297b32f429547e091fb799c9d0fa41be5a6824408c08f6c71585d59175d7a0
-       b2sums = 
5b727c88eca866f69eda701ca8898d4bd3b68adefb8234a501cb280fae2be98f1314bb64ff94bcc5e1c0cae9ffc6866ee70aa4fbc4353eac1f16d59f9a789ebc
+       source = libarchive-version-compat.patch
+       sha512sums = 
ed13687709370a828df584601852af2de9ec93091072242254192e7eb425c754e7d1467eb9692691ce971f2a6c3d5f6ee8c78a21b0262b0cc2c15ae31c03d680
+       sha512sums = 
7a7e20c0b0630adcd4d09d6eb447bc65d5002880a0664d9c98c2d513eb4c1dd3352d4ee7357af661180840e8189c5b369f161b04fde6b1325765cf0dac42b0f5
+       b2sums = 
559c27283615a41fd942be0d1f807b04c1132e78d3283e3e3555542b0baa89bd39269efd24887c3e108265820cacd09755b39b216924205a8de57895dc742303
+       b2sums = 
b11010a3d831618710559447fa675a529e5b951d96e18792b393e912f275bc04059b77d4ff8de233f40e10f53704e2985990d059d0a60109405d1b09da97d9ce
 
 pkgname = python-libarchive-c


=====================================
PKGBUILD
=====================================
@@ -2,7 +2,7 @@
 
 pkgname=python-libarchive-c
 pkgver=5.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Python interface to libarchive'
 url='https://github.com/Changaco/python-libarchive-c'
 arch=('any')
@@ -10,13 +10,19 @@ license=('CC0-1.0')
 depends=('python' 'libarchive')
 makedepends=('python-setuptools')
 checkdepends=('python-pytest')
-source=(https://github.com/Changaco/python-libarchive-c/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-sha512sums=('a2026aba3ef325f10e981e15e50de0435d7371642b0e6df8cd5ab64e76186b2a72297b32f429547e091fb799c9d0fa41be5a6824408c08f6c71585d59175d7a0')
-b2sums=('5b727c88eca866f69eda701ca8898d4bd3b68adefb8234a501cb280fae2be98f1314bb64ff94bcc5e1c0cae9ffc6866ee70aa4fbc4353eac1f16d59f9a789ebc')
+source=(https://github.com/Changaco/python-libarchive-c/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz
+        libarchive-version-compat.patch)
+sha512sums=('ed13687709370a828df584601852af2de9ec93091072242254192e7eb425c754e7d1467eb9692691ce971f2a6c3d5f6ee8c78a21b0262b0cc2c15ae31c03d680'
+            
'7a7e20c0b0630adcd4d09d6eb447bc65d5002880a0664d9c98c2d513eb4c1dd3352d4ee7357af661180840e8189c5b369f161b04fde6b1325765cf0dac42b0f5')
+b2sums=('559c27283615a41fd942be0d1f807b04c1132e78d3283e3e3555542b0baa89bd39269efd24887c3e108265820cacd09755b39b216924205a8de57895dc742303'
+        
'b11010a3d831618710559447fa675a529e5b951d96e18792b393e912f275bc04059b77d4ff8de233f40e10f53704e2985990d059d0a60109405d1b09da97d9ce')
 
 prepare() {
   sed '/os.umask(2)/d' -i ${pkgbase}-${pkgver}/setup.py
   cd ${pkgbase}-${pkgver}
+
+  # See https://github.com/Changaco/python-libarchive-c/pull/131
+  patch -Np1 -i ${srcdir}/libarchive-version-compat.patch
 }
 
 check() {


=====================================
libarchive-version-compat.patch
=====================================
@@ -0,0 +1,38 @@
+From adb206946721a4f5bd1190ab9c975bab4373e35c Mon Sep 17 00:00:00 2001
+From: Changaco <[email protected]>
+Date: Fri, 27 Sep 2024 11:51:22 +0200
+Subject: [PATCH] update a test failing with new libarchive versions
+
+fixes #130
+---
+ tests/test_entry.py | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_entry.py b/tests/test_entry.py
+index 419cecb..34543a5 100644
+--- a/tests/test_entry.py
++++ b/tests/test_entry.py
+@@ -9,7 +9,7 @@
+ 
+ import pytest
+ 
+-from libarchive import memory_reader, memory_writer
++from libarchive import ArchiveError, memory_reader, memory_writer
+ from libarchive.entry import ArchiveEntry, ConsumedArchiveEntry, 
PassedArchiveEntry
+ 
+ from . import data_dir, get_entries, get_tarinfos
+@@ -64,7 +64,13 @@ def test_check_ArchiveEntry_against_TarInfo():
+ 
+ 
+ def test_check_archiveentry_using_python_testtar():
+-    check_entries(join(data_dir, 'testtar.tar'))
++    # This test behaves differently depending on the libarchive version:
++    # 3.5, 3.6 and presumably all future versions reject the archive as 
damaged,
++    # whereas older versions accepted it.
++    try:
++        check_entries(join(data_dir, 'testtar.tar'))
++    except ArchiveError as e:
++        assert e.msg == "Damaged tar archive"
+ 
+ 
+ def test_check_archiveentry_with_unicode_and_binary_entries_tar():



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/python-libarchive-c/-/commit/16442fd4f605477cb3018639566ff866ecb81ff0

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/python-libarchive-c/-/commit/16442fd4f605477cb3018639566ff866ecb81ff0
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to