diff --git a/0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch b/0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch index a1e1344db436b06feec0a7e0ed73a5326e7fd0dd..a0b2e65ad569068561a90328d3a017076dc140e1 100644 --- a/0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch +++ b/0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch @@ -13,7 +13,7 @@ index 878f27f..6917203 100644 --- a/pcap-linux.c +++ b/pcap-linux.c @@ -2474,6 +2474,10 @@ activate_pf_packet(pcap_t *handle, int is_any_device) - } + handle->linktype = DLT_LINUX_SLL; } + /* Hack to make things work on s390 ctc interfaces */ diff --git a/libpcap-1.10.4.tar.gz b/libpcap-1.10.4.tar.gz deleted file mode 100644 index 6ae7485520b106c34924e77ad4c7b042e21535bc..0000000000000000000000000000000000000000 Binary files a/libpcap-1.10.4.tar.gz and /dev/null differ diff --git a/libpcap-1.10.5.tar.xz b/libpcap-1.10.5.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..14c11c7d5f9aef8c5f79390098628f901a7039d1 Binary files /dev/null and b/libpcap-1.10.5.tar.xz differ diff --git a/libpcap.spec b/libpcap.spec index aeef7e9d6247353f89306c79ccaa3581e3f0dc2e..1e00b90b28bf61bac4c8cff104421b1a25d72ea7 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -1,11 +1,11 @@ Name: libpcap Epoch: 14 -Version: 1.10.4 +Version: 1.10.5 Release: 1 Summary: A system-independent interface for user-level packet capture -License: BSD -URL: http://www.tcpdump.org -Source0: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz +License: BSD-3-Clause +URL: https://www.tcpdump.org +Source0: https://www.tcpdump.org/release/%{name}-%{version}.tar.xz Patch0: 0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch Patch1: pcap-config-mitigate-multilib-conflict.patch @@ -41,29 +41,26 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %install %make_install - %delete_la_and_a -%ldconfig_scriptlets - %files -%defattr(-,root,root) %license LICENSE %{_libdir}/libpcap.so.* %files devel -%defattr(-,root,root) %{_bindir}/pcap-config %{_includedir}/* %{_libdir}/libpcap.so %{_libdir}/pkgconfig/libpcap.pc %files help -%defattr(-,root,root) %doc README.md CHANGES CREDITS %{_mandir}/man* %changelog +* Sat Aug 31 2024 Funda Wang - 14:1.10.5-1 +- update to 1.10.5 + * Tue Jan 31 2023 chenzixuan - 14:1.10.4-1 - Type:requirements - ID:NA