[Glibc-bsd-commits] r5185 - in trunk/kfreebsd-11/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-11-29 22:57:47 +0000 (Fri, 29 Nov 2013)
New Revision: 5185

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/control.flavor.in
   trunk/kfreebsd-11/debian/patches/999_config.diff
Log:
Disable pty(4) to follow upstream.

Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2013-11-29 22:51:05 UTC (rev 5184)
+++ trunk/kfreebsd-11/debian/changelog	2013-11-29 22:57:47 UTC (rev 5185)
@@ -2,6 +2,7 @@
 
   * Implement a watchdog to detect when upstream switches to a new Clang
     version.
+  * Disable pty(4) to follow upstream.
 
  -- Robert Millan <rmh at debian.org>  Fri, 29 Nov 2013 14:05:10 +0100
 

Modified: trunk/kfreebsd-11/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-11/debian/control.flavor.in	2013-11-29 22:51:05 UTC (rev 5184)
+++ trunk/kfreebsd-11/debian/control.flavor.in	2013-11-29 22:57:47 UTC (rev 5185)
@@ -9,9 +9,8 @@
 Breaks:
 # Prior versions can't boot kFreeBSD >= 9.1 (see #699002)
  grub-common (<< 1.99-27+deb7u2) [kfreebsd-any],
-# AT_* macros break LD_PRELOAD (see #630695)
-# Missing support for RFTSIGZMB (see 007_clone_signals.diff)
- libc0.1 (<< 2.11.3-1) [kfreebsd-any],
+# Missing support for pts(4) (see #667448)
+ libc0.1 (<< 2.17-4~) [kfreebsd-any],
 # Require ZFS v28 userland
  zfsutils (<< 8.3~) [kfreebsd-any],
 Provides: kfreebsd-image- at major@, kfreebsd-image

Modified: trunk/kfreebsd-11/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/999_config.diff	2013-11-29 22:51:05 UTC (rev 5184)
+++ trunk/kfreebsd-11/debian/patches/999_config.diff	2013-11-29 22:57:47 UTC (rev 5185)
@@ -48,7 +48,7 @@
  options 	SYSVSHM			# SYSV-style shared memory
 --- /dev/null
 +++ b/sys/conf/DEBIAN
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,36 @@
 +# Common options to all Debian GNU/kFreeBSD kernels
 +
 +options		LINPROCFS
@@ -71,10 +71,6 @@
 +device		pfsync
 +device		pflog
 +
-+# pty(4) was removed from GENERIC in 10-CURRENT (see rev 233271),
-+# but unfortunetely glibc doesn't support pts(4) yet (see #667448).
-+device		pty
-+
 +# Toggle to enable/disable debug options.
 +include		DEBIAN_DEBUG
 +#include	DEBIAN_NODEBUG