openeuler-ci-bot
Gitee
commit
3af409693f
@ -1,28 +0,0 @@
|
||||
From 208bb414553d5444d82601e6fd4ca25fbb192998 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Sekletar <msekleta@redhat.com>
|
||||
Date: Mon, 29 Sep 2014 08:19:05 +0200
|
||||
Subject: [PATCH 1/4] man: tcpdump and tcpslice have manpages in man8
|
||||
|
||||
Both should be run only by root, hence manpages for them should be located in
|
||||
/usr/share/man/man8/
|
||||
---
|
||||
pcap.3pcap.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pcap.3pcap.in b/pcap.3pcap.in
|
||||
index f5a7e0c..f220e68 100644
|
||||
--- a/pcap.3pcap.in
|
||||
+++ b/pcap.3pcap.in
|
||||
@@ -882,7 +882,7 @@ use an
|
||||
script or some other configuration script to check whether the libpcap
|
||||
1.0 APIs are available and use them only if they are.
|
||||
.SH SEE ALSO
|
||||
-autoconf(1), tcpdump(1), tcpslice(1), pcap-filter(@MAN_MISC_INFO@), pfconfig(8),
|
||||
+autoconf(1), tcpdump(8), tcpslice(8), pcap-filter(@MAN_MISC_INFO@), pfconfig(8),
|
||||
usermod(@MAN_ADMIN_COMMANDS@)
|
||||
.SH AUTHORS
|
||||
The original authors of libpcap are:
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
||||
@ -1,89 +0,0 @@
|
||||
From 5b80ca39b1f01177e98c78bbc622dfda6f7a7e71 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Sekletar <msekleta@redhat.com>
|
||||
Date: Mon, 29 Sep 2014 08:27:15 +0200
|
||||
Subject: [PATCH 2/4] pcap-config: mitigate multilib conflict
|
||||
|
||||
libdir path is different on 64bit and 32bit arches. Hence when installing both
|
||||
multilib versions on the system yum complains about conflicting pcap-config
|
||||
file.
|
||||
|
||||
Hence remove libdir references from pcap-config, libdir is in dynamic linker
|
||||
path anyway.
|
||||
---
|
||||
pcap-config.in | 27 ++++++++-------------------
|
||||
1 file changed, 8 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/pcap-config.in b/pcap-config.in
|
||||
index 206be3b..75f2c9f 100644
|
||||
--- a/pcap-config.in
|
||||
+++ b/pcap-config.in
|
||||
@@ -7,7 +7,6 @@
|
||||
prefix="@prefix@"
|
||||
exec_prefix="@exec_prefix@"
|
||||
includedir="@includedir@"
|
||||
-libdir="@libdir@"
|
||||
V_RPATH_OPT="@V_RPATH_OPT@"
|
||||
LIBS="@LIBS@"
|
||||
PACKAGE_NAME="@PACKAGE_NAME@"
|
||||
@@ -36,16 +35,6 @@ do
|
||||
esac
|
||||
shift
|
||||
done
|
||||
-if [ "$V_RPATH_OPT" != "" ]
|
||||
-then
|
||||
- #
|
||||
- # If libdir isn't /usr/lib, add it to the run-time linker path.
|
||||
- #
|
||||
- if [ "$libdir" != "/usr/lib" ]
|
||||
- then
|
||||
- RPATH=$V_RPATH_OPT$libdir
|
||||
- fi
|
||||
-fi
|
||||
if [ "$static" = 1 ]
|
||||
then
|
||||
#
|
||||
@@ -54,16 +43,16 @@ then
|
||||
#
|
||||
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir -L$libdir -lpcap $LIBS"
|
||||
+ echo "-lpcap @LIBS@"
|
||||
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir -L$libdir $LIBS"
|
||||
+ echo "@LIBS@"
|
||||
elif [ "$show_cflags" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir"
|
||||
+ echo ""
|
||||
elif [ "$show_libs" = 1 ]
|
||||
then
|
||||
- echo "-L$libdir -lpcap $LIBS"
|
||||
+ echo "-lpcap @LIBS@"
|
||||
elif [ "$show_additional_libs" = 1 ]
|
||||
then
|
||||
echo "$LIBS"
|
||||
@@ -75,15 +64,15 @@ else
|
||||
#
|
||||
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME"
|
||||
+ echo "-lpcap"
|
||||
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir"
|
||||
+ echo ""
|
||||
elif [ "$show_cflags" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir"
|
||||
+ echo ""
|
||||
elif [ "$show_libs" = 1 ]
|
||||
then
|
||||
- echo "-L$libdir $RPATH -l$PACKAGE_NAME"
|
||||
+ echo "-lpcap"
|
||||
fi
|
||||
fi
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
diff --git a/pcap-linux.c b/pcap-linux.c
|
||||
index 58782ae..b7a813d 100644
|
||||
--- a/pcap-linux.c
|
||||
+++ b/pcap-linux.c
|
||||
@@ -3499,6 +3499,17 @@ static void map_arphrd_to_dlt(pcap_t *handle, int sock_fd, int arptype,
|
||||
* XXX - this is handled in activate_new(). */
|
||||
/* handlep->cooked = 1; */
|
||||
break;
|
||||
+#ifndef ARPHRD_IEEE80215
|
||||
+#define ARPHRD_IEEE80215 805
|
||||
+#endif
|
||||
+#ifndef ARPHRD_IEEE80215_PHY
|
||||
+#define ARPHRD_IEEE80215_PHY 806
|
||||
+#endif
|
||||
+
|
||||
+ case ARPHRD_IEEE80215:
|
||||
+ case ARPHRD_IEEE80215_PHY:
|
||||
+ handle->linktype = DLT_IEEE802_15_4;
|
||||
+ break;
|
||||
|
||||
/* ARPHRD_LAPD is unofficial and randomly allocated, if reallocation
|
||||
* is needed, please report it to <daniele@orlandi.com> */
|
||||
|
||||
12
libpcap.spec
12
libpcap.spec
@ -1,17 +1,14 @@
|
||||
Name: libpcap
|
||||
Epoch: 14
|
||||
Version: 1.9.1
|
||||
Release: 3
|
||||
Release: 4
|
||||
Summary: A system-independent interface for user-level packet capture
|
||||
License: BSD with advertising
|
||||
URL: http://www.tcpdump.org
|
||||
Source0: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
|
||||
|
||||
Patch0001: 0001-man-tcpdump-and-tcpslice-have-manpages-in-man8.patch
|
||||
Patch0002: 0002-pcap-config-mitigate-multilib-conflict.patch
|
||||
Patch0003: 0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch
|
||||
Patch0004: ieee80215-arphrd.patch
|
||||
Patch0005: clean-up-signed-vs-unsigned-do-more-error-checking-in-the-parser.patch
|
||||
Patch0001: 0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch
|
||||
Patch0002: clean-up-signed-vs-unsigned-do-more-error-checking-in-the-parser.patch
|
||||
|
||||
BuildRequires: bison bluez-libs-devel flex gcc git glibc-kernheaders >= 2.2.0
|
||||
|
||||
@ -62,5 +59,8 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
%{_mandir}/man*
|
||||
|
||||
%changelog
|
||||
* Sat Jan 11 2019 openEuler Buildteam <buildteam@openeuler.org> - 14:1.9.1-4
|
||||
- delete useless info
|
||||
|
||||
* Sat Dec 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 14:1.9.1-3
|
||||
- Package init
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user