- updated to 2.6.38

- removed obsolete SuSE.TIOCGDEV and cap-syslog patches

Changed files:
    linux-kernel-headers.SuSE.TIOCGDEV.patch -> 1.10
    linux-libc-headers-cap-syslog.patch -> 1.3
    linux-libc-headers.spec -> 1.167

diff --git a/linux-kernel-headers.SuSE.TIOCGDEV.patch b/linux-kernel-headers.SuSE.TIOCGDEV.patch
deleted file mode 100644 (file)
index 4caf1ba..0000000
--- a/linux-kernel-headers.SuSE.TIOCGDEV.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-TIOCGDEV is used to get the kernel device name behind /dev/console
-Temporary solution until another solution exists.
-
---- a/linux/arch/parisc/include/asm/ioctls.h
-+++ b/linux/arch/parisc/include/asm/ioctls.h
-@@ -52,6 +52,7 @@
- #define TCSETSF2      _IOW('T',0x2D, struct termios2)
- #define TIOCGPTN      _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
- #define TIOCSPTLCK    _IOW('T',0x31, int)  /* Lock/unlock Pty */
-+#define TIOCGDEV      _IOR('T',0x32, unsigned int) /* Get real dev no below /dev/console */
- #define TIOCSIG               _IOW('T',0x36, int)  /* Generate signal on Pty slave */
- 
- #define FIONCLEX      0x5450  /* these numbers need to be adjusted. */
---- a/linux/arch/powerpc/include/asm/ioctls.h
-+++ b/linux/arch/powerpc/include/asm/ioctls.h
-@@ -94,6 +94,7 @@
- #define TIOCSRS485    0x542f
- #define TIOCGPTN      _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
- #define TIOCSPTLCK    _IOW('T',0x31, int)  /* Lock/unlock Pty */
-+#define TIOCGDEV      _IOR('T',0x32, unsigned int) /* Get real dev no below /dev/console */
- #define TIOCSIG               _IOW('T',0x36, int)  /* Generate signal on Pty slave */
- 
- #define TIOCSERCONFIG 0x5453
---- a/linux/arch/sparc/include/asm/ioctls.h    2007-07-08 19:32:17.000000000 -0400
-+++ b/linux/arch/sparc/include/asm/ioctls.h    2007-08-27 14:01:21.000000000 -0400
-@@ -15,6 +15,7 @@
- #define TCSETS2               _IOW('T', 13, struct termios2)
- #define TCSETSW2      _IOW('T', 14, struct termios2)
- #define TCSETSF2      _IOW('T', 15, struct termios2)
-+#define TIOCGDEV      _IOR('T',0x32, unsigned int) /* Get real dev no below /dev/console */
- 
- /* Note that all the ioctls that are not available in Linux have a 
-  * double underscore on the front to: a) avoid some programs to
---- a/linux/include/asm-generic/ioctls.h
-+++ b/linux/include/asm-generic/ioctls.h
-@@ -65,6 +65,7 @@
- #define TIOCSRS485    0x542F
- #define TIOCGPTN      _IOR('T', 0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
- #define TIOCSPTLCK    _IOW('T', 0x31, int)  /* Lock/unlock Pty */
-+#define TIOCGDEV      _IOR('T', 0x32, unsigned int) /* Get real dev no below /dev/console */
- #define TCGETX                0x5432 /* SYS5 TCGETX compatibility */
- #define TCSETX                0x5433
- #define TCSETXF               0x5434

diff --git a/linux-libc-headers-cap-syslog.patch b/linux-libc-headers-cap-syslog.patch
deleted file mode 100644 (file)
index 01cb027..0000000
--- a/linux-libc-headers-cap-syslog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- linux-2.6.37/include/linux/capability.h~   2011-01-19 19:04:06.771638932 +0100
-+++ linux-2.6.37/include/linux/capability.h    2011-01-19 19:04:27.401829354 +0100
-@@ -352,6 +352,8 @@
- 
- #define CAP_MAC_ADMIN        33
- 
-+#define CAP_SYSLOG           34
-+
--#define CAP_LAST_CAP         CAP_MAC_ADMIN
-+#define CAP_LAST_CAP         CAP_SYSLOG
- 
- #define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)

diff --git a/linux-libc-headers.spec b/linux-libc-headers.spec
index 320f7ef0006af63215d020fc70cc8e519196206e..50a551aaa583791a633db7b737569268f0047713 100644 (file)
--- a/linux-libc-headers.spec
+++ b/linux-libc-headers.spec
@@ -1,31 +1,27 @@
-%define        basever 2.6.37
+%define        basever 2.6.38
 %define        postver %{nil}
 Summary:       Linux kernel headers for use with C libraries
 Summary(pl.UTF-8):     Nagłówki jądra Linuksa do użytku z bibliotekami C
 Name:          linux-libc-headers
 Version:       %{basever}%{postver}
-Release:       3
+Release:       1
 Epoch:         7
 License:       GPL v2
 Group:         Development
 Source0:       http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{basever}.tar.bz2
-# Source0-md5: c8ee37b4fdccdb651e0603d35350b434
+# Source0-md5: 7d471477bfa67546f902da62227fa976
 %if "%{postver}" != "%{nil}"
 Source1:       http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
 # Source1-md5: 738f762746488345b1a8707d00895eef
 %endif
-# DROP for now? iptables accesses kernel headers/sources directly
-#PatchX: %{name}-netfilter.patch
 Patch0:                %{name}-esfq.patch
 Patch1:                %{name}-wrr.patch
 Patch2:                %{name}-fbsplash.patch
 Patch3:                %{name}-imq.patch
 Patch4:                %{name}-endian.patch
 Patch5:                %{name}-pom-set.patch
-Patch6:                linux-kernel-headers.SuSE.TIOCGDEV.patch
-Patch7:                %{name}-atm-vbr.patch
-Patch8:                %{name}-cap-syslog.patch
-Patch9:                vserver.patch
+Patch6:                %{name}-atm-vbr.patch
+Patch7:                vserver.patch
 AutoReqProv:   no
 BuildRequires: perl-base
 BuildRequires: rpmbuild(macros) >= 1.568
@@ -68,10 +64,8 @@ bzip2 -dc %{SOURCE1} | patch -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p2
+%patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT