From fff5063f9d66324fad59b6bd6f972474654ea0efd9cd9449e9a83f1b2f4f1f40 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 4 Mar 2014 21:30:27 +0000 Subject: [PATCH] Accepting request 224646 from home:michal-m:branches:Base:System - Update to kernel headers 3.13. - Drop the never-upstreamed SO_BSDCOMPAT patch. The kernel does issue a warning when a process uses this socked option. OBS-URL: https://build.opensuse.org/request/show/224646 OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=74 --- linux-glibc-devel-3.11-rc6.tar.xz | 3 - linux-glibc-devel-3.13.tar.xz | 3 + linux-glibc-devel.SuSE.SO_BSDCOMPAT.patch | 77 ----------------------- linux-glibc-devel.changes | 7 +++ linux-glibc-devel.spec | 8 +-- 5 files changed, 13 insertions(+), 85 deletions(-) delete mode 100644 linux-glibc-devel-3.11-rc6.tar.xz create mode 100644 linux-glibc-devel-3.13.tar.xz delete mode 100644 linux-glibc-devel.SuSE.SO_BSDCOMPAT.patch diff --git a/linux-glibc-devel-3.11-rc6.tar.xz b/linux-glibc-devel-3.11-rc6.tar.xz deleted file mode 100644 index 56ecc32..0000000 --- a/linux-glibc-devel-3.11-rc6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ef48fd14f7d1f637a7f75b7fe87a655e7d1074051245fbe9713122a5c96d0bb -size 831428 diff --git a/linux-glibc-devel-3.13.tar.xz b/linux-glibc-devel-3.13.tar.xz new file mode 100644 index 0000000..31b4fc2 --- /dev/null +++ b/linux-glibc-devel-3.13.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fb43f1744af3cfde29f1cec80e2ee26519efd242f08d5f4dd7df792ac07b6ac +size 829908 diff --git a/linux-glibc-devel.SuSE.SO_BSDCOMPAT.patch b/linux-glibc-devel.SuSE.SO_BSDCOMPAT.patch deleted file mode 100644 index 44eca5e..0000000 --- a/linux-glibc-devel.SuSE.SO_BSDCOMPAT.patch +++ /dev/null @@ -1,77 +0,0 @@ -these packages use the obsolete SO_BSDCOMPAT: -bind -dietlibc (#define only) -pidgin -python -strace -syslogd - ---- - usr/include/asm-generic/socket.h | 1 - - usr/include/asm-ia64/socket.h | 1 - - usr/include/asm-parisc/socket.h | 1 - - usr/include/asm-powerpc/socket.h | 1 - - usr/include/asm-s390/socket.h | 1 - - usr/include/asm-sparc/socket.h | 1 - - 6 files changed, 6 deletions(-) - ---- linux-glibc-devel-3.9-rc4.orig/usr/include/asm-generic/socket.h -+++ linux-glibc-devel-3.9-rc4/usr/include/asm-generic/socket.h -@@ -21,7 +21,6 @@ - #define SO_NO_CHECK 11 - #define SO_PRIORITY 12 - #define SO_LINGER 13 --#define SO_BSDCOMPAT 14 - #define SO_REUSEPORT 15 - #ifndef SO_PASSCRED /* powerpc only differs in these */ - #define SO_PASSCRED 16 ---- linux-glibc-devel-3.9-rc4.orig/usr/include/asm-ia64/socket.h -+++ linux-glibc-devel-3.9-rc4/usr/include/asm-ia64/socket.h -@@ -30,7 +30,6 @@ - #define SO_NO_CHECK 11 - #define SO_PRIORITY 12 - #define SO_LINGER 13 --#define SO_BSDCOMPAT 14 - #define SO_REUSEPORT 15 - #define SO_PASSCRED 16 - #define SO_PEERCRED 17 ---- linux-glibc-devel-3.9-rc4.orig/usr/include/asm-parisc/socket.h -+++ linux-glibc-devel-3.9-rc4/usr/include/asm-parisc/socket.h -@@ -30,7 +30,6 @@ - - #define SO_NO_CHECK 0x400b - #define SO_PRIORITY 0x400c --#define SO_BSDCOMPAT 0x400e - #define SO_PASSCRED 0x4010 - #define SO_PEERCRED 0x4011 - #define SO_TIMESTAMP 0x4012 ---- linux-glibc-devel-3.9-rc4.orig/usr/include/asm-powerpc/socket.h -+++ linux-glibc-devel-3.9-rc4/usr/include/asm-powerpc/socket.h -@@ -28,7 +28,6 @@ - #define SO_NO_CHECK 11 - #define SO_PRIORITY 12 - #define SO_LINGER 13 --#define SO_BSDCOMPAT 14 - #define SO_REUSEPORT 15 - #define SO_RCVLOWAT 16 - #define SO_SNDLOWAT 17 ---- linux-glibc-devel-3.9-rc4.orig/usr/include/asm-s390/socket.h -+++ linux-glibc-devel-3.9-rc4/usr/include/asm-s390/socket.h -@@ -27,7 +27,6 @@ - #define SO_NO_CHECK 11 - #define SO_PRIORITY 12 - #define SO_LINGER 13 --#define SO_BSDCOMPAT 14 - #define SO_REUSEPORT 15 - #define SO_PASSCRED 16 - #define SO_PEERCRED 17 ---- linux-glibc-devel-3.9-rc4.orig/usr/include/asm-sparc/socket.h -+++ linux-glibc-devel-3.9-rc4/usr/include/asm-sparc/socket.h -@@ -16,7 +16,6 @@ - #define SO_LINGER 0x0080 - #define SO_OOBINLINE 0x0100 - #define SO_REUSEPORT 0x0200 --#define SO_BSDCOMPAT 0x0400 - #define SO_RCVLOWAT 0x0800 - #define SO_SNDLOWAT 0x1000 - #define SO_RCVTIMEO 0x2000 diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes index 5f9a712..f4e911a 100644 --- a/linux-glibc-devel.changes +++ b/linux-glibc-devel.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 4 16:14:59 UTC 2014 - mmarek@suse.cz + +- Update to kernel headers 3.13. +- Drop the never-upstreamed SO_BSDCOMPAT patch. The kernel does + issue a warning when a process uses this socked option. + ------------------------------------------------------------------- Wed Oct 9 11:36:05 UTC 2013 - schwab@suse.de diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec index 5fbf92f..2c07365 100644 --- a/linux-glibc-devel.spec +++ b/linux-glibc-devel.spec @@ -1,7 +1,7 @@ # # spec file for package linux-glibc-devel # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,10 +23,10 @@ Group: Development/Libraries/C and C++ BuildArch: noarch # this confusing version number has no meaning, it's the version # of the Linux kernel where these headers come from -Version: 3.11 +Version: 3.13 Release: 0 # A "-" is not allowed in version -%define upstream_version 3.11-rc6 +%define upstream_version 3.13 Url: http://www.kernel.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes @@ -37,7 +37,6 @@ Obsoletes: linux-kernel-headers < %{version} PreReq: coreutils Source: %{name}-%{upstream_version}.tar.xz Source1: install_all.sh -Patch1: linux-glibc-devel.SuSE.SO_BSDCOMPAT.patch %description This package provides Linux kernel headers, the kernel API description @@ -50,7 +49,6 @@ packages, instead. %prep %setup -q -n linux-glibc-devel-%{upstream_version} -%patch -P 1 -p1 %build cat > version.h <<-BOGUS