Bug 281306 - sysutils/ipmitool : Update to 1.8.19
Summary: sysutils/ipmitool : Update to 1.8.19
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: Ryan Steinmetz
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-09-06 00:58 UTC by Olivier Cochard
Modified: 2024-09-19 17:47 UTC (History)
2 users (show)

See Also:
zi: maintainer-feedback+


Attachments
patch (10.46 KB, patch)
2024-09-06 00:58 UTC, Olivier Cochard
no flags Details | Diff
New version of the patch (9.85 KB, patch)
2024-09-06 15:49 UTC, Olivier Cochard
no flags Details | Diff
New simple port net/iana-enterprise-numbers (1.76 KB, patch)
2024-09-06 15:50 UTC, Olivier Cochard
no flags Details | Diff
New version of the patch (last one this time I hope) (10.40 KB, patch)
2024-09-13 12:10 UTC, Olivier Cochard
no flags Details | Diff
Installing enterprise number in DATADIR (10.71 KB, patch)
2024-09-18 21:12 UTC, Olivier Cochard
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Olivier Cochard freebsd_committer freebsd_triage 2024-09-06 00:58:37 UTC
Created attachment 253367 [details]
patch

Here is an upgrade to latest version:
- master site changed to the new one (there is a copy on github too, but the old sourceforge page mention CodeBerg so I’ve used this one
- Allmost all previous patches removed (I think they are useless now)
- It requiere the IANA enterprise-numbers database now. I’ve checked the pkgsource port, and they added a new full port only for this file. But as ipmitool the only consummer, I’ve choose to include this file here.
- It need more test with the freeipmi port’s options

Regards,
Olivier
Comment 1 Ryan Steinmetz freebsd_committer freebsd_triage 2024-09-06 01:36:58 UTC
Approved, thank you.
Comment 2 Daniel Engberg freebsd_committer freebsd_triage 2024-09-06 04:26:56 UTC
Running bootstrap.sh when we have USES= autoreconf seems wrong?

GNU_CONFIGURE_MANPREFIX should be removed

Please use https://codeberg.org/IPMITool/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ as MASTER_SITES URL (see other ports using codeberg.org) as it's a generated archive

We probably want to import this commit?
https://codeberg.org/IPMITool/ipmitool/commit/be11d948f89b10be094e28d8a0a5e8fb532c7b60

Looking at https://codeberg.org/IPMITool/ipmitool/commit/eb1df8d6a608074c05a1db768830747c01927aaa (latest commit) you might even want to consider import latest head as it fixes typos in the code (bugs?) too.
Comment 3 Olivier Cochard freebsd_committer freebsd_triage 2024-09-06 14:40:15 UTC
(In reply to Daniel Engberg from comment #2)

Thanks for these comments!

Specially the mention to the commit about preventing downloading IANA enterprise-numbers because it brakes reproducible build.

So my method of downloading this file will broke at the next IANA file update: The filename will be the same, but the checksum will be wrong.

This explains why on pkgsrc they created a new port (net/iana-enterprise-numbers) and added it as a running dependency (https://pkgsrc.se/sysutils/ipmitool)

This will remove the multiples distfile and the ugly "do-extract" step.

Ryan: Are you agrea to follow the same way as with pgksrc ?
Which mean: Could I create a new simple port net/iana-enterprise-numbers (with you as maintainer) first ?
Comment 4 Olivier Cochard freebsd_committer freebsd_triage 2024-09-06 15:49:29 UTC
Created attachment 253379 [details]
New version of the patch

New patch version that will requieres a new run_deps
Comment 5 Olivier Cochard freebsd_committer freebsd_triage 2024-09-06 15:50:17 UTC
Created attachment 253380 [details]
New simple port net/iana-enterprise-numbers

running dependency of latest version of ipmitool
Comment 6 Olivier Cochard freebsd_committer freebsd_triage 2024-09-07 08:39:10 UTC
I didn’t solve the iana-enterprise-numbers that doesn’t use revision name in this new dep port :-(
This port will still break each time they update the file.
I’m still looking for a solution (other than maintaining our own copy).
Comment 7 Ryan Steinmetz freebsd_committer freebsd_triage 2024-09-07 14:15:51 UTC
(In reply to Olivier Cochard from comment #6)

Can probably put this under local distfiles and just manually track/update it.

It should show up under LOCAL/zi/ as enterprise-numbers-20240907.txt once syncing completes.

https://docs.freebsd.org/en/books/porters-handbook/slow-porting/

We can use this instead of creating a new port.
Comment 8 Olivier Cochard freebsd_committer freebsd_triage 2024-09-07 15:38:07 UTC
(In reply to Ryan Steinmetz from comment #7)

Yes I prefer this method: feel free to modify the proposed patch and commit it.
Thanks!
Comment 9 Olivier Cochard freebsd_committer freebsd_triage 2024-09-13 12:10:51 UTC
Created attachment 253537 [details]
New version of the patch (last one this time I hope)

Ooops, I didn’t see you’ve already uploade the iana enterprise file on your account.
So here is the (final?) version.
Comment 10 Olivier Cochard freebsd_committer freebsd_triage 2024-09-16 16:29:01 UTC
Are you ok with this latest version ?
Comment 11 Ryan Steinmetz freebsd_committer freebsd_triage 2024-09-16 19:44:53 UTC
(In reply to Olivier Cochard from comment #10)

I think if we're going to bundle the enterprise-numbers file within the ipmitool port, it should probably go in %%DATADIR%%.  I don't envision a scenario where someone else wants this file and decides to bring in ipmitool as the way to get it.

So, in that scenario, we'd probably look to break it out into its own port and then for now, we just keep it in an ipmitool-specific directory.

Otherwise, this seems fine to me!
Comment 12 Olivier Cochard freebsd_committer freebsd_triage 2024-09-18 21:12:05 UTC
Created attachment 253646 [details]
Installing enterprise number in DATADIR

Yes, good idea.
Here this the version installing the enterprise-number file in DATADIR.
Comment 13 Ryan Steinmetz freebsd_committer freebsd_triage 2024-09-18 21:21:15 UTC
(In reply to Olivier Cochard from comment #12)

Seems reasonable to me!  Make it so.
Comment 14 commit-hook freebsd_committer freebsd_triage 2024-09-18 21:35:39 UTC
A commit in branch main references this bug:

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

commit 3fc9a44f0698c9f14f56002cb708529ce4f07fe0
Author:     Olivier Cochard <olivier@FreeBSD.org>
AuthorDate: 2024-09-18 21:31:45 +0000
Commit:     Olivier Cochard <olivier@FreeBSD.org>
CommitDate: 2024-09-18 21:31:45 +0000

    sysutils/ipmitool: Update to 1.8.19

    PR:             281306
    Approved by:    zi (maitainer)

 sysutils/ipmitool/Makefile                         |  29 +++--
 sysutils/ipmitool/distinfo                         |   8 +-
 sysutils/ipmitool/files/extra-patch-Makefile.in    |  12 +-
 ...c_plugins_lanplus_lanplus__crypt__impl.c (gone) | 140 ---------------------
 sysutils/ipmitool/files/patch-configure.ac (new)   |  23 ++++
 .../patch-include_ipmitool_ipmi__hpmfwupg.h (gone) |  11 --
 .../ipmitool/files/patch-lib_ipmi__cfgp.c (gone)   |  11 --
 .../ipmitool/files/patch-src_ipmitool.c (gone)     |  10 --
 8 files changed, 51 insertions(+), 193 deletions(-)
Comment 15 Denis Shaposhnikov 2024-09-19 14:21:10 UTC
Failed to build after update:

ipmi_time.c:108:3: error: use of undeclared identifier 'daylight'
  108 |                 daylight = -1;
      |                 ^
1 error generated.
gmake[2]: *** [Makefile:532: ipmi_time.lo] Error 1
gmake[2]: Leaving directory '/wrkdirs/usr/ports/sysutils/ipmitool/work/ipmitool/lib'
gmake[1]: *** [Makefile:486: all-recursive] Error 1
gmake[1]: Leaving directory '/wrkdirs/usr/ports/sysutils/ipmitool/work/ipmitool'
gmake: *** [Makefile:418: all] Error 2
Comment 16 Olivier Cochard freebsd_committer freebsd_triage 2024-09-19 15:24:54 UTC
(In reply to Denis Shaposhnikov from comment #15)

Hi Denis,
Indeed I’ve forgot to test it on non -head FreeBSD !

So I need to understand what happen here because this variable daylight seems define by the include time.h.
But time.h export only if inside a __XSI_VISIBLE condition, so my feeling is there is a behaviour changes here I need to fix.
Comment 17 commit-hook freebsd_committer freebsd_triage 2024-09-19 15:32:12 UTC
A commit in branch main references this bug:

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

commit 643f82bb3aee9d2d137390054012a65030dcb849
Author:     Ryan Steinmetz <zi@FreeBSD.org>
AuthorDate: 2024-09-19 15:30:20 +0000
Commit:     Ryan Steinmetz <zi@FreeBSD.org>
CommitDate: 2024-09-19 15:31:10 +0000

    sysutils/ipmitool: Unbreak after previous commit, bump

    PR:             281306

 sysutils/ipmitool/Makefile                           |  1 +
 sysutils/ipmitool/files/patch-lib_ipmi__time.c (new) | 10 ++++++++++
 2 files changed, 11 insertions(+)
Comment 18 Olivier Cochard freebsd_committer freebsd_triage 2024-09-19 16:05:43 UTC
(In reply to commit-hook from comment #17)

I was looking for a solution like this one:

https://cgit.freebsd.org/ports/tree/devel/qtcreator/files/patch-src_libs_3rdparty_sqlite_sqlite3.c
Comment 19 Ryan Steinmetz freebsd_committer freebsd_triage 2024-09-19 17:47:26 UTC
(In reply to Olivier Cochard from comment #18)

If you find a more appropriate solution, please revert my patch+commit a fix+bump PORTREVISION. (Should work on 13.3-R, 13.4-R, 14.0-R and 14.1-R at a minimum)

I had a number of emails about it and needed the build to succeed.