pool/iproute2
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 312250 from security:netfilter

Browse Source 
- Update iproute2-dirs.diff to respect /usr/share/tc [bnc#934828]

- Update iproute2-dirs.diff to respect /usr/share/tc [bnc#934828]

OBS-URL: https://build.opensuse.org/request/show/312250
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=77
This commit is contained in:
Dominique Leuenberger 2015-06-24 18:30:17 +00:00 committed by Git OBS Bridge
commit 8f2619aa87
3 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
iproute2-dirs.diff
View File

@ -2,12 +2,13 @@
Makefile | 4 ++--
include/iptables.h | 2 +-
netem/Makefile | 6 ++++--
3 files changed, 7 insertions(+), 5 deletions(-)
tc/q_netem.c | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
Index: iproute2-3.15.0/Makefile
Index: iproute2-4.0.0/Makefile
===================================================================
--- iproute2-3.15.0.orig/Makefile
+++ iproute2-3.15.0/Makefile
--- iproute2-4.0.0.orig/Makefile
+++ iproute2-4.0.0/Makefile
@@ -1,7 +1,7 @@
ROOTDIR=$(DESTDIR)
PREFIX=/usr
@ -17,19 +18,19 @@ Index: iproute2-3.15.0/Makefile
CONFDIR=/etc/iproute2
DATADIR=$(PREFIX)/share
DOCDIR=$(DATADIR)/doc/iproute2
@@ -33,7 +33,7 @@ CCOPTS = -O2
WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes
WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2
@@ -13,7 +13,7 @@ DBM_INCLUDE:=$(ROOTDIR)/usr/include
-CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
+CFLAGS = -DLIBDIR=\"${LIBDIR}\" $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
YACCFLAGS = -d -t -v
SHARED_LIBS = y
SUBDIRS=lib ip tc bridge misc netem genl man
Index: iproute2-3.15.0/include/iptables.h
-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
+DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DPKGDATADIR=\"$(DATADIR)/tc\"
ifneq ($(SHARED_LIBS),y)
DEFINES+= -DNO_SHARED_LIBS
endif
Index: iproute2-4.0.0/include/iptables.h
===================================================================
--- iproute2-3.15.0.orig/include/iptables.h
+++ iproute2-3.15.0/include/iptables.h
--- iproute2-4.0.0.orig/include/iptables.h
+++ iproute2-4.0.0/include/iptables.h
@@ -5,7 +5,7 @@
#include "libiptc/libiptc.h"
@ -39,10 +40,10 @@ Index: iproute2-3.15.0/include/iptables.h
#endif
#ifndef IPPROTO_SCTP
Index: iproute2-3.15.0/netem/Makefile
Index: iproute2-4.0.0/netem/Makefile
===================================================================
--- iproute2-3.15.0.orig/netem/Makefile
+++ iproute2-3.15.0/netem/Makefile
--- iproute2-4.0.0.orig/netem/Makefile
+++ iproute2-4.0.0/netem/Makefile
@@ -5,6 +5,8 @@ HOSTCC ?= $(CC)
CCOPTS = $(CBUILD_CFLAGS)
LDLIBS += -lm
@ -64,3 +65,16 @@ Index: iproute2-3.15.0/netem/Makefile
done
clean:
Index: iproute2-4.0.0/tc/q_netem.c
===================================================================
--- iproute2-4.0.0.orig/tc/q_netem.c
+++ iproute2-4.0.0/tc/q_netem.c
@@ -113,7 +113,7 @@ static int get_distribution(const char *
char *line = NULL;
char name[128];
- snprintf(name, sizeof(name), "%s/%s.dist", get_tc_lib(), type);
+ snprintf(name, sizeof(name), "%s/%s.dist", PKGDATADIR, type);
if ((f = fopen(name, "r")) == NULL) {
fprintf(stderr, "No distribution data for %s (%s: %s)\n",
type, name, strerror(errno));

5
iproute2-doc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jun 16 08:46:47 UTC 2015 - jengelh@inai.de
- Update iproute2-dirs.diff to respect /usr/share/tc [bnc#934828]
-------------------------------------------------------------------
Mon Apr 13 19:29:50 UTC 2015 - jengelh@inai.de

5
iproute2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jun 16 08:46:47 UTC 2015 - jengelh@inai.de
- Update iproute2-dirs.diff to respect /usr/share/tc [bnc#934828]
-------------------------------------------------------------------
Mon Apr 13 19:29:50 UTC 2015 - jengelh@inai.de