[arch-commits] Commit in iproute2/repos (10 files)

Ionut Biru ibiru at archlinux.org
Mon Mar 12 10:49:33 EDT 2012


    Date: Monday, March 12, 2012 @ 10:49:33
  Author: ibiru
Revision: 153250

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  iproute2/repos/testing-i686/
  iproute2/repos/testing-i686/PKGBUILD
    (from rev 153249, iproute2/trunk/PKGBUILD)
  iproute2/repos/testing-i686/fix-ip-l.patch
    (from rev 153249, iproute2/trunk/fix-ip-l.patch)
  iproute2/repos/testing-i686/iproute2-fhs.patch
    (from rev 153249, iproute2/trunk/iproute2-fhs.patch)
  iproute2/repos/testing-i686/remove-libnl-headers.patch
    (from rev 153249, iproute2/trunk/remove-libnl-headers.patch)
  iproute2/repos/testing-x86_64/
  iproute2/repos/testing-x86_64/PKGBUILD
    (from rev 153249, iproute2/trunk/PKGBUILD)
  iproute2/repos/testing-x86_64/fix-ip-l.patch
    (from rev 153249, iproute2/trunk/fix-ip-l.patch)
  iproute2/repos/testing-x86_64/iproute2-fhs.patch
    (from rev 153249, iproute2/trunk/iproute2-fhs.patch)
  iproute2/repos/testing-x86_64/remove-libnl-headers.patch
    (from rev 153249, iproute2/trunk/remove-libnl-headers.patch)

-------------------------------------------+
 testing-i686/PKGBUILD                     |   58 +++++++++++++++++++
 testing-i686/fix-ip-l.patch               |   27 +++++++++
 testing-i686/iproute2-fhs.patch           |   84 ++++++++++++++++++++++++++++
 testing-i686/remove-libnl-headers.patch   |   31 ++++++++++
 testing-x86_64/PKGBUILD                   |   58 +++++++++++++++++++
 testing-x86_64/fix-ip-l.patch             |   27 +++++++++
 testing-x86_64/iproute2-fhs.patch         |   84 ++++++++++++++++++++++++++++
 testing-x86_64/remove-libnl-headers.patch |   31 ++++++++++
 8 files changed, 400 insertions(+)

Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 153249, iproute2/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2012-03-12 14:49:33 UTC (rev 153250)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+
+pkgname=iproute2
+pkgver=3.2.0
+pkgrel=3
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
+depends=('glibc' 'db' 'libnl')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
+	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+	iproute2-fhs.patch
+        fix-ip-l.patch
+        remove-libnl-headers.patch)
+sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
+          '2416b11252364d7a6c742eabb4a6924a75637a46'
+          '2ec5513c44f89046438d65e2cda1a014010e3b73'
+          '1cb89ea0945fd190e6943fa7b1c3a4f254d0c1b3')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  # set correct fhs structure
+  patch -Np1 -i "$srcdir/iproute2-fhs.patch"
+
+  #upstream fixes
+  patch -Np1 -i "$srcdir/fix-ip-l.patch"
+  patch -Np1 -i "$srcdir/remove-libnl-headers.patch"
+
+  ./configure
+
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR="$pkgdir" install
+
+  # allow loopback to be started before /usr is mounted, this may not be supported in the future
+  mkdir -p "$pkgdir/sbin"
+  mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+  ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
+
+  # libnetlink isn't installed, install it FS#19385
+  install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+  install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+}

