Djam/libpcap
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/libpcap.git synced 2025-02-23 17:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to 1.3.0

Browse source
This commit is contained in:
icedphoenix 2012-08-30 16:42:02 +04:00
parent bc0a2496e5
commit ad60cb9268
7 changed files with 147 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
"libpcap-1.1.1.tar.gz": 18581af5e78a40b7b2c9a6cd8ce40e7cb1cd9c63
"libpcap-1.3.0.tar.gz": 90aa2f0fcfb4bf79fc50ccdaa70f484d96295be3

BIN
libpcap-1.1.1.tar.gz.sig
View file

Binary file not shown.

9
libpcap-1.3.0.tar.gz.sig Normal file
View file

@ -0,0 +1,9 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQCVAwUAT9d3EIqHRg3pndX9AQKoXQP+IT2fkar8CcC+xoWRNEe1p+5jA7HOBGKB
6e84o9o2xKEjEDt3dhQpeVrkeK1FA+bR53x0379GMq0Vym/GQiJJYEiNW5tFyid8
YnlA7p7heXx4IEfjglmh10hwWffOUdpVQ67p0bd0CQweUc71loVVePmJvEJcLaUQ
gfPGtL+M+ro=
=dJIZ
-----END PGP SIGNATURE-----

12
libpcap-man.patch Normal file
View file

@ -0,0 +1,12 @@
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:

61
libpcap-multilib.patch Normal file
View file

@ -0,0 +1,61 @@
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

100
libpcap.spec
View file

@ -4,26 +4,22 @@
Summary: A system-independent interface for user-level packet capture
Name: libpcap
Version: 1.1.1
Release: %mkrel 5
Version: 1.3.0
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.0.0-LDFLAGS.diff
# (misc) fix the -i any,
# http://sourceforge.net/tracker/?func=detail&aid=2593897&group_id=53067&atid=469577
# commit 8fa17a5a554aaeb85d3ec4118b45a31f1efd6808 from upstream
#Patch1: libpcap-1.0.0-fix_handling_of_any.diff
# (misc) use usbmon to sniff on usb bus, and allow to use tcpdump -i usb0
# patch from debian, applied upstream ( 3866e831 )
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520259
#Patch2: libpcap-1.0.0-fix_usb_network_sniffing.diff
Patch0: libpcap-multilib.patch
Patch1: libpcap-man.patch
Patch2: lpthread-1.3.0-libpcap.patch
BuildRequires: bison
BuildRequires: flex
BuildRequires: libnl-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
#BuildRequires: libnl3-devel <- not yet
# for bluetooth/bluetooth.h
BuildRequires: bluez-devel
Suggests: %name-doc
%description
@ -61,7 +57,7 @@ capture modules in each application.
%package -n %{develname}
Summary: Static library and header files for the pcap library
Group: Development/C
Requires: %{libname} = %{version}-%{release}
Requires: %{libname} >= %{version}-%{release}
Provides: pcap-devel = %{version}-%{release}
Provides: %{name}-devel = %{version}-%{release}
Obsoletes: %{mklibname pcap -d 0}
@ -80,68 +76,79 @@ compile applications such as tcpdump, etc.
%prep
%setup -q -n %{name}-%{version}
#%patch0 -p0
#%patch1 -p1
#%patch2 -p0
%patch0 -p1
%patch1 -p1
%patch2 -p1
#sparc needs -fPIC
%ifarch %{sparc}
sed -i -e 's|-fpic|-fPIC|g' configure
%endif
%build
%serverbuild
export CFLAGS="%{optflags} -fno-strict-aliasing"
#export CFLAGS="%{optflags} -fPIC"
%configure2_5x \
--enable-ipv6
--enable-ipv6 \
--enable-bluetooth
%make "CCOPT=$CFLAGS -fPIC" all
%make "CCOPT=$CFLAGS -fPIC" shared
%make
# LIBS='-lpthread'
%install
rm -rf %{buildroot}
install -d %{buildroot}%{_bindir}
make DESTDIR=%{buildroot} install
make DESTDIR=%{buildroot} install-shared
ln -snf libpcap.so.%{major} %{buildroot}%{_libdir}/libpcap.so
%makeinstall_std
# install additional headers
install -m0644 pcap-int.h %{buildroot}%{_includedir}/
install -m0644 pcap/bluetooth.h %{buildroot}%{_includedir}/pcap/
%if %mdkversion < 200900
%post -n %{libname} -p /sbin/ldconfig
%endif
%if %mdkversion < 200900
%postun -n %{libname} -p /sbin/ldconfig
%endif
%clean
rm -rf %{buildroot}
# nuke the statis lib
rm -f %{buildroot}%{_libdir}/libpcap.a
%files -n %{libname}
%defattr(-,root,root)
%doc README* CREDITS INSTALL.txt LICENSE
%{_libdir}/libpcap.so.%{major}*
%files doc
%defattr(-,root,root)
%{_mandir}/man?/*
%files -n %{develname}
%defattr(-,root,root)
%doc CHANGES TODO
%{_bindir}/pcap-config
%dir %{_includedir}/pcap
%{_includedir}/pcap/*.h
%{_includedir}/*.h
%{_libdir}/libpcap.so
%{_libdir}/libpcap.a
%changelog
* Mon May 02 2011 Oden Eriksson <oeriksson@mandriva.com> 1.1.1-4mdv2011.0
* Wed Jun 20 2012 Alexander Khrukin <akhrukin@mandriva.org> 1.3.0-1
+ Revision: 806293
- version update 1.3.0
* Mon Mar 26 2012 Bernhard Rosenkraenzer <bero@bero.eu> 1.2.1-2
+ Revision: 787040
- Rebuild in current environment
* Tue Jan 10 2012 Alexander Khrukin <akhrukin@mandriva.org> 1.2.1-1
+ Revision: 759358
- version update 1.2.1
* Mon Nov 28 2011 Oden Eriksson <oeriksson@mandriva.com> 1.2.0-1
+ Revision: 734889
- 1.2.0
- fix deps (still needs netfilter headers though?)
- various cleanups
- make pcap-config "arch safe" ;)
+ Matthew Dawkins <mattydaw@mandriva.org>
- properly commented out patches
* Mon May 02 2011 Oden Eriksson <oeriksson@mandriva.com> 1.1.1-4
+ Revision: 661514
- mass rebuild
@ -207,7 +214,7 @@ rm -rf %{buildroot}
+ Pixel <pixel@mandriva.com>
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
+ Olivier Blin <oblin@mandriva.com>
+ Olivier Blin <blino@mandriva.org>
- restore BuildRoot
+ Thierry Vignaud <tv@mandriva.org>
@ -239,11 +246,6 @@ rm -rf %{buildroot}
+ Revision: 43309
- using -fstack-protector
* Wed Nov 22 2006 Oden Eriksson <oeriksson@mandriva.com> 0.9.5-1mdv2007.0
+ Revision: 86095
- Import libpcap
* Wed Nov 22 2006 Oden Eriksson <oeriksson@mandriva.com> 0.9.5-1mdv2007.1
- 0.9.5

13
lpthread-1.3.0-libpcap.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/Makefile.in b/Makefile.in
index 772cc7d..8065973 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,7 +52,7 @@ INCLS = -I. @V_INCLS@
DEFS = @DEFS@ @V_DEFS@
ADDLOBJS = @ADDLOBJS@
ADDLARCHIVEOBJS = @ADDLARCHIVEOBJS@
-LIBS = @LIBS@
+LIBS = @LIBS@ -lpthread
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
DYEXT = @DYEXT@