]> git.proxmox.com Git - pmg-api.git/commitdiff
unpack: adapt to new libarchive methods
authorStoiko Ivanov <s.ivanov@proxmox.com>
Mon, 7 Jun 2021 18:55:22 +0000 (18:55 +0000)
committerStoiko Ivanov <s.ivanov@proxmox.com>
Fri, 11 Jun 2021 14:53:45 +0000 (14:53 +0000)
This patch changes the deprecated method used from libarchive-perl.
It needs a versioned dependency bump on libarchive-perl (>= 3.4.0).

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
debian/control
src/PMG/Unpack.pm

index 92f25db25d4e06d4c2d1723b355cad0efd88f7cc..74953efa1033b2344c41168e27acefb920a8dc08 100644 (file)
@@ -3,7 +3,7 @@ Section: perl
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: debhelper (>= 12~),
-               libarchive-perl,
+               libarchive-perl (>= 3.4.0-1),
                libarchive-zip-perl,
                libauthen-pam-perl,
                libcompress-bzip2-perl,
@@ -43,7 +43,7 @@ Depends: apt,
          fetchmail,
          fonts-font-awesome,
          libapt-pkg-perl,
-         libarchive-perl,
+         libarchive-perl (>= 3.4.0-1),
          libarchive-zip-perl,
          libauthen-pam-perl,
          libcompress-bzip2-perl,
index 5de786cacdedc17ac7139abb47328fe82666ee70..d4fe4547ba9341a23a6841f9e24b756ed65605df 100755 (executable)
@@ -681,7 +681,7 @@ sub unpack_tar {
     die "unable to create LibArchive object" if !$a;
 
     LibArchive::archive_read_support_format_all ($a);
-    LibArchive::archive_read_support_compression_all ($a);
+    LibArchive::archive_read_support_filter_all ($a);
 
     eval {
        run_with_timeout ($timeout, sub {
@@ -785,7 +785,7 @@ sub unpack_tar {
     my $err = $@;
 
     LibArchive::archive_read_close($a);
-    LibArchive::archive_read_finish($a);
+    LibArchive::archive_read_free($a);
 
     die $err if $err;