From owner-svn-ports-head@freebsd.org Fri Sep 7 19:56:49 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 87EC110529C8; Fri, 7 Sep 2018 19:56:49 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E4074758E9; Fri, 7 Sep 2018 19:56:48 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: by mail-lf1-f50.google.com with SMTP id m26-v6so12990031lfb.0; Fri, 07 Sep 2018 12:56:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=hv+riZt2pWR5AXYMhtOTMRtLVuSxHmZdqi/a9YOuf1k=; b=LUpZnuubtPOS3UFGgrflzSeRsaeeNUijulMaVk5y3W8cCmi27doTqFWr56iW+LybLg R9rb1GMM/eDO2ePabdwmkSI3xAwcoJqE1D46Aw1WXVPwu9l5qGRUsyr2vmyg7PjDb3AS 5nNvFE3KM8Px0diJFyZCiJjKL1OEuvU+ZEbGiCi9G4ts+1jcRAxLYy09VPmDrBC8d8xu 6oHcfWbho9piLHBKuAPoJueIhLKagIQEhwYVjYFDEB9mDwOdRxQKVKvtdr4G3IlGkKOn D5RJx3bWMQR7srGrzYTcM7mXorJAPFqDmFZEpqrULuryObgMvoPX/km6Hh8GllhNbTf/ 1Xww== X-Gm-Message-State: APzg51AjWKKGCdP+69ZoD+wtkJXrZkjzU7GJ+b+n2Q+gpdGFKW+Xf44h Tr4UJt29Crjp8mdjbN7qkKE+6FPVPo8= X-Google-Smtp-Source: ANB0VdaTFEI5QcxgpQrcUllSTWdia4yBVwDygKUB/AWYEGclcA/IFj052TVwR7suLHPVHAuRWE9h+g== X-Received: by 2002:a19:11d1:: with SMTP id 78-v6mr5451875lfr.25.1536337075332; Fri, 07 Sep 2018 09:17:55 -0700 (PDT) Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com. [209.85.167.49]) by smtp.gmail.com with ESMTPSA id v10-v6sm1333883ljg.12.2018.09.07.09.17.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Sep 2018 09:17:54 -0700 (PDT) Received: by mail-lf1-f49.google.com with SMTP id j8-v6so12474217lfb.4; Fri, 07 Sep 2018 09:17:54 -0700 (PDT) X-Received: by 2002:a19:c70a:: with SMTP id x10-v6mr5783763lff.148.1536337074399; Fri, 07 Sep 2018 09:17:54 -0700 (PDT) MIME-Version: 1.0 References: <201809071545.w87FjEBE098699@repo.freebsd.org> <20180907160017.r5vf67bnkdqgkwdx@ivaldir.net> In-Reply-To: <20180907160017.r5vf67bnkdqgkwdx@ivaldir.net> From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Date: Fri, 7 Sep 2018 16:17:42 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r479196 - head/sysutils/smartmontools/files To: Baptiste Daroussin Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 19:56:49 -0000 On Fri, Sep 7, 2018 at 6:00 PM Baptiste Daroussin wrote: > > On Fri, Sep 07, 2018 at 03:45:14PM +0000, Fernando Apestegu=C3=ADa 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 chec= k out. > > > > PR: 230867 > > Submitted by: ohartmann@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 > > =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)); > > > > -+#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; > > > 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