mirror of
https://abf.rosa.ru/djam/libpcap.git
synced 2025-02-23 17:52:56 +00:00
New version 1.10.3
This commit is contained in:
parent
e17b08cf6f
commit
e1d898d3ce
4 changed files with 46 additions and 75 deletions
3
.abf.yml
3
.abf.yml
|
@ -1,3 +1,2 @@
|
|||
sources:
|
||||
libpcap-1.10.1.tar.gz: 4343528176e0402cce807a09a97191069a1e3dd9
|
||||
libpcap-1.10.1.tar.gz.sig: 6b734289acfcbbf5c265b825c3ac6328b1553571
|
||||
libpcap-1.10.3.tar.gz: 8c4bb621b044f01f060b68eb63ed0515780dca19
|
||||
|
|
43
libpcap-1.10.2-multilib.patch
Normal file
43
libpcap-1.10.2-multilib.patch
Normal file
|
@ -0,0 +1,43 @@
|
|||
--- libpcap-1.10.2/pcap-config.in.orig 2023-01-03 13:08:17.213734355 -0500
|
||||
+++ libpcap-1.10.2/pcap-config.in 2023-01-03 13:10:51.125222216 -0500
|
||||
@@ -111,16 +111,16 @@ then
|
||||
#
|
||||
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir $LPATH -l@PACKAGE_NAME@ $LIBS"
|
||||
+ echo "-l@PACKAGE_NAME@ $LIBS"
|
||||
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir $LPATH $LIBS"
|
||||
+ echo "$LIBS"
|
||||
elif [ "$show_cflags" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir"
|
||||
+ echo ""
|
||||
elif [ "$show_libs" = 1 ]
|
||||
then
|
||||
- echo "$LPATH -l@PACKAGE_NAME@ $LIBS"
|
||||
+ echo "-l@PACKAGE_NAME@ $LIBS"
|
||||
elif [ "$show_additional_libs" = 1 ]
|
||||
then
|
||||
echo "$LIBS"
|
||||
@@ -138,15 +138,15 @@ else
|
||||
#
|
||||
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir $LPATH @RPATH@ -l@PACKAGE_NAME@"
|
||||
+ echo "-l@PACKAGE_NAME@"
|
||||
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir"
|
||||
+ echo ""
|
||||
elif [ "$show_cflags" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir"
|
||||
+ echo ""
|
||||
elif [ "$show_libs" = 1 ]
|
||||
then
|
||||
- echo "$LPATH @RPATH@ -l@PACKAGE_NAME@"
|
||||
+ echo "-l@PACKAGE_NAME@"
|
||||
fi
|
||||
fi
|
|
@ -1,70 +0,0 @@
|
|||
diff -urN libpcap-1.9.1/pcap-config.in libpcap-1.9.1-patched/pcap-config.in
|
||||
--- libpcap-1.9.1/pcap-config.in 2019-10-01 00:38:32.000000000 +1000
|
||||
+++ libpcap-1.9.1-patched/pcap-config.in 2019-10-14 13:28:40.707338081 +1000
|
||||
@@ -11,8 +11,6 @@
|
||||
prefix="@prefix@"
|
||||
exec_prefix="@exec_prefix@"
|
||||
includedir="@includedir@"
|
||||
-libdir="@libdir@"
|
||||
-V_RPATH_OPT="@V_RPATH_OPT@"
|
||||
LIBS="@LIBS@"
|
||||
PACKAGE_NAME="@PACKAGE_NAME@"
|
||||
|
||||
@@ -41,16 +39,6 @@
|
||||
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
|
||||
#
|
||||
@@ -59,16 +47,16 @@
|
||||
#
|
||||
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir -L$libdir -lpcap $LIBS"
|
||||
+ echo "-lpcap @LIBS@"
|
||||
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir -L$libdir $LIBS"
|
||||
+ echo "@LIBS@"
|
||||
elif [ "$show_cflags" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir"
|
||||
+ echo ""
|
||||
elif [ "$show_libs" = 1 ]
|
||||
then
|
||||
- echo "-L$libdir -lpcap $LIBS"
|
||||
+ echo "-lpcap @LIBS@"
|
||||
elif [ "$show_additional_libs" = 1 ]
|
||||
then
|
||||
echo "$LIBS"
|
||||
@@ -80,15 +68,15 @@
|
||||
#
|
||||
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME"
|
||||
+ echo "-lpcap"
|
||||
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir"
|
||||
+ echo ""
|
||||
elif [ "$show_cflags" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir"
|
||||
+ echo ""
|
||||
elif [ "$show_libs" = 1 ]
|
||||
then
|
||||
- echo "-L$libdir $RPATH -l$PACKAGE_NAME"
|
||||
+ echo "-lpcap"
|
||||
fi
|
||||
fi
|
|
@ -6,14 +6,13 @@
|
|||
|
||||
Summary: A system-independent interface for user-level packet capture
|
||||
Name: libpcap
|
||||
Version: 1.10.1
|
||||
Version: 1.10.3
|
||||
Release: 1
|
||||
License: BSD
|
||||
Group: System/Libraries
|
||||
Url: http://www.tcpdump.org/
|
||||
Source0: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
|
||||
Source1: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz.sig
|
||||
Patch0: libpcap-1.9.1-multilib.patch
|
||||
Patch0: libpcap-1.10.2-multilib.patch
|
||||
BuildRequires: bison
|
||||
BuildRequires: flex
|
||||
%if %{with bluetooth}
|
||||
|
|
Loading…
Add table
Reference in a new issue