[Glibc-bsd-commits] r3478 - in trunk/kfreebsd-9/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-06-25 10:16:30 +0000 (Sat, 25 Jun 2011)
New Revision: 3478

Added:
   trunk/kfreebsd-9/debian/patches/917_disable_kgssapi.diff
Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/009_disable_duped_modules.diff
   trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff
   trunk/kfreebsd-9/debian/patches/series
Log:
  * New upstream snapshot.
    - Fix net802.11 stack kernel memory disclosure (CVE-2011-2480).
      (Closes: #631160)
    - Refresh all patches.
    - Revert enabling of kgssapi modules (break build).

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-06-24 20:17:13 UTC (rev 3477)
+++ trunk/kfreebsd-9/debian/changelog	2011-06-25 10:16:30 UTC (rev 3478)
@@ -1,7 +1,10 @@
-kfreebsd-9 (9.0~svn223182-1) UNRELEASED; urgency=low
+kfreebsd-9 (9.0~svn223502-1) UNRELEASED; urgency=low
 
-  [ Robert Millan ]
-  * Add myself to Uploaders.
+  * New upstream snapshot.
+    - Fix net802.11 stack kernel memory disclosure (CVE-2011-2480).
+      (Closes: #631160)
+    - Refresh all patches.
+    - Revert enabling of kgssapi modules (break build).
 
   [ Petr Salinger ]
   * Drop 111_linprocfs_kthread.diff, fixed upstream.
@@ -9,8 +12,9 @@
   [ Robert Millan ]
   * Add conf/kern.mk, conf/kmod.mk, kern/vnode_if.src, and
     tools/vnode_if.awk to kfreebsd-headers-8.2-1.  (Closes: #630509)
+  * Add myself to Uploaders.
 
- -- Robert Millan <rmh at debian.org>  Fri, 17 Jun 2011 12:37:06 +0200
+ -- Robert Millan <rmh at debian.org>  Fri, 24 Jun 2011 16:16:30 +0200
 
 kfreebsd-9 (9.0~svn223109-0.1) experimental; urgency=low
 

Modified: trunk/kfreebsd-9/debian/patches/009_disable_duped_modules.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/009_disable_duped_modules.diff	2011-06-24 20:17:13 UTC (rev 3477)
+++ trunk/kfreebsd-9/debian/patches/009_disable_duped_modules.diff	2011-06-25 10:16:30 UTC (rev 3478)
@@ -14,7 +14,7 @@
  %OBJS
 --- a/sys/conf/Makefile.arm
 +++ b/sys/conf/Makefile.arm
-@@ -123,6 +123,8 @@
+@@ -124,6 +124,8 @@
  
  MKMODULESENV+=	MACHINE=${MACHINE}
  

Modified: trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff	2011-06-24 20:17:13 UTC (rev 3477)
+++ trunk/kfreebsd-9/debian/patches/903_disable_non-free_drivers.diff	2011-06-25 10:16:30 UTC (rev 3478)
@@ -73,7 +73,7 @@
  	hwpmc \
  	${_i2c} \
  	${_ibcs2} \
-@@ -227,7 +225,6 @@
+@@ -229,7 +227,6 @@
  	ntfs \
  	ntfs_iconv \
  	nullfs \
@@ -81,7 +81,7 @@
  	${_nvram} \
  	${_nwfs} \
  	${_nxge} \
-@@ -492,8 +489,6 @@
+@@ -494,8 +491,6 @@
  _dpt=		dpt
  _ex=		ex
  _hptiop=	hptiop
@@ -90,7 +90,7 @@
  _ichwd=		ichwd
  _ida=		ida
  _iir=		iir
-@@ -509,7 +504,6 @@
+@@ -511,7 +506,6 @@
  _ixgbe=		ixgbe
  _mly=		mly
  _nfe=		nfe
@@ -98,7 +98,7 @@
  _nvram=		nvram
  _nxge=		nxge
  _tpm=		tpm
-@@ -565,8 +559,6 @@
+@@ -567,8 +561,6 @@
  _exca=		exca
  _ext2fs=	ext2fs
  _hptiop=	hptiop
@@ -107,7 +107,7 @@
  _i2c=		i2c
  _ichwd=		ichwd
  _ida=		ida
-@@ -597,7 +589,6 @@
+@@ -599,7 +591,6 @@
  .endif
  _ndis=		ndis
  _nfe=		nfe
@@ -155,7 +155,7 @@
  amd64/acpica/acpi_machdep.c	optional	acpi
  amd64/acpica/acpi_switch.S	optional	acpi
  acpi_wakecode.o			optional	acpi			\
-@@ -188,14 +168,6 @@
+@@ -187,14 +167,6 @@
  dev/fdc/fdc_acpi.c		optional	fdc
  dev/fdc/fdc_isa.c		optional	fdc isa
  dev/fdc/fdc_pccard.c		optional	fdc pccard
@@ -170,7 +170,7 @@
  dev/hwpmc/hwpmc_amd.c		optional	hwpmc
  dev/hwpmc/hwpmc_intel.c		optional	hwpmc
  dev/hwpmc/hwpmc_core.c		optional	hwpmc
-@@ -207,7 +179,6 @@
+@@ -206,7 +178,6 @@
  dev/lindev/full.c		optional	lindev
  dev/lindev/lindev.c		optional	lindev
  dev/nfe/if_nfe.c		optional	nfe pci

Added: trunk/kfreebsd-9/debian/patches/917_disable_kgssapi.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/917_disable_kgssapi.diff	                        (rev 0)
+++ trunk/kfreebsd-9/debian/patches/917_disable_kgssapi.diff	2011-06-25 10:16:30 UTC (rev 3478)
@@ -0,0 +1,11 @@
+--- a/sys/modules/Makefile
++++ b/sys/modules/Makefile
+@@ -153,8 +153,6 @@
+ 	jme \
+ 	joy \
+ 	kbdmux \
+-	kgssapi \
+-	kgssapi_krb5 \
+ 	khelp \
+ 	krpc \
+ 	ksyms \

Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2011-06-24 20:17:13 UTC (rev 3477)
+++ trunk/kfreebsd-9/debian/patches/series	2011-06-25 10:16:30 UTC (rev 3478)
@@ -23,6 +23,7 @@
 914_psm.diff
 915_ip6.v6only.diff
 916_NKPT_amd64.diff
+917_disable_kgssapi.diff
 950_no_stack_protector.diff
 951_disable_mk_magic.diff
 999_config.diff