diff --git a/fix_for_printw_error.patch b/fix_for_printw_error.patch new file mode 100644 index 0000000000000000000000000000000000000000..27c94ba55e675b011997a9ffa070614ad6830798 --- /dev/null +++ b/fix_for_printw_error.patch @@ -0,0 +1,48 @@ +diff -uNr mtr-0.94.orig/ui/curses.c mtr-0.94/ui/curses.c +--- mtr-0.94.orig/ui/curses.c 2020-09-24 16:26:14.000000000 +0800 ++++ mtr-0.94/ui/curses.c 2022-03-10 15:35:51.374026715 +0800 +@@ -432,7 +432,7 @@ + attron(A_BOLD); + #ifdef HAVE_IPINFO + if (is_printii(ctl)) +- printw(fmt_ipinfo(ctl, addr)); ++ printw("%s", fmt_ipinfo(ctl, addr)); + #endif + if (name != NULL) { + if (ctl->show_ips) +@@ -485,7 +485,7 @@ + printw("\n "); + #ifdef HAVE_IPINFO + if (is_printii(ctl)) +- printw(fmt_ipinfo(ctl, addrs)); ++ printw("%s", fmt_ipinfo(ctl, addrs)); + #endif + if (name != NULL) { + if (ctl->show_ips) +@@ -650,7 +650,7 @@ + + #ifdef HAVE_IPINFO + if (is_printii(ctl)) +- printw(fmt_ipinfo(ctl, addr)); ++ printw("%s", fmt_ipinfo(ctl, addr)); + #endif + name = dns_lookup(ctl, addr); + printw("%s", name ? name : strlongip(ctl, addr)); +@@ -700,7 +700,7 @@ + + mvprintw(1, 0, "%s (%s) -> %s", ctl->LocalHostname, net_localaddr(), ctl->Hostname); + t = time(NULL); +- mvprintw(1, maxx - 25, iso_time(&t)); ++ mvprintw(1, maxx - 25, "%s", iso_time(&t)); + printw("\n"); + + printw("Keys: "); +@@ -760,7 +760,7 @@ + startstat = padding - 2; + + snprintf(msg, sizeof(msg), " Last %3d pings", max_cols); +- mvprintw(rowstat - 1, startstat, msg); ++ mvprintw(rowstat - 1, startstat, "%s", msg); + + attroff(A_BOLD); + move(rowstat, 0); diff --git a/mtr.spec b/mtr.spec index fd19c2f91859c312823cd868cb8b11d426a85cbb..f754fd7a29cc4facd49a5d9de8f8518ba8088bc7 100644 --- a/mtr.spec +++ b/mtr.spec @@ -2,7 +2,7 @@ Name: mtr Version: 0.94 -Release: 2 +Release: 3 Epoch: 2 Summary: Ping and Traceroute Network Diagnostic Tool License: GPLv2 and BSD @@ -10,7 +10,7 @@ URL: https://www.bitwizard.nl/mtr/ Source0: https://github.com/traviscross/mtr/archive/v%{version}/%{name}-%{version}.tar.gz Source1: net-x%{name}.desktop Source2: mtr-gtk-pkexec-wrapper.sh - +Patch0: fix_for_printw_error.patch BuildRequires: git autoconf automake libtool ncurses-devel gtk2-devel desktop-file-utils Provides: %{name}-gtk = %{epoch}:%{version}-%{release} @@ -25,7 +25,7 @@ and percentage for all network hops between the systems. %package_help %prep -%autosetup -n %{name}-%{version} +%autosetup -n %{name}-%{version} -p1 %build export CFLAGS="%{optflags} -fPIE" @@ -68,6 +68,9 @@ make test %{_mandir}/man8/* %changelog +* Fri Mar 11 2022 lin.zhang - 0.94-3 +- add patch fix_for_printw_error.patch + * Wed Mar 3 2021 lin.zhang - 0.94-2 - modify net-xmtr.desktop file for Xfce4 Traceroute