Copied: iproute2/repos/testing-i686/fix-ip-l.patch (from rev 153249, iproute2/trunk/fix-ip-l.patch)
===================================================================
--- testing-i686/fix-ip-l.patch	                        (rev 0)
+++ testing-i686/fix-ip-l.patch	2012-03-12 14:49:33 UTC (rev 153250)
@@ -0,0 +1,27 @@
+From 5aa08f6bf4107f8aec43c0678466a314dbd0d054 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <shemminger at vyatta.com>
+Date: Fri, 20 Jan 2012 08:16:02 -0800
+Subject: [PATCH] ip: make 'ip l' be 'ip link'
+
+Restore compatiablity for those lazy typists.
+---
+ ip/ip.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/ip/ip.c b/ip/ip.c
+index 7b4bacb..20dc3b5 100644
+--- a/ip/ip.c
++++ b/ip/ip.c
+@@ -72,8 +72,8 @@ static const struct cmd {
+ 	{ "neighbour",	do_ipneigh },
+ 	{ "ntable",	do_ipntable },
+ 	{ "ntbl",	do_ipntable },
+-	{ "l2tp",	do_ipl2tp },
+ 	{ "link",	do_iplink },
++	{ "l2tp",	do_ipl2tp },
+ 	{ "tunnel",	do_iptunnel },
+ 	{ "tunl",	do_iptunnel },
+ 	{ "tuntap",	do_iptuntap },
+-- 
+1.7.6.5
+

Copied: iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 153249, iproute2/trunk/iproute2-fhs.patch)
===================================================================
--- testing-i686/iproute2-fhs.patch	                        (rev 0)
+++ testing-i686/iproute2-fhs.patch	2012-03-12 14:49:33 UTC (rev 153250)
@@ -0,0 +1,84 @@
+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/
+ ROOTDIR=$(DESTDIR)
+ LIBDIR=/usr/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
+@@ -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:
+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 @@
+ 	$(AR) rcs $@ $(TCLIB)
+ 
+ install: all
+-	mkdir -p $(MODDESTDIR)
+-	install -m 0755 tc $(DESTDIR)$(SBINDIR)
+-	for i in $(TCSO); \
+-	do install -m 755 $$i $(MODDESTDIR); \
+-	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
++	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; \

Copied: iproute2/repos/testing-i686/remove-libnl-headers.patch (from rev 153249, iproute2/trunk/remove-libnl-headers.patch)
===================================================================
--- testing-i686/remove-libnl-headers.patch	                        (rev 0)
+++ testing-i686/remove-libnl-headers.patch	2012-03-12 14:49:33 UTC (rev 153250)
@@ -0,0 +1,31 @@
+From 13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <shemminger at vyatta.com>
+Date: Tue, 10 Jan 2012 08:50:49 -0800
+Subject: [PATCH] iplt2p: remove unused libnl headers
+
+Leftover from change to original code.
+---
+ ip/ipl2tp.c |    7 -------
+ 1 files changed, 0 insertions(+), 7 deletions(-)
+
+diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c
+index 042ddb4..97f98b6 100644
+--- a/ip/ipl2tp.c
++++ b/ip/ipl2tp.c
+@@ -23,13 +23,6 @@
+ #include <linux/if_arp.h>
+ #include <linux/ip.h>
+ 
+-#include <netlink/netlink.h>
+-#include <netlink/genl/genl.h>
+-#include <netlink/genl/family.h>
+-#include <netlink/genl/mngt.h>
+-#include <netlink/genl/ctrl.h>
+-#include <netlink/utils.h>
+-
+ #include <linux/genetlink.h>
+ #include <linux/l2tp.h>
+ 
+-- 
+1.7.6.5
+

Copied: iproute2/repos/testing-x86_64/PKGBUILD (from rev 153249, iproute2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2012-03-12 14:49:33 UTC (rev 153250)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+
+pkgname=iproute2
+pkgver=3.2.0
+pkgrel=3
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
+depends=('glibc' 'db' 'libnl')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
+	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+	iproute2-fhs.patch
+        fix-ip-l.patch
+        remove-libnl-headers.patch)
+sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
+          '2416b11252364d7a6c742eabb4a6924a75637a46'
+          '2ec5513c44f89046438d65e2cda1a014010e3b73'
+          '1cb89ea0945fd190e6943fa7b1c3a4f254d0c1b3')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  # set correct fhs structure
+  patch -Np1 -i "$srcdir/iproute2-fhs.patch"
+
+  #upstream fixes
+  patch -Np1 -i "$srcdir/fix-ip-l.patch"
+  patch -Np1 -i "$srcdir/remove-libnl-headers.patch"
+
+  ./configure
+
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR="$pkgdir" install
+
+  # allow loopback to be started before /usr is mounted, this may not be supported in the future
+  mkdir -p "$pkgdir/sbin"
+  mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+  ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
+
+  # libnetlink isn't installed, install it FS#19385
+  install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+  install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+}

