[Glibc-bsd-commits] r2746 - in trunk/kfreebsd-8: . debian debian/patches

Sat Aug 29 14:46:10 UTC 2009

Author: ps-guest
Date: 2009-08-29 14:46:10 +0000 (Sat, 29 Aug 2009)
New Revision: 2746

Removed:
   trunk/kfreebsd-8/debian/patches/011_brandinfo.diff
Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/912_binutils.diff
   trunk/kfreebsd-8/debian/patches/series
   trunk/kfreebsd-8/fetch
Log:
http://www.freebsd.org/cgi/query-pr.cgi?pr=135468 have been fixed in RELENG_8



Modified: trunk/kfreebsd-8/debian/changelog
===================================================================

--- trunk/kfreebsd-8/debian/changelog	2009-08-28 15:56:34 UTC (rev 2745)
+++ trunk/kfreebsd-8/debian/changelog	2009-08-29 14:46:10 UTC (rev 2746)
@@ -1,18 +1,21 @@
-kfreebsd-8 (8.0~cvs20090719-1) EXPERIMENTAL; urgency=low
+kfreebsd-8 (8.0~cvs20090829-1) EXPERIMENTAL; urgency=low
 
+  [ Petr Salinger ]
+  * New upstream snapshot of RELENG_8
+     - 011_brandinfo.diff dropped, fixed upstream
+  * Alter Build-depends as freebsd-buildutils 7.0 is still sufficent
+  * Update of some patches
+
   [ Luca Favatella ]
-  * New upstream snapshot of HEAD
+  * Drop patches
      - 000_ext2fs.diff and 017_oss_compat.diff applied upstream
      - 005_binutils.diff applied upstream (with mov instead of movw)
      - 911_no_werror.diff dropped (because useless)
-     - 001_misc.diff partially applied upstream and refreshed
+  * Partially drop and refresh the rest
+     - 001_misc.diff
 
-  [ Petr Salinger ]
-  * Alter Build-depends as freebsd-buildutils 7.0 is still sufficent
-  * Update of some patches
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 29 Aug 2009 15:18:23 +0200
 
- -- Aurelien Jarno <aurel32 at debian.org>  Sun, 19 Jul 2009 17:18:23 +0200
-
 kfreebsd-7 (7.2-4) unstable; urgency=low
 
   [ Aurelien Jarno ]

Deleted: trunk/kfreebsd-8/debian/patches/011_brandinfo.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/011_brandinfo.diff	2009-08-28 15:56:34 UTC (rev 2745)
+++ trunk/kfreebsd-8/debian/patches/011_brandinfo.diff	2009-08-29 14:46:10 UTC (rev 2746)
@@ -1,63 +0,0 @@
-Upstream checks the .note.ABI-tag in a bad way.
-They should not only check the "GNU", but also whether OS field matches.
-In both cases they should check 8 bytes, we can use it for current hack.
-
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532627
-http://www.freebsd.org/cgi/query-pr.cgi?pr=135468
-
-
---- src.orig/sys/amd64/linux32/linux32_sysvec.c
-+++ src/sys/amd64/linux32/linux32_sysvec.c
-@@ -1066,10 +1066,10 @@
- 	.sv_flags	= SV_ABI_LINUX | SV_ILP32 | SV_IA32
- };
- 
--static char GNULINUX_ABI_VENDOR[] = "GNU";
-+static char GNULINUX_ABI_VENDOR[] = "GNU\0\0\0\0\0";
- 
- static Elf_Brandnote linux32_brandnote = {
--	.hdr.n_namesz	= sizeof(GNULINUX_ABI_VENDOR),
-+	.hdr.n_namesz	= 4,
- 	.hdr.n_descsz	= 16,
- 	.hdr.n_type	= 1,
- 	.vendor		= GNULINUX_ABI_VENDOR,
---- src.orig/sys/i386/linux/linux_sysvec.c
-+++ src/sys/i386/linux/linux_sysvec.c
-@@ -1027,10 +1027,10 @@
- 	.sv_flags	= SV_ABI_LINUX | SV_IA32 | SV_ILP32
- };
- 
--static char GNULINUX_ABI_VENDOR[] = "GNU";
-+static char GNULINUX_ABI_VENDOR[] = "GNU\0\0\0\0\0";
- 
- static Elf_Brandnote linux_brandnote = {
--	.hdr.n_namesz	= sizeof(GNULINUX_ABI_VENDOR),
-+	.hdr.n_namesz	= 4,
- 	.hdr.n_descsz	= 16,
- 	.hdr.n_type	= 1,
- 	.vendor		= GNULINUX_ABI_VENDOR,
---- src.orig/sys/kern/imgact_elf.c
-+++ src/sys/kern/imgact_elf.c
-@@ -109,10 +109,10 @@
- #define	round_page_ps(va, ps)	(((va) + (ps - 1)) & ~(ps - 1))
- #define	aligned(a, t)	(trunc_page_ps((u_long)(a), sizeof(t)) == (u_long)(a))
- 
--static const char FREEBSD_ABI_VENDOR[] = "FreeBSD";
-+static const char FREEBSD_ABI_VENDOR[] = "FreeBSD\0";
- 
- Elf_Brandnote __elfN(freebsd_brandnote) = {
--	.hdr.n_namesz	= sizeof(FREEBSD_ABI_VENDOR),
-+	.hdr.n_namesz	= 8,
- 	.hdr.n_descsz	= sizeof(int32_t),
- 	.hdr.n_type	= 1,
- 	.vendor		= FREEBSD_ABI_VENDOR,
-@@ -1382,8 +1382,7 @@
- 		    note->n_type != checknote->hdr.n_type)
- 			goto nextnote;
- 		note_name = (const char *)(note + 1);
--		if (strncmp(checknote->vendor, note_name,
--		    checknote->hdr.n_namesz) != 0)
-+		if (memcmp(checknote->vendor, note_name, 8) != 0)
- 			goto nextnote;
- 
- 		/*

Modified: trunk/kfreebsd-8/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/912_binutils.diff	2009-08-28 15:56:34 UTC (rev 2745)
+++ trunk/kfreebsd-8/debian/patches/912_binutils.diff	2009-08-29 14:46:10 UTC (rev 2746)
@@ -1,7 +1,7 @@
 --- src.orig/sys/conf/ldscript.amd64
 +++ src/sys/conf/ldscript.amd64
 @@ -1,12 +1,12 @@
- /* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.9 2004/05/29 01:09:00 tjr Exp $ */
+ /* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.9.30.1 2009/08/03 08:13:06 kensmith Exp $ */
 -OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
 +OUTPUT_FORMAT("elf64-x86-64-freebsd", "elf64-x86-64-freebsd", "elf64-x86-64-freebsd")
  OUTPUT_ARCH(i386:x86-64)

Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2009-08-28 15:56:34 UTC (rev 2745)
+++ trunk/kfreebsd-8/debian/patches/series	2009-08-29 14:46:10 UTC (rev 2746)
@@ -5,7 +5,6 @@
 008_config.diff
 009_disable_duped_modules.diff
 010_ET_DYN.diff
-011_brandinfo.diff
 013_ip_packed.diff
 020_linker.diff 
 101_subsecond_timestamp.diff

Modified: trunk/kfreebsd-8/fetch
===================================================================
--- trunk/kfreebsd-8/fetch	2009-08-28 15:56:34 UTC (rev 2745)
+++ trunk/kfreebsd-8/fetch	2009-08-29 14:46:10 UTC (rev 2746)
@@ -2,7 +2,7 @@
 set -ex
 
 ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=HEAD
+RELENG=RELENG_8
 
 rm -rf src
 


