Bug 261380 - sysutils/toybox: update to 0.8.6
Summary: sysutils/toybox: update to 0.8.6
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: Daniel Engberg
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-01-21 15:53 UTC by Vidar Karlsen
Modified: 2022-02-13 19:47 UTC (History)
1 user (show)

See Also:


Attachments
Patch to update toybox to 0.8.6 (5.74 KB, patch)
2022-01-21 15:53 UTC, Vidar Karlsen
vidar: maintainer-approval+
Details | Diff
New and better patch (10.12 KB, patch)
2022-01-24 10:16 UTC, Vidar Karlsen
vidar: maintainer-approval+
Details | Diff
Newer and betterer patch (10.45 KB, patch)
2022-01-24 12:58 UTC, Vidar Karlsen
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Vidar Karlsen 2022-01-21 15:53:01 UTC
Created attachment 231214 [details]
Patch to update toybox to 0.8.6

Update sysutils/toybox to 0.8.6.

QA:
- poudriere testport: 12.3 & 13.0, builds and runs
- portlint -C: looks fine
- I disabled toys/other/chvt for now because it no longer builds on FreeBSD

Changelog: http://landley.net/toybox/#30-11-2021 (too long to list here)
Comment 1 Vidar Karlsen 2022-01-24 10:16:20 UTC
Created attachment 231265 [details]
New and better patch

I found some extra time so I improved upon the upgrade:
- reverted chvt to an earlier version that builds on FreeBSD
- it now installs symlinks to the toybox binary in ${PREFIX}/toybox/[bin|sbin|usr/bin|usr/sbin]
Comment 2 Daniel Engberg freebsd_committer freebsd_triage 2022-01-24 12:43:06 UTC
Hi Vidar,

Any reason why we can't use http://landley.net/toybox/downloads/toybox-0.8.6.tar.gz as recommended in the USE_GITHUB section in Porters Handbook?

Can you also try to push these patches upstream?

Best regards,
Daniel
Comment 3 Vidar Karlsen 2022-01-24 12:58:38 UTC
Created attachment 231270 [details]
Newer and betterer patch

Switching from GH to MASTER_SITES=http://landley.net/toybox/downloads/
Comment 4 Vidar Karlsen 2022-01-24 13:02:46 UTC
(In reply to Daniel Engberg from comment #2)

Good point, Daniel!
I see no reason not to do that, so I uploaded a revised patch using the official MASTER_SITE.

As for upstreaming, I tried that some time ago to no avail. Upstream has moved since then, so I had to rebase the patches. I'll reach out to them again and try to get them accepted.
Comment 5 Daniel Engberg freebsd_committer freebsd_triage 2022-01-24 20:37:50 UTC
L2 in pkg-list looks wrong?
Comment 6 Vidar Karlsen 2022-01-24 21:29:20 UTC
(In reply to Daniel Engberg from comment #5)

It is actually supposed to be there, this is the good old posix test(1):

# ls -l toybox/bin
total 197
lrwxr-xr-x  1 root  wheel       6 Jan 23 20:43 [ -> toybox

# file toybox/bin/\[ 
toybox/bin/[: symbolic link to toybox
Comment 7 Daniel Engberg freebsd_committer freebsd_triage 2022-02-13 15:12:43 UTC
Poudriere testport OK 12.3-RELEASE (amd64)
Poudriere testport OK 13.0-RELEASE (i386)
Comment 8 commit-hook freebsd_committer freebsd_triage 2022-02-13 19:44:39 UTC
A commit in branch main references this bug:

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

commit fac8a211bfa41f0b8dfe18771ea0e159f83b3690
Author:     Vidar Karlsen <vidar@karlsen.tech>
AuthorDate: 2022-02-13 19:19:26 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2022-02-13 19:43:32 +0000

    sysutils/toybox: update to 0.8.6

    Changelog: http://landley.net/toybox/#30-11-2021

    PR:             261380

 sysutils/toybox/Makefile                           |  38 ++++++-
 sysutils/toybox/distinfo                           |   6 +-
 sysutils/toybox/files/patch-lib_portability.c      |  42 +++++--
 sysutils/toybox/files/patch-lib_portability.h      |  13 ++-
 .../toybox/files/patch-toys_other_chvt.c (new)     |  25 +++++
 sysutils/toybox/pkg-plist (new)                    | 125 +++++++++++++++++++++
 6 files changed, 231 insertions(+), 18 deletions(-)
Comment 9 Daniel Engberg freebsd_committer freebsd_triage 2022-02-13 19:47:23 UTC
Committed, thanks!