Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3d45749d08082d0a13437a36eed64a953d93023c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3d45749d08082d0a13437a36eed64a953d93023c)
  • Date: Mon, 15 Aug 2016 04:07:58 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

net/bridge-utils/BUILD | 4 -
net/bridge-utils/HISTORY | 6 +
net/bridge-utils/PRE_BUILD | 6 +
net/bridge-utils/bridge-utils-1.5-linux_3.8_fix-1.patch | 54
++++++++++++++++
4 files changed, 66 insertions(+), 4 deletions(-)

New commits:
commit 3d45749d08082d0a13437a36eed64a953d93023c
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

net/bridge-utils: added a fix for IPv6 + reorganized some code

diff --git a/net/bridge-utils/BUILD b/net/bridge-utils/BUILD
index 5891342..2b6aa65 100755
--- a/net/bridge-utils/BUILD
+++ b/net/bridge-utils/BUILD
@@ -1,6 +1,2 @@
OPTS="$OPTS
--with-linux-headers=${INSTALL_ROOT}/lib/modules/$(get_kernel_version)/build"
&&
-cd ${SOURCE_DIRECTORY} &&
-sed -i "23i#include <netinet/in.h>" libbridge/libbridge.h &&
-aclocal &&
-autoconf &&
default_build
diff --git a/net/bridge-utils/HISTORY b/net/bridge-utils/HISTORY
index 827e421..76768c7 100644
--- a/net/bridge-utils/HISTORY
+++ b/net/bridge-utils/HISTORY
@@ -1,3 +1,9 @@
+2016-08-15 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD: moved most of the code to PRE_BUILD
+ * PRE_BUILD, bridge-utils-1.5-linux_3.8_fix-1.patch: added patch
+ from LFS project to fix IPv6 header inclusion and reduce
+ configure warnings
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/net/bridge-utils/PRE_BUILD b/net/bridge-utils/PRE_BUILD
new file mode 100755
index 0000000..81a4a6e
--- /dev/null
+++ b/net/bridge-utils/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SPELL_DIRECTORY}/bridge-utils-1.5-linux_3.8_fix-1.patch &&
+sed -i "23i#include <netinet/in.h>" libbridge/libbridge.h &&
+aclocal &&
+autoconf
diff --git a/net/bridge-utils/bridge-utils-1.5-linux_3.8_fix-1.patch
b/net/bridge-utils/bridge-utils-1.5-linux_3.8_fix-1.patch
new file mode 100644
index 0000000..292cc83
--- /dev/null
+++ b/net/bridge-utils/bridge-utils-1.5-linux_3.8_fix-1.patch
@@ -0,0 +1,54 @@
+Submitted By: Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org>
+Date: 2013-03-10
+Initial Package Version: 1.5
+Upstream Status: Unknown
+Origin: LFS
+Description: This patch contains fixes a problem with
+the omission of a needed include file in the kernel's linux/if_bridge.h.
+It also fixes some autoconf warnings.
+
+
+diff -Naur bridge-utils-1.5.orig/Makefile.in bridge-utils-1.5/Makefile.in
+--- bridge-utils-1.5.orig/Makefile.in 2011-03-28 19:52:54.000000000 -0500
++++ bridge-utils-1.5/Makefile.in 2013-03-10 13:44:41.000000000 -0500
+@@ -9,6 +9,7 @@
+ bindir=@bindir@
+ sbindir=@sbindir@
+ mandir=@mandir@
++datarootdir=@datarootdir@
+ distdir = $(PACKAGE)-$(VERSION)
+
+ SUBDIRS=libbridge brctl doc
+diff -Naur bridge-utils-1.5.orig/brctl/Makefile.in
bridge-utils-1.5/brctl/Makefile.in
+--- bridge-utils-1.5.orig/brctl/Makefile.in 2011-03-28 19:52:54.000000000
-0500
++++ bridge-utils-1.5/brctl/Makefile.in 2013-03-10 13:44:15.000000000 -0500
+@@ -12,6 +12,7 @@
+ bindir=@bindir@
+ sbindir=@sbindir@
+ mandir=@mandir@
++datarootdir=@datarootdir@
+
+ INSTALL=@INSTALL@
+
+diff -Naur bridge-utils-1.5.orig/doc/Makefile.in
bridge-utils-1.5/doc/Makefile.in
+--- bridge-utils-1.5.orig/doc/Makefile.in 2011-03-28 19:52:54.000000000
-0500
++++ bridge-utils-1.5/doc/Makefile.in 2013-03-10 13:43:39.000000000 -0500
+@@ -9,6 +9,7 @@
+ bindir=@bindir@
+ sbindir=@sbindir@
+ mandir=@mandir@
++datarootdir=@datarootdir@
+
+ SUBDIRS=libbridge brctl
+
+diff -Naur bridge-utils-1.5.orig/libbridge/libbridge.h
bridge-utils-1.5/libbridge/libbridge.h
+--- bridge-utils-1.5.orig/libbridge/libbridge.h 2011-03-28
19:52:54.000000000 -0500
++++ bridge-utils-1.5/libbridge/libbridge.h 2013-03-10 13:46:23.000000000
-0500
+@@ -21,6 +21,7 @@
+
+ #include <sys/socket.h>
+ #include <linux/if.h>
++#include <netinet/ip6.h>
+ #include <linux/if_bridge.h>
+
+ /* defined in net/if.h but that conflicts with linux/if.h... */



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3d45749d08082d0a13437a36eed64a953d93023c), Pavel Vinogradov, 08/15/2016

Archive powered by MHonArc 2.6.24.

Top of Page