Copied: iproute2/repos/testing-x86_64/fix-ip-l.patch (from rev 153249, iproute2/trunk/fix-ip-l.patch)
===================================================================
--- testing-x86_64/fix-ip-l.patch	                        (rev 0)
+++ testing-x86_64/fix-ip-l.patch	2012-03-12 14:49:33 UTC (rev 153250)
@@ -0,0 +1,27 @@
+From 5aa08f6bf4107f8aec43c0678466a314dbd0d054 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <shemminger at vyatta.com>
+Date: Fri, 20 Jan 2012 08:16:02 -0800
+Subject: [PATCH] ip: make 'ip l' be 'ip link'
+
+Restore compatiablity for those lazy typists.
+---
+ ip/ip.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/ip/ip.c b/ip/ip.c
+index 7b4bacb..20dc3b5 100644
+--- a/ip/ip.c
++++ b/ip/ip.c
+@@ -72,8 +72,8 @@ static const struct cmd {
+ 	{ "neighbour",	do_ipneigh },
+ 	{ "ntable",	do_ipntable },
+ 	{ "ntbl",	do_ipntable },
+-	{ "l2tp",	do_ipl2tp },
+ 	{ "link",	do_iplink },
++	{ "l2tp",	do_ipl2tp },
+ 	{ "tunnel",	do_iptunnel },
+ 	{ "tunl",	do_iptunnel },
+ 	{ "tuntap",	do_iptuntap },
+-- 
+1.7.6.5
+

Copied: iproute2/repos/testing-x86_64/iproute2-fhs.patch (from rev 153249, iproute2/trunk/iproute2-fhs.patch)
===================================================================
--- testing-x86_64/iproute2-fhs.patch	                        (rev 0)
+++ testing-x86_64/iproute2-fhs.patch	2012-03-12 14:49:33 UTC (rev 153250)
@@ -0,0 +1,84 @@
+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/
+ ROOTDIR=$(DESTDIR)
+ LIBDIR=/usr/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
+@@ -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:
+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 @@
+ 	$(AR) rcs $@ $(TCLIB)
+ 
+ install: all
+-	mkdir -p $(MODDESTDIR)
+-	install -m 0755 tc $(DESTDIR)$(SBINDIR)
+-	for i in $(TCSO); \
+-	do install -m 755 $$i $(MODDESTDIR); \
+-	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
++	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; \

Copied: iproute2/repos/testing-x86_64/remove-libnl-headers.patch (from rev 153249, iproute2/trunk/remove-libnl-headers.patch)
===================================================================
--- testing-x86_64/remove-libnl-headers.patch	                        (rev 0)
+++ testing-x86_64/remove-libnl-headers.patch	2012-03-12 14:49:33 UTC (rev 153250)
@@ -0,0 +1,31 @@
+From 13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <shemminger at vyatta.com>
+Date: Tue, 10 Jan 2012 08:50:49 -0800
+Subject: [PATCH] iplt2p: remove unused libnl headers
+
+Leftover from change to original code.
+---
+ ip/ipl2tp.c |    7 -------
+ 1 files changed, 0 insertions(+), 7 deletions(-)
+
+diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c
+index 042ddb4..97f98b6 100644
+--- a/ip/ipl2tp.c
++++ b/ip/ipl2tp.c
+@@ -23,13 +23,6 @@
+ #include <linux/if_arp.h>
+ #include <linux/ip.h>
+ 
+-#include <netlink/netlink.h>
+-#include <netlink/genl/genl.h>
+-#include <netlink/genl/family.h>
+-#include <netlink/genl/mngt.h>
+-#include <netlink/genl/ctrl.h>
+-#include <netlink/utils.h>
+-
+ #include <linux/genetlink.h>
+ #include <linux/l2tp.h>
+ 
+-- 
+1.7.6.5
+



More information about the arch-commits mailing list