From owner-svn-ports-head@freebsd.org Fri Sep 7 16:00:19 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 60DD4FFE6E3; Fri, 7 Sep 2018 16:00:19 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 139F38EDAB; Fri, 7 Sep 2018 16:00:19 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from ivaldir.etoilebsd.net (etoilebsd.net [178.32.217.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id E88DD2772E; Fri, 7 Sep 2018 16:00:18 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by ivaldir.etoilebsd.net (Postfix, from userid 1001) id E152A8F5C8; Fri, 7 Sep 2018 18:00:17 +0200 (CEST) Date: Fri, 7 Sep 2018 18:00:17 +0200 From: Baptiste Daroussin To: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r479196 - head/sysutils/smartmontools/files Message-ID: <20180907160017.r5vf67bnkdqgkwdx@ivaldir.net> References: <201809071545.w87FjEBE098699@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ojhspkadkphe4q3y" Content-Disposition: inline In-Reply-To: <201809071545.w87FjEBE098699@repo.freebsd.org> User-Agent: NeoMutt/20180716 X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Sep 2018 16:00:19 -0000 --ojhspkadkphe4q3y Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Sep 07, 2018 at 03:45:14PM +0000, Fernando Apestegu=EDa wrote: > Author: fernape > Date: Fri Sep 7 15:45:14 2018 > New Revision: 479196 > URL: https://svnweb.freebsd.org/changeset/ports/479196 >=20 > Log: > sysutils/smartmontools: unbreak in 12-CURRENT > =20 > 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. > =20 > Update patch to fix it so it works regardless of the revision we check = out. > =20 > PR: 230867 > Submitted by: ohartmann@walstatt.org > Approved by: tcberner (mentor), maintainer (timeout, 2 weeks) > Differential Revision: https://reviews.freebsd.org/D16908 >=20 > Modified: > head/sysutils/smartmontools/files/patch-os__freebsd.cpp >=20 > Modified: head/sysutils/smartmontools/files/patch-os__freebsd.cpp > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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)); > =20 > -+#if __FreeBSD_version >=3D 1200058 > ++#if __FreeBSD_version >=3D 1200058 && __FreeBSD_version < 1200081 > + pt.cmd.opc_fuse =3D NVME_CMD_SET_OPC(in.opcode); > +#else > pt.cmd.opc =3D in.opcode; >=20 Is it worth keeping a patch for just a very tiny set of revision of -HEAD? Best regards, Bapt --ojhspkadkphe4q3y Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAluSoHgACgkQY4mL3PG3 PlrsmA/9ECrYbkE3o+S1X11MWQKM7sFiZg54PnIks/3YoDa1W5oOjC55cwaE9d2K YiEstuSyjolvqqUSsEaWbMyf7L9ObiE+TgiYjKxX6aCILvqIKsPWi2yCpgCp1pG6 Xtm93BNCzgs5ttVInzFk+0LNKYIwPA9BDS+ESSU+hAwREXEidM/RQJc9Vl32sYrP m8FEj3dqxwERx3ePsTkRnTxMKUF3USDoQMHvJvkrh8vVVImT89bUYfMhkWZzaq8h vqZO1yF9iwvZ9xTpxal7xdB/lQTxIIruWp78uKtR/uNxP130hUvRPnWSUvCgFxfr NYI/K1lEFVOaMm1QCSreTopVOIhnEpJ7DIE0zQznepV/TzVQzsgKvLw9JUrGSbZf OALu7aB099Qx64s2xluKOw7u96n2MrUThHpZBC/O1b6lxrFgGvXx1IsxsC+iDOAI XYBi1y49gv7eNeig5daENGDZCKBEXJzaVrcnRimA3q3B/HdvGzPdEF48NYd2P59h Gotk68PUKvq1JQusm2rGN0omSvU+pXrb/VyCkcnkjtOiNmGZe894LeJqkU6LrECs X6toyZvk49HkOv8xjKdbPJ2TzhjYZFxpzS5BizaKloM9id3/odt+SsqOqCV11N4o aa6LDv4h2Pm2GjsuGRpgh612ATXwOEYBitbfQP6WEmNRYLpDcd8= =zwBQ -----END PGP SIGNATURE----- --ojhspkadkphe4q3y--