rpms/iptraf/devel iptraf-3.0.1-compile.fix.patch, NONE, 1.1 iptraf-3.0.1-incltypes.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 iptraf.spec, 1.27, 1.28 sources, 1.5, 1.6 iptraf-3.0.0-compile.fix.patch, 1.4, NONE iptraf-3.0.0-incltypes.patch, 1.1, NONE

Marcela Mašláňová (mmaslano) fedora-extras-commits at redhat.com
Fri Nov 2 12:20:11 UTC 2007 

Author: mmaslano

Update of /cvs/pkgs/rpms/iptraf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30405

Modified Files:
	.cvsignore iptraf.spec sources 
Added Files:
	iptraf-3.0.1-compile.fix.patch iptraf-3.0.1-incltypes.patch 
Removed Files:
	iptraf-3.0.0-compile.fix.patch iptraf-3.0.0-incltypes.patch 
Log Message:
Upgrade on new upstream version and recreate some patches.


iptraf-3.0.1-compile.fix.patch:

--- NEW FILE iptraf-3.0.1-compile.fix.patch ---
diff -up iptraf-3.0.1/src/tr.c.old iptraf-3.0.1/src/tr.c
--- iptraf-3.0.1/src/tr.c.old	2005-09-13 08:42:54.000000000 +0200
+++ iptraf-3.0.1/src/tr.c	2007-11-02 12:30:26.000000000 +0100
@@ -7,7 +7,7 @@
  */
 
 #include <asm/types.h>
-#include <linux/if_tr.h>
+#include <netinet/if_tr.h>
 #include <netinet/in.h>
 
 unsigned int get_tr_ip_offset(unsigned char *pkt)
diff -up iptraf-3.0.1/src/othptab.c.old iptraf-3.0.1/src/othptab.c
--- iptraf-3.0.1/src/othptab.c.old	2007-09-25 11:47:35.000000000 +0200
+++ iptraf-3.0.1/src/othptab.c	2007-11-02 12:28:24.000000000 +0100
@@ -19,10 +19,10 @@ details.
 #include <stdlib.h>
 #include <asm/types.h>
 #include <sys/socket.h>
-#include <linux/if_ether.h>
-#include <linux/if_tr.h>
-#include <linux/netdevice.h>
-#include <linux/if_fddi.h>
+#include <netinet/if_ether.h>
+#include <netinet/if_tr.h>
+#include <linux/netdevice.h>
+#include <netinet/if_fddi.h>
 #include <winops.h>
 #include "arphdr.h"
 #include "options.h"
diff -up iptraf-3.0.1/src/Makefile.old iptraf-3.0.1/src/Makefile
--- iptraf-3.0.1/src/Makefile.old	2007-11-02 12:27:07.000000000 +0100
+++ iptraf-3.0.1/src/Makefile	2007-11-02 12:29:50.000000000 +0100
@@ -18,7 +18,7 @@ VERSION 	= -DVERSION=\"$(VERNUMBER)\"
 BINDIR		= ../../iptraf-$(VERNUMBER).bin.$(ARCH)
 
 CC		= gcc
-LIBS		= -L../support -ltextbox -lpanel -lncurses   # in this order!
+LIBS		= -L../support -ltextbox -lpanelw -lncursesw   # in this order!
 
 # comment this one out to omit debug code when done.
 
@@ -39,7 +39,7 @@ LDOPTS		= #-static
 # you may want to change this to point to your ncurses include directory
 # if the ncurses include files are not in the default location.
 
-INCLUDEDIR	= -I/usr/include/ncurses -I../support
+INCLUDEDIR	= -I/usr/include/ncursesw -I../support
 
 # You can uncomment this one to disable the backspace key in input fields.
 # This means you must use the Del key or Ctrl+H combination to erase the
@@ -162,7 +162,7 @@ install:
 # and the compiled programs for release as a ready-to-run distribution.
 
 dist-bin: all
-	$(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) -L../support -ltextbox /usr/lib/libpanel.a /usr/lib/libncurses.a
+	$(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) -L../support -ltextbox /usr/lib/libpanelw.a /usr/lib/libncursesw.a
 	rm -rf $(BINDIR)
 	mkdir $(BINDIR)
 	/bin/cp -p ../CHANGES ../LICENSE ../FAQ ../INSTALL ../README* \
@@ -178,7 +178,7 @@ dist-bin: all
 # Just in case anyone needs to link a static binary
 #
 static: $(OBJS)
-	$(CC) -static $(PROC) -o iptraf $(OBJS) ../support/libtextbox.a -lpanel -lncurses
+	$(CC) -static $(PROC) -o iptraf $(OBJS) ../support/libtextbox.a -lpanelw -lncursesw
 	$(CC) -static -o rvnamed rvnamed.o getpath.o
 	$(CC) -static -o rawtime rawtime.c
 
diff -up iptraf-3.0.1/src/tcptable.h.old iptraf-3.0.1/src/tcptable.h
--- iptraf-3.0.1/src/tcptable.h.old	2007-09-25 11:46:03.000000000 +0200
+++ iptraf-3.0.1/src/tcptable.h	2007-11-02 12:35:56.000000000 +0100
@@ -20,11 +20,11 @@
 #include <arpa/inet.h>
 #include <net/if_arp.h>
 #include <asm/types.h>
