From 1697f72b16a9a205c080f1bb1e3f57af84067d1a8f4f7d3512b153d2a77bc7cc Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 29 Jun 2015 08:08:41 +0000 Subject: [PATCH] iproute2-4.1.0 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=102 --- iproute2-4.0.0.tar.sign | Bin 543 -> 0 bytes iproute2-4.0.0.tar.xz | 3 --- iproute2-4.1.0.tar.sign | Bin 0 -> 543 bytes iproute2-4.1.0.tar.xz | 3 +++ iproute2-dirs.diff | 43 ++++++++++++++++++++-------------------- iproute2-doc.changes | 11 ++++++++++ iproute2-doc.spec | 4 ++-- iproute2-pkgconfig.diff | 31 +++++++++++++++++++++++++++++ iproute2.changes | 11 ++++++++++ iproute2.spec | 14 ++++++------- 10 files changed, 85 insertions(+), 35 deletions(-) delete mode 100644 iproute2-4.0.0.tar.sign delete mode 100644 iproute2-4.0.0.tar.xz create mode 100644 iproute2-4.1.0.tar.sign create mode 100644 iproute2-4.1.0.tar.xz create mode 100644 iproute2-pkgconfig.diff diff --git a/iproute2-4.0.0.tar.sign b/iproute2-4.0.0.tar.sign deleted file mode 100644 index cc180539d23478e18ebbb6dde025e0a7ea6b7136c462ed718c76f3fd75ab0d37..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0SEvF1p-wo=HCDc2@rs%e_)l(p5C3O{uhWGo2hmgM%=KN# z?WW0SM2!}!J_eq}A$IHwQ370#cP8=3d%3>1xs*0;B}X>L>=;bV7BFbu&^1LEM2}1x zbEm!#6E-meg^-)|ViP=`yJjNzFJB_S?e*X%q`#zF=B-$bp4?YST>#MsZ{tA>lppO^h7D zNCM@QsEOq!z55*cd~Os`p^qIKIfJv4%C+}|aa&_B{YJb6#I|)lyg#EBM~rl9y28oCxY&eWr znPfZ6Tur~(#BxwP|5pRNlI?std53|n<$%MT`MD1&T_)v-nP;a=b{$3)+xP1~weYoP h_WBycmB5pPc8d!|EJ@C@G_*KULON@lcEZ+328wb~|3&}+ diff --git a/iproute2-4.0.0.tar.xz b/iproute2-4.0.0.tar.xz deleted file mode 100644 index 331ddf4..0000000 --- a/iproute2-4.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cd06eb1050b858b308b65705725042bb566fd261135e35a73dafb48cd632618 -size 459364 diff --git a/iproute2-4.1.0.tar.sign b/iproute2-4.1.0.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..809958ee2090b1ce6222ce2310cf7778e103dd23a6889d2ae2590a83523cbee8 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0SEvF1p-x#r`Z4s2@rs%e_)l({2%?=DN5q~yh>k+ zBedPPqhbKxk?y|xnQu9l9>K$bh=fesL5SG33Wd8W6@Ew+9fkC^_J%u#3W3*{FkSqO zjYFRqF1kQ>rdDvObkTm+Y|gg8I(FhU^TYRAkyzi{gv8n5Pb5o1T!Y>56p|YXm_I(S z((1nDJJJTR6b*ug>b{o97t%JIbX8S7bcK9zT-1*UXS-l#V=vD<`C7>-gM4xVHd|Wn z54KK)+$%_)m`*_LaeBKEiZT>Mbsd;q{DF36U__JCr|f@!Z*~a|(-)@xsiiHEjAwFr z-3q&BGNax*9K&^H_Z`~z(o}$jK!Q5=TD#G;`ixk)DY +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 + diff --git a/iproute2.changes b/iproute2.changes index fa0f1fb..f661000 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -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 diff --git a/iproute2.spec b/iproute2.spec index eee6f06..ea448a9 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -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