modify libnl to sp3

Signed-off-by: zhangqin88 <zhangqin88@huawei.com>
This commit is contained in:
zhangqin88
2024-06-01 17:21:56 +08:00
parent b8f7d3ea67
commit 81617fcb2f
8 changed files with 1208 additions and 19 deletions
+1
View File
@@ -13,6 +13,7 @@ defs.h.in~
/lib/stamp-h1
test-suite.log
libnl-3.7.0
!slove-oh-update-sp3.patch
!solve-oh-compile-problem.patch
/libnl-1.pc
/lib/defs.h
+2 -2
View File
@@ -3,9 +3,9 @@
"Name": "openEuler:libnl3",
"License": "LGPL V2.1",
"License File": "COPYING",
"Version Number": "3.7.0-1.oe2203sp1",
"Version Number": "3.7.0-1.oe2203sp3",
"Owner": "xusai4@huawei.com",
"Upstream URL": "https://repo.openeuler.org/openEuler-22.03-LTS-SP1/source/Packages/libnl3-3.7.0-1.oe2203sp1.src.rpm",
"Upstream URL": "https://repo.openeuler.org/openEuler-22.03-LTS-SP3/source/Packages/libnl3-3.7.0-2.oe2203sp3.src.rpm",
"Description": "Providing APIs to netlink protocol based Linux kernel interfaces."
}
]
+1 -1
View File
@@ -11,7 +11,7 @@
The following patches is carried by the openEuler:libnl3 open source library:
solve-redefinition-of-struct-ipv6_mreq.patch
slove-oh-update-sp3.patch
The following patches are added to solve the compilation problem under the OpenHarmony project:
+1 -1
View File
@@ -11,7 +11,7 @@
#### patch包说明
以下patch包为openEuler:libnl3开源库本身携带
solve-redefinition-of-struct-ipv6_mreq.patch
slove-oh-update-sp3.patch
以下patch包为解决在OpenHarmony工程下编译存在的问题自行添加
solve-oh-compile-problem.patch
+1 -1
View File
@@ -14,6 +14,6 @@ fi
tar xvf libnl-3.7.0.tar.gz
cd $1/libnl-3.7.0
./configure
patch -p1 < $1/solve-redefinition-of-struct-ipv6_mreq.patch --fuzz=0 --no-backup-if-mismatch
patch -p1 < $1/slove-oh-update-sp3.patch --fuzz=0 --no-backup-if-mismatch
patch -p1 < $1/solve-oh-compile-problem.patch --fuzz=0 --no-backup-if-mismatch
exit 0
+57 -2
View File
@@ -1,11 +1,31 @@
Name: libnl3
Version: 3.7.0
Release: 1
Release: 4
Summary: Providing APIs to netlink protocol based Linux kernel interfaces
License: LGPLv2
URL: http://www.infradead.org/~tgr/libnl/
Source: https://github.com/thom311/libnl/releases/download/libnl3_7_0/libnl-3.7.0.tar.gz
Patch6000: backport-prevent-segfault-in-af_request_type.patch
Patch6001: backport-fix-bridge-info-parsing.patch
Patch9000: solve-redefinition-of-struct-ipv6_mreq.patch
patch6002: backport-add-some-tests-about-addr-class-rule-neigh-qdisc.patch
patch6003: backport-clear-XFRM_SP_ATTR_TMPL-when-removing-the-last-template.patch
patch6004: backport-fix-reference-counters-of-sa-selector-addresses.patch
patch6005: backport-do-not-use-static-array-indices-for-buffer.patch
patch6006: backport-fix-leak-in-error-handling-of-rtnl_flower_append_action.patch
patch6007: backport-fix-signed-overflow-warning-in-nl_object_diff.patch
patch6008: backport-workaround-coverity-warning-about-time_t-handling.patch
patch6009: backport-fix-leaking-usertemplate-in-xfrmnl_sp_parse.patch
patch6010: backport-avoid-integer-overflow-in-rtnl_tc_calc_cell_log.patch
patch6011: backport-fix-crashes-in-case-of-ENOMEM.patch
patch6012: backport-accept-NULL-argument-in-nla_nest_cancel-for-robustness.patch
patch6013: backport-fix-error-handling-in-nl_str2ip_protos.patch
patch6014: backport-handle-negative-and-zero-size-in-nla_memcpy.patch
patch6015: backport-use-thread-safe-gmtime_r-instead-of-gmtime.patch
BuildRequires: flex bison libtool autoconf automake swig
Requires: %{name} = %{version}-%{release}
@@ -89,12 +109,47 @@ cd python
%{python3_sitearch}/netlink-*.egg-info
%changelog
* Mon Nov 7 2022 chengyechun <chengyechun1@huawei.com> - 3.7.0-1
* Thu Apr 25 2024 sunhai <sunhai10@huawei.com> - 3.7.0-4
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:sync some pathes from upstream
* Fri Jan 12 2024 chengyechun <chengyechun1@huawei.com> - 3.7.0-3
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Use the user-mode IPv6 header file
* Mon Aug 14 2023 chengyechun <chengyechun1@huawei.com> - 3.7.0-2
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:prevent segfault in af_request_type
fix bridge info parsing
* Wed Nov 9 2022 chengyechun <chengyechun1@huawei.com> - 3.7.0-1
- Type:enhancement
- ID:NA
- SUG:NA
- DESC:update to libnl-3.7.0
* Sat Dec 18 2021 chengyechun <chengyechun1@huawei.com> - 3.5.0-6
- Type:bugfix
- ID:NA
- SUG:NA
-DES:add seome tests about add and delele addr,
add and delete neigh,
add and delete qdisc,
add link and rule,
delete route;
* Thu Dec 16 2021 chengyechun <chengyechun1@huawei.com> - 3.5.0-5
- Type:bugfix
- ID:NA
- SUG:NA
- DES:add a test:test add route
* Wed Mar 10 2021 zengwefeng <zwfeng@huawei.com> - 3.5.0-4
- Type:bugfix
- ID:NA
File diff suppressed because it is too large Load Diff
@@ -1,12 +0,0 @@
diff -uNrp libnl-3.2.28/include/linux-private/linux/if_bridge.h libnl-3.2.28-new//include/linux-private/linux/if_bridge.h
--- libnl-3.2.28/include/linux-private/linux/if_bridge.h 2016-06-29 17:04:28.000000000 +0800
+++ libnl-3.2.28-new//include/linux-private/linux/if_bridge.h 2016-11-26 13:46:11.000000000 +0800
@@ -15,7 +15,7 @@
#include <linux/types.h>
#include <linux/if_ether.h>
-#include <linux/in6.h>
+#include <netinet/in.h>
#define SYSFS_BRIDGE_ATTR "bridge"
#define SYSFS_BRIDGE_FDB "brforward"