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

Petr Salinger ps-guest at alioth.debian.org
Thu Jun 11 12:33:28 UTC 2009 

Author: ps-guest
Date: 2009-06-11 12:33:27 +0000 (Thu, 11 Jun 2009)
New Revision: 2581

Added:
   trunk/kfreebsd-8/debian/patches/011_brandinfo.diff
Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/control.flavor.in
   trunk/kfreebsd-8/debian/copyright
   trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff
   trunk/kfreebsd-8/debian/patches/004_xargs.diff
   trunk/kfreebsd-8/debian/patches/910_GENERIC_hints.diff
   trunk/kfreebsd-8/debian/patches/series
   trunk/kfreebsd-8/debian/rules
Log:
* merge kfreebsd-7 changes
  update some patches



Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2009-06-11 11:52:01 UTC (rev 2580)
+++ trunk/kfreebsd-8/debian/changelog	2009-06-11 12:33:27 UTC (rev 2581)
@@ -1,4 +1,4 @@
-kfreebsd-8 (8.0~cvs20090504-1) EXPERIMENTAL; urgency=low
+kfreebsd-8 (8.0~cvs20090611-1) UNSTABLE; urgency=low
 
   [ Luca Favatella ]
   * New upstream snapshot of HEAD
@@ -6,17 +6,27 @@
      - 005_binutils.diff applied upstream (with mov instead of movw)
      - 911_no_werror.diff dropped (because unuseful)
      - 001_misc.diff partially applied upstream and refreshed
-     - refresh 903_disable_non-free_drivers.diff,
-               912_binutils.diff,
-               913_uudecode.diff,
-               999_config.diff
 
   [ Petr Salinger ]
-  * Drop kfreebsd-7 only transitional packages
   * Alter Build-depends as freebsd-buildutils 7.0 is still sufficent
+  * update of some patches
 
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 04 May 2009 12:00:00 +0200
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 11 Jun 2009 12:00:00 +0200
 
+kfreebsd-7 (7.2-2) UNSTABLE; urgency=low
+
+  [ Petr Salinger ]
+  * 011_brandinfo.diff: fix the way a binary type is detected.
+    The original upstream change in 7.2 prevented 32-bit binaries to work.
+    It broke biarch support on kfreebsd-amd64 and whole kfreebsd-i386.
+    Closes: #532627.
+  * Fix local information disclosure via direct pipe writes
+    (FreeBSD-SA-09:09.pipe).
+  * Fix missing permission check on SIOCSIFINFO_IN6 ioctl
+    (FreeBSD-SA-09:10.ipv6).
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 11 Jun 2009 12:00:00 +0200
+
 kfreebsd-7 (7.2-1) unstable; urgency=low
 
   [ Petr Salinger ]
@@ -25,8 +35,15 @@
      - update of some patches
      - refresh all patches
 
- -- Aurelien Jarno <aurel32 at debian.org>  Mon, 04 May 2009 12:00:00 +0200
+  [ Aurelien Jarno ]
+  * Keep sources of ZFS but don't enable them.
+  * Remove alternative build-depends on freebsd6-buildutils. 
+  * Remove compat flavours as we are going to the official archive.
+  * Move ndiswrapper modules to kfreebsd-image, the same way the Linux
+    modules are in main in the Debian.
 
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 31 May 2009 21:35:04 +0200
+
 kfreebsd-7 (7.1-4) unstable; urgency=low
 
   * debian/control.flavor.in: depends on kldutils instead of 

Modified: trunk/kfreebsd-8/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-8/debian/control.flavor.in	2009-06-11 11:52:01 UTC (rev 2580)
+++ trunk/kfreebsd-8/debian/control.flavor.in	2009-06-11 12:33:27 UTC (rev 2581)
@@ -10,15 +10,6 @@
  .
  This package is compiled for a @flavor at -class machine.
 
-Package: ndiswrapper-modules- at version@- at abiname@- at flavor@
-Architecture: kfreebsd- at arch@
-Section: contrib/net
-Priority: optional
-Depends: kfreebsd-image- at version@- at abiname@- at flavor@
-Description: Ndiswrapper kFreeBSD module
- This package contains the ndiswrapper loadable kernel modules for the
- kfreebsd-image- at version@- at abiname@- at flavor@ package.
-
 Package: kfreebsd-image- at major@- at flavor@
 Architecture: kfreebsd- at arch@
 Depends: kfreebsd-image- at version@- at abiname@- at flavor@

