rpms/iptraf/FC-5 iptraf-3.0.0-compile.fix.patch, NONE, 1.1 iptraf.spec, 1.19, 1.20

Mon Aug 21 06:55:18 UTC 2006

Author: mmaslano

Update of /cvs/dist/rpms/iptraf/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1309

Modified Files:
	iptraf.spec 
Added Files:
	iptraf-3.0.0-compile.fix.patch 
Log Message:
Update for correct line-drawing in UTF-8.


iptraf-3.0.0-compile.fix.patch:
 ./src/Makefile        |    8 ++++----
 ./src/othptab.c       |    6 +++---
 ./src/tcptable.h      |    6 +++---
 iptraf-3.0.0/src/tr.c |    2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE iptraf-3.0.0-compile.fix.patch ---
--- ./src/othptab.c.old	2005-09-13 08:42:54.000000000 +0200
+++ ./src/othptab.c	2006-06-06 13:17:03.000000000 +0200
@@ -17,9 +17,9 @@
 ***/
 
 #include <asm/types.h>
-#include <linux/if_ether.h>
-#include <linux/if_tr.h>
-#include <linux/if_fddi.h>
+#include <netinet/if_ether.h>
+#include <netinet/if_tr.h>
+#include <netinet/if_fddi.h>
 #include <winops.h>
 #include "arphdr.h"
 #include "options.h"
--- ./src/Makefile.old	2006-06-06 13:36:40.000000000 +0200
+++ ./src/Makefile	2006-05-31 07:58:30.000000000 +0200
@@ -18,7 +18,7 @@
 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 @@
 # 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 @@
 # 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 @@
 # 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
 
--- ./src/tcptable.h.old	2005-09-13 08:42:54.000000000 +0200
+++ ./src/tcptable.h	2006-06-06 13:40:24.000000000 +0200
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <curses.h>
+#include <ncurses.h>
 #include <panel.h>
 #include <netdb.h>
 #include <time.h>
@@ -22,8 +22,8 @@
 #include <asm/types.h>
 #include <linux/if_packet.h>
 #include <linux/if_ether.h>
-#include <linux/if_fddi.h>
-#include <linux/if_tr.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.0/src/tr.c.old   2006-06-07 10:47:27.000000000 +0200
+++ iptraf-3.0.0/src/tr.c       2006-06-07 10:38:20.000000000 +0200
@@ -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)


Index: iptraf.spec
===================================================================
RCS file: /cvs/dist/rpms/iptraf/FC-5/iptraf.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- iptraf.spec	5 Apr 2006 15:25:46 -0000	1.19
+++ iptraf.spec	21 Aug 2006 06:55:16 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A console-based network monitoring utility.
 Name: iptraf
 Version: 3.0.0
-Release: 1.3.FC5
+Release: 2%{?dist}
 Source: ftp://iptraf.seul.org/pub/iptraf/%{name}-%{version}.tar.gz
 URL: http://iptraf.seul.org/
 Patch0: iptraf-2.4.0-Makefile.patch
@@ -11,6 +11,7 @@
 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
 License: GPL
 Group: Applications/System
 BuildRoot: /var/tmp/%{name}-%{version}-root
@@ -43,6 +44,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 make -C src CFLAGS="$RPM_OPT_FLAGS" \
@@ -82,6 +84,9 @@
 %dir %attr(700,root,root) /var/lib/iptraf
 
 %changelog
+* Mon Aug 21 2006 Marcela Maslanova <mmaslano at redhat.com> 3.0.0-2.FC5
+- fix compile (#192510)
+ 
 * Wed Apr 05 2006 Miroslav Lichvar <mlichvar at redhat.com> 3.0.0-1.3.FC5
 - fix crash when parsing long network interface name (#187937)
 


