Jan Engelhardt
1697f72b16
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=102
80 lines
2.3 KiB
Diff
80 lines
2.3 KiB
Diff
---
|
|
Makefile | 4 ++--
|
|
include/iptables.h | 2 +-
|
|
netem/Makefile | 6 ++++--
|
|
tc/q_netem.c | 2 +-
|
|
4 files changed, 8 insertions(+), 6 deletions(-)
|
|
|
|
Index: iproute2-4.1.0/Makefile
|
|
===================================================================
|
|
--- 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
|
|
|
|
-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.1.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"
|
|
|
|
#ifndef IPT_LIB_DIR
|
|
-#define IPT_LIB_DIR "/usr/local/lib/iptables"
|
|
+#define IPT_LIB_DIR LIBDIR
|
|
#endif
|
|
|
|
#ifndef IPPROTO_SCTP
|
|
Index: iproute2-4.1.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
|
|
|
|
+LIBDIR = /usr/lib
|
|
+
|
|
all: $(DISTGEN) $(DISTDATA)
|
|
|
|
$(DISTGEN):
|
|
@@ -20,9 +22,9 @@ stats: stats.c
|
|
$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
|
|
|
|
install: all
|
|
- mkdir -p $(DESTDIR)$(LIBDIR)/tc
|
|
+ mkdir -p $(DESTDIR)/usr/share/tc
|
|
for i in $(DISTDATA); \
|
|
- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
|
|
+ do install -m 644 $$i $(DESTDIR)/usr/share/tc; \
|
|
done
|
|
|
|
clean:
|
|
Index: iproute2-4.1.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];
|
|
|
|
- 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));
|