From owner-freebsd-ports@FreeBSD.ORG  Thu Sep 25 21:09:18 2014
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7A130C3D;
 Thu, 25 Sep 2014 21:09:18 +0000 (UTC)
Received: from mail-ie0-x22e.google.com (mail-ie0-x22e.google.com
 [IPv6:2607:f8b0:4001:c03::22e])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 39285FF1;
 Thu, 25 Sep 2014 21:09:18 +0000 (UTC)
Received: by mail-ie0-f174.google.com with SMTP id rd18so8874211iec.5
 for <multiple recipients>; Thu, 25 Sep 2014 14:09:17 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=VkotNNAkY9hAwznV/ws43NG7ksgGFVLktQyA2bykSQI=;
 b=WxYkFhhSfkiyZHseotbqnA+wQ0CIfLooOG9BBO0ij6khL2dOu/4aSYW9pcvL6uYfed
 36Sg0sEQfYCRWptRmhDoNmw4FmxXMNkS2DmCWuzwSKHBaSoszVNL/avfMgEtPmb6CBQp
 O6tegyLNdEk9Z0EwBq/8yffz8t9VIjbsR1NEewq0YbVDggYuqdKbiEt6UJ6IoQEjW6S+
 2nIhlo+F59K7wpp8l0CrpqV7k4o/L0sF/yr8I4GpmuEU0qX/NcoHjmy6tEfrt7brNCGR
 LNY0rxuqzEWBtolITxbR1svaXLT6CugpFZVEI0V1S1EGJe5t5pkE3jp5re9bZ5Nl0Wyl
 iLjA==
MIME-Version: 1.0
X-Received: by 10.43.65.12 with SMTP id xk12mr22638299icb.9.1411679357653;
 Thu, 25 Sep 2014 14:09:17 -0700 (PDT)
Sender: vrwmiller@gmail.com
Received: by 10.64.165.73 with HTTP; Thu, 25 Sep 2014 14:09:17 -0700 (PDT)
In-Reply-To: <CAHzLAVHBRzKx7vEXuSpGAOZcNBM2tp6YUHibTvggQjM8wWkhoA@mail.gmail.com>
References: <CAHzLAVGcGPQP3NvaSpe6+idLdEWM4hrQyPwP6YVPvOO-J823Fw@mail.gmail.com>
 <54233850.2070807@FreeBSD.org>
 <CAHzLAVFsmaD_wx+2+9oug3hCOYG_kxBAi--R9FmmBOPG2PcZ4A@mail.gmail.com>
 <54242A0E.6000507@madpilot.net>
 <CAHzLAVFWv9Zz7dk2uF=3y-qJBpdEbXgWD_YoJXD0zcd+bxHCsQ@mail.gmail.com>
 <54246761.8060405@madpilot.net>
 <CAHzLAVHBRzKx7vEXuSpGAOZcNBM2tp6YUHibTvggQjM8wWkhoA@mail.gmail.com>
Date: Thu, 25 Sep 2014 17:09:17 -0400
X-Google-Sender-Auth: qOAOe5Y-DMJV_ItSEcoglAlENUI
Message-ID: <CAHzLAVE7mPSp2dHwT0a_mYA5e5nOi9Swairt1tmn1Q+TCoVLHQ@mail.gmail.com>
Subject: Re: Poudriere Build of pkg_* repos?
From: Rick Miller <vmiller@hostileadmin.com>
To: Guido Falsi <mad@madpilot.net>
Content-Type: text/plain; charset=UTF-8
X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1
Cc: freebsd-ports <freebsd-ports@freebsd.org>,
 Bryan Drewery <bdrewery@freebsd.org>
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports/>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Sep 2014 21:09:18 -0000

On Thu, Sep 25, 2014 at 4:51 PM, Rick Miller <vmiller@hostileadmin.com>
wrote:

>
>
> On Thu, Sep 25, 2014 at 3:05 PM, Guido Falsi <mad@madpilot.net> wrote:
>
>> On 09/25/14 20:57, Rick Miller wrote:
>> > On Thu, Sep 25, 2014 at 10:43 AM, Guido Falsi <mad@madpilot.net> wrote:
>> > [snip]
>>
> >
>> > =======================<phase: patch
>> >============================
>> > ===>  Patching for bash-4.3.24
>> > ===>  Applying distribution patches for bash-4.3.24
>> > ===>  Applying extra patch /distfiles/local-patches/8_4-amd64/bash.patch
>> > ===>  Applying extra patch
>> > /usr/ports/shells/bash/files/extrapatch-colonbreakswords
>> > ===>  Applying extra patch
>> > /usr/ports/shells/bash/files/extrapatch-implicitcd
>> > ===>  Applying FreeBSD patches for bash-4.3.24
>> >
>> ===========================================================================
>> >
>> > The first sign that something didn't appear to have gone as expected was
>> > that the package was built as bash-4.3.24.tbz as opposed to
>> > bash-4.3.25.tbz.  The above test was executed observing the behavior of
>> a
>> > still vulnerable binary.
>>
>> The way you are applying the patch simply modifies the code being
>> compiled by the port, you're not patching the port itself, so the port
>> maintains the same version number.
>>
>
> Makes sense
>
>
>
>> > The test was performed on an 8.4 host with a [unpatched] bash-4.3.24
>> after
>> > forcefully removing the package and adding the new, patched package.  It
>> > complained of dependencies on packages that were already installed, but
>> not
>> > up to the version of the dependency.  After manually fixing these
>> > dependencies (forcefully deleting the existing dependencies and
>> installing
>> > the new ones), the test was executed once again to the same results.
>> >
>> > Could this be an issue of the order the patches were applied in or ??
>>
>> You should check the build log and see if in the patching phase there
>> was any error.
>>
>
> The above log snippet is from the patch phase of the build indicating
> success (well, at least no error).  A build with the wrong patch was
> attempted that did indicate errors, as expected.
>
> The full log can be viewed at http://pastebin.com/hwHwJAKK
>
> Is there some way in the log to identify if the source was patched and
> built correctly?  Does Poudriere [ I say Poudriere realizing that it likely
> does not, but perhaps the system does? ] provide the ability to review the
> source code after patching to actually verify the patch was applied?  A
> cursory search of the filesystem where Poudriere stores the jail turned up
> no leads.
>

The patch does apply to evalstring.c which shows the following warnings in
the build log though I am unfamiliar enough to know whether or not this
would apply to this particular scenario.

cc -c  -DHAVE_CONFIG_H -DSHELL   -I. -I..  -I.. -I../include -I../lib -I.
-I/usr/local/include -O2 -pipe -fno-strict-aliasing evalstring.c
evalstring.c: In function 'parse_and_execute':
evalstring.c:208: warning: passing argument 1 of 'sigemptyset' discards
qualifiers from pointer target type
evalstring.c:209: warning: passing argument 3 of 'sigprocmask' discards
qualifiers from pointer target type
evalstring.c:288: warning: passing argument 2 of 'sigprocmask' discards
qualifiers from pointer target type
evalstring.c: In function 'parse_string':
evalstring.c:444: warning: passing argument 1 of 'sigemptyset' discards
qualifiers from pointer target type
evalstring.c:445: warning: passing argument 3 of 'sigprocmask' discards
qualifiers from pointer target type
evalstring.c:497: warning: passing argument 2 of 'sigprocmask' discards
qualifiers from pointer target type

-- 
Take care
Rick Miller