Compare commits
No commits in common. "5884a4c2fd9c8f2c7af85f0075d2291a958ce888" and "acbc02013470105b3c4f30189a70bf8abe81780c" have entirely different histories.
5884a4c2fd
...
acbc020134
25
backport-fix-Potential-Null-Pointer-Dereference.patch
Normal file
25
backport-fix-Potential-Null-Pointer-Dereference.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From 1c0e8ac9c02d82209a3405a972174a795d044038 Mon Sep 17 00:00:00 2001
|
||||||
|
From: qingkaishi <qingkaishi@gmail.com>
|
||||||
|
Date: Wed, 9 Sep 2020 23:58:28 +0800
|
||||||
|
Subject: [PATCH] fix Potential Null Pointer Dereference
|
||||||
|
|
||||||
|
---
|
||||||
|
test/dnet/fw.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/test/dnet/fw.c b/test/dnet/fw.c
|
||||||
|
index 1557827..c845263 100644
|
||||||
|
--- a/test/dnet/fw.c
|
||||||
|
+++ b/test/dnet/fw.c
|
||||||
|
@@ -108,7 +108,7 @@ arg_to_fr(int argc, char *argv[], struct fw_rule *fr)
|
||||||
|
|
||||||
|
p = strtok(argv[4], ":");
|
||||||
|
|
||||||
|
- if (addr_aton(p, &fr->fw_src) < 0)
|
||||||
|
+ if (!p || addr_aton(p, &fr->fw_src) < 0)
|
||||||
|
return (-1);
|
||||||
|
|
||||||
|
if ((p = strtok(NULL, ":")) != NULL) {
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
BIN
libdnet-1.14.tar.gz
Normal file
BIN
libdnet-1.14.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
53
libdnet.spec
53
libdnet.spec
@ -1,15 +1,15 @@
|
|||||||
Name: libdnet
|
Name: libdnet
|
||||||
Version: 1.17.0
|
Version: 1.14
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: Simple portable interface work with low-level networking routines
|
Summary: Simple portable interface work with low-level networking routines
|
||||||
|
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: https://github.com/ofalk/%{name}
|
URL: https://github.com/ofalk/%{name}
|
||||||
Source: https://github.com/ofalk/libdnet/archive/%{name}-%{version}.tar.gz
|
Source: https://github.com/ofalk/libdnet/archive/%{name}-%{version}.tar.gz
|
||||||
|
Patch0: backport-fix-Potential-Null-Pointer-Dereference.patch
|
||||||
|
|
||||||
BuildRequires: gcc-c++ autoconf automake libtool
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: python3-Cython
|
BuildRequires: python3-Cython
|
||||||
BuildRequires: make check-devel python3-setuptools
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
%{name} provides a simplified, portable interface to several low-level networking
|
%{name} provides a simplified, portable interface to several low-level networking
|
||||||
@ -35,7 +35,7 @@ Requires: %{name} = %{version}-%{release}
|
|||||||
%package -n python3-%{name}
|
%package -n python3-%{name}
|
||||||
%{?python_provide:%python_provide python3-%{name}}
|
%{?python_provide:%python_provide python3-%{name}}
|
||||||
Provides: %{name}-python = %{version}-%{release}
|
Provides: %{name}-python = %{version}-%{release}
|
||||||
Obsoletes: %{name}-python < %{version}-%{release}
|
Obsoletes: %{name}-python
|
||||||
Summary: Python bindings for %{name}
|
Summary: Python bindings for %{name}
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
@ -49,15 +49,18 @@ Python3 package for python-%{name}
|
|||||||
%autosetup -n %{name}-%{name}-%{version} -p1
|
%autosetup -n %{name}-%{name}-%{version} -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -i
|
|
||||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||||
%configure --disable-static
|
%configure
|
||||||
%disable_rpath
|
%disable_rpath
|
||||||
|
|
||||||
%make_build
|
%make_build
|
||||||
|
|
||||||
|
pushd python
|
||||||
|
%{__python3} setup.py build
|
||||||
|
popd
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
%{__make} install DESTDIR=%{buildroot}
|
||||||
|
|
||||||
pushd python
|
pushd python
|
||||||
%{__python3} setup.py install --skip-build --root %{buildroot}
|
%{__python3} setup.py install --skip-build --root %{buildroot}
|
||||||
@ -76,7 +79,9 @@ popd
|
|||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_bindir}/dnet-config
|
%{_bindir}/dnet-config
|
||||||
%{_libdir}/%{name}.so
|
%{_libdir}/%{name}.so
|
||||||
%{_includedir}/*
|
%{_includedir}/dnet/*.h
|
||||||
|
%{_includedir}/dnet.h
|
||||||
|
%{_libdir}/*.a
|
||||||
|
|
||||||
%files progs
|
%files progs
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -93,36 +98,6 @@ popd
|
|||||||
%{_mandir}/man8/*.8*
|
%{_mandir}/man8/*.8*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Jan 05 2024 xingwei <xingwei14@h-partners.com> - 1.17.0-1
|
|
||||||
- Type:requirements
|
|
||||||
- ID:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC: update libdnet to 1.17.0
|
|
||||||
|
|
||||||
* Thu Jul 13 2023 chenzixuan <chenzixuan@kylinos.cn> - 1.16.4-1
|
|
||||||
- Type:requirements
|
|
||||||
- ID:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC: update libdnet to 1.16.4
|
|
||||||
|
|
||||||
* Thu Feb 09 2023 yanglu <yanglu72@h-partners.com> - 1.16.3-2
|
|
||||||
- Type:bugfix
|
|
||||||
- ID:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC: fix libdnet build error
|
|
||||||
|
|
||||||
* Fri Feb 03 2023 xinghe <xinghe2@h-partners.com> - 1.16.3-1
|
|
||||||
- Type:requirements
|
|
||||||
- ID:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC: update libdnet to 1.16.3
|
|
||||||
|
|
||||||
* Fri Nov 18 2022 xingwei <xingwei14@h-partners.com> - 1.14-3
|
|
||||||
- Type:bugfix
|
|
||||||
- ID:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC: add Obsoletes '< version' in spec
|
|
||||||
|
|
||||||
* Tue Nov 01 2022 xingwei <xingwei14@h-partners.com> - 1.14-2
|
* Tue Nov 01 2022 xingwei <xingwei14@h-partners.com> - 1.14-2
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user