Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c393788554341b049c8c7bc6a9b2aa8ac90b370a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c393788554341b049c8c7bc6a9b2aa8ac90b370a)
  • Date: Fri, 21 Mar 2008 06:57:55 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

net/iptraf/HISTORY | 4 ++++
net/iptraf/PRE_BUILD | 3 ++-
net/iptraf/iptraf-3.0.0-headerfix.patch | 25 +++++++++++++++++++++++++
3 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit c393788554341b049c8c7bc6a9b2aa8ac90b370a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

net/iptraf: added a patch to make iptraf compile

diff --git a/net/iptraf/HISTORY b/net/iptraf/HISTORY
index 76a8e7f..16bc89c 100644
--- a/net/iptraf/HISTORY
+++ b/net/iptraf/HISTORY
@@ -1,3 +1,7 @@
+2008-03-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, iptraf-3.0.0-headerfix.patch: added a patch from
+ gentoo to make iptraf compile
+
2006-11-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* slightly modified patch from Renan Merour fixing #11506:
* DETAILS: Version bump to 3.0.0
diff --git a/net/iptraf/PRE_BUILD b/net/iptraf/PRE_BUILD
index 6cfb1c5..c5512ea 100755
--- a/net/iptraf/PRE_BUILD
+++ b/net/iptraf/PRE_BUILD
@@ -3,4 +3,5 @@ cd $SOURCE_DIRECTORY/src &&
local KVER=$(get_kernel_version) &&
if [[ ${KVER:0:3} == 2.6 ]]; then
patch -p2 < ${SPELL_DIRECTORY}/iptraf_headers.patch
-fi
+fi &&
+patch -p2 < $SCRIPT_DIRECTORY/iptraf-3.0.0-headerfix.patch
diff --git a/net/iptraf/iptraf-3.0.0-headerfix.patch
b/net/iptraf/iptraf-3.0.0-headerfix.patch
new file mode 100644
index 0000000..604d63e
--- /dev/null
+++ b/net/iptraf/iptraf-3.0.0-headerfix.patch
@@ -0,0 +1,25 @@
+diff -Naur iptraf-3.0.0-minus/src/othptab.c iptraf-3.0.0/src/othptab.c
+--- iptraf-3.0.0-minus/src/othptab.c 2006-09-27 03:30:33.000000000 +0200
++++ iptraf-3.0.0/src/othptab.c 2006-09-27 03:34:24.000000000 +0200
+@@ -17,6 +17,7 @@
+ ***/
+
+ #include <asm/types.h>
++#include <sys/types.h>
+ #include <linux/if_ether.h>
+ #include <winops.h>
+ #include "arphdr.h"
+diff -Naur iptraf-3.0.0-minus/src/tr.c iptraf-3.0.0/src/tr.c
+--- iptraf-3.0.0-minus/src/tr.c 2005-09-13 08:42:54.000000000 +0200
++++ iptraf-3.0.0/src/tr.c 2006-09-27 03:32:54.000000000 +0200
+@@ -7,8 +7,8 @@
+ */
+
+ #include <asm/types.h>
+-#include <linux/if_tr.h>
+ #include <netinet/in.h>
++#include <linux/if_tr.h>
+
+ unsigned int get_tr_ip_offset(unsigned char *pkt)
+ {
+



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c393788554341b049c8c7bc6a9b2aa8ac90b370a), Florian Franzmann, 03/21/2008

Archive powered by MHonArc 2.6.24.

Top of Page