Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 Sep 2016 08:13:04 -0600
From:      Adam Weinberger <adamw@adamw.org>
To:        Mathieu Arnold <mat@FreeBSD.org>
Cc:        Adam Weinberger <adamw@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   Re: svn commit: r421527 - branches/2016Q3
Message-ID:  <4AB29714-76F9-4179-827B-827B1C1B9D45@adamw.org>
In-Reply-To: <325da9e4-8311-779c-c6ce-5d8f3a9ff1d6@FreeBSD.org>
References:  <201609080003.u8803Y7g044634@repo.freebsd.org> <325da9e4-8311-779c-c6ce-5d8f3a9ff1d6@FreeBSD.org>

next in thread | previous in thread | raw e-mail | index | archive | help
> On 8 Sep, 2016, at 2:06, Mathieu Arnold <mat@FreeBSD.org> wrote:
>=20
> Le 08/09/2016 =C3=A0 02:03, Adam Weinberger a =C3=A9crit :
>> Author: adamw
>> Date: Thu Sep  8 00:03:34 2016
>> New Revision: 421527
>> URL: https://svnweb.freebsd.org/changeset/ports/421527
>>=20
>> Log:
>>  MFH: r421506
>>=20
>>  Update to 4.90F.
>>=20
>>  Bug fix:
>>  - It fixes a race condition when lsof is looking up information on a
>>    socket's TCP state.  The worst case of the race is that lsof gets =
a
>>    segmentation fault.
>>=20
>>  PR:		212457
>>  Submitted by:	maintainer (Larry Rosenman)
>>=20
>>  Approved by:	ports-secteam (feld)
>>=20
>> Modified:
>> Directory Properties:
>>  branches/2016Q3/   (props changed)
>>=20
>>=20
>=20
> Mmmm, this does not seem to have done anything.  Do you still have the
> output of the mfh command you ran ?

This should be fixed now in r421552. Because I'd already recorded the =
mergeinfo of the final commit, I had to fudge the fixed commit, because =
mfh just merged the last commit before that.

As you identified in a separate email to me, when doing an MFC of a =
commit, you also have to merge all previous commits to that port since =
the branch date. Just in case this helps somebody else down the line!

# Adam


--=20
Adam Weinberger
adamw@adamw.org
http://www.adamw.org




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4AB29714-76F9-4179-827B-827B1C1B9D45>