diff --git a/fix_for_printw_error.patch b/fix_for_printw_error.patch deleted file mode 100644 index 27c94ba55e675b011997a9ffa070614ad6830798..0000000000000000000000000000000000000000 --- a/fix_for_printw_error.patch +++ /dev/null @@ -1,48 +0,0 @@ -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-0.94.tar.gz b/mtr-0.94.tar.gz deleted file mode 100644 index 996d667dee86f07edfa62ecf733c0647f5701212..0000000000000000000000000000000000000000 Binary files a/mtr-0.94.tar.gz and /dev/null differ diff --git a/mtr-0.95.tar.gz b/mtr-0.95.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..83970b115d69065438efb2df3bf8701e30d02461 Binary files /dev/null and b/mtr-0.95.tar.gz differ diff --git a/mtr.spec b/mtr.spec index a234bca53e523a5ffca845f075c86176a3b82c94..67da87eae6671c78eec68f76cba974ffdb95c444 100644 --- a/mtr.spec +++ b/mtr.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: mtr -Version: 0.94 -Release: 4 +Version: 0.95 +Release: 1 Epoch: 2 Summary: Ping and Traceroute Network Diagnostic Tool License: GPLv2 and BSD @@ -10,7 +10,6 @@ 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 %if %{?openEuler:1}0 @@ -90,6 +89,9 @@ make test %{_mandir}/man8/* %changelog +* Tue Jun 28 2022 YukariChiba - 2:0.95-1 +- Upgrade version to 0.95 + * Sat Jun 25 2022 gaihuiying - 2:0.94-4 - Type:bugfix - CVE:NA