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-01-31 07:01:06 +00:00
parent 49b6f940cd
commit 7ddf43a91a
4 changed files with 42 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

48
pcap-config-mitigate-multilib-conflict.patch
View File

@ -15,7 +15,7 @@ path anyway.
1 file changed, 8 insertions(+), 19 deletions(-) 1 file changed, 8 insertions(+), 19 deletions(-)
diff --git a/pcap-config.in b/pcap-config.in diff --git a/pcap-config.in b/pcap-config.in
index 54ca42f..830a6c7 100644 index 6039ef3..72297bf 100644
--- a/pcap-config.in --- a/pcap-config.in
+++ b/pcap-config.in +++ b/pcap-config.in
@@ -11,7 +11,6 @@ @@ -11,7 +11,6 @@
@ -23,35 +23,18 @@ index 54ca42f..830a6c7 100644
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@"
@@ -41,16 +40,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
#
@@ -59,16 +48,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
@ -59,20 +42,20 @@ index 54ca42f..830a6c7 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"
@@ -80,15 +69,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
@ -80,10 +63,9 @@ index 54ca42f..830a6c7 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