From 45ce976b2b8237bdce92e63696b45ac46ff53af4 Mon Sep 17 00:00:00 2001 From: wangmy Date: Wed, 19 Jan 2022 09:41:57 +0800 Subject: mtr: upgrade 0.94 -> 0.95 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 Signed-off-by: Khem Raj --- ...f-Werror-format-security-errors-in-printw.patch | 68 ---------------------- meta-networking/recipes-support/mtr/mtr_0.94.bb | 27 --------- meta-networking/recipes-support/mtr/mtr_0.95.bb | 25 ++++++++ 3 files changed, 25 insertions(+), 95 deletions(-) delete mode 100644 meta-networking/recipes-support/mtr/mtr/0001-Fix-a-lot-of-Werror-format-security-errors-in-printw.patch delete mode 100644 meta-networking/recipes-support/mtr/mtr_0.94.bb create mode 100644 meta-networking/recipes-support/mtr/mtr_0.95.bb 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 5a8ee49d53..0000000000 --- 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 -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 ---- - 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.94.bb deleted file mode 100644 index 460fd2e8b6..0000000000 --- a/meta-networking/recipes-support/mtr/mtr_0.94.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Combined traceroute and ping utility" -DESCRIPTION = "mtr combines the functionality of the 'traceroute' and 'ping' programs in a single network diagnostic tool." -HOMEPAGE = "http://www.bitwizard.nl/mtr/" -SECTION = "net" -DEPENDS = "ncurses" - -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 \ - " - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--without-gtk" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -PACKAGES += "${PN}-bash-completions" - -FILES:${PN}-bash-completions = "${datadir}/bash-completion/" diff --git a/meta-networking/recipes-support/mtr/mtr_0.95.bb b/meta-networking/recipes-support/mtr/mtr_0.95.bb new file mode 100644 index 0000000000..b5e2fae506 --- /dev/null +++ b/meta-networking/recipes-support/mtr/mtr_0.95.bb @@ -0,0 +1,25 @@ +SUMMARY = "Combined traceroute and ping utility" +DESCRIPTION = "mtr combines the functionality of the 'traceroute' and 'ping' programs in a single network diagnostic tool." +HOMEPAGE = "http://www.bitwizard.nl/mtr/" +SECTION = "net" +DEPENDS = "ncurses" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://ui/mtr.c;beginline=5;endline=16;md5=00a894a39d53726a27386534d1c4e468" + +SRCREV = "852e5617fbf331cf292723702161f0ac9afe257c" +SRC_URI = "git://github.com/traviscross/mtr;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--without-gtk" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +PACKAGES += "${PN}-bash-completions" + +FILES:${PN}-bash-completions = "${datadir}/bash-completion/" -- cgit v1.2.3-54-g00ecf