From owner-freebsd-stable@FreeBSD.ORG Wed Jan 24 18:36:15 2007 Return-Path: X-Original-To: freebsd-stable@freebsd.org Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D692216A5C5 for ; Wed, 24 Jan 2007 18:36:08 +0000 (UTC) (envelope-from swhetzel@gmail.com) Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.174]) by mx1.freebsd.org (Postfix) with ESMTP id AC93313C448 for ; Wed, 24 Jan 2007 18:36:07 +0000 (UTC) (envelope-from swhetzel@gmail.com) Received: by ug-out-1314.google.com with SMTP id o2so219809uge for ; Wed, 24 Jan 2007 10:36:06 -0800 (PST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=f9vJcZsH2/7QiriH7GHGvGmcw3sFoZynrGX6+jK3X+ZeYUbug8HIBing9yUvuwAYTi5Ix5phaj+ZddCQYJCZMcVo020STnb36y4HBMXo9Ebx83DEGpKrQHdu6nPncd9kdmGRNWqyKyTmvM5a9VnFh4RRKzEp2BEUNhk5awDTwWs= Received: by 10.82.116.15 with SMTP id o15mr336721buc.1169663766309; Wed, 24 Jan 2007 10:36:06 -0800 (PST) Received: by 10.82.186.2 with HTTP; Wed, 24 Jan 2007 10:36:06 -0800 (PST) Message-ID: <790a9fff0701241036l584c2ae9n52e4834d929b1104@mail.gmail.com> Date: Wed, 24 Jan 2007 12:36:06 -0600 From: "Scot Hetzel" To: "Alexandre Vasconcelos" In-Reply-To: <45B7A0FA.1050901@terceirizado.mda.gov.br> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <45B7A0FA.1050901@terceirizado.mda.gov.br> Cc: freebsd-stable@freebsd.org Subject: Re: FreeBSD 6.2-STABLE and Flash 7 patch X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jan 2007 18:36:16 -0000 On 1/24/07, Alexandre Vasconcelos wrote: > root@alex src]# patch < rtld_dlsym_hack.diff > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |--- libexec/rtld-elf/rtld.c.orig Fri Sep 24 08:04:52 2004 > |+++ libexec/rtld-elf/rtld.c Sun Oct 17 03:37:44 2004 > -------------------------- > Patching file libexec/rtld-elf/rtld.c using Plan A... > Hunk #1 failed at 129. > Hunk #2 succeeded at 187 (offset 9 lines). > Hunk #3 succeeded at 1820 (offset 82 lines). > 1 out of 3 hunks failed--saving rejects to libexec/rtld-elf/rtld.c.rej > done > > And make fails: > : > How to fix this? Apply the missing patch hunk (vi libexec/rtld-elf/rtld.c.rej) to libexec/rtld-elf/rtld.c. Scot -- DISCLAIMER: No electrons were mamed while sending this message. Only slightly bruised.