.gitignore

@@ -1 +1,2 @@
-SOURCES/libpcap-1.10.0.tar.gz
+SOURCES/libpcap-1.10.4.tar.gz
+SOURCES/libpcap-1.10.4.tar.gz.sig

.libpcap.metadata

@@ -1 +1,2 @@
-3d8c1843ae4ea0d7871c8689b58508406e5743c9 SOURCES/libpcap-1.10.0.tar.gz
+818cbe70179c73eebfe1038854665f33aac64245 SOURCES/libpcap-1.10.4.tar.gz
+c5555ac81e6de628e0515114fea91dd7828eb909 SOURCES/libpcap-1.10.4.tar.gz.sig

SOURCES/0001-man-tcpdump-and-tcpslice-have-manpages-in-man8.patch

@@ -21,7 +21,7 @@ index 492c227..46a2a4b 100644
 -.BR tcpslice (1),
 +.BR tcpdump (8),
 +.BR tcpslice (8),
- .BR pcap-filter (@MAN_MISC_INFO@),
+ .BR \%pcap-filter (@MAN_MISC_INFO@),
  .BR pfconfig (8),
  .BR usermod (@MAN_ADMIN_COMMANDS@)
 -- 

SOURCES/0002-pcap-config-mitigate-multilib-conflict.patch

@@ -12,45 +12,30 @@ path anyway.
 ---
  pcap-config.in | 27 ++++++++-------------------
  1 file changed, 8 insertions(+), 19 deletions(-)
+--
+1.8.3.1
 
 diff --git a/pcap-config.in b/pcap-config.in
-index 206be3b..75f2c9f 100644
+index 6039ef3..72297bf 100644
 --- a/pcap-config.in
 +++ b/pcap-config.in
-@@ -7,7 +7,6 @@
+@@ -11,7 +11,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
+ LIBS_STATIC="@LIBS_STATIC@"
+ VERSION="@PACKAGE_VERSION@"
+@@ -90,16 +89,16 @@ then
  	#
  	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
  	then
--		echo "-I$includedir -L$libdir -lpcap $LIBS"
+-		echo "-I$includedir $LPATH -l@PACKAGE_NAME@ $LIBS_STATIC"
 +		echo "-lpcap @LIBS@"
  	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
  	then
--		echo "-I$includedir -L$libdir $LIBS"
+-		echo "-I$includedir $LPATH $LIBS_STATIC"
 +		echo "@LIBS@"
  	elif [ "$show_cflags" = 1 ]
  	then
@@ -58,20 +43,20 @@ index 206be3b..75f2c9f 100644
 +		echo ""
  	elif [ "$show_libs" = 1 ]
  	then
--		echo "-L$libdir -lpcap $LIBS"
+-		echo "$LPATH -l@PACKAGE_NAME@ $LIBS_STATIC"
 +		echo "-lpcap @LIBS@"
  	elif [ "$show_additional_libs" = 1 ]
  	then
- 		echo "$LIBS"
-@@ -75,15 +64,15 @@ else
+ 		echo "$LIBS_STATIC"
+@@ -117,16 +116,16 @@ then
  	#
  	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
  	then
--		echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME"
+-		echo "-I$includedir $LPATH -l@PACKAGE_NAME@ $LIBS"
 +		echo "-lpcap"
  	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
  	then
--		echo "-I$includedir"
+-		echo "-I$includedir $LPATH $LIBS"
 +		echo ""
  	elif [ "$show_cflags" = 1 ]
  	then
@@ -79,10 +64,8 @@ index 206be3b..75f2c9f 100644
 +		echo ""
  	elif [ "$show_libs" = 1 ]
  	then
--		echo "-L$libdir $RPATH -l$PACKAGE_NAME"
+-		echo "$LPATH -l@PACKAGE_NAME@ $LIBS"
 +		echo "-lpcap"
- 	fi
- fi
--- 
-1.8.3.1
-
+ 	elif [ "$show_additional_libs" = 1 ]
+ 	then
+ 		echo "$LIBS"

SOURCES/0004-covscan-rhel9.patch

@@ -1,14 +0,0 @@
-diff --git a/pcap-linux.c b/pcap-linux.c
-index 86ce887..3c09617 100644
---- a/pcap-linux.c
-+++ b/pcap-linux.c
-@@ -1599,8 +1599,8 @@ get_if_flags(const char *name, bpf_u_int32 *flags, char *errbuf)
- 				}
- 			}
- 			fclose(fh);
--			free(pathstr);
- 		}
-+		free(pathstr);
- 	}
- 
- #ifdef ETHTOOL_GLINK

SPECS/libpcap.spec

@@ -1,9 +1,9 @@
 Name:     libpcap
 Epoch:    14
-Version:  1.10.0
-Release:  4%{?dist}
+Version:  1.10.4
+Release:  7%{?dist}
 Summary:  A system-independent interface for user-level packet capture
-License:  BSD with advertising
+License:  ISC AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause-UC
 URL:      https://www.tcpdump.org/
 
 BuildRequires: make
@@ -18,12 +18,12 @@ BuildRequires: glibc-kernheaders >= 2.2.0
 BuildRequires: rdma-core-devel
 %endif
 
-Source:  https://www.tcpdump.org/release/%{name}-%{version}.tar.gz
+Source0:  https://www.tcpdump.org/release/%{name}-%{version}.tar.gz
+Source1:  https://www.tcpdump.org/release/%{name}-%{version}.tar.gz.sig
 
 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-covscan-rhel9.patch
 
 %description
 Libpcap provides a portable framework for low-level network
@@ -93,15 +93,51 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libpcap.a
 %{_mandir}/man5/pcap*.5*
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 14:1.10.0-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 14:1.10.4-7
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
 
-* Mon Jul 26 2021 Michal Ruprich <mruprich@redhat.com> - 14:1.10.0-3
-- Resolves: #1938778 - review of important potential issues detected by static analyzers in libpcap
+* Tue Jul 02 2024 František Hrdina <fhrdina@redhat.com> - 14:1.10.4-6
+- Fix broken gating
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 14:1.10.0-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 14:1.10.4-5
+- Bump release for June 2024 mass rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 14:1.10.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 14:1.10.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 14:1.10.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Apr 12 2023 Michal Ruprich <mruprich@redhat.com> - 14:1.10.4-1
+- New version 1.10.4
+
+* Tue Mar 21 2023 Michal Ruprich <mruprich@redhat.com> - 14:1.10.3-3
+- SPDX migration
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 14:1.10.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Jan 17 2023 Michal Ruprich <mruprich@redhat.com> - 14:1.10.3-1
+- New version 1.10.3
+
+* Tue Jan 03 2023 Michal Ruprich <mruprich@redhat.com> - 14:1.10.2-1
+- New version 1.10.2
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 14:1.10.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 14:1.10.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 14:1.10.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jun 10 2021 Michal Ruprich <mruprich@redhat.com> - 14:1.10.1-1
+- New version 1.10.1
 
 * Thu Feb 11 2021 Michal Ruprich <mruprich@redhat.com> - 14:1.10.0-1
 - New version 1.10.0