Modified: trunk/kfreebsd-8/debian/copyright
===================================================================
--- trunk/kfreebsd-8/debian/copyright	2009-06-11 11:52:01 UTC (rev 2580)
+++ trunk/kfreebsd-8/debian/copyright	2009-06-11 12:33:27 UTC (rev 2581)
@@ -40,10 +40,8 @@
   DFSG-incompatible terms and were therefore removed from the package
   (and disabled in the build system):
 
-src/sys/compat/opensolaris
 src/sys/contrib/dev/nve
 src/sys/contrib/dev/oltr
-src/sys/contrib/opensolaris
 src/sys/dev/hptmv
 src/sys/dev/hptrr
 src/sys/dev/rr232x
@@ -57,4 +55,3 @@
 src/sys/modules/nve
 src/sys/modules/oltr
 src/sys/modules/rr232x
-src/sys/modules/zfs

Modified: trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff	2009-06-11 11:52:01 UTC (rev 2580)
+++ trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff	2009-06-11 12:33:27 UTC (rev 2581)
@@ -8,10 +8,10 @@
  DPADD=	${LIBL}
 -LDADD=	-ll
 +LDADD=	-ll -ldb
+ WARNS?=	6
  
  # Correct path for kernel builds
- # Don't rely on the kernel's .depend file
-@@ -23,13 +23,6 @@
+@@ -24,13 +24,6 @@
  DEPENDFILE=	.depend_aicasm
  .endif
  
@@ -124,14 +124,14 @@
 -#include <db.h>
 +#include <db_185.h>		/* Sleepycat 1.85 compat */
  #endif
+ #include <ctype.h>
  #include <fcntl.h>
- #include <inttypes.h>
 Index: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
 ===================================================================
 --- src.orig/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
 +++ src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
 @@ -42,8 +42,9 @@
-  * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h,v 1.17 2005/01/06 01:42:27 imp Exp $
+  * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h,v 1.18 2009/06/01 18:42:16 delphij Exp $
   */
  
 -#ifdef __linux__

Modified: trunk/kfreebsd-8/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/004_xargs.diff	2009-06-11 11:52:01 UTC (rev 2580)
+++ trunk/kfreebsd-8/debian/patches/004_xargs.diff	2009-06-11 12:33:27 UTC (rev 2581)
@@ -5,7 +5,7 @@
 ===================================================================
 --- src.orig/sys/conf/kmod.mk
 +++ src/sys/conf/kmod.mk
-@@ -204,7 +204,7 @@
+@@ -203,7 +203,7 @@
  	grep -v '^#' < ${EXPORT_SYMS} > export_syms
  .endif
  	awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
@@ -18,18 +18,16 @@
 ===================================================================
 --- src.orig/sys/contrib/dev/acpica/acpica_prep.sh
 +++ src/sys/contrib/dev/acpica/acpica_prep.sh
-@@ -55,12 +55,12 @@
- 
+@@ -58,10 +58,10 @@
+ # copy files
  echo copying full dirs
  for i in ${fulldirs}; do
 -	find ${wrk} -name ${i} -type d | xargs -J % mv % ${dst}
 +	find ${wrk} -name ${i} -type d | xargs -I % mv % ${dst}
  done
- 
- # move files to destination
- echo copying flat dirs
+ echo copying remaining files
 -find ${wrk} -type f | xargs -J % mv % ${dst}
 +find ${wrk} -type f | xargs -I % mv % ${dst}
- mv ${dst}/changes.txt ${dst}/CHANGES.txt
  
- # update src/headers for appropriate paths
+ # canonify include paths
+ for H in ${src_headers}; do

