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

[Petr Salinger]

Author: ps-guest
Date: 2010-04-08 05:04:33 +0000 (Thu, 08 Apr 2010)
New Revision: 3005

Added:
   trunk/kfreebsd-8/debian/patches/105_pts.diff
Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/control.flavor.in
   trunk/kfreebsd-8/debian/control.in
   trunk/kfreebsd-8/debian/patches/series
   trunk/kfreebsd-8/debian/rules
Log:
* Fix vnode leak - local DoS, aka hang during build of gcc-4.3
* Merge packaging changes from kfreebsd-7



Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2010-03-29 19:54:08 UTC (rev 3004)
+++ trunk/kfreebsd-8/debian/changelog	2010-04-08 05:04:33 UTC (rev 3005)
@@ -1,3 +1,14 @@
+kfreebsd-8 (8.0-5) UNSTABLE; urgency=medium
+
+  [ Petr Salinger ]
+  * Fix vnode leak - local DoS
+      - 105_pts.diff
+
+  * Merge packaging changes from kfreebsd-7
+      debian/control: add ${misc:Depends} to all packages. 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 08 Apr 2010 07:03:45 +0200
+
 kfreebsd-8 (8.0-4) unstable; urgency=medium
 
   [ Robert Millan ]

Modified: trunk/kfreebsd-8/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-8/debian/control.flavor.in	2010-03-29 19:54:08 UTC (rev 3004)
+++ trunk/kfreebsd-8/debian/control.flavor.in	2010-04-08 05:04:33 UTC (rev 3005)
@@ -1,6 +1,6 @@
 Package: kfreebsd-image- at version@- at abiname@- at flavor@
 Architecture: kfreebsd- at arch@
-Depends: freebsd-utils (>= 5), kldutils (>= 7.1)
+Depends: freebsd-utils (>= 5), kldutils (>= 7.1), ${misc:Depends}
 Conflicts: kfreebsd-loader (<< 5.4-1.3)
 Provides: kfreebsd-image- at major@, kfreebsd-image
 Recommends: @recommends@
@@ -12,7 +12,7 @@
 
 Package: kfreebsd-image- at major@- at flavor@
 Architecture: kfreebsd- at arch@
-Depends: kfreebsd-image- at version@- at abiname@- at flavor@
+Depends: kfreebsd-image- at version@- at abiname@- at flavor@, ${misc:Depends}
 Description: kernel of FreeBSD @major@ image
  This package depends on the latest binary image for kernel of FreeBSD @major@ on
  @flavor at -class machines.
@@ -20,7 +20,7 @@
 Package: kfreebsd-headers- at version@- at abiname@- at flavor@
 Architecture: kfreebsd- at arch@
 Provides: kfreebsd-headers- at major@
-Depends: kfreebsd-headers- at version@- at abiname@ (= ${binary:Version})
+Depends: kfreebsd-headers- at version@- at abiname@ (= ${binary:Version}), ${misc:Depends}
 Description: header files for kernel of FreeBSD @version@
  This package provides the header files for kernel of FreeBSD @version@, generally 
  used for building out-of-tree kernel modules. These files are going to be 
@@ -30,7 +30,7 @@
 
 Package: kfreebsd-headers- at major@- at flavor@
 Architecture: kfreebsd- at arch@
-Depends: kfreebsd-headers- at version@- at abiname@- at flavor@
+Depends: kfreebsd-headers- at version@- at abiname@- at flavor@, ${misc:Depends}
 Description: header files for kernel of FreeBSD @major@
  This package depends on the latest header files for kernel of FreeBSD @major@ on
  @flavor at -class machines.

Modified: trunk/kfreebsd-8/debian/control.in
===================================================================
--- trunk/kfreebsd-8/debian/control.in	2010-03-29 19:54:08 UTC (rev 3004)
+++ trunk/kfreebsd-8/debian/control.in	2010-04-08 05:04:33 UTC (rev 3005)
@@ -10,6 +10,7 @@
 
 Package: kfreebsd-source- at version@
 Architecture: all
+Depends: ${misc:Depends}
 Recommends: freebsd-buildutils (>= 7)
 Provides: kfreebsd-source- at major@, kfreebsd-source
 Description: source code for kernel of FreeBSD @version@ with Debian patches
@@ -18,6 +19,7 @@
 
 Package: kfreebsd-headers- at version@- at abiname@
 Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: ${misc:Depends}
 Description: Common architecture-specific header files for kernel of FreeBSD @version@
  This package provides the architecture-specific common kernel header files for 
  kernel of FreeBSD @version@, generally used for building out-of-tree kernel 

Added: trunk/kfreebsd-8/debian/patches/105_pts.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/105_pts.diff	                        (rev 0)
+++ trunk/kfreebsd-8/debian/patches/105_pts.diff	2010-04-08 05:04:33 UTC (rev 3005)
@@ -0,0 +1,16 @@
+
+fix leak of the vnodes
+http://lists.freebsd.org/pipermail/freebsd-hackers/2010-April/031433.html
+
+--- a/sys/kern/tty_pts.c
++++ b/sys/kern/tty_pts.c
+@@ -589,6 +589,9 @@
+ 	tty_lock(tp);
+ 	tty_rel_gone(tp);
+ 
++	if (fp->f_vnode != NULL)
++		return (vnops.fo_close(fp, td));
++			
+ 	return (0);
+ }
+ 

Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2010-03-29 19:54:08 UTC (rev 3004)
+++ trunk/kfreebsd-8/debian/patches/series	2010-04-08 05:04:33 UTC (rev 3005)
@@ -18,6 +18,7 @@
 102_POLL_HUP.diff
 103_stat_pipe.diff
 104_linprocfs.diff
+105_pts.diff
 902_version.diff
 903_disable_non-free_drivers.diff 
 904_dev_full.diff

Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules	2010-03-29 19:54:08 UTC (rev 3004)
+++ trunk/kfreebsd-8/debian/rules	2010-04-08 05:04:33 UTC (rev 3005)
@@ -7,8 +7,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-SVN=http://svn.freebsd.org/base/release/8.0.0/
-
 full_version	:= $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
 version		:= $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
 major           := $(shell echo $(version) | sed -e 's/\..*//g')
@@ -20,7 +18,7 @@
 configfile	:= DEBCUSTOM
 abiname		:= 1
 
-SVN		:= svn://svn.freebsd.org/base/release/$(version).0
+SVN		:= http://svn.freebsd.org/base/release/$(version).0
 SOURCE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-source-$(version)
 IMAGE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-image-$(version)-$(abiname)
 HEADERS_PACKAGE	:= $(CURDIR)/debian/kfreebsd-headers-$(version)-$(abiname)