Bug 263146 - Upgrade libarchive in base to 3.6.1
Summary: Upgrade libarchive in base to 3.6.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Package Infrastructure (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Martin Matuska
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-04-08 13:27 UTC by Martin Matuska
Modified: 2022-10-31 02:02 UTC (History)
2 users (show)

See Also:

Attachments
Libarchive 3.6.1 patch against main (3.91 KB, patch)
2022-04-08 13:27 UTC, Martin Matuska 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Martin Matuska freebsd_committer freebsd_triage 2022-04-08 13:27:59 UTC 
Created attachment 233060 [details]
Libarchive 3.6.1 patch against main
Comment 1 Antoine Brodin freebsd_committer freebsd_triage 2022-04-12 16:11:55 UTC 
Exp-run looks fine
Comment 2 commit-hook freebsd_committer freebsd_triage 2022-04-12 18:17:22 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=7ec51a3e2b91caaea5c1de1a4c7b362b20d35a62

commit 7ec51a3e2b91caaea5c1de1a4c7b362b20d35a62
Merge: 6e3168c85db3 91ee6b45e4ef
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2022-04-12 18:12:34 +0000
Commit:     Martin Matuska <mm@FreeBSD.org>
CommitDate: 2022-04-12 18:14:04 +0000

    libarchive: import changes from upstream

    Libarchive 3.6.1

    Bug fixes:
      PR #1549: archive_digest: check return value of EVP_DigestInit()

    PR:             263146 (exp-run)
    MFC after:      1 week

 contrib/libarchive/NEWS                        |  2 ++
 contrib/libarchive/libarchive/archive.h        |  4 ++--
 contrib/libarchive/libarchive/archive_digest.c | 18 ++++++++++++------
 contrib/libarchive/libarchive/archive_entry.h  |  2 +-
 4 files changed, 17 insertions(+), 9 deletions(-)
Comment 3 Graham Perrin freebsd_committer freebsd_triage 2022-10-30 11:17:37 UTC 
> Product: Ports & Packages


(In reply to commit-hook from comment #2)

>     MFC after:      1 week

<https://cgit.freebsd.org/src/log/?qt=grep&q=libarchive%3A+import+changes+from+upstream>

(Have I misunderstood something? I don't see a merge … apologies for the noise.)
Comment 5 Graham Perrin freebsd_committer freebsd_triage 2022-10-31 02:02:00 UTC 
(In reply to Martin Matuska from comment #4)

Thanks!