From owner-freebsd-stable@FreeBSD.ORG Wed Jan 24 19:50:38 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 BA8F616A400 for ; Wed, 24 Jan 2007 19:50:38 +0000 (UTC) (envelope-from ports@fsck.ch) Received: from smtp.hispeed.ch (mxout.hispeed.ch [62.2.95.247]) by mx1.freebsd.org (Postfix) with ESMTP id 4104013C45A for ; Wed, 24 Jan 2007 19:50:38 +0000 (UTC) (envelope-from ports@fsck.ch) Received: from fac (84-73-229-8.dclient.hispeed.ch [84.73.229.8]) (authenticated bits=0) by smtp.hispeed.ch (8.12.11.20060308/8.12.11/taifun-1.0) with ESMTP id l0OIoWBj003200 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Wed, 24 Jan 2007 19:50:33 +0100 Date: Wed, 24 Jan 2007 19:50:31 +0100 From: Tobias Roth To: freebsd-stable@freebsd.org Message-ID: <20070124195031.3561c85d@fac> In-Reply-To: <790a9fff0701241036l584c2ae9n52e4834d929b1104@mail.gmail.com> References: <45B7A0FA.1050901@terceirizado.mda.gov.br> <790a9fff0701241036l584c2ae9n52e4834d929b1104@mail.gmail.com> X-Mailer: Claws Mail 2.7.1 (GTK+ 2.10.8; i386-portbld-freebsd6.2) X-message-flag: Warning! Using Outlook is insecure and promotes virus distribution. Please use a different email client. X-PGP-Key: http://fsck.ch/public_key.asc Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=MP_fwir4KT5UC2KQaboJqr_kt0 X-Virus-Scanned: ClamAV version 0.88.7, clamav-milter version 0.88.7 on smtp-05.tornado.cablecom.ch X-Virus-Status: Clean X-DCC-spamcheck-02.tornado.cablecom.ch-Metrics: smtp-05.tornado.cablecom.ch 1378; Body=2 Fuz1=2 Fuz2=2 Cc: Alexandre Vasconcelos 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:50:38 -0000 --MP_fwir4KT5UC2KQaboJqr_kt0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline On Wed, 24 Jan 2007 12:36:06 -0600 "Scot Hetzel" wrote: > 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. For your convenience: http://fsck.ch/rtld_dlsym_hack_new.diff or the attached file (if it makes it through). cheers, Tobias --MP_fwir4KT5UC2KQaboJqr_kt0 Content-Type: text/x-patch; name=rtld_dlsym_hack_new.diff Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=rtld_dlsym_hack_new.diff --- libexec/rtld-elf/rtld.c.orig Tue Jan 16 08:51:04 2007 +++ libexec/rtld-elf/rtld.c Wed Jan 24 19:43:57 2007 @@ -129,6 +129,7 @@ static void unlink_object(Obj_Entry *); static void unload_object(Obj_Entry *); static void unref_dag(Obj_Entry *); +void *_dlsym(void *, const char *); static void ref_dag(Obj_Entry *); void r_debug_state(struct r_debug *, struct link_map *); @@ -182,6 +183,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, @@ -1762,6 +1764,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 * --MP_fwir4KT5UC2KQaboJqr_kt0--