jengelh/iproute2
SHA256
1
0
Fork 0
forked from pool/iproute2
Code Pull Requests Activity

iproute2-4.1.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=102
This commit is contained in:
Jan Engelhardt 2015-06-29 08:08:41 +00:00 committed by Git OBS Bridge
parent 57329cd688
commit 1697f72b16
10 changed files with 85 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
iproute2-4.0.0.tar.sign
View File

Binary file not shown.

3
iproute2-4.0.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5cd06eb1050b858b308b65705725042bb566fd261135e35a73dafb48cd632618
size 459364

BIN
iproute2-4.1.0.tar.sign Normal file
View File

Binary file not shown.

3
iproute2-4.1.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d1326696c6a8f81ba66aaf48d858005cf280c81d3284d8d2c99748e3d0746146
size 495312

43
iproute2-dirs.diff
View File

@ -5,20 +5,19 @@
tc/q_netem.c | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
Index: iproute2-4.0.0/Makefile
Index: iproute2-4.1.0/Makefile
===================================================================
--- iproute2-4.0.0.orig/Makefile
+++ iproute2-4.0.0/Makefile
@@ -1,7 +1,7 @@
ROOTDIR=$(DESTDIR)
PREFIX=/usr
LIBDIR=$(PREFIX)/lib
-SBINDIR=/sbin
+SBINDIR=/usr/sbin
CONFDIR=/etc/iproute2
DATADIR=$(PREFIX)/share
DOCDIR=$(DATADIR)/doc/iproute2
@@ -13,7 +13,7 @@ DBM_INCLUDE:=$(ROOTDIR)/usr/include
--- iproute2-4.1.0.orig/Makefile
+++ iproute2-4.1.0/Makefile
@@ -1,6 +1,6 @@
PREFIX?=/usr
LIBDIR?=$(PREFIX)/lib
-SBINDIR?=/sbin
+SBINDIR?=/usr/sbin
CONFDIR?=/etc/iproute2
DATADIR?=$(PREFIX)/share
DOCDIR?=$(DATADIR)/doc/iproute2
@@ -13,7 +13,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include
SHARED_LIBS = y
@ -27,10 +26,10 @@ Index: iproute2-4.0.0/Makefile
ifneq ($(SHARED_LIBS),y)
DEFINES+= -DNO_SHARED_LIBS
endif
Index: iproute2-4.0.0/include/iptables.h
Index: iproute2-4.1.0/include/iptables.h
===================================================================
--- iproute2-4.0.0.orig/include/iptables.h
+++ iproute2-4.0.0/include/iptables.h
--- iproute2-4.1.0.orig/include/iptables.h
+++ iproute2-4.1.0/include/iptables.h
@@ -5,7 +5,7 @@
#include "libiptc/libiptc.h"
@ -40,10 +39,10 @@ Index: iproute2-4.0.0/include/iptables.h
#endif
#ifndef IPPROTO_SCTP
Index: iproute2-4.0.0/netem/Makefile
Index: iproute2-4.1.0/netem/Makefile
===================================================================
--- iproute2-4.0.0.orig/netem/Makefile
+++ iproute2-4.0.0/netem/Makefile
--- iproute2-4.1.0.orig/netem/Makefile
+++ iproute2-4.1.0/netem/Makefile
@@ -5,6 +5,8 @@ HOSTCC ?= $(CC)
CCOPTS = $(CBUILD_CFLAGS)
LDLIBS += -lm
@ -65,10 +64,10 @@ Index: iproute2-4.0.0/netem/Makefile
done
clean:
Index: iproute2-4.0.0/tc/q_netem.c
Index: iproute2-4.1.0/tc/q_netem.c
===================================================================
--- iproute2-4.0.0.orig/tc/q_netem.c
+++ iproute2-4.0.0/tc/q_netem.c
--- iproute2-4.1.0.orig/tc/q_netem.c
+++ iproute2-4.1.0/tc/q_netem.c
@@ -113,7 +113,7 @@ static int get_distribution(const char *
char *line = NULL;
char name[128];

11
iproute2-doc.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Jun 28 23:01:23 UTC 2015 - jengelh@inai.de
- Update to new upstream release 4.1
* ip: support RFC4191 router preference
* xfrm: add command for configuring SPD hash table
* tipc: add new TIPC configuration tool
* BPF support in tc
* Lots of RED (tc scheduler) cleanup work
* color option to ip command
-------------------------------------------------------------------
Tue Jun 16 08:46:47 UTC 2015 - jengelh@inai.de

4
iproute2-doc.spec
View File

@ -17,9 +17,9 @@
Name: iproute2-doc
Version: 4.0
Version: 4.1
Release: 0
%define rversion 4.0.0
%define rversion 4.1.0
Summary: Documentation to iproute2
License: GPL-2.0+
Group: Documentation/Other

31
iproute2-pkgconfig.diff Normal file
View File

@ -0,0 +1,31 @@
From 2417e995230c16d63fe62f904d5e5db832c37459 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 29 Jun 2015 09:58:11 +0200
Subject: [PATCH] build: must honor pkg-config flags for libmnl
The build otherwise fails if libmnl does not directly live in a
standard search path.
---
tipc/Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tipc/Makefile b/tipc/Makefile
index 4bda8c5..d4637f8 100644
--- a/tipc/Makefile
+++ b/tipc/Makefile
@@ -5,8 +5,11 @@ TIPCOBJ=bearer.o \
node.o socket.o \
tipc.o
+include ../Config
+
TARGETS=tipc
-LDLIBS += -lmnl
+CFLAGS += $(shell $(PKG_CONFIG) libmnl --cflags)
+LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
all: $(TARGETS) $(LIBS)
--
2.4.3

11
iproute2.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Jun 28 23:01:23 UTC 2015 - jengelh@inai.de
- Update to new upstream release 4.1
* ip: support RFC4191 router preference
* xfrm: add command for configuring SPD hash table
* tipc: add new TIPC configuration tool
* BPF support in tc
* Lots of RED (tc scheduler) cleanup work
* color option to ip command
-------------------------------------------------------------------
Tue Jun 16 08:46:47 UTC 2015 - jengelh@inai.de

14
iproute2.spec
View File

@ -17,9 +17,9 @@
Name: iproute2
Version: 4.0
Version: 4.1
Release: 0
%define rversion 4.0.0
%define rversion 4.1.0
Summary: Linux network configuration utilities
License: GPL-2.0
Group: Productivity/Networking/Routing
@ -37,6 +37,7 @@ Patch2: iproute2-HZ.diff
Patch3: revert-pdf-creation.diff
Patch4: revert-bison-fix.diff
Patch5: kernel_xfrm6_raw.patch
Patch6: iproute2-pkgconfig.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison
BuildRequires: db-devel
@ -45,13 +46,9 @@ BuildRequires: pkgconfig >= 0.21
BuildRequires: xz
%define with_xt 1
%if 0%{?with_xt}
%if 0%{?suse_version} >= 1140
BuildRequires: pkgconfig(libmnl)
BuildRequires: pkgconfig(libselinux)
BuildRequires: pkgconfig(xtables) >= 1.4.11
%else
BuildRequires: libselinux-devel
BuildRequires: libxtables-devel >= 1.4.11
%endif
%endif
Provides: iproute = %version-%release
Provides: %name(xfrm6_raw) = %version-%release
@ -71,6 +68,7 @@ Provides: libnetlink = %version-%release
%description -n libnetlink-devel
libnetlink provides a higher-level interface to rtnetlink(7).
New programs should use libmnl-devel instead.
%prep
%setup -qn %name-%rversion
@ -81,7 +79,7 @@ libnetlink provides a higher-level interface to rtnetlink(7).
%if 0%{?sles_version} == 11
%patch -P 4 -p1
%endif
%patch -P 5 -p1
%patch -P 5 -P 6 -p1
find . -name *.orig -delete
%build