Bug 263183 - security/keepassxc: Update to 2.7.1
Summary: security/keepassxc: Update to 2.7.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Li-Wen Hsu
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-04-09 16:58 UTC by Guido Falsi
Modified: 2022-04-27 08:01 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (lwhsu)

Attachments
Update patch (2.27 KB, patch)
2022-04-09 16:58 UTC, Guido Falsi 		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 Guido Falsi freebsd_committer freebsd_triage 2022-04-09 16:58:08 UTC 
Created attachment 233106 [details]
Update patch

Hi,

I've created an update patch to 2.7.1

UPstream, for different reasons, patched the minizip include issue:

https://github.com/keepassxreboot/keepassxc/commit/31db3c325d2ffc9dedc240d8ac5036fe6f1cf5c3

so I removed those patches.

I also noticed we have a USES for minizip, so I leveraged that instead of using LIB_DEPENDS directly.
Comment 1 Li-Wen Hsu freebsd_committer freebsd_triage 2022-04-25 13:55:23 UTC 
(In reply to Guido Falsi from comment #0)
Thanks for the patch and sorry that I missed this ticket. If possible, please also include the patch in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=262953#c17

I will do test and commit it later this week or weekend, and you're also welcomed to commit it if you're confident with it.
Comment 2 Guido Falsi freebsd_committer freebsd_triage 2022-04-25 14:17:24 UTC 
(In reply to Li-Wen Hsu from comment #1)

I'm working on the updated patch.

as a sidenote changing DISTNAME requires also fixing WRKSRC which is derived from it.

I'm going to thoroughly test my changes anyway.
Comment 3 commit-hook freebsd_committer freebsd_triage 2022-04-27 07:58:55 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=421f76c27c18017d5a8a2f8bd2fc546d8e649ba8

commit 421f76c27c18017d5a8a2f8bd2fc546d8e649ba8
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2022-04-27 07:57:15 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2022-04-27 07:57:15 +0000

    security/keepassxc: Update to 2.7.1

    - Convert to minizip USES
    - Fix MASTER_SITES [1]
    - Remove patches already present upstream

    PR:             263183, 262953 [1]
    Approved by:    lwhsu (maintainer)

 security/keepassxc/Makefile                                   |  8 +++++---
 security/keepassxc/distinfo                                   |  6 +++---
 .../keepassxc/files/patch-src_keeshare_ShareExport.cpp (gone) | 11 -----------
 .../keepassxc/files/patch-src_keeshare_ShareImport.cpp (gone) | 11 -----------
 4 files changed, 8 insertions(+), 28 deletions(-)
Comment 4 Guido Falsi freebsd_committer freebsd_triage 2022-04-27 08:01:36 UTC 
I committed my patch taking advantage of your aapproval.

Obviously if there is any issue with my commit I'll be ready to help fixing it.

Thanks!