[Glibc-bsd-commits] r5639 - in branches/wheezy/kfreebsd-9/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-10-15 13:44:21 +0000 (Wed, 15 Oct 2014)
New Revision: 5639

Modified:
   branches/wheezy/kfreebsd-9/debian/changelog
   branches/wheezy/kfreebsd-9/debian/patches/999_config.diff
Log:
Disable SCTP since it was unsupported yet in userland and has
security issues (CVE-2014-3953)


Modified: branches/wheezy/kfreebsd-9/debian/changelog
===================================================================
--- branches/wheezy/kfreebsd-9/debian/changelog	2014-10-15 13:43:38 UTC (rev 5638)
+++ branches/wheezy/kfreebsd-9/debian/changelog	2014-10-15 13:44:21 UTC (rev 5639)
@@ -4,6 +4,8 @@
   * Pick SVN 268432 from FreeBSD 9-STABLE to fix SA-14:17:
     - kernel memory disclosure in sockbuf control message
       (CVE-2014-3952) (Closes: #754236))
+  * Disable SCTP since it was unsupported yet in userland and has
+    security issues (CVE-2014-3953)
  -- Steven Chamberlain <steven at pyro.eu.org>  Tue, 08 Jul 2014 23:03:16 +0000
 
 kfreebsd-9 (9.0-10+deb70.7) wheezy-security; urgency=high

Modified: branches/wheezy/kfreebsd-9/debian/patches/999_config.diff
===================================================================
--- branches/wheezy/kfreebsd-9/debian/patches/999_config.diff	2014-10-15 13:43:38 UTC (rev 5638)
+++ branches/wheezy/kfreebsd-9/debian/patches/999_config.diff	2014-10-15 13:44:21 UTC (rev 5639)
@@ -1,6 +1,6 @@
 --- a/sys/amd64/conf/GENERIC
 +++ b/sys/amd64/conf/GENERIC
-@@ -18,10 +18,12 @@
+@@ -18,16 +18,18 @@
  #
  # $FreeBSD$
  
@@ -16,6 +16,13 @@
  
  options 	SCHED_ULE		# ULE scheduler
  options 	PREEMPTION		# Enable kernel thread preemption
+ options 	INET			# InterNETworking
+ options 	INET6			# IPv6 communications protocols
+-options 	SCTP			# Stream Control Transmission Protocol
++#options 	SCTP			# Stream Control Transmission Protocol
+ options 	FFS			# Berkeley Fast Filesystem
+ options 	SOFTUPDATES		# Enable FFS soft updates support
+ options 	UFS_ACL			# Support for access control lists
 @@ -49,7 +51,7 @@
  options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
  options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
@@ -162,7 +169,7 @@
 +options		ALTQ_PRIQ	# Priority Queuing (PRIQ)
 --- a/sys/i386/conf/GENERIC
 +++ b/sys/i386/conf/GENERIC
-@@ -18,12 +18,14 @@
+@@ -18,18 +18,20 @@
  #
  # $FreeBSD$
  
@@ -182,6 +189,13 @@
  
  options 	SCHED_ULE		# ULE scheduler
  options 	PREEMPTION		# Enable kernel thread preemption
+ options 	INET			# InterNETworking
+ options 	INET6			# IPv6 communications protocols
+-options 	SCTP			# Stream Control Transmission Protocol
++#options 	SCTP			# Stream Control Transmission Protocol
+ options 	FFS			# Berkeley Fast Filesystem
+ options 	SOFTUPDATES		# Enable FFS soft updates support
+ options 	UFS_ACL			# Support for access control lists
 @@ -43,6 +45,8 @@
  options 	MSDOSFS			# MSDOS Filesystem
  options 	CD9660			# ISO 9660 Filesystem