New version 1.9.0
This commit is contained in:
parent
22cfac8e4f
commit
d678c2050d
1
.gitignore
vendored
1
.gitignore
vendored
@ -13,3 +13,4 @@ libpcap-1.1.1.tar.gz
|
||||
/libpcap-1.7.4.tar.gz
|
||||
/libpcap-1.8.0.tar.gz
|
||||
/libpcap-1.8.1.tar.gz
|
||||
/libpcap-1.9.0.tar.gz
|
||||
|
||||
@ -19,7 +19,7 @@ index f5a7e0c..f220e68 100644
|
||||
.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(1M)
|
||||
usermod(@MAN_ADMIN_COMMANDS@)
|
||||
.SH AUTHORS
|
||||
The original authors of libpcap are:
|
||||
--
|
||||
|
||||
@ -24,7 +24,7 @@ index 206be3b..75f2c9f 100644
|
||||
-libdir="@libdir@"
|
||||
V_RPATH_OPT="@V_RPATH_OPT@"
|
||||
LIBS="@LIBS@"
|
||||
|
||||
PACKAGE_NAME="@PACKAGE_NAME@"
|
||||
@@ -36,16 +35,6 @@ do
|
||||
esac
|
||||
shift
|
||||
@ -67,7 +67,7 @@ index 206be3b..75f2c9f 100644
|
||||
#
|
||||
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir -L$libdir $RPATH -lpcap"
|
||||
- echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME"
|
||||
+ echo "-lpcap"
|
||||
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
|
||||
then
|
||||
@ -79,7 +79,7 @@ index 206be3b..75f2c9f 100644
|
||||
+ echo ""
|
||||
elif [ "$show_libs" = 1 ]
|
||||
then
|
||||
- echo "-L$libdir $RPATH -lpcap"
|
||||
- echo "-L$libdir $RPATH -l$PACKAGE_NAME"
|
||||
+ echo "-lpcap"
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
diff --git a/pcap-linux.c b/pcap-linux.c
|
||||
index 85aa4d2..73b8602 100644
|
||||
--- a/pcap-linux.c
|
||||
+++ b/pcap-linux.c
|
||||
@@ -3252,6 +3252,13 @@ static void map_arphrd_to_dlt(pcap_t *handle, int sock_fd, int arptype,
|
||||
/* handlep->cooked = 1; */
|
||||
break;
|
||||
|
||||
+#ifndef ARPHRD_VSOCKMON
|
||||
+#define ARPHRD_VSOCKMON 826
|
||||
+#endif
|
||||
+ case ARPHRD_VSOCKMON:
|
||||
+ handle->linktype = DLT_VSOCK;
|
||||
+ break;
|
||||
+
|
||||
/* ARPHRD_LAPD is unofficial and randomly allocated, if reallocation
|
||||
* is needed, please report it to <daniele@orlandi.com> */
|
||||
#ifndef ARPHRD_LAPD
|
||||
diff --git a/pcap.c b/pcap.c
|
||||
index 77a709f..f571a10 100644
|
||||
--- a/pcap.c
|
||||
+++ b/pcap.c
|
||||
@@ -1259,6 +1259,7 @@ static struct dlt_choice dlt_choices[] = {
|
||||
DLT_CHOICE(RTAC_SERIAL, "Schweitzer Engineering Laboratories RTAC packets"),
|
||||
DLT_CHOICE(BLUETOOTH_LE_LL, "Bluetooth Low Energy air interface"),
|
||||
DLT_CHOICE(NETLINK, "Linux netlink"),
|
||||
+ DLT_CHOICE(VSOCK, "Linux vsock"),
|
||||
DLT_CHOICE(BLUETOOTH_LINUX_MONITOR, "Bluetooth Linux Monitor"),
|
||||
DLT_CHOICE(BLUETOOTH_BREDR_BB, "Bluetooth Basic Rate/Enhanced Data Rate baseband packets"),
|
||||
DLT_CHOICE(BLUETOOTH_LE_LL_WITH_PHDR, "Bluetooth Low Energy air interface with pseudo-header"),
|
||||
diff --git a/pcap/dlt.h b/pcap/dlt.h
|
||||
index 2d74713..c5e851f 100644
|
||||
--- a/pcap/dlt.h
|
||||
+++ b/pcap/dlt.h
|
||||
@@ -1316,7 +1316,8 @@
|
||||
#ifdef DLT_MATCHING_MAX
|
||||
#undef DLT_MATCHING_MAX
|
||||
#endif
|
||||
-#define DLT_MATCHING_MAX 265 /* highest value in the "matching" range */
|
||||
+#define DLT_MATCHING_MAX 271 /* highest value in the "matching" range */
|
||||
+#define DLT_VSOCK 271
|
||||
|
||||
/*
|
||||
* DLT and savefile link type values are split into a class and
|
||||
11
libpcap.spec
11
libpcap.spec
@ -1,7 +1,7 @@
|
||||
Name: libpcap
|
||||
Epoch: 14
|
||||
Version: 1.8.1
|
||||
Release: 11%{?dist}
|
||||
Version: 1.9.0
|
||||
Release: 1%{?dist}
|
||||
Summary: A system-independent interface for user-level packet capture
|
||||
Group: Development/Libraries
|
||||
License: BSD with advertising
|
||||
@ -19,7 +19,6 @@ Source: 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: 0004-Add-support-for-AF_VSOCK.patch
|
||||
|
||||
%description
|
||||
Libpcap provides a portable framework for low-level network
|
||||
@ -71,8 +70,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libpcap.a
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc README CHANGES CREDITS
|
||||
%doc README.md CHANGES CREDITS
|
||||
%{_libdir}/libpcap.so.*
|
||||
%{_libdir}/pkgconfig/libpcap.pc
|
||||
%{_mandir}/man7/pcap*.7*
|
||||
|
||||
%files devel
|
||||
@ -85,6 +85,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libpcap.a
|
||||
%{_mandir}/man5/pcap*.5*
|
||||
|
||||
%changelog
|
||||
* Wed Aug 01 2018 Michal Ruprich <mruprich@redhat.com> - 14:1.9.0-1
|
||||
- New version 1.9.0
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 14:1.8.1-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user