Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (91909872e561883a9072678b1e925d2a15dece3e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (91909872e561883a9072678b1e925d2a15dece3e)
  • Date: Sat, 11 Nov 2006 11:15:27 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

net/iptraf/DETAILS | 5 +--
net/iptraf/HISTORY | 6 ++++
net/iptraf/PRE_BUILD | 6 ++++
net/iptraf/iptraf_headers.patch | 60
++++++++++++++++++++++++++++++++++++++++
4 files changed, 74 insertions(+), 3 deletions(-)

New commits:
commit 91909872e561883a9072678b1e925d2a15dece3e
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

iptraf: fix #11506

diff --git a/net/iptraf/DETAILS b/net/iptraf/DETAILS
index 8411fc8..de60df3 100755
--- a/net/iptraf/DETAILS
+++ b/net/iptraf/DETAILS
@@ -1,12 +1,11 @@
SPELL=iptraf
- VERSION=2.7.0
+ VERSION=3.0.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://iptraf.seul.org/pub/iptraf/$SOURCE
WEB_SITE=http://cebu.mozcom.com/riker/iptraf/
-
SOURCE_HASH=sha512:6adce8d0b43c3aa06f361adce2076abcc024e6c723c30170284289d08d7193c051c14c375483174f7e4b1aad4468f9f4b68873040f47ed9554af703c4c7b3cd6
+
SOURCE_HASH=sha512:f98064105a850ebd92675e6bd2d3ed5361c238f198f309f3960e1905ebb00dbbf52e3f5daea0b9e157c6dc3c55db7b0c0a1adcafce928dbd4a2cd9c9225dcdb3
ENTERED=20020202
- UPDATED=20020528
KEYWORDS="net"
SHORT="IPTraf is a console-based network statistics utility"
cat << EOF
diff --git a/net/iptraf/HISTORY b/net/iptraf/HISTORY
index 2da562e..76a8e7f 100644
--- a/net/iptraf/HISTORY
+++ b/net/iptraf/HISTORY
@@ -1,3 +1,9 @@
+2006-11-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * slightly modified patch from Renan Merour fixing #11506:
+ * DETAILS: Version bump to 3.0.0
+ * PRE_BUILD: Conditional patch to compile with kernel-2.6 headers
+ * iptraf_headers.patch: patch for 2.6 linux headers.
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/net/iptraf/PRE_BUILD b/net/iptraf/PRE_BUILD
new file mode 100755
index 0000000..6cfb1c5
--- /dev/null
+++ b/net/iptraf/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY/src &&
+local KVER=$(get_kernel_version) &&
+if [[ ${KVER:0:3} == 2.6 ]]; then
+ patch -p2 < ${SPELL_DIRECTORY}/iptraf_headers.patch
+fi
diff --git a/net/iptraf/iptraf_headers.patch b/net/iptraf/iptraf_headers.patch
new file mode 100644
index 0000000..ebf7d02
--- /dev/null
+++ b/net/iptraf/iptraf_headers.patch
@@ -0,0 +1,60 @@
+diff -Naur iptraf-3.0.0_orig/src/install.sh iptraf-3.0.0/src/install.sh
+--- iptraf-3.0.0_orig/src/install.sh 2002-12-26 04:07:18.000000000 +0100
++++ iptraf-3.0.0/src/install.sh 2006-08-21 21:07:42.000000000 +0200
+@@ -85,7 +85,7 @@
+ echo "this version. You can view this file now (will require the 'less'"
+ echo "program in /usr/bin. Press Q to quit when done)."
+ echo
+-echo -n "Would you like to view the RELEASE-NOTES file now (Y/N)? "; read
YESNO
++echo -n "Would you like to view the RELEASE-NOTES file now (Y/N)? "; YESNO
== y
+
+ if [ "$YESNO" = "y" -o "$YESNO" = "Y" ]; then
+ less ../RELEASE-NOTES
+diff -Naur iptraf-3.0.0_orig/src/Makefile iptraf-3.0.0/src/Makefile
+--- iptraf-3.0.0_orig/src/Makefile 2005-09-13 11:11:17.000000000 +0200
++++ iptraf-3.0.0/src/Makefile 2006-08-21 21:07:42.000000000 +0200
+@@ -68,12 +68,12 @@
+ # installation target directory. The iptraf and rvnamed programs get
+ # stored here. iptraf also exec's rvnamed from this directory.
+
+-TARGET = /usr/local/bin
++TARGET = /usr/bin
+
+ # The IPTraf working directory; if you change this. Starting with this
+ # version, this definition overrides dirs.h.
+
+-WORKDIR = /var/local/iptraf
++WORKDIR = /var/iptraf
+
+ # The IPTraf log file directory. IPTraf log files are placed here.
+ # This definition overrides dirs.h
+diff -Naur iptraf-3.0.0_orig/src/othptab.c iptraf-3.0.0/src/othptab.c
+--- iptraf-3.0.0_orig/src/othptab.c 2005-09-13 08:42:54.000000000 +0200
++++ iptraf-3.0.0/src/othptab.c 2006-08-21 21:14:49.000000000 +0200
+@@ -18,8 +18,8 @@
+
+ #include <asm/types.h>
+ #include <linux/if_ether.h>
+-#include <linux/if_tr.h>
+-#include <linux/if_fddi.h>
++/*#include <linux/if_tr.h>*/
++/*#include <linux/if_fddi.h>*/
+ #include <winops.h>
+ #include "arphdr.h"
+ #include "options.h"
+diff -Naur iptraf-3.0.0_orig/src/tcptable.h iptraf-3.0.0/src/tcptable.h
+--- iptraf-3.0.0_orig/src/tcptable.h 2005-09-13 08:42:54.000000000 +0200
++++ iptraf-3.0.0/src/tcptable.h 2006-08-21 21:13:25.000000000 +0200
+@@ -20,11 +20,11 @@
+ #include <arpa/inet.h>
+ #include <net/if_arp.h>
+ #include <asm/types.h>
++#include <net/if.h>
+ #include <linux/if_packet.h>
+ #include <linux/if_ether.h>
+ #include <linux/if_fddi.h>
+ #include <linux/if_tr.h>
+-#include <net/if.h>
+ #include <netinet/ip.h>
+ #include <netinet/udp.h>
+ #include "servname.h"



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (91909872e561883a9072678b1e925d2a15dece3e), Jaka Kranjc, 11/11/2006

Archive powered by MHonArc 2.6.24.

Top of Page