Hello community, here is the log from the commit of package iftop for openSUSE:Factory checked in at 2013-03-07 07:21:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iftop (Old) and /work/SRC/openSUSE:Factory/.iftop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iftop", Maintainer is "lr...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/iftop/iftop.changes 2012-12-14 09:18:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.iftop.new/iftop.changes 2013-03-07 07:21:15.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 5 17:55:17 UTC 2013 - crrodrig...@opensuse.org + +- Use ncursesw6 +- fix a number of implicit declarations and + implicit-pointer-decl warnings (iftop-implicit-pointer-decl.patch) + +------------------------------------------------------------------- New: ---- iftop-implicit-pointer-decl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iftop.spec ++++++ --- /var/tmp/diff_new_pack.r0KrfX/_old 2013-03-07 07:21:15.000000000 +0100 +++ /var/tmp/diff_new_pack.r0KrfX/_new 2013-03-07 07:21:15.000000000 +0100 @@ -26,9 +26,11 @@ Url: http://www.ex-parrot.com/~pdw/iftop/ BuildRequires: libpcap-devel BuildRequires: ncurses-devel +BuildRequires: automake Source0: %name-%real_version.tar.gz Patch1: %name-manpage.patch Patch2: %name-multicast.patch +Patch3: iftop-implicit-pointer-decl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,8 +50,12 @@ %setup -q -n %name-%real_version %patch1 -p0 %patch2 -p1 +%patch3 %build +autoreconf -fiv +export CFLAGS="%optflags $(ncursesw6-config --cflags)" +export LDFLAGS="$(ncursesw6-config --libs)" %configure %__make %{?jobs:-j%jobs} CPPFLAGS=-DUSE_GETIFADDRS ++++++ iftop-implicit-pointer-decl.patch ++++++ --- cfgfile.h.orig +++ cfgfile.h @@ -13,14 +13,14 @@ typedef struct { int value; } config_enumeration_type; -int read_config(); +int read_config(char *file, int whinge_on_error); char *config_get_string(const char *directive); int config_get_bool(const char *directive); int config_get_int(const char *directive, int *value); int config_get_float(const char *directive, float *value); int config_init(); - - +void config_set_string(const char *directive, const char* s); +int config_get_enum(const char *directive, config_enumeration_type *enumeration, int *value); #endif /* __CFGFILE_H_ */ --- iftop.c.orig +++ iftop.c @@ -3,6 +3,8 @@ * */ +#define NCURSES_NOMACROS 1 +#define NCURSES_OPAQUE 1 #include "integers.h" #include <stdio.h> @@ -62,6 +64,8 @@ struct in6_addr if_ip6_addr; extern options_t options; +extern int get_addrs_ioctl(char *interface, char if_hw_addr[], struct in_addr *if_ip_addr, struct in6_addr *if_ip6_addr); + hash_type* history; history_type history_totals; time_t last_timestamp; --- cfgfile.c.orig +++ cfgfile.c @@ -8,6 +8,7 @@ #include <stdio.h> #include <string.h> #include <errno.h> +#include <stdlib.h> #include "stringmap.h" #include "iftop.h" --- options.h.orig +++ options.h @@ -93,5 +93,6 @@ typedef struct { void options_set_defaults(); void options_read(int argc, char **argv); - +void options_read_args(int argc, char **argv); +void options_make(void); #endif /* __OPTIONS_H_ */ --- configure.in.orig +++ configure.in @@ -34,7 +34,9 @@ AM_INIT_AUTOMAKE(iftop, "1.0pre2") AC_DEFINE_UNQUOTED(IFTOP_VERSION, "$VERSION", [The iftop version number]) dnl Make sure we have a C compiler.... -AC_PROG_CC +AC_PROG_CC_STDC +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE AC_HEADER_STDC dnl --- Makefile.am.orig +++ Makefile.am @@ -10,6 +10,7 @@ # $Id: Makefile.am,v 1.11 2010/11/27 17:19:25 pdw Exp $ # +AM_CPPFLAGS = -include $(top_builddir)/config.h sbin_PROGRAMS = iftop #iftop-dump --- edline.c.orig +++ edline.c @@ -6,6 +6,9 @@ static const char rcsid[] = "$Id: edline.c,v 1.2 2002/11/04 12:27:35 chris Exp $"; +#define NCURSES_NOMACROS 1 +#define NCURSES_OPAQUE 1 + #include <ctype.h> #include <curses.h> #include <string.h> --- ui.c.orig +++ ui.c @@ -3,6 +3,9 @@ * */ +#define NCURSES_NOMACROS 1 +#define NCURSES_OPAQUE 1 + #include <sys/types.h> #include <ctype.h> -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
