jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

iproute2: update to 4.1.0.

Browse source
This commit is contained in:
Juan RP 2015-06-28 07:47:12 +02:00
parent b1ff452a92
commit 2639ac00ce
3 changed files with 14 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
srcpkgs/iproute2/patches/iproute2-fhs.patch
View file

@ -1,71 +0,0 @@
--- Makefile 2012-05-21 23:12:19.000000000 +0200
+++ Makefile 2012-06-18 10:23:53.896760158 +0200
@@ -1,7 +1,8 @@
ROOTDIR=$(DESTDIR)
PREFIX=/usr
LIBDIR=$(PREFIX)/lib
-SBINDIR=/sbin
+SBINDIR=/usr/bin
+SHAREDIR=/usr/share
CONFDIR=/etc/iproute2
DATADIR=$(PREFIX)/share
DOCDIR=$(DATADIR)/doc/iproute2
--- netem/Makefile 2012-05-21 23:12:19.000000000 +0200
+++ netem/Makefile 2012-06-18 10:23:53.896760158 +0200
@@ -20,9 +20,9 @@
$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
install: all
- mkdir -p $(DESTDIR)$(LIBDIR)/tc
+ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
for i in $(DISTDATA); \
- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
+ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
done
clean:
--- tc/Makefile 2012-05-21 23:12:19.000000000 +0200
+++ tc/Makefile 2012-06-18 10:23:53.893426840 +0200
@@ -105,18 +105,11 @@
$(AR) rcs $@ $(TCLIB)
install: all
- mkdir -p $(MODDESTDIR)
+ mkdir -p $(DESTDIR)$(LIBDIR)/tc
install -m 0755 tc $(DESTDIR)$(SBINDIR)
for i in $(TCSO); \
- do install -m 755 $$i $(MODDESTDIR); \
+ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
done
- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
- if [ -f $(MODDESTDIR)/m_xt.so ]; \
- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
- fi; \
- fi
clean:
rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \
--- tc/tc_util.c 2012-05-21 23:12:19.000000000 +0200
+++ tc/tc_util.c 2012-06-18 10:23:53.893426840 +0200
@@ -24,8 +24,8 @@
#include "utils.h"
#include "tc_util.h"
-#ifndef LIBDIR
-#define LIBDIR "/usr/lib"
+#ifndef SHAREDIR
+#define SHAREDIR "/usr/share"
#endif
const char *get_tc_lib(void)
@@ -34,7 +34,7 @@
lib_dir = getenv("TC_LIB_DIR");
if (!lib_dir)
- lib_dir = LIBDIR "/tc/";
+ lib_dir = SHAREDIR "/tc/";
return lib_dir;
}

10
srcpkgs/iproute2/patches/musl.patch
View file

@ -20,3 +20,13 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead.
#include <sys/types.h>
#include <asm/types.h>
#include <resolv.h>
--- include/linux/xfrm.h.orig 2015-06-28 07:46:32.607697856 +0200
+++ include/linux/xfrm.h 2015-06-28 07:46:37.263753313 +0200
@@ -1,7 +1,6 @@
#ifndef _LINUX_XFRM_H
#define _LINUX_XFRM_H
-#include <linux/in6.h>
#include <linux/types.h>
/* All of the structures in this file may not change size as they are

8
srcpkgs/iproute2/template
View file

@ -1,10 +1,10 @@
# Template file for 'iproute2'
pkgname=iproute2
version=4.0.0
version=4.1.0
revision=1
build_pie=yes
hostmakedepends="pkg-config perl flex"
makedepends="libfl-devel db-devel iptables-devel"
makedepends="libfl-devel libmnl-devel db-devel iptables-devel"
conf_files="
/etc/iproute2/ematch_map
/etc/iproute2/rt_dsfield
@ -17,7 +17,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.linux-foundation.org/en/Net:Iproute2"
license="GPL-2"
distfiles="${KERNEL_SITE}/utils/net/$pkgname/$pkgname-$version.tar.xz"
checksum=5cd06eb1050b858b308b65705725042bb566fd261135e35a73dafb48cd632618
checksum=d1326696c6a8f81ba66aaf48d858005cf280c81d3284d8d2c99748e3d0746146
do_configure() {
./configure
@ -29,7 +29,7 @@ do_build() {
DBM_INCLUDE="$XBPS_CROSS_BASE/usr/include" ${makejobs}
}
do_install() {
make DESTDIR=${DESTDIR} install
make DESTDIR=${DESTDIR} SBINDIR=/usr/bin install
rm -r ${DESTDIR}/usr/share/doc
rm -r ${DESTDIR}/usr/share/man/man3