Bug 254922 - security/john: Update to 1.9, fix build when OpenCL is installed
Summary: security/john: Update to 1.9, fix build when OpenCL is installed
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: Alexey Dokuchaev
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-04-09 16:25 UTC by Thierry Dussuet
Modified: 2022-10-29 03:47 UTC (History)
1 user (show)

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


Attachments
Recursive diff for the version update (50.85 KB, patch)
2021-04-09 16:25 UTC, Thierry Dussuet
no flags Details | Diff
Non-recursive diff (9.43 KB, patch)
2021-04-09 16:27 UTC, Thierry Dussuet
no flags Details | Diff
Latest version with opencl, openmp, openmpi options (59.90 KB, patch)
2021-04-12 16:35 UTC, Thierry Dussuet
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Thierry Dussuet 2021-04-09 16:25:38 UTC
Created attachment 223949 [details]
Recursive diff for the version update

This patch would allow an update to version 1.9.0, and allows the port to build built even when OpenCL is installed.
On FreeBSD 12.2, version 1.9.0 builds with OpenCL support if enabled, but lacking the necessary hardware I could not fully test it.
On FreeBSD 13.0-CURRENT, there were build errors with OpenCL support enabled. Without OpenCL it was fine.
This should also solve bug report number #247229.
Comment 1 Thierry Dussuet 2021-04-09 16:27:23 UTC
Created attachment 223950 [details]
Non-recursive diff

This is the non-recursive diff. Basically the same as recursive, but the files/ directory is no longer necessary so this one is easier to read.
Comment 2 Thierry Dussuet 2021-04-12 16:35:32 UTC
Created attachment 224054 [details]
Latest version with opencl, openmp, openmpi options

Hi, played around a bit more with this during the weekend and got version 1.9 working with OpenCL, OpenMP and OpenMPI, with the latest changes from github, so added them as options. Hope this can be useful.
Portlint is complaining that the first line should have $FreeBSD$ as it is a comment, not sure how to handle this?
Comment 3 Alexey Dokuchaev freebsd_committer freebsd_triage 2021-04-16 09:59:16 UTC
(In reply to Thierry Dussuet from comment #2)
> Portlint is complaining that the first line should have $FreeBSD$ as it is
> a comment, not sure how to handle this?
Just ignore this, it doesn't matter.
Comment 4 commit-hook freebsd_committer freebsd_triage 2021-11-26 07:35:58 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4b7f7b97f1fffa5b008504c7255289f5a2948ba2

commit 4b7f7b97f1fffa5b008504c7255289f5a2948ba2
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2021-11-26 07:34:18 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2021-11-26 07:34:25 +0000

    security/john: belatedly update JtR to version 1.9.0-jumbo-1

    Despite what Solar Designer had said earlier, community enhancements
    were not offered as separate patch, so the top comment about JUMBO
    option still stands.

    Because supported SIMD features are detected during configure, force
    SSE2 for x86 packages as reasonable default which most modern CPUs
    should support these days.  Ideally we should probably do several build
    rounds and produce binaries targeting different SIMD features (e.g.
    like Arch Linux is doing this), but that's the task for another day.

    Actualize the lists of binaries and symlinks (some programs had become
    standalone, others had been converted to scripts offered as extras).

    Drop BROKEN_mips64: it was added in r425682 five years ago for a
    different version, since then similar breakage for aarch64 had been
    fixed, and looking at the configure script, mips64 should be supported
    (even if it's really not, that particular error message is no longer
    accurate per grepping the sources).

    Adjust LICENSE (GPLv2 or later) and fix the build with OpenCL support.

    PR:     247229, 254922

 security/john/Makefile                             |  75 +++---
 security/john/distinfo                             |   6 +-
 security/john/files/patch-Makefile.in (gone)       |  61 -----
 security/john/files/patch-Makefile.legacy (gone)   | 114 ---------
 .../john/files/patch-bitcoin__fmt__plug.c (gone)   | 134 ----------
 security/john/files/patch-dmg__fmt__plug.c (gone)  | 156 -----------
 .../john/files/patch-encfs__fmt__plug.c (gone)     | 113 --------
 security/john/files/patch-git-4442241b4c (new)     | 253 ++++++++++++++++++
 security/john/files/patch-git-4f5f6fc8dc (new)     |  14 +
 security/john/files/patch-gpg__fmt__plug.c (gone)  | 117 ---------
 security/john/files/patch-john.c (gone)            |  31 ---
 security/john/files/patch-jumbo.c (gone)           |  26 --
 security/john/files/patch-jumbo.h (gone)           |  13 -
 security/john/files/patch-rar__fmt__plug.c (gone)  | 254 ------------------
 .../john/files/patch-truecrypt__fmt__plug.c (gone) |  13 -
 security/john/files/patch-unrar.c (gone)           |  25 --
 security/john/files/patch-unrar.h (gone)           |  25 --
 security/john/files/patch-wordlist.c (gone)        |  14 -
 security/john/files/patch-wpapsk.h (gone)          |  62 -----
 security/john/pkg-plist                            | 285 +++++++++++++++++++--
 20 files changed, 570 insertions(+), 1221 deletions(-)
Comment 5 Alexey Dokuchaev freebsd_committer freebsd_triage 2021-11-26 07:45:31 UTC
(In reply to Thierry Dussuet from comment #2)
> Hi, played around a bit more with this during the weekend and got version 1.9
> working with OpenCL, OpenMP and OpenMPI
Nice, thank you, I've updated the port and now options OpenCL and OpenMP should work as intended.  I've decided to leave the OpenMPI for another commit to make this commit diff less noisy.
Comment 6 commit-hook freebsd_committer freebsd_triage 2022-10-29 03:46:31 UTC
A commit in branch main references this bug:

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

commit fae646ee890ae6170d5cde461a8c4658caf5188a
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2022-10-29 03:44:46 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2022-10-29 03:44:46 +0000

    security/john: allow to build JtR with OpenMPI support

    PR:     254922

 security/john/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)