rpms
/
libpcap
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:c9
Branches Tags
rpms:i10c-beta
rpms:c10-beta
rpms:i10cs
rpms:cs10
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9
...
pull from: rpms:c10-beta
Branches Tags
rpms:i10c-beta
rpms:c10-beta
rpms:i10cs
rpms:cs10
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9

No commits in common. 'c9' and 'c10-beta' have entirely different histories.
c9 ... c10-beta

6 changed files with 67 additions and 64 deletions
Show Stats

3
.gitignore vendored
Unescape View File

@ -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

3
.libpcap.metadata
Unescape View File

@ -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

2
SOURCES/0001-man-tcpdump-and-tcpslice-have-manpages-in-man8.patch
Unescape View File

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

53
SOURCES/0002-pcap-config-mitigate-multilib-conflict.patch
Unescape View File

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

14
SOURCES/0004-covscan-rhel9.patch
Unescape View File

@ -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

56
SPECS/libpcap.spec
Unescape View File

@ -1,9 +1,9 @@
Name: libpcap Name: libpcap
Epoch: 14 Epoch: 14
Version: 1.10.0 Version: 1.10.4
Release: 4%{?dist} Release: 6%{?dist}
Summary: A system-independent interface for user-level packet capture 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/ URL: https://www.tcpdump.org/
BuildRequires: make BuildRequires: make
@ -18,12 +18,12 @@ BuildRequires: glibc-kernheaders >= 2.2.0
BuildRequires: rdma-core-devel BuildRequires: rdma-core-devel
%endif %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 Patch0001: 0001-man-tcpdump-and-tcpslice-have-manpages-in-man8.patch
Patch0002: 0002-pcap-config-mitigate-multilib-conflict.patch Patch0002: 0002-pcap-config-mitigate-multilib-conflict.patch
Patch0003: 0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch Patch0003: 0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch
Patch0004: 0004-covscan-rhel9.patch
%description %description
Libpcap provides a portable framework for low-level network Libpcap provides a portable framework for low-level network
@ -93,15 +93,47 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libpcap.a
%{_mandir}/man5/pcap*.5* %{_mandir}/man5/pcap*.5*
%changelog %changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 14:1.10.0-4 * Tue Jul 02 2024 František Hrdina <fhrdina@redhat.com> - 14:1.10.4-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Fix broken gating
Related: rhbz#1991688
* Mon Jul 26 2021 Michal Ruprich <mruprich@redhat.com> - 14:1.10.0-3 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 14:1.10.4-5
- Resolves: #1938778 - review of important potential issues detected by static analyzers in libpcap - Bump release for June 2024 mass rebuild
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 14:1.10.0-2 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 14:1.10.4-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - 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 * Thu Feb 11 2021 Michal Ruprich <mruprich@redhat.com> - 14:1.10.0-1
- New version 1.10.0 - New version 1.10.0

Write Preview
Loading…
Cancel
Save