libpcap: Upgraded to version 1.1.1

Remove config-fixes.patch and ldflags.patch since the change is already in the
latest version
Remove shared.patch since it is not being used.
Rebase aclocal.patch according to the latest package version
Also contains Metadata fix

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>

8 files changed, 80 insertions, 214 deletions

diff --git a/meta/packages/libpcap/libpcap-1.0.0/config-fixes.patch b/meta/packages/libpcap/libpcap-1.0.0/config-fixes.patch
deleted file mode 100644
index 166816eb8..000000000
--- a/meta/packages/libpcap/libpcap-1.0.0/config-fixes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fixes to enable building with latest autoconf and automake
-
-JL 09/02/10
-
-Index: libpcap-0.9.3/configure.in
-===================================================================
---- libpcap-0.9.3.orig/configure.in	2005-07-07 07:56:03.000000000 +0100
-+++ libpcap-0.9.3/configure.in	2010-02-09 15:19:40.529662003 +0000
-@@ -11,6 +11,7 @@
- AC_INIT(pcap.c)
- 
- AC_CANONICAL_SYSTEM
-+AC_PROG_CC
- 
- AC_LBL_C_INIT(V_CCOPT, V_INCLS, V_LIBS)
- AC_LBL_C_INLINE
diff --git a/meta/packages/libpcap/libpcap-1.0.0/ldflags.patch b/meta/packages/libpcap/libpcap-1.0.0/ldflags.patch
deleted file mode 100644
index 66ab5f725..000000000
--- a/meta/packages/libpcap/libpcap-1.0.0/ldflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN libpcap-1.0.0.orig/Makefile.in libpcap-1.0.0/Makefile.in
---- libpcap-1.0.0.orig/Makefile.in	2008-10-28 01:26:13.000000000 +0000
-+++ libpcap-1.0.0/Makefile.in	2009-04-02 13:54:20.000000000 +0000
-@@ -326,7 +326,7 @@
- #
- libpcap.so: $(OBJ)
- 	@rm -f $@
--	$(CC) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS)
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS)
- 
- #
- # The following rule succeeds, but the result is untested.
diff --git a/meta/packages/libpcap/libpcap-1.0.0/shared.patch b/meta/packages/libpcap/libpcap-1.0.0/shared.patch
deleted file mode 100644
index cbdb18163..000000000
--- a/meta/packages/libpcap/libpcap-1.0.0/shared.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Patch currently not applied but would be better or worse than customised do_install?
-
---- libpcap-0.9.3/Makefile.in~shared
-+++ libpcap-0.9.3/Makefile.in
-@@ -37,6 +37,15 @@
- srcdir = @srcdir@
- VPATH = @srcdir@
- 
-+# some defines for shared library compilation - FIXME, if not matching
-+MAJ=0.9
-+MIN=3
-+VERSION=$(MAJ).$(MIN)
-+LIBNAME=pcap
-+LIBRARY=lib$(LIBNAME).a
-+SOLIBRARY=lib$(LIBNAME).so
-+SHAREDLIB=$(SOLIBRARY).$(VERSION)
-+
- #
- # You shouldn't need to edit anything below.
- #
-@@ -50,6 +59,7 @@
- 
- # Standard CFLAGS
- CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
-+CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ)
- 
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -70,6 +80,9 @@
- .c.o:
- 	@rm -f $@
- 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
-+%_pic.o: %.c
-+	@rm -f $@
-+	$(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c
- 
- PSRC =	pcap-@V_PCAP@.c
- FSRC =  fad-@V_FINDALLDEVS@.c
-@@ -84,6 +97,7 @@
- # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
- # hack the extra indirection
- OBJ =	$(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
-+OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=.o) $(CSRC:.c=_pic.o) $(GENSRC:.c=_pic.o)
- HDR =	pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
- 	ethertype.h gencode.h gnuc.h
- GENHDR = \
-@@ -95,15 +109,22 @@
- TAGFILES = \
- 	$(SRC) $(HDR) $(TAGHDR)
- 
--CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
-+CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so*
- 
--all: libpcap.a
-+all: libpcap.a $(SHAREDLIB)
- 
- libpcap.a: $(OBJ)
- 	@rm -f $@
- 	ar rc $@ $(OBJ) $(LIBS)
- 	$(RANLIB) $@
- 
-+$(SHAREDLIB): $(OBJ_PIC)
-+	-@rm -f $@
-+	-@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ)
-+	$(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc
-+	ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ)
-+	ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY)
-+
- shared: libpcap.$(DYEXT)
- 
- #
-@@ -129,6 +150,9 @@
- scanner.o: scanner.c tokdefs.h
- 	$(CC) $(CFLAGS) -c scanner.c
- 
-+scanner_pic.o: scanner.c tokdefs.h
-+	$(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c
-+
- pcap.o: version.h
- 
- tokdefs.h: grammar.c
-@@ -142,9 +166,16 @@
- 	@rm -f $@
- 	$(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
- 
-+grammer_pic.o: grammar.c
-+	@rm -f $@
-+	$(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c 
-+
- version.o: version.c
- 	$(CC) $(CFLAGS) -c version.c
- 
-+version_pic.o: version.c
-+	$(CC) -fPIC $(CFLAGS) -c version.c -o $@
-+
- snprintf.o: $(srcdir)/missing/snprintf.c
- 	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
- 
-@@ -170,11 +201,17 @@
- bpf_filter.o: bpf_filter.c
- 	$(CC) $(CFLAGS) -c bpf_filter.c
- 
-+bpf_filter_pic.o: bpf_filter.c
-+	$(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@
-+
- install: libpcap.a 
- 	[ -d $(DESTDIR)$(libdir) ] || \
- 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
- 	$(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
- 	$(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
-+	$(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/
-+	ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ)
-+	ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY)
- 	[ -d $(DESTDIR)$(includedir) ] || \
- 	    (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
- 	$(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h
diff --git a/meta/packages/libpcap/libpcap-1.0.0/aclocal.patch b/meta/packages/libpcap/libpcap-1.1.1/aclocal.patch
index 29cd275d5..71fd8b989 100644
--- a/meta/packages/libpcap/libpcap-1.0.0/aclocal.patch
+++ b/meta/packages/libpcap/libpcap-1.1.1/aclocal.patch
@@ -1,16 +1,34 @@
-diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
---- libpcap-0.9.7.orig/aclocal.m4	2007-09-16 01:19:51.000000000 +0200
-+++ libpcap-0.9.7/aclocal.m4	2007-09-16 02:45:52.000000000 +0200
-@@ -42,7 +42,7 @@
+diff -ruN libpcap-1.1.1-orig/aclocal.m4 libpcap-1.1.1/aclocal.m4
+--- libpcap-1.1.1-orig/aclocal.m4	2010-06-29 10:46:32.815117569 +0800
++++ libpcap-1.1.1/aclocal.m4	2010-06-29 10:49:17.150149949 +0800
+@@ -37,7 +37,7 @@
+ dnl AC_LBL_C_INIT.  Now, we run AC_LBL_C_INIT_BEFORE_CC, AC_PROG_CC,
+ dnl and AC_LBL_C_INIT at the top level.
+ dnl
+-AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC,
++AC_DEFUN([AC_LBL_C_INIT_BEFORE_CC],
+     [AC_PREREQ(2.50)
+     AC_BEFORE([$0], [AC_LBL_C_INIT])
+     AC_BEFORE([$0], [AC_PROG_CC])
+@@ -90,7 +90,7 @@
  dnl	ac_cv_lbl_gcc_vers
  dnl	LBL_CFLAGS
  dnl
 -AC_DEFUN(AC_LBL_C_INIT,
 +AC_DEFUN([AC_LBL_C_INIT],
-     [AC_PREREQ(2.12)
-     AC_BEFORE([$0], [AC_PROG_CC])
+     [AC_PREREQ(2.50)
      AC_BEFORE([$0], [AC_LBL_FIXINCLUDES])
-@@ -169,7 +169,7 @@
+     AC_BEFORE([$0], [AC_LBL_DEVEL])
+@@ -217,7 +217,7 @@
+ dnl	V_SONAME_OPT
+ dnl	V_RPATH_OPT
+ dnl
+-AC_DEFUN(AC_LBL_SHLIBS_INIT,
++AC_DEFUN([AC_LBL_SHLIBS_INIT],
+     [AC_PREREQ(2.50)
+     if test "$GCC" = yes ; then
+ 	    #
+@@ -361,7 +361,7 @@
  # Make sure we use the V_CCOPT flags, because some of those might
  # disable inlining.
  #
@@ -19,25 +37,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
      [AC_MSG_CHECKING(for inline)
      save_CFLAGS="$CFLAGS"
      CFLAGS="$V_CCOPT"
-@@ -225,7 +225,7 @@
- dnl	LIBS
- dnl	LBL_LIBS
- dnl
--AC_DEFUN(AC_LBL_LIBPCAP,
-+AC_DEFUN([AC_LBL_LIBPCAP],
-     [AC_REQUIRE([AC_LBL_LIBRARY_NET])
-     dnl
-     dnl save a copy before locating libpcap.a
-@@ -293,7 +293,7 @@
- dnl	RETSIGTYPE (defined)
- dnl	RETSIGVAL (defined)
- dnl
--AC_DEFUN(AC_LBL_TYPE_SIGNAL,
-+AC_DEFUN([AC_LBL_TYPE_SIGNAL],
-     [AC_BEFORE([$0], [AC_LBL_LIBPCAP])
-     AC_TYPE_SIGNAL
-     if test "$ac_cv_type_signal" = void ; then
-@@ -323,7 +323,7 @@
+@@ -407,7 +407,7 @@
  dnl
  dnl	AC_LBL_FIXINCLUDES
  dnl
@@ -46,7 +46,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
      [if test "$GCC" = yes ; then
  	    AC_MSG_CHECKING(for ANSI ioctl definitions)
  	    AC_CACHE_VAL(ac_cv_lbl_gcc_fixincludes,
-@@ -369,7 +369,7 @@
+@@ -453,7 +453,7 @@
  dnl	$2 (yacc appended)
  dnl	$3 (optional flex and bison -P prefix)
  dnl
@@ -55,7 +55,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
      [AC_ARG_WITH(flex, [  --without-flex          don't use flex])
      AC_ARG_WITH(bison, [  --without-bison         don't use bison])
      if test "$with_flex" = no ; then
-@@ -422,7 +422,7 @@
+@@ -506,7 +506,7 @@
  dnl
  dnl	DECLWAITSTATUS (defined)
  dnl
@@ -64,16 +64,16 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
      [AC_MSG_CHECKING(if union wait is used)
      AC_CACHE_VAL(ac_cv_lbl_union_wait,
  	AC_TRY_COMPILE([
-@@ -451,7 +451,7 @@
+@@ -535,7 +535,7 @@
  dnl
  dnl	HAVE_SOCKADDR_SA_LEN (defined)
  dnl
 -AC_DEFUN(AC_LBL_SOCKADDR_SA_LEN,
 +AC_DEFUN([AC_LBL_SOCKADDR_SA_LEN],
-     [AC_MSG_CHECKING(if sockaddr struct has sa_len member)
+     [AC_MSG_CHECKING(if sockaddr struct has the sa_len member)
      AC_CACHE_VAL(ac_cv_lbl_sockaddr_has_sa_len,
  	AC_TRY_COMPILE([
-@@ -476,7 +476,7 @@
+@@ -560,7 +560,7 @@
  dnl
  dnl	HAVE_SOCKADDR_STORAGE (defined)
  dnl
@@ -82,7 +82,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
      [AC_MSG_CHECKING(if sockaddr_storage struct exists)
      AC_CACHE_VAL(ac_cv_lbl_has_sockaddr_storage,
  	AC_TRY_COMPILE([
-@@ -509,7 +509,7 @@
+@@ -593,7 +593,7 @@
  dnl won't be using code that would use that member, or we wouldn't
  dnl compile in any case).
  dnl
@@ -91,7 +91,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
      [AC_MSG_CHECKING(if dl_hp_ppa_info_t struct has dl_module_id_1 member)
      AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1,
  	AC_TRY_COMPILE([
-@@ -535,7 +535,7 @@
+@@ -619,7 +619,7 @@
  dnl
  dnl	ac_cv_lbl_have_run_path (yes or no)
  dnl
@@ -100,16 +100,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
      [AC_MSG_CHECKING(for ${CC-cc} -R)
      AC_CACHE_VAL(ac_cv_lbl_have_run_path,
  	[echo 'main(){}' > conftest.c
-@@ -561,7 +561,7 @@
- dnl	int32_t (defined)
- dnl	u_int32_t (defined)
- dnl
--AC_DEFUN(AC_LBL_CHECK_TYPE,
-+AC_DEFUN([AC_LBL_CHECK_TYPE],
-     [AC_MSG_CHECKING(for $1 using $CC)
-     AC_CACHE_VAL(ac_cv_lbl_have_$1,
- 	AC_TRY_COMPILE([
-@@ -590,7 +590,7 @@
+@@ -644,7 +644,7 @@
  dnl
  dnl	LBL_ALIGN (DEFINED)
  dnl
@@ -118,7 +109,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
      [AC_MSG_CHECKING(if unaligned accesses fail)
      AC_CACHE_VAL(ac_cv_lbl_unaligned_fail,
  	[case "$host_cpu" in
-@@ -695,7 +695,7 @@
+@@ -749,7 +749,7 @@
  dnl	HAVE_OS_PROTO_H (defined)
  dnl	os-proto.h (symlinked)
  dnl
@@ -127,7 +118,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
      [rm -f os-proto.h
      if test "${LBL_CFLAGS+set}" = set; then
  	    $1="$$1 ${LBL_CFLAGS}"
-@@ -825,7 +825,7 @@
+@@ -886,7 +886,7 @@
  dnl statically and happen to have a libresolv.a lying around (and no
  dnl libnsl.a).
  dnl
@@ -136,7 +127,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
      # Most operating systems have gethostbyname() in the default searched
      # libraries (i.e. libc):
      # Some OSes (eg. Solaris) place it in libnsl
-@@ -848,7 +848,7 @@
+@@ -909,7 +909,7 @@
  dnl Test for __attribute__
  dnl
  
@@ -145,7 +136,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
  AC_MSG_CHECKING(for __attribute__)
  AC_CACHE_VAL(ac_cv___attribute__, [
  AC_COMPILE_IFELSE(
-@@ -886,7 +886,7 @@
+@@ -947,7 +947,7 @@
  dnl
  dnl -Scott Barron
  dnl
@@ -154,3 +145,21 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
     [AC_MSG_CHECKING(if if_packet.h has tpacket_stats defined)
     AC_CACHE_VAL(ac_cv_lbl_tpacket_stats,
     AC_TRY_COMPILE([
+@@ -976,7 +976,7 @@
+ dnl doesn't have that member (which is OK, as either we won't be using
+ dnl code that would use that member, or we wouldn't compile in any case).
+ dnl
+-AC_DEFUN(AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI,
++AC_DEFUN([AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI],
+     [AC_MSG_CHECKING(if tpacket_auxdata struct has tp_vlan_tci member)
+     AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1,
+ 	AC_TRY_COMPILE([
+@@ -1003,7 +1003,7 @@
+ dnl 
+ dnl 	HAVE_DLPI_PASSIVE (defined)
+ dnl
+-AC_DEFUN(AC_LBL_DL_PASSIVE_REQ_T,
++AC_DEFUN([AC_LBL_DL_PASSIVE_REQ_T],
+         [AC_MSG_CHECKING(if dl_passive_req_t struct exists)
+        AC_CACHE_VAL(ac_cv_lbl_has_dl_passive_req_t,
+                 AC_TRY_COMPILE([
diff --git a/meta/packages/libpcap/libpcap-1.0.0/ieee80215-arphrd.patch b/meta/packages/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch
index f29c7cb54..f29c7cb54 100644
--- a/meta/packages/libpcap/libpcap-1.0.0/ieee80215-arphrd.patch
+++ b/meta/packages/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch
diff --git a/meta/packages/libpcap/libpcap.inc b/meta/packages/libpcap/libpcap.inc
index d8f0b2561..2025d84c0 100644
--- a/meta/packages/libpcap/libpcap.inc
+++ b/meta/packages/libpcap/libpcap.inc
@@ -1,7 +1,10 @@
-DESCRIPTION = "Network Packet Capture Library"
+DESCRIPTION = "Libpcap is a tool to capture network packages on Unix/Linux platform"
 HOMEPAGE = "http://www.tcpdump.org/"
+BUGTRACKER = "http://sourceforge.net/tracker/?group_id=53067&atid=469577"
 SECTION = "libs/network"
 LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \
+                    file://pcap.h;beginline=1;endline=34;md5=8d6cf7e17d5745010d633e30bc529ea9"
 DEPENDS = "flex-native bison-native"
 
 SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz"
@@ -15,7 +18,7 @@ CFLAGS_prepend = "-I${S} "
 CXXFLAGS_prepend = "-I${S} "
 
 do_configure_prepend () {
-	if [ ! -e acinclude.m4 ]; then
-		cat aclocal.m4 > acinclude.m4
-	fi
+    if [ ! -e acinclude.m4 ]; then
+        cat aclocal.m4 > acinclude.m4
+    fi
 }
diff --git a/meta/packages/libpcap/libpcap_1.0.0.bb b/meta/packages/libpcap/libpcap_1.0.0.bb
deleted file mode 100644
index edd9706b1..000000000
--- a/meta/packages/libpcap/libpcap_1.0.0.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require libpcap.inc
-
-PR = "r0"
-
-SRC_URI += "file://config-fixes.patch;patch=1 \
-            file://aclocal.patch;patch=1 \
-            file://ieee80215-arphrd.patch;patch=1 \
-            file://ldflags.patch;patch=1"
-
-#
-# make install doesn't cover the shared lib
-# make install-shared is just broken (no symlinks)
-#
-do_install_prepend () {
-	install -d ${D}${libdir}
-	install -d ${D}${bindir}
-	oe_runmake install-shared DESTDIR=${D}
-	oe_libinstall -a -so libpcap ${D}${libdir}
-}
diff --git a/meta/packages/libpcap/libpcap_1.1.1.bb b/meta/packages/libpcap/libpcap_1.1.1.bb
new file mode 100644
index 000000000..58ab5e6c9
--- /dev/null
+++ b/meta/packages/libpcap/libpcap_1.1.1.bb
@@ -0,0 +1,17 @@
+require libpcap.inc
+
+PR = "r0"
+
+SRC_URI += "file://aclocal.patch \
+            file://ieee80215-arphrd.patch"
+
+#
+# make install doesn't cover the shared lib
+# make install-shared is just broken (no symlinks)
+#
+do_install_prepend () {
+    install -d ${D}${libdir}
+    install -d ${D}${bindir}
+    oe_runmake install-shared DESTDIR=${D}
+    oe_libinstall -a -so libpcap ${D}${libdir}
+}