From 34a4fc8582afd78efb65d022e5c51924c3e46d2f Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 26 Sep 2019 09:57:04 +0200 Subject: [PATCH 01/54] Rebase package on top of iproute2-5.3.0 --- .gitignore | 1 + ...l-fix-ip-6-show-change-dev-name-cmds.patch | 41 --- ...intf-with-asprintf-when-dealing-with.patch | 341 ++++++++++++++++++ ...hen-changing-IPv6-tunnel-without-tun.patch | 52 --- ...oute-fix-json-formatting-for-metrics.patch | 78 ---- ...-utils-move-parse_percent-to-tc_util.patch | 113 ------ ...nstrain-percentage-in-0-100-interval.patch | 97 ----- ...evlink-health-dump-show-command-to-d.patch | 64 ---- 0007-devlink-Fix-binary-values-print.patch | 83 ----- ...nclosing-array-brackets-binary-print.patch | 47 --- ...-backslash-escape-typo-in-jsonw_puts.patch | 30 -- iproute.spec | 18 +- sources | 2 +- 13 files changed, 350 insertions(+), 617 deletions(-) delete mode 100644 0001-Revert-ip6tunnel-fix-ip-6-show-change-dev-name-cmds.patch create mode 100644 0001-bpf-replace-snprintf-with-asprintf-when-dealing-with.patch delete mode 100644 0002-ip-tunnel-warn-when-changing-IPv6-tunnel-without-tun.patch delete mode 100644 0003-ip-route-fix-json-formatting-for-metrics.patch delete mode 100644 0004-utils-move-parse_percent-to-tc_util.patch delete mode 100644 0005-tc-util-constrain-percentage-in-0-100-interval.patch delete mode 100644 0006-devlink-Change-devlink-health-dump-show-command-to-d.patch delete mode 100644 0007-devlink-Fix-binary-values-print.patch delete mode 100644 0008-devlink-Remove-enclosing-array-brackets-binary-print.patch delete mode 100644 0009-json-fix-backslash-escape-typo-in-jsonw_puts.patch diff --git a/.gitignore b/.gitignore index 1af7f79..1103d18 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /iproute2-5.0.0.tar.xz /iproute2-5.1.0.tar.xz /iproute2-5.2.0.tar.xz +/iproute2-5.3.0.tar.xz diff --git a/0001-Revert-ip6tunnel-fix-ip-6-show-change-dev-name-cmds.patch b/0001-Revert-ip6tunnel-fix-ip-6-show-change-dev-name-cmds.patch deleted file mode 100644 index 5964cb0..0000000 --- a/0001-Revert-ip6tunnel-fix-ip-6-show-change-dev-name-cmds.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8cfac8f16a88bac7453da91aeca9e2c4244ca92a Mon Sep 17 00:00:00 2001 -From: Andrea Claudi -Date: Tue, 9 Jul 2019 15:16:50 +0200 -Subject: [PATCH] Revert "ip6tunnel: fix 'ip -6 {show|change} dev ' cmds" - -This reverts commit ba126dcad20e6d0e472586541d78bdd1ac4f1123. -It breaks tunnel creation when using 'dev' parameter: - -$ ip link add type dummy -$ ip -6 tunnel add ip6tnl1 mode ip6ip6 remote 2001:db8:ffff:100::2 local 2001:db8:ffff:100::1 hoplimit 1 tclass 0x0 dev dummy0 -add tunnel "ip6tnl0" failed: File exists - -dev parameter must be used to specify the device to which -the tunnel is binded, and not the tunnel itself. - -Reported-by: Jianwen Ji -Reviewed-by: Matteo Croce -Signed-off-by: Andrea Claudi -Signed-off-by: Stephen Hemminger -(cherry picked from commit ad04dbc5b41df509cd6925eab36af73000632fd2) -Signed-off-by: Phil Sutter ---- - ip/ip6tunnel.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c -index 56fd3466ed062..999408ed801b1 100644 ---- a/ip/ip6tunnel.c -+++ b/ip/ip6tunnel.c -@@ -298,8 +298,6 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm2 *p) - p->link = ll_name_to_index(medium); - if (!p->link) - return nodev(medium); -- else -- strlcpy(p->name, medium, sizeof(p->name)); - } - return 0; - } --- -2.22.0 - diff --git a/0001-bpf-replace-snprintf-with-asprintf-when-dealing-with.patch b/0001-bpf-replace-snprintf-with-asprintf-when-dealing-with.patch new file mode 100644 index 0000000..85c1c85 --- /dev/null +++ b/0001-bpf-replace-snprintf-with-asprintf-when-dealing-with.patch @@ -0,0 +1,341 @@ +From e72287abe26945d0cd453021baa75dd51b6c271b Mon Sep 17 00:00:00 2001 +From: Andrea Claudi +Date: Mon, 16 Sep 2019 15:00:55 +0200 +Subject: [PATCH] bpf: replace snprintf with asprintf when dealing with long + buffers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reduces stack usage, as asprintf allocates memory on the heap. + +This indirectly fixes a snprintf truncation warning (from gcc v9.2.1): + +bpf.c: In function ‘bpf_get_work_dir’: +bpf.c:784:49: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=] + 784 | snprintf(bpf_wrk_dir, sizeof(bpf_wrk_dir), "%s/", mnt); + | ^ +bpf.c:784:2: note: ‘snprintf’ output between 2 and 4097 bytes into a destination of size 4096 + 784 | snprintf(bpf_wrk_dir, sizeof(bpf_wrk_dir), "%s/", mnt); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Fixes: e42256699cac ("bpf: make tc's bpf loader generic and move into lib") +Signed-off-by: Andrea Claudi +Signed-off-by: David Ahern +(cherry picked from commit c0325b06382cb4f7ebfaf80c29c8800d74666fd9) +Signed-off-by: Phil Sutter +--- + lib/bpf.c | 155 ++++++++++++++++++++++++++++++++++++++++-------------- + 1 file changed, 116 insertions(+), 39 deletions(-) + +diff --git a/lib/bpf.c b/lib/bpf.c +index 23cb0d96a85ba..10cf9bf44419a 100644 +--- a/lib/bpf.c ++++ b/lib/bpf.c +@@ -406,13 +406,21 @@ static int bpf_derive_elf_map_from_fdinfo(int fd, struct bpf_elf_map *map, + struct bpf_map_ext *ext) + { + unsigned int val, owner_type = 0, owner_jited = 0; +- char file[PATH_MAX], buff[4096]; ++ char *file = NULL; ++ char buff[4096]; + FILE *fp; ++ int ret; + +- snprintf(file, sizeof(file), "/proc/%d/fdinfo/%d", getpid(), fd); ++ ret = asprintf(&file, "/proc/%d/fdinfo/%d", getpid(), fd); ++ if (ret < 0) { ++ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); ++ free(file); ++ return ret; ++ } + memset(map, 0, sizeof(*map)); + + fp = fopen(file, "r"); ++ free(file); + if (!fp) { + fprintf(stderr, "No procfs support?!\n"); + return -EIO; +@@ -600,8 +608,9 @@ int bpf_trace_pipe(void) + 0, + }; + int fd_in, fd_out = STDERR_FILENO; +- char tpipe[PATH_MAX]; ++ char *tpipe = NULL; + const char *mnt; ++ int ret; + + mnt = bpf_find_mntpt("tracefs", TRACEFS_MAGIC, tracefs_mnt, + sizeof(tracefs_mnt), tracefs_known_mnts); +@@ -610,9 +619,15 @@ int bpf_trace_pipe(void) + return -1; + } + +- snprintf(tpipe, sizeof(tpipe), "%s/trace_pipe", mnt); ++ ret = asprintf(&tpipe, "%s/trace_pipe", mnt); ++ if (ret < 0) { ++ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); ++ free(tpipe); ++ return ret; ++ } + + fd_in = open(tpipe, O_RDONLY); ++ free(tpipe); + if (fd_in < 0) + return -1; + +@@ -633,37 +648,50 @@ int bpf_trace_pipe(void) + + static int bpf_gen_global(const char *bpf_sub_dir) + { +- char bpf_glo_dir[PATH_MAX]; ++ char *bpf_glo_dir = NULL; + int ret; + +- snprintf(bpf_glo_dir, sizeof(bpf_glo_dir), "%s/%s/", +- bpf_sub_dir, BPF_DIR_GLOBALS); ++ ret = asprintf(&bpf_glo_dir, "%s/%s/", bpf_sub_dir, BPF_DIR_GLOBALS); ++ if (ret < 0) { ++ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); ++ goto out; ++ } + + ret = mkdir(bpf_glo_dir, S_IRWXU); + if (ret && errno != EEXIST) { + fprintf(stderr, "mkdir %s failed: %s\n", bpf_glo_dir, + strerror(errno)); +- return ret; ++ goto out; + } + +- return 0; ++ ret = 0; ++out: ++ free(bpf_glo_dir); ++ return ret; + } + + static int bpf_gen_master(const char *base, const char *name) + { +- char bpf_sub_dir[PATH_MAX + NAME_MAX + 1]; ++ char *bpf_sub_dir = NULL; + int ret; + +- snprintf(bpf_sub_dir, sizeof(bpf_sub_dir), "%s%s/", base, name); ++ ret = asprintf(&bpf_sub_dir, "%s%s/", base, name); ++ if (ret < 0) { ++ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); ++ goto out; ++ } + + ret = mkdir(bpf_sub_dir, S_IRWXU); + if (ret && errno != EEXIST) { + fprintf(stderr, "mkdir %s failed: %s\n", bpf_sub_dir, + strerror(errno)); +- return ret; ++ goto out; + } + +- return bpf_gen_global(bpf_sub_dir); ++ ret = bpf_gen_global(bpf_sub_dir); ++out: ++ free(bpf_sub_dir); ++ return ret; + } + + static int bpf_slave_via_bind_mnt(const char *full_name, +@@ -692,13 +720,22 @@ static int bpf_slave_via_bind_mnt(const char *full_name, + static int bpf_gen_slave(const char *base, const char *name, + const char *link) + { +- char bpf_lnk_dir[PATH_MAX + NAME_MAX + 1]; +- char bpf_sub_dir[PATH_MAX + NAME_MAX]; ++ char *bpf_lnk_dir = NULL; ++ char *bpf_sub_dir = NULL; + struct stat sb = {}; + int ret; + +- snprintf(bpf_lnk_dir, sizeof(bpf_lnk_dir), "%s%s/", base, link); +- snprintf(bpf_sub_dir, sizeof(bpf_sub_dir), "%s%s", base, name); ++ ret = asprintf(&bpf_lnk_dir, "%s%s/", base, link); ++ if (ret < 0) { ++ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); ++ goto out; ++ } ++ ++ ret = asprintf(&bpf_sub_dir, "%s%s", base, name); ++ if (ret < 0) { ++ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); ++ goto out; ++ } + + ret = symlink(bpf_lnk_dir, bpf_sub_dir); + if (ret) { +@@ -706,25 +743,30 @@ static int bpf_gen_slave(const char *base, const char *name, + if (errno != EPERM) { + fprintf(stderr, "symlink %s failed: %s\n", + bpf_sub_dir, strerror(errno)); +- return ret; ++ goto out; + } + +- return bpf_slave_via_bind_mnt(bpf_sub_dir, +- bpf_lnk_dir); ++ ret = bpf_slave_via_bind_mnt(bpf_sub_dir, bpf_lnk_dir); ++ goto out; + } + + ret = lstat(bpf_sub_dir, &sb); + if (ret) { + fprintf(stderr, "lstat %s failed: %s\n", + bpf_sub_dir, strerror(errno)); +- return ret; ++ goto out; + } + +- if ((sb.st_mode & S_IFMT) != S_IFLNK) +- return bpf_gen_global(bpf_sub_dir); ++ if ((sb.st_mode & S_IFMT) != S_IFLNK) { ++ ret = bpf_gen_global(bpf_sub_dir); ++ goto out; ++ } + } + +- return 0; ++out: ++ free(bpf_lnk_dir); ++ free(bpf_sub_dir); ++ return ret; + } + + static int bpf_gen_hierarchy(const char *base) +@@ -742,7 +784,7 @@ static int bpf_gen_hierarchy(const char *base) + static const char *bpf_get_work_dir(enum bpf_prog_type type) + { + static char bpf_tmp[PATH_MAX] = BPF_DIR_MNT; +- static char bpf_wrk_dir[PATH_MAX]; ++ static char *bpf_wrk_dir; + static const char *mnt; + static bool bpf_mnt_cached; + const char *mnt_env = getenv(BPF_ENV_MNT); +@@ -781,7 +823,12 @@ static const char *bpf_get_work_dir(enum bpf_prog_type type) + } + } + +- snprintf(bpf_wrk_dir, sizeof(bpf_wrk_dir), "%s/", mnt); ++ ret = asprintf(&bpf_wrk_dir, "%s/", mnt); ++ if (ret < 0) { ++ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); ++ free(bpf_wrk_dir); ++ goto out; ++ } + + ret = bpf_gen_hierarchy(bpf_wrk_dir); + if (ret) { +@@ -1438,31 +1485,48 @@ static int bpf_probe_pinned(const char *name, const struct bpf_elf_ctx *ctx, + + static int bpf_make_obj_path(const struct bpf_elf_ctx *ctx) + { +- char tmp[PATH_MAX]; ++ char *tmp = NULL; + int ret; + +- snprintf(tmp, sizeof(tmp), "%s/%s", bpf_get_work_dir(ctx->type), +- ctx->obj_uid); ++ ret = asprintf(&tmp, "%s/%s", bpf_get_work_dir(ctx->type), ctx->obj_uid); ++ if (ret < 0) { ++ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); ++ goto out; ++ } + + ret = mkdir(tmp, S_IRWXU); + if (ret && errno != EEXIST) { + fprintf(stderr, "mkdir %s failed: %s\n", tmp, strerror(errno)); +- return ret; ++ goto out; + } + +- return 0; ++ ret = 0; ++out: ++ free(tmp); ++ return ret; + } + + static int bpf_make_custom_path(const struct bpf_elf_ctx *ctx, + const char *todo) + { +- char tmp[PATH_MAX], rem[PATH_MAX], *sub; ++ char *tmp = NULL; ++ char *rem = NULL; ++ char *sub; + int ret; + +- snprintf(tmp, sizeof(tmp), "%s/../", bpf_get_work_dir(ctx->type)); +- snprintf(rem, sizeof(rem), "%s/", todo); +- sub = strtok(rem, "/"); ++ ret = asprintf(&tmp, "%s/../", bpf_get_work_dir(ctx->type)); ++ if (ret < 0) { ++ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); ++ goto out; ++ } + ++ ret = asprintf(&rem, "%s/", todo); ++ if (ret < 0) { ++ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); ++ goto out; ++ } ++ ++ sub = strtok(rem, "/"); + while (sub) { + if (strlen(tmp) + strlen(sub) + 2 > PATH_MAX) + return -EINVAL; +@@ -1474,13 +1538,17 @@ static int bpf_make_custom_path(const struct bpf_elf_ctx *ctx, + if (ret && errno != EEXIST) { + fprintf(stderr, "mkdir %s failed: %s\n", tmp, + strerror(errno)); +- return ret; ++ goto out; + } + + sub = strtok(NULL, "/"); + } + +- return 0; ++ ret = 0; ++out: ++ free(rem); ++ free(tmp); ++ return ret; + } + + static int bpf_place_pinned(int fd, const char *name, +@@ -2587,14 +2655,23 @@ struct bpf_jited_aux { + + static int bpf_derive_prog_from_fdinfo(int fd, struct bpf_prog_data *prog) + { +- char file[PATH_MAX], buff[4096]; ++ char *file = NULL; ++ char buff[4096]; + unsigned int val; + FILE *fp; ++ int ret; ++ ++ ret = asprintf(&file, "/proc/%d/fdinfo/%d", getpid(), fd); ++ if (ret < 0) { ++ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); ++ free(file); ++ return ret; ++ } + +- snprintf(file, sizeof(file), "/proc/%d/fdinfo/%d", getpid(), fd); + memset(prog, 0, sizeof(*prog)); + + fp = fopen(file, "r"); ++ free(file); + if (!fp) { + fprintf(stderr, "No procfs support?!\n"); + return -EIO; +-- +2.23.0 + diff --git a/0002-ip-tunnel-warn-when-changing-IPv6-tunnel-without-tun.patch b/0002-ip-tunnel-warn-when-changing-IPv6-tunnel-without-tun.patch deleted file mode 100644 index acf0c21..0000000 --- a/0002-ip-tunnel-warn-when-changing-IPv6-tunnel-without-tun.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 141c6e6397d373126bba14982678dd6f1e9fbfd7 Mon Sep 17 00:00:00 2001 -From: Andrea Claudi -Date: Tue, 9 Jul 2019 15:16:51 +0200 -Subject: [PATCH] ip tunnel: warn when changing IPv6 tunnel without tunnel name - -Tunnel change fails if a tunnel name is not specified while using -'ip -6 tunnel change'. However, no warning message is printed and -no error code is returned. - -$ ip -6 tunnel add ip6tnl1 mode ip6gre local fd::1 remote fd::2 tos inherit ttl 127 encaplimit none dev dummy0 -$ ip -6 tunnel change dev dummy0 local 2001:1234::1 remote 2001:1234::2 -$ ip -6 tunnel show ip6tnl1 -ip6tnl1: gre/ipv6 remote fd::2 local fd::1 dev dummy0 encaplimit none hoplimit 127 tclass inherit flowlabel 0x00000 (flowinfo 0x00000000) - -This commit checks if tunnel interface name is equal to an empty -string: in this case, it prints a warning message to the user. -It intentionally avoids to return an error to not break existing -script setup. - -This is the output after this commit: -$ ip -6 tunnel add ip6tnl1 mode ip6gre local fd::1 remote fd::2 tos inherit ttl 127 encaplimit none dev dummy0 -$ ip -6 tunnel change dev dummy0 local 2001:1234::1 remote 2001:1234::2 -Tunnel interface name not specified -$ ip -6 tunnel show ip6tnl1 -ip6tnl1: gre/ipv6 remote fd::2 local fd::1 dev dummy0 encaplimit none hoplimit 127 tclass inherit flowlabel 0x00000 (flowinfo 0x00000000) - -Reviewed-by: Matteo Croce -Signed-off-by: Andrea Claudi -Signed-off-by: Stephen Hemminger -(cherry picked from commit d035cc1b4e83e2589ea2115cdc2fa7c6d3693a5a) -Signed-off-by: Phil Sutter ---- - ip/ip6tunnel.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c -index 999408ed801b1..e3da11eb4518e 100644 ---- a/ip/ip6tunnel.c -+++ b/ip/ip6tunnel.c -@@ -386,6 +386,9 @@ static int do_add(int cmd, int argc, char **argv) - if (parse_args(argc, argv, cmd, &p) < 0) - return -1; - -+ if (!*p.name) -+ fprintf(stderr, "Tunnel interface name not specified\n"); -+ - if (p.proto == IPPROTO_GRE) - basedev = "ip6gre0"; - else if (p.i_flags & VTI_ISVTI) --- -2.22.0 - diff --git a/0003-ip-route-fix-json-formatting-for-metrics.patch b/0003-ip-route-fix-json-formatting-for-metrics.patch deleted file mode 100644 index 092ba3e..0000000 --- a/0003-ip-route-fix-json-formatting-for-metrics.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 9da7fb1dd27624ed6ab62f5595451f43c3a07d2d Mon Sep 17 00:00:00 2001 -From: Andrea Claudi -Date: Mon, 8 Jul 2019 11:36:42 +0200 -Subject: [PATCH] ip-route: fix json formatting for metrics - -Setting metrics for routes currently lead to non-parsable -json output. For example: - -$ ip link add type dummy -$ ip route add 192.168.2.0 dev dummy0 metric 100 mtu 1000 rto_min 3 -$ ip -j route | jq -parse error: ':' not as part of an object at line 1, column 319 - -Fixing this opening a json object in the metrics array and using -print_string() instead of fprintf(). - -This is the output for the above commands applying this patch: - -$ ip -j route | jq -[ - { - "dst": "192.168.2.0", - "dev": "dummy0", - "scope": "link", - "metric": 100, - "flags": [], - "metrics": [ - { - "mtu": 1000, - "rto_min": 3 - } - ] - } -] - -Fixes: 663c3cb23103f ("iproute: implement JSON and color output") -Fixes: 968272e791710 ("iproute: refactor metrics print") -Signed-off-by: Andrea Claudi -Reported-by: Frank Hofmann -Signed-off-by: Stephen Hemminger -(cherry picked from commit 89ce8012d71f5689074dc4cbe3db102cbdf76460) -Signed-off-by: Phil Sutter ---- - ip/iproute.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/ip/iproute.c b/ip/iproute.c -index 1669e0138259e..2f9b612b0b506 100644 ---- a/ip/iproute.c -+++ b/ip/iproute.c -@@ -578,6 +578,7 @@ static void print_rta_metrics(FILE *fp, const struct rtattr *rta) - int i; - - open_json_array(PRINT_JSON, "metrics"); -+ open_json_object(NULL); - - parse_rtattr(mxrta, RTAX_MAX, RTA_DATA(rta), RTA_PAYLOAD(rta)); - -@@ -611,7 +612,7 @@ static void print_rta_metrics(FILE *fp, const struct rtattr *rta) - print_rtax_features(fp, val); - break; - default: -- fprintf(fp, "%u ", val); -+ print_uint(PRINT_ANY, mx_names[i], "%u ", val); - break; - - case RTAX_RTT: -@@ -639,6 +640,7 @@ static void print_rta_metrics(FILE *fp, const struct rtattr *rta) - } - } - -+ close_json_object(); - close_json_array(PRINT_JSON, NULL); - } - --- -2.22.0 - diff --git a/0004-utils-move-parse_percent-to-tc_util.patch b/0004-utils-move-parse_percent-to-tc_util.patch deleted file mode 100644 index fe3ce46..0000000 --- a/0004-utils-move-parse_percent-to-tc_util.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 5b17171ce7363e597009e07fb143522a2d79c77b Mon Sep 17 00:00:00 2001 -From: Andrea Claudi -Date: Fri, 28 Jun 2019 18:03:45 +0200 -Subject: [PATCH] utils: move parse_percent() to tc_util - -As parse_percent() is used only in tc. - -This reduces ip, bridge and genl binaries size: - -$ bloat-o-meter -t bridge/bridge bridge/bridge.new -add/remove: 0/1 grow/shrink: 0/0 up/down: 0/-109 (-109) -Total: Before=50973, After=50864, chg -0.21% - -$ bloat-o-meter -t genl/genl genl/genl.new -add/remove: 0/1 grow/shrink: 0/0 up/down: 0/-109 (-109) -Total: Before=30298, After=30189, chg -0.36% - -$ bloat-o-meter ip/ip ip/ip.new -add/remove: 0/1 grow/shrink: 0/0 up/down: 0/-109 (-109) -Total: Before=674164, After=674055, chg -0.02% - -Signed-off-by: Andrea Claudi -Signed-off-by: David Ahern -(cherry picked from commit 1e5746d5e13d895b63da954f0290cffbb076cefa) -Signed-off-by: Phil Sutter ---- - include/utils.h | 1 - - lib/utils.c | 16 ---------------- - tc/tc_util.c | 16 ++++++++++++++++ - tc/tc_util.h | 1 + - 4 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/include/utils.h b/include/utils.h -index 927fdc17e09dd..f9a4916b517ab 100644 ---- a/include/utils.h -+++ b/include/utils.h -@@ -145,7 +145,6 @@ int get_addr_rta(inet_prefix *dst, const struct rtattr *rta, int family); - int get_addr_ila(__u64 *val, const char *arg); - - int read_prop(const char *dev, char *prop, long *value); --int parse_percent(double *val, const char *str); - int get_hex(char c); - int get_integer(int *val, const char *arg, int base); - int get_unsigned(unsigned *val, const char *arg, int base); -diff --git a/lib/utils.c b/lib/utils.c -index be0f11b00280d..5da9a47848966 100644 ---- a/lib/utils.c -+++ b/lib/utils.c -@@ -101,22 +101,6 @@ out: - return -1; - } - --/* Parse a percent e.g: '30%' -- * return: 0 = ok, -1 = error, 1 = out of range -- */ --int parse_percent(double *val, const char *str) --{ -- char *p; -- -- *val = strtod(str, &p) / 100.; -- if (*val == HUGE_VALF || *val == HUGE_VALL) -- return 1; -- if (*p && strcmp(p, "%")) -- return -1; -- -- return 0; --} -- - int get_hex(char c) - { - if (c >= 'A' && c <= 'F') -diff --git a/tc/tc_util.c b/tc/tc_util.c -index e5d15281581df..53d15e08e9734 100644 ---- a/tc/tc_util.c -+++ b/tc/tc_util.c -@@ -190,6 +190,22 @@ static const struct rate_suffix { - { NULL } - }; - -+/* Parse a percent e.g: '30%' -+ * return: 0 = ok, -1 = error, 1 = out of range -+ */ -+int parse_percent(double *val, const char *str) -+{ -+ char *p; -+ -+ *val = strtod(str, &p) / 100.; -+ if (*val == HUGE_VALF || *val == HUGE_VALL) -+ return 1; -+ if (*p && strcmp(p, "%")) -+ return -1; -+ -+ return 0; -+} -+ - static int parse_percent_rate(char *rate, size_t len, - const char *str, const char *dev) - { -diff --git a/tc/tc_util.h b/tc/tc_util.h -index 825fea36a0809..eb4b60db3fdd7 100644 ---- a/tc/tc_util.h -+++ b/tc/tc_util.h -@@ -101,6 +101,7 @@ int print_tc_classid(char *buf, int len, __u32 h); - char *sprint_tc_classid(__u32 h, char *buf); - - int tc_print_police(FILE *f, struct rtattr *tb); -+int parse_percent(double *val, const char *str); - int parse_police(int *argc_p, char ***argv_p, int tca_id, struct nlmsghdr *n); - - int parse_action_control(int *argc_p, char ***argv_p, --- -2.22.0 - diff --git a/0005-tc-util-constrain-percentage-in-0-100-interval.patch b/0005-tc-util-constrain-percentage-in-0-100-interval.patch deleted file mode 100644 index d5928f5..0000000 --- a/0005-tc-util-constrain-percentage-in-0-100-interval.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 29a5b8d072d06b685c428f15125ff62b8b470064 Mon Sep 17 00:00:00 2001 -From: Andrea Claudi -Date: Sat, 13 Jul 2019 11:44:07 +0200 -Subject: [PATCH] tc: util: constrain percentage in 0-100 interval - -parse_percent() currently allows to specify negative percentages -or value above 100%. However this does not seems to make sense, -as the function is used for probabilities or bandiwidth rates. - -Moreover, using negative values leads to erroneous results -(using Bernoulli loss model as example): - -$ ip link add test type dummy -$ ip link set test up -$ tc qdisc add dev test root netem loss gemodel -10% limit 10 -$ tc qdisc show dev test -qdisc netem 800c: root refcnt 2 limit 10 loss gemodel p 90% r 10% 1-h 100% 1-k 0% - -Using values above 100% we have instead: - -$ ip link add test type dummy -$ ip link set test up -$ tc qdisc add dev test root netem loss gemodel 140% limit 10 -$ tc qdisc show dev test -qdisc netem 800f: root refcnt 2 limit 10 loss gemodel p 40% r 60% 1-h 100% 1-k 0% - -This commit changes parse_percent() with a check to ensure -percentage values stay between 1.0 and 0.0. -parse_percent_rate() function, which already employs a similar -check, is adjusted accordingly. - -With this check in place, we have: - -$ ip link add test type dummy -$ ip link set test up -$ tc qdisc add dev test root netem loss gemodel -10% limit 10 -Illegal "loss gemodel p" - -Fixes: 927e3cfb52b58 ("tc: B.W limits can now be specified in %.") -Signed-off-by: Andrea Claudi -Signed-off-by: Stephen Hemminger -(cherry picked from commit 6bc13e4a20f50e9c37d5a504c78222913c433fd3) -Signed-off-by: Phil Sutter ---- - tc/tc_util.c | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) - -diff --git a/tc/tc_util.c b/tc/tc_util.c -index 53d15e08e9734..b90d256c33a4a 100644 ---- a/tc/tc_util.c -+++ b/tc/tc_util.c -@@ -198,7 +198,7 @@ int parse_percent(double *val, const char *str) - char *p; - - *val = strtod(str, &p) / 100.; -- if (*val == HUGE_VALF || *val == HUGE_VALL) -+ if (*val > 1.0 || *val < 0.0) - return 1; - if (*p && strcmp(p, "%")) - return -1; -@@ -226,16 +226,16 @@ static int parse_percent_rate(char *rate, size_t len, - if (ret != 1) - goto malf; - -- if (parse_percent(&perc, str_perc)) -+ ret = parse_percent(&perc, str_perc); -+ if (ret == 1) { -+ fprintf(stderr, "Invalid rate specified; should be between [0,100]%% but is %s\n", str); -+ goto err; -+ } else if (ret == -1) { - goto malf; -+ } - - free(str_perc); - -- if (perc > 1.0 || perc < 0.0) { -- fprintf(stderr, "Invalid rate specified; should be between [0,100]%% but is %s\n", str); -- return -1; -- } -- - rate_bit = perc * dev_mbit * 1000 * 1000; - - ret = snprintf(rate, len, "%lf", rate_bit); -@@ -247,8 +247,9 @@ static int parse_percent_rate(char *rate, size_t len, - return 0; - - malf: -- free(str_perc); - fprintf(stderr, "Specified rate value could not be read or is malformed\n"); -+err: -+ free(str_perc); - return -1; - } - --- -2.22.0 - diff --git a/0006-devlink-Change-devlink-health-dump-show-command-to-d.patch b/0006-devlink-Change-devlink-health-dump-show-command-to-d.patch deleted file mode 100644 index a0688e3..0000000 --- a/0006-devlink-Change-devlink-health-dump-show-command-to-d.patch +++ /dev/null @@ -1,64 +0,0 @@ -From f12ee1269f04a5f4ab5c18326004af32da4061ae Mon Sep 17 00:00:00 2001 -From: Aya Levin -Date: Wed, 10 Jul 2019 14:03:19 +0300 -Subject: [PATCH] devlink: Change devlink health dump show command to dumpit - -Although devlink health dump show command is given per reporter, it -returns large amounts of data. Trying to use the doit cb results in -OUT-OF-BUFFER error. This complementary patch raises the DUMP flag in -order to invoke the dumpit cb. We're safe as no existing drivers -implement the dump health reporter option yet. - -Fixes: 041e6e651a8e ("devlink: Add devlink health dump show command") -Signed-off-by: Aya Levin -Signed-off-by: Tariq Toukan -Acked-by: Jiri Pirko -Signed-off-by: Stephen Hemminger -(cherry picked from commit b4d97ef57fd4b7669971ed209065a72d115dffc2) -Signed-off-by: Phil Sutter ---- - devlink/devlink.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/devlink/devlink.c b/devlink/devlink.c -index 5618ba26d6fb3..9c338cb4ccc84 100644 ---- a/devlink/devlink.c -+++ b/devlink/devlink.c -@@ -6072,13 +6072,13 @@ static int cmd_fmsg_object_cb(const struct nlmsghdr *nlh, void *data) - return MNL_CB_OK; - } - --static int cmd_health_object_common(struct dl *dl, uint8_t cmd) -+static int cmd_health_object_common(struct dl *dl, uint8_t cmd, uint16_t flags) - { - struct fmsg_cb_data data; - struct nlmsghdr *nlh; - int err; - -- nlh = mnlg_msg_prepare(dl->nlg, cmd, NLM_F_REQUEST | NLM_F_ACK); -+ nlh = mnlg_msg_prepare(dl->nlg, cmd, flags | NLM_F_REQUEST | NLM_F_ACK); - - err = dl_argv_parse_put(nlh, dl, - DL_OPT_HANDLE | DL_OPT_HEALTH_REPORTER_NAME, 0); -@@ -6093,12 +6093,16 @@ static int cmd_health_object_common(struct dl *dl, uint8_t cmd) - - static int cmd_health_dump_show(struct dl *dl) - { -- return cmd_health_object_common(dl, DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET); -+ return cmd_health_object_common(dl, -+ DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET, -+ NLM_F_DUMP); - } - - static int cmd_health_diagnose(struct dl *dl) - { -- return cmd_health_object_common(dl, DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE); -+ return cmd_health_object_common(dl, -+ DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE, -+ 0); - } - - static int cmd_health_recover(struct dl *dl) --- -2.22.0 - diff --git a/0007-devlink-Fix-binary-values-print.patch b/0007-devlink-Fix-binary-values-print.patch deleted file mode 100644 index a91296f..0000000 --- a/0007-devlink-Fix-binary-values-print.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 4aaf5d7099e7b985973b49f59ceef9b1fd6f6810 Mon Sep 17 00:00:00 2001 -From: Aya Levin -Date: Wed, 10 Jul 2019 14:03:20 +0300 -Subject: [PATCH] devlink: Fix binary values print - -Fix function pr_out_binary_value() to start printing the binary buffer -from offset 0 instead of offset 1. Remove redundant new line at the -beginning of the output - -Example: -With patch: - mlx5e_txqsq: - 05 00 00 00 05 00 00 00 01 00 00 00 00 00 00 00 - 00 00 00 00 00 00 00 00 8e 6e 3a 13 07 00 00 00 - 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 - c0 -Without patch - mlx5e_txqsq: - - 00 00 00 05 00 00 00 01 00 00 00 00 00 00 00 00 - 00 00 00 00 00 00 00 8e 6e 3a 13 07 00 00 00 00 - 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 c0 - -Fixes: 844a61764c6f ("devlink: Add helper functions for name and value separately") -Signed-off-by: Aya Levin -Signed-off-by: Tariq Toukan -Signed-off-by: Stephen Hemminger -(cherry picked from commit 1d05cca2fd70a5bc8a9f4e978aa5629dbc99a973) -Signed-off-by: Phil Sutter ---- - devlink/devlink.c | 24 +++++++++++++----------- - 1 file changed, 13 insertions(+), 11 deletions(-) - -diff --git a/devlink/devlink.c b/devlink/devlink.c -index 9c338cb4ccc84..5dff974c93c93 100644 ---- a/devlink/devlink.c -+++ b/devlink/devlink.c -@@ -1779,29 +1779,31 @@ static void pr_out_uint64_value(struct dl *dl, uint64_t value) - pr_out(" %"PRIu64, value); - } - -+static bool is_binary_eol(int i) -+{ -+ return !(i%16); -+} -+ - static void pr_out_binary_value(struct dl *dl, uint8_t *data, uint32_t len) - { -- int i = 1; -+ int i = 0; - - if (dl->json_output) - jsonw_start_array(dl->jw); -- else -- pr_out("\n"); - - while (i < len) { -- if (dl->json_output) { -+ if (dl->json_output) - jsonw_printf(dl->jw, "%d", data[i]); -- } else { -- pr_out(" %02x", data[i]); -- if (!(i % 16)) -- pr_out("\n"); -- } -+ else -+ pr_out("%02x ", data[i]); - i++; -+ if (!dl->json_output && is_binary_eol(i)) -+ __pr_out_newline(); - } - if (dl->json_output) - jsonw_end_array(dl->jw); -- else if ((i - 1) % 16) -- pr_out("\n"); -+ else if (!is_binary_eol(i)) -+ __pr_out_newline(); - } - - static void pr_out_str_value(struct dl *dl, const char *value) --- -2.22.0 - diff --git a/0008-devlink-Remove-enclosing-array-brackets-binary-print.patch b/0008-devlink-Remove-enclosing-array-brackets-binary-print.patch deleted file mode 100644 index b9d6096..0000000 --- a/0008-devlink-Remove-enclosing-array-brackets-binary-print.patch +++ /dev/null @@ -1,47 +0,0 @@ -From a5d73c80107321aafd1e2007a059a7eb950412d7 Mon Sep 17 00:00:00 2001 -From: Aya Levin -Date: Wed, 10 Jul 2019 14:03:21 +0300 -Subject: [PATCH] devlink: Remove enclosing array brackets binary print with - json format - -Keep pr_out_binary_value function only for printing. Inner relations -like array grouping should be done outside the function. - -Fixes: 844a61764c6f ("devlink: Add helper functions for name and value separately") -Signed-off-by: Aya Levin -Signed-off-by: Tariq Toukan -Signed-off-by: Stephen Hemminger -(cherry picked from commit f359942a25d368ccf2e47b79f95db2798e09f7a4) -Signed-off-by: Phil Sutter ---- - devlink/devlink.c | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/devlink/devlink.c b/devlink/devlink.c -index 5dff974c93c93..ebb1de3eb2eaa 100644 ---- a/devlink/devlink.c -+++ b/devlink/devlink.c -@@ -1788,9 +1788,6 @@ static void pr_out_binary_value(struct dl *dl, uint8_t *data, uint32_t len) - { - int i = 0; - -- if (dl->json_output) -- jsonw_start_array(dl->jw); -- - while (i < len) { - if (dl->json_output) - jsonw_printf(dl->jw, "%d", data[i]); -@@ -1800,9 +1797,7 @@ static void pr_out_binary_value(struct dl *dl, uint8_t *data, uint32_t len) - if (!dl->json_output && is_binary_eol(i)) - __pr_out_newline(); - } -- if (dl->json_output) -- jsonw_end_array(dl->jw); -- else if (!is_binary_eol(i)) -+ if (!dl->json_output && !is_binary_eol(i)) - __pr_out_newline(); - } - --- -2.22.0 - diff --git a/0009-json-fix-backslash-escape-typo-in-jsonw_puts.patch b/0009-json-fix-backslash-escape-typo-in-jsonw_puts.patch deleted file mode 100644 index 52d01b1..0000000 --- a/0009-json-fix-backslash-escape-typo-in-jsonw_puts.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 742a2436d344ac15330c56a2326c03c8c56686a5 Mon Sep 17 00:00:00 2001 -From: Ivan Delalande -Date: Wed, 17 Jul 2019 18:15:31 -0700 -Subject: [PATCH] json: fix backslash escape typo in jsonw_puts - -Fixes: fcc16c22 ("provide common json output formatter") -Signed-off-by: Ivan Delalande -Signed-off-by: Stephen Hemminger -(cherry picked from commit ed54f76484b5ee47b190a202ecf29fce60d0d878) -Signed-off-by: Phil Sutter ---- - lib/json_writer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/json_writer.c b/lib/json_writer.c -index 5004c181e6225..88c5eb8882254 100644 ---- a/lib/json_writer.c -+++ b/lib/json_writer.c -@@ -75,7 +75,7 @@ static void jsonw_puts(json_writer_t *self, const char *str) - fputs("\\b", self->out); - break; - case '\\': -- fputs("\\n", self->out); -+ fputs("\\\\", self->out); - break; - case '"': - fputs("\\\"", self->out); --- -2.22.0 - diff --git a/iproute.spec b/iproute.spec index fcc2832..c3f48c3 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,20 +1,12 @@ %global cbq_version v0.7.3 Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 5.2.0 -Release: 2%{?dist} +Version: 5.3.0 +Release: 1%{?dist} URL: http://kernel.org/pub/linux/utils/net/%{name}2/ Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz -Patch1: 0001-Revert-ip6tunnel-fix-ip-6-show-change-dev-name-cmds.patch -Patch2: 0002-ip-tunnel-warn-when-changing-IPv6-tunnel-without-tun.patch -Patch3: 0003-ip-route-fix-json-formatting-for-metrics.patch -Patch4: 0004-utils-move-parse_percent-to-tc_util.patch -Patch5: 0005-tc-util-constrain-percentage-in-0-100-interval.patch -Patch6: 0006-devlink-Change-devlink-health-dump-show-command-to-d.patch -Patch7: 0007-devlink-Fix-binary-values-print.patch -Patch8: 0008-devlink-Remove-enclosing-array-brackets-binary-print.patch -Patch9: 0009-json-fix-backslash-escape-typo-in-jsonw_puts.patch +Patch1: 0001-bpf-replace-snprintf-with-asprintf-when-dealing-with.patch License: GPLv2+ and Public Domain BuildRequires: gcc @@ -132,6 +124,10 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_includedir}/iproute2/bpf_elf.h %changelog +* Thu Sep 26 2019 Phil Sutter - 5.3.0-1 +- New version 5.3.0 +- Add upstream-suggested backports + * Thu Jul 25 2019 Fedora Release Engineering - 5.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 108351d..0629eb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iproute2-5.2.0.tar.xz) = 82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1 +SHA512 (iproute2-5.3.0.tar.xz) = c20ce477cb3ec24194ea56d3d9037795e26975ffde188b63ba974a0aa671dd169f356e9446bf43dc56523e01c0bafa442b91d83da9b2302daee18e237f2f3157 From e919693befd1be0dcfb5639ecd911715ded7c11f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= Date: Tue, 8 Oct 2019 12:32:08 +0200 Subject: [PATCH 02/54] Add a dependency on psmisc The ifcfg script uses killall, provided by the psmisc package. --- iproute.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/iproute.spec b/iproute.spec index c3f48c3..da0a79d 100644 --- a/iproute.spec +++ b/iproute.spec @@ -26,6 +26,7 @@ BuildRequires: linux-atm-libs-devel %endif Provides: /sbin/ip Recommends: %{name}-tc +Requires: psmisc %description The iproute package contains networking utilities (ip and rtmon, for example) From 26d638db91fa316f706ea947ab076bce216ec8cc Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 8 Oct 2019 13:51:27 +0200 Subject: [PATCH 03/54] iproute-5.3.0-2 - ifcfg script uses killall, therefore requires psmisc package --- iproute.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iproute.spec b/iproute.spec index da0a79d..198d6f1 100644 --- a/iproute.spec +++ b/iproute.spec @@ -2,7 +2,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 5.3.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://kernel.org/pub/linux/utils/net/%{name}2/ Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz @@ -125,6 +125,9 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_includedir}/iproute2/bpf_elf.h %changelog +* Tue Oct 08 2019 Phil Sutter - 5.3.0-2 +- ifcfg script uses killall, therefore requires psmisc package + * Thu Sep 26 2019 Phil Sutter - 5.3.0-1 - New version 5.3.0 - Add upstream-suggested backports From 51429ab2bfb43c742c5e1cfd54367bdd61cea57b Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 26 Nov 2019 16:37:12 +0100 Subject: [PATCH 04/54] Rebase package on top of iproute2-5.4.0 --- .gitignore | 1 + ...intf-with-asprintf-when-dealing-with.patch | 341 ------------------ ...k-allow-full-range-of-resource-sizes.patch | 43 +++ iproute.spec | 30 +- sources | 2 +- 5 files changed, 54 insertions(+), 363 deletions(-) delete mode 100644 0001-bpf-replace-snprintf-with-asprintf-when-dealing-with.patch create mode 100644 0001-devlink-allow-full-range-of-resource-sizes.patch diff --git a/.gitignore b/.gitignore index 1103d18..b21cca6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /iproute2-5.1.0.tar.xz /iproute2-5.2.0.tar.xz /iproute2-5.3.0.tar.xz +/iproute2-5.4.0.tar.xz diff --git a/0001-bpf-replace-snprintf-with-asprintf-when-dealing-with.patch b/0001-bpf-replace-snprintf-with-asprintf-when-dealing-with.patch deleted file mode 100644 index 85c1c85..0000000 --- a/0001-bpf-replace-snprintf-with-asprintf-when-dealing-with.patch +++ /dev/null @@ -1,341 +0,0 @@ -From e72287abe26945d0cd453021baa75dd51b6c271b Mon Sep 17 00:00:00 2001 -From: Andrea Claudi -Date: Mon, 16 Sep 2019 15:00:55 +0200 -Subject: [PATCH] bpf: replace snprintf with asprintf when dealing with long - buffers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reduces stack usage, as asprintf allocates memory on the heap. - -This indirectly fixes a snprintf truncation warning (from gcc v9.2.1): - -bpf.c: In function ‘bpf_get_work_dir’: -bpf.c:784:49: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=] - 784 | snprintf(bpf_wrk_dir, sizeof(bpf_wrk_dir), "%s/", mnt); - | ^ -bpf.c:784:2: note: ‘snprintf’ output between 2 and 4097 bytes into a destination of size 4096 - 784 | snprintf(bpf_wrk_dir, sizeof(bpf_wrk_dir), "%s/", mnt); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Fixes: e42256699cac ("bpf: make tc's bpf loader generic and move into lib") -Signed-off-by: Andrea Claudi -Signed-off-by: David Ahern -(cherry picked from commit c0325b06382cb4f7ebfaf80c29c8800d74666fd9) -Signed-off-by: Phil Sutter ---- - lib/bpf.c | 155 ++++++++++++++++++++++++++++++++++++++++-------------- - 1 file changed, 116 insertions(+), 39 deletions(-) - -diff --git a/lib/bpf.c b/lib/bpf.c -index 23cb0d96a85ba..10cf9bf44419a 100644 ---- a/lib/bpf.c -+++ b/lib/bpf.c -@@ -406,13 +406,21 @@ static int bpf_derive_elf_map_from_fdinfo(int fd, struct bpf_elf_map *map, - struct bpf_map_ext *ext) - { - unsigned int val, owner_type = 0, owner_jited = 0; -- char file[PATH_MAX], buff[4096]; -+ char *file = NULL; -+ char buff[4096]; - FILE *fp; -+ int ret; - -- snprintf(file, sizeof(file), "/proc/%d/fdinfo/%d", getpid(), fd); -+ ret = asprintf(&file, "/proc/%d/fdinfo/%d", getpid(), fd); -+ if (ret < 0) { -+ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); -+ free(file); -+ return ret; -+ } - memset(map, 0, sizeof(*map)); - - fp = fopen(file, "r"); -+ free(file); - if (!fp) { - fprintf(stderr, "No procfs support?!\n"); - return -EIO; -@@ -600,8 +608,9 @@ int bpf_trace_pipe(void) - 0, - }; - int fd_in, fd_out = STDERR_FILENO; -- char tpipe[PATH_MAX]; -+ char *tpipe = NULL; - const char *mnt; -+ int ret; - - mnt = bpf_find_mntpt("tracefs", TRACEFS_MAGIC, tracefs_mnt, - sizeof(tracefs_mnt), tracefs_known_mnts); -@@ -610,9 +619,15 @@ int bpf_trace_pipe(void) - return -1; - } - -- snprintf(tpipe, sizeof(tpipe), "%s/trace_pipe", mnt); -+ ret = asprintf(&tpipe, "%s/trace_pipe", mnt); -+ if (ret < 0) { -+ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); -+ free(tpipe); -+ return ret; -+ } - - fd_in = open(tpipe, O_RDONLY); -+ free(tpipe); - if (fd_in < 0) - return -1; - -@@ -633,37 +648,50 @@ int bpf_trace_pipe(void) - - static int bpf_gen_global(const char *bpf_sub_dir) - { -- char bpf_glo_dir[PATH_MAX]; -+ char *bpf_glo_dir = NULL; - int ret; - -- snprintf(bpf_glo_dir, sizeof(bpf_glo_dir), "%s/%s/", -- bpf_sub_dir, BPF_DIR_GLOBALS); -+ ret = asprintf(&bpf_glo_dir, "%s/%s/", bpf_sub_dir, BPF_DIR_GLOBALS); -+ if (ret < 0) { -+ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); -+ goto out; -+ } - - ret = mkdir(bpf_glo_dir, S_IRWXU); - if (ret && errno != EEXIST) { - fprintf(stderr, "mkdir %s failed: %s\n", bpf_glo_dir, - strerror(errno)); -- return ret; -+ goto out; - } - -- return 0; -+ ret = 0; -+out: -+ free(bpf_glo_dir); -+ return ret; - } - - static int bpf_gen_master(const char *base, const char *name) - { -- char bpf_sub_dir[PATH_MAX + NAME_MAX + 1]; -+ char *bpf_sub_dir = NULL; - int ret; - -- snprintf(bpf_sub_dir, sizeof(bpf_sub_dir), "%s%s/", base, name); -+ ret = asprintf(&bpf_sub_dir, "%s%s/", base, name); -+ if (ret < 0) { -+ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); -+ goto out; -+ } - - ret = mkdir(bpf_sub_dir, S_IRWXU); - if (ret && errno != EEXIST) { - fprintf(stderr, "mkdir %s failed: %s\n", bpf_sub_dir, - strerror(errno)); -- return ret; -+ goto out; - } - -- return bpf_gen_global(bpf_sub_dir); -+ ret = bpf_gen_global(bpf_sub_dir); -+out: -+ free(bpf_sub_dir); -+ return ret; - } - - static int bpf_slave_via_bind_mnt(const char *full_name, -@@ -692,13 +720,22 @@ static int bpf_slave_via_bind_mnt(const char *full_name, - static int bpf_gen_slave(const char *base, const char *name, - const char *link) - { -- char bpf_lnk_dir[PATH_MAX + NAME_MAX + 1]; -- char bpf_sub_dir[PATH_MAX + NAME_MAX]; -+ char *bpf_lnk_dir = NULL; -+ char *bpf_sub_dir = NULL; - struct stat sb = {}; - int ret; - -- snprintf(bpf_lnk_dir, sizeof(bpf_lnk_dir), "%s%s/", base, link); -- snprintf(bpf_sub_dir, sizeof(bpf_sub_dir), "%s%s", base, name); -+ ret = asprintf(&bpf_lnk_dir, "%s%s/", base, link); -+ if (ret < 0) { -+ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); -+ goto out; -+ } -+ -+ ret = asprintf(&bpf_sub_dir, "%s%s", base, name); -+ if (ret < 0) { -+ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); -+ goto out; -+ } - - ret = symlink(bpf_lnk_dir, bpf_sub_dir); - if (ret) { -@@ -706,25 +743,30 @@ static int bpf_gen_slave(const char *base, const char *name, - if (errno != EPERM) { - fprintf(stderr, "symlink %s failed: %s\n", - bpf_sub_dir, strerror(errno)); -- return ret; -+ goto out; - } - -- return bpf_slave_via_bind_mnt(bpf_sub_dir, -- bpf_lnk_dir); -+ ret = bpf_slave_via_bind_mnt(bpf_sub_dir, bpf_lnk_dir); -+ goto out; - } - - ret = lstat(bpf_sub_dir, &sb); - if (ret) { - fprintf(stderr, "lstat %s failed: %s\n", - bpf_sub_dir, strerror(errno)); -- return ret; -+ goto out; - } - -- if ((sb.st_mode & S_IFMT) != S_IFLNK) -- return bpf_gen_global(bpf_sub_dir); -+ if ((sb.st_mode & S_IFMT) != S_IFLNK) { -+ ret = bpf_gen_global(bpf_sub_dir); -+ goto out; -+ } - } - -- return 0; -+out: -+ free(bpf_lnk_dir); -+ free(bpf_sub_dir); -+ return ret; - } - - static int bpf_gen_hierarchy(const char *base) -@@ -742,7 +784,7 @@ static int bpf_gen_hierarchy(const char *base) - static const char *bpf_get_work_dir(enum bpf_prog_type type) - { - static char bpf_tmp[PATH_MAX] = BPF_DIR_MNT; -- static char bpf_wrk_dir[PATH_MAX]; -+ static char *bpf_wrk_dir; - static const char *mnt; - static bool bpf_mnt_cached; - const char *mnt_env = getenv(BPF_ENV_MNT); -@@ -781,7 +823,12 @@ static const char *bpf_get_work_dir(enum bpf_prog_type type) - } - } - -- snprintf(bpf_wrk_dir, sizeof(bpf_wrk_dir), "%s/", mnt); -+ ret = asprintf(&bpf_wrk_dir, "%s/", mnt); -+ if (ret < 0) { -+ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); -+ free(bpf_wrk_dir); -+ goto out; -+ } - - ret = bpf_gen_hierarchy(bpf_wrk_dir); - if (ret) { -@@ -1438,31 +1485,48 @@ static int bpf_probe_pinned(const char *name, const struct bpf_elf_ctx *ctx, - - static int bpf_make_obj_path(const struct bpf_elf_ctx *ctx) - { -- char tmp[PATH_MAX]; -+ char *tmp = NULL; - int ret; - -- snprintf(tmp, sizeof(tmp), "%s/%s", bpf_get_work_dir(ctx->type), -- ctx->obj_uid); -+ ret = asprintf(&tmp, "%s/%s", bpf_get_work_dir(ctx->type), ctx->obj_uid); -+ if (ret < 0) { -+ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); -+ goto out; -+ } - - ret = mkdir(tmp, S_IRWXU); - if (ret && errno != EEXIST) { - fprintf(stderr, "mkdir %s failed: %s\n", tmp, strerror(errno)); -- return ret; -+ goto out; - } - -- return 0; -+ ret = 0; -+out: -+ free(tmp); -+ return ret; - } - - static int bpf_make_custom_path(const struct bpf_elf_ctx *ctx, - const char *todo) - { -- char tmp[PATH_MAX], rem[PATH_MAX], *sub; -+ char *tmp = NULL; -+ char *rem = NULL; -+ char *sub; - int ret; - -- snprintf(tmp, sizeof(tmp), "%s/../", bpf_get_work_dir(ctx->type)); -- snprintf(rem, sizeof(rem), "%s/", todo); -- sub = strtok(rem, "/"); -+ ret = asprintf(&tmp, "%s/../", bpf_get_work_dir(ctx->type)); -+ if (ret < 0) { -+ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); -+ goto out; -+ } - -+ ret = asprintf(&rem, "%s/", todo); -+ if (ret < 0) { -+ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); -+ goto out; -+ } -+ -+ sub = strtok(rem, "/"); - while (sub) { - if (strlen(tmp) + strlen(sub) + 2 > PATH_MAX) - return -EINVAL; -@@ -1474,13 +1538,17 @@ static int bpf_make_custom_path(const struct bpf_elf_ctx *ctx, - if (ret && errno != EEXIST) { - fprintf(stderr, "mkdir %s failed: %s\n", tmp, - strerror(errno)); -- return ret; -+ goto out; - } - - sub = strtok(NULL, "/"); - } - -- return 0; -+ ret = 0; -+out: -+ free(rem); -+ free(tmp); -+ return ret; - } - - static int bpf_place_pinned(int fd, const char *name, -@@ -2587,14 +2655,23 @@ struct bpf_jited_aux { - - static int bpf_derive_prog_from_fdinfo(int fd, struct bpf_prog_data *prog) - { -- char file[PATH_MAX], buff[4096]; -+ char *file = NULL; -+ char buff[4096]; - unsigned int val; - FILE *fp; -+ int ret; -+ -+ ret = asprintf(&file, "/proc/%d/fdinfo/%d", getpid(), fd); -+ if (ret < 0) { -+ fprintf(stderr, "asprintf failed: %s\n", strerror(errno)); -+ free(file); -+ return ret; -+ } - -- snprintf(file, sizeof(file), "/proc/%d/fdinfo/%d", getpid(), fd); - memset(prog, 0, sizeof(*prog)); - - fp = fopen(file, "r"); -+ free(file); - if (!fp) { - fprintf(stderr, "No procfs support?!\n"); - return -EIO; --- -2.23.0 - diff --git a/0001-devlink-allow-full-range-of-resource-sizes.patch b/0001-devlink-allow-full-range-of-resource-sizes.patch new file mode 100644 index 0000000..1d45b21 --- /dev/null +++ b/0001-devlink-allow-full-range-of-resource-sizes.patch @@ -0,0 +1,43 @@ +From b9cee97db2169bd9627c5a7117e57c0892e8f552 Mon Sep 17 00:00:00 2001 +From: Jakub Kicinski +Date: Tue, 5 Nov 2019 13:17:07 -0800 +Subject: [PATCH] devlink: allow full range of resource sizes + +Resource size is a 64 bit attribute at netlink level. +Make the command line argument 64 bit as well. + +Fixes: 8cd644095842 ("devlink: Add support for devlink resource abstraction") +Signed-off-by: Jakub Kicinski +Acked-by: Jiri Pirko +Signed-off-by: David Ahern +(cherry picked from commit c3f69bf923dea50e48564fd520fec6314ddbcf5f) +Signed-off-by: Phil Sutter +--- + devlink/devlink.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/devlink/devlink.c b/devlink/devlink.c +index 056ac95ee726f..ebffa8c80ffef 100644 +--- a/devlink/devlink.c ++++ b/devlink/devlink.c +@@ -281,7 +281,7 @@ struct dl_opts { + bool dpipe_counters_enable; + bool eswitch_encap_mode; + const char *resource_path; +- uint32_t resource_size; ++ uint64_t resource_size; + uint32_t resource_id; + bool resource_id_valid; + const char *param_name; +@@ -1334,7 +1334,7 @@ static int dl_argv_parse(struct dl *dl, uint64_t o_required, + } else if (dl_argv_match(dl, "size") && + (o_all & DL_OPT_RESOURCE_SIZE)) { + dl_arg_inc(dl); +- err = dl_argv_uint32_t(dl, &opts->resource_size); ++ err = dl_argv_uint64_t(dl, &opts->resource_size); + if (err) + return err; + o_found |= DL_OPT_RESOURCE_SIZE; +-- +2.24.0 + diff --git a/iproute.spec b/iproute.spec index 198d6f1..b973427 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,12 +1,12 @@ %global cbq_version v0.7.3 Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 5.3.0 -Release: 2%{?dist} +Version: 5.4.0 +Release: 1%{?dist} URL: http://kernel.org/pub/linux/utils/net/%{name}2/ Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz -Patch1: 0001-bpf-replace-snprintf-with-asprintf-when-dealing-with.patch +Patch1: 0001-devlink-allow-full-range-of-resource-sizes.patch License: GPLv2+ and Public Domain BuildRequires: gcc @@ -27,6 +27,7 @@ BuildRequires: linux-atm-libs-devel Provides: /sbin/ip Recommends: %{name}-tc Requires: psmisc +Obsoletes: iproute-doc < %{version}-%{release} %description The iproute package contains networking utilities (ip and rtmon, for example) @@ -44,15 +45,6 @@ The Traffic Control utility manages queueing disciplines, their classes and attached filters and actions. It is the standard tool to configure QoS in Linux. -%if ! 0%{?_module_build} -%package doc -Summary: Documentation for iproute2 utilities with examples -License: GPLv2+ - -%description doc -The iproute documentation contains howtos and examples of settings. -%endif - %package devel Summary: iproute development files License: GPLv2+ @@ -89,7 +81,7 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %dir %{_sysconfdir}/iproute2 %{!?_licensedir:%global license %%doc} %license COPYING -%doc README README.distribution README.lnstat +%doc README %{_mandir}/man7/* %exclude %{_mandir}/man7/tc-* %{_mandir}/man8/* @@ -101,7 +93,6 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %files tc %{!?_licensedir:%global license %%doc} %license COPYING -%doc README.iproute2+tc %{_mandir}/man7/tc-* %{_mandir}/man8/tc* %dir %{_libdir}/tc/ @@ -109,13 +100,6 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_sbindir}/tc %{_datadir}/bash-completion/completions/tc -%if ! 0%{?_module_build} -%files doc -%{!?_licensedir:%global license %%doc} -%license COPYING -%doc %{_docdir}/examples -%endif - %files devel %{!?_licensedir:%global license %%doc} %license COPYING @@ -125,6 +109,10 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_includedir}/iproute2/bpf_elf.h %changelog +* Tue Nov 26 2019 Phil Sutter - 5.4.0-1 +- New version 5.4.0 +- Drop iproute-doc package, upstream removed all non-manpage documentation + * Tue Oct 08 2019 Phil Sutter - 5.3.0-2 - ifcfg script uses killall, therefore requires psmisc package diff --git a/sources b/sources index 0629eb2..c870a64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iproute2-5.3.0.tar.xz) = c20ce477cb3ec24194ea56d3d9037795e26975ffde188b63ba974a0aa671dd169f356e9446bf43dc56523e01c0bafa442b91d83da9b2302daee18e237f2f3157 +SHA512 (iproute2-5.4.0.tar.xz) = 26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051 From ba82a868379228bef3ef59a0e26aa48e54b7f7cb Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 28 Jan 2020 11:06:32 +0100 Subject: [PATCH 05/54] Rebase package on top of iproute2-5.5.0 --- .gitignore | 1 + ...k-allow-full-range-of-resource-sizes.patch | 43 ------------------- iproute.spec | 7 +-- sources | 2 +- 4 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 0001-devlink-allow-full-range-of-resource-sizes.patch diff --git a/.gitignore b/.gitignore index b21cca6..6d00acb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /iproute2-5.2.0.tar.xz /iproute2-5.3.0.tar.xz /iproute2-5.4.0.tar.xz +/iproute2-5.5.0.tar.xz diff --git a/0001-devlink-allow-full-range-of-resource-sizes.patch b/0001-devlink-allow-full-range-of-resource-sizes.patch deleted file mode 100644 index 1d45b21..0000000 --- a/0001-devlink-allow-full-range-of-resource-sizes.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b9cee97db2169bd9627c5a7117e57c0892e8f552 Mon Sep 17 00:00:00 2001 -From: Jakub Kicinski -Date: Tue, 5 Nov 2019 13:17:07 -0800 -Subject: [PATCH] devlink: allow full range of resource sizes - -Resource size is a 64 bit attribute at netlink level. -Make the command line argument 64 bit as well. - -Fixes: 8cd644095842 ("devlink: Add support for devlink resource abstraction") -Signed-off-by: Jakub Kicinski -Acked-by: Jiri Pirko -Signed-off-by: David Ahern -(cherry picked from commit c3f69bf923dea50e48564fd520fec6314ddbcf5f) -Signed-off-by: Phil Sutter ---- - devlink/devlink.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/devlink/devlink.c b/devlink/devlink.c -index 056ac95ee726f..ebffa8c80ffef 100644 ---- a/devlink/devlink.c -+++ b/devlink/devlink.c -@@ -281,7 +281,7 @@ struct dl_opts { - bool dpipe_counters_enable; - bool eswitch_encap_mode; - const char *resource_path; -- uint32_t resource_size; -+ uint64_t resource_size; - uint32_t resource_id; - bool resource_id_valid; - const char *param_name; -@@ -1334,7 +1334,7 @@ static int dl_argv_parse(struct dl *dl, uint64_t o_required, - } else if (dl_argv_match(dl, "size") && - (o_all & DL_OPT_RESOURCE_SIZE)) { - dl_arg_inc(dl); -- err = dl_argv_uint32_t(dl, &opts->resource_size); -+ err = dl_argv_uint64_t(dl, &opts->resource_size); - if (err) - return err; - o_found |= DL_OPT_RESOURCE_SIZE; --- -2.24.0 - diff --git a/iproute.spec b/iproute.spec index b973427..38bb655 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,13 +1,11 @@ %global cbq_version v0.7.3 Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 5.4.0 +Version: 5.5.0 Release: 1%{?dist} URL: http://kernel.org/pub/linux/utils/net/%{name}2/ Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz -Patch1: 0001-devlink-allow-full-range-of-resource-sizes.patch - License: GPLv2+ and Public Domain BuildRequires: gcc BuildRequires: bison @@ -109,6 +107,9 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_includedir}/iproute2/bpf_elf.h %changelog +* Tue Jan 28 2020 Phil Sutter - 5.5.0-1 +- New version 5.5.0 + * Tue Nov 26 2019 Phil Sutter - 5.4.0-1 - New version 5.4.0 - Drop iproute-doc package, upstream removed all non-manpage documentation diff --git a/sources b/sources index c870a64..fd93a9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iproute2-5.4.0.tar.xz) = 26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051 +SHA512 (iproute2-5.5.0.tar.xz) = a59fb6d620206aa17a4ff7d4510b99322e39b6cf34a00953a7d4cd4d62ca85de16d2e28e33cafa7b026edd4f63c81f3f337954aafe963b964ca0cd2d5c54ac78 From 415ca140888e863342401aaa72681515603df002 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 3 Jun 2020 10:29:13 +0200 Subject: [PATCH 06/54] Rebase package on top of iproute2-5.7.0 --- .gitignore | 1 + iproute.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6d00acb..6e1d42c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /iproute2-5.3.0.tar.xz /iproute2-5.4.0.tar.xz /iproute2-5.5.0.tar.xz +/iproute2-5.7.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 38bb655..bd74579 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,7 +1,7 @@ %global cbq_version v0.7.3 Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 5.5.0 +Version: 5.7.0 Release: 1%{?dist} URL: http://kernel.org/pub/linux/utils/net/%{name}2/ Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz @@ -87,6 +87,7 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/* %{_sbindir}/* %exclude %{_sbindir}/tc +%{_datadir}/bash-completion/completions/devlink %files tc %{!?_licensedir:%global license %%doc} @@ -107,6 +108,9 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_includedir}/iproute2/bpf_elf.h %changelog +* Wed Jun 03 2020 Phil Sutter - 5.7.0-1 +- New version 5.7.0 + * Tue Jan 28 2020 Phil Sutter - 5.5.0-1 - New version 5.5.0 diff --git a/sources b/sources index fd93a9a..d9b2c5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iproute2-5.5.0.tar.xz) = a59fb6d620206aa17a4ff7d4510b99322e39b6cf34a00953a7d4cd4d62ca85de16d2e28e33cafa7b026edd4f63c81f3f337954aafe963b964ca0cd2d5c54ac78 +SHA512 (iproute2-5.7.0.tar.xz) = d5ef68e0eb8e84fbff68c2e7dd4097b9ceb438c928d17ede4130876802dfeafe8bf08d82b4fd39005314e0679c0b261aaa3d6a0a2ff364074a43a043a855a634 From fc0b49e928bc5dec727b1b9931e9ce6afae2029f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 01:55:14 +0000 Subject: [PATCH 07/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iproute.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iproute.spec b/iproute.spec index bd74579..c6881f6 100644 --- a/iproute.spec +++ b/iproute.spec @@ -2,7 +2,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 5.7.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://kernel.org/pub/linux/utils/net/%{name}2/ Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz @@ -108,6 +108,9 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_includedir}/iproute2/bpf_elf.h %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 5.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jun 03 2020 Phil Sutter - 5.7.0-1 - New version 5.7.0 From 3e3e60bdb8a4a9eac937eb1b076b5f381c6b978c Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 10 Aug 2020 12:35:26 +0200 Subject: [PATCH 08/54] Rebase package on top of iproute2-5.8.0 --- .gitignore | 1 + iproute.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6e1d42c..da0698b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /iproute2-5.4.0.tar.xz /iproute2-5.5.0.tar.xz /iproute2-5.7.0.tar.xz +/iproute2-5.8.0.tar.xz diff --git a/iproute.spec b/iproute.spec index c6881f6..43e421b 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,8 +1,8 @@ %global cbq_version v0.7.3 Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 5.7.0 -Release: 2%{?dist} +Version: 5.8.0 +Release: 1%{?dist} URL: http://kernel.org/pub/linux/utils/net/%{name}2/ Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz @@ -108,6 +108,9 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_includedir}/iproute2/bpf_elf.h %changelog +* Mon Aug 10 2020 Phil Sutter - 5.8.0-1 +- New version 5.8.0 + * Tue Jul 28 2020 Fedora Release Engineering - 5.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index d9b2c5b..71785b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iproute2-5.7.0.tar.xz) = d5ef68e0eb8e84fbff68c2e7dd4097b9ceb438c928d17ede4130876802dfeafe8bf08d82b4fd39005314e0679c0b261aaa3d6a0a2ff364074a43a043a855a634 +SHA512 (iproute2-5.8.0.tar.xz) = f2a3f7dcf5cb39ca7cd14f0e40e45641eccf4b93427c527a09fd789ac8621c5c3359769ca61fcc8bab7e915edd943c39b7c3e15cbfc497187aa6271eed0a9152 From 495711a13bccaad8f8aa720595131550dc71d7b5 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 2 Dec 2020 20:23:47 +0100 Subject: [PATCH 09/54] Use rpm configure/build/install rpm macros Signed-off-by: Andrea Claudi --- iproute.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/iproute.spec b/iproute.spec index 43e421b..e71d221 100644 --- a/iproute.spec +++ b/iproute.spec @@ -55,21 +55,13 @@ The libnetlink static library. %autosetup -p1 -n %{name}2-%{version} %build -export CFLAGS='%{optflags}' -export LDFLAGS='%{build_ldflags}' -export LIBDIR='%{_libdir}' -export IPT_LIB_DIR='/%{_lib}/xtables' -./configure -make %{?_smp_mflags} +%configure +%make_build %install -export DESTDIR='%{buildroot}' export SBINDIR='%{_sbindir}' -export MANDIR='%{_mandir}' export LIBDIR='%{_libdir}' -export CONFDIR='%{_sysconfdir}/iproute2' -export DOCDIR='%{_docdir}' -make install +%make_install # libnetlink install -D -m644 include/libnetlink.h %{buildroot}%{_includedir}/libnetlink.h From 6e849e5270fa82cb4978947efa38224c562a9b01 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 2 Dec 2020 20:29:21 +0100 Subject: [PATCH 10/54] Fix rpmlint warn unversioned-explicit-provides on tc Signed-off-by: Andrea Claudi --- iproute.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iproute.spec b/iproute.spec index e71d221..2fee2cc 100644 --- a/iproute.spec +++ b/iproute.spec @@ -36,7 +36,7 @@ kernel. Summary: Linux Traffic Control utility License: GPLv2+ Requires: %{name}%{?_isa} = %{version}-%{release} -Provides: tc +Provides: /sbin/tc %description tc The Traffic Control utility manages queueing disciplines, their classes and From 26cbcf8539dc51111dcf0da6d5423b3e2ba7839b Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Fri, 4 Dec 2020 14:03:57 +0100 Subject: [PATCH 11/54] Add Provides: iproute-doc This fix an rpmlint warning caused by Obsoletes: iproute-doc without any package providing it. Signed-off-by: Andrea Claudi --- iproute.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/iproute.spec b/iproute.spec index 2fee2cc..8258543 100644 --- a/iproute.spec +++ b/iproute.spec @@ -23,6 +23,7 @@ BuildRequires: linux-atm-libs-devel %endif %endif Provides: /sbin/ip +Provides: iproute-doc = %{version}-%{release} Recommends: %{name}-tc Requires: psmisc Obsoletes: iproute-doc < %{version}-%{release} From 32597caac48b7382bfa1b5bf95e37f870829e9ad Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 2 Dec 2020 18:48:54 +0100 Subject: [PATCH 12/54] Rebase package on top of iproute2-5.9.0 Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index da0698b..061a864 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /iproute2-5.5.0.tar.xz /iproute2-5.7.0.tar.xz /iproute2-5.8.0.tar.xz +/iproute2-5.9.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 8258543..ef8a217 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,7 +1,7 @@ %global cbq_version v0.7.3 Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 5.8.0 +Version: 5.9.0 Release: 1%{?dist} URL: http://kernel.org/pub/linux/utils/net/%{name}2/ Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz @@ -101,6 +101,9 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_includedir}/iproute2/bpf_elf.h %changelog +* Wed Dec 2 2020 Andrea Claudi - 5.9.0-1 +- New version 5.9.0 + * Mon Aug 10 2020 Phil Sutter - 5.8.0-1 - New version 5.8.0 diff --git a/sources b/sources index 71785b2..5228a25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iproute2-5.8.0.tar.xz) = f2a3f7dcf5cb39ca7cd14f0e40e45641eccf4b93427c527a09fd789ac8621c5c3359769ca61fcc8bab7e915edd943c39b7c3e15cbfc497187aa6271eed0a9152 +SHA512 (iproute2-5.9.0.tar.xz) = bce59b0e8d876f10f94926be7f2a7cda0de15db04fabedfe938649d486ca6d6d222523d1661b8b36ea50e35369a4730938d6ebeb80577ac0522a3432037bcd50 From 49aaa709ec0ba08167b7909b6f103d882c08161b Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Mon, 21 Dec 2020 20:08:58 +0100 Subject: [PATCH 13/54] Rebase package on top of iproute2-5.10.0 Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 061a864..7ae29dc 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /iproute2-5.7.0.tar.xz /iproute2-5.8.0.tar.xz /iproute2-5.9.0.tar.xz +/iproute2-5.10.0.tar.xz diff --git a/iproute.spec b/iproute.spec index ef8a217..a8f4e05 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,7 +1,7 @@ %global cbq_version v0.7.3 Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 5.9.0 +Version: 5.10.0 Release: 1%{?dist} URL: http://kernel.org/pub/linux/utils/net/%{name}2/ Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz @@ -101,6 +101,9 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_includedir}/iproute2/bpf_elf.h %changelog +* Mon Dec 21 2020 Andrea Claudi - 5.10.0-1 +- New version 5.10.0 (#1909551) + * Wed Dec 2 2020 Andrea Claudi - 5.9.0-1 - New version 5.9.0 diff --git a/sources b/sources index 5228a25..33bd142 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iproute2-5.9.0.tar.xz) = bce59b0e8d876f10f94926be7f2a7cda0de15db04fabedfe938649d486ca6d6d222523d1661b8b36ea50e35369a4730938d6ebeb80577ac0522a3432037bcd50 +SHA512 (iproute2-5.10.0.tar.xz) = a468eefa797898b6de452212aa432c0a931434defacae5fb4335754c1292c5d86a8c8dbf3017f90cec266d71a2a17ae469aac17e1a85a5cbddc70814313e4c13 From d90e533c293975caf831c232ac451b210ab22956 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 06:19:11 +0000 Subject: [PATCH 14/54] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- iproute.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/iproute.spec b/iproute.spec index a8f4e05..cfb86ea 100644 --- a/iproute.spec +++ b/iproute.spec @@ -17,6 +17,7 @@ BuildRequires: libdb-devel BuildRequires: libmnl-devel BuildRequires: libselinux-devel BuildRequires: pkgconfig +BuildRequires: make %if ! 0%{?_module_build} %if 0%{?fedora} BuildRequires: linux-atm-libs-devel From 9440bece435ac69d0b611f0266c63d62b7b1e238 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 14:27:39 +0000 Subject: [PATCH 15/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iproute.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iproute.spec b/iproute.spec index cfb86ea..4d11f70 100644 --- a/iproute.spec +++ b/iproute.spec @@ -2,7 +2,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 5.10.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://kernel.org/pub/linux/utils/net/%{name}2/ Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz @@ -102,6 +102,9 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_includedir}/iproute2/bpf_elf.h %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 5.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Dec 21 2020 Andrea Claudi - 5.10.0-1 - New version 5.10.0 (#1909551) From e100ed01fc4b57f1579015ac66bcb748b1995d4a Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 18 Jan 2021 01:02:33 +0000 Subject: [PATCH 16/54] Spec file cleanup --- iproute.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/iproute.spec b/iproute.spec index 4d11f70..8ab529b 100644 --- a/iproute.spec +++ b/iproute.spec @@ -3,8 +3,8 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 5.10.0 Release: 2%{?dist} -URL: http://kernel.org/pub/linux/utils/net/%{name}2/ -Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz +URL: https://kernel.org/pub/linux/utils/net/%{name}2/ +Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz License: GPLv2+ and Public Domain BuildRequires: gcc @@ -71,7 +71,6 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %files %dir %{_sysconfdir}/iproute2 -%{!?_licensedir:%global license %%doc} %license COPYING %doc README %{_mandir}/man7/* @@ -84,7 +83,6 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_datadir}/bash-completion/completions/devlink %files tc -%{!?_licensedir:%global license %%doc} %license COPYING %{_mandir}/man7/tc-* %{_mandir}/man8/tc* @@ -94,7 +92,6 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_datadir}/bash-completion/completions/tc %files devel -%{!?_licensedir:%global license %%doc} %license COPYING %{_mandir}/man3/* %{_libdir}/libnetlink.a From 50c05074a3161f1cdd09d3b88c52585872bb6b86 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Fri, 26 Feb 2021 18:07:44 +0100 Subject: [PATCH 17/54] Rebase package on top of iproute2-5.11.0 Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 7 +++++-- sources | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7ae29dc..823e4bc 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /iproute2-5.8.0.tar.xz /iproute2-5.9.0.tar.xz /iproute2-5.10.0.tar.xz +/iproute2-5.11.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 8ab529b..aadf6cf 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,8 +1,8 @@ %global cbq_version v0.7.3 Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 5.10.0 -Release: 2%{?dist} +Version: 5.11.0 +Release: 1%{?dist} URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz @@ -99,6 +99,9 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_includedir}/iproute2/bpf_elf.h %changelog +* Fri Feb 26 2021 Andrea Claudi - 5.11.0-1 +- New version 5.11.0 (#1931731) + * Tue Jan 26 2021 Fedora Release Engineering - 5.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 33bd142..5c68742 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (iproute2-5.10.0.tar.xz) = a468eefa797898b6de452212aa432c0a931434defacae5fb4335754c1292c5d86a8c8dbf3017f90cec266d71a2a17ae469aac17e1a85a5cbddc70814313e4c13 +SHA512 (iproute2-5.11.0.tar.xz) = 8d0e7efc20db70af2d344962610b7fb7f464da567f63e094a2e2a9915f6e9087a2282163d2c73eb2065aaec4f0b0cf19614253798153b31e34b06f57e704f3ed From c193bd78b0b81d728edd083fa9361f91ddf5ff7c Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Tue, 27 Apr 2021 21:46:31 +0200 Subject: [PATCH 18/54] Rebase package on top of iproute2-5.12.0 Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 5 ++++- sources | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 823e4bc..6970810 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /iproute2-5.9.0.tar.xz /iproute2-5.10.0.tar.xz /iproute2-5.11.0.tar.xz +/iproute2-5.12.0.tar.xz diff --git a/iproute.spec b/iproute.spec index aadf6cf..7839897 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,7 +1,7 @@ %global cbq_version v0.7.3 Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 5.11.0 +Version: 5.12.0 Release: 1%{?dist} URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz @@ -99,6 +99,9 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_includedir}/iproute2/bpf_elf.h %changelog +* Tue Apr 27 2021 Andrea Claudi - 5.12.0-1 +- Update to 5.12.0 (#1954257) + * Fri Feb 26 2021 Andrea Claudi - 5.11.0-1 - New version 5.11.0 (#1931731) diff --git a/sources b/sources index 5c68742..1de9de1 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (iproute2-5.10.0.tar.xz) = a468eefa797898b6de452212aa432c0a931434defacae5fb4335754c1292c5d86a8c8dbf3017f90cec266d71a2a17ae469aac17e1a85a5cbddc70814313e4c13 SHA512 (iproute2-5.11.0.tar.xz) = 8d0e7efc20db70af2d344962610b7fb7f464da567f63e094a2e2a9915f6e9087a2282163d2c73eb2065aaec4f0b0cf19614253798153b31e34b06f57e704f3ed +SHA512 (iproute2-5.12.0.tar.xz) = 9249beb67b30ceef178b60b2b61a5e6c45277e747ae4c865e739b7ab84192549e8e94ebaee43c0a87c0291037746ffb6936346245220786e369201ee13d60fac From 89005f26e9bc81764fe719aec9a4c65915494497 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 30 Jun 2021 13:18:11 +0200 Subject: [PATCH 19/54] Rebase package on top of iproute2-5.13.0 Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 5 ++++- sources | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6970810..bcdf03a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /iproute2-5.10.0.tar.xz /iproute2-5.11.0.tar.xz /iproute2-5.12.0.tar.xz +/iproute2-5.13.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 7839897..d7a8f65 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,7 +1,7 @@ %global cbq_version v0.7.3 Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 5.12.0 +Version: 5.13.0 Release: 1%{?dist} URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz @@ -99,6 +99,9 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_includedir}/iproute2/bpf_elf.h %changelog +* Wed Jun 30 2021 Andrea Claudi - 5.13.0-1 +- Update to 5.13.0 (#1977463) + * Tue Apr 27 2021 Andrea Claudi - 5.12.0-1 - Update to 5.12.0 (#1954257) diff --git a/sources b/sources index 1de9de1..8513c83 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (iproute2-5.10.0.tar.xz) = a468eefa797898b6de452212aa432c0a931434defacae5fb4335754c1292c5d86a8c8dbf3017f90cec266d71a2a17ae469aac17e1a85a5cbddc70814313e4c13 SHA512 (iproute2-5.11.0.tar.xz) = 8d0e7efc20db70af2d344962610b7fb7f464da567f63e094a2e2a9915f6e9087a2282163d2c73eb2065aaec4f0b0cf19614253798153b31e34b06f57e704f3ed SHA512 (iproute2-5.12.0.tar.xz) = 9249beb67b30ceef178b60b2b61a5e6c45277e747ae4c865e739b7ab84192549e8e94ebaee43c0a87c0291037746ffb6936346245220786e369201ee13d60fac +SHA512 (iproute2-5.13.0.tar.xz) = a3286639fb303a7c3c553cb5df0a7336c4c67e53eb05e872d2776b771dbfa36ffdf2df140f570275db6785c882992f469f8eb34a5b506aac876216df7dde245d From 477162c60518eb67b4eb3a83dcc359e2a6ac3ba4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 08:41:51 +0000 Subject: [PATCH 20/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iproute.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iproute.spec b/iproute.spec index d7a8f65..d5135d6 100644 --- a/iproute.spec +++ b/iproute.spec @@ -2,7 +2,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 5.13.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz @@ -99,6 +99,9 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_includedir}/iproute2/bpf_elf.h %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 5.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jun 30 2021 Andrea Claudi - 5.13.0-1 - Update to 5.13.0 (#1977463) From 665ce7375fdb003966a76ff4100510ef49f06e63 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 20 Oct 2021 14:51:03 +0200 Subject: [PATCH 21/54] iproute-5.14.0-1 * Wed Oct 20 2021 Andrea Claudi - 5.14.0-1 - New version 5.14.0 [1999860] Resolves: rhbz#1999860 Signed-off-by: Andrea Claudi --- .gitignore | 1 + ...igure-restore-backward-compatibility.patch | 50 ++++++ ...-parsing-issue-on-include_dir-option.patch | 76 +++++++++ ...x-parsing-issue-on-libbpf_dir-option.patch | 79 +++++++++ ...rsing-issue-with-more-than-one-value.patch | 63 ++++++++ 0005-configure-simplify-options-parsing.patch | 114 +++++++++++++ ...-configure-support-param-value-style.patch | 53 ++++++ 0007-configure-add-the-prefix-option.patch | 72 +++++++++ 0008-configure-add-the-libdir-option.patch | 151 ++++++++++++++++++ iproute.spec | 101 +++++++++--- sources | 1 + 11 files changed, 743 insertions(+), 18 deletions(-) create mode 100644 0001-configure-restore-backward-compatibility.patch create mode 100644 0002-configure-fix-parsing-issue-on-include_dir-option.patch create mode 100644 0003-configure-fix-parsing-issue-on-libbpf_dir-option.patch create mode 100644 0004-configure-fix-parsing-issue-with-more-than-one-value.patch create mode 100644 0005-configure-simplify-options-parsing.patch create mode 100644 0006-configure-support-param-value-style.patch create mode 100644 0007-configure-add-the-prefix-option.patch create mode 100644 0008-configure-add-the-libdir-option.patch diff --git a/.gitignore b/.gitignore index bcdf03a..2f6d853 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /iproute2-5.11.0.tar.xz /iproute2-5.12.0.tar.xz /iproute2-5.13.0.tar.xz +/iproute2-5.14.0.tar.xz diff --git a/0001-configure-restore-backward-compatibility.patch b/0001-configure-restore-backward-compatibility.patch new file mode 100644 index 0000000..ad8178d --- /dev/null +++ b/0001-configure-restore-backward-compatibility.patch @@ -0,0 +1,50 @@ +From 5e6e93a55d2335b90aacb0107e962610cce64007 Mon Sep 17 00:00:00 2001 +Message-Id: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +From: Andrea Claudi +Date: Wed, 20 Oct 2021 12:32:38 +0200 +Subject: [PATCH] configure: restore backward compatibility + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999860 +Upstream Status: iproute2.git commit a3272b93 + +commit a3272b93725a406bc98b67373da67a4bdf6fcdb0 +Author: Luca Boccassi +Date: Thu Sep 2 12:38:54 2021 +0100 + + configure: restore backward compatibility + + Commit a9c3d70d902a0473ee5c13336317006a52ce8242 broke backward compatibility + by making 'configure' error out if parameters are passed, instead of + ignoring them. + Sometimes packaging systems detect 'configure' and assume it's from + autotools, and pass a bunch of options. Eg: + + dh_auto_configure + ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking + + Ignore unknown options again instead of erroring out. + + Fixes: a9c3d70d902a ("configure: add options ability") + + Signed-off-by: Luca Boccassi + Signed-off-by: Stephen Hemminger +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 0a4a0fc9..7f4f3bd9 100755 +--- a/configure ++++ b/configure +@@ -518,7 +518,7 @@ else + "") + break ;; + *) +- usage 1 ;; ++ shift 1 ;; + esac + done + fi +-- +2.31.1 + diff --git a/0002-configure-fix-parsing-issue-on-include_dir-option.patch b/0002-configure-fix-parsing-issue-on-include_dir-option.patch new file mode 100644 index 0000000..c061c51 --- /dev/null +++ b/0002-configure-fix-parsing-issue-on-include_dir-option.patch @@ -0,0 +1,76 @@ +From 290ce87f0a59ec4ddc83918c073364540057ae64 Mon Sep 17 00:00:00 2001 +Message-Id: <290ce87f0a59ec4ddc83918c073364540057ae64.1634733799.git.aclaudi@redhat.com> +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +From: Andrea Claudi +Date: Wed, 20 Oct 2021 12:32:38 +0200 +Subject: [PATCH] configure: fix parsing issue on include_dir option + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999860 +Upstream Status: iproute2-next.git commit 1d819dcc + +commit 1d819dcc741e25958190e31f8186c940713fa0a8 +Author: Andrea Claudi +Date: Thu Oct 14 10:50:49 2021 +0200 + + configure: fix parsing issue on include_dir option + + configure is stuck in an endless loop if '--include_dir' option is used + without a value: + + $ ./configure --include_dir + ./configure: line 506: shift: 2: shift count out of range + ./configure: line 506: shift: 2: shift count out of range + [...] + + Fix it splitting 'shift 2' into two consecutive shifts, and making the + second one conditional to the number of remaining arguments. + + A check is also provided after the while loop to verify the include dir + exists; this avoid to produce an erroneous configuration. + + Fixes: a9c3d70d902a ("configure: add options ability") + Signed-off-by: Andrea Claudi + Acked-by: Phil Sutter + Signed-off-by: David Ahern +--- + configure | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/configure b/configure +index 7f4f3bd9..ea9051ab 100755 +--- a/configure ++++ b/configure +@@ -485,7 +485,7 @@ usage() + { + cat < Path to iproute2 include dir + --libbpf_dir Path to libbpf DESTDIR + --libbpf_force Enable/disable libbpf by force. Available options: + on: require link against libbpf, quit config if no libbpf support +@@ -502,8 +502,9 @@ else + while true; do + case "$1" in + --include_dir) +- INCLUDE=$2 +- shift 2 ;; ++ shift ++ INCLUDE="$1" ++ [ "$#" -gt 0 ] && shift ;; + --libbpf_dir) + LIBBPF_DIR="$2" + shift 2 ;; +@@ -523,6 +524,8 @@ else + done + fi + ++[ -d "$INCLUDE" ] || usage 1 ++ + echo "# Generated config based on" $INCLUDE >$CONFIG + quiet_config >> $CONFIG + +-- +2.31.1 + diff --git a/0003-configure-fix-parsing-issue-on-libbpf_dir-option.patch b/0003-configure-fix-parsing-issue-on-libbpf_dir-option.patch new file mode 100644 index 0000000..5a8c17d --- /dev/null +++ b/0003-configure-fix-parsing-issue-on-libbpf_dir-option.patch @@ -0,0 +1,79 @@ +From 5f717b9a1bb8c49e101670682d73bc5ae9ee701a Mon Sep 17 00:00:00 2001 +Message-Id: <5f717b9a1bb8c49e101670682d73bc5ae9ee701a.1634733799.git.aclaudi@redhat.com> +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +From: Andrea Claudi +Date: Wed, 20 Oct 2021 12:32:38 +0200 +Subject: [PATCH] configure: fix parsing issue on libbpf_dir option + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999860 +Upstream Status: iproute2-next.git commit 48c379bc + +commit 48c379bc2afd43b3246f68ed46475f5318b1218f +Author: Andrea Claudi +Date: Thu Oct 14 10:50:50 2021 +0200 + + configure: fix parsing issue on libbpf_dir option + + configure is stuck in an endless loop if '--libbpf_dir' option is used + without a value: + + $ ./configure --libbpf_dir + ./configure: line 515: shift: 2: shift count out of range + ./configure: line 515: shift: 2: shift count out of range + [...] + + Fix it splitting 'shift 2' into two consecutive shifts, and making the + second one conditional to the number of remaining arguments. + + A check is also provided after the while loop to verify the libbpf dir + exists; also, as LIBBPF_DIR does not have a default value, configure bails + out if the user does not specify a value after --libbpf_dir, thus avoiding + to produce an erroneous configuration. + + Fixes: 7ae2585b865a ("configure: convert LIBBPF environment variables to command-line options") + Signed-off-by: Andrea Claudi + Acked-by: Phil Sutter + Signed-off-by: David Ahern +--- + configure | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/configure b/configure +index ea9051ab..0f304206 100755 +--- a/configure ++++ b/configure +@@ -486,7 +486,7 @@ usage() + cat < Path to iproute2 include dir +- --libbpf_dir Path to libbpf DESTDIR ++ --libbpf_dir Path to libbpf DESTDIR + --libbpf_force Enable/disable libbpf by force. Available options: + on: require link against libbpf, quit config if no libbpf support + off: disable libbpf probing +@@ -506,8 +506,9 @@ else + INCLUDE="$1" + [ "$#" -gt 0 ] && shift ;; + --libbpf_dir) +- LIBBPF_DIR="$2" +- shift 2 ;; ++ shift ++ LIBBPF_DIR="$1" ++ [ "$#" -gt 0 ] && shift ;; + --libbpf_force) + if [ "$2" != 'on' ] && [ "$2" != 'off' ]; then + usage 1 +@@ -525,6 +526,9 @@ else + fi + + [ -d "$INCLUDE" ] || usage 1 ++if [ "${LIBBPF_DIR-unused}" != "unused" ]; then ++ [ -d "$LIBBPF_DIR" ] || usage 1 ++fi + + echo "# Generated config based on" $INCLUDE >$CONFIG + quiet_config >> $CONFIG +-- +2.31.1 + diff --git a/0004-configure-fix-parsing-issue-with-more-than-one-value.patch b/0004-configure-fix-parsing-issue-with-more-than-one-value.patch new file mode 100644 index 0000000..72d90a6 --- /dev/null +++ b/0004-configure-fix-parsing-issue-with-more-than-one-value.patch @@ -0,0 +1,63 @@ +From 4f9ade07eafe74db184eb09603e8187f3ca14423 Mon Sep 17 00:00:00 2001 +Message-Id: <4f9ade07eafe74db184eb09603e8187f3ca14423.1634733799.git.aclaudi@redhat.com> +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +From: Andrea Claudi +Date: Wed, 20 Oct 2021 12:32:38 +0200 +Subject: [PATCH] configure: fix parsing issue with more than one value per + option + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999860 +Upstream Status: iproute2-next.git commit c330d097 + +commit c330d0979440a1dec4a436fd742bb6e28d195526 +Author: Andrea Claudi +Date: Thu Oct 14 10:50:51 2021 +0200 + + configure: fix parsing issue with more than one value per option + + With commit a9c3d70d902a ("configure: add options ability") users are no + more able to provide wrong command lines like: + + $ ./configure --include_dir foo bar + + The script simply bails out when user provides more than one value for a + single option. However, in doing so, it breaks backward compatibility with + some packaging system, which expects unknown options to be ignored. + + Commit a3272b93725a ("configure: restore backward compatibility") fix this + issue, but makes it possible again for users to provide wrong command lines + such as the one above. + + This fixes the issue simply ignoring autoconf-like options such as + '--opt=value'. + + Fixes: a3272b93725a ("configure: restore backward compatibility") + Signed-off-by: Andrea Claudi + Acked-by: Phil Sutter + Signed-off-by: David Ahern +--- + configure | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index 0f304206..9ec19a5b 100755 +--- a/configure ++++ b/configure +@@ -517,10 +517,12 @@ else + shift 2 ;; + -h | --help) + usage 0 ;; ++ --*) ++ shift ;; + "") + break ;; + *) +- shift 1 ;; ++ usage 1 ;; + esac + done + fi +-- +2.31.1 + diff --git a/0005-configure-simplify-options-parsing.patch b/0005-configure-simplify-options-parsing.patch new file mode 100644 index 0000000..b44439c --- /dev/null +++ b/0005-configure-simplify-options-parsing.patch @@ -0,0 +1,114 @@ +From e563a97894c173dcfe2ccdb061c9bfe16526678b Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +From: Andrea Claudi +Date: Wed, 20 Oct 2021 12:32:38 +0200 +Subject: [PATCH] configure: simplify options parsing + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999860 +Upstream Status: iproute2-next.git commit 99245d17 + +commit 99245d1741a85e4397973782578d4a78673eb348 +Author: Andrea Claudi +Date: Thu Oct 14 10:50:52 2021 +0200 + + configure: simplify options parsing + + This commit simplifies options parsing moving all the code not related to + parsing out of the case statement. + + - The conditional shift after the assignments is moved right after the + case, reducing code duplication. + - The semantic checks on the LIBBPF_FORCE value is moved after the loop + like we already did for INCLUDE and LIBBPF_DIR. + - Finally, the loop condition is changed to check remaining arguments, thus + making it possible to get rid of the null string case break. + + As a bonus, now the help message states that on or off should follow + --libbpf_force + + Signed-off-by: Andrea Claudi + Acked-by: Phil Sutter + Signed-off-by: David Ahern +--- + configure | 37 ++++++++++++++++++------------------- + 1 file changed, 18 insertions(+), 19 deletions(-) + +diff --git a/configure b/configure +index 9ec19a5b..26e06eb8 100755 +--- a/configure ++++ b/configure +@@ -485,12 +485,12 @@ usage() + { + cat < Path to iproute2 include dir +- --libbpf_dir Path to libbpf DESTDIR +- --libbpf_force Enable/disable libbpf by force. Available options: +- on: require link against libbpf, quit config if no libbpf support +- off: disable libbpf probing +- -h | --help Show this usage info ++ --include_dir Path to iproute2 include dir ++ --libbpf_dir Path to libbpf DESTDIR ++ --libbpf_force Enable/disable libbpf by force. Available options: ++ on: require link against libbpf, quit config if no libbpf support ++ off: disable libbpf probing ++ -h | --help Show this usage info + EOF + exit $1 + } +@@ -499,31 +499,25 @@ EOF + if [ $# -eq 1 ] && [ "$(echo $1 | cut -c 1)" != '-' ]; then + INCLUDE="$1" + else +- while true; do ++ while [ "$#" -gt 0 ]; do + case "$1" in + --include_dir) + shift +- INCLUDE="$1" +- [ "$#" -gt 0 ] && shift ;; ++ INCLUDE="$1" ;; + --libbpf_dir) + shift +- LIBBPF_DIR="$1" +- [ "$#" -gt 0 ] && shift ;; ++ LIBBPF_DIR="$1" ;; + --libbpf_force) +- if [ "$2" != 'on' ] && [ "$2" != 'off' ]; then +- usage 1 +- fi +- LIBBPF_FORCE=$2 +- shift 2 ;; ++ shift ++ LIBBPF_FORCE="$1" ;; + -h | --help) + usage 0 ;; + --*) +- shift ;; +- "") +- break ;; ++ ;; + *) + usage 1 ;; + esac ++ [ "$#" -gt 0 ] && shift + done + fi + +@@ -531,6 +525,11 @@ fi + if [ "${LIBBPF_DIR-unused}" != "unused" ]; then + [ -d "$LIBBPF_DIR" ] || usage 1 + fi ++if [ "${LIBBPF_FORCE-unused}" != "unused" ]; then ++ if [ "$LIBBPF_FORCE" != 'on' ] && [ "$LIBBPF_FORCE" != 'off' ]; then ++ usage 1 ++ fi ++fi + + echo "# Generated config based on" $INCLUDE >$CONFIG + quiet_config >> $CONFIG +-- +2.31.1 + diff --git a/0006-configure-support-param-value-style.patch b/0006-configure-support-param-value-style.patch new file mode 100644 index 0000000..0596c47 --- /dev/null +++ b/0006-configure-support-param-value-style.patch @@ -0,0 +1,53 @@ +From 6de1c71cf82d67784a185ba912bdbfa24fa6bce5 Mon Sep 17 00:00:00 2001 +Message-Id: <6de1c71cf82d67784a185ba912bdbfa24fa6bce5.1634733799.git.aclaudi@redhat.com> +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +From: Andrea Claudi +Date: Wed, 20 Oct 2021 12:32:38 +0200 +Subject: [PATCH] configure: support --param=value style + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999860 +Upstream Status: iproute2-next.git commit 4b8bca5f + +commit 4b8bca5f9e3e6f210b1036166dc98801e76d8ee5 +Author: Andrea Claudi +Date: Thu Oct 14 10:50:53 2021 +0200 + + configure: support --param=value style + + This commit makes it possible to specify values for configure params + using the common autotools configure syntax '--param=value'. + + Signed-off-by: Andrea Claudi + Acked-by: Phil Sutter + Signed-off-by: David Ahern +--- + configure | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure b/configure +index 26e06eb8..9a2645d9 100755 +--- a/configure ++++ b/configure +@@ -504,12 +504,18 @@ else + --include_dir) + shift + INCLUDE="$1" ;; ++ --include_dir=*) ++ INCLUDE="${1#*=}" ;; + --libbpf_dir) + shift + LIBBPF_DIR="$1" ;; ++ --libbpf_dir=*) ++ LIBBPF_DIR="${1#*=}" ;; + --libbpf_force) + shift + LIBBPF_FORCE="$1" ;; ++ --libbpf_force=*) ++ LIBBPF_FORCE="${1#*=}" ;; + -h | --help) + usage 0 ;; + --*) +-- +2.31.1 + diff --git a/0007-configure-add-the-prefix-option.patch b/0007-configure-add-the-prefix-option.patch new file mode 100644 index 0000000..be26253 --- /dev/null +++ b/0007-configure-add-the-prefix-option.patch @@ -0,0 +1,72 @@ +From aad7307a1ca9f2c8df26e1ed5e8a8b9816f87792 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +From: Andrea Claudi +Date: Wed, 20 Oct 2021 12:32:38 +0200 +Subject: [PATCH] configure: add the --prefix option + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999860 +Upstream Status: iproute2-next.git commit 0ee1950b + +commit 0ee1950b5c38986ea896606810231f5f9d761a00 +Author: Andrea Claudi +Date: Thu Oct 14 10:50:54 2021 +0200 + + configure: add the --prefix option + + This commit add the '--prefix' option to the iproute2 configure script. + + This mimics the '--prefix' option that autotools configure provides, and + will be used later to allow users or packagers to set the lib directory. + + Signed-off-by: Andrea Claudi + Acked-by: Phil Sutter + Signed-off-by: David Ahern +--- + configure | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/configure b/configure +index 9a2645d9..05e23eff 100755 +--- a/configure ++++ b/configure +@@ -3,6 +3,7 @@ + # This is not an autoconf generated configure + + INCLUDE="$PWD/include" ++PREFIX="/usr" + + # Output file which is input to Makefile + CONFIG=config.mk +@@ -490,6 +491,7 @@ Usage: $0 [OPTIONS] + --libbpf_force Enable/disable libbpf by force. Available options: + on: require link against libbpf, quit config if no libbpf support + off: disable libbpf probing ++ --prefix Path prefix of the lib files to install + -h | --help Show this usage info + EOF + exit $1 +@@ -516,6 +518,11 @@ else + LIBBPF_FORCE="$1" ;; + --libbpf_force=*) + LIBBPF_FORCE="${1#*=}" ;; ++ --prefix) ++ shift ++ PREFIX="$1" ;; ++ --prefix=*) ++ PREFIX="${1#*=}" ;; + -h | --help) + usage 0 ;; + --*) +@@ -536,6 +543,7 @@ if [ "${LIBBPF_FORCE-unused}" != "unused" ]; then + usage 1 + fi + fi ++[ -z "$PREFIX" ] && usage 1 + + echo "# Generated config based on" $INCLUDE >$CONFIG + quiet_config >> $CONFIG +-- +2.31.1 + diff --git a/0008-configure-add-the-libdir-option.patch b/0008-configure-add-the-libdir-option.patch new file mode 100644 index 0000000..425b5cc --- /dev/null +++ b/0008-configure-add-the-libdir-option.patch @@ -0,0 +1,151 @@ +From d2e278fcff8a699a2dbac8d74758b4e5f86fd5f0 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +From: Andrea Claudi +Date: Wed, 20 Oct 2021 12:32:38 +0200 +Subject: [PATCH] configure: add the --libdir option + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999860 +Upstream Status: iproute2-next.git commit cee0cf84 + +commit cee0cf84bd32c8d9215f0c155187ad99d52a69b1 +Author: Andrea Claudi +Date: Thu Oct 14 10:50:55 2021 +0200 + + configure: add the --libdir option + + This commit allows users/packagers to choose a lib directory to store + iproute2 lib files. + + At the moment iproute2 ship lib files in /usr/lib and offers no way to + modify this setting. However, according to the FHS, distros may choose + "one or more variants of the /lib directory on systems which support + more than one binary format" (e.g. /usr/lib64 on Fedora). + + As Luca states in commit a3272b93725a ("configure: restore backward + compatibility"), packaging systems may assume that 'configure' is from + autotools, and try to pass it some parameters. + + Allowing the '--libdir=/path/to/libdir' syntax, we can use this to our + advantage, and let the lib directory to be chosen by the distro + packaging system. + + Note that LIBDIR uses "\${prefix}/lib" as default value because autoconf + allows this to be expanded to the --prefix value at configure runtime. + "\${prefix}" is replaced with the PREFIX value in check_lib_dir(). + + Signed-off-by: Andrea Claudi + Acked-by: Phil Sutter + Signed-off-by: David Ahern +--- + Makefile | 7 ++++--- + configure | 18 ++++++++++++++++++ + 2 files changed, 22 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 5bc11477..45655ca4 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,8 @@ + # SPDX-License-Identifier: GPL-2.0 + # Top level Makefile for iproute2 + ++-include config.mk ++ + ifeq ("$(origin V)", "command line") + VERBOSE = $(V) + endif +@@ -13,7 +15,6 @@ MAKEFLAGS += --no-print-directory + endif + + PREFIX?=/usr +-LIBDIR?=$(PREFIX)/lib + SBINDIR?=/sbin + CONFDIR?=/etc/iproute2 + NETNS_RUN_DIR?=/var/run/netns +@@ -60,7 +61,7 @@ SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma dcb man vdpa + LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a + LDLIBS += $(LIBNETLINK) + +-all: config ++all: config.mk + @set -e; \ + for i in $(SUBDIRS); \ + do echo; echo $$i; $(MAKE) -C $$i; done +@@ -80,7 +81,7 @@ help: + @echo "Make Arguments:" + @echo " V=[0|1] - set build verbosity level" + +-config: ++config.mk: + @if [ ! -f config.mk -o configure -nt config.mk ]; then \ + sh configure $(KERNEL_INCLUDE); \ + fi +diff --git a/configure b/configure +index 05e23eff..8ddff43c 100755 +--- a/configure ++++ b/configure +@@ -4,6 +4,7 @@ + + INCLUDE="$PWD/include" + PREFIX="/usr" ++LIBDIR="\${prefix}/lib" + + # Output file which is input to Makefile + CONFIG=config.mk +@@ -149,6 +150,15 @@ EOF + rm -f $TMPDIR/ipttest.c $TMPDIR/ipttest + } + ++check_lib_dir() ++{ ++ LIBDIR=$(echo $LIBDIR | sed "s|\${prefix}|$PREFIX|") ++ ++ echo -n "lib directory: " ++ echo "$LIBDIR" ++ echo "LIBDIR:=$LIBDIR" >> $CONFIG ++} ++ + check_ipt() + { + if ! grep TC_CONFIG_XT $CONFIG > /dev/null; then +@@ -487,6 +497,7 @@ usage() + cat < Path to iproute2 include dir ++ --libdir Path to iproute2 lib dir + --libbpf_dir Path to libbpf DESTDIR + --libbpf_force Enable/disable libbpf by force. Available options: + on: require link against libbpf, quit config if no libbpf support +@@ -508,6 +519,11 @@ else + INCLUDE="$1" ;; + --include_dir=*) + INCLUDE="${1#*=}" ;; ++ --libdir) ++ shift ++ LIBDIR="$1" ;; ++ --libdir=*) ++ LIBDIR="${1#*=}" ;; + --libbpf_dir) + shift + LIBBPF_DIR="$1" ;; +@@ -544,6 +560,7 @@ if [ "${LIBBPF_FORCE-unused}" != "unused" ]; then + fi + fi + [ -z "$PREFIX" ] && usage 1 ++[ -z "$LIBDIR" ] && usage 1 + + echo "# Generated config based on" $INCLUDE >$CONFIG + quiet_config >> $CONFIG +@@ -568,6 +585,7 @@ if ! grep -q TC_CONFIG_NO_XT $CONFIG; then + fi + + echo ++check_lib_dir + if ! grep -q TC_CONFIG_NO_XT $CONFIG; then + echo -n "iptables modules directory: " + check_ipt_lib_dir +-- +2.31.1 + diff --git a/iproute.spec b/iproute.spec index d5135d6..8e6cc6f 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,33 +1,46 @@ -%global cbq_version v0.7.3 Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 5.13.0 -Release: 2%{?dist} +Version: 5.14.0 +Release: 1%{?dist}%{?buildid} +%if 0%{?rhel} +Group: Applications/System +%endif URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz +%if ! 0%{?fedora} +Source1: iproute2.sh +Source2: rt_dsfield.deprecated +%endif +Patch0: 0001-configure-restore-backward-compatibility.patch +Patch1: 0002-configure-fix-parsing-issue-on-include_dir-option.patch +Patch2: 0003-configure-fix-parsing-issue-on-libbpf_dir-option.patch +Patch3: 0004-configure-fix-parsing-issue-with-more-than-one-value.patch +Patch4: 0005-configure-simplify-options-parsing.patch +Patch5: 0006-configure-support-param-value-style.patch +Patch6: 0007-configure-add-the-prefix-option.patch +Patch7: 0008-configure-add-the-libdir-option.patch License: GPLv2+ and Public Domain -BuildRequires: gcc BuildRequires: bison BuildRequires: elfutils-libelf-devel BuildRequires: flex +BuildRequires: gcc BuildRequires: iptables-devel >= 1.4.5 +BuildRequires: libbpf-devel BuildRequires: libcap-devel BuildRequires: libdb-devel BuildRequires: libmnl-devel BuildRequires: libselinux-devel -BuildRequires: pkgconfig BuildRequires: make +BuildRequires: pkgconfig %if ! 0%{?_module_build} %if 0%{?fedora} BuildRequires: linux-atm-libs-devel %endif %endif -Provides: /sbin/ip -Provides: iproute-doc = %{version}-%{release} -Recommends: %{name}-tc +Requires: libbpf Requires: psmisc -Obsoletes: iproute-doc < %{version}-%{release} +Provides: /sbin/ip %description The iproute package contains networking utilities (ip and rtmon, for example) @@ -36,6 +49,9 @@ kernel. %package tc Summary: Linux Traffic Control utility +%if 0%{?rhel} +Group: Applications/System +%endif License: GPLv2+ Requires: %{name}%{?_isa} = %{version}-%{release} Provides: /sbin/tc @@ -45,9 +61,26 @@ The Traffic Control utility manages queueing disciplines, their classes and attached filters and actions. It is the standard tool to configure QoS in Linux. +%if ! 0%{?_module_build} +%package doc +Summary: Documentation for iproute2 utilities with examples +%if 0%{?rhel} +Group: Applications/System +%endif +License: GPLv2+ +Requires: %{name} = %{version}-%{release} + +%description doc +The iproute documentation contains howtos and examples of settings. +%endif + %package devel Summary: iproute development files +%if 0%{?rhel} +Group: Development/Libraries +%endif License: GPLv2+ +Requires: %{name} = %{version}-%{release} Provides: iproute-static = %{version}-%{release} %description devel @@ -65,18 +98,32 @@ export SBINDIR='%{_sbindir}' export LIBDIR='%{_libdir}' %make_install +echo '.so man8/tc-cbq.8' > %{buildroot}%{_mandir}/man8/cbq.8 + # libnetlink install -D -m644 include/libnetlink.h %{buildroot}%{_includedir}/libnetlink.h install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a +# drop these files, iproute-doc package extracts files directly from _builddir +rm -rf '%{buildroot}%{_docdir}' + +# RHEL-specific stuff +%if ! 0%{?fedora} +# use TC_LIB_DIR environment variable +install -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/iproute2.sh +# append deprecated values to rt_dsfield for compatibility reasons +cat %{SOURCE2} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield +%endif + %files %dir %{_sysconfdir}/iproute2 %license COPYING -%doc README +%doc README README.devel %{_mandir}/man7/* %exclude %{_mandir}/man7/tc-* %{_mandir}/man8/* %exclude %{_mandir}/man8/tc* +%exclude %{_mandir}/man8/cbq* %attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/* %{_sbindir}/* %exclude %{_sbindir}/tc @@ -84,13 +131,23 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %files tc %license COPYING +%if ! 0%{?fedora} +%{_sysconfdir}/profile.d/iproute2.sh +%endif %{_mandir}/man7/tc-* %{_mandir}/man8/tc* +%{_mandir}/man8/cbq* %dir %{_libdir}/tc/ %{_libdir}/tc/* %{_sbindir}/tc %{_datadir}/bash-completion/completions/tc +%if ! 0%{?_module_build} +%files doc +%license COPYING +%doc examples +%endif + %files devel %license COPYING %{_mandir}/man3/* @@ -99,17 +156,25 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a %{_includedir}/iproute2/bpf_elf.h %changelog -* Thu Jul 22 2021 Fedora Release Engineering - 5.13.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +* Wed Oct 20 2021 Andrea Claudi - 5.14.0-1 +- New version 5.14.0 [1999860] -* Wed Jun 30 2021 Andrea Claudi - 5.13.0-1 -- Update to 5.13.0 (#1977463) +* Mon Aug 09 2021 Mohan Boddu - 5.13.0-4.el9 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 -* Tue Apr 27 2021 Andrea Claudi - 5.12.0-1 -- Update to 5.12.0 (#1954257) +* Fri Jul 16 2021 Andrea Claudi - 5.13.0-3.el9 +- Fix changelog (Andrea Claudi) [1947854] +- Add RHEL gating configuration (Aleksandra Fedorova) -* Fri Feb 26 2021 Andrea Claudi - 5.11.0-1 -- New version 5.11.0 (#1931731) +* Thu Jul 15 2021 Andrea Claudi - 5.13.0-2.el9 +- Remove Recommends: iproute-tc from spec file (Andrea Claudi) [1947854] + +* Wed Jun 30 2021 Andrea Claudi - 5.13.0-1.el9 +- New version 5.13.0 (#1977898) + +* Fri Apr 16 2021 Mohan Boddu - 5.10.0-3.el9 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 * Tue Jan 26 2021 Fedora Release Engineering - 5.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 8513c83..c893066 100644 --- a/sources +++ b/sources @@ -2,3 +2,4 @@ SHA512 (iproute2-5.10.0.tar.xz) = a468eefa797898b6de452212aa432c0a931434defacae5 SHA512 (iproute2-5.11.0.tar.xz) = 8d0e7efc20db70af2d344962610b7fb7f464da567f63e094a2e2a9915f6e9087a2282163d2c73eb2065aaec4f0b0cf19614253798153b31e34b06f57e704f3ed SHA512 (iproute2-5.12.0.tar.xz) = 9249beb67b30ceef178b60b2b61a5e6c45277e747ae4c865e739b7ab84192549e8e94ebaee43c0a87c0291037746ffb6936346245220786e369201ee13d60fac SHA512 (iproute2-5.13.0.tar.xz) = a3286639fb303a7c3c553cb5df0a7336c4c67e53eb05e872d2776b771dbfa36ffdf2df140f570275db6785c882992f469f8eb34a5b506aac876216df7dde245d +SHA512 (iproute2-5.14.0.tar.xz) = e2b9b0a2c3e6fc4c67cb50b0a9bf710e749648b83369a49bf905edd7e519d76c50c2cc818bb63cc605c409c66075d4d371f2371796e5f7a8f9d04101b80ef75c From dfbb7f212cfb31d78f9c67d389fd659e2a7723ad Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Thu, 4 Nov 2021 18:52:27 +0100 Subject: [PATCH 22/54] iproute-5.15.0-1 * Thu Nov 04 2021 Andrea Claudi - 5.15.0-1 - New version 5.15.0 [2019267] Resolves: rhbz#2019267 Signed-off-by: Andrea Claudi --- .gitignore | 1 + ...-parsing-issue-on-include_dir-option.patch | 6 +-- ...igure-restore-backward-compatibility.patch | 50 ------------------- ...x-parsing-issue-on-libbpf_dir-option.patch | 6 +-- ...rsing-issue-with-more-than-one-value.patch | 6 +-- ...4-configure-simplify-options-parsing.patch | 6 +-- ...-configure-support-param-value-style.patch | 6 +-- ...0006-configure-add-the-prefix-option.patch | 6 +-- ...0007-configure-add-the-libdir-option.patch | 6 +-- iproute.spec | 33 ++++++------ sources | 1 + 11 files changed, 37 insertions(+), 90 deletions(-) rename 0002-configure-fix-parsing-issue-on-include_dir-option.patch => 0001-configure-fix-parsing-issue-on-include_dir-option.patch (91%) delete mode 100644 0001-configure-restore-backward-compatibility.patch rename 0003-configure-fix-parsing-issue-on-libbpf_dir-option.patch => 0002-configure-fix-parsing-issue-on-libbpf_dir-option.patch (92%) rename 0004-configure-fix-parsing-issue-with-more-than-one-value.patch => 0003-configure-fix-parsing-issue-with-more-than-one-value.patch (89%) rename 0005-configure-simplify-options-parsing.patch => 0004-configure-simplify-options-parsing.patch (93%) rename 0006-configure-support-param-value-style.patch => 0005-configure-support-param-value-style.patch (86%) rename 0007-configure-add-the-prefix-option.patch => 0006-configure-add-the-prefix-option.patch (90%) rename 0008-configure-add-the-libdir-option.patch => 0007-configure-add-the-libdir-option.patch (95%) diff --git a/.gitignore b/.gitignore index 2f6d853..03cfd44 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /iproute2-5.12.0.tar.xz /iproute2-5.13.0.tar.xz /iproute2-5.14.0.tar.xz +/iproute2-5.15.0.tar.xz diff --git a/0002-configure-fix-parsing-issue-on-include_dir-option.patch b/0001-configure-fix-parsing-issue-on-include_dir-option.patch similarity index 91% rename from 0002-configure-fix-parsing-issue-on-include_dir-option.patch rename to 0001-configure-fix-parsing-issue-on-include_dir-option.patch index c061c51..231fffe 100644 --- a/0002-configure-fix-parsing-issue-on-include_dir-option.patch +++ b/0001-configure-fix-parsing-issue-on-include_dir-option.patch @@ -1,7 +1,7 @@ From 290ce87f0a59ec4ddc83918c073364540057ae64 Mon Sep 17 00:00:00 2001 -Message-Id: <290ce87f0a59ec4ddc83918c073364540057ae64.1634733799.git.aclaudi@redhat.com> -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +Message-Id: <290ce87f0a59ec4ddc83918c073364540057ae64.1636047125.git.aclaudi@redhat.com> +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> From: Andrea Claudi Date: Wed, 20 Oct 2021 12:32:38 +0200 Subject: [PATCH] configure: fix parsing issue on include_dir option diff --git a/0001-configure-restore-backward-compatibility.patch b/0001-configure-restore-backward-compatibility.patch deleted file mode 100644 index ad8178d..0000000 --- a/0001-configure-restore-backward-compatibility.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 5e6e93a55d2335b90aacb0107e962610cce64007 Mon Sep 17 00:00:00 2001 -Message-Id: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> -From: Andrea Claudi -Date: Wed, 20 Oct 2021 12:32:38 +0200 -Subject: [PATCH] configure: restore backward compatibility - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999860 -Upstream Status: iproute2.git commit a3272b93 - -commit a3272b93725a406bc98b67373da67a4bdf6fcdb0 -Author: Luca Boccassi -Date: Thu Sep 2 12:38:54 2021 +0100 - - configure: restore backward compatibility - - Commit a9c3d70d902a0473ee5c13336317006a52ce8242 broke backward compatibility - by making 'configure' error out if parameters are passed, instead of - ignoring them. - Sometimes packaging systems detect 'configure' and assume it's from - autotools, and pass a bunch of options. Eg: - - dh_auto_configure - ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --runstatedir=/run --disable-maintainer-mode --disable-dependency-tracking - - Ignore unknown options again instead of erroring out. - - Fixes: a9c3d70d902a ("configure: add options ability") - - Signed-off-by: Luca Boccassi - Signed-off-by: Stephen Hemminger ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 0a4a0fc9..7f4f3bd9 100755 ---- a/configure -+++ b/configure -@@ -518,7 +518,7 @@ else - "") - break ;; - *) -- usage 1 ;; -+ shift 1 ;; - esac - done - fi --- -2.31.1 - diff --git a/0003-configure-fix-parsing-issue-on-libbpf_dir-option.patch b/0002-configure-fix-parsing-issue-on-libbpf_dir-option.patch similarity index 92% rename from 0003-configure-fix-parsing-issue-on-libbpf_dir-option.patch rename to 0002-configure-fix-parsing-issue-on-libbpf_dir-option.patch index 5a8c17d..007e9bb 100644 --- a/0003-configure-fix-parsing-issue-on-libbpf_dir-option.patch +++ b/0002-configure-fix-parsing-issue-on-libbpf_dir-option.patch @@ -1,7 +1,7 @@ From 5f717b9a1bb8c49e101670682d73bc5ae9ee701a Mon Sep 17 00:00:00 2001 -Message-Id: <5f717b9a1bb8c49e101670682d73bc5ae9ee701a.1634733799.git.aclaudi@redhat.com> -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +Message-Id: <5f717b9a1bb8c49e101670682d73bc5ae9ee701a.1636047125.git.aclaudi@redhat.com> +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> From: Andrea Claudi Date: Wed, 20 Oct 2021 12:32:38 +0200 Subject: [PATCH] configure: fix parsing issue on libbpf_dir option diff --git a/0004-configure-fix-parsing-issue-with-more-than-one-value.patch b/0003-configure-fix-parsing-issue-with-more-than-one-value.patch similarity index 89% rename from 0004-configure-fix-parsing-issue-with-more-than-one-value.patch rename to 0003-configure-fix-parsing-issue-with-more-than-one-value.patch index 72d90a6..2f4d55a 100644 --- a/0004-configure-fix-parsing-issue-with-more-than-one-value.patch +++ b/0003-configure-fix-parsing-issue-with-more-than-one-value.patch @@ -1,7 +1,7 @@ From 4f9ade07eafe74db184eb09603e8187f3ca14423 Mon Sep 17 00:00:00 2001 -Message-Id: <4f9ade07eafe74db184eb09603e8187f3ca14423.1634733799.git.aclaudi@redhat.com> -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +Message-Id: <4f9ade07eafe74db184eb09603e8187f3ca14423.1636047125.git.aclaudi@redhat.com> +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> From: Andrea Claudi Date: Wed, 20 Oct 2021 12:32:38 +0200 Subject: [PATCH] configure: fix parsing issue with more than one value per diff --git a/0005-configure-simplify-options-parsing.patch b/0004-configure-simplify-options-parsing.patch similarity index 93% rename from 0005-configure-simplify-options-parsing.patch rename to 0004-configure-simplify-options-parsing.patch index b44439c..e27ddab 100644 --- a/0005-configure-simplify-options-parsing.patch +++ b/0004-configure-simplify-options-parsing.patch @@ -1,7 +1,7 @@ From e563a97894c173dcfe2ccdb061c9bfe16526678b Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +Message-Id: +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> From: Andrea Claudi Date: Wed, 20 Oct 2021 12:32:38 +0200 Subject: [PATCH] configure: simplify options parsing diff --git a/0006-configure-support-param-value-style.patch b/0005-configure-support-param-value-style.patch similarity index 86% rename from 0006-configure-support-param-value-style.patch rename to 0005-configure-support-param-value-style.patch index 0596c47..d012369 100644 --- a/0006-configure-support-param-value-style.patch +++ b/0005-configure-support-param-value-style.patch @@ -1,7 +1,7 @@ From 6de1c71cf82d67784a185ba912bdbfa24fa6bce5 Mon Sep 17 00:00:00 2001 -Message-Id: <6de1c71cf82d67784a185ba912bdbfa24fa6bce5.1634733799.git.aclaudi@redhat.com> -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +Message-Id: <6de1c71cf82d67784a185ba912bdbfa24fa6bce5.1636047125.git.aclaudi@redhat.com> +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> From: Andrea Claudi Date: Wed, 20 Oct 2021 12:32:38 +0200 Subject: [PATCH] configure: support --param=value style diff --git a/0007-configure-add-the-prefix-option.patch b/0006-configure-add-the-prefix-option.patch similarity index 90% rename from 0007-configure-add-the-prefix-option.patch rename to 0006-configure-add-the-prefix-option.patch index be26253..0725dfb 100644 --- a/0007-configure-add-the-prefix-option.patch +++ b/0006-configure-add-the-prefix-option.patch @@ -1,7 +1,7 @@ From aad7307a1ca9f2c8df26e1ed5e8a8b9816f87792 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +Message-Id: +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> From: Andrea Claudi Date: Wed, 20 Oct 2021 12:32:38 +0200 Subject: [PATCH] configure: add the --prefix option diff --git a/0008-configure-add-the-libdir-option.patch b/0007-configure-add-the-libdir-option.patch similarity index 95% rename from 0008-configure-add-the-libdir-option.patch rename to 0007-configure-add-the-libdir-option.patch index 425b5cc..6c7beac 100644 --- a/0008-configure-add-the-libdir-option.patch +++ b/0007-configure-add-the-libdir-option.patch @@ -1,7 +1,7 @@ From d2e278fcff8a699a2dbac8d74758b4e5f86fd5f0 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1634733799.git.aclaudi@redhat.com> +Message-Id: +In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> +References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> From: Andrea Claudi Date: Wed, 20 Oct 2021 12:32:38 +0200 Subject: [PATCH] configure: add the --libdir option diff --git a/iproute.spec b/iproute.spec index 8e6cc6f..6114a8a 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,6 +1,6 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 5.14.0 +Version: 5.15.0 Release: 1%{?dist}%{?buildid} %if 0%{?rhel} Group: Applications/System @@ -8,17 +8,15 @@ Group: Applications/System URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz %if ! 0%{?fedora} -Source1: iproute2.sh -Source2: rt_dsfield.deprecated +Source1: rt_dsfield.deprecated %endif -Patch0: 0001-configure-restore-backward-compatibility.patch -Patch1: 0002-configure-fix-parsing-issue-on-include_dir-option.patch -Patch2: 0003-configure-fix-parsing-issue-on-libbpf_dir-option.patch -Patch3: 0004-configure-fix-parsing-issue-with-more-than-one-value.patch -Patch4: 0005-configure-simplify-options-parsing.patch -Patch5: 0006-configure-support-param-value-style.patch -Patch6: 0007-configure-add-the-prefix-option.patch -Patch7: 0008-configure-add-the-libdir-option.patch +Patch0: 0001-configure-fix-parsing-issue-on-include_dir-option.patch +Patch1: 0002-configure-fix-parsing-issue-on-libbpf_dir-option.patch +Patch2: 0003-configure-fix-parsing-issue-with-more-than-one-value.patch +Patch3: 0004-configure-simplify-options-parsing.patch +Patch4: 0005-configure-support-param-value-style.patch +Patch5: 0006-configure-add-the-prefix-option.patch +Patch6: 0007-configure-add-the-libdir-option.patch License: GPLv2+ and Public Domain BuildRequires: bison @@ -107,12 +105,9 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a # drop these files, iproute-doc package extracts files directly from _builddir rm -rf '%{buildroot}%{_docdir}' -# RHEL-specific stuff -%if ! 0%{?fedora} -# use TC_LIB_DIR environment variable -install -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/iproute2.sh # append deprecated values to rt_dsfield for compatibility reasons -cat %{SOURCE2} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield +%if ! 0%{?fedora} +cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %endif %files @@ -131,9 +126,6 @@ cat %{SOURCE2} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %files tc %license COPYING -%if ! 0%{?fedora} -%{_sysconfdir}/profile.d/iproute2.sh -%endif %{_mandir}/man7/tc-* %{_mandir}/man8/tc* %{_mandir}/man8/cbq* @@ -156,6 +148,9 @@ cat %{SOURCE2} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %{_includedir}/iproute2/bpf_elf.h %changelog +* Thu Nov 04 2021 Andrea Claudi - 5.15.0-1 +- New version 5.15.0 [2019267] + * Wed Oct 20 2021 Andrea Claudi - 5.14.0-1 - New version 5.14.0 [1999860] diff --git a/sources b/sources index c893066..d426c9e 100644 --- a/sources +++ b/sources @@ -3,3 +3,4 @@ SHA512 (iproute2-5.11.0.tar.xz) = 8d0e7efc20db70af2d344962610b7fb7f464da567f63e0 SHA512 (iproute2-5.12.0.tar.xz) = 9249beb67b30ceef178b60b2b61a5e6c45277e747ae4c865e739b7ab84192549e8e94ebaee43c0a87c0291037746ffb6936346245220786e369201ee13d60fac SHA512 (iproute2-5.13.0.tar.xz) = a3286639fb303a7c3c553cb5df0a7336c4c67e53eb05e872d2776b771dbfa36ffdf2df140f570275db6785c882992f469f8eb34a5b506aac876216df7dde245d SHA512 (iproute2-5.14.0.tar.xz) = e2b9b0a2c3e6fc4c67cb50b0a9bf710e749648b83369a49bf905edd7e519d76c50c2cc818bb63cc605c409c66075d4d371f2371796e5f7a8f9d04101b80ef75c +SHA512 (iproute2-5.15.0.tar.xz) = e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22 From bc9be1bd5b5a343d15944fb84f46a4a762c5f892 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 13:24:55 +0000 Subject: [PATCH 23/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iproute.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iproute.spec b/iproute.spec index 6114a8a..a5cb087 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,7 +1,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 5.15.0 -Release: 1%{?dist}%{?buildid} +Release: 2%{?dist}%{?buildid} %if 0%{?rhel} Group: Applications/System %endif @@ -148,6 +148,9 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %{_includedir}/iproute2/bpf_elf.h %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 5.15.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Nov 04 2021 Andrea Claudi - 5.15.0-1 - New version 5.15.0 [2019267] From 93abbcde57b64d67bd5d998a8a423d0093d1383c Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 23 Mar 2022 15:21:14 +0100 Subject: [PATCH 24/54] iproute-5.17.0-1 * Wed Mar 23 2022 Andrea Claudi - 5.17.0-1 - New version 5.17.0 [2039103] Resolves: rhbz#2039103 Signed-off-by: Andrea Claudi --- .gitignore | 1 + ...-parsing-issue-on-include_dir-option.patch | 76 --------- ...x-parsing-issue-on-libbpf_dir-option.patch | 79 --------- ...rsing-issue-with-more-than-one-value.patch | 63 -------- 0004-configure-simplify-options-parsing.patch | 114 ------------- ...-configure-support-param-value-style.patch | 53 ------ 0006-configure-add-the-prefix-option.patch | 72 --------- 0007-configure-add-the-libdir-option.patch | 151 ------------------ iproute.spec | 14 +- sources | 1 + 10 files changed, 7 insertions(+), 617 deletions(-) delete mode 100644 0001-configure-fix-parsing-issue-on-include_dir-option.patch delete mode 100644 0002-configure-fix-parsing-issue-on-libbpf_dir-option.patch delete mode 100644 0003-configure-fix-parsing-issue-with-more-than-one-value.patch delete mode 100644 0004-configure-simplify-options-parsing.patch delete mode 100644 0005-configure-support-param-value-style.patch delete mode 100644 0006-configure-add-the-prefix-option.patch delete mode 100644 0007-configure-add-the-libdir-option.patch diff --git a/.gitignore b/.gitignore index 03cfd44..44c7c55 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /iproute2-5.13.0.tar.xz /iproute2-5.14.0.tar.xz /iproute2-5.15.0.tar.xz +/iproute2-5.17.0.tar.xz diff --git a/0001-configure-fix-parsing-issue-on-include_dir-option.patch b/0001-configure-fix-parsing-issue-on-include_dir-option.patch deleted file mode 100644 index 231fffe..0000000 --- a/0001-configure-fix-parsing-issue-on-include_dir-option.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 290ce87f0a59ec4ddc83918c073364540057ae64 Mon Sep 17 00:00:00 2001 -Message-Id: <290ce87f0a59ec4ddc83918c073364540057ae64.1636047125.git.aclaudi@redhat.com> -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> -From: Andrea Claudi -Date: Wed, 20 Oct 2021 12:32:38 +0200 -Subject: [PATCH] configure: fix parsing issue on include_dir option - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999860 -Upstream Status: iproute2-next.git commit 1d819dcc - -commit 1d819dcc741e25958190e31f8186c940713fa0a8 -Author: Andrea Claudi -Date: Thu Oct 14 10:50:49 2021 +0200 - - configure: fix parsing issue on include_dir option - - configure is stuck in an endless loop if '--include_dir' option is used - without a value: - - $ ./configure --include_dir - ./configure: line 506: shift: 2: shift count out of range - ./configure: line 506: shift: 2: shift count out of range - [...] - - Fix it splitting 'shift 2' into two consecutive shifts, and making the - second one conditional to the number of remaining arguments. - - A check is also provided after the while loop to verify the include dir - exists; this avoid to produce an erroneous configuration. - - Fixes: a9c3d70d902a ("configure: add options ability") - Signed-off-by: Andrea Claudi - Acked-by: Phil Sutter - Signed-off-by: David Ahern ---- - configure | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/configure b/configure -index 7f4f3bd9..ea9051ab 100755 ---- a/configure -+++ b/configure -@@ -485,7 +485,7 @@ usage() - { - cat < Path to iproute2 include dir - --libbpf_dir Path to libbpf DESTDIR - --libbpf_force Enable/disable libbpf by force. Available options: - on: require link against libbpf, quit config if no libbpf support -@@ -502,8 +502,9 @@ else - while true; do - case "$1" in - --include_dir) -- INCLUDE=$2 -- shift 2 ;; -+ shift -+ INCLUDE="$1" -+ [ "$#" -gt 0 ] && shift ;; - --libbpf_dir) - LIBBPF_DIR="$2" - shift 2 ;; -@@ -523,6 +524,8 @@ else - done - fi - -+[ -d "$INCLUDE" ] || usage 1 -+ - echo "# Generated config based on" $INCLUDE >$CONFIG - quiet_config >> $CONFIG - --- -2.31.1 - diff --git a/0002-configure-fix-parsing-issue-on-libbpf_dir-option.patch b/0002-configure-fix-parsing-issue-on-libbpf_dir-option.patch deleted file mode 100644 index 007e9bb..0000000 --- a/0002-configure-fix-parsing-issue-on-libbpf_dir-option.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 5f717b9a1bb8c49e101670682d73bc5ae9ee701a Mon Sep 17 00:00:00 2001 -Message-Id: <5f717b9a1bb8c49e101670682d73bc5ae9ee701a.1636047125.git.aclaudi@redhat.com> -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> -From: Andrea Claudi -Date: Wed, 20 Oct 2021 12:32:38 +0200 -Subject: [PATCH] configure: fix parsing issue on libbpf_dir option - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999860 -Upstream Status: iproute2-next.git commit 48c379bc - -commit 48c379bc2afd43b3246f68ed46475f5318b1218f -Author: Andrea Claudi -Date: Thu Oct 14 10:50:50 2021 +0200 - - configure: fix parsing issue on libbpf_dir option - - configure is stuck in an endless loop if '--libbpf_dir' option is used - without a value: - - $ ./configure --libbpf_dir - ./configure: line 515: shift: 2: shift count out of range - ./configure: line 515: shift: 2: shift count out of range - [...] - - Fix it splitting 'shift 2' into two consecutive shifts, and making the - second one conditional to the number of remaining arguments. - - A check is also provided after the while loop to verify the libbpf dir - exists; also, as LIBBPF_DIR does not have a default value, configure bails - out if the user does not specify a value after --libbpf_dir, thus avoiding - to produce an erroneous configuration. - - Fixes: 7ae2585b865a ("configure: convert LIBBPF environment variables to command-line options") - Signed-off-by: Andrea Claudi - Acked-by: Phil Sutter - Signed-off-by: David Ahern ---- - configure | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/configure b/configure -index ea9051ab..0f304206 100755 ---- a/configure -+++ b/configure -@@ -486,7 +486,7 @@ usage() - cat < Path to iproute2 include dir -- --libbpf_dir Path to libbpf DESTDIR -+ --libbpf_dir Path to libbpf DESTDIR - --libbpf_force Enable/disable libbpf by force. Available options: - on: require link against libbpf, quit config if no libbpf support - off: disable libbpf probing -@@ -506,8 +506,9 @@ else - INCLUDE="$1" - [ "$#" -gt 0 ] && shift ;; - --libbpf_dir) -- LIBBPF_DIR="$2" -- shift 2 ;; -+ shift -+ LIBBPF_DIR="$1" -+ [ "$#" -gt 0 ] && shift ;; - --libbpf_force) - if [ "$2" != 'on' ] && [ "$2" != 'off' ]; then - usage 1 -@@ -525,6 +526,9 @@ else - fi - - [ -d "$INCLUDE" ] || usage 1 -+if [ "${LIBBPF_DIR-unused}" != "unused" ]; then -+ [ -d "$LIBBPF_DIR" ] || usage 1 -+fi - - echo "# Generated config based on" $INCLUDE >$CONFIG - quiet_config >> $CONFIG --- -2.31.1 - diff --git a/0003-configure-fix-parsing-issue-with-more-than-one-value.patch b/0003-configure-fix-parsing-issue-with-more-than-one-value.patch deleted file mode 100644 index 2f4d55a..0000000 --- a/0003-configure-fix-parsing-issue-with-more-than-one-value.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 4f9ade07eafe74db184eb09603e8187f3ca14423 Mon Sep 17 00:00:00 2001 -Message-Id: <4f9ade07eafe74db184eb09603e8187f3ca14423.1636047125.git.aclaudi@redhat.com> -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> -From: Andrea Claudi -Date: Wed, 20 Oct 2021 12:32:38 +0200 -Subject: [PATCH] configure: fix parsing issue with more than one value per - option - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999860 -Upstream Status: iproute2-next.git commit c330d097 - -commit c330d0979440a1dec4a436fd742bb6e28d195526 -Author: Andrea Claudi -Date: Thu Oct 14 10:50:51 2021 +0200 - - configure: fix parsing issue with more than one value per option - - With commit a9c3d70d902a ("configure: add options ability") users are no - more able to provide wrong command lines like: - - $ ./configure --include_dir foo bar - - The script simply bails out when user provides more than one value for a - single option. However, in doing so, it breaks backward compatibility with - some packaging system, which expects unknown options to be ignored. - - Commit a3272b93725a ("configure: restore backward compatibility") fix this - issue, but makes it possible again for users to provide wrong command lines - such as the one above. - - This fixes the issue simply ignoring autoconf-like options such as - '--opt=value'. - - Fixes: a3272b93725a ("configure: restore backward compatibility") - Signed-off-by: Andrea Claudi - Acked-by: Phil Sutter - Signed-off-by: David Ahern ---- - configure | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index 0f304206..9ec19a5b 100755 ---- a/configure -+++ b/configure -@@ -517,10 +517,12 @@ else - shift 2 ;; - -h | --help) - usage 0 ;; -+ --*) -+ shift ;; - "") - break ;; - *) -- shift 1 ;; -+ usage 1 ;; - esac - done - fi --- -2.31.1 - diff --git a/0004-configure-simplify-options-parsing.patch b/0004-configure-simplify-options-parsing.patch deleted file mode 100644 index e27ddab..0000000 --- a/0004-configure-simplify-options-parsing.patch +++ /dev/null @@ -1,114 +0,0 @@ -From e563a97894c173dcfe2ccdb061c9bfe16526678b Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> -From: Andrea Claudi -Date: Wed, 20 Oct 2021 12:32:38 +0200 -Subject: [PATCH] configure: simplify options parsing - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999860 -Upstream Status: iproute2-next.git commit 99245d17 - -commit 99245d1741a85e4397973782578d4a78673eb348 -Author: Andrea Claudi -Date: Thu Oct 14 10:50:52 2021 +0200 - - configure: simplify options parsing - - This commit simplifies options parsing moving all the code not related to - parsing out of the case statement. - - - The conditional shift after the assignments is moved right after the - case, reducing code duplication. - - The semantic checks on the LIBBPF_FORCE value is moved after the loop - like we already did for INCLUDE and LIBBPF_DIR. - - Finally, the loop condition is changed to check remaining arguments, thus - making it possible to get rid of the null string case break. - - As a bonus, now the help message states that on or off should follow - --libbpf_force - - Signed-off-by: Andrea Claudi - Acked-by: Phil Sutter - Signed-off-by: David Ahern ---- - configure | 37 ++++++++++++++++++------------------- - 1 file changed, 18 insertions(+), 19 deletions(-) - -diff --git a/configure b/configure -index 9ec19a5b..26e06eb8 100755 ---- a/configure -+++ b/configure -@@ -485,12 +485,12 @@ usage() - { - cat < Path to iproute2 include dir -- --libbpf_dir Path to libbpf DESTDIR -- --libbpf_force Enable/disable libbpf by force. Available options: -- on: require link against libbpf, quit config if no libbpf support -- off: disable libbpf probing -- -h | --help Show this usage info -+ --include_dir Path to iproute2 include dir -+ --libbpf_dir Path to libbpf DESTDIR -+ --libbpf_force Enable/disable libbpf by force. Available options: -+ on: require link against libbpf, quit config if no libbpf support -+ off: disable libbpf probing -+ -h | --help Show this usage info - EOF - exit $1 - } -@@ -499,31 +499,25 @@ EOF - if [ $# -eq 1 ] && [ "$(echo $1 | cut -c 1)" != '-' ]; then - INCLUDE="$1" - else -- while true; do -+ while [ "$#" -gt 0 ]; do - case "$1" in - --include_dir) - shift -- INCLUDE="$1" -- [ "$#" -gt 0 ] && shift ;; -+ INCLUDE="$1" ;; - --libbpf_dir) - shift -- LIBBPF_DIR="$1" -- [ "$#" -gt 0 ] && shift ;; -+ LIBBPF_DIR="$1" ;; - --libbpf_force) -- if [ "$2" != 'on' ] && [ "$2" != 'off' ]; then -- usage 1 -- fi -- LIBBPF_FORCE=$2 -- shift 2 ;; -+ shift -+ LIBBPF_FORCE="$1" ;; - -h | --help) - usage 0 ;; - --*) -- shift ;; -- "") -- break ;; -+ ;; - *) - usage 1 ;; - esac -+ [ "$#" -gt 0 ] && shift - done - fi - -@@ -531,6 +525,11 @@ fi - if [ "${LIBBPF_DIR-unused}" != "unused" ]; then - [ -d "$LIBBPF_DIR" ] || usage 1 - fi -+if [ "${LIBBPF_FORCE-unused}" != "unused" ]; then -+ if [ "$LIBBPF_FORCE" != 'on' ] && [ "$LIBBPF_FORCE" != 'off' ]; then -+ usage 1 -+ fi -+fi - - echo "# Generated config based on" $INCLUDE >$CONFIG - quiet_config >> $CONFIG --- -2.31.1 - diff --git a/0005-configure-support-param-value-style.patch b/0005-configure-support-param-value-style.patch deleted file mode 100644 index d012369..0000000 --- a/0005-configure-support-param-value-style.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 6de1c71cf82d67784a185ba912bdbfa24fa6bce5 Mon Sep 17 00:00:00 2001 -Message-Id: <6de1c71cf82d67784a185ba912bdbfa24fa6bce5.1636047125.git.aclaudi@redhat.com> -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> -From: Andrea Claudi -Date: Wed, 20 Oct 2021 12:32:38 +0200 -Subject: [PATCH] configure: support --param=value style - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999860 -Upstream Status: iproute2-next.git commit 4b8bca5f - -commit 4b8bca5f9e3e6f210b1036166dc98801e76d8ee5 -Author: Andrea Claudi -Date: Thu Oct 14 10:50:53 2021 +0200 - - configure: support --param=value style - - This commit makes it possible to specify values for configure params - using the common autotools configure syntax '--param=value'. - - Signed-off-by: Andrea Claudi - Acked-by: Phil Sutter - Signed-off-by: David Ahern ---- - configure | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure b/configure -index 26e06eb8..9a2645d9 100755 ---- a/configure -+++ b/configure -@@ -504,12 +504,18 @@ else - --include_dir) - shift - INCLUDE="$1" ;; -+ --include_dir=*) -+ INCLUDE="${1#*=}" ;; - --libbpf_dir) - shift - LIBBPF_DIR="$1" ;; -+ --libbpf_dir=*) -+ LIBBPF_DIR="${1#*=}" ;; - --libbpf_force) - shift - LIBBPF_FORCE="$1" ;; -+ --libbpf_force=*) -+ LIBBPF_FORCE="${1#*=}" ;; - -h | --help) - usage 0 ;; - --*) --- -2.31.1 - diff --git a/0006-configure-add-the-prefix-option.patch b/0006-configure-add-the-prefix-option.patch deleted file mode 100644 index 0725dfb..0000000 --- a/0006-configure-add-the-prefix-option.patch +++ /dev/null @@ -1,72 +0,0 @@ -From aad7307a1ca9f2c8df26e1ed5e8a8b9816f87792 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> -From: Andrea Claudi -Date: Wed, 20 Oct 2021 12:32:38 +0200 -Subject: [PATCH] configure: add the --prefix option - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999860 -Upstream Status: iproute2-next.git commit 0ee1950b - -commit 0ee1950b5c38986ea896606810231f5f9d761a00 -Author: Andrea Claudi -Date: Thu Oct 14 10:50:54 2021 +0200 - - configure: add the --prefix option - - This commit add the '--prefix' option to the iproute2 configure script. - - This mimics the '--prefix' option that autotools configure provides, and - will be used later to allow users or packagers to set the lib directory. - - Signed-off-by: Andrea Claudi - Acked-by: Phil Sutter - Signed-off-by: David Ahern ---- - configure | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/configure b/configure -index 9a2645d9..05e23eff 100755 ---- a/configure -+++ b/configure -@@ -3,6 +3,7 @@ - # This is not an autoconf generated configure - - INCLUDE="$PWD/include" -+PREFIX="/usr" - - # Output file which is input to Makefile - CONFIG=config.mk -@@ -490,6 +491,7 @@ Usage: $0 [OPTIONS] - --libbpf_force Enable/disable libbpf by force. Available options: - on: require link against libbpf, quit config if no libbpf support - off: disable libbpf probing -+ --prefix Path prefix of the lib files to install - -h | --help Show this usage info - EOF - exit $1 -@@ -516,6 +518,11 @@ else - LIBBPF_FORCE="$1" ;; - --libbpf_force=*) - LIBBPF_FORCE="${1#*=}" ;; -+ --prefix) -+ shift -+ PREFIX="$1" ;; -+ --prefix=*) -+ PREFIX="${1#*=}" ;; - -h | --help) - usage 0 ;; - --*) -@@ -536,6 +543,7 @@ if [ "${LIBBPF_FORCE-unused}" != "unused" ]; then - usage 1 - fi - fi -+[ -z "$PREFIX" ] && usage 1 - - echo "# Generated config based on" $INCLUDE >$CONFIG - quiet_config >> $CONFIG --- -2.31.1 - diff --git a/0007-configure-add-the-libdir-option.patch b/0007-configure-add-the-libdir-option.patch deleted file mode 100644 index 6c7beac..0000000 --- a/0007-configure-add-the-libdir-option.patch +++ /dev/null @@ -1,151 +0,0 @@ -From d2e278fcff8a699a2dbac8d74758b4e5f86fd5f0 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> -References: <5e6e93a55d2335b90aacb0107e962610cce64007.1636047125.git.aclaudi@redhat.com> -From: Andrea Claudi -Date: Wed, 20 Oct 2021 12:32:38 +0200 -Subject: [PATCH] configure: add the --libdir option - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1999860 -Upstream Status: iproute2-next.git commit cee0cf84 - -commit cee0cf84bd32c8d9215f0c155187ad99d52a69b1 -Author: Andrea Claudi -Date: Thu Oct 14 10:50:55 2021 +0200 - - configure: add the --libdir option - - This commit allows users/packagers to choose a lib directory to store - iproute2 lib files. - - At the moment iproute2 ship lib files in /usr/lib and offers no way to - modify this setting. However, according to the FHS, distros may choose - "one or more variants of the /lib directory on systems which support - more than one binary format" (e.g. /usr/lib64 on Fedora). - - As Luca states in commit a3272b93725a ("configure: restore backward - compatibility"), packaging systems may assume that 'configure' is from - autotools, and try to pass it some parameters. - - Allowing the '--libdir=/path/to/libdir' syntax, we can use this to our - advantage, and let the lib directory to be chosen by the distro - packaging system. - - Note that LIBDIR uses "\${prefix}/lib" as default value because autoconf - allows this to be expanded to the --prefix value at configure runtime. - "\${prefix}" is replaced with the PREFIX value in check_lib_dir(). - - Signed-off-by: Andrea Claudi - Acked-by: Phil Sutter - Signed-off-by: David Ahern ---- - Makefile | 7 ++++--- - configure | 18 ++++++++++++++++++ - 2 files changed, 22 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 5bc11477..45655ca4 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,8 @@ - # SPDX-License-Identifier: GPL-2.0 - # Top level Makefile for iproute2 - -+-include config.mk -+ - ifeq ("$(origin V)", "command line") - VERBOSE = $(V) - endif -@@ -13,7 +15,6 @@ MAKEFLAGS += --no-print-directory - endif - - PREFIX?=/usr --LIBDIR?=$(PREFIX)/lib - SBINDIR?=/sbin - CONFDIR?=/etc/iproute2 - NETNS_RUN_DIR?=/var/run/netns -@@ -60,7 +61,7 @@ SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma dcb man vdpa - LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a - LDLIBS += $(LIBNETLINK) - --all: config -+all: config.mk - @set -e; \ - for i in $(SUBDIRS); \ - do echo; echo $$i; $(MAKE) -C $$i; done -@@ -80,7 +81,7 @@ help: - @echo "Make Arguments:" - @echo " V=[0|1] - set build verbosity level" - --config: -+config.mk: - @if [ ! -f config.mk -o configure -nt config.mk ]; then \ - sh configure $(KERNEL_INCLUDE); \ - fi -diff --git a/configure b/configure -index 05e23eff..8ddff43c 100755 ---- a/configure -+++ b/configure -@@ -4,6 +4,7 @@ - - INCLUDE="$PWD/include" - PREFIX="/usr" -+LIBDIR="\${prefix}/lib" - - # Output file which is input to Makefile - CONFIG=config.mk -@@ -149,6 +150,15 @@ EOF - rm -f $TMPDIR/ipttest.c $TMPDIR/ipttest - } - -+check_lib_dir() -+{ -+ LIBDIR=$(echo $LIBDIR | sed "s|\${prefix}|$PREFIX|") -+ -+ echo -n "lib directory: " -+ echo "$LIBDIR" -+ echo "LIBDIR:=$LIBDIR" >> $CONFIG -+} -+ - check_ipt() - { - if ! grep TC_CONFIG_XT $CONFIG > /dev/null; then -@@ -487,6 +497,7 @@ usage() - cat < Path to iproute2 include dir -+ --libdir Path to iproute2 lib dir - --libbpf_dir Path to libbpf DESTDIR - --libbpf_force Enable/disable libbpf by force. Available options: - on: require link against libbpf, quit config if no libbpf support -@@ -508,6 +519,11 @@ else - INCLUDE="$1" ;; - --include_dir=*) - INCLUDE="${1#*=}" ;; -+ --libdir) -+ shift -+ LIBDIR="$1" ;; -+ --libdir=*) -+ LIBDIR="${1#*=}" ;; - --libbpf_dir) - shift - LIBBPF_DIR="$1" ;; -@@ -544,6 +560,7 @@ if [ "${LIBBPF_FORCE-unused}" != "unused" ]; then - fi - fi - [ -z "$PREFIX" ] && usage 1 -+[ -z "$LIBDIR" ] && usage 1 - - echo "# Generated config based on" $INCLUDE >$CONFIG - quiet_config >> $CONFIG -@@ -568,6 +585,7 @@ if ! grep -q TC_CONFIG_NO_XT $CONFIG; then - fi - - echo -+check_lib_dir - if ! grep -q TC_CONFIG_NO_XT $CONFIG; then - echo -n "iptables modules directory: " - check_ipt_lib_dir --- -2.31.1 - diff --git a/iproute.spec b/iproute.spec index a5cb087..debfa7c 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,7 +1,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 5.15.0 -Release: 2%{?dist}%{?buildid} +Version: 5.17.0 +Release: 1%{?dist}%{?buildid} %if 0%{?rhel} Group: Applications/System %endif @@ -10,13 +10,6 @@ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{v %if ! 0%{?fedora} Source1: rt_dsfield.deprecated %endif -Patch0: 0001-configure-fix-parsing-issue-on-include_dir-option.patch -Patch1: 0002-configure-fix-parsing-issue-on-libbpf_dir-option.patch -Patch2: 0003-configure-fix-parsing-issue-with-more-than-one-value.patch -Patch3: 0004-configure-simplify-options-parsing.patch -Patch4: 0005-configure-support-param-value-style.patch -Patch5: 0006-configure-add-the-prefix-option.patch -Patch6: 0007-configure-add-the-libdir-option.patch License: GPLv2+ and Public Domain BuildRequires: bison @@ -148,6 +141,9 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %{_includedir}/iproute2/bpf_elf.h %changelog +* Wed Mar 23 2022 Andrea Claudi - 5.17.0-1 +- New version 5.17.0 [2039103] + * Thu Jan 20 2022 Fedora Release Engineering - 5.15.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index d426c9e..ccbe23a 100644 --- a/sources +++ b/sources @@ -4,3 +4,4 @@ SHA512 (iproute2-5.12.0.tar.xz) = 9249beb67b30ceef178b60b2b61a5e6c45277e747ae4c8 SHA512 (iproute2-5.13.0.tar.xz) = a3286639fb303a7c3c553cb5df0a7336c4c67e53eb05e872d2776b771dbfa36ffdf2df140f570275db6785c882992f469f8eb34a5b506aac876216df7dde245d SHA512 (iproute2-5.14.0.tar.xz) = e2b9b0a2c3e6fc4c67cb50b0a9bf710e749648b83369a49bf905edd7e519d76c50c2cc818bb63cc605c409c66075d4d371f2371796e5f7a8f9d04101b80ef75c SHA512 (iproute2-5.15.0.tar.xz) = e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22 +SHA512 (iproute2-5.17.0.tar.xz) = fcffe96fb4819305ddf5c3764b100bd1d204069cf53a6bd776c2716144f574b4fc17963fc231a83ad253cce6a563814556eeb60b211ba9b0b87330186259b34d From 59e7b4ef2f08259f568320e7fbd66c8b64330cef Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 30 Mar 2022 18:11:16 +0200 Subject: [PATCH 25/54] iproute-5.17.0-2 * Wed Mar 30 2022 Andrea Claudi - 5.17.0-2 - iproute.spec: do not ship routel (Andrea Claudi) [2068118] Resolves: rhbz#2068118 Signed-off-by: Andrea Claudi --- iproute.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/iproute.spec b/iproute.spec index debfa7c..d56fbd0 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,7 +1,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 5.17.0 -Release: 1%{?dist}%{?buildid} +Release: 2%{?dist}%{?buildid} %if 0%{?rhel} Group: Applications/System %endif @@ -115,6 +115,7 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/* %{_sbindir}/* %exclude %{_sbindir}/tc +%exclude %{_sbindir}/routel %{_datadir}/bash-completion/completions/devlink %files tc @@ -141,6 +142,9 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %{_includedir}/iproute2/bpf_elf.h %changelog +* Wed Mar 30 2022 Andrea Claudi - 5.17.0-2 +- iproute.spec: do not ship routel (Andrea Claudi) [2068118] + * Wed Mar 23 2022 Andrea Claudi - 5.17.0-1 - New version 5.17.0 [2039103] From 9b3f8a94d69481090f77535fc468c712e82f37e6 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 15 Jun 2022 01:04:40 +0200 Subject: [PATCH 26/54] iproute-5.18.0-1 * Tue Jun 14 2022 Andrea Claudi - 5.18.0-1 - New version 5.18.0 [2090930] Resolves: rhbz#2090930 Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 11 ++++++----- sources | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 44c7c55..6441e01 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /iproute2-5.14.0.tar.xz /iproute2-5.15.0.tar.xz /iproute2-5.17.0.tar.xz +/iproute2-5.18.0.tar.xz diff --git a/iproute.spec b/iproute.spec index d56fbd0..393cf08 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,15 +1,13 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 5.17.0 -Release: 2%{?dist}%{?buildid} +Version: 5.18.0 +Release: 1%{?dist}%{?buildid} %if 0%{?rhel} Group: Applications/System %endif URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz -%if ! 0%{?fedora} -Source1: rt_dsfield.deprecated -%endif + License: GPLv2+ and Public Domain BuildRequires: bison @@ -142,6 +140,9 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %{_includedir}/iproute2/bpf_elf.h %changelog +* Tue Jun 14 2022 Andrea Claudi - 5.18.0-1 +- New version 5.18.0 [2090930] + * Wed Mar 30 2022 Andrea Claudi - 5.17.0-2 - iproute.spec: do not ship routel (Andrea Claudi) [2068118] diff --git a/sources b/sources index ccbe23a..69ee7a2 100644 --- a/sources +++ b/sources @@ -5,3 +5,4 @@ SHA512 (iproute2-5.13.0.tar.xz) = a3286639fb303a7c3c553cb5df0a7336c4c67e53eb05e8 SHA512 (iproute2-5.14.0.tar.xz) = e2b9b0a2c3e6fc4c67cb50b0a9bf710e749648b83369a49bf905edd7e519d76c50c2cc818bb63cc605c409c66075d4d371f2371796e5f7a8f9d04101b80ef75c SHA512 (iproute2-5.15.0.tar.xz) = e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22 SHA512 (iproute2-5.17.0.tar.xz) = fcffe96fb4819305ddf5c3764b100bd1d204069cf53a6bd776c2716144f574b4fc17963fc231a83ad253cce6a563814556eeb60b211ba9b0b87330186259b34d +SHA512 (iproute2-5.18.0.tar.xz) = 7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068 From c48c29082d38750428cadc158b3f458012deaa35 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 14:48:38 +0000 Subject: [PATCH 27/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iproute.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iproute.spec b/iproute.spec index 393cf08..a35a470 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,7 +1,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 5.18.0 -Release: 1%{?dist}%{?buildid} +Release: 2%{?dist}%{?buildid} %if 0%{?rhel} Group: Applications/System %endif @@ -140,6 +140,9 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %{_includedir}/iproute2/bpf_elf.h %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 5.18.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jun 14 2022 Andrea Claudi - 5.18.0-1 - New version 5.18.0 [2090930] From 35ccaf5271c5f2e70b994a410202925b3c7ea5e4 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Thu, 6 Oct 2022 16:13:20 +0200 Subject: [PATCH 28/54] iproute-6.0.0-1 * Thu Oct 06 2022 Andrea Claudi - 6.0.0-1 - New version 6.0.0 [2114514] - Fix some trailing whitespaces in iproute.spec - Also fix eln build (wrongly including SOURCE1 file) Resolves: rhbz#2114514 Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 31 +++++++++++++++++-------------- sources | 1 + 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 6441e01..44b2f8d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /iproute2-5.15.0.tar.xz /iproute2-5.17.0.tar.xz /iproute2-5.18.0.tar.xz +/iproute2-6.0.0.tar.xz diff --git a/iproute.spec b/iproute.spec index a35a470..9149c1c 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,7 +1,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 5.18.0 -Release: 2%{?dist}%{?buildid} +Version: 6.0.0 +Release: 1%{?dist}%{?buildid} %if 0%{?rhel} Group: Applications/System %endif @@ -97,7 +97,7 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a rm -rf '%{buildroot}%{_docdir}' # append deprecated values to rt_dsfield for compatibility reasons -%if ! 0%{?fedora} +%if 0%{?rhel} && ! 0%{?eln} cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %endif @@ -140,6 +140,9 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %{_includedir}/iproute2/bpf_elf.h %changelog +* Thu Oct 06 2022 Andrea Claudi - 6.0.0-1 +- New version 6.0.0 [2114514] + * Thu Jul 21 2022 Fedora Release Engineering - 5.18.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild @@ -657,14 +660,14 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Thu Apr 23 2009 Marcela Mašláňová - 2.6.29-3 -- new iptables (xtables) bring problems to tc, when ipt is used. +- new iptables (xtables) bring problems to tc, when ipt is used. rhbz#497344 still broken. tc_modules.patch brings correct paths to xtables, but that doesn't fix whole issue. -- 497355 ip should allow creation of an IPsec SA with 'proto any' +- 497355 ip should allow creation of an IPsec SA with 'proto any' and specified sport and dport as selectors * Tue Apr 14 2009 Marcela Mašláňová - 2.6.29-2 -- c3651bf4763d7247e3edd4e20526a85de459041b ip6tunnel: Fix no default +- c3651bf4763d7247e3edd4e20526a85de459041b ip6tunnel: Fix no default display of ip4ip6 tunnels - e48f73d6a5e90d2f883e15ccedf4f53d26bb6e74 missing arpd directory @@ -723,7 +726,7 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield * Wed Feb 6 2008 Marcela Maslanova - 2.6.23-3 - rebuild without tetex files. It isn't working in rawhide yet. Added - new source for ps files. + new source for ps files. - #431179 backward compatibility for previous iproute versions * Mon Jan 21 2008 Marcela Maslanova - 2.6.23-2 @@ -775,7 +778,7 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield - bug fix for xfrm monitor - alignment fixes for cris - documentation corrections - + * Mon Oct 2 2006 Radek Vokal - 2.6.16-7 - fix ip.8 man page, add initcwnd option @@ -825,7 +828,7 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield - use tc manpages and cbq.init from source tarball (#172851) * Thu Nov 10 2005 Radek Vokal 2.6.14-8 -- new upstream source +- new upstream source * Mon Oct 31 2005 Radek Vokal 2.6.14-7 - add warning to ip tunnel add command (#128107) @@ -841,7 +844,7 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield - add RPM_OPT_FLAGS * Mon Sep 19 2005 Radek Vokal 2.6.14-3 -- forget to apply the patch :( +- forget to apply the patch :( * Mon Sep 19 2005 Radek Vokal 2.6.14-2 - make ip help work again (#168449) @@ -860,7 +863,7 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield * Tue May 24 2005 Radek Vokal 2.6.11-2 - removed useless initvar patch (#150798) -- new upstream source +- new upstream source * Tue Mar 15 2005 Radek Vokal 2.6.11-1 - update to iproute-2.6.11 @@ -879,7 +882,7 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield * Tue Nov 16 2004 Radek Vokal 2.6.9-4 - source file updated from snapshot version -- endian patch adding +- endian patch adding * Sat Sep 18 2004 Joshua Blanton 2.6.9-3 - added installation of netem module for tc @@ -905,7 +908,7 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield * Wed Apr 21 2004 Phil Knirsch 2.4.7-14 - Fixed -f option for ss (#118355). - Small description fix (#110997). -- Added initialization of some vars (#74961). +- Added initialization of some vars (#74961). - Added patch to initialize "default" rule as well (#60693). * Fri Feb 13 2004 Elliot Lee @@ -958,7 +961,7 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield - fix build problem in beehive if kernel-sources is not installed * Fri May 25 2001 Helge Deller -- updated to iproute2-2.2.4-now-ss001007.tar.gz +- updated to iproute2-2.2.4-now-ss001007.tar.gz - bzip2 source tar file - "License" replaces "Copyright" - added "BuildPrereq: tetex-latex tetex-dvips psutils" diff --git a/sources b/sources index 69ee7a2..958b7ca 100644 --- a/sources +++ b/sources @@ -6,3 +6,4 @@ SHA512 (iproute2-5.14.0.tar.xz) = e2b9b0a2c3e6fc4c67cb50b0a9bf710e749648b83369a4 SHA512 (iproute2-5.15.0.tar.xz) = e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22 SHA512 (iproute2-5.17.0.tar.xz) = fcffe96fb4819305ddf5c3764b100bd1d204069cf53a6bd776c2716144f574b4fc17963fc231a83ad253cce6a563814556eeb60b211ba9b0b87330186259b34d SHA512 (iproute2-5.18.0.tar.xz) = 7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068 +SHA512 (iproute2-6.0.0.tar.xz) = be30362b0df6906aa786f935d5f555b8b86c747fe05314066f4180ab2f7c952ae227b7cf04c15e75d8f99ca17bafb7c8dc0fb1c18f3a9e3222d98716bb449f7a From 3b389914ec602928d74d86d67f1a4c11164aec4c Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Tue, 1 Nov 2022 22:18:36 +0100 Subject: [PATCH 29/54] libbpf 1.0 support Extra release for libbpf 1.0 build. Signed-off-by: Jiri Olsa --- iproute.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iproute.spec b/iproute.spec index 9149c1c..b5c206d 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,7 +1,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 6.0.0 -Release: 1%{?dist}%{?buildid} +Release: 2%{?dist}%{?buildid} %if 0%{?rhel} Group: Applications/System %endif @@ -140,6 +140,9 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %{_includedir}/iproute2/bpf_elf.h %changelog +* Tue Nov 01 2022 Jiri Olsa - 6.0.0-2 +- libbpf 1.0 support + * Thu Oct 06 2022 Andrea Claudi - 6.0.0-1 - New version 6.0.0 [2114514] From a833ccb56dc76b2db10f9568c30d36ef36b13e31 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:18:39 +0000 Subject: [PATCH 30/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iproute.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iproute.spec b/iproute.spec index b5c206d..27e353a 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,7 +1,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 6.0.0 -Release: 2%{?dist}%{?buildid} +Release: 3%{?dist}%{?buildid} %if 0%{?rhel} Group: Applications/System %endif @@ -140,6 +140,9 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %{_includedir}/iproute2/bpf_elf.h %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 6.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Nov 01 2022 Jiri Olsa - 6.0.0-2 - libbpf 1.0 support From e2a8a76a86596946328288a41bc0f3a078956729 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Fri, 27 Jan 2023 20:11:50 +0100 Subject: [PATCH 31/54] iproute-6.1.0-1 * Fri Jan 27 2023 Andrea Claudi - 6.1.0-1 - New version 6.1.0 [2114514] Resolves: rhbz#2114514 Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 7 +++++-- sources | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 44b2f8d..a41b0f5 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /iproute2-5.17.0.tar.xz /iproute2-5.18.0.tar.xz /iproute2-6.0.0.tar.xz +/iproute2-6.1.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 27e353a..d0bad43 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,7 +1,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.0.0 -Release: 3%{?dist}%{?buildid} +Version: 6.1.0 +Release: 1%{?dist}%{?buildid} %if 0%{?rhel} Group: Applications/System %endif @@ -140,6 +140,9 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %{_includedir}/iproute2/bpf_elf.h %changelog +* Fri Jan 27 2023 Andrea Claudi - 6.1.0-1 +- New version 6.1.0 [2114514] + * Thu Jan 19 2023 Fedora Release Engineering - 6.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 958b7ca..641f77b 100644 --- a/sources +++ b/sources @@ -7,3 +7,4 @@ SHA512 (iproute2-5.15.0.tar.xz) = e94918fa10e523224b965c7cb5303a101745e89c90d149 SHA512 (iproute2-5.17.0.tar.xz) = fcffe96fb4819305ddf5c3764b100bd1d204069cf53a6bd776c2716144f574b4fc17963fc231a83ad253cce6a563814556eeb60b211ba9b0b87330186259b34d SHA512 (iproute2-5.18.0.tar.xz) = 7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068 SHA512 (iproute2-6.0.0.tar.xz) = be30362b0df6906aa786f935d5f555b8b86c747fe05314066f4180ab2f7c952ae227b7cf04c15e75d8f99ca17bafb7c8dc0fb1c18f3a9e3222d98716bb449f7a +SHA512 (iproute2-6.1.0.tar.xz) = 4e4d3b5e1e1a5444f42671c1e6caee072e80063e34e37386695f76f85a1ab662f4513050814006e5154426cbaadfba1d86b0be14e65978d5e670a16446047b28 From 1a364a91200b485b7825bcd905b1fed7da1a6642 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 12 Feb 2023 19:50:19 -0500 Subject: [PATCH 32/54] Fix flatpak build --- iproute.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/iproute.spec b/iproute.spec index d0bad43..6972e37 100644 --- a/iproute.spec +++ b/iproute.spec @@ -79,12 +79,11 @@ The libnetlink static library. %autosetup -p1 -n %{name}2-%{version} %build -%configure +%configure --libdir %{_libdir} +echo -e "\nPREFIX=%{_prefix}\nCONFDIR:=%{_sysconfdir}/iproute2\nSBINDIR=%{_sbindir}" >> config.mk %make_build %install -export SBINDIR='%{_sbindir}' -export LIBDIR='%{_libdir}' %make_install echo '.so man8/tc-cbq.8' > %{buildroot}%{_mandir}/man8/cbq.8 From cbbae567ba4f3b443bc5a932cacb7ddc264be777 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 26 Apr 2023 11:43:32 +0200 Subject: [PATCH 33/54] iproute-6.2.0-1.f39 * Wed Apr 26 2023 Andrea Claudi - 6.2.0-1.f39 - Adopt SPDX license ids - Use rpmautospec machinery - New version 6.2.0 (Andrea Claudi) [2171899] Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 885 +-------------------------------------------------- sources | 1 + 3 files changed, 9 insertions(+), 878 deletions(-) diff --git a/.gitignore b/.gitignore index a41b0f5..9243517 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /iproute2-5.18.0.tar.xz /iproute2-6.0.0.tar.xz /iproute2-6.1.0.tar.xz +/iproute2-6.2.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 6972e37..861b294 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,7 +1,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.1.0 -Release: 1%{?dist}%{?buildid} +Version: 6.2.0 +Release: %autorelease %if 0%{?rhel} Group: Applications/System %endif @@ -9,7 +9,7 @@ URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz -License: GPLv2+ and Public Domain +License: GPL-2.0-or-later AND NIST-PD BuildRequires: bison BuildRequires: elfutils-libelf-devel BuildRequires: flex @@ -41,7 +41,7 @@ Summary: Linux Traffic Control utility %if 0%{?rhel} Group: Applications/System %endif -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{name}%{?_isa} = %{version}-%{release} Provides: /sbin/tc @@ -56,7 +56,7 @@ Summary: Documentation for iproute2 utilities with examples %if 0%{?rhel} Group: Applications/System %endif -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{name} = %{version}-%{release} %description doc @@ -68,7 +68,7 @@ Summary: iproute development files %if 0%{?rhel} Group: Development/Libraries %endif -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{name} = %{version}-%{release} Provides: iproute-static = %{version}-%{release} @@ -139,875 +139,4 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %{_includedir}/iproute2/bpf_elf.h %changelog -* Fri Jan 27 2023 Andrea Claudi - 6.1.0-1 -- New version 6.1.0 [2114514] - -* Thu Jan 19 2023 Fedora Release Engineering - 6.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Nov 01 2022 Jiri Olsa - 6.0.0-2 -- libbpf 1.0 support - -* Thu Oct 06 2022 Andrea Claudi - 6.0.0-1 -- New version 6.0.0 [2114514] - -* Thu Jul 21 2022 Fedora Release Engineering - 5.18.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jun 14 2022 Andrea Claudi - 5.18.0-1 -- New version 5.18.0 [2090930] - -* Wed Mar 30 2022 Andrea Claudi - 5.17.0-2 -- iproute.spec: do not ship routel (Andrea Claudi) [2068118] - -* Wed Mar 23 2022 Andrea Claudi - 5.17.0-1 -- New version 5.17.0 [2039103] - -* Thu Jan 20 2022 Fedora Release Engineering - 5.15.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Nov 04 2021 Andrea Claudi - 5.15.0-1 -- New version 5.15.0 [2019267] - -* Wed Oct 20 2021 Andrea Claudi - 5.14.0-1 -- New version 5.14.0 [1999860] - -* Mon Aug 09 2021 Mohan Boddu - 5.13.0-4.el9 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 - -* Fri Jul 16 2021 Andrea Claudi - 5.13.0-3.el9 -- Fix changelog (Andrea Claudi) [1947854] -- Add RHEL gating configuration (Aleksandra Fedorova) - -* Thu Jul 15 2021 Andrea Claudi - 5.13.0-2.el9 -- Remove Recommends: iproute-tc from spec file (Andrea Claudi) [1947854] - -* Wed Jun 30 2021 Andrea Claudi - 5.13.0-1.el9 -- New version 5.13.0 (#1977898) - -* Fri Apr 16 2021 Mohan Boddu - 5.10.0-3.el9 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - -* Tue Jan 26 2021 Fedora Release Engineering - 5.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Dec 21 2020 Andrea Claudi - 5.10.0-1 -- New version 5.10.0 (#1909551) - -* Wed Dec 2 2020 Andrea Claudi - 5.9.0-1 -- New version 5.9.0 - -* Mon Aug 10 2020 Phil Sutter - 5.8.0-1 -- New version 5.8.0 - -* Tue Jul 28 2020 Fedora Release Engineering - 5.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jun 03 2020 Phil Sutter - 5.7.0-1 -- New version 5.7.0 - -* Tue Jan 28 2020 Phil Sutter - 5.5.0-1 -- New version 5.5.0 - -* Tue Nov 26 2019 Phil Sutter - 5.4.0-1 -- New version 5.4.0 -- Drop iproute-doc package, upstream removed all non-manpage documentation - -* Tue Oct 08 2019 Phil Sutter - 5.3.0-2 -- ifcfg script uses killall, therefore requires psmisc package - -* Thu Sep 26 2019 Phil Sutter - 5.3.0-1 -- New version 5.3.0 -- Add upstream-suggested backports - -* Thu Jul 25 2019 Fedora Release Engineering - 5.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Jul 23 2019 Phil Sutter - 5.2.0-1 -- New version 5.2.0 -- Add upstream-suggested backports -- Fix for tunnel creation when using 'dev' parameter - -* Wed May 29 2019 Phil Sutter - 5.1.0-1 -- New version 5.1.0 - -* Wed Mar 20 2019 Phil Sutter - 5.0.0-2 -- Restore Provides: hint, at least pptp depends on it - -* Wed Mar 20 2019 Phil Sutter - 5.0.0-1 -- New version 5.0.0 -- Get rid of old upgrade path hints - -* Fri Feb 01 2019 Phil Sutter - 4.20.0-1 -- New version 4.20.0 -- Add upstream-suggested backports -- Upstream dropped cbq script, remove it along with related configs -- Add libcap support - -* Fri Feb 01 2019 Fedora Release Engineering - 4.18.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Sep 19 2018 Phil Sutter - 4.18.0-5 -- man: ip-route: Clarify referenced versions are Linux ones - -* Fri Aug 31 2018 Phil Sutter - 4.18.0-4 -- iprule: Fix destination prefix output - -* Thu Aug 23 2018 Phil Sutter - 4.18.0-3 -- Make colored output configurable - -* Thu Aug 16 2018 Phil Sutter - 4.18.0-2 -- Fix ss filter expressions - -* Tue Aug 14 2018 Phil Sutter - 4.18.0-1 -- New version 4.18.0 - -* Fri Jul 13 2018 Fedora Release Engineering - 4.17.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 12 2018 Phil Sutter - 4.17.0-1 -- New version 4.17.0 - -* Fri Jun 01 2018 Phil Sutter - 4.16.0-1 -- New version 4.16.0 - -* Fri Feb 09 2018 Phil Sutter - 4.15.0-1 -- New version 4.15.0 - -* Fri Feb 9 2018 Florian Weimer - 4.14.1-6 -- Use LDFLAGS defaults from redhat-rpm-config - -* Wed Feb 07 2018 Fedora Release Engineering - 4.14.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Dec 11 2017 Phil Sutter - 4.14.1-4 -- Add missing patch files. - -* Mon Dec 11 2017 Phil Sutter - 4.14.1-3 -- Add upstream suggested backports. -- Make use of %%autosetup macro. - -* Wed Nov 15 2017 Phil Sutter - 4.14.1-2 -- Drop unused build dependencies - -* Wed Nov 15 2017 Phil Sutter - 4.14.1-1 -- New version 4.14.1 - -* Tue Sep 19 2017 Phil Sutter - 4.13.0-1 -- New version 4.13.0 - -* Wed Aug 02 2017 Fedora Release Engineering - 4.12.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 4.12.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jul 21 2017 Phil Sutter - 4.12.0-1 -- New version 4.12.0 - -* Tue May 23 2017 Phil Sutter - 4.11.0-1 -- Add virtual capability to tc subpackage so it's easier found -- New version 4.11.0 - -* Thu May 11 2017 Karsten Hopp - 4.10.0-3 -- don't build docs for module builds to limit dependencies - -* Fri Mar 17 2017 Phil Sutter - 4.10.0-2 -- Add two fixes to 4.10.0 release from upstream. - -* Tue Mar 14 2017 Phil Sutter - 4.10.0-1 -- Ship new header iproute2/bpf_elf.h -- Document content of remaining docs fixup patch in spec file -- Drop patches already applied upstream -- New version 4.10.0 - -* Fri Feb 10 2017 Fedora Release Engineering - 4.9.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 2 2017 Thomas Woerner - 4.9.0-3 -- Release bump for iptables-1.6.1 (libxtables.so.12) - -* Sat Jan 28 2017 Phil Sutter - 4.9.0-2 -- Fix for failing 'make install' - -* Sat Jan 28 2017 Phil Sutter - 4.9.0-1 -- New version 4.9.0 - -* Fri Jan 13 2017 Phil Sutter - 4.8.0-2 -- Fix segfault in xt action - -* Wed Nov 30 2016 Phil Sutter - 4.8.0-1 -- New version 4.8.0 - -* Wed Aug 10 2016 Phil Sutter - 4.7.0-1 -- New version 4.7.0 - -* Wed May 04 2016 Phil Sutter - 4.6.0-1 -- New version 4.6.0 - -* Wed Apr 13 2016 Thomas Woerner - 4.5.0-4 -- Rebuild for new iptables-1.6.0 with libxtables so bump - -* Fri Apr 08 2016 Phil Sutter - 4.5.0-3 -- Fix upgrade path by adding correct Requires/Obsoletes statements to spec file -- Move README.iproute2+tc into tc subpackage - -* Fri Mar 18 2016 Phil Sutter - 4.5.0-2 -- Split tc into it's own subpackage - -* Fri Mar 18 2016 Phil Sutter - 4.5.0-1 -- New version 4.5.0 - -* Thu Feb 04 2016 Fedora Release Engineering - 4.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 19 2016 Phil Sutter - 4.4.0-1 -- New version 4.4.0 - -* Sun Oct 04 2015 Phil Sutter - 4.2.0-4 -- Simplify RPM install stage by using package's install target - -* Sun Oct 04 2015 Phil Sutter - 4.2.0-3 -- Add missing build dependency to libmnl-devel -- Ship tipc utility - -* Thu Sep 24 2015 Phil Sutter - 4.2.0-2 -- Add missing build dependency to libselinux-devel - -* Wed Sep 02 2015 Pavel Šimerda - 4.2.0-1 -- new version 4.2.0 - -* Tue Jul 07 2015 Pavel Šimerda - 4.1.1-1 -- new version 4.1.1 - -* Wed Jun 17 2015 Fedora Release Engineering - 4.0.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed May 13 2015 Pavel Šimerda - 4.0.0-3 -- remove patch rejected by upstream - -* Mon May 11 2015 Pavel Šimerda - 4.0.0-2 -- Remove patch rejected by upstream - -* Tue Apr 14 2015 Pavel Šimerda - 4.0.0-1 -- new version 4.0.0 - -* Fri Mar 13 2015 Pavel Šimerda - 3.19.0-1 -- new version 3.19.0 - -* Sat Oct 04 2014 Lubomir Rintel - 3.16.0-3 -- Backport fix for ip link add name regression that broke libvirt - -* Sat Aug 16 2014 Fedora Release Engineering - 3.16.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Tue Aug 05 2014 Petr Šabata - 3.16.0-1 -- 3.16 bump - -* Sat Jul 12 2014 Tom Callaway - 3.15.0-2 -- fix license handling - -* Thu Jun 12 2014 Petr Šabata - 3.15.0-1 -- 3.15.0 bump - -* Sat Jun 07 2014 Fedora Release Engineering - 3.14.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue May 06 2014 Petr Šabata - 3.14.0-2 -- Fix incorrect references in ss(8), #1092653 - -* Tue Apr 15 2014 Petr Šabata - 3.14.0-1 -- 3.14 bump -- Drop out iplink_have_newlink() fix in favor of upstream's approach - -* Tue Nov 26 2013 Petr Šabata - 3.12.0-2 -- Drop libnl from dependencies (#1034454) - -* Mon Nov 25 2013 Petr Šabata - 3.12.0-1 -- 3.12.0 bump - -* Thu Nov 21 2013 Petr Šabata - 3.11.0-2 -- Fix the rtt time parsing again - -* Tue Oct 22 2013 Petr Šabata - 3.11.0-1 -- 3.11 bump - -* Tue Oct 01 2013 Petr Pisar - 3.10.0-8 -- Close file with bridge monitor file (bug #1011822) - -* Tue Sep 24 2013 Petr Pisar - 3.10.0-7 -- Add tc -OK option -- Document "bridge mdb" and "bridge monitor mdb" - -* Fri Aug 30 2013 Petr Šabata - 3.10.0-6 -- Fix lnstat -i properly this time - -* Thu Aug 29 2013 Petr Šabata - 3.10.0-5 -- Fix an 'ip link' hang (#996537) - -* Tue Aug 13 2013 Petr Šabata - 3.10.0-4 -- lnstat -i: Run indefinitely if the --count isn't specified (#977845) -- Switch to unversioned %%docdir - -* Sat Aug 03 2013 Fedora Release Engineering - 3.10.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jul 17 2013 Petr Šabata - 3.10.0-2 -- Fix the XFRM patch - -* Wed Jul 17 2013 Petr Šabata - 3.10.0-1 -- 3.10.0 bump -- Drop the SHAREDIR patch and revert to upstream ways (#966445) -- Fix an XFRM regression with FORTIFY_SOURCE - -* Tue Apr 30 2013 Petr Šabata - 3.9.0-1 -- 3.9.0 bump - -* Thu Apr 25 2013 Petr Šabata - 3.8.0-4 -- ATM is available in Fedora only - -* Tue Mar 12 2013 Petr Šabata - 3.8.0-3 -- Mention the "up" argument in documentation and help outputs (#907468) - -* Mon Mar 04 2013 Petr Šabata - 3.8.0-2 -- Bump for 1.4.18 rebuild - -* Tue Feb 26 2013 Petr Šabata - 3.8.0-1 -- 3.8.0 bump - -* Fri Feb 08 2013 Petr Šabata - 3.7.0-2 -- Don't propogate mounts out of ip (#882047) - -* Wed Dec 12 2012 Petr Šabata - 3.7.0-1 -- 3.7.0 bump - -* Mon Nov 19 2012 Petr Šabata - 3.6.0-3 -- Include section 7 manpages (#876857) -- Fix ancient bogus dates in the changelog (correction based upon commits) -- Explicitly require some TeX fonts no longer present in the base distribution - -* Thu Oct 04 2012 Petr Šabata - 3.6.0-2 -- List all interfaces by default - -* Wed Oct 03 2012 Petr Šabata - 3.6.0-1 -- 3.6.0 bump - -* Thu Aug 30 2012 Petr Šabata - 3.5.1-2 -- Remove the explicit iptables dependency (#852840) - -* Tue Aug 14 2012 Petr Šabata - 3.5.1-1 -- 3.5.1 bugfix release bump -- Rename 'br' to 'bridge' - -* Mon Aug 06 2012 Petr Šabata - 3.5.0-2 -- Install the new bridge utility - -* Thu Aug 02 2012 Petr Šabata - 3.5.0-1 -- 3.5.0 bump -- Move to db5. - -* Thu Jul 19 2012 Fedora Release Engineering - 3.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue May 22 2012 Petr Šabata - 3.4.0-1 -- 3.4.0 bump -- Drop the print route patch (included upstream) - -* Mon Apr 30 2012 Petr Šabata - 3.3.0-2 -- Let's install rtmon too... (#814819) - -* Thu Mar 22 2012 Petr Šabata - 3.3.0-1 -- 3.3.0 bump -- Update source URL - -* Mon Feb 27 2012 Petr Šabata - 3.2.0-3 -- Address dangerous /tmp files security issue (CVE-2012-1088, #797881, #797878) - -* Fri Jan 27 2012 Petr Šabata - 3.2.0-2 -- Simplify the spec a bit thanks to the UsrMove feature - -* Fri Jan 06 2012 Petr Šabata - 3.2.0-1 -- 3.2.0 bump -- Removing a useless, now conflicting patch (initcwnd already decumented) - -* Thu Nov 24 2011 Petr Šabata - 3.1.0-1 -- 3.1.0 bump -- Point URL and Source to the new location on kernel.org -- Remove now obsolete defattr -- Dropping various patches now included upstream -- Dropping iproute2-2.6.25-segfault.patch; I fail to understand the reason for - this hack - -* Tue Nov 15 2011 Petr Šabata - 2.6.39-6 -- ss -ul should display UDP CLOSED sockets (#691100) - -* Thu Oct 06 2011 Petr Sabata - 2.6.39-5 -- Fix ss, lnstat and arpd usage and manpages - -* Wed Sep 07 2011 Petr Sabata - 2.6.39-4 -- lnstat should dump (-d) to stdout instead of stderr (#736332) - -* Tue Jul 26 2011 Petr Sabata - 2.6.39-3 -- Rebuild for xtables7 - -* Tue Jul 12 2011 Petr Sabata - 2.6.39-2 -- Rebuild for xtables6 - -* Thu Jun 30 2011 Petr Sabata - 2.6.39-1 -- 2.6.39 bump - -* Wed Apr 27 2011 Petr Sabata - 2.6.38.1-4 -- Link [cr]tstat to lnstat - -* Wed Apr 27 2011 Petr Sabata - 2.6.38.1-3 -- Install ctstat, rtstat and routef manpage symlinks -- Install m_xt & m_ipt tc modules -- Creating devel and virtual static subpackages with libnetlink - -* Thu Apr 21 2011 Petr Sabata - 2.6.38.1-2 -- General cleanup -- Use global instead of define -- Buildroot removal -- Correcting URL and Source links -- Install genl, ifstat, routef, routel and rtpr (rhbz#697319) - -* Fri Mar 18 2011 Petr Sabata - 2.6.38.1-1 -- 2.6.38.1 bump - -* Wed Mar 16 2011 Petr Sabata - 2.6.38-1 -- 2.6.38 bump - -* Wed Feb 09 2011 Fedora Release Engineering - 2.6.37-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jan 31 2011 Petr Sabata - 2.6.37-2 -- man-pages.patch update, ip(8) TYPE whitespace - -* Mon Jan 10 2011 Petr Sabata - 2.6.37-1 -- 2.6.37 upstream release -- ss(8) improvements patch removed (included upstream) - -* Wed Dec 08 2010 Petr Sabata - 2.6.35-10 -- fix a typo in ss(8) improvements patch, rhbz#661267 - -* Tue Nov 30 2010 Petr Sabata - 2.6.35-9 -- ss(8) improvements patch by jpopelka; should be included in 2.6.36 - -* Tue Nov 09 2010 Petr Sabata - 2.6.35-8 -- rhbz#641599, use the versioned path, man-pages.patch update, prep update - -* Tue Oct 12 2010 Petr Sabata - 2.6.35-7 -- Do not segfault if peer name is omitted when creating a peer veth link, rhbz#642322 - -* Mon Oct 11 2010 Petr Sabata - 2.6.35-6 -- Man-pages update, rhbz#641599 - -* Wed Sep 29 2010 jkeating - 2.6.35-5 -- Rebuilt for gcc bug 634757 - -* Tue Sep 21 2010 Petr Sabata - 2.6.35-4 -- Modified man-pages.patch to fix cbq manpage, rhbz#635877 - -* Tue Sep 21 2010 Petr Sabata - 2.6.35-3 -- Don't print routes with negative metric fix, rhbz#628739 - -* Wed Aug 18 2010 Petr Sabata - 2.6.35-2 -- 'ip route get' fix, iproute2-2.6.35-print-route.patch -- rhbz#622782 - -* Thu Aug 05 2010 Petr Sabata - 2.6.35-1 -- 2.6.35 version bump -- iproute2-tc-priority.patch removed (included in upstream now) - -* Thu Jul 08 2010 Petr Sabata - 2.6.34-5 -- Licensing guidelines compliance fix - -* Wed Jul 07 2010 Petr Sabata - 2.6.34-4 -- Requires: iptables >= 1.4.5, BuildRequires: iptables-devel >= 1.4.5 - -* Thu Jul 01 2010 Petr Sabata - 2.6.34-3 -- Build now runs ./configure to regenerate Makefile for ipt/xt detection - -* Mon Jun 21 2010 Petr Sabata - 2.6.34-2 -- iproute-tc-priority.patch, rhbz#586112 - -* Mon Jun 21 2010 Petr Sabata - 2.6.34-1 -- 2.6.34 version bump - -* Tue Apr 20 2010 Marcela Mašláňová - 2.6.33-2 -- 578729 6rd tunnel correctly 3979ef91de9ed17d21672aaaefd6c228485135a2 -- change BR texlive to tex according to guidelines - -* Thu Feb 25 2010 Marcela Mašláňová - 2.6.33-1 -- update - -* Tue Jan 26 2010 Marcela Mašláňová - 2.6.32-2 -- add macvlan aka VESA support d63a9b2b1e4e3eab0d0577d0a0f412d50be1e0a7 -- kernel headers 2.6.33 ab322673298bd0b8927cdd9d11f3d36af5941b93 - are needed for macvlan features and probably for other added later. -- fix number of release which contains 2.6.32 kernel headers and features - but it was released as 2.6.31 - -* Mon Jan 4 2010 Marcela Mašláňová - 2.6.31-1 -- update to 2.6.31 - -* Fri Nov 27 2009 Marcela Mašláňová - 2.6.29-5.1.20091106gita7a9ddbb -- 539232 patch cbq initscript - -* Fri Nov 27 2009 Marcela Mašláňová - 2.6.29-5.0.20091106gita7a9ddbb -- snapshot with kernel headers for 2.6.32 - -* Fri Oct 9 2009 Marcela Mašláňová - 2.6.29-5.0.20091009gitdaf49fd6 -- new official version isn't available but it's needed -> switch to git snapshots - -* Thu Sep 24 2009 Marcela Mašláňová - 2.6.29-5 -- create missing man pages - -* Fri Jul 24 2009 Fedora Release Engineering - 2.6.29-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Apr 23 2009 Marcela Mašláňová - 2.6.29-3 -- new iptables (xtables) bring problems to tc, when ipt is used. - rhbz#497344 still broken. tc_modules.patch brings correct paths to - xtables, but that doesn't fix whole issue. -- 497355 ip should allow creation of an IPsec SA with 'proto any' - and specified sport and dport as selectors - -* Tue Apr 14 2009 Marcela Mašláňová - 2.6.29-2 -- c3651bf4763d7247e3edd4e20526a85de459041b ip6tunnel: Fix no default - display of ip4ip6 tunnels -- e48f73d6a5e90d2f883e15ccedf4f53d26bb6e74 missing arpd directory - -* Wed Mar 25 2009 Marcela Mašláňová - 2.6.29-1 -- update to 2.6.29 -- remove DDR patch which became part of sourc -- add patch with correct headers 1957a322c9932e1a1d2ca1fd37ce4b335ceb7113 - -* Wed Feb 25 2009 Fedora Release Engineering - 2.6.28-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 4 2009 Marcela Mašláňová - 2.6.28-2 -- 483484 install distribution files into /usr/share and also fixed - install paths in spec -- add the latest change from git which add DRR support - c86f34942a0ce9f8203c0c38f9fe9604f96be706 - -* Mon Jan 19 2009 Marcela Mašláňová - 2.6.28-1 -- previous two patches were included into 2.6.28 release. -- update - -* Mon Jan 12 2009 Marcela Mašláňová - 2.6.27-2 -- 475130 - Negative preferred lifetimes of IPv6 prefixes/addresses - displayed incorrectly -- 472878 - “ip maddr show” in IB interface causes a stack corruption -- both patches will be probably in iproute v2.6.28 - -* Thu Dec 4 2008 Marcela Maslanova - 2.6.27-1 -- aead support was included into upstream version -- patch for moving libs is now deprecated -- update to 2.6.27 - -* Tue Aug 12 2008 Marcela Maslanova - 2.6.26-1 -- update to 2.6.26 -- clean patches - -* Tue Jul 22 2008 Marcela Maslanova - 2.6.25-5 -- fix iproute2-2.6.25-segfault.patch - -* Thu Jul 10 2008 Tom "spot" Callaway - 2.6.25-4 -- rebuild for new db4-4.7 - -* Thu Jul 3 2008 Marcela Maslanova - 2.6.25-3 -- 449933 instead of failing strncpy use copying byte after byte - -* Wed May 14 2008 Marcela Maslanova - 2.6.25-2 -- allow replay setting, solve also 444724 - -* Mon Apr 21 2008 Marcela Maslanova - 2.6.25-1 -- update -- remove patch for backward compatibility -- add patch for AEAD compatibility - -* Thu Feb 21 2008 Marcela Maslanova - 2.6.23-4 -- add creating ps file again. Fix was done in texlive - -* Wed Feb 6 2008 Marcela Maslanova - 2.6.23-3 -- rebuild without tetex files. It isn't working in rawhide yet. Added - new source for ps files. -- #431179 backward compatibility for previous iproute versions - -* Mon Jan 21 2008 Marcela Maslanova - 2.6.23-2 -- rebuild with fix tetex and linuxdoc-tools -> manual pdf -- clean unnecessary patches -- add into spec *.so objects, new BR linux-atm-libs-devel - -* Wed Oct 31 2007 Marcela Maslanova - 2.6.23-1 -- new version from upstrem 2.3.23 - -* Tue Oct 23 2007 Marcela Maslanova - 2.6.22-5 -- move files from /usr/lib/tc to /usr/share/tc -- remove listing files twice - -* Fri Aug 31 2007 Marcela Maslanova - 2.6.22-3 -- package review #225903 - -* Mon Aug 27 2007 Jeremy Katz - 2.6.22-2 -- rebuild for new db4 - -* Wed Jul 11 2007 Radek Vokál - 2.6.22-1 -- upgrade to 2.6.22 - -* Mon Mar 19 2007 Radek Vokál - 2.6.20-2 -- fix broken tc-pfifo man page (#232891) - -* Thu Mar 15 2007 Radek Vokál - 2.6.20-1 -- upgrade to 2.6.20 - -* Fri Dec 15 2006 Radek Vokál - 2.6.19-1 -- upgrade to 2.6.19 - -* Mon Dec 11 2006 Radek Vokál - 2.6.18-5 -- fix snapshot version - -* Fri Dec 1 2006 Radek Vokál - 2.6.18-4 -- spec file cleanup -- one more rebuilt against db4 - -* Thu Nov 16 2006 Radek Vokál - 2.6.18-3 -- fix defective manpage for tc-pfifo (#215399) - -* Mon Nov 13 2006 Radek Vokál - 2.6.18-2 -- rebuilt against new db4 - -* Tue Oct 3 2006 Radek Vokal - 2.6.18-1 -- upgrade to upstream 2.6.18 -- initcwnd patch merged -- bug fix for xfrm monitor -- alignment fixes for cris -- documentation corrections - -* Mon Oct 2 2006 Radek Vokal - 2.6.16-7 -- fix ip.8 man page, add initcwnd option - -* Sun Oct 01 2006 Jesse Keating - 2.6.16-6 -- rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Tue Sep 19 2006 Radek Vokal - 2.6.16-5 -- fix crash when resolving ip address - -* Mon Aug 21 2006 Radek Vokál - 2.6.16-4 -- add LOWER_UP and DORMANT flags (#202199) -- use dist tag - -* Wed Jul 12 2006 Jesse Keating - 2.6.16-3.1 -- rebuild - -* Mon Jun 26 2006 Radek Vokál - 2.6.16-3 -- improve handling of initcwnd value (#179719) - -* Sun May 28 2006 Radek Vokál - 2.6.16-2 -- fix BuildRequires: flex (#193403) - -* Sun Mar 26 2006 Radek Vokál - 2.6.16-1 -- upgrade to 2.6.16-060323 -- don't hardcode /usr/lib in tc (#186607) - -* Wed Feb 22 2006 Radek Vokál - 2.6.15-2 -- own /usr/lib/tc (#181953) -- obsoletes shapecfg (#182284) - -* Fri Feb 10 2006 Jesse Keating - 2.6.15-1.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 2.6.15-1.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Tue Jan 17 2006 Radek Vokal 2.6.15-1 -- upgrade to 2.6.15-060110 - -* Mon Dec 12 2005 Radek Vokal 2.6.14-11 -- rebuilt - -* Fri Dec 09 2005 Radek Vokal 2.6.14-10 -- remove backup of config files (#175302) - -* Fri Nov 11 2005 Radek Vokal 2.6.14-9 -- use tc manpages and cbq.init from source tarball (#172851) - -* Thu Nov 10 2005 Radek Vokal 2.6.14-8 -- new upstream source - -* Mon Oct 31 2005 Radek Vokal 2.6.14-7 -- add warning to ip tunnel add command (#128107) - -* Fri Oct 07 2005 Bill Nottingham 2.6.14-6 -- update from upstream (appears to fix #170111) - -* Fri Oct 07 2005 Radek Vokal 2.6.14-5 -- update from upstream -- fixed host_len size for memcpy (#168903) - -* Fri Sep 23 2005 Radek Vokal 2.6.14-4 -- add RPM_OPT_FLAGS - -* Mon Sep 19 2005 Radek Vokal 2.6.14-3 -- forget to apply the patch :( - -* Mon Sep 19 2005 Radek Vokal 2.6.14-2 -- make ip help work again (#168449) - -* Wed Sep 14 2005 Radek Vokal 2.6.14-1 -- upgrade to ss050901 for 2.6.14 kernel headers - -* Fri Aug 26 2005 Radek Vokal 2.6.13-3 -- added /sbin/cbq script and sample configuration files (#166301) - -* Fri Aug 19 2005 Radek Vokal 2.6.13-2 -- upgrade to iproute2-050816 - -* Thu Aug 11 2005 Radek Vokal 2.6.13-1 -- update to snapshot for 2.6.13+ kernel - -* Tue May 24 2005 Radek Vokal 2.6.11-2 -- removed useless initvar patch (#150798) -- new upstream source - -* Tue Mar 15 2005 Radek Vokal 2.6.11-1 -- update to iproute-2.6.11 - -* Fri Mar 04 2005 Radek Vokal 2.6.10-2 -- gcc4 rebuilt - -* Wed Feb 16 2005 Radek Vokal 2.6.10-1 -- update to iproute-2.6.10 - -* Thu Dec 23 2004 Radek Vokal 2.6.9-6 -- added arpd into sbin - -* Mon Nov 29 2004 Radek Vokal 2.6.9-5 -- debug info removed from makefile and from spec (#140891) - -* Tue Nov 16 2004 Radek Vokal 2.6.9-4 -- source file updated from snapshot version -- endian patch adding - -* Sat Sep 18 2004 Joshua Blanton 2.6.9-3 -- added installation of netem module for tc - -* Mon Sep 06 2004 Radek Vokal 2.6.9-2 -- fixed possible buffer owerflow, path by Steve Grubb - -* Wed Sep 01 2004 Radek Vokal 2.6.9-1 -- updated to iproute-2.6.9, spec file change, patches cleared - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Wed May 26 2004 Phil Knirsch 2.4.7-16 -- Took tons of manpages from debian, much more complete (#123952). - -* Thu May 06 2004 Phil Knirsch 2.4.7-15 -- rebuilt - -* Thu May 06 2004 Phil Knirsch 2.4.7-13.2 -- Built security errata version for FC1. - -* Wed Apr 21 2004 Phil Knirsch 2.4.7-14 -- Fixed -f option for ss (#118355). -- Small description fix (#110997). -- Added initialization of some vars (#74961). -- Added patch to initialize "default" rule as well (#60693). - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Wed Nov 05 2003 Phil Knirsch 2.4.7-12 -- Security errata for netlink (CAN-2003-0856). - -* Thu Oct 23 2003 Phil Knirsch -- Updated to latest version. Used by other distros, so seems stable. ;-) -- Quite a few patches needed updating in that turn. -- Added ss (#107363) and several other new nifty tools. - -* Tue Jun 17 2003 Phil Knirsch -- rebuilt - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Thu Jan 16 2003 Phil Knirsch 2.4.7-7 -- Added htb3-tc patch from http://luxik.cdi.cz/~devik/qos/htb/ (#75486). - -* Fri Oct 11 2002 Bill Nottingham 2.4.7-6 -- remove flags patch at author's request - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Wed Jun 19 2002 Phil Knirsch 2.4.7-4 -- Don't forcibly strip binaries - -* Mon May 27 2002 Phil Knirsch 2.4.7-3 -- Fixed missing diffserv and atm support in config (#57278). -- Fixed inconsistent numeric base problem for command line (#65473). - -* Tue May 14 2002 Phil Knirsch 2.4.7-2 -- Added patch to fix crosscompiling by Adrian Linkins. - -* Fri Mar 15 2002 Phil Knirsch 2.4.7-1 -- Update to latest stable release 2.4.7-now-ss010824. -- Added simple man page for ip. - -* Wed Aug 8 2001 Bill Nottingham -- allow setting of allmulti & promisc flags (#48669) - -* Mon Jul 02 2001 Than Ngo -- fix build problem in beehive if kernel-sources is not installed - -* Fri May 25 2001 Helge Deller -- updated to iproute2-2.2.4-now-ss001007.tar.gz -- bzip2 source tar file -- "License" replaces "Copyright" -- added "BuildPrereq: tetex-latex tetex-dvips psutils" -- rebuilt for 7.2 - -* Tue May 1 2001 Bill Nottingham -- use the system headers - the included ones are broken -- ETH_P_ECHO went away - -* Sat Jan 6 2001 Jeff Johnson -- test for specific KERNEL_INCLUDE directories. - -* Thu Oct 12 2000 Than Ngo -- rebuild for 7.1 - -* Thu Oct 12 2000 Than Ngo -- add default configuration files for iproute (Bug #10549, #18887) - -* Tue Jul 25 2000 Jakub Jelinek -- fix include-glibc/ to cope with glibc 2.2 new resolver headers - -* Thu Jul 13 2000 Prospector -- automatic rebuild - -* Sun Jun 18 2000 Than Ngo -- rebuilt in the new build environment -- use RPM macros -- handle RPM_OPT_FLAGS - -* Sat Jun 03 2000 Than Ngo -- fix iproute to build with new glibc - -* Fri May 26 2000 Ngo Than -- update to 2.2.4-now-ss000305 -- add configuration files - -* Mon Sep 13 1999 Bill Nottingham -- strip binaries - -* Mon Aug 16 1999 Cristian Gafton -- first build +%autochangelog diff --git a/sources b/sources index 641f77b..612487f 100644 --- a/sources +++ b/sources @@ -8,3 +8,4 @@ SHA512 (iproute2-5.17.0.tar.xz) = fcffe96fb4819305ddf5c3764b100bd1d204069cf53a6b SHA512 (iproute2-5.18.0.tar.xz) = 7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068 SHA512 (iproute2-6.0.0.tar.xz) = be30362b0df6906aa786f935d5f555b8b86c747fe05314066f4180ab2f7c952ae227b7cf04c15e75d8f99ca17bafb7c8dc0fb1c18f3a9e3222d98716bb449f7a SHA512 (iproute2-6.1.0.tar.xz) = 4e4d3b5e1e1a5444f42671c1e6caee072e80063e34e37386695f76f85a1ab662f4513050814006e5154426cbaadfba1d86b0be14e65978d5e670a16446047b28 +SHA512 (iproute2-6.2.0.tar.xz) = b24e0fdd0f51b8b78bc3bb681e3829af47d3011e93f3892289eb070b336709a6883728ecc7627ca37f6449720f8ed1349af321c0d04454894a7175b82f7de151 From 7d1d584693f64c34c203b6a986ab079a12860521 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Sun, 30 Apr 2023 10:56:21 +0200 Subject: [PATCH 34/54] iproute-6.3.0-1.f39 * Sun Apr 30 2023 Andrea Claudi - 6.3.0-1.f39 - New version 6.3.0 (Andrea Claudi) [2192181] Resolves: rhbz#2192181 Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 2 +- sources | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9243517..60a3d0c 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /iproute2-6.0.0.tar.xz /iproute2-6.1.0.tar.xz /iproute2-6.2.0.tar.xz +/iproute2-6.3.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 861b294..7c93030 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,6 +1,6 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.2.0 +Version: 6.3.0 Release: %autorelease %if 0%{?rhel} Group: Applications/System diff --git a/sources b/sources index 612487f..59355c7 100644 --- a/sources +++ b/sources @@ -9,3 +9,4 @@ SHA512 (iproute2-5.18.0.tar.xz) = 7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de49 SHA512 (iproute2-6.0.0.tar.xz) = be30362b0df6906aa786f935d5f555b8b86c747fe05314066f4180ab2f7c952ae227b7cf04c15e75d8f99ca17bafb7c8dc0fb1c18f3a9e3222d98716bb449f7a SHA512 (iproute2-6.1.0.tar.xz) = 4e4d3b5e1e1a5444f42671c1e6caee072e80063e34e37386695f76f85a1ab662f4513050814006e5154426cbaadfba1d86b0be14e65978d5e670a16446047b28 SHA512 (iproute2-6.2.0.tar.xz) = b24e0fdd0f51b8b78bc3bb681e3829af47d3011e93f3892289eb070b336709a6883728ecc7627ca37f6449720f8ed1349af321c0d04454894a7175b82f7de151 +SHA512 (iproute2-6.3.0.tar.xz) = aec1d8ceb54c8849a075ec1ce079678638e05ccaec093e8b3cbc7243b5fafea2a8c11f10930fced3df82f52d6750aa325178e44f9058e37a556ab108d4a968bf From 05c1d08d5dd331a8a49b1089506f554f9377c87d Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Tue, 27 Jun 2023 11:24:06 +0200 Subject: [PATCH 35/54] iproute-6.4.0-1.f39 * Tue Jun 27 2023 Andrea Claudi - 6.4.0-1.f39 - New version 6.4.0 (Andrea Claudi) [2217550] Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 2 +- sources | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 60a3d0c..9cde5f7 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /iproute2-6.1.0.tar.xz /iproute2-6.2.0.tar.xz /iproute2-6.3.0.tar.xz +/iproute2-6.4.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 7c93030..02c3545 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,6 +1,6 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.3.0 +Version: 6.4.0 Release: %autorelease %if 0%{?rhel} Group: Applications/System diff --git a/sources b/sources index 59355c7..e8ae896 100644 --- a/sources +++ b/sources @@ -10,3 +10,4 @@ SHA512 (iproute2-6.0.0.tar.xz) = be30362b0df6906aa786f935d5f555b8b86c747fe053140 SHA512 (iproute2-6.1.0.tar.xz) = 4e4d3b5e1e1a5444f42671c1e6caee072e80063e34e37386695f76f85a1ab662f4513050814006e5154426cbaadfba1d86b0be14e65978d5e670a16446047b28 SHA512 (iproute2-6.2.0.tar.xz) = b24e0fdd0f51b8b78bc3bb681e3829af47d3011e93f3892289eb070b336709a6883728ecc7627ca37f6449720f8ed1349af321c0d04454894a7175b82f7de151 SHA512 (iproute2-6.3.0.tar.xz) = aec1d8ceb54c8849a075ec1ce079678638e05ccaec093e8b3cbc7243b5fafea2a8c11f10930fced3df82f52d6750aa325178e44f9058e37a556ab108d4a968bf +SHA512 (iproute2-6.4.0.tar.xz) = 42330be6e061302694ea301765ff8d3cbfaeca4b1d06e39778861e4390ed211c03cb2d41498190202b659f7f5647b1ca4857410ef8c16fd601a35e7162788d21 From b4ab73fd792594877fa458a25fa48abe00bb9ef2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 07:34:48 +0000 Subject: [PATCH 36/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From d7b1054f529b7d634e4a3ad27d4f6eef95e58177 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 20 Sep 2023 16:21:46 +0200 Subject: [PATCH 37/54] iproute-6.5.0-1.f40 * Wed Sep 20 2023 Andrea Claudi - 6.5.0-1.f40 - New version 6.5.0 (Andrea Claudi) [2237746] Signed-off-by: Andrea Claudi --- .gitignore | 1 + ...CONF_USR_DIR-honours-the-libdir-conf.patch | 48 +++++++++++++++++++ iproute.spec | 14 +++--- sources | 1 + 4 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch diff --git a/.gitignore b/.gitignore index 9cde5f7..36c29bc 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /iproute2-6.2.0.tar.xz /iproute2-6.3.0.tar.xz /iproute2-6.4.0.tar.xz +/iproute2-6.5.0.tar.xz diff --git a/0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch b/0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch new file mode 100644 index 0000000..645a6f9 --- /dev/null +++ b/0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch @@ -0,0 +1,48 @@ +From 358ce5cf068fb9f630a699e94e5aa1498856296a Mon Sep 17 00:00:00 2001 +Message-ID: <358ce5cf068fb9f630a699e94e5aa1498856296a.1695218419.git.aclaudi@redhat.com> +From: Andrea Claudi +Date: Wed, 20 Sep 2023 15:52:51 +0200 +Subject: [PATCH] Makefile: ensure CONF_USR_DIR honours the libdir config + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2237746 +Upstream Status: iproute2.git commit 946753a4 + +commit 946753a4459bd035132a27bb2eb87529c1979b90 +Author: Andrea Claudi +Date: Fri Sep 15 21:59:06 2023 +0200 + + Makefile: ensure CONF_USR_DIR honours the libdir config + + Following commit cee0cf84bd32 ("configure: add the --libdir option"), + iproute2 lib directory is configurable using the --libdir option on the + configure script. However, CONF_USR_DIR does not honour the configured + lib path in its default value. + + This fixes the issue simply using $(LIBDIR) instead of $(PREFIX)/lib. + Please note that the default value for $(LIBDIR) is exactly + $(PREFIX)/lib, so this does not change the default value for + CONF_USR_DIR. + + Fixes: 0a0a8f12fa1b ("Read configuration files from /etc and /usr") + Signed-off-by: Andrea Claudi + Signed-off-by: Stephen Hemminger +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 7d1819ce..54539ce4 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ endif + PREFIX?=/usr + SBINDIR?=/sbin + CONF_ETC_DIR?=/etc/iproute2 +-CONF_USR_DIR?=$(PREFIX)/lib/iproute2 ++CONF_USR_DIR?=$(LIBDIR)/iproute2 + NETNS_RUN_DIR?=/var/run/netns + NETNS_ETC_DIR?=/etc/netns + DATADIR?=$(PREFIX)/share +-- +2.41.0 + diff --git a/iproute.spec b/iproute.spec index 02c3545..c7e1b80 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,13 +1,13 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.4.0 +Version: 6.5.0 Release: %autorelease %if 0%{?rhel} Group: Applications/System %endif URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz - +Patch0: 0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch License: GPL-2.0-or-later AND NIST-PD BuildRequires: bison @@ -79,8 +79,8 @@ The libnetlink static library. %autosetup -p1 -n %{name}2-%{version} %build -%configure --libdir %{_libdir} -echo -e "\nPREFIX=%{_prefix}\nCONFDIR:=%{_sysconfdir}/iproute2\nSBINDIR=%{_sbindir}" >> config.mk +%configure +echo -e "\nCONFDIR:=%{_libdir}/iproute2\nSBINDIR=%{_sbindir}" >> config.mk %make_build %install @@ -97,11 +97,11 @@ rm -rf '%{buildroot}%{_docdir}' # append deprecated values to rt_dsfield for compatibility reasons %if 0%{?rhel} && ! 0%{?eln} -cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield +cat %{SOURCE1} >>%{buildroot}%{_libdir}/iproute2/rt_dsfield %endif %files -%dir %{_sysconfdir}/iproute2 +%dir %{_libdir}/iproute2 %license COPYING %doc README README.devel %{_mandir}/man7/* @@ -109,7 +109,7 @@ cat %{SOURCE1} >>%{buildroot}%{_sysconfdir}/iproute2/rt_dsfield %{_mandir}/man8/* %exclude %{_mandir}/man8/tc* %exclude %{_mandir}/man8/cbq* -%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/* +%attr(644,root,root) %config(noreplace) %{_libdir}/iproute2/* %{_sbindir}/* %exclude %{_sbindir}/tc %exclude %{_sbindir}/routel diff --git a/sources b/sources index e8ae896..6fa712f 100644 --- a/sources +++ b/sources @@ -11,3 +11,4 @@ SHA512 (iproute2-6.1.0.tar.xz) = 4e4d3b5e1e1a5444f42671c1e6caee072e80063e34e3738 SHA512 (iproute2-6.2.0.tar.xz) = b24e0fdd0f51b8b78bc3bb681e3829af47d3011e93f3892289eb070b336709a6883728ecc7627ca37f6449720f8ed1349af321c0d04454894a7175b82f7de151 SHA512 (iproute2-6.3.0.tar.xz) = aec1d8ceb54c8849a075ec1ce079678638e05ccaec093e8b3cbc7243b5fafea2a8c11f10930fced3df82f52d6750aa325178e44f9058e37a556ab108d4a968bf SHA512 (iproute2-6.4.0.tar.xz) = 42330be6e061302694ea301765ff8d3cbfaeca4b1d06e39778861e4390ed211c03cb2d41498190202b659f7f5647b1ca4857410ef8c16fd601a35e7162788d21 +SHA512 (iproute2-6.5.0.tar.xz) = 615ba6924becdf08af3f491d347d84897ff0198426d65b194c87146c4527b0856fc51688b59834abe1cb6f9a70b93c66ff7ade6b7c305c1ece0fd6a29df6bc54 From 8760a89e54d403da2bcbdb870dba250ef94dd33b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:14:40 +0000 Subject: [PATCH 38/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ff66d681df23a52b7c6a595d37391fcefb2f19c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 22:53:27 +0000 Subject: [PATCH 39/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f8ce70532360040d0a4cda79080899f71993f69a Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Sat, 10 Feb 2024 00:16:01 +0100 Subject: [PATCH 40/54] iproute-6.7.0-1.f40 * Fri Feb 09 2024 Andrea Claudi - 6.7.0-1.f40 - New version 6.7.0 (Andrea Claudi) [2247875] - Fix FTBFS on ppc64le (Andrea Claudi) [2261250] - Remove libdb-devel dependency from iproute [1788538] - Enable color output by default [2239120] Resolves: rhbz#2247875, rhbz#2261250, rhbz#1788538, #rhbz2239120 Signed-off-by: Andrea Claudi --- .gitignore | 1 + ...CONF_USR_DIR-honours-the-libdir-conf.patch | 48 -------------- ...proute2-fix-build-failure-on-ppc64le.patch | 66 +++++++++++++++++++ iproute.spec | 27 ++------ sources | 15 +---- 5 files changed, 75 insertions(+), 82 deletions(-) delete mode 100644 0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch create mode 100644 0001-iproute2-fix-build-failure-on-ppc64le.patch diff --git a/.gitignore b/.gitignore index 36c29bc..25f8579 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /iproute2-6.3.0.tar.xz /iproute2-6.4.0.tar.xz /iproute2-6.5.0.tar.xz +/iproute2-6.7.0.tar.xz diff --git a/0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch b/0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch deleted file mode 100644 index 645a6f9..0000000 --- a/0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 358ce5cf068fb9f630a699e94e5aa1498856296a Mon Sep 17 00:00:00 2001 -Message-ID: <358ce5cf068fb9f630a699e94e5aa1498856296a.1695218419.git.aclaudi@redhat.com> -From: Andrea Claudi -Date: Wed, 20 Sep 2023 15:52:51 +0200 -Subject: [PATCH] Makefile: ensure CONF_USR_DIR honours the libdir config - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2237746 -Upstream Status: iproute2.git commit 946753a4 - -commit 946753a4459bd035132a27bb2eb87529c1979b90 -Author: Andrea Claudi -Date: Fri Sep 15 21:59:06 2023 +0200 - - Makefile: ensure CONF_USR_DIR honours the libdir config - - Following commit cee0cf84bd32 ("configure: add the --libdir option"), - iproute2 lib directory is configurable using the --libdir option on the - configure script. However, CONF_USR_DIR does not honour the configured - lib path in its default value. - - This fixes the issue simply using $(LIBDIR) instead of $(PREFIX)/lib. - Please note that the default value for $(LIBDIR) is exactly - $(PREFIX)/lib, so this does not change the default value for - CONF_USR_DIR. - - Fixes: 0a0a8f12fa1b ("Read configuration files from /etc and /usr") - Signed-off-by: Andrea Claudi - Signed-off-by: Stephen Hemminger ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 7d1819ce..54539ce4 100644 ---- a/Makefile -+++ b/Makefile -@@ -17,7 +17,7 @@ endif - PREFIX?=/usr - SBINDIR?=/sbin - CONF_ETC_DIR?=/etc/iproute2 --CONF_USR_DIR?=$(PREFIX)/lib/iproute2 -+CONF_USR_DIR?=$(LIBDIR)/iproute2 - NETNS_RUN_DIR?=/var/run/netns - NETNS_ETC_DIR?=/etc/netns - DATADIR?=$(PREFIX)/share --- -2.41.0 - diff --git a/0001-iproute2-fix-build-failure-on-ppc64le.patch b/0001-iproute2-fix-build-failure-on-ppc64le.patch new file mode 100644 index 0000000..1d621e4 --- /dev/null +++ b/0001-iproute2-fix-build-failure-on-ppc64le.patch @@ -0,0 +1,66 @@ +From ac4e9bd66d9c8461024dfd3698e120c678eb6cfc Mon Sep 17 00:00:00 2001 +Message-ID: +From: Andrea Claudi +Date: Fri, 9 Feb 2024 23:56:20 +0100 +Subject: [PATCH] iproute2: fix build failure on ppc64le +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2261250 +Upstream Status: posted upstream + +commit d13ef7c00b60a50a5e8ddbb7ff138399689d3483 +Author: Andrea Claudi +Date: Fri Feb 9 10:44:55 2024 +0100 + + iproute2: fix build failure on ppc64le + + ppc64le build fails with error on ifstat.c when + -Wincompatible-pointer-types is enabled: + + ifstat.c: In function ‘dump_raw_db’: + ifstat.c:323:44: error: initialization of ‘long long unsigned int *’ from incompatible pointer type ‘__u64 *’ {aka ‘long unsigned int *’} [-Wincompatible-pointer-types] + 323 | unsigned long long *vals = n->val; + + Several other warnings are produced when -Wformat= is set, for example: + + ss.c:3244:34: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 2 has type ‘__u64’ {aka ‘long unsigned int’} [-Wformat=] + 3244 | out(" rcv_nxt:%llu", s->mptcpi_rcv_nxt); + | ~~~^ ~~~~~~~~~~~~~~~~~ + | | | + | | __u64 {aka long unsigned int} + | long long unsigned int + | %lu + + This happens because __u64 is defined as long unsigned on ppc64le. As + pointed out by Florian Weimar, we should use -D__SANE_USERSPACE_TYPES__ + if we really want to use long long unsigned in iproute2. + + This fix the build failure and all the warnings without any change on + the code itself. + + Suggested-by: Florian Weimer + Signed-off-by: Andrea Claudi + +Signed-off-by: Andrea Claudi +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 8024d45e..3b9daede 100644 +--- a/Makefile ++++ b/Makefile +@@ -60,7 +60,7 @@ CC := gcc + HOSTCC ?= $(CC) + DEFINES += -D_GNU_SOURCE + # Turn on transparent support for LFS +-DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE ++DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__SANE_USERSPACE_TYPES__ + CCOPTS = -O2 -pipe + WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes + WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2 +-- +2.43.0 + diff --git a/iproute.spec b/iproute.spec index c7e1b80..7d10d3c 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,13 +1,10 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.5.0 +Version: 6.7.0 Release: %autorelease -%if 0%{?rhel} -Group: Applications/System -%endif URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz -Patch0: 0001-Makefile-ensure-CONF_USR_DIR-honours-the-libdir-conf.patch +Patch0: 0001-iproute2-fix-build-failure-on-ppc64le.patch License: GPL-2.0-or-later AND NIST-PD BuildRequires: bison @@ -17,7 +14,6 @@ BuildRequires: gcc BuildRequires: iptables-devel >= 1.4.5 BuildRequires: libbpf-devel BuildRequires: libcap-devel -BuildRequires: libdb-devel BuildRequires: libmnl-devel BuildRequires: libselinux-devel BuildRequires: make @@ -38,9 +34,6 @@ kernel. %package tc Summary: Linux Traffic Control utility -%if 0%{?rhel} -Group: Applications/System -%endif License: GPL-2.0-or-later Requires: %{name}%{?_isa} = %{version}-%{release} Provides: /sbin/tc @@ -53,9 +46,6 @@ Linux. %if ! 0%{?_module_build} %package doc Summary: Documentation for iproute2 utilities with examples -%if 0%{?rhel} -Group: Applications/System -%endif License: GPL-2.0-or-later Requires: %{name} = %{version}-%{release} @@ -65,9 +55,6 @@ The iproute documentation contains howtos and examples of settings. %package devel Summary: iproute development files -%if 0%{?rhel} -Group: Development/Libraries -%endif License: GPL-2.0-or-later Requires: %{name} = %{version}-%{release} Provides: iproute-static = %{version}-%{release} @@ -79,8 +66,8 @@ The libnetlink static library. %autosetup -p1 -n %{name}2-%{version} %build -%configure -echo -e "\nCONFDIR:=%{_libdir}/iproute2\nSBINDIR=%{_sbindir}" >> config.mk +%configure --color auto +echo -e "\nSBINDIR=%{_sbindir}" >> config.mk %make_build %install @@ -97,11 +84,11 @@ rm -rf '%{buildroot}%{_docdir}' # append deprecated values to rt_dsfield for compatibility reasons %if 0%{?rhel} && ! 0%{?eln} -cat %{SOURCE1} >>%{buildroot}%{_libdir}/iproute2/rt_dsfield +cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield %endif %files -%dir %{_libdir}/iproute2 +%dir %{_datadir}/iproute2 %license COPYING %doc README README.devel %{_mandir}/man7/* @@ -109,7 +96,7 @@ cat %{SOURCE1} >>%{buildroot}%{_libdir}/iproute2/rt_dsfield %{_mandir}/man8/* %exclude %{_mandir}/man8/tc* %exclude %{_mandir}/man8/cbq* -%attr(644,root,root) %config(noreplace) %{_libdir}/iproute2/* +%attr(644,root,root) %config(noreplace) %{_datadir}/iproute2/* %{_sbindir}/* %exclude %{_sbindir}/tc %exclude %{_sbindir}/routel diff --git a/sources b/sources index 6fa712f..9522a67 100644 --- a/sources +++ b/sources @@ -1,14 +1 @@ -SHA512 (iproute2-5.10.0.tar.xz) = a468eefa797898b6de452212aa432c0a931434defacae5fb4335754c1292c5d86a8c8dbf3017f90cec266d71a2a17ae469aac17e1a85a5cbddc70814313e4c13 -SHA512 (iproute2-5.11.0.tar.xz) = 8d0e7efc20db70af2d344962610b7fb7f464da567f63e094a2e2a9915f6e9087a2282163d2c73eb2065aaec4f0b0cf19614253798153b31e34b06f57e704f3ed -SHA512 (iproute2-5.12.0.tar.xz) = 9249beb67b30ceef178b60b2b61a5e6c45277e747ae4c865e739b7ab84192549e8e94ebaee43c0a87c0291037746ffb6936346245220786e369201ee13d60fac -SHA512 (iproute2-5.13.0.tar.xz) = a3286639fb303a7c3c553cb5df0a7336c4c67e53eb05e872d2776b771dbfa36ffdf2df140f570275db6785c882992f469f8eb34a5b506aac876216df7dde245d -SHA512 (iproute2-5.14.0.tar.xz) = e2b9b0a2c3e6fc4c67cb50b0a9bf710e749648b83369a49bf905edd7e519d76c50c2cc818bb63cc605c409c66075d4d371f2371796e5f7a8f9d04101b80ef75c -SHA512 (iproute2-5.15.0.tar.xz) = e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22 -SHA512 (iproute2-5.17.0.tar.xz) = fcffe96fb4819305ddf5c3764b100bd1d204069cf53a6bd776c2716144f574b4fc17963fc231a83ad253cce6a563814556eeb60b211ba9b0b87330186259b34d -SHA512 (iproute2-5.18.0.tar.xz) = 7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068 -SHA512 (iproute2-6.0.0.tar.xz) = be30362b0df6906aa786f935d5f555b8b86c747fe05314066f4180ab2f7c952ae227b7cf04c15e75d8f99ca17bafb7c8dc0fb1c18f3a9e3222d98716bb449f7a -SHA512 (iproute2-6.1.0.tar.xz) = 4e4d3b5e1e1a5444f42671c1e6caee072e80063e34e37386695f76f85a1ab662f4513050814006e5154426cbaadfba1d86b0be14e65978d5e670a16446047b28 -SHA512 (iproute2-6.2.0.tar.xz) = b24e0fdd0f51b8b78bc3bb681e3829af47d3011e93f3892289eb070b336709a6883728ecc7627ca37f6449720f8ed1349af321c0d04454894a7175b82f7de151 -SHA512 (iproute2-6.3.0.tar.xz) = aec1d8ceb54c8849a075ec1ce079678638e05ccaec093e8b3cbc7243b5fafea2a8c11f10930fced3df82f52d6750aa325178e44f9058e37a556ab108d4a968bf -SHA512 (iproute2-6.4.0.tar.xz) = 42330be6e061302694ea301765ff8d3cbfaeca4b1d06e39778861e4390ed211c03cb2d41498190202b659f7f5647b1ca4857410ef8c16fd601a35e7162788d21 -SHA512 (iproute2-6.5.0.tar.xz) = 615ba6924becdf08af3f491d347d84897ff0198426d65b194c87146c4527b0856fc51688b59834abe1cb6f9a70b93c66ff7ade6b7c305c1ece0fd6a29df6bc54 +SHA512 (iproute2-6.7.0.tar.xz) = 5d8dca139b1b980dac6c841f477b951dd199074cb078b5ea8df23b3532eeb235cca1df9f6628b0f81b7edd62aaf4e95bad15a851843bd61e5715215da97cc546 From 02154c54ad2c3c3f8916a9faad0e0408a212a052 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Tue, 12 Mar 2024 13:23:51 +0100 Subject: [PATCH 41/54] iproute-6.8.0-1.f41 * Tue Mar 12 2024 Andrea Claudi - 6.8.0-1.f41 - New version 6.8.0 (Andrea Claudi) [2269034] Signed-off-by: Andrea Claudi --- .gitignore | 1 + ...proute2-fix-build-failure-on-ppc64le.patch | 66 ------------------- iproute.spec | 4 +- sources | 2 +- 4 files changed, 4 insertions(+), 69 deletions(-) delete mode 100644 0001-iproute2-fix-build-failure-on-ppc64le.patch diff --git a/.gitignore b/.gitignore index 25f8579..3976641 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /iproute2-6.4.0.tar.xz /iproute2-6.5.0.tar.xz /iproute2-6.7.0.tar.xz +/iproute2-6.8.0.tar.xz diff --git a/0001-iproute2-fix-build-failure-on-ppc64le.patch b/0001-iproute2-fix-build-failure-on-ppc64le.patch deleted file mode 100644 index 1d621e4..0000000 --- a/0001-iproute2-fix-build-failure-on-ppc64le.patch +++ /dev/null @@ -1,66 +0,0 @@ -From ac4e9bd66d9c8461024dfd3698e120c678eb6cfc Mon Sep 17 00:00:00 2001 -Message-ID: -From: Andrea Claudi -Date: Fri, 9 Feb 2024 23:56:20 +0100 -Subject: [PATCH] iproute2: fix build failure on ppc64le -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2261250 -Upstream Status: posted upstream - -commit d13ef7c00b60a50a5e8ddbb7ff138399689d3483 -Author: Andrea Claudi -Date: Fri Feb 9 10:44:55 2024 +0100 - - iproute2: fix build failure on ppc64le - - ppc64le build fails with error on ifstat.c when - -Wincompatible-pointer-types is enabled: - - ifstat.c: In function ‘dump_raw_db’: - ifstat.c:323:44: error: initialization of ‘long long unsigned int *’ from incompatible pointer type ‘__u64 *’ {aka ‘long unsigned int *’} [-Wincompatible-pointer-types] - 323 | unsigned long long *vals = n->val; - - Several other warnings are produced when -Wformat= is set, for example: - - ss.c:3244:34: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 2 has type ‘__u64’ {aka ‘long unsigned int’} [-Wformat=] - 3244 | out(" rcv_nxt:%llu", s->mptcpi_rcv_nxt); - | ~~~^ ~~~~~~~~~~~~~~~~~ - | | | - | | __u64 {aka long unsigned int} - | long long unsigned int - | %lu - - This happens because __u64 is defined as long unsigned on ppc64le. As - pointed out by Florian Weimar, we should use -D__SANE_USERSPACE_TYPES__ - if we really want to use long long unsigned in iproute2. - - This fix the build failure and all the warnings without any change on - the code itself. - - Suggested-by: Florian Weimer - Signed-off-by: Andrea Claudi - -Signed-off-by: Andrea Claudi ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 8024d45e..3b9daede 100644 ---- a/Makefile -+++ b/Makefile -@@ -60,7 +60,7 @@ CC := gcc - HOSTCC ?= $(CC) - DEFINES += -D_GNU_SOURCE - # Turn on transparent support for LFS --DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -+DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__SANE_USERSPACE_TYPES__ - CCOPTS = -O2 -pipe - WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes - WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2 --- -2.43.0 - diff --git a/iproute.spec b/iproute.spec index 7d10d3c..7d04056 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,10 +1,10 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.7.0 +Version: 6.8.0 Release: %autorelease URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz -Patch0: 0001-iproute2-fix-build-failure-on-ppc64le.patch + License: GPL-2.0-or-later AND NIST-PD BuildRequires: bison diff --git a/sources b/sources index 9522a67..92fbad4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iproute2-6.7.0.tar.xz) = 5d8dca139b1b980dac6c841f477b951dd199074cb078b5ea8df23b3532eeb235cca1df9f6628b0f81b7edd62aaf4e95bad15a851843bd61e5715215da97cc546 +SHA512 (iproute2-6.8.0.tar.xz) = 54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0 From 741bac7f44dd5c478ae848d0be8e3e2a96c7d41b Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 16 Apr 2024 00:16:12 -0400 Subject: [PATCH 42/54] Fix flatpak build config.mk does not set PREFIX, therefore DATADIR does not set properly either. --- iproute.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iproute.spec b/iproute.spec index 7d04056..f6a3ee4 100644 --- a/iproute.spec +++ b/iproute.spec @@ -67,7 +67,7 @@ The libnetlink static library. %build %configure --color auto -echo -e "\nSBINDIR=%{_sbindir}" >> config.mk +echo -e "\nPREFIX=%{_prefix}\nSBINDIR=%{_sbindir}" >> config.mk %make_build %install From 1110672bf6dafa03c253cdc900ba151d4800bed9 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 23 Jun 2024 22:54:28 -0400 Subject: [PATCH 43/54] Import rt_dsfield.deprecated for ELN builds Without Source1 being present, this cannot build when bootstrapping a new RHEL version (as happened in 10) without manual intervention, which is completely avoidable here. --- iproute.spec | 3 ++- rt_dsfield.deprecated | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 rt_dsfield.deprecated diff --git a/iproute.spec b/iproute.spec index f6a3ee4..edd9380 100644 --- a/iproute.spec +++ b/iproute.spec @@ -4,6 +4,7 @@ Version: 6.8.0 Release: %autorelease URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz +Source1: rt_dsfield.deprecated License: GPL-2.0-or-later AND NIST-PD @@ -83,7 +84,7 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a rm -rf '%{buildroot}%{_docdir}' # append deprecated values to rt_dsfield for compatibility reasons -%if 0%{?rhel} && ! 0%{?eln} +%if 0%{?rhel} cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield %endif diff --git a/rt_dsfield.deprecated b/rt_dsfield.deprecated new file mode 100644 index 0000000..c8eec63 --- /dev/null +++ b/rt_dsfield.deprecated @@ -0,0 +1,17 @@ + +# Deprecated values dropped upstream +# Kept in RHEL for backwards-compatibility +0x00 default +0x10 lowdelay +0x08 throughput +0x04 reliability +# This value overlap with ECT, do not use it! +0x02 mincost +# These values seems do not want to die, Cisco likes them by a strange reason. +0x20 priority +0x40 immediate +0x60 flash +0x80 flash-override +0xa0 critical +0xc0 internet +0xe0 network From 88661651e0059d0fc215a6c8e77e2ef9a82c0b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 13 Apr 2024 15:12:40 +0200 Subject: [PATCH 44/54] Add compat sbin Provides For https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin. A few packages require /usr/sbin/{ip,ss}. --- iproute.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/iproute.spec b/iproute.spec index edd9380..7a70541 100644 --- a/iproute.spec +++ b/iproute.spec @@ -26,7 +26,15 @@ BuildRequires: linux-atm-libs-devel %endif Requires: libbpf Requires: psmisc + +# Compat symlinks for Requires in other packages. Provides: /sbin/ip +%if "%{_sbindir}" == "%{_bindir}" +# We rely on filesystem to create the symlink for us. +Requires: filesystem(unmerged-sbin-symlinks) +Provides: /usr/sbin/ip +Provides: /usr/sbin/ss +%endif %description The iproute package contains networking utilities (ip and rtmon, for example) From 4a0051fa001c43c4472df8a1682555774750bae6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 10:32:53 +0000 Subject: [PATCH 45/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d10e375a529986e7519fb6815840461dea7ad3cb Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Tue, 23 Jul 2024 17:01:06 +0200 Subject: [PATCH 46/54] iproute-6.10.0-1.f41 * Tue Jul 23 2024 Andrea Claudi - 6.10.0-1.f41 - New version 6.10.0 (Andrea Claudi) [2298392] Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 3 +-- sources | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3976641..d0de316 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /iproute2-6.5.0.tar.xz /iproute2-6.7.0.tar.xz /iproute2-6.8.0.tar.xz +/iproute2-6.10.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 7a70541..1c7768a 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,12 +1,11 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.8.0 +Version: 6.10.0 Release: %autorelease URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz Source1: rt_dsfield.deprecated - License: GPL-2.0-or-later AND NIST-PD BuildRequires: bison BuildRequires: elfutils-libelf-devel diff --git a/sources b/sources index 92fbad4..73b0974 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (iproute2-6.8.0.tar.xz) = 54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0 +SHA512 (iproute2-6.10.0.tar.xz) = 706479aa37a25fcf30c525c6abd85e0861e484d046e0636a28dbc52b958d45c9dba70b912f530dedd4b0b496e4b98969e23501bbbb41d3de50810bae014fcb41 From 052577f9e92734d44adf2a4d7b6fc44de100a1ae Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 27 Nov 2024 16:48:48 +0100 Subject: [PATCH 47/54] iproute-6.12.0-1.f42 * Wed Nov 27 2024 Andrea Claudi - 6.12.0-1.f42 - New version 6.12.0 (Andrea Claudi) [2298392] Signed-off-by: Andrea Claudi --- .gitignore | 27 +-------------------------- iproute.spec | 2 +- sources | 1 + 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index d0de316..a09786c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,3 @@ -/iproute2-4.18.0.tar.xz -/iproute2-4.20.0.tar.xz -/iproute2-5.0.0.tar.xz -/iproute2-5.1.0.tar.xz -/iproute2-5.2.0.tar.xz -/iproute2-5.3.0.tar.xz -/iproute2-5.4.0.tar.xz -/iproute2-5.5.0.tar.xz -/iproute2-5.7.0.tar.xz -/iproute2-5.8.0.tar.xz -/iproute2-5.9.0.tar.xz -/iproute2-5.10.0.tar.xz -/iproute2-5.11.0.tar.xz -/iproute2-5.12.0.tar.xz -/iproute2-5.13.0.tar.xz -/iproute2-5.14.0.tar.xz -/iproute2-5.15.0.tar.xz -/iproute2-5.17.0.tar.xz -/iproute2-5.18.0.tar.xz -/iproute2-6.0.0.tar.xz -/iproute2-6.1.0.tar.xz -/iproute2-6.2.0.tar.xz -/iproute2-6.3.0.tar.xz -/iproute2-6.4.0.tar.xz -/iproute2-6.5.0.tar.xz -/iproute2-6.7.0.tar.xz /iproute2-6.8.0.tar.xz /iproute2-6.10.0.tar.xz +/iproute2-6.12.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 1c7768a..7f7570b 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,6 +1,6 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.10.0 +Version: 6.12.0 Release: %autorelease URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz diff --git a/sources b/sources index 73b0974..7074a5d 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (iproute2-6.8.0.tar.xz) = 54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0 SHA512 (iproute2-6.10.0.tar.xz) = 706479aa37a25fcf30c525c6abd85e0861e484d046e0636a28dbc52b958d45c9dba70b912f530dedd4b0b496e4b98969e23501bbbb41d3de50810bae014fcb41 +SHA512 (iproute2-6.12.0.tar.xz) = dbd6afb8162a6086e4be9045b8dc53aa563bd4b7abaf43ee13cd7d493730ff0b90e6985f68c6f42d64f4af6a692d0589e0cefd2f24045ec1c10418cfb73940b2 From 7e1077b3ac5c7c4751fa4b8eaa8bf48ad8bc2d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 12 Jan 2025 14:31:21 +0100 Subject: [PATCH 48/54] Rebuilt for the bin-sbin merge (2nd attempt) https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin From 9fefd19efee268a3b566b554c7cc3cd97509690a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 07:21:19 +0000 Subject: [PATCH 49/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b5c2466bc330aaeaa9234e8f31349abfbfcc0589 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Mon, 5 May 2025 16:14:12 +0200 Subject: [PATCH 50/54] iproute-6.14.0-1.f43 * Mon May 05 2025 Andrea Claudi - 6.14.0-1.f43 - New version 6.14.0 (Andrea Claudi) [2339037] Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 3 ++- sources | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a09786c..d4a29ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /iproute2-6.8.0.tar.xz /iproute2-6.10.0.tar.xz /iproute2-6.12.0.tar.xz +/iproute2-6.14.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 7f7570b..0e4018a 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,6 +1,6 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.12.0 +Version: 6.14.0 Release: %autorelease URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz @@ -104,6 +104,7 @@ cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield %{_mandir}/man8/* %exclude %{_mandir}/man8/tc* %exclude %{_mandir}/man8/cbq* +%exclude %{_mandir}/man8/arpd* %attr(644,root,root) %config(noreplace) %{_datadir}/iproute2/* %{_sbindir}/* %exclude %{_sbindir}/tc diff --git a/sources b/sources index 7074a5d..3e3658e 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (iproute2-6.8.0.tar.xz) = 54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0 SHA512 (iproute2-6.10.0.tar.xz) = 706479aa37a25fcf30c525c6abd85e0861e484d046e0636a28dbc52b958d45c9dba70b912f530dedd4b0b496e4b98969e23501bbbb41d3de50810bae014fcb41 SHA512 (iproute2-6.12.0.tar.xz) = dbd6afb8162a6086e4be9045b8dc53aa563bd4b7abaf43ee13cd7d493730ff0b90e6985f68c6f42d64f4af6a692d0589e0cefd2f24045ec1c10418cfb73940b2 +SHA512 (iproute2-6.14.0.tar.xz) = e79049bdca0e0381f0a93a40e4d597ce59fb509dabc6e8b04a510ff9953f091c67577d6faa62967bd197bf62ab6e56d928558270a1390621431acb237b77fa46 From 50f9619fb02bb0e399a594a36f2bebfbe915ba51 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 17:45:38 +0000 Subject: [PATCH 51/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5659df63b3a54876efaecaa4c59603af43b230db Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 3 Sep 2025 17:31:48 +0200 Subject: [PATCH 52/54] iproute-6.16.0-1.f44 * Wed Sep 03 2025 Andrea Claudi - 6.16.0-1.f44 - New version 6.16.0 (Andrea Claudi) [2368627] Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 26 ++++++++++++++++++++++++-- sources | 1 + 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d4a29ef..f05cf9e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /iproute2-6.10.0.tar.xz /iproute2-6.12.0.tar.xz /iproute2-6.14.0.tar.xz +/iproute2-6.16.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 0e4018a..58b72f2 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,10 +1,13 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.14.0 +Version: 6.16.0 Release: %autorelease URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz +%if 0%{?rhel} Source1: rt_dsfield.deprecated +Source2: README.etc +%endif License: GPL-2.0-or-later AND NIST-PD BuildRequires: bison @@ -93,9 +96,25 @@ rm -rf '%{buildroot}%{_docdir}' # append deprecated values to rt_dsfield for compatibility reasons %if 0%{?rhel} cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield +mkdir -p %{buildroot}%{_sysconfdir}/iproute2 +cp %{SOURCE2} %{buildroot}%{_sysconfdir}/iproute2/README +cp %{SOURCE2} %{buildroot}%{_datadir}/iproute2/README + +# RHEL-94662: restore /etc/iproute2 conf files, if modified +# this is safe because we don't have conf files in /etc/iproute2 anymore, so +# every *.rpmsave file over there is a leftover from a failed conf upgrade +%posttrans +if [ -f /etc/iproute2/*rpmsave ]; then + for conffile in /etc/iproute2/*rpmsave; do + mv $conffile ${conffile%.rpmsave} + done +fi %endif %files +%if 0%{?rhel} +%dir %{_sysconfdir}/iproute2 +%endif %dir %{_datadir}/iproute2 %license COPYING %doc README README.devel @@ -105,8 +124,11 @@ cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield %exclude %{_mandir}/man8/tc* %exclude %{_mandir}/man8/cbq* %exclude %{_mandir}/man8/arpd* -%attr(644,root,root) %config(noreplace) %{_datadir}/iproute2/* +%attr(644,root,root) %config %{_datadir}/iproute2/* %{_sbindir}/* +%if 0%{?rhel} +%attr(644,root,root) %{_sysconfdir}/iproute2/* +%endif %exclude %{_sbindir}/tc %exclude %{_sbindir}/routel %{_datadir}/bash-completion/completions/devlink diff --git a/sources b/sources index 3e3658e..f39b2df 100644 --- a/sources +++ b/sources @@ -2,3 +2,4 @@ SHA512 (iproute2-6.8.0.tar.xz) = 54e50340a73c8810d69bfd54704b469149731634a97d94d SHA512 (iproute2-6.10.0.tar.xz) = 706479aa37a25fcf30c525c6abd85e0861e484d046e0636a28dbc52b958d45c9dba70b912f530dedd4b0b496e4b98969e23501bbbb41d3de50810bae014fcb41 SHA512 (iproute2-6.12.0.tar.xz) = dbd6afb8162a6086e4be9045b8dc53aa563bd4b7abaf43ee13cd7d493730ff0b90e6985f68c6f42d64f4af6a692d0589e0cefd2f24045ec1c10418cfb73940b2 SHA512 (iproute2-6.14.0.tar.xz) = e79049bdca0e0381f0a93a40e4d597ce59fb509dabc6e8b04a510ff9953f091c67577d6faa62967bd197bf62ab6e56d928558270a1390621431acb237b77fa46 +SHA512 (iproute2-6.16.0.tar.xz) = 88930ea1a3a901594a69dc04e533bfd1de0f5b79f176dedb45f11f01035bd680edccc8e04e56d0922ee430580581c646473a3baa941254739878f7ab946f17df From 6deb8d6715636314fe01afde0c796369c9343d22 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 19 Sep 2025 04:00:55 -0400 Subject: [PATCH 53/54] Import README.etc --- README.etc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 README.etc diff --git a/README.etc b/README.etc new file mode 100644 index 0000000..6fc09c3 --- /dev/null +++ b/README.etc @@ -0,0 +1,16 @@ +You are looking for your iproute2 config in /etc/iproute2 and it's gone? + +Here's an explanation on what's going on: + +From v6.5.0, iproute2 supports stateless configuration pattern. This +means that iproute2 now read its config from /etc/iproute2/FOO, and, +if it does not exist, fall back to /usr/share/iproute2/FOO. + +You can find iproute2 default configuration in /usr/share/iproute2, +while you can store your user-modified config files in /etc/iproute2. + +/usr/share/iproute2 files are not supposed to be manually modified. + +If a previous update broke your user config for iproute2, you may +have one or more ".rpmsave" files in /etc/iproute2. You can restore +your config simply dropping the ".rpmsave" suffix from the file name. From e2fb4f806782daf154762a8e4b63ebaae16349f8 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 8 Oct 2025 00:31:40 +0200 Subject: [PATCH 54/54] iproute-6.17.0-1.f44 * Wed Oct 08 2025 Andrea Claudi - 6.17.0-1.f44 - New version 6.17.0 (Andrea Claudi) [2400133] - Create /etc/iproute2 for user configuration files (Andrea Claudi) [2343990] Signed-off-by: Andrea Claudi --- .gitignore | 1 + iproute.spec | 14 ++++++-------- sources | 1 + 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index f05cf9e..fd6d31a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /iproute2-6.12.0.tar.xz /iproute2-6.14.0.tar.xz /iproute2-6.16.0.tar.xz +/iproute2-6.17.0.tar.xz diff --git a/iproute.spec b/iproute.spec index 58b72f2..77088b9 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,13 +1,13 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 6.16.0 +Version: 6.17.0 Release: %autorelease URL: https://kernel.org/pub/linux/utils/net/%{name}2/ Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz %if 0%{?rhel} Source1: rt_dsfield.deprecated -Source2: README.etc %endif +Source2: README.etc License: GPL-2.0-or-later AND NIST-PD BuildRequires: bison @@ -93,16 +93,18 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a # drop these files, iproute-doc package extracts files directly from _builddir rm -rf '%{buildroot}%{_docdir}' +mkdir -p %{buildroot}%{_sysconfdir}/iproute2 +cp %{SOURCE2} %{buildroot}%{_sysconfdir}/iproute2/README + # append deprecated values to rt_dsfield for compatibility reasons %if 0%{?rhel} cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield -mkdir -p %{buildroot}%{_sysconfdir}/iproute2 -cp %{SOURCE2} %{buildroot}%{_sysconfdir}/iproute2/README cp %{SOURCE2} %{buildroot}%{_datadir}/iproute2/README # RHEL-94662: restore /etc/iproute2 conf files, if modified # this is safe because we don't have conf files in /etc/iproute2 anymore, so # every *.rpmsave file over there is a leftover from a failed conf upgrade + %posttrans if [ -f /etc/iproute2/*rpmsave ]; then for conffile in /etc/iproute2/*rpmsave; do @@ -112,9 +114,7 @@ fi %endif %files -%if 0%{?rhel} %dir %{_sysconfdir}/iproute2 -%endif %dir %{_datadir}/iproute2 %license COPYING %doc README README.devel @@ -126,9 +126,7 @@ fi %exclude %{_mandir}/man8/arpd* %attr(644,root,root) %config %{_datadir}/iproute2/* %{_sbindir}/* -%if 0%{?rhel} %attr(644,root,root) %{_sysconfdir}/iproute2/* -%endif %exclude %{_sbindir}/tc %exclude %{_sbindir}/routel %{_datadir}/bash-completion/completions/devlink diff --git a/sources b/sources index f39b2df..9ad54ed 100644 --- a/sources +++ b/sources @@ -3,3 +3,4 @@ SHA512 (iproute2-6.10.0.tar.xz) = 706479aa37a25fcf30c525c6abd85e0861e484d046e063 SHA512 (iproute2-6.12.0.tar.xz) = dbd6afb8162a6086e4be9045b8dc53aa563bd4b7abaf43ee13cd7d493730ff0b90e6985f68c6f42d64f4af6a692d0589e0cefd2f24045ec1c10418cfb73940b2 SHA512 (iproute2-6.14.0.tar.xz) = e79049bdca0e0381f0a93a40e4d597ce59fb509dabc6e8b04a510ff9953f091c67577d6faa62967bd197bf62ab6e56d928558270a1390621431acb237b77fa46 SHA512 (iproute2-6.16.0.tar.xz) = 88930ea1a3a901594a69dc04e533bfd1de0f5b79f176dedb45f11f01035bd680edccc8e04e56d0922ee430580581c646473a3baa941254739878f7ab946f17df +SHA512 (iproute2-6.17.0.tar.xz) = 3d83d49233c1d984f15d285a46e2ec0eeb820c7cb84cfc84866921f37e8a57d31bc3953be07e8c79ed6079f326a25c3a85f591b0d67f9f689c0c70ccdb0fef77