Hello community, here is the log from the commit of package ftop for openSUSE:Factory checked in at 2014-09-12 10:03:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ftop (Old) and /work/SRC/openSUSE:Factory/.ftop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ftop" Changes: -------- New Changes file: --- /dev/null 2014-07-24 01:57:42.080040256 +0200 +++ /work/SRC/openSUSE:Factory/.ftop.new/ftop.changes 2014-09-12 10:03:13.000000000 +0200 @@ -0,0 +1,23 @@ +------------------------------------------------------------------- +Wed Sep 3 14:47:11 CEST 2014 - dsterba@suse.cz + +- clean spec + +------------------------------------------------------------------- +Tue Jun 15 21:17:32 UTC 2010 - pascal.bleser@opensuse.org + +- rework the autoconf/ncurses patch to avoid calling autoreconf, + which is breaking on SLE + +- add a patch ("ftop-fix_printf_format.patch") to fix the improper + use of %u for formatting size_t variables in printf (must use %zu + instead): http://code.google.com/p/ftop/issues/detail?id=2 + +------------------------------------------------------------------- +Tue Jun 15 19:26:30 UTC 2010 - pascal.bleser@opensuse.org + +- initial package (1.0) + +- buffer overflow patch sent upstream: + http://code.google.com/p/ftop/issues/detail?id=1 + New: ---- ftop-1.0.tar.bz2 ftop-fix_buffer_overflow.patch ftop-fix_printf_format.patch ftop-ncurses.patch ftop.changes ftop.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ftop.spec ++++++ # # spec file for package ftop # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: ftop Version: 1.0 Release: 0 Summary: Open File Monitoring License: GPL-3.0 Group: System/Monitoring Url: http://code.google.com/p/ftop/ Source: http://ftop.googlecode.com/files/ftop-%{version}.tar.bz2 Patch1: ftop-ncurses.patch Patch2: ftop-fix_buffer_overflow.patch Patch3: ftop-fix_printf_format.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc BuildRequires: glibc-devel BuildRequires: libtool BuildRequires: make BuildRequires: ncurses-devel BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Ftop is to files what top is to processes. The progress of all open files and file systems can be monitored. If run as a regular user, the set of open files will be limited to those in that user's processes (which is generally all that is of interest to the user). In any case, the selection of which files to display is possible through a wide assortment of options. As with top, the items are displayed in order from most to least active. %prep %setup -q %patch1 %patch2 %patch3 %build export CFLAGS="%{optflags} -Wall -DHAVE_LIBCURSES=1" export CPPFLAGS="$CFLAGS" %configure make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install %{?_smp_mflags} %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/ftop %doc %{_mandir}/man1/ftop.1%{ext_man} %changelog ++++++ ftop-fix_buffer_overflow.patch ++++++ --- src/ftop.c.orig 2010-06-15 21:42:15.000000000 +0200 +++ src/ftop.c 2010-06-15 21:45:38.000000000 +0200 @@ -935,7 +935,7 @@ { if (bar_used > 0) { - snprintf(rate_buf, bar_used + 1, "%s", tmp_buf); + snprintf(rate_buf, bar_used >= sizeof(rate_buf) ? sizeof(rate_buf) : bar_used + 1, "%s", tmp_buf); p_attron(p, A_REVERSE); p_printf(p, "%s", rate_buf); if (bar_used > bytes) ++++++ ftop-fix_printf_format.patch ++++++ --- src/ftop.c.orig 2010-06-15 23:14:50.000000000 +0200 +++ src/ftop.c 2010-06-15 23:15:52.000000000 +0200 @@ -222,7 +222,7 @@ p_eol(p, part); cols = snprintf(tmp_buf, sizeof(tmp_buf), - "Processes: %u total, %u unreadable", + "Processes: %zu total, %zu unreadable", s->num_processes + s->num_unreadable_processes, s->num_unreadable_processes); @@ -244,7 +244,7 @@ p_eol(p, part); snprintf(tmp_buf, sizeof(tmp_buf), - "Open Files: %u regular, %u dir, %u chr, %u blk, %u pipe, %u sock, %u misc", + "Open Files: %zu regular, %zu dir, %zu chr, %zu blk, %zu pipe, %zu sock, %zu misc", s->num_reg, s->num_dir, s->num_chr, s->num_blk, s->num_pipe, s->num_sock, s->num_misc); ++++++ ftop-ncurses.patch ++++++ --- configure.ac.orig 2010-06-15 21:31:28.000000000 +0200 +++ configure.ac 2010-06-15 21:31:38.000000000 +0200 @@ -14,7 +14,7 @@ AC_PROG_MAKE_SET # Checks for libraries. -AC_CHECK_LIB([curses], [initscr]) +AC_CHECK_LIB([ncurses], [initscr]) # Checks for header files. AC_HEADER_STDC --- configure.orig 2010-06-15 23:09:48.000000000 +0200 +++ configure 2010-06-15 23:10:39.000000000 +0200 @@ -3415,13 +3415,13 @@ # Checks for libraries. -{ echo "$as_me:$LINENO: checking for initscr in -lcurses" >&5 -echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5 +echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6; } if test "${ac_cv_lib_curses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lcurses $LIBS" +LIBS="-lncurses $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -3481,7 +3481,7 @@ #define HAVE_LIBCURSES 1 _ACEOF - LIBS="-lcurses $LIBS" + LIBS="-lncurses $LIBS" fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org