From b8522860ac761621667b152bc6c515df4c31c962f751e31984f3872c09903e59 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 23 Jul 2010 20:59:28 +0000
Subject: [PATCH] Accepting request 43695 from Base:System
checked in (request 43695)
OBS-URL: https://build.opensuse.org/request/show/43695
OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=22
---
linux-glibc-devel.SuSE.TIOCGDEV.patch | 46 ++++-----------------------
linux-glibc-devel.changes | 5 ---
2 files changed, 6 insertions(+), 45 deletions(-)
diff --git a/linux-glibc-devel.SuSE.TIOCGDEV.patch b/linux-glibc-devel.SuSE.TIOCGDEV.patch
index ac93ada..1d20f6d 100644
--- a/linux-glibc-devel.SuSE.TIOCGDEV.patch
+++ b/linux-glibc-devel.SuSE.TIOCGDEV.patch
@@ -1,16 +1,4 @@
----
- 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
+++ usr/include/asm-arm/ioctls.h
@@ -52,6 +52,7 @@
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
@@ -20,9 +8,7 @@ Index: usr/include/asm-arm/ioctls.h
#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
#define FIOCLEX 0x5451
-Index: usr/include/asm-generic/ioctls.h
-===================================================================
---- usr/include/asm-generic/ioctls.h.orig
+--- usr/include/asm-generic/ioctls.h
+++ usr/include/asm-generic/ioctls.h
@@ -65,6 +65,7 @@
#define TIOCSRS485 0x542F
@@ -32,9 +18,7 @@ Index: usr/include/asm-generic/ioctls.h
#define TCGETX 0x5432 /* SYS5 TCGETX compatibility */
#define TCSETX 0x5433
#define TCSETXF 0x5434
-Index: usr/include/asm-ia64/ioctls.h
-===================================================================
---- usr/include/asm-ia64/ioctls.h.orig
+--- usr/include/asm-ia64/ioctls.h
+++ usr/include/asm-ia64/ioctls.h
@@ -59,6 +59,7 @@
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
@@ -44,9 +28,7 @@ Index: usr/include/asm-ia64/ioctls.h
#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
#define FIOCLEX 0x5451
-Index: usr/include/asm-parisc/ioctls.h
-===================================================================
---- usr/include/asm-parisc/ioctls.h.orig
+--- usr/include/asm-parisc/ioctls.h
+++ usr/include/asm-parisc/ioctls.h
@@ -52,6 +52,7 @@
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
@@ -56,9 +38,7 @@ Index: usr/include/asm-parisc/ioctls.h
#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
#define FIOCLEX 0x5451
-Index: usr/include/asm-powerpc/ioctls.h
-===================================================================
---- usr/include/asm-powerpc/ioctls.h.orig
+--- usr/include/asm-powerpc/ioctls.h
+++ usr/include/asm-powerpc/ioctls.h
@@ -93,6 +93,7 @@
#define TIOCSRS485 0x542f
@@ -68,9 +48,7 @@ Index: usr/include/asm-powerpc/ioctls.h
#define TIOCSERCONFIG 0x5453
#define TIOCSERGWILD 0x5454
-Index: usr/include/asm-s390/ioctls.h
-===================================================================
---- usr/include/asm-s390/ioctls.h.orig
+--- usr/include/asm-s390/ioctls.h
+++ usr/include/asm-s390/ioctls.h
@@ -60,6 +60,7 @@
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
@@ -80,15 +58,3 @@ Index: usr/include/asm-s390/ioctls.h
#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 570c35e..b337ca6 100644
--- a/linux-glibc-devel.changes
+++ b/linux-glibc-devel.changes
@@ -3,11 +3,6 @@ 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