-#include <linux/if_packet.h>
-#include <linux/if_ether.h>
-#include <linux/netdevice.h>
-#include <linux/if_fddi.h>
-#include <linux/if_tr.h>
+#include <linux/if_packet.h>
+#include <netinet/if_ether.h>
+#include <linux/netdevice.h>
+#include <netinet/if_fddi.h>
+#include <netinet/if_tr.h>
 // #include <net/if.h>
 #include <netinet/ip.h>
 #include <netinet/udp.h>

iptraf-3.0.1-incltypes.patch:

--- NEW FILE iptraf-3.0.1-incltypes.patch ---
diff -up iptraf-3.0.1/src/ifstats.c.old iptraf-3.0.1/src/ifstats.c
--- iptraf-3.0.1/src/ifstats.c.old	2007-11-02 12:49:25.000000000 +0100
+++ iptraf-3.0.1/src/ifstats.c	2007-11-02 12:49:38.000000000 +0100
@@ -26,6 +26,7 @@ details.
 #include <time.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <linux/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <netinet/in.h>
diff -up iptraf-3.0.1/src/serv.c.old iptraf-3.0.1/src/serv.c
--- iptraf-3.0.1/src/serv.c.old	2007-11-02 12:50:04.000000000 +0100
+++ iptraf-3.0.1/src/serv.c	2007-11-02 12:50:25.000000000 +0100
@@ -32,6 +32,7 @@ details.
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/udp.h>
+#include <linux/types.h>
 #include <linux/if_packet.h>
 #include <linux/if_ether.h>
 #include <listbox.h>
diff -up iptraf-3.0.1/src/ifaces.c.old iptraf-3.0.1/src/ifaces.c
--- iptraf-3.0.1/src/ifaces.c.old	2007-11-02 12:50:37.000000000 +0100
+++ iptraf-3.0.1/src/ifaces.c	2007-11-02 12:50:54.000000000 +0100
@@ -27,6 +27,7 @@ details.
 #include <net/if.h>
 #include <fcntl.h>
 #include <string.h>
+#include <linux/types.h>
 #include <linux/if_packet.h>
 #include "links.h"
 #include "error.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iptraf/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Feb 2006 14:38:34 -0000	1.5
+++ .cvsignore	2 Nov 2007 12:19:38 -0000	1.6
@@ -1 +1 @@
-iptraf-3.0.0.tar.gz
+iptraf-3.0.1.tar.gz


Index: iptraf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptraf/devel/iptraf.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- iptraf.spec	18 Sep 2007 11:25:58 -0000	1.27
+++ iptraf.spec	2 Nov 2007 12:19:38 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A console-based network monitoring utility
 Name: iptraf
-Version: 3.0.0
-Release: 7%{?dist}
+Version: 3.0.1
+Release: 1%{?dist}
 Source0: ftp://iptraf.seul.org/pub/iptraf/%{name}-%{version}.tar.gz
 Source1: iptraf 
 URL: http://iptraf.seul.org
@@ -12,9 +12,9 @@
 Patch4: iptraf-2.7.0-nostrip.patch
 Patch5: iptraf-3.0.0-setlocale.patch
 Patch6: iptraf-3.0.0-longdev.patch
-Patch7: iptraf-3.0.0-compile.fix.patch
+Patch7: iptraf-3.0.1-compile.fix.patch
 Patch8: iptraf-3.0.0-in_trafic.patch
-Patch9: iptraf-3.0.0-incltypes.patch
+Patch9: iptraf-3.0.1-incltypes.patch
 
 License: GPLv2+
 Group: Applications/System
@@ -73,7 +73,7 @@
 
 # remove everything besides the html and pictures in Documentation
 find Documentation -type f | grep -v '\.html$\|\.png$\|/stylesheet' | \
-    xargs rm -f
+	xargs rm -f
 rm -rf Documentation/.xvpics
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d/
 cp %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/iptraf
@@ -93,6 +93,9 @@
 %dir %attr(644,root,root) %config(noreplace) /etc/logrotate.d/iptraf
 
 %changelog
+* Fri Nov  2 2007 Marcela Maslanova <mmaslano at redhat.com> - 3.0.1-1
+- upgrade iptraf-3.0.1
+
 * Fri Aug 24 2007 Marcela Maslanova <mmaslano at redhat.com> - 3.0.0-7
 - rebuilt for mass rebuilt
 - check license


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iptraf/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Feb 2006 14:38:34 -0000	1.5
+++ sources	2 Nov 2007 12:19:38 -0000	1.6
@@ -1 +1 @@
-377371c28ee3c21a76f7024920649ea8  iptraf-3.0.0.tar.gz
+004c2c005a1b78739e22bc49d33e244d  iptraf-3.0.1.tar.gz


--- iptraf-3.0.0-compile.fix.patch DELETED ---


--- iptraf-3.0.0-incltypes.patch DELETED ---

More information about the fedora-extras-commits mailing list