packages: iptraf/iptraf.patch, iptraf/iptraf.spec, iptraf/iptraf-llh.patch ...

[arekm]

Author: arekm                        Date: Sat Jul 25 21:39:25 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.0.1

---- Files affected:
packages/iptraf:
   iptraf.patch (1.7 -> 1.8) , iptraf.spec (1.62 -> 1.63) , iptraf-llh.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/iptraf/iptraf.patch
diff -u packages/iptraf/iptraf.patch:1.7 packages/iptraf/iptraf.patch:1.8
--- packages/iptraf/iptraf.patch:1.7	Sun Jun  3 21:16:09 2007
+++ packages/iptraf/iptraf.patch	Sat Jul 25 23:39:20 2009
@@ -345,21 +345,6 @@
      unsigned int sport = 0;
 --- iptraf-3.0.0.orig/src/packet.c
 +++ iptraf-3.0.0/src/packet.c
-@@ -31,13 +31,12 @@
- #include <netinet/tcp.h>
- #include <sys/time.h>
- #include <net/if_arp.h>
--#include <net/if.h>
-+#include <linux/if.h>
- #include <sys/ioctl.h>
- #include <linux/if_packet.h>
- #include <linux/if_ether.h>
- #include <linux/if_fddi.h>
- #include <linux/if_tr.h>
--#include <linux/isdn.h>
- #include <linux/sockios.h>
- #include <msgboxes.h>
- #include "deskman.h"
 @@ -79,6 +78,8 @@
      case ARPHRD_ETHER:
          if (strncmp(ifname, "eth", 3) == 0)
@@ -636,3 +621,13 @@
  #include <netinet/in.h>
  
  unsigned int get_tr_ip_offset(unsigned char *pkt)
+--- iptraf/src/packet.c~	2009-07-25 23:37:07.174013319 +0200
++++ iptraf/src/packet.c	2009-07-25 23:37:20.504011520 +0200
+@@ -37,7 +37,6 @@
+ #include <linux/netdevice.h>
+ #include <linux/if_fddi.h>
+ #include <linux/if_tr.h>
+-#include <linux/isdn.h>
+ #include <linux/sockios.h>
+ #include <msgboxes.h>
+ #include "deskman.h"

================================================================
Index: packages/iptraf/iptraf.spec
diff -u packages/iptraf/iptraf.spec:1.62 packages/iptraf/iptraf.spec:1.63
--- packages/iptraf/iptraf.spec:1.62	Sat Mar 15 21:38:54 2008
+++ packages/iptraf/iptraf.spec	Sat Jul 25 23:39:20 2009
@@ -6,16 +6,15 @@
 Summary(ru.UTF-8):	IPTraf - консольная программа мониторинга сетевого траффика
 Summary(uk.UTF-8):	IPTraf - консольна програма моніторингу трафіку в мережі
 Name:		iptraf
-Version:	3.0.0
-Release:	4
+Version:	3.0.1
+Release:	1
 License:	GPL
 Group:		Networking/Utilities
 Source0:	ftp://iptraf.seul.org/pub/iptraf/%{name}-%{version}.tar.gz
-# Source0-md5:	377371c28ee3c21a76f7024920649ea8
+# Source0-md5:	004c2c005a1b78739e22bc49d33e244d
 Patch0:		%{name}.patch
 Patch1:		%{name}-iface.patch
-Patch2:		%{name}-llh.patch
-Patch3:		%{name}-show_all_interfaces.patch
+Patch2:		%{name}-show_all_interfaces.patch
 URL:		http://iptraf.seul.org/
 BuildRequires:	ncurses-ext-devel >= 5.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -68,7 +67,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 cd src
@@ -105,6 +103,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2009/07/25 21:39:20  arekm
+- up to 3.0.1
+
 Revision 1.62  2008/03/15 20:38:54  dzeus
 - rel. 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptraf/iptraf.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptraf/iptraf.spec?r1=1.62&r2=1.63&f=u