From b6c1fa7c2b8c1bfa922b92b31af24317f433f688 Mon Sep 17 00:00:00 2001 From: gaoxingwang Date: Fri, 11 Nov 2022 11:49:12 +0800 Subject: [PATCH] rdnssd: remove unused parameter Signed-off-by: gaoxingwang (cherry picked from commit 5bfed34bae6ac0da2d671973130f32945a4aa0ec) --- backport-rdnssd-remove-unused-parameter.patch | 34 +++++++++++++++++++ ndisc6.spec | 13 +++++-- 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 backport-rdnssd-remove-unused-parameter.patch diff --git a/backport-rdnssd-remove-unused-parameter.patch b/backport-rdnssd-remove-unused-parameter.patch new file mode 100644 index 0000000..d04bc79 --- /dev/null +++ b/backport-rdnssd-remove-unused-parameter.patch @@ -0,0 +1,34 @@ +From f1835bc849fad80e053d3e1e7a8b117ee6e6284d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Wed, 11 May 2022 21:30:54 +0300 +Subject: [PATCH] rdnssd: remove unused parameter + +--- + rdnss/rdnssd.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rdnss/rdnssd.c b/rdnss/rdnssd.c +index 57942d3..b87edb2 100644 +--- a/rdnss/rdnssd.c ++++ b/rdnss/rdnssd.c +@@ -291,7 +291,7 @@ void parse_rdnss (const struct nd_opt_hdr *opt, unsigned int ifindex) + rdnss_update(addr, ifindex, lifetime); + } + +-void parse_dnssl (const struct nd_opt_hdr *opt, unsigned int ifindex) ++void parse_dnssl (const struct nd_opt_hdr *opt) + { + struct nd_opt_dnssl *dnssl_opt; + size_t nd_opt_len = opt->nd_opt_len; +@@ -396,7 +396,7 @@ int parse_nd_opts (const struct nd_opt_hdr *opt, size_t opts_len, unsigned int i + break; + + case ND_OPT_DNSSL: +- parse_dnssl(opt, ifindex); ++ parse_dnssl(opt); + break; + + default: +-- +2.27.0 + diff --git a/ndisc6.spec b/ndisc6.spec index ea402ac..ccb997d 100644 --- a/ndisc6.spec +++ b/ndisc6.spec @@ -1,13 +1,14 @@ Name: ndisc6 Version: 1.0.4 -Release: 4 +Release: 5 Summary: IPv6 diagnostic tools License: GPLv2 or GPLv3 URL: http://www.remlab.net/ndisc6 Source0: http://www.remlab.net/files/ndisc6/%{name}-%{version}.tar.bz2 -Patch0: bugfix-add-self-mac-check.patch -Patch1: bugfix-add-SO_BINDTODEVICE.patch +Patch0: bugfix-add-self-mac-check.patch +Patch1: bugfix-add-SO_BINDTODEVICE.patch +Patch2: backport-rdnssd-remove-unused-parameter.patch BuildRequires: gcc perl-generators @@ -47,6 +48,12 @@ It includes the follwing programs : %{_mandir}/man* %changelog +* Fri Nov 11 2022 gaoxingwang - 1.0.4-5 +- Type:bugfix +- CVE:NA +- SUG:restart +- DESC: rdnssd: remove unused parameter + * Fri Apr 29 2022 gaoxingwang - 1.0.4-4 - Type:bugfix - CVE:NA -- Gitee