head	1.2;
access;
symbols
	pkgsrc-2021Q3:1.1.0.92
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.90
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.88
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.86
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.84
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.80
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.60
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.82
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.78
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.76
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.74
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.72
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.70
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.68
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.66
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.64
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.62
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.58
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.56
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.54
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.52
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.50
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.48
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.46
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.44
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.42
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.40
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.38
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.36
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.34
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.32
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.30
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.28
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.26
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.24
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.22
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.20
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.18
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.16
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.14
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.12
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.10
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.8
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.6
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.4
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.2
	pkgsrc-2010Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2021.10.01.11.56.13;	author nia;	state dead;
branches;
next	1.1;
commitid	CpiodN7O0v4Pp6bD;

1.1
date	2010.05.04.20.46.31;	author tez;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Prune gcc34, gcc44.
@
text
@$NetBSD: patch-cd,v 1.1 2010/05/04 20:46:31 tez Exp $
CVE-2009-3736 fix for embedded libltdl

--- libjava/libltdl/ltdl.c.orig	2010-04-30 10:49:19.822297200 -0500
+++ libjava/libltdl/ltdl.c	2010-04-30 10:49:34.600872700 -0500
@@@@ -2159,7 +2159,8 @@@@
 static	int	try_dlopen	      LT_PARAMS((lt_dlhandle *handle,
 						 const char *filename));
 static	int	tryall_dlopen	      LT_PARAMS((lt_dlhandle *handle,
-						 const char *filename));
+						 const char *filename,
+						 const char * useloader));
 static	int	unload_deplibs	      LT_PARAMS((lt_dlhandle handle));
 static	int	lt_argz_insert	      LT_PARAMS((char **pargz,
 						 size_t *pargz_len,
@@@@ -2345,9 +2346,10 @@@@
 }
 
 static int
-tryall_dlopen (handle, filename)
+tryall_dlopen (handle, filename, useloader)
      lt_dlhandle *handle;
      const char *filename;
+     const char *useloader;
 {
   lt_dlhandle	 cur;
   lt_dlloader   *loader;
@@@@ -2414,6 +2416,11 @@@@
 
   while (loader)
     {
+      if (useloader && strcmp(loader->loader_name, useloader))
+	{
+	  loader = loader->next;
+	  continue;
+	}
       lt_user_data data = loader->dlloader_data;
 
       cur->module = loader->module_open (data, filename);
@@@@ -2483,7 +2490,7 @@@@
       error += tryall_dlopen_module (handle,
 				     (const char *) 0, prefix, filename);
     }
-  else if (tryall_dlopen (handle, filename) != 0)
+  else if (tryall_dlopen (handle, filename, NULL) != 0)
     {
       ++error;
     }
@@@@ -2504,7 +2511,7 @@@@
   /* Try to open the old library first; if it was dlpreopened,
      we want the preopened version of it, even if a dlopenable
      module is available.  */
-  if (old_name && tryall_dlopen (handle, old_name) == 0)
+  if (old_name && tryall_dlopen (handle, old_name, "dlpreload") == 0)
     {
       return 0;
     }
@@@@ -2768,7 +2775,7 @@@@
 
   /* Try to dlopen the file, but do not continue searching in any
      case.  */
-  if (tryall_dlopen (handle, filename) != 0)
+  if (tryall_dlopen (handle, filename,NULL) != 0)
     *handle = 0;
 
   return 1;
@@@@ -3053,7 +3060,7 @@@@
       /* lt_dlclose()ing yourself is very bad!  Disallow it.  */
       LT_DLSET_FLAG (*phandle, LT_DLRESIDENT_FLAG);
 
-      if (tryall_dlopen (&newhandle, 0) != 0)
+      if (tryall_dlopen (&newhandle, 0, NULL) != 0)
 	{
 	  LT_DLFREE (*phandle);
 	  return 1;
@@@@ -3175,7 +3182,7 @@@@
 	    }
 #endif
 	}
-      if (!file)
+      else
 	{
 	  file = fopen (filename, LT_READTEXT_MODE);
 	}
@@@@ -3359,7 +3366,7 @@@@
 #endif
 		   )))
 	{
-          if (tryall_dlopen (&newhandle, filename) != 0)
+          if (tryall_dlopen (&newhandle, filename, NULL) != 0)
             {
               newhandle = NULL;
             }
@


1.1
log
@Add patch to embedded libltdl for CVE-2009-3736 from:
 http://lists.gnu.org/archive/html/libtool/2009-11/msg00065.html
@
text
@d1 1
a1 1
$NetBSD$
@