From owner-p4-projects@FreeBSD.ORG  Tue Dec  4 16:43:02 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id F0D04ABA; Tue,  4 Dec 2012 16:43:01 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9D5FAAB8
 for <perforce@freebsd.org>; Tue,  4 Dec 2012 16:43:01 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id 6A2738FC0C
 for <perforce@freebsd.org>; Tue,  4 Dec 2012 16:43:01 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qB4Gh1GV018841
 for <perforce@freebsd.org>; Tue, 4 Dec 2012 16:43:01 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qB4Gh1jr018838
 for perforce@freebsd.org; Tue, 4 Dec 2012 16:43:01 GMT
 (envelope-from brooks@freebsd.org)
Date: Tue, 4 Dec 2012 16:43:01 GMT
Message-Id: <201212041643.qB4Gh1jr018838@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 219874 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Dec 2012 16:43:02 -0000

http://p4web.freebsd.org/@@219874?ac=10

Change 219874 by brooks@brooks_zenith on 2012/12/04 16:42:34

	Link against the vulnerable version of libmagic.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/ctsrd/minifile/capsicum/Makefile#2 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/ctsrd/minifile/capsicum/Makefile#2 (text+ko) ====

@@ -12,7 +12,7 @@
 BINDIR=	/usr/libexec
 
 CFLAGS+=	-I${.CURDIR}/..
-LDADD+=		-lmagic -lz
+LDADD+=		-lvuln_magic -lz
 
 WARNS=	6