From owner-svn-src-head@freebsd.org  Sun Jul 12 05:47:04 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EEEF2998AD2;
 Sun, 12 Jul 2015 05:47:04 +0000 (UTC)
 (envelope-from jmg@gold.funkthat.com)
Received: from gold.funkthat.com (gate2.funkthat.com [208.87.223.18])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client CN "gold.funkthat.com", Issuer "gold.funkthat.com" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id B37427A3;
 Sun, 12 Jul 2015 05:47:04 +0000 (UTC)
 (envelope-from jmg@gold.funkthat.com)
Received: from gold.funkthat.com (localhost [127.0.0.1])
 by gold.funkthat.com (8.14.5/8.14.5) with ESMTP id t6C5ku0d082803
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Sat, 11 Jul 2015 22:46:56 -0700 (PDT)
 (envelope-from jmg@gold.funkthat.com)
Received: (from jmg@localhost)
 by gold.funkthat.com (8.14.5/8.14.5/Submit) id t6C5ktsa082802;
 Sat, 11 Jul 2015 22:46:55 -0700 (PDT) (envelope-from jmg)
Date: Sat, 11 Jul 2015 22:46:55 -0700
From: John-Mark Gurney <jmg@funkthat.com>
To: Andrew Turner <andrew@fubar.geek.nz>
Cc: Craig Rodrigues <rodrigc@crodrigues.org>,
 "src-committers@freebsd.org" <src-committers@freebsd.org>,
 "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
 "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
Subject: Re: svn commit: r285366 - in head: lib/libmd sys/crypto/sha2
Message-ID: <20150712054655.GF8523@funkthat.com>
References: <201507110312.t6B3CZBv081280@repo.freebsd.org>
 <20150711080439.GD8523@funkthat.com>
 <CAG=rPVcCSzHKwqyOzAZOG=N9pBMpwFbY+CMOM655BanjnNVQ-w@mail.gmail.com>
 <20150711142920.GE8523@funkthat.com>
 <20150711180615.52a618b7@bender.Home>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150711180615.52a618b7@bender.Home>
X-Operating-System: FreeBSD 9.1-PRERELEASE amd64
X-PGP-Fingerprint: 54BA 873B 6515 3F10 9E88  9322 9CB1 8F74 6D3F A396
X-Files: The truth is out there
X-URL: http://resnet.uoregon.edu/~gurney_j/
X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html
X-TipJar: bitcoin:13Qmb6AeTgQecazTWph4XasEsP7nGRbAPE
X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? can i haz chizburger?
User-Agent: Mutt/1.5.21 (2010-09-15)
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7
 (gold.funkthat.com [127.0.0.1]); Sat, 11 Jul 2015 22:46:56 -0700 (PDT)
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Jul 2015 05:47:05 -0000

Andrew Turner wrote this message on Sat, Jul 11, 2015 at 18:06 +0100:
> On Sat, 11 Jul 2015 07:29:20 -0700
> John-Mark Gurney <jmg@funkthat.com> wrote:
> ... 
> > The closest I can see is that sha256hl.c (from mdXhl.c) is including
> > "sha256.h" with double quotes, and getting the wrong header file..
> 
> I concur, the following fixes libmd to use the correct header.

Andrew, thanks for the fix and thanks Craig for the commit... I owe
all of you a beer (or a drink of your choice)...

> Index: lib/libmd/Makefile
> ===================================================================
> --- lib/libmd/Makefile  (revision 285383)
> +++ lib/libmd/Makefile  (working copy)
> @@ -49,6 +49,7 @@
>  #   * macros are used to rename symbols to libcrypt internal names
>  #   * no weak aliases are generated
>  CFLAGS+= -I${.CURDIR} -DWEAK_REFS
> +CFLAGS+= -I${.CURDIR}/../../sys/crypto/sha2
>  .PATH: ${.CURDIR}/${MACHINE_ARCH} ${.CURDIR}/../../sys/crypto/sha2
>  
>  .if exists(${MACHINE_ARCH}/sha.S)

-- 
  John-Mark Gurney				Voice: +1 415 225 5579

     "All that I will do, has been done, All that I have, has not."