From owner-freebsd-stable@FreeBSD.ORG Wed Jan 24 19:38:24 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 C0BE516A402 for ; Wed, 24 Jan 2007 19:38:24 +0000 (UTC) (envelope-from eric.j.christeson@gmail.com) Received: from wx-out-0506.google.com (wx-out-0506.google.com [66.249.82.224]) by mx1.freebsd.org (Postfix) with ESMTP id 8283813C448 for ; Wed, 24 Jan 2007 19:38:24 +0000 (UTC) (envelope-from eric.j.christeson@gmail.com) Received: by wx-out-0506.google.com with SMTP id s18so258041wxc for ; Wed, 24 Jan 2007 11:38:24 -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=OWCHw9aXyNWivB0CLXJ8k9OsPZnydNVw1YY9hSpNHWXXDC1qv79frdonhcRHm6tGz1inyMjJGIRQDuRQXijwOYxxF4RSHSQgZsgt8lXnTux54TjfnXncicsiFqi5f78cTmlg3J4j+CsOnjD2ySrYeYxlcz0sAMPxMfDJg9DgVgA= Received: by 10.90.116.6 with SMTP id o6mr1049504agc.1169665876817; Wed, 24 Jan 2007 11:11:16 -0800 (PST) Received: by 10.90.55.1 with HTTP; Wed, 24 Jan 2007 11:11:16 -0800 (PST) Message-ID: <7e3339060701241111s674800a4n4210fd756a27f59a@mail.gmail.com> Date: Wed, 24 Jan 2007 13:11:16 -0600 From: ejc To: "Alexandre Vasconcelos" In-Reply-To: <45B7A937.2020007@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> <790a9fff0701241036l584c2ae9n52e4834d929b1104@mail.gmail.com> <45B7A937.2020007@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 19:38:24 -0000 On 1/24/07, Alexandre Vasconcelos wrote: > Scot Hetzel wrote: > > > Apply the missing patch hunk (vi libexec/rtld-elf/rtld.c.rej) to > > libexec/rtld-elf/rtld.c. > > > Thanks for answering Scot, and sorry for ignorance.. how can I do it? rtld.c has changed a bit over time so here's a patch against the new file. ****Begin Patch**** --- libexec/rtld-elf/rtld.c.orig Wed Jan 24 13:03:46 2007 +++ libexec/rtld-elf/rtld.c Wed Jan 24 13:04:43 2007 @@ -134,6 +134,7 @@ static void ref_dag(Obj_Entry *); static void ld_utrace_log(int, void *, void *, size_t, int, const char *); +void *_dlsym(void *, const char *); void r_debug_state(struct r_debug *, struct link_map *); /* @@ -186,6 +187,7 @@ (func_ptr_type) &dlclose, (func_ptr_type) &dlerror, (func_ptr_type) &dlopen, + (func_ptr_type) &_dlsym, (func_ptr_type) &dlsym, (func_ptr_type) &dladdr, (func_ptr_type) &dllockinit, @@ -1827,6 +1829,12 @@ trace_loaded_objects(obj); wlock_release(rtld_bind_lock, lockstate); exit(0); +} + +void * +_dlsym(void *handle, const char *name) +{ + return dlsym(handle, name); } void * ****End Patch**** -- Eric