Bug 263996 - archivers/libzip: Update to 1.9.2
Summary: archivers/libzip: Update to 1.9.2
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Raphael Kubo da Costa
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-05-15 14:50 UTC by Bernard Spil
Modified: 2022-08-05 18:18 UTC (History)
2 users (show)

See Also:
rakuco: maintainer-feedback+


Attachments
git diff for archivers/libzip (2.26 KB, text/plain)
2022-05-15 14:50 UTC, Bernard Spil
no flags Details
git diff for archivers/libzip (2.43 KB, patch)
2022-05-16 11:06 UTC, Bernard Spil
no flags Details | Diff
git diff for archivers/libzip (2.57 KB, patch)
2022-07-10 09:17 UTC, Bernard Spil
rakuco: maintainer-approval+
Details | Diff
git diff for archivers/libzip (3.19 KB, patch)
2022-07-14 11:52 UTC, Bernard Spil
brnrd: maintainer-approval?
Details | Diff
make test output (20.30 KB, text/plain)
2022-07-14 11:54 UTC, Bernard Spil
no flags Details
Patch for libzip (4.06 KB, patch)
2022-07-14 12:24 UTC, Daniel Engberg
rakuco: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Bernard Spil freebsd_committer freebsd_triage 2022-05-15 14:50:07 UTC
Created attachment 233934 [details]
git diff for archivers/libzip

```
archivers/libzip: Update to 1.8.0

 * fixes LibreSSL 3.5 compatibility

PR:    ?
```
Comment 1 Raphael Kubo da Costa freebsd_committer freebsd_triage 2022-05-15 20:16:01 UTC
Thanks, the patch does look reasonable. Could you also include which releases you tested it with? Did zstd and lzma detection work in the configuration phase?
Comment 2 Bernard Spil freebsd_committer freebsd_triage 2022-05-16 11:06:58 UTC
Created attachment 233958 [details]
git diff for archivers/libzip

(In reply to Raphael Kubo da Costa from comment #1)

Wow, that was spectacularly bad! Don't know how that built on my system.

Fixed this, and built it in vanilla currently supported versions
https://brnrd.eu/poudriere/data/130amd64-git/2022-05-16_10h20m32s/logs/libzip-1.8.0.log
https://brnrd.eu/poudriere/data/123i386-git/2022-05-16_10h20m48s/logs/libzip-1.8.0.log
https://brnrd.eu/poudriere/data/123amd64-git/2022-05-16_10h39m01s/logs/libzip-1.8.0.log
Comment 3 Raphael Kubo da Costa freebsd_committer freebsd_triage 2022-05-16 11:12:12 UTC
`make stage-qa` in your logs indicates the following:

Error: /usr/local/lib/libzip.so.5.4 is linked to /usr/local/lib/libzstd.so.1 from archivers/zstd but it is not declared as a dependency
Warning: you need LIB_DEPENDS+=libzstd.so:archivers/zstd

Can you add the missing dependency?
Comment 4 Bernard Spil freebsd_committer freebsd_triage 2022-07-10 09:17:53 UTC
Created attachment 235165 [details]
git diff for archivers/libzip

Added libzstd dependency
Comment 5 Raphael Kubo da Costa freebsd_committer freebsd_triage 2022-07-13 12:39:40 UTC
Comment on attachment 235165 [details]
git diff for archivers/libzip

lgtm, thank you!
Comment 6 Daniel Engberg freebsd_committer freebsd_triage 2022-07-14 08:42:53 UTC
Upstream is at 1.9.2

PORTVERSION --> DISTVERSION
LIB_DEPENDS+= --> LIB_DEPENDS=
Add GitHub as primary MASTER_SITE and libzip.org as fallback to offload upstream
Reference: https://github.com/nih-at/libzip/releases/tag/v1.9.2
Comment 7 Daniel Engberg freebsd_committer freebsd_triage 2022-07-14 08:58:15 UTC
...also, please run make test to catch bugs =)
Comment 8 Bernard Spil freebsd_committer freebsd_triage 2022-07-14 11:52:33 UTC
Created attachment 235253 [details]
git diff for archivers/libzip

archivers/libzip: Update to 1.9.2

 * Use GitHub download (diizzy)
 * Prefer DISTVERSION (diizzy)
 * Adds zstd and lzma capability (diizzy)

PR: 263996
Comment 10 Daniel Engberg freebsd_committer freebsd_triage 2022-07-14 12:24:59 UTC
Created attachment 235255 [details]
Patch for libzip

Incorporate changes by brnrd
Switch back to MASTER_SITES (Porters Handbook USE_GITHUB)
Remove unnecessary patch
Do some minor adjustments to Makefile to follow Porters Handbook more closely
Comment 11 Raphael Kubo da Costa freebsd_committer freebsd_triage 2022-07-30 10:47:11 UTC
Comment on attachment 235255 [details]
Patch for libzip

lgtm, thank you
Comment 12 commit-hook freebsd_committer freebsd_triage 2022-08-05 17:59:29 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7df84dbe4a304066c1ceda871429832b629620a1

commit 7df84dbe4a304066c1ceda871429832b629620a1
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2022-08-05 17:55:41 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2022-08-05 17:55:41 +0000

    archivers/libzip: Update to 1.9.2

    PR:             263996
    Reported by:    brnrd
    Submitted by:   dizzyy
    Approved by:    rakuco

 archivers/libzip/Makefile                        |  9 ++++++---
 archivers/libzip/distinfo                        |  6 +++---
 archivers/libzip/files/patch-git_fd89e242 (gone) | 18 ------------------
 archivers/libzip/pkg-plist                       |  7 +++++--
 4 files changed, 14 insertions(+), 26 deletions(-)