diff --git a/.gitignore b/.gitignore index ada547e..08796bd 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ /libnl-doc-3.5.0.tar.gz /libnl-3.6.0.tar.gz /libnl-doc-3.6.0.tar.gz +/libnl-3.7.0.tar.gz +/libnl-doc-3.7.0.tar.gz diff --git a/0001-route-fix-crash-caused-by-parse_multipath-by-wrong-f.patch b/0001-route-fix-crash-caused-by-parse_multipath-by-wrong-f.patch deleted file mode 100644 index 0aaab21..0000000 --- a/0001-route-fix-crash-caused-by-parse_multipath-by-wrong-f.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2bc7a785dbd4b882d32e20502d4f3518f8c7610b Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Tue, 3 May 2022 18:59:22 +0200 -Subject: [PATCH 1/1] route: fix crash caused by parse_multipath() by wrong - free() - -https://bugzilla.redhat.com/show_bug.cgi?id=2081279 - -Fixes: b50be8fa869b ('rtnl/route: use cleanup attribute in "lib/route/route_obj.c"') -(cherry picked from commit 9b0493646c20f3eecdf664e7e00c6c9162e04fba) ---- - lib/route/route_obj.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/route/route_obj.c b/lib/route/route_obj.c -index 4fdd23c19842..9441b77a76e5 100644 ---- a/lib/route/route_obj.c -+++ b/lib/route/route_obj.c -@@ -1102,7 +1102,7 @@ static int parse_multipath(struct rtnl_route *route, struct nlattr *attr) - } - } - -- rtnl_route_add_nexthop(route, nh); -+ rtnl_route_add_nexthop(route, _nl_steal_pointer(&nh)); - tlen -= RTNH_ALIGN(rtnh->rtnh_len); - rtnh = RTNH_NEXT(rtnh); - } --- -2.35.1 - diff --git a/libnl3.spec b/libnl3.spec index a722367..ce24aa8 100644 --- a/libnl3.spec +++ b/libnl3.spec @@ -1,6 +1,6 @@ Name: libnl3 -Version: 3.6.0 -Release: 2%{?dist} +Version: 3.7.0 +Release: 1%{?dist} Summary: Convenience library for kernel netlink sockets License: LGPLv2 URL: http://www.infradead.org/~tgr/libnl/ @@ -19,7 +19,6 @@ Source: http://www.infradead.org/~tgr/libnl/files/libnl-%{fullversion}.tar.gz Source1: http://www.infradead.org/~tgr/libnl/files/libnl-doc-%{fullversion}.tar.gz #Patch1: some.patch -Patch1: 0001-route-fix-crash-caused-by-parse_multipath-by-wrong-f.patch BuildRequires: autoconf @@ -154,6 +153,9 @@ popd %endif %changelog +* Wed Jul 6 2022 Thomas Haller - 3.7.0-1 +- Update to 3.7.0 release (rh #2075841) + * Tue May 3 2022 Thomas Haller - 3.6.0-2 - route: fix crash parsing multihop route (rh #2081279) diff --git a/sources b/sources index e9c0365..fe4b381 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnl-3.6.0.tar.gz) = 7d1190ce94f43f5b18b1f7909221ca034d4ea5c8ed5735dbd27224d03e7f95d3c4e8ccdb611e33b58007729a21bfc0e23adc8758b112c712355664d87a81ce1b -SHA512 (libnl-doc-3.6.0.tar.gz) = 301339d3e73a0dcdd4337ff94621f238919c1fd79d211c8f2d50b09939e3bfeff2b41bdc264ba75b22ada67df97affd17e88b229db4b794e1734c3356ce881da +SHA512 (libnl-3.7.0.tar.gz) = 80fbbc079299c90afd2a5eda62e4d4f98bf4ef23958c3ce5101f4ed4d81d783af733213bb3bab15f218555d8460bc2394898f909f4ac024fc27281faec86a041 +SHA512 (libnl-doc-3.7.0.tar.gz) = 4f6ae2649bc81cc6d474fafa90878fefcd0775c36f1f8709f97a5a9bd516da8d35decbd1a7ed01a0321ff5498befc27be4c6c4d552cb6396303d3c3bfa47ca82