[Glibc-bsd-commits] r1838 - in trunk/kfreebsd-6/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2007-01-04 21:09:37 +0100 (Thu, 04 Jan 2007)
New Revision: 1838

Modified:
   trunk/kfreebsd-6/debian/changelog
   trunk/kfreebsd-6/debian/patches/010_ET_DYN.diff
Log:
* restrict renaming of ld.so only for native FreeBSD libc



Modified: trunk/kfreebsd-6/debian/changelog
===================================================================
--- trunk/kfreebsd-6/debian/changelog	2007-01-04 17:32:01 UTC (rev 1837)
+++ trunk/kfreebsd-6/debian/changelog	2007-01-04 20:09:37 UTC (rev 1838)
@@ -1,3 +1,10 @@
+kfreebsd-6 (6.1-4) UNRELEASED; urgency=low
+
+  [ Petr Salinger ]
+  * restrict renaming of ld.so only for native FreeBSD libc
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue,  2 Jan 2007 00:37:24 +0100
+
 kfreebsd-6 (6.1-3) unreleassed; urgency=low
 
   * Remove the CVS/ directory from kfreebsd-source-6.

Modified: trunk/kfreebsd-6/debian/patches/010_ET_DYN.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/010_ET_DYN.diff	2007-01-04 17:32:01 UTC (rev 1837)
+++ trunk/kfreebsd-6/debian/patches/010_ET_DYN.diff	2007-01-04 20:09:37 UTC (rev 1838)
@@ -13,7 +13,7 @@
  
  	/*
  	 * Do we have a valid ELF header ?
-@@ -649,8 +651,24 @@
+@@ -649,10 +651,26 @@
  		    hdr->e_ident[EI_OSABI]);
  		return (ENOEXEC);
  	}
@@ -36,8 +36,11 @@
 +	}
 +		
  	sv = brand_info->sysvec;
- 	if (interp != NULL && brand_info->interp_newpath != NULL)
+-	if (interp != NULL && brand_info->interp_newpath != NULL)
++	if (interp != NULL && brand_info->interp_newpath != NULL && strstr(interp, "ld-elf.so") != NULL)
  		interp = brand_info->interp_newpath;
+ 
+ 	/*
 @@ -693,7 +711,7 @@
  
  			if ((error = __elfN(load_section)(vmspace,