diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-05 02:43:51 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-05 02:43:51 -0300 |
| commit | 61b68fb9fca39dda7e4b48c5af9567dc60ea3dd2 (patch) | |
| tree | 6b8b6fb14ede5aae651e92f593252dba143cee74 /core/iproute2 | |
| parent | ca998b4c054452abed4e01be1d2b28fee0ca904f (diff) | |
| parent | 5801c5acd80d30d17aaef76b8bc401c61b3ef3c9 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/camlp5/PKGBUILD
community/coq/PKGBUILD
community/ldns/PKGBUILD
community/luxrays/PKGBUILD
community/luxrender/PKGBUILD
community/nut/PKGBUILD
community/root/PKGBUILD
community/swi-prolog/PKGBUILD
community/vtk/PKGBUILD
community/wings3d/wings3d.sh
core/sqlite3/PKGBUILD
core/tzdata/PKGBUILD
extra/cmus/PKGBUILD
extra/dcron/PKGBUILD
extra/farsight2/PKGBUILD
extra/foomatic/PKGBUILD
extra/fwbuilder/PKGBUILD
extra/gnome-utils/PKGBUILD
extra/ivtv-utils/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdesdk/PKGBUILD
extra/koffice/PKGBUILD
extra/libxfce4menu/PKGBUILD
extra/openmpi/PKGBUILD
extra/telepathy-butterfly/PKGBUILD
extra/telepathy-farsight/PKGBUILD
extra/telepathy-kde-presence-dataengine/PKGBUILD
extra/telepathy-qt4/PKGBUILD
extra/xfce-utils/PKGBUILD
extra/xulrunner/PKGBUILD
multilib/lib32-zlib/PKGBUILD
staging/gimp-devel/gimp-devel.install
testing/gtk3/PKGBUILD
testing/php/PKGBUILD
~xihh/couchdb-git/couchdb.install
~xihh/couchdb-git/rc-script.patch
~xihh/gmime24/PKGBUILD
Diffstat (limited to 'core/iproute2')
| -rw-r--r-- | core/iproute2/fix-ip-l.patch | 27 | ||||
| -rw-r--r-- | core/iproute2/remove-libnl-headers.patch | 31 |
2 files changed, 0 insertions, 58 deletions
diff --git a/core/iproute2/fix-ip-l.patch b/core/iproute2/fix-ip-l.patch deleted file mode 100644 index 7f1749cbb..000000000 --- a/core/iproute2/fix-ip-l.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5aa08f6bf4107f8aec43c0678466a314dbd0d054 Mon Sep 17 00:00:00 2001 -From: Stephen Hemminger <shemminger@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 - diff --git a/core/iproute2/remove-libnl-headers.patch b/core/iproute2/remove-libnl-headers.patch deleted file mode 100644 index 921e1fa82..000000000 --- a/core/iproute2/remove-libnl-headers.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0 Mon Sep 17 00:00:00 2001 -From: Stephen Hemminger <shemminger@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 - |