Copied: trunk/kfreebsd-8/debian/patches/011_brandinfo.diff (from rev 2580, trunk/kfreebsd-7/debian/patches/011_brandinfo.diff)
===================================================================
--- trunk/kfreebsd-8/debian/patches/011_brandinfo.diff	                        (rev 0)
+++ trunk/kfreebsd-8/debian/patches/011_brandinfo.diff	2009-06-11 12:33:27 UTC (rev 2581)
@@ -0,0 +1,69 @@
+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
+
+
+Index: src/sys/amd64/linux32/linux32_sysvec.c
+===================================================================
+--- src.orig/sys/amd64/linux32/linux32_sysvec.c
++++ src/sys/amd64/linux32/linux32_sysvec.c
+@@ -1047,10 +1047,10 @@
+ 	.sv_maxssiz	= &linux32_maxssiz,
+ };
+ 
+-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,
+Index: src/sys/i386/linux/linux_sysvec.c
+===================================================================
+--- src.orig/sys/i386/linux/linux_sysvec.c
++++ src/sys/i386/linux/linux_sysvec.c
+@@ -1017,10 +1017,10 @@
+ 	.sv_maxssiz	= NULL
+ };
+ 
+-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,
+Index: src/sys/kern/imgact_elf.c
+===================================================================
+--- src.orig/sys/kern/imgact_elf.c
++++ src/sys/kern/imgact_elf.c
+@@ -112,10 +112,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,
+@@ -1393,8 +1393,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/910_GENERIC_hints.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/910_GENERIC_hints.diff	2009-06-11 11:52:01 UTC (rev 2580)
+++ trunk/kfreebsd-8/debian/patches/910_GENERIC_hints.diff	2009-06-11 12:33:27 UTC (rev 2581)
@@ -2,23 +2,23 @@
 ===================================================================
 --- src.orig/sys/i386/conf/GENERIC.hints
 +++ src/sys/i386/conf/GENERIC.hints
-@@ -27,6 +27,7 @@
+@@ -18,6 +18,7 @@
+ hint.atkbd.0.at="atkbdc"
  hint.atkbd.0.irq="1"
  hint.psm.0.at="atkbdc"
++hint.psm.0.flags="0x100"
  hint.psm.0.irq="12"
-+hint.psm.0.flags="0x100"
- hint.vga.0.at="isa"
  hint.sc.0.at="isa"
  hint.sc.0.flags="0x100"
 Index: src/sys/amd64/conf/GENERIC.hints
 ===================================================================
 --- src.orig/sys/amd64/conf/GENERIC.hints
 +++ src/sys/amd64/conf/GENERIC.hints
-@@ -13,6 +13,7 @@
+@@ -12,6 +12,7 @@
+ hint.atkbd.0.at="atkbdc"
  hint.atkbd.0.irq="1"
  hint.psm.0.at="atkbdc"
++hint.psm.0.flags="0x100"
  hint.psm.0.irq="12"
-+hint.psm.0.flags="0x100"
- hint.vga.0.at="isa"
  hint.sc.0.at="isa"
  hint.sc.0.flags="0x100"

Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2009-06-11 11:52:01 UTC (rev 2580)
+++ trunk/kfreebsd-8/debian/patches/series	2009-06-11 12:33:27 UTC (rev 2581)
@@ -5,6 +5,7 @@
 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/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules	2009-06-11 11:52:01 UTC (rev 2580)
+++ trunk/kfreebsd-8/debian/rules	2009-06-11 12:33:27 UTC (rev 2581)
@@ -21,7 +21,6 @@
 SOURCE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-source-$(version)
 IMAGE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-image-$(version)-$(abiname)
 HEADERS_PACKAGE	:= $(CURDIR)/debian/kfreebsd-headers-$(version)-$(abiname)
-NDIS_PACKAGE	:= $(CURDIR)/debian/ndiswrapper-modules-$(version)-$(abiname)
 SRC_TAR		:= kfreebsd-source-$(version).tar.bz2
 SRC_DIR		:= kfreebsd-source-$(version)
 HEADERS_DIR	:= kfreebsd-headers-$(version)-$(abiname)
@@ -191,11 +190,6 @@
 		debian/kfreebsd-image.overrides \
 		$(IMAGE_PACKAGE)-$*/usr/share/lintian/overrides/kfreebsd-image-$(version)-$(abiname)-$*
 
-	# move ndis modules to their own package
-	mkdir -p $(NDIS_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*
-	mv $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/ndis.ko $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/if_ndis.ko \
-		$(NDIS_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/
-
 	# scripts
 	sed -e "s/@RELEASE@/$(version)-$(abiname)-$*/g" debian/kfreebsd-image.postinst.in \
 		> debian/kfreebsd-image-$(version)-$(abiname)-$*.postinst

More information about the Glibc-bsd-commits mailing list