packages/iproute
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!47 update to 5.15.0

Browse Source 
From: @jiangheng12
Reviewed-by: @zengwefeng
Signed-off-by: @zengwefeng
This commit is contained in:
openeuler-ci-bot 2021-11-29 02:05:58 +00:00 committed by Gitee
commit 59d9c38ad3
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bugfix-iproute2-change-proc-to-ipnetnsproc-which-is-private.patch
View File

@ -21,7 +21,7 @@ diff --git a/ip/ipnetns.c b/ip/ipnetns.c
index fc58a04..fedc3db 100644 index fc58a04..fedc3db 100644
--- a/ip/ipnetns.c --- a/ip/ipnetns.c
+++ b/ip/ipnetns.c +++ b/ip/ipnetns.c
@@ -24,6 +24,62 @@ @@ -25,6 +25,62 @@
#include "namespace.h" #include "namespace.h"
#include "json_print.h" #include "json_print.h"
@ -84,9 +84,9 @@ index fc58a04..fedc3db 100644
static int usage(void) static int usage(void)
{ {
fprintf(stderr, fprintf(stderr,
@@ -589,10 +645,9 @@ static int netns_pids(int argc, char **argv) @@ -606,10 +663,9 @@ static int netns_pids(int argc, char **argv)
strerror(errno)); strerror(errno));
return -1; goto out;
} }
- dir = opendir("/proc/"); - dir = opendir("/proc/");
+ dir = opendir(get_proc_string()); + dir = opendir(get_proc_string());
@ -94,10 +94,10 @@ index fc58a04..fedc3db 100644
- fprintf(stderr, "Open of /proc failed: %s\n", - fprintf(stderr, "Open of /proc failed: %s\n",
- strerror(errno)); - strerror(errno));
+ fprintf(stderr, "Open of %s failed: %s\n", get_proc_string(), strerror(errno)); + fprintf(stderr, "Open of %s failed: %s\n", get_proc_string(), strerror(errno));
return -1; goto out;
} }
while ((entry = readdir(dir))) { while ((entry = readdir(dir))) {
@@ -601,8 +656,7 @@ static int netns_pids(int argc, char **argv) @@ -618,8 +674,7 @@ static int netns_pids(int argc, char **argv)
if (!is_pid(entry->d_name)) if (!is_pid(entry->d_name))
continue; continue;
@ -107,7 +107,7 @@ index fc58a04..fedc3db 100644
if (stat(pid_net_path, &st) != 0) if (stat(pid_net_path, &st) != 0)
continue; continue;
if ((st.st_dev == netst.st_dev) && if ((st.st_dev == netst.st_dev) &&
@@ -625,7 +679,7 @@ int netns_identify_pid(const char *pidstr, char *name, int len) @@ -646,7 +701,7 @@ int netns_identify_pid(const char *pidstr, char *name, int len)
name[0] = '\0'; name[0] = '\0';
@ -116,7 +116,7 @@ index fc58a04..fedc3db 100644
netns = open(net_path, O_RDONLY); netns = open(net_path, O_RDONLY);
if (netns < 0) { if (netns < 0) {
fprintf(stderr, "Cannot open network namespace: %s\n", fprintf(stderr, "Cannot open network namespace: %s\n",
@@ -856,9 +910,11 @@ static int netns_add(int argc, char **argv, bool create) @@ -917,9 +972,11 @@ static int netns_add(int argc, char **argv, bool create)
} }
/* Bind the netns last so I can watch for it */ /* Bind the netns last so I can watch for it */

10
iproute.spec
View File

@ -1,6 +1,6 @@
Name: iproute Name: iproute
Version: 5.10.0 Version: 5.15.0
Release: 2 Release: 1
Summary: Linux network configuration utilities Summary: Linux network configuration utilities
License: GPLv2+ and Public Domain License: GPLv2+ and Public Domain
URL: https://kernel.org/pub/linux/utils/net/iproute2/ URL: https://kernel.org/pub/linux/utils/net/iproute2/
@ -10,7 +10,8 @@ Patch1: bugfix-iproute2-3.10.0-fix-maddr-show.patch
Patch2: bugfix-iproute2-change-proc-to-ipnetnsproc-which-is-private.patch Patch2: bugfix-iproute2-change-proc-to-ipnetnsproc-which-is-private.patch
BuildRequires: gcc bison elfutils-libelf-devel flex iptables-devel libcap-devel BuildRequires: gcc bison elfutils-libelf-devel flex iptables-devel libcap-devel
BuildRequires: libdb-devel libmnl-devel libselinux-devel pkgconfig BuildRequires: libdb-devel libmnl-devel libselinux-devel pkgconfig libbpf-devel
Requires: libbpf psmisc
Provides: /sbin/ip iproute-tc tc Provides: /sbin/ip iproute-tc tc
Obsoletes: iproute-tc Obsoletes: iproute-tc
@ -75,6 +76,9 @@ install -m 0644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
%{_mandir}/* %{_mandir}/*
%changelog %changelog
* Fri Nov 26 2021 jiangheng <jiangheng12@huawei.com> - 5.15.0-1
- DESC: update to 5.15.0
* Mon Aug 02 2021 chenyanpanHW <chenyanpan@huawei.com> - 5.10.0-2 * Mon Aug 02 2021 chenyanpanHW <chenyanpan@huawei.com> - 5.10.0-2
- DESC: delete -S git from %autosetup, and delete BuildRequires git - DESC: delete -S git from %autosetup, and delete BuildRequires git

BIN
iproute2-5.10.0.tar.xz
View File

Binary file not shown.

BIN
iproute2-5.15.0.tar.xz Normal file
View File

Binary file not shown.