packages/libpcap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update libpcap to 1.10.3

Browse Source
This commit is contained in:
xinghe 2023-02-06 03:03:09 +00:00
parent 9b7286b0ed
commit 8465bac05a
5 changed files with 27 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
backport-pcap-config-mitigate-multilib-conflict.patch
View File

@ -9,48 +9,32 @@ 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
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 +42,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 +63,9 @@ 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"
--

0
libpcap-1.10.1-sw.patch Executable file → Normal file
View File

BIN
libpcap-1.10.1.tar.gz
View File

Binary file not shown.

BIN
libpcap-1.10.3.tar.gz Normal file
View File

Binary file not shown.

12
libpcap.spec
View File

@ -1,7 +1,7 @@
Name: libpcap
Epoch: 14
Version: 1.10.1
Release: 3
Version: 1.10.3
Release: 1
Summary: A system-independent interface for user-level packet capture
License: BSD with advertising
URL: http://www.tcpdump.org
@ -11,7 +11,7 @@ Patch0: backport-0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-e
Patch1: backport-pcap-config-mitigate-multilib-conflict.patch
Patch2: libpcap-1.10.1-sw.patch
BuildRequires: bison flex gcc git glibc-kernheaders >= 2.2.0
BuildRequires: make bison flex gcc git glibc-kernheaders >= 2.2.0
%ifnarch i686
BuildRequires: bluez-devel
@ -64,6 +64,12 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%{_mandir}/man*
%changelog
* Mon Feb 06 2023 xinghe <xinghe2@h-partners.com> - 14:1.10.3-1
- Type:requirements
- ID:NA
- SUG:NA
- DESC:update libpcap to 1.10.3
* Thu Jul 28 2022 wuzx<wuzx1226@qq.com> - 14:1.10.1-3
- add sw64 patch