Hello community,
here is the log from the commit of package iptraf checked in at Tue Nov 28 11:59:36 CET 2006.
-------- --- iptraf/iptraf.changes 2006-08-30 10:46:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/STABLE/iptraf/iptraf.changes 2006-11-28 11:34:39.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 28 11:34:15 CET 2006 - prusnak@suse.cz + +- fixed line drawing in console (lines.patch) [#223678] + +-------------------------------------------------------------------
New: ---- iptraf-3.0.0-lines.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences: ------------------ ++++++ iptraf.spec ++++++ --- /var/tmp/diff_new_pack.0uLqDq/_old 2006-11-28 11:59:18.000000000 +0100 +++ /var/tmp/diff_new_pack.0uLqDq/_new 2006-11-28 11:59:18.000000000 +0100 @@ -11,11 +11,11 @@ # norootforbuild
Name: iptraf -License: GPL +License: GNU General Public License (GPL) Group: Productivity/Networking/Diagnostic Autoreqprov: on Version: 3.0.0 -Release: 14 +Release: 32 Summary: TCP/IP Network Monitor URL: http://iptraf.seul.org/ Source: iptraf-%{version}.tar.bz2 @@ -26,6 +26,7 @@ Patch4: %{name}-%{version}-support.patch Patch5: %{name}-%{version}-strict-aliasing.patch Patch6: %{name}-%{version}-uninitialized.patch +Patch7: %{name}-%{version}-lines.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description @@ -49,6 +50,7 @@ %patch4 %patch5 %patch6 +%patch7
%build cd src @@ -80,6 +82,8 @@ /usr/sbin/rvnamed
%changelog -n iptraf +* Tue Nov 28 2006 - prusnak@suse.cz +- fixed line drawing in console (lines.patch) [#223678] * Wed Aug 30 2006 - lmichnovic@suse.cz - fixed uninitialized variable (uninitialized.patch) [#197715] * Wed Jan 25 2006 - mls@suse.de
++++++ iptraf-3.0.0-lines.patch ++++++ --- src/Makefile +++ src/Makefile @@ -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.
--- src/bar.c +++ src/bar.c @@ -14,7 +14,7 @@ * and accumulator are also reset. */
-#include <curses.h> +#include <ncurses.h> #include <time.h> #include <string.h> #include <winops.h> --- src/deskman.c +++ src/deskman.c @@ -17,7 +17,7 @@
***/
-#include <curses.h> +#include <ncurses.h> #include <stdlib.h> #include <panel.h> #include <string.h> --- src/error.c +++ src/error.c @@ -18,7 +18,7 @@
***/
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <winops.h> #include <msgboxes.h> --- src/fltedit.c +++ src/fltedit.c @@ -16,7 +16,7 @@
***/
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <string.h> #include <ctype.h> --- src/fltmgr.c +++ src/fltmgr.c @@ -16,7 +16,7 @@
***/
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <stdlib.h> #include <unistd.h> --- src/fltselect.c +++ src/fltselect.c @@ -18,7 +18,7 @@ ***/
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <unistd.h> #include <fcntl.h> --- src/hostmon.c +++ src/hostmon.c @@ -18,7 +18,7 @@
***/
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <string.h> #include <unistd.h> --- src/ifstats.c +++ src/ifstats.c @@ -17,7 +17,7 @@ ***/
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <stdlib.h> #include <string.h> --- src/ipfilter.c +++ src/ipfilter.c @@ -17,7 +17,7 @@
***/
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <string.h> #include <ctype.h> --- src/iptraf.c +++ src/iptraf.c @@ -26,7 +26,7 @@ #include <stdlib.h> #include <unistd.h> #include <getopt.h> -#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <signal.h> #include <string.h> @@ -39,6 +39,7 @@ #include <menurt.h> #include <winops.h> #include <msgboxes.h> +#include <locale.h> #include "dirs.h" #include "deskman.h" #include "fltdefs.h" @@ -489,6 +490,8 @@ int facilitytime = 0; int current_log_interval = 0;
+ setlocale(LC_CTYPE, ""); + #ifndef ALLOWUSERS if (geteuid() != 0) { fprintf(stderr, "\nIPTraf Version %s\n", VERSION); --- src/landesc.c +++ src/landesc.c @@ -19,7 +19,7 @@
***/
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <stdlib.h> #include <sys/types.h> --- src/log.c +++ src/log.c @@ -17,7 +17,7 @@
***/
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <time.h> #include <string.h> --- src/options.c +++ src/options.c @@ -16,7 +16,7 @@
***/
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <fcntl.h> #include <unistd.h> --- src/othptab.h +++ src/othptab.h @@ -14,7 +14,7 @@ #include <arpa/inet.h> #include <netinet/ip_icmp.h> #include <netinet/udp.h> -//#include <curses.h> +//#include <ncurses.h> #include <panel.h> #include <netdb.h> #include <linux/if_ether.h> --- src/packet.c +++ src/packet.c @@ -19,7 +19,7 @@ ***/
#include <asm/types.h> -#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <string.h> #include <unistd.h> --- src/pktsize.c +++ src/pktsize.c @@ -17,7 +17,7 @@
***/
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <unistd.h> #include <string.h> --- src/promisc.c +++ src/promisc.c @@ -21,7 +21,7 @@
***/
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <sys/ioctl.h> #include <sys/socket.h> --- src/revname.c +++ src/revname.c @@ -32,7 +32,7 @@ #include <sys/types.h> #include <unistd.h> #include <errno.h> -#include <curses.h> +#include <ncurses.h> #include "deskman.h" #include "getpath.h" #include "rvnamed.h" --- src/serv.c +++ src/serv.c @@ -16,7 +16,7 @@
***/
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <stdlib.h> #include <unistd.h> --- src/tcptable.h +++ src/tcptable.h @@ -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> --- src/timer.c +++ src/timer.c @@ -19,7 +19,7 @@
***/
-#include <curses.h> +#include <ncurses.h> #include <time.h>
void printelapsedtime(time_t start, time_t now, int y, int x, WINDOW * win) --- support/input.c +++ support/input.c @@ -9,7 +9,7 @@
***/
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <ctype.h> #include "input.h" --- support/labels.c +++ support/labels.c @@ -6,7 +6,7 @@ * Copyright (c) Gerard Paul Java 2001 */
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include "winops.h"
--- support/labels.h +++ support/labels.h @@ -1,4 +1,4 @@ -#include <curses.h> +#include <ncurses.h>
void tx_printkeyhelp(char *keytext, char *desc, WINDOW * win, int highattr, int textattr); --- support/listbox.c +++ support/listbox.c @@ -5,7 +5,7 @@ * Copyright (c) Gerard Paul Java 2001 */
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <string.h> #include <stdlib.h> --- support/listbox.h +++ support/listbox.h @@ -1,4 +1,4 @@ -#include <curses.h> +#include <ncurses.h>
#define MAX_TEXT_LENGTH 240
--- support/menurt.c +++ support/menurt.c @@ -11,7 +11,7 @@
***/
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include <string.h> #include <ctype.h> --- support/msgboxes.c +++ support/msgboxes.c @@ -5,7 +5,7 @@ * Copyright (c) Gerard Paul Java 2001 */
-#include <curses.h> +#include <ncurses.h> #include <panel.h> #include "winops.h"
--- support/textbox.h +++ support/textbox.h @@ -39,13 +39,13 @@ void tx_getinput(struct FIELDLIST *list, struct FIELD *field, int *exitkey); void tx_fillfields(struct FIELDLIST *list, int *aborted); void tx_destroyfields(struct FIELDLIST *list); -#include <curses.h> +#include <ncurses.h>
void tx_printkeyhelp(char *keytext, char *desc, WINDOW * win, int highattr, int textattr); void tx_menukeyhelp(int textattr, int highattr); void tx_listkeyhelp(int textattr, int highattr); -#include <curses.h> +#include <ncurses.h>
#define MAX_TEXT_LENGTH 240
@@ -152,7 +152,7 @@
***/
-#include <curses.h> +#include <ncurses.h>
void tx_stdwinset(WINDOW * win); void tx_refresh_screen(void); --- support/txbox.c +++ support/txbox.c @@ -11,7 +11,7 @@ * The tx_box function is a drop-in replacement for box(). */
-#include <curses.h> +#include <ncurses.h>
void tx_box(WINDOW *win, int vline, int hline) { --- support/winops.c +++ support/winops.c @@ -5,7 +5,7 @@
***/
-#include <curses.h> +#include <ncurses.h> #include <stdlib.h> #include <string.h>
--- support/winops.h +++ support/winops.h @@ -5,7 +5,7 @@
***/
-#include <curses.h> +#include <ncurses.h> #define tx_coloreol() tx_wcoloreol(stdscr)
void tx_stdwinset(WINDOW * win);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
-
root＠suse.de