From owner-p4-projects@FreeBSD.ORG Tue Sep 2 13:55:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 665271065672; Tue, 2 Sep 2008 13:55:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 279241065670 for ; Tue, 2 Sep 2008 13:55:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 160E18FC14 for ; Tue, 2 Sep 2008 13:55:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m82DtS3l096286 for ; Tue, 2 Sep 2008 13:55:28 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m82DtSQR096284 for perforce@freebsd.org; Tue, 2 Sep 2008 13:55:28 GMT (envelope-from trasz@freebsd.org) Date: Tue, 2 Sep 2008 13:55:28 GMT Message-Id: <200809021355.m82DtSQR096284@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 149058 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2008 13:55:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=149058 Change 149058 by trasz@trasz_traszkan on 2008/09/02 13:54:31 Backoff kern/stack_protector.c renaming. Instead, do it as suggested by Ruslan Ermilov. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#11 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/stack_protector.c#3 add .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_stack_protector.c#2 delete Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Makefile.inc#11 (text+ko) ==== @@ -1,6 +1,10 @@ # $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.19 2006/07/07 14:02:17 rwatson Exp $ -.PATH: ${.CURDIR}/posix1e ${.CURDIR}/../../sys/kern/ +.PATH: ${.CURDIR}/posix1e + +# Copy kern/subr_acl_nfs4.c to the libc object directory. +subr_acl_nfs4.c: ${.CURDIR}/../../sys/kern/subr_acl_nfs4.c + cat ${.ALLSRC} > ${.TARGET} SRCS+= acl_branding.c \ acl_calc_mask.c \ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#12 (text+ko) ==== @@ -1612,7 +1612,7 @@ kern/sched_4bsd.c optional sched_4bsd kern/sched_ule.c optional sched_ule kern/serdev_if.m standard -kern/subr_stack_protector.c standard \ +kern/stack_protector.c standard \ compile-with "${NORMAL_C:N-fstack-protector*}" kern/subr_acl_posix1e.c standard kern/subr_acl_nfs4.c standard