From afc940b562f6924eacde457dd00c1643b1b825bc Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 19 Jun 2012 11:47:25 +0200 Subject: [PATCH] iproute2: update to 3.4.0. --- srcpkgs/iproute2/patches/iproute2-fhs.patch | 97 ++++++++++----------- srcpkgs/iproute2/template | 20 ++--- 2 files changed, 50 insertions(+), 67 deletions(-) diff --git a/srcpkgs/iproute2/patches/iproute2-fhs.patch b/srcpkgs/iproute2/patches/iproute2-fhs.patch index 2608414db2a..92ef7f6acc0 100644 --- a/srcpkgs/iproute2/patches/iproute2-fhs.patch +++ b/srcpkgs/iproute2/patches/iproute2-fhs.patch @@ -1,48 +1,19 @@ -diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile ---- iproute2.old/Makefile 2009-11-11 22:05:21.251407668 +0100 -+++ iproute2-2.6.29/Makefile 2009-11-11 22:07:09.891833516 +0100 -@@ -1,11 +1,12 @@ - DESTDIR=/usr/ +diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile +--- iproute2-3.4.0/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/Makefile 2012-06-18 10:23:53.896760158 +0200 +@@ -1,7 +1,8 @@ ROOTDIR=$(DESTDIR) - LIBDIR=/usr/lib/ + PREFIX=/usr + LIBDIR=$(PREFIX)/lib -SBINDIR=/sbin +SBINDIR=/usr/sbin - CONFDIR=/etc/iproute2 --DOCDIR=/share/doc/iproute2 --MANDIR=/share/man -+DOCDIR=/usr/share/doc/iproute2 -+MANDIR=/usr/share/man - ARPDDIR=/var/lib/arpd +SHAREDIR=/usr/share - - # Path to db_185.h include - DBM_INCLUDE:=$(ROOTDIR)/usr/include -diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c ---- iproute2.old/tc/tc_util.c 2009-11-11 22:05:21.298076943 +0100 -+++ iproute2-2.6.29/tc/tc_util.c 2009-11-11 22:09:32.865152646 +0100 -@@ -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; - } -diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile ---- iproute2.old/netem/Makefile 2010-08-06 11:30:48.640940183 +0200 -+++ iproute2-2.6.35/netem/Makefile 2010-08-06 11:32:34.210908892 +0200 + CONFDIR=/etc/iproute2 + DATADIR=$(PREFIX)/share + DOCDIR=$(DATADIR)/doc/iproute2 +diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile +--- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +0200 @@ -20,9 +20,9 @@ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm @@ -55,18 +26,20 @@ diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile done clean: -diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile ---- iproute2.old/tc/Makefile 2010-08-06 11:48:35.607472252 +0200 -+++ iproute2-2.6.35/tc/Makefile 2010-08-06 11:49:36.977473380 +0200 -@@ -99,18 +99,11 @@ +diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile +--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200 +@@ -105,18 +105,11 @@ $(AR) rcs $@ $(TCLIB) install: all - mkdir -p $(MODDESTDIR) -- install -m 0755 tc $(DESTDIR)$(SBINDIR) -- for i in $(TCSO); \ ++ mkdir -p $(DESTDIR)$(LIBDIR)/tc + install -m 0755 tc $(DESTDIR)$(SBINDIR) + for i in $(TCSO); \ - do install -m 755 $$i $(MODDESTDIR); \ -- done ++ 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 ; \ @@ -74,11 +47,29 @@ diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile - then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \ - fi; \ - fi -+ mkdir -p $(DESTDIR)$(LIBDIR)/tc -+ install -m 0755 tc $(DESTDIR)$(SBINDIR) -+ for i in $(TCSO); \ -+ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ -+ done clean: rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \ +diff -Naur iproute2-3.4.0/tc/tc_util.c iproute2-3.4.0.new/tc/tc_util.c +--- iproute2-3.4.0/tc/tc_util.c 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/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; + } diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template index 9aea00f6f32..d9e9e935f1c 100644 --- a/srcpkgs/iproute2/template +++ b/srcpkgs/iproute2/template @@ -1,15 +1,16 @@ # Template file for 'iproute2' pkgname=iproute2 -version=3.3.0 +version=3.4.0 patch_args="-Np1" -distfiles="${KERNEL_SITE}/utils/net/$pkgname/$pkgname-$version.tar.xz" -makedepends="pkg-config perl>=0 db-devel bison flex libnl-devel iptables-devel" revision=1 +build_style=configure +makedepends="pkg-config perl>=0 db-devel bison flex libnl-devel iptables-devel" short_desc="IP Routing Utilities" maintainer="Juan RP " homepage="http://www.linux-foundation.org/en/Net:Iproute2" license="GPL-2" -checksum=e16d9ec1bd0bb2a3bb8be5ba0f0d9c53d39c0515a3ad58a58a89efe1748fb2a6 +distfiles="${KERNEL_SITE}/utils/net/$pkgname/$pkgname-$version.tar.xz" +checksum=38e846e412b2fa235a447b50c20ad1e9770d1b3ed4d3ab18ca0b18c6e8b79ba4 long_desc=" Iproute2 is a collection of utilities for controlling TCP/IP networking and traffic control in Linux." @@ -22,16 +23,7 @@ conf_files=" /etc/iproute2/rt_scopes /etc/iproute2/rt_tables" - -do_build() { - sed -i -e "s|\/usr\/local\/lib|\/usr\/libexec|g" configure - ./configure ${CONFIGURE_SHARED_ARGS} - make ${makejobs} -} - -do_install() { - make DESTDIR=${DESTDIR} install - +post_install() { # Remove tex and sgml files. rm -f ${DESTDIR}/usr/share/doc/iproute2/*.{tex,sgml} # Remove devel manpages.