svn commit: r479196 - head/sysutils/smartmontools/files

[Fernando Apesteguía]

On Fri, Sep 7, 2018 at 6:00 PM Baptiste Daroussin <bapt at freebsd.org> wrote:
>
> On Fri, Sep 07, 2018 at 03:45:14PM +0000, Fernando Apesteguía wrote:
> > Author: fernape
> > Date: Fri Sep  7 15:45:14 2018
> > New Revision: 479196
> > URL: https://svnweb.freebsd.org/changeset/ports/479196
> >
> > Log:
> >   sysutils/smartmontools: unbreak in 12-CURRENT
> >
> >   Between __FreeBSD_version 1200058 and 1200081 fields opc and fuse of
> >   struct nvme_command (sys/dev/nvme/nvme.h) where merged under opc_fuse, but
> >   in r338182 this change was undone and this port broke.
> >
> >   Update patch to fix it so it works regardless of the revision we check out.
> >
> >   PR: 230867
> >   Submitted by:       ohartmann at walstatt.org
> >   Approved by:        tcberner (mentor), maintainer (timeout, 2 weeks)
> >   Differential Revision:      https://reviews.freebsd.org/D16908
> >
> > Modified:
> >   head/sysutils/smartmontools/files/patch-os__freebsd.cpp
> >
> > Modified: head/sysutils/smartmontools/files/patch-os__freebsd.cpp
> > ==============================================================================
> > --- head/sysutils/smartmontools/files/patch-os__freebsd.cpp   Fri Sep  7 14:47:48 2018        (r479195)
> > +++ head/sysutils/smartmontools/files/patch-os__freebsd.cpp   Fri Sep  7 15:45:14 2018        (r479196)
> > @@ -22,7 +22,7 @@
> >     struct nvme_pt_command pt;
> >     memset(&pt, 0, sizeof(pt));
> >
> > -+#if __FreeBSD_version >= 1200058
> > ++#if __FreeBSD_version >= 1200058 && __FreeBSD_version < 1200081
> >  +  pt.cmd.opc_fuse = NVME_CMD_SET_OPC(in.opcode);
> >  +#else
> >     pt.cmd.opc = in.opcode;
> >
> Is it worth keeping a patch for just a very tiny set of revision of -HEAD?

The patch is pretty simple and small. I don't think it harms to have
it around for a while. But I agree that, at some point in the future
(when 12.0-RELEASE is out?), this could be deleted and if someone is
in between the problematic revisions, ask them politely to upgrade.

Cheers
>
> Best regards,
> Bapt