diff mbox series

[meta-networking] mtr: upgrade 0.94 -> 0.95

Message ID 1642556519-18240-1-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [meta-networking] mtr: upgrade 0.94 -> 0.95 | expand

Commit Message

Mingyu Wang (Fujitsu) Jan. 19, 2022, 1:41 a.m. UTC 
0001-Fix-a-lot-of-Werror-format-security-errors-in-printw.patch
removed since it is included in 0.95.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...ror-format-security-errors-in-printw.patch | 68 -------------------
 .../mtr/{mtr_0.94.bb => mtr_0.95.bb}          |  6 +-
 2 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 meta-networking/recipes-support/mtr/mtr/0001-Fix-a-lot-of-Werror-format-security-errors-in-printw.patch
 rename meta-networking/recipes-support/mtr/{mtr_0.94.bb => mtr_0.95.bb} (83%)
diff mbox series

Patch

diff --git a/meta-networking/recipes-support/mtr/mtr/0001-Fix-a-lot-of-Werror-format-security-errors-in-printw.patch b/meta-networking/recipes-support/mtr/mtr/0001-Fix-a-lot-of-Werror-format-security-errors-in-printw.patch
deleted file mode 100644
index 5a8ee49d5..000000000
--- a/meta-networking/recipes-support/mtr/mtr/0001-Fix-a-lot-of-Werror-format-security-errors-in-printw.patch
+++ /dev/null
@@ -1,68 +0,0 @@ 
-From 628b4b3a16c5e3416aac3eea041ff03375fb495b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 30 Oct 2021 11:00:59 -0700
-Subject: [PATCH] Fix a lot of -Werror=format-security errors in
- printw/mvprintw
-
-In all these places a non-constant is used as a format string which
-compiler complains about. Fix by using "%s" as format.
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- ui/curses.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/ui/curses.c b/ui/curses.c
-index 34bf30d..c24cf28 100644
---- a/ui/curses.c
-+++ b/ui/curses.c
-@@ -432,7 +432,7 @@ static void mtr_curses_hosts(
-                 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 @@ static void mtr_curses_hosts(
-                 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 @@ static void mtr_curses_graph(
- 
- #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 @@ void mtr_curses_redraw(
- 
-     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 @@ void mtr_curses_redraw(
-         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);
--- 
-2.33.1
-
diff --git a/meta-networking/recipes-support/mtr/mtr_0.94.bb b/meta-networking/recipes-support/mtr/mtr_0.95.bb
similarity index 83%
rename from meta-networking/recipes-support/mtr/mtr_0.94.bb
rename to meta-networking/recipes-support/mtr/mtr_0.95.bb
index 460fd2e8b..b5e2fae50 100644
--- a/meta-networking/recipes-support/mtr/mtr_0.94.bb
+++ b/meta-networking/recipes-support/mtr/mtr_0.95.bb
@@ -8,10 +8,8 @@  LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://ui/mtr.c;beginline=5;endline=16;md5=00a894a39d53726a27386534d1c4e468"
 
-SRCREV = "2c73cbf4094e4eed343ed11ae5bab2580f3122d1"
-SRC_URI = "git://github.com/traviscross/mtr;branch=master;protocol=https \
-           file://0001-Fix-a-lot-of-Werror-format-security-errors-in-printw.patch \
-          "
+SRCREV = "852e5617fbf331cf292723702161f0ac9afe257c"
+SRC_URI = "git://github.com/traviscross/mtr;branch=master;protocol=https"
 
 S = "${WORKDIR}/git"