From c3bc8305036275d96fe2569b6c091c8b5a5b09bfdaec392652293963d2fbcd4a Mon Sep 17 00:00:00 2001
From: Petr Baudis <pbaudis@novell.com>
Date: Sun, 4 Jul 2010 14:13:26 +0000
Subject: [PATCH] Accepting request 42457 from home:jengelh:sparc

Copy from home:jengelh:sparc/linux-glibc-devel via accept of submit request 42457 revision 4.
Request was accepted with message:
reviewed ok.

OBS-URL: https://build.opensuse.org/request/show/42457
OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=20
---
 linux-glibc-devel.SuSE.TIOCGDEV.patch | 46 +++++++++++++++++++++++----
 linux-glibc-devel.changes             |  5 +++
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/linux-glibc-devel.SuSE.TIOCGDEV.patch b/linux-glibc-devel.SuSE.TIOCGDEV.patch
index 1d20f6d..ac93ada 100644
--- a/linux-glibc-devel.SuSE.TIOCGDEV.patch
+++ b/linux-glibc-devel.SuSE.TIOCGDEV.patch
@@ -1,4 +1,16 @@
---- usr/include/asm-arm/ioctls.h
+---
+ usr/include/asm-arm/ioctls.h     |    1 +
+ usr/include/asm-generic/ioctls.h |    1 +
+ usr/include/asm-ia64/ioctls.h    |    1 +
+ usr/include/asm-parisc/ioctls.h  |    1 +
+ usr/include/asm-powerpc/ioctls.h |    1 +
+ usr/include/asm-s390/ioctls.h    |    1 +
+ usr/include/asm-sparc/ioctls.h   |    1 +
+ 7 files changed, 7 insertions(+)
+
+Index: usr/include/asm-arm/ioctls.h
+===================================================================
+--- usr/include/asm-arm/ioctls.h.orig
 +++ usr/include/asm-arm/ioctls.h
 @@ -52,6 +52,7 @@
  #define TCSETSF2	_IOW('T',0x2D, struct termios2)
@@ -8,7 +20,9 @@
  
  #define FIONCLEX	0x5450  /* these numbers need to be adjusted. */
  #define FIOCLEX		0x5451
---- usr/include/asm-generic/ioctls.h
+Index: usr/include/asm-generic/ioctls.h
+===================================================================
+--- usr/include/asm-generic/ioctls.h.orig
 +++ usr/include/asm-generic/ioctls.h
 @@ -65,6 +65,7 @@
  #define TIOCSRS485	0x542F
@@ -18,7 +32,9 @@
  #define TCGETX		0x5432 /* SYS5 TCGETX compatibility */
  #define TCSETX		0x5433
  #define TCSETXF		0x5434
---- usr/include/asm-ia64/ioctls.h
+Index: usr/include/asm-ia64/ioctls.h
+===================================================================
+--- usr/include/asm-ia64/ioctls.h.orig
 +++ usr/include/asm-ia64/ioctls.h
 @@ -59,6 +59,7 @@
  #define TCSETSF2	_IOW('T',0x2D, struct termios2)
@@ -28,7 +44,9 @@
  
  #define FIONCLEX	0x5450  /* these numbers need to be adjusted. */
  #define FIOCLEX		0x5451
---- usr/include/asm-parisc/ioctls.h
+Index: usr/include/asm-parisc/ioctls.h
+===================================================================
+--- usr/include/asm-parisc/ioctls.h.orig
 +++ usr/include/asm-parisc/ioctls.h
 @@ -52,6 +52,7 @@
  #define TCSETSF2	_IOW('T',0x2D, struct termios2)
@@ -38,7 +56,9 @@
  
  #define FIONCLEX	0x5450  /* these numbers need to be adjusted. */
  #define FIOCLEX		0x5451
---- usr/include/asm-powerpc/ioctls.h
+Index: usr/include/asm-powerpc/ioctls.h
+===================================================================
+--- usr/include/asm-powerpc/ioctls.h.orig
 +++ usr/include/asm-powerpc/ioctls.h
 @@ -93,6 +93,7 @@
  #define TIOCSRS485	0x542f
@@ -48,7 +68,9 @@
  
  #define TIOCSERCONFIG	0x5453
  #define TIOCSERGWILD	0x5454
---- usr/include/asm-s390/ioctls.h
+Index: usr/include/asm-s390/ioctls.h
+===================================================================
+--- usr/include/asm-s390/ioctls.h.orig
 +++ usr/include/asm-s390/ioctls.h
 @@ -60,6 +60,7 @@
  #define TCSETSF2	_IOW('T',0x2D, struct termios2)
@@ -58,3 +80,15 @@
  
  #define FIONCLEX	0x5450  /* these numbers need to be adjusted. */
  #define FIOCLEX		0x5451
+Index: usr/include/asm-sparc/ioctls.h
+===================================================================
+--- usr/include/asm-sparc/ioctls.h.orig
++++ usr/include/asm-sparc/ioctls.h
+@@ -80,6 +80,7 @@
+ /* Get minor device of a pty master's FD -- Solaris equiv is ISPTM */
+ #define TIOCGPTN	_IOR('t', 134, unsigned int) /* Get Pty Number */
+ #define TIOCSPTLCK	_IOW('t', 135, int) /* Lock/unlock PTY */
++#define TIOCGDEV	_IOW('t', 0x32, unsigned int)
+ 
+ /* Little f */
+ #define FIOCLEX		_IO('f', 1)
diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes
index b337ca6..570c35e 100644
--- a/linux-glibc-devel.changes
+++ b/linux-glibc-devel.changes
@@ -3,6 +3,11 @@ Sun Jul  4 01:45:44 CEST 2010 - dmueller@suse.de
 
 - update kernel headers to 2.6.34 for proper O_SYNC support
 
+-------------------------------------------------------------------
+Wed Jun 30 15:14:03 UTC 2010 - jengelh@medozas.de
+
+- add TIOCGDEV define to SPARC definitions
+
 -------------------------------------------------------------------
 Tue May 11 16:18:13 CEST 2010 - pbaudis@suse.cz