bridge-utils in main

2015-07-21 20:55:12 +03:00
parent 9f3266e43f
commit a663e33050
6 changed files with 140 additions and 0 deletions
@@ -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")
@@ -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 <linux/sockios.h>
+#include <unistd.h>
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+ #include <linux/if_bridge.h>
@@ -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) {
@@ -0,0 +1,30 @@
+commit 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d
+Author: Russell Senior <russell@personaltelco.net>
+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 <russell@personaltelco.net>
+
+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 <sys/socket.h>
+#include <netinet/in.h>
+ #include <linux/if.h>
+ #include <linux/if_bridge.h>
+ 
@@ -0,0 +1,52 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>bridge-utils</Name>
+        <Homepage>http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge</Homepage>
+        <Packager>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Packager>
+        <License>GPLv2</License>
+        <IsA>app:console</IsA>
+        <Summary>Linux network bridging utilities</Summary>
+        <Description>Containts userspace driver for IEEE 802.1d ethernet bridging (plus Spanning Tree protocol) for the linux kernel.</Description>
+        <Archive sha1sum="19d2a58cd3a70f971aa931b40256174a847e60d6" type="targz">http://downloads.sourceforge.net/project/bridge/bridge/bridge-utils-1.5.tar.gz</Archive>
+        <Patches>
+            <Patch level="1">bridge-utils-1.0.4-inc.patch</Patch>
+	    <!--<Patch level="1">bridge-utils-1.2-show-ports.patch</Patch>
+	    <Patch level="1">bridge-utils-1.2-foreach.patch</Patch>-->
+	    <Patch level="1">bridge-utils-1.2-params.patch</Patch>-->
+	    <Patch level="1">bridge-utils-1.5-linux_3.8.x.patch</Patch>
+        </Patches>
+    </Source>
+
+    <Package>
+        <Name>bridge-utils</Name>
+        <Files>
+            <Path fileType="header">/usr/include</Path>
+            <Path fileType="library">/usr/lib</Path>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="man">/usr/share/man</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="2">
+            <Date>2014-01-19</Date>
+            <Version>1.5</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Stefan Gronewold(groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
+        <Update release="1">
+            <Date>2012-08-28</Date>
+            <Version>1.5</Version>
+            <Comment>First release</Comment>
+            <Name>Osman Erkan</Name>
+            <Email>osman.erkan@pisilinux.org</Email>
+        </Update>
+    </History>
+</PISI>
@@ -0,0 +1,8 @@
+<?xml version="1.0" ?>
+<PISI>
+    <Source>
+        <Name>bridge-utils</Name>
+        <Summary xml:lang="tr">Linux için ağ köprüleme yardımcı uygulamaları</Summary>
+        <Description xml:lang="tr">Linux için ağ köprüleme yardımcı uygulamaları.</Description>
+    </Source>
+</PISI>