From a663e33050f7871f0991e536d21fc75fd78f7da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Tue, 21 Jul 2015 20:55:12 +0300 Subject: [PATCH] bridge-utils in main --- network/connection/bridge-utils/actions.py | 27 ++++++++++ .../files/bridge-utils-1.0.4-inc.patch | 10 ++++ .../files/bridge-utils-1.2-params.patch | 13 +++++ .../files/bridge-utils-1.5-linux_3.8.x.patch | 30 +++++++++++ network/connection/bridge-utils/pspec.xml | 52 +++++++++++++++++++ .../connection/bridge-utils/translations.xml | 8 +++ 6 files changed, 140 insertions(+) create mode 100644 network/connection/bridge-utils/actions.py create mode 100644 network/connection/bridge-utils/files/bridge-utils-1.0.4-inc.patch create mode 100644 network/connection/bridge-utils/files/bridge-utils-1.2-params.patch create mode 100644 network/connection/bridge-utils/files/bridge-utils-1.5-linux_3.8.x.patch create mode 100644 network/connection/bridge-utils/pspec.xml create mode 100644 network/connection/bridge-utils/translations.xml diff --git a/network/connection/bridge-utils/actions.py b/network/connection/bridge-utils/actions.py new file mode 100644 index 0000000000..6ea5b013c1 --- /dev/null +++ b/network/connection/bridge-utils/actions.py @@ -0,0 +1,27 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + + +def setup(): + autotools.autoconf() + autotools.configure("--prefix=/usr \ + --datarootdir=/usr/share \ + --with-linux-headers=/usr/include \ + --sbindir=/usr/bin \ + --sysconfdir=/etc") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + # autotools.install('SUBDIRS="brctl doc"') + + pisitools.dodoc("AUTHORS", "COPYING", "ChangeLog", "README", "doc/FAQ", "doc/HOWTO") diff --git a/network/connection/bridge-utils/files/bridge-utils-1.0.4-inc.patch b/network/connection/bridge-utils/files/bridge-utils-1.0.4-inc.patch new file mode 100644 index 0000000000..1ae3f5b3cc --- /dev/null +++ b/network/connection/bridge-utils/files/bridge-utils-1.0.4-inc.patch @@ -0,0 +1,10 @@ +--- bridge-utils-1.0.4/libbridge/libbridge_private.h~ 2004-05-28 21:38:38.000000000 +0100 ++++ bridge-utils-1.0.4/libbridge/libbridge_private.h 2004-07-01 11:24:21.000000000 +0100 +@@ -22,6 +22,7 @@ + #include "config.h" + + #include ++#include + #include + #include + #include diff --git a/network/connection/bridge-utils/files/bridge-utils-1.2-params.patch b/network/connection/bridge-utils/files/bridge-utils-1.2-params.patch new file mode 100644 index 0000000000..195b7ebdaa --- /dev/null +++ b/network/connection/bridge-utils/files/bridge-utils-1.2-params.patch @@ -0,0 +1,13 @@ +diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c +index 1decc28..65ea79a 100644 +--- a/libbridge/libbridge_devif.c ++++ b/libbridge/libbridge_devif.c +@@ -282,7 +282,7 @@ static int br_set(const char *bridge, const char *name, + char path[SYSFS_PATH_MAX]; + FILE *f; + +- snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/%s", bridge, name); ++ snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge/%s", bridge, name); + + f = fopen(path, "w"); + if (f) { diff --git a/network/connection/bridge-utils/files/bridge-utils-1.5-linux_3.8.x.patch b/network/connection/bridge-utils/files/bridge-utils-1.5-linux_3.8.x.patch new file mode 100644 index 0000000000..0455a9085c --- /dev/null +++ b/network/connection/bridge-utils/files/bridge-utils-1.5-linux_3.8.x.patch @@ -0,0 +1,30 @@ +commit 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d +Author: Russell Senior +Date: Wed Mar 6 12:49:42 2013 -0800 + + bridge-utils: Fix compile against linux-3.8.x + + Linux 3.8 has a header, include/uapi/linux/if_bridge.h that uses a + struct in6_addr but doesn't define it. The trivial seeming fix of + including the header that does define it causes more problems. The + problem was discussed on mailing lists in January 2013. The final + suggestion I found was here: + + http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html + + This is intended to implement that suggestion. + + Signed-off-by: Russell Senior + +diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h +index 39964f2..dd14bae 100644 +--- a/libbridge/libbridge.h ++++ b/libbridge/libbridge.h +@@ -20,6 +20,7 @@ + #define _LIBBRIDGE_H + + #include ++#include + #include + #include + diff --git a/network/connection/bridge-utils/pspec.xml b/network/connection/bridge-utils/pspec.xml new file mode 100644 index 0000000000..3d43c25f99 --- /dev/null +++ b/network/connection/bridge-utils/pspec.xml @@ -0,0 +1,52 @@ + + + + + bridge-utils + http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + Linux network bridging utilities + Containts userspace driver for IEEE 802.1d ethernet bridging (plus Spanning Tree protocol) for the linux kernel. + http://downloads.sourceforge.net/project/bridge/bridge/bridge-utils-1.5.tar.gz + + bridge-utils-1.0.4-inc.patch + + bridge-utils-1.2-params.patch--> + bridge-utils-1.5-linux_3.8.x.patch + + + + + bridge-utils + + /usr/include + /usr/lib + /usr/bin + /usr/share/doc + /usr/share/man + + + + + + 2014-01-19 + 1.5 + Rebuild + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2012-08-28 + 1.5 + First release + Osman Erkan + osman.erkan@pisilinux.org + + + diff --git a/network/connection/bridge-utils/translations.xml b/network/connection/bridge-utils/translations.xml new file mode 100644 index 0000000000..87614d5abe --- /dev/null +++ b/network/connection/bridge-utils/translations.xml @@ -0,0 +1,8 @@ + + + + bridge-utils + Linux için ağ köprüleme yardımcı uygulamaları + Linux için ağ köprüleme yardımcı uygulamaları. + +