From 9b55291395bbc03ec970e9f289623edaaa3c0901 Mon Sep 17 00:00:00 2001 From: liushaofei <370072077@qq.com> Date: Tue, 3 Aug 2021 20:36:50 +0800 Subject: [PATCH] fix hping software --- hping-multiple-definition-of-delaytable.patch | 11 +++++++++++ hping.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 hping-multiple-definition-of-delaytable.patch diff --git a/hping-multiple-definition-of-delaytable.patch b/hping-multiple-definition-of-delaytable.patch new file mode 100644 index 0000000..e78a282 --- /dev/null +++ b/hping-multiple-definition-of-delaytable.patch @@ -0,0 +1,11 @@ +--- ./hping2.h.xiugai 2021-08-03 10:41:08.601438036 +0800 ++++ ./hping2.h 2021-08-03 10:44:28.575662672 +0800 +@@ -357,7 +357,7 @@ + int status; + }; + +-volatile struct delaytable_element delaytable[TABLESIZE]; ++extern volatile struct delaytable_element delaytable[TABLESIZE]; + + /* protos */ + void nop(void); /* nop */ diff --git a/hping.spec b/hping.spec index d0796af..ab6c82f 100644 --- a/hping.spec +++ b/hping.spec @@ -2,13 +2,14 @@ Name: hping Version: 20200503 -Release: 2 +Release: 3 Summary: hping is a command-line oriented TCP/IP packet assembler/analyzer License: GPLv2 URL: http://www.hping.org/ Source0: %{name}-%{version}.zip Patch0: hping-fix-netbpf-header.patch +Patch1: hping-multiple-definition-of-delaytable.patch BuildRequires: gcc tcl-devel libpcap-devel @@ -18,6 +19,7 @@ hping is a command-line oriented TCP/IP packet assembler/analyzer. The interface %prep %setup -q -n %{name}-master/ %patch0 -p1 +%patch1 -p1 %build %configure @@ -45,6 +47,9 @@ install -m0644 docs/hping3.8 %{buildroot}/%{_mandir}/man8 %{_mandir}/* %changelog +* Mon Aug 2 2021 liushaofei +- fix multiple definition + * Mon Oct 12 2020 liqingqing_1229 - update source0's url -- Gitee