mirror of
https://abf.rosa.ru/djam/libpcap.git
synced 2025-02-23 09:43:00 +00:00
Merge pull request #1 from djam/libpcap:rosa2023.1
Backports and update
This commit is contained in:
commit
5c33684b05
7 changed files with 51 additions and 121 deletions
3
.abf.yml
3
.abf.yml
|
|
@ -1,3 +1,2 @@
|
|||
sources:
|
||||
libpcap-1.8.1.tar.gz: 32d7526dde8f8a2f75baf40c01670602aeef7e39
|
||||
libpcap-1.8.1.tar.gz.sig: fa615314fc15ad4011f73aacf442f83fa037d661
|
||||
libpcap-1.10.4.tar.gz: 818cbe70179c73eebfe1038854665f33aac64245
|
||||
|
|
|
|||
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,22 +0,0 @@
|
|||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -453,10 +453,6 @@
|
||||
|
||||
incdir=-I/usr/include/libnl3
|
||||
libnldir=
|
||||
- if test x$withval != x ; then
|
||||
- libnldir=-L${withval}/lib/.libs
|
||||
- incdir=-I${withval}/include
|
||||
- fi
|
||||
|
||||
#
|
||||
# Try libnl 3.x first.
|
||||
@@ -471,7 +467,7 @@
|
||||
AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
|
||||
AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
|
||||
AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
|
||||
- V_INCLS="$V_INCLS ${incdir}"
|
||||
+ V_INCLS="${incdir} $V_INCLS"
|
||||
have_any_nl="yes"
|
||||
],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -Naur libpcap-1.8.1-orig/Makefile.in libpcap-1.8.1/Makefile.in
|
||||
--- libpcap-1.8.1-orig/Makefile.in 2016-10-26 03:07:59.000000000 +0300
|
||||
+++ libpcap-1.8.1/Makefile.in 2017-02-03 02:10:18.946263843 +0300
|
||||
@@ -52,7 +52,7 @@
|
||||
DEFS = -DBUILDING_PCAP @DEFS@ @V_DEFS@
|
||||
ADDLOBJS = @ADDLOBJS@
|
||||
ADDLARCHIVEOBJS = @ADDLARCHIVEOBJS@
|
||||
-LIBS = @LIBS@
|
||||
+LIBS = @LIBS@ -lpthread
|
||||
CROSSFLAGS=
|
||||
CFLAGS = @CFLAGS@ ${CROSSFLAGS}
|
||||
LDFLAGS = @LDFLAGS@ ${CROSSFLAGS}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -up libpcap/pcap.3pcap.in.man libpcap/pcap.3pcap.in
|
||||
--- libpcap/pcap.3pcap.in.man 2009-07-03 06:01:12.000000000 +0200
|
||||
+++ libpcap/pcap.3pcap.in 2009-07-03 15:00:12.000000000 +0200
|
||||
@@ -363,7 +363,7 @@ use an
|
||||
script or some other configuration script to check whether the libpcap
|
||||
1.0 APIs are available and use them only if they are.
|
||||
.SH SEE ALSO
|
||||
-autoconf(1), tcpdump(1), tcpslice(1), pcap-filter(@MAN_MISC_INFO@), pfconfig(8),
|
||||
+autoconf(1), tcpdump(8), tcpslice(8), pcap-filter(@MAN_MISC_INFO@), pfconfig(8),
|
||||
usermod(1M)
|
||||
.SH AUTHORS
|
||||
The original authors of libpcap are:
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
diff -up libpcap/pcap-config.in.multilib libpcap/pcap-config.in
|
||||
--- libpcap/pcap-config.in.multilib 2011-11-23 14:28:54.580396515 +0100
|
||||
+++ libpcap/pcap-config.in 2011-11-23 14:36:47.408268484 +0100
|
||||
@@ -36,16 +36,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 +44,16 @@ then
|
||||
#
|
||||
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"
|
||||
@@ -75,15 +65,15 @@ else
|
||||
#
|
||||
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
|
||||
then
|
||||
- echo "-I$includedir -L$libdir $RPATH -lpcap"
|
||||
+ 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 -lpcap"
|
||||
+ echo "-lpcap"
|
||||
fi
|
||||
fi
|
||||
19
libpcap.spec
19
libpcap.spec
|
|
@ -1,21 +1,18 @@
|
|||
%define major 1
|
||||
%define libname %mklibname pcap %{major}
|
||||
%define devname %mklibname pcap -d
|
||||
|
||||
%bcond_without bluetooth
|
||||
|
||||
Summary: A system-independent interface for user-level packet capture
|
||||
Name: libpcap
|
||||
Version: 1.8.1
|
||||
Release: 2
|
||||
Version: 1.10.4
|
||||
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-multilib.patch
|
||||
Patch1: libpcap-man.patch
|
||||
Patch2: libpcap-1.8.1-lpthread.patch
|
||||
Patch3: libpcap-1.8.1-error-include-libnl.patch
|
||||
Patch0: libpcap-1.10.2-multilib.patch
|
||||
BuildRequires: bison
|
||||
BuildRequires: flex
|
||||
%if %{with bluetooth}
|
||||
|
|
@ -78,12 +75,13 @@ This package contains the development pcap library and its header files needed
|
|||
to compile applications such as tcpdump, etc.
|
||||
|
||||
%files -n %{devname}
|
||||
%doc README* CREDITS INSTALL.txt LICENSE CHANGES TODO
|
||||
%doc README* CREDITS INSTALL.md LICENSE CHANGES TODO
|
||||
%{_bindir}/pcap-config
|
||||
%dir %{_includedir}/pcap
|
||||
%{_includedir}/pcap/*.h
|
||||
%{_includedir}/*.h
|
||||
%{_libdir}/libpcap.so
|
||||
%{_libdir}/pkgconfig/libpcap.pc
|
||||
%{_mandir}/man1/pcap-config.1*
|
||||
%{_mandir}/man3/pcap*
|
||||
|
||||
|
|
@ -95,10 +93,7 @@ to compile applications such as tcpdump, etc.
|
|||
|
||||
%build
|
||||
autoreconf -vfi
|
||||
export CFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
|
||||
%configure2_5x \
|
||||
--disable-static \
|
||||
%configure \
|
||||
--enable-ipv6 \
|
||||
%if %{with bluetooth}
|
||||
--enable-bluetooth \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue