forked from pool/linux-glibc-devel
Accepting request 146216 from security:netfilter
- Update to new upstream release 3.7.1 (required for xtables-addons that is currently failing in factory) OBS-URL: https://build.opensuse.org/request/show/146216 OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=61
This commit is contained in:
parent
f58786cea3
commit
d74587338a
@ -1,10 +1,10 @@
|
||||
#!/bin/bash
|
||||
# bash -x $0 linux-1.2.3.tar.bz2
|
||||
# bash -x $0 linux-1.2.3.tar.xz
|
||||
set -e
|
||||
kernel=$1
|
||||
if ! test -f "$1"
|
||||
then
|
||||
echo "Usage: ${0##*/} linux-1.2.3.tar.gz"
|
||||
echo "Usage: ${0##*/} linux-1.2.3.tar.xz"
|
||||
exit 1
|
||||
fi
|
||||
if echo $PWD | grep -q :; then
|
||||
@ -80,6 +80,6 @@ do
|
||||
done
|
||||
popd
|
||||
du -sh "$header_dir/usr"
|
||||
tar -cjf "$header_dir.tar.bz2" "${header_dir##*/}"
|
||||
tar -cJf "$header_dir.tar.xz" "${header_dir##*/}"
|
||||
rm -rf $header_dir linux-${kernel_dir}
|
||||
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c58a07f6f2d54dcb9afa6138a4f779f15ec3d61095c2f36841480f71d3078cfd
|
||||
size 856452
|
3
linux-glibc-devel-3.7.1.tar.xz
Normal file
3
linux-glibc-devel-3.7.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bf8cbdc583de7a5be87c789123137dcaa2f3948e78a18b44966c09654c62286a
|
||||
size 788476
|
@ -6,22 +6,19 @@ python
|
||||
strace
|
||||
syslogd
|
||||
|
||||
Index: usr/include/asm-arm/socket.h
|
||||
---
|
||||
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(-)
|
||||
|
||||
Index: linux-glibc-devel-3.7.1/usr/include/asm-generic/socket.h
|
||||
===================================================================
|
||||
--- usr/include/asm-arm/socket.h.orig
|
||||
+++ usr/include/asm-arm/socket.h
|
||||
@@ -21,7 +21,6 @@
|
||||
#define SO_NO_CHECK 11
|
||||
#define SO_PRIORITY 12
|
||||
#define SO_LINGER 13
|
||||
-#define SO_BSDCOMPAT 14
|
||||
/* To add :#define SO_REUSEPORT 15 */
|
||||
#define SO_PASSCRED 16
|
||||
#define SO_PEERCRED 17
|
||||
Index: usr/include/asm-generic/socket.h
|
||||
===================================================================
|
||||
--- usr/include/asm-generic/socket.h.orig
|
||||
+++ usr/include/asm-generic/socket.h
|
||||
--- linux-glibc-devel-3.7.1.orig/usr/include/asm-generic/socket.h
|
||||
+++ linux-glibc-devel-3.7.1/usr/include/asm-generic/socket.h
|
||||
@@ -21,7 +21,6 @@
|
||||
#define SO_NO_CHECK 11
|
||||
#define SO_PRIORITY 12
|
||||
@ -30,10 +27,10 @@ Index: usr/include/asm-generic/socket.h
|
||||
/* To add :#define SO_REUSEPORT 15 */
|
||||
|
||||
#ifndef SO_PASSCRED /* powerpc only differs in these */
|
||||
Index: usr/include/asm-ia64/socket.h
|
||||
Index: linux-glibc-devel-3.7.1/usr/include/asm-ia64/socket.h
|
||||
===================================================================
|
||||
--- usr/include/asm-ia64/socket.h.orig
|
||||
+++ usr/include/asm-ia64/socket.h
|
||||
--- linux-glibc-devel-3.7.1.orig/usr/include/asm-ia64/socket.h
|
||||
+++ linux-glibc-devel-3.7.1/usr/include/asm-ia64/socket.h
|
||||
@@ -30,7 +30,6 @@
|
||||
#define SO_NO_CHECK 11
|
||||
#define SO_PRIORITY 12
|
||||
@ -42,10 +39,10 @@ Index: usr/include/asm-ia64/socket.h
|
||||
/* To add :#define SO_REUSEPORT 15 */
|
||||
#define SO_PASSCRED 16
|
||||
#define SO_PEERCRED 17
|
||||
Index: usr/include/asm-parisc/socket.h
|
||||
Index: linux-glibc-devel-3.7.1/usr/include/asm-parisc/socket.h
|
||||
===================================================================
|
||||
--- usr/include/asm-parisc/socket.h.orig
|
||||
+++ usr/include/asm-parisc/socket.h
|
||||
--- linux-glibc-devel-3.7.1.orig/usr/include/asm-parisc/socket.h
|
||||
+++ linux-glibc-devel-3.7.1/usr/include/asm-parisc/socket.h
|
||||
@@ -30,7 +30,6 @@
|
||||
|
||||
#define SO_NO_CHECK 0x400b
|
||||
@ -54,10 +51,10 @@ Index: usr/include/asm-parisc/socket.h
|
||||
#define SO_PASSCRED 0x4010
|
||||
#define SO_PEERCRED 0x4011
|
||||
#define SO_TIMESTAMP 0x4012
|
||||
Index: usr/include/asm-powerpc/socket.h
|
||||
Index: linux-glibc-devel-3.7.1/usr/include/asm-powerpc/socket.h
|
||||
===================================================================
|
||||
--- usr/include/asm-powerpc/socket.h.orig
|
||||
+++ usr/include/asm-powerpc/socket.h
|
||||
--- linux-glibc-devel-3.7.1.orig/usr/include/asm-powerpc/socket.h
|
||||
+++ linux-glibc-devel-3.7.1/usr/include/asm-powerpc/socket.h
|
||||
@@ -28,7 +28,6 @@
|
||||
#define SO_NO_CHECK 11
|
||||
#define SO_PRIORITY 12
|
||||
@ -66,10 +63,10 @@ Index: usr/include/asm-powerpc/socket.h
|
||||
/* To add :#define SO_REUSEPORT 15 */
|
||||
#define SO_RCVLOWAT 16
|
||||
#define SO_SNDLOWAT 17
|
||||
Index: usr/include/asm-s390/socket.h
|
||||
Index: linux-glibc-devel-3.7.1/usr/include/asm-s390/socket.h
|
||||
===================================================================
|
||||
--- usr/include/asm-s390/socket.h.orig
|
||||
+++ usr/include/asm-s390/socket.h
|
||||
--- linux-glibc-devel-3.7.1.orig/usr/include/asm-s390/socket.h
|
||||
+++ linux-glibc-devel-3.7.1/usr/include/asm-s390/socket.h
|
||||
@@ -27,7 +27,6 @@
|
||||
#define SO_NO_CHECK 11
|
||||
#define SO_PRIORITY 12
|
||||
@ -78,3 +75,15 @@ Index: usr/include/asm-s390/socket.h
|
||||
/* To add :#define SO_REUSEPORT 15 */
|
||||
#define SO_PASSCRED 16
|
||||
#define SO_PEERCRED 17
|
||||
Index: linux-glibc-devel-3.7.1/usr/include/asm-sparc/socket.h
|
||||
===================================================================
|
||||
--- linux-glibc-devel-3.7.1.orig/usr/include/asm-sparc/socket.h
|
||||
+++ linux-glibc-devel-3.7.1/usr/include/asm-sparc/socket.h
|
||||
@@ -16,7 +16,6 @@
|
||||
#define SO_LINGER 0x0080
|
||||
#define SO_OOBINLINE 0x0100
|
||||
/* To add :#define SO_REUSEPORT 0x0200 */
|
||||
-#define SO_BSDCOMPAT 0x0400
|
||||
#define SO_RCVLOWAT 0x0800
|
||||
#define SO_SNDLOWAT 0x1000
|
||||
#define SO_RCVTIMEO 0x2000
|
||||
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 21 03:57:05 UTC 2012 - jengelh@inai.de
|
||||
|
||||
- Update to new upstream release 3.7.1, use xz format
|
||||
- Remove unneeded %clean section
|
||||
- Also remove sparc's SO_BSDCOMPAT in
|
||||
linux-glibc-devel.SuSE.SO_BSDCOMPAT.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 27 08:03:00 UTC 2012 - coolo@suse.com
|
||||
|
||||
|
@ -16,8 +16,6 @@
|
||||
#
|
||||
|
||||
|
||||
BuildRequires: fdupes
|
||||
|
||||
Name: linux-glibc-devel
|
||||
Summary: Linux headers for userspace development
|
||||
License: GPL-2.0
|
||||
@ -25,17 +23,19 @@ 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.6.0
|
||||
Version: 3.7.1
|
||||
Release: 0
|
||||
# A "-" is not allowed in version
|
||||
%define upstream_version 3.6-rc6
|
||||
%define upstream_version 3.7.1
|
||||
Url: http://www.kernel.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: xz
|
||||
Provides: kernel-headers
|
||||
Provides: linux-kernel-headers = %{version}
|
||||
Obsoletes: linux-kernel-headers < %{version}
|
||||
PreReq: coreutils
|
||||
Source: %{name}-%{upstream_version}.tar.bz2
|
||||
Source: %{name}-%{upstream_version}.tar.xz
|
||||
Source1: install_all.sh
|
||||
Patch1: linux-glibc-devel.SuSE.SO_BSDCOMPAT.patch
|
||||
|
||||
@ -50,7 +50,7 @@ packages, instead.
|
||||
|
||||
%prep
|
||||
%setup -q -n linux-glibc-devel-%{upstream_version}
|
||||
%patch1
|
||||
%patch -P 1 -p1
|
||||
|
||||
%build
|
||||
cat > version.h <<-BOGUS
|
||||
@ -172,9 +172,6 @@ esac
|
||||
ln -sfn asm-$asm_link usr/include/asm
|
||||
exit 0
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{_prefix}/include/*
|
||||
|
Loading…
Reference in New Issue
Block a user