Bug 206234
| Summary: | [PATCH] editors/openoffice-4: fix nss-related problems with password-protected documents | ||
|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Arrigo Marchiori <ardovm> |
| Component: | Individual Port(s) | Assignee: | Don Lewis <truckman> |
| Status: | Closed FIXED | ||
| Severity: | Affects Many People | CC: | damjan.jov, truckman |
| Priority: | --- | Keywords: | patch |
| Version: | Latest | Flags: | bugzilla:
maintainer-feedback?
(office) |
| Hardware: | Any | ||
| OS: | Any | ||
| Attachments: | |||
|
Description
Arrigo Marchiori
2016-01-14 12:20:11 UTC
Created attachment 165563 [details] Upstream patch (vanilla, to be copied into the files/ directory) This file is the ``vanilla'' patch proposed by upstream: https://bz.apache.org/ooo/attachment.cgi?id=84969&action=diff It works if copied into the files/ directory of the editors/openoffice-4 port. I am not sure if it is a good idea to split it into many files, each one patching a single source file, as requested in Porter's Handbook chapter 4.4. In fact, it seems that the files/ directory already contains ``bulk'' patches that affect many files. I am also not sure if it is advisable to apply this fix selectively, i.e. leave to the user the choice between OpenSSL and libnss. Please advise if you think so, and kindly give me some pointers to the documentation on such process (I could not find any information on _selective_ patching in the Porter's Handbook). Please scrap that patch, it's fixed upstream now in SVN revision 1724971 (github https://github.com/apache/openoffice/commit/1b37335955a5c2a31c90142ea739bee1bd54a79c). If you want to fix older openoffice versions, backport that patch instead, which will fix encryption functions and digital signatures too, not just cryptographic hash functions. Created attachment 165818 [details]
Patch including upstream's commit and the proposed patch to enable correct interpretation of the isRelative option
Following Damjan's advice, this patch integrates upstream SVN commit 1724971.
This patch also includes a proposed fix to a mis-interpretation of Mozilla profile files. This was not accepted by upstream (yet?).
Created attachment 165819 [details] Integration of upstream SVN commits This contains the following changes: 1- upstream SVN commit 1724971, following Damjan's advice from comment #2; 2- fix to a mis-interpretation of the "IsRelative" option inside Mozilla profile files (this is pending review from upstream); 3- PORTREVISION bump. Parts 1- and 2- are inside a single patch file, to be created into the files/ directory. Comment on attachment 165819 [details]
Integration of upstream SVN commits
Both fixes were merged upstream.
A commit references this bug: Author: truckman Date: Fri Jan 29 00:44:00 UTC 2016 New revision: 407439 URL: https://svnweb.freebsd.org/changeset/ports/407439 Log: Fix nss-related problems with password-protected documents. Apply patches from upstream commits r1724971 and r1726068 to fix upstream bug <https://bz.apache.org/ooo/show_bug.cgi?id=125431>, "The Password is incorrect. The file cannot be opened." PR: 206234 Submitted by: Arrigo Marchiori <ardovm AT yahoo.it> MFH: 2106Q1 Changes: head/editors/openoffice-4/Makefile head/editors/openoffice-4/files/patch-nss A commit references this bug: Author: truckman Date: Fri Jan 29 19:32:13 UTC 2016 New revision: 407493 URL: https://svnweb.freebsd.org/changeset/ports/407493 Log: MFH: r405096 (direct commit to openoffice-4 only) MFH: r406872 (direct commit to openoffice-4 only) MFH: r407439 r405096: Correct the Icon entry in the .desktop files so that the icons are visible in the menu. r406872: PORTREVISION bump to allow a clean merge of the next r470439: [1] Fix nss-related problems with password-protected documents. Apply patches from upstream commits r1724971 and r1726068 to fix upstream bug <https://bz.apache.org/ooo/show_bug.cgi?id=125431>, "The Password is incorrect. The file cannot be opened." PR: 205758 PR: 206234 Submitted by: Arrigo Marchiori <ardovm AT yahoo.it> [1] Approved by: ports-secteam (miwi - r407439) Approved by: ports-secteam (feld - r405096, r406872) Changes: _U branches/2016Q1/ branches/2016Q1/editors/openoffice-4/Makefile branches/2016Q1/editors/openoffice-4/files/patch-nss A commit references this bug: Author: truckman Date: Sat Jan 30 21:26:57 UTC 2016 New revision: 407553 URL: https://svnweb.freebsd.org/changeset/ports/407553 Log: Upgrade to upstream svn revision 1727463. This fixes the upstream bug <https://bz.apache.org/ooo/show_bug.cgi?id=125431>, "The Password is incorrect. The file cannot be opened." PR: 206234 Changes: head/editors/openoffice-devel/Makefile head/editors/openoffice-devel/distinfo |
