packages: libpcap/libpcap.spec, libpcap/libpcap-m4.patch (NEW) - rel 5; dro...

[arekm]

Author: arekm                        Date: Fri Aug 28 21:16:38 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5; drop local pcap check from m4 macro

---- Files affected:
packages/libpcap:
   libpcap.spec (1.82 -> 1.83) , libpcap-m4.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libpcap/libpcap.spec
diff -u packages/libpcap/libpcap.spec:1.82 packages/libpcap/libpcap.spec:1.83
--- packages/libpcap/libpcap.spec:1.82	Tue Jun 23 22:46:54 2009
+++ packages/libpcap/libpcap.spec	Fri Aug 28 23:16:32 2009
@@ -12,7 +12,7 @@
 Summary(uk.UTF-8):	Надає доступ до мережевих інтерфейсів в promiscuous-режимі
 Name:		libpcap
 Version:	1.0.0
-Release:	4
+Release:	5
 Epoch:		2
 License:	BSD
 Group:		Libraries
@@ -22,6 +22,7 @@
 Patch1:		%{name}-pf_ring.patch
 Patch2:		%{name}-any_device.patch
 Patch3:		%{name}-pcap-config.patch
+Patch4:		%{name}-m4.patch
 URL:		http://www.tcpdump.org/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -159,6 +160,7 @@
 %{?with_pfring:%patch1 -p0}
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -213,6 +215,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.83  2009/08/28 21:16:32  arekm
+- rel 5; drop local pcap check from m4 macro
+
 Revision 1.82  2009/06/23 20:46:54  adamg
 - fix pcap-config; release 4
 

================================================================
Index: packages/libpcap/libpcap-m4.patch
diff -u /dev/null packages/libpcap/libpcap-m4.patch:1.1
--- /dev/null	Fri Aug 28 23:16:38 2009
+++ packages/libpcap/libpcap-m4.patch	Fri Aug 28 23:16:32 2009
@@ -0,0 +1,38 @@
+--- libpcap-1.0.0/aclocal.m4~	2008-10-11 04:42:43.000000000 +0200
++++ libpcap-1.0.0/aclocal.m4	2009-08-28 23:14:04.224849573 +0200
+@@ -239,35 +239,10 @@
+ 		    LIBS="$LIBS $pfopen"
+ 	    fi
+     fi
+-    AC_MSG_CHECKING(for local pcap library)
+-    libpcap=FAIL
+-    lastdir=FAIL
+-    places=`ls .. | sed -e 's,/$,,' -e 's,^,../,' | \
+-	egrep '/libpcap-[[0-9]]*\.[[0-9]]*(\.[[0-9]]*)?([[ab]][[0-9]]*)?$'`
+-    for dir in $places ../libpcap libpcap ; do
+-	    basedir=`echo $dir | sed -e 's/[[ab]][[0-9]]*$//'`
+-	    if test $lastdir = $basedir ; then
+-		    dnl skip alphas when an actual release is present
+-		    continue;
+-	    fi
+-	    lastdir=$dir
+-	    if test -r $dir/pcap.c ; then
+-		    libpcap=$dir/libpcap.a
+-		    d=$dir
+-		    dnl continue and select the last one that exists
+-	    fi
+-    done
+-    if test $libpcap = FAIL ; then
+-	    AC_MSG_RESULT(not found)
+ 	    AC_CHECK_LIB(pcap, main, libpcap="-lpcap")
+ 	    if test $libpcap = FAIL ; then
+ 		    AC_MSG_ERROR(see the INSTALL doc for more info)
+ 	    fi
+-    else
+-	    $1=$libpcap
+-	    $2="-I$d $$2"
+-	    AC_MSG_RESULT($libpcap)
+-    fi
+     LIBS="$libpcap $LIBS"
+     case "$host_os" in
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libpcap/libpcap.spec?r1=1.82&r2=1.83&f=u