Skip to Content.
Sympa Menu

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

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 (6918e26c7550eec4d981e702f40c5353e0e5e665)
  • Date: Mon, 15 Aug 2016 04:54:23 +0000

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

net/bridge-utils/PRE_BUILD | 1 -
net/bridge-utils/bridge-utils-1.5-linux_3.8_fix-1.patch | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6918e26c7550eec4d981e702f40c5353e0e5e665
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

net/bridge-utils: moved sed to patch

diff --git a/net/bridge-utils/PRE_BUILD b/net/bridge-utils/PRE_BUILD
index 81a4a6e..8984f2c 100755
--- a/net/bridge-utils/PRE_BUILD
+++ b/net/bridge-utils/PRE_BUILD
@@ -1,6 +1,5 @@
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
index 292cc83..2a77f42 100644
--- 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
@@ -44,9 +44,11 @@ diff -Naur bridge-utils-1.5.orig/doc/Makefile.in
bridge-utils-1.5/doc/Makefile.i
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 @@
+@@ -20,7 +20,9 @@
+ #define _LIBBRIDGE_H

#include <sys/socket.h>
++#include <netinet/in.h>
#include <linux/if.h>
+#include <netinet/ip6.h>
#include <linux/if_bridge.h>




Archive powered by MHonArc 2.6.24.

Top of Page