summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2010-06-30 10:31:47 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-01 14:13:07 +0100
commitd92a3c09f377d259547311e11910d539953533d8 (patch)
tree24dc4eb7329e4d2d19c0cf8d6ce45e26d4e751cd
parent64b82f8acd84a2e816b5474ff8fd5a4c4390c6a4 (diff)
downloadpoky-d92a3c09f377d259547311e11910d539953533d8.tar.gz
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>
-rw-r--r--meta/packages/libpcap/libpcap-1.0.0/config-fixes.patch16
-rw-r--r--meta/packages/libpcap/libpcap-1.0.0/ldflags.patch12
-rw-r--r--meta/packages/libpcap/libpcap-1.0.0/shared.patch116
-rw-r--r--meta/packages/libpcap/libpcap-1.1.1/aclocal.patch (renamed from meta/packages/libpcap/libpcap-1.0.0/aclocal.patch)103
-rw-r--r--meta/packages/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch (renamed from meta/packages/libpcap/libpcap-1.0.0/ieee80215-arphrd.patch)0
-rw-r--r--meta/packages/libpcap/libpcap.inc11
-rw-r--r--meta/packages/libpcap/libpcap_1.0.0.bb19
-rw-r--r--meta/packages/libpcap/libpcap_1.1.1.bb17
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 166816eb8f..0000000000
--- a/meta/packages/libpcap/libpcap-1.0.0/config-fixes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Fixes to enable building with latest autoconf and automake
2
3JL 09/02/10
4
5Index: libpcap-0.9.3/configure.in
6===================================================================
7--- libpcap-0.9.3.orig/configure.in 2005-07-07 07:56:03.000000000 +0100
8+++ libpcap-0.9.3/configure.in 2010-02-09 15:19:40.529662003 +0000
9@@ -11,6 +11,7 @@
10 AC_INIT(pcap.c)
11
12 AC_CANONICAL_SYSTEM
13+AC_PROG_CC
14
15 AC_LBL_C_INIT(V_CCOPT, V_INCLS, V_LIBS)
16 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 66ab5f725f..0000000000
--- a/meta/packages/libpcap/libpcap-1.0.0/ldflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1diff -urN libpcap-1.0.0.orig/Makefile.in libpcap-1.0.0/Makefile.in
2--- libpcap-1.0.0.orig/Makefile.in 2008-10-28 01:26:13.000000000 +0000
3+++ libpcap-1.0.0/Makefile.in 2009-04-02 13:54:20.000000000 +0000
4@@ -326,7 +326,7 @@
5 #
6 libpcap.so: $(OBJ)
7 @rm -f $@
8- $(CC) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS)
9+ $(CC) $(LDFLAGS) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS)
10
11 #
12 # 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 cbdb181633..0000000000
--- a/meta/packages/libpcap/libpcap-1.0.0/shared.patch
+++ /dev/null
@@ -1,116 +0,0 @@
1Patch currently not applied but would be better or worse than customised do_install?
2
3--- libpcap-0.9.3/Makefile.in~shared
4+++ libpcap-0.9.3/Makefile.in
5@@ -37,6 +37,15 @@
6 srcdir = @srcdir@
7 VPATH = @srcdir@
8
9+# some defines for shared library compilation - FIXME, if not matching
10+MAJ=0.9
11+MIN=3
12+VERSION=$(MAJ).$(MIN)
13+LIBNAME=pcap
14+LIBRARY=lib$(LIBNAME).a
15+SOLIBRARY=lib$(LIBNAME).so
16+SHAREDLIB=$(SOLIBRARY).$(VERSION)
17+
18 #
19 # You shouldn't need to edit anything below.
20 #
21@@ -50,6 +59,7 @@
22
23 # Standard CFLAGS
24 CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
25+CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ)
26
27 INSTALL = @INSTALL@
28 INSTALL_PROGRAM = @INSTALL_PROGRAM@
29@@ -70,6 +80,9 @@
30 .c.o:
31 @rm -f $@
32 $(CC) $(CFLAGS) -c $(srcdir)/$*.c
33+%_pic.o: %.c
34+ @rm -f $@
35+ $(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c
36
37 PSRC = pcap-@V_PCAP@.c
38 FSRC = fad-@V_FINDALLDEVS@.c
39@@ -84,6 +97,7 @@
40 # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
41 # hack the extra indirection
42 OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
43+OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=.o) $(CSRC:.c=_pic.o) $(GENSRC:.c=_pic.o)
44 HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
45 ethertype.h gencode.h gnuc.h
46 GENHDR = \
47@@ -95,15 +109,22 @@
48 TAGFILES = \
49 $(SRC) $(HDR) $(TAGHDR)
50
51-CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
52+CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so*
53
54-all: libpcap.a
55+all: libpcap.a $(SHAREDLIB)
56
57 libpcap.a: $(OBJ)
58 @rm -f $@
59 ar rc $@ $(OBJ) $(LIBS)
60 $(RANLIB) $@
61
62+$(SHAREDLIB): $(OBJ_PIC)
63+ -@rm -f $@
64+ -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ)
65+ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc
66+ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ)
67+ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY)
68+
69 shared: libpcap.$(DYEXT)
70
71 #
72@@ -129,6 +150,9 @@
73 scanner.o: scanner.c tokdefs.h
74 $(CC) $(CFLAGS) -c scanner.c
75
76+scanner_pic.o: scanner.c tokdefs.h
77+ $(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c
78+
79 pcap.o: version.h
80
81 tokdefs.h: grammar.c
82@@ -142,9 +166,16 @@
83 @rm -f $@
84 $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
85
86+grammer_pic.o: grammar.c
87+ @rm -f $@
88+ $(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c
89+
90 version.o: version.c
91 $(CC) $(CFLAGS) -c version.c
92
93+version_pic.o: version.c
94+ $(CC) -fPIC $(CFLAGS) -c version.c -o $@
95+
96 snprintf.o: $(srcdir)/missing/snprintf.c
97 $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
98
99@@ -170,11 +201,17 @@
100 bpf_filter.o: bpf_filter.c
101 $(CC) $(CFLAGS) -c bpf_filter.c
102
103+bpf_filter_pic.o: bpf_filter.c
104+ $(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@
105+
106 install: libpcap.a
107 [ -d $(DESTDIR)$(libdir) ] || \
108 (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
109 $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
110 $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
111+ $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/
112+ ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ)
113+ ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY)
114 [ -d $(DESTDIR)$(includedir) ] || \
115 (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
116 $(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 29cd275d58..71fd8b989b 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 @@
1diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4 1diff -ruN libpcap-1.1.1-orig/aclocal.m4 libpcap-1.1.1/aclocal.m4
2--- libpcap-0.9.7.orig/aclocal.m4 2007-09-16 01:19:51.000000000 +0200 2--- libpcap-1.1.1-orig/aclocal.m4 2010-06-29 10:46:32.815117569 +0800
3+++ libpcap-0.9.7/aclocal.m4 2007-09-16 02:45:52.000000000 +0200 3+++ libpcap-1.1.1/aclocal.m4 2010-06-29 10:49:17.150149949 +0800
4@@ -42,7 +42,7 @@ 4@@ -37,7 +37,7 @@
5 dnl AC_LBL_C_INIT. Now, we run AC_LBL_C_INIT_BEFORE_CC, AC_PROG_CC,
6 dnl and AC_LBL_C_INIT at the top level.
7 dnl
8-AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC,
9+AC_DEFUN([AC_LBL_C_INIT_BEFORE_CC],
10 [AC_PREREQ(2.50)
11 AC_BEFORE([$0], [AC_LBL_C_INIT])
12 AC_BEFORE([$0], [AC_PROG_CC])
13@@ -90,7 +90,7 @@
5 dnl ac_cv_lbl_gcc_vers 14 dnl ac_cv_lbl_gcc_vers
6 dnl LBL_CFLAGS 15 dnl LBL_CFLAGS
7 dnl 16 dnl
8-AC_DEFUN(AC_LBL_C_INIT, 17-AC_DEFUN(AC_LBL_C_INIT,
9+AC_DEFUN([AC_LBL_C_INIT], 18+AC_DEFUN([AC_LBL_C_INIT],
10 [AC_PREREQ(2.12) 19 [AC_PREREQ(2.50)
11 AC_BEFORE([$0], [AC_PROG_CC])
12 AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) 20 AC_BEFORE([$0], [AC_LBL_FIXINCLUDES])
13@@ -169,7 +169,7 @@ 21 AC_BEFORE([$0], [AC_LBL_DEVEL])
22@@ -217,7 +217,7 @@
23 dnl V_SONAME_OPT
24 dnl V_RPATH_OPT
25 dnl
26-AC_DEFUN(AC_LBL_SHLIBS_INIT,
27+AC_DEFUN([AC_LBL_SHLIBS_INIT],
28 [AC_PREREQ(2.50)
29 if test "$GCC" = yes ; then
30 #
31@@ -361,7 +361,7 @@
14 # Make sure we use the V_CCOPT flags, because some of those might 32 # Make sure we use the V_CCOPT flags, because some of those might
15 # disable inlining. 33 # disable inlining.
16 # 34 #
@@ -19,25 +37,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
19 [AC_MSG_CHECKING(for inline) 37 [AC_MSG_CHECKING(for inline)
20 save_CFLAGS="$CFLAGS" 38 save_CFLAGS="$CFLAGS"
21 CFLAGS="$V_CCOPT" 39 CFLAGS="$V_CCOPT"
22@@ -225,7 +225,7 @@ 40@@ -407,7 +407,7 @@
23 dnl LIBS
24 dnl LBL_LIBS
25 dnl
26-AC_DEFUN(AC_LBL_LIBPCAP,
27+AC_DEFUN([AC_LBL_LIBPCAP],
28 [AC_REQUIRE([AC_LBL_LIBRARY_NET])
29 dnl
30 dnl save a copy before locating libpcap.a
31@@ -293,7 +293,7 @@
32 dnl RETSIGTYPE (defined)
33 dnl RETSIGVAL (defined)
34 dnl
35-AC_DEFUN(AC_LBL_TYPE_SIGNAL,
36+AC_DEFUN([AC_LBL_TYPE_SIGNAL],
37 [AC_BEFORE([$0], [AC_LBL_LIBPCAP])
38 AC_TYPE_SIGNAL
39 if test "$ac_cv_type_signal" = void ; then
40@@ -323,7 +323,7 @@
41 dnl 41 dnl
42 dnl AC_LBL_FIXINCLUDES 42 dnl AC_LBL_FIXINCLUDES
43 dnl 43 dnl
@@ -46,7 +46,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
46 [if test "$GCC" = yes ; then 46 [if test "$GCC" = yes ; then
47 AC_MSG_CHECKING(for ANSI ioctl definitions) 47 AC_MSG_CHECKING(for ANSI ioctl definitions)
48 AC_CACHE_VAL(ac_cv_lbl_gcc_fixincludes, 48 AC_CACHE_VAL(ac_cv_lbl_gcc_fixincludes,
49@@ -369,7 +369,7 @@ 49@@ -453,7 +453,7 @@
50 dnl $2 (yacc appended) 50 dnl $2 (yacc appended)
51 dnl $3 (optional flex and bison -P prefix) 51 dnl $3 (optional flex and bison -P prefix)
52 dnl 52 dnl
@@ -55,7 +55,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
55 [AC_ARG_WITH(flex, [ --without-flex don't use flex]) 55 [AC_ARG_WITH(flex, [ --without-flex don't use flex])
56 AC_ARG_WITH(bison, [ --without-bison don't use bison]) 56 AC_ARG_WITH(bison, [ --without-bison don't use bison])
57 if test "$with_flex" = no ; then 57 if test "$with_flex" = no ; then
58@@ -422,7 +422,7 @@ 58@@ -506,7 +506,7 @@
59 dnl 59 dnl
60 dnl DECLWAITSTATUS (defined) 60 dnl DECLWAITSTATUS (defined)
61 dnl 61 dnl
@@ -64,16 +64,16 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
64 [AC_MSG_CHECKING(if union wait is used) 64 [AC_MSG_CHECKING(if union wait is used)
65 AC_CACHE_VAL(ac_cv_lbl_union_wait, 65 AC_CACHE_VAL(ac_cv_lbl_union_wait,
66 AC_TRY_COMPILE([ 66 AC_TRY_COMPILE([
67@@ -451,7 +451,7 @@ 67@@ -535,7 +535,7 @@
68 dnl 68 dnl
69 dnl HAVE_SOCKADDR_SA_LEN (defined) 69 dnl HAVE_SOCKADDR_SA_LEN (defined)
70 dnl 70 dnl
71-AC_DEFUN(AC_LBL_SOCKADDR_SA_LEN, 71-AC_DEFUN(AC_LBL_SOCKADDR_SA_LEN,
72+AC_DEFUN([AC_LBL_SOCKADDR_SA_LEN], 72+AC_DEFUN([AC_LBL_SOCKADDR_SA_LEN],
73 [AC_MSG_CHECKING(if sockaddr struct has sa_len member) 73 [AC_MSG_CHECKING(if sockaddr struct has the sa_len member)
74 AC_CACHE_VAL(ac_cv_lbl_sockaddr_has_sa_len, 74 AC_CACHE_VAL(ac_cv_lbl_sockaddr_has_sa_len,
75 AC_TRY_COMPILE([ 75 AC_TRY_COMPILE([
76@@ -476,7 +476,7 @@ 76@@ -560,7 +560,7 @@
77 dnl 77 dnl
78 dnl HAVE_SOCKADDR_STORAGE (defined) 78 dnl HAVE_SOCKADDR_STORAGE (defined)
79 dnl 79 dnl
@@ -82,7 +82,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
82 [AC_MSG_CHECKING(if sockaddr_storage struct exists) 82 [AC_MSG_CHECKING(if sockaddr_storage struct exists)
83 AC_CACHE_VAL(ac_cv_lbl_has_sockaddr_storage, 83 AC_CACHE_VAL(ac_cv_lbl_has_sockaddr_storage,
84 AC_TRY_COMPILE([ 84 AC_TRY_COMPILE([
85@@ -509,7 +509,7 @@ 85@@ -593,7 +593,7 @@
86 dnl won't be using code that would use that member, or we wouldn't 86 dnl won't be using code that would use that member, or we wouldn't
87 dnl compile in any case). 87 dnl compile in any case).
88 dnl 88 dnl
@@ -91,7 +91,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
91 [AC_MSG_CHECKING(if dl_hp_ppa_info_t struct has dl_module_id_1 member) 91 [AC_MSG_CHECKING(if dl_hp_ppa_info_t struct has dl_module_id_1 member)
92 AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1, 92 AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1,
93 AC_TRY_COMPILE([ 93 AC_TRY_COMPILE([
94@@ -535,7 +535,7 @@ 94@@ -619,7 +619,7 @@
95 dnl 95 dnl
96 dnl ac_cv_lbl_have_run_path (yes or no) 96 dnl ac_cv_lbl_have_run_path (yes or no)
97 dnl 97 dnl
@@ -100,16 +100,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
100 [AC_MSG_CHECKING(for ${CC-cc} -R) 100 [AC_MSG_CHECKING(for ${CC-cc} -R)
101 AC_CACHE_VAL(ac_cv_lbl_have_run_path, 101 AC_CACHE_VAL(ac_cv_lbl_have_run_path,
102 [echo 'main(){}' > conftest.c 102 [echo 'main(){}' > conftest.c
103@@ -561,7 +561,7 @@ 103@@ -644,7 +644,7 @@
104 dnl int32_t (defined)
105 dnl u_int32_t (defined)
106 dnl
107-AC_DEFUN(AC_LBL_CHECK_TYPE,
108+AC_DEFUN([AC_LBL_CHECK_TYPE],
109 [AC_MSG_CHECKING(for $1 using $CC)
110 AC_CACHE_VAL(ac_cv_lbl_have_$1,
111 AC_TRY_COMPILE([
112@@ -590,7 +590,7 @@
113 dnl 104 dnl
114 dnl LBL_ALIGN (DEFINED) 105 dnl LBL_ALIGN (DEFINED)
115 dnl 106 dnl
@@ -118,7 +109,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
118 [AC_MSG_CHECKING(if unaligned accesses fail) 109 [AC_MSG_CHECKING(if unaligned accesses fail)
119 AC_CACHE_VAL(ac_cv_lbl_unaligned_fail, 110 AC_CACHE_VAL(ac_cv_lbl_unaligned_fail,
120 [case "$host_cpu" in 111 [case "$host_cpu" in
121@@ -695,7 +695,7 @@ 112@@ -749,7 +749,7 @@
122 dnl HAVE_OS_PROTO_H (defined) 113 dnl HAVE_OS_PROTO_H (defined)
123 dnl os-proto.h (symlinked) 114 dnl os-proto.h (symlinked)
124 dnl 115 dnl
@@ -127,7 +118,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
127 [rm -f os-proto.h 118 [rm -f os-proto.h
128 if test "${LBL_CFLAGS+set}" = set; then 119 if test "${LBL_CFLAGS+set}" = set; then
129 $1="$$1 ${LBL_CFLAGS}" 120 $1="$$1 ${LBL_CFLAGS}"
130@@ -825,7 +825,7 @@ 121@@ -886,7 +886,7 @@
131 dnl statically and happen to have a libresolv.a lying around (and no 122 dnl statically and happen to have a libresolv.a lying around (and no
132 dnl libnsl.a). 123 dnl libnsl.a).
133 dnl 124 dnl
@@ -136,7 +127,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
136 # Most operating systems have gethostbyname() in the default searched 127 # Most operating systems have gethostbyname() in the default searched
137 # libraries (i.e. libc): 128 # libraries (i.e. libc):
138 # Some OSes (eg. Solaris) place it in libnsl 129 # Some OSes (eg. Solaris) place it in libnsl
139@@ -848,7 +848,7 @@ 130@@ -909,7 +909,7 @@
140 dnl Test for __attribute__ 131 dnl Test for __attribute__
141 dnl 132 dnl
142 133
@@ -145,7 +136,7 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
145 AC_MSG_CHECKING(for __attribute__) 136 AC_MSG_CHECKING(for __attribute__)
146 AC_CACHE_VAL(ac_cv___attribute__, [ 137 AC_CACHE_VAL(ac_cv___attribute__, [
147 AC_COMPILE_IFELSE( 138 AC_COMPILE_IFELSE(
148@@ -886,7 +886,7 @@ 139@@ -947,7 +947,7 @@
149 dnl 140 dnl
150 dnl -Scott Barron 141 dnl -Scott Barron
151 dnl 142 dnl
@@ -154,3 +145,21 @@ diff -Naru libpcap-0.9.7.orig/aclocal.m4 libpcap-0.9.7/acinclude.m4
154 [AC_MSG_CHECKING(if if_packet.h has tpacket_stats defined) 145 [AC_MSG_CHECKING(if if_packet.h has tpacket_stats defined)
155 AC_CACHE_VAL(ac_cv_lbl_tpacket_stats, 146 AC_CACHE_VAL(ac_cv_lbl_tpacket_stats,
156 AC_TRY_COMPILE([ 147 AC_TRY_COMPILE([
148@@ -976,7 +976,7 @@
149 dnl doesn't have that member (which is OK, as either we won't be using
150 dnl code that would use that member, or we wouldn't compile in any case).
151 dnl
152-AC_DEFUN(AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI,
153+AC_DEFUN([AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI],
154 [AC_MSG_CHECKING(if tpacket_auxdata struct has tp_vlan_tci member)
155 AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1,
156 AC_TRY_COMPILE([
157@@ -1003,7 +1003,7 @@
158 dnl
159 dnl HAVE_DLPI_PASSIVE (defined)
160 dnl
161-AC_DEFUN(AC_LBL_DL_PASSIVE_REQ_T,
162+AC_DEFUN([AC_LBL_DL_PASSIVE_REQ_T],
163 [AC_MSG_CHECKING(if dl_passive_req_t struct exists)
164 AC_CACHE_VAL(ac_cv_lbl_has_dl_passive_req_t,
165 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 f29c7cb54c..f29c7cb54c 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 d8f0b2561c..2025d84c0d 100644
--- a/meta/packages/libpcap/libpcap.inc
+++ b/meta/packages/libpcap/libpcap.inc
@@ -1,7 +1,10 @@
1DESCRIPTION = "Network Packet Capture Library" 1DESCRIPTION = "Libpcap is a tool to capture network packages on Unix/Linux platform"
2HOMEPAGE = "http://www.tcpdump.org/" 2HOMEPAGE = "http://www.tcpdump.org/"
3BUGTRACKER = "http://sourceforge.net/tracker/?group_id=53067&atid=469577"
3SECTION = "libs/network" 4SECTION = "libs/network"
4LICENSE = "BSD" 5LICENSE = "BSD"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \
7 file://pcap.h;beginline=1;endline=34;md5=8d6cf7e17d5745010d633e30bc529ea9"
5DEPENDS = "flex-native bison-native" 8DEPENDS = "flex-native bison-native"
6 9
7SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz" 10SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz"
@@ -15,7 +18,7 @@ CFLAGS_prepend = "-I${S} "
15CXXFLAGS_prepend = "-I${S} " 18CXXFLAGS_prepend = "-I${S} "
16 19
17do_configure_prepend () { 20do_configure_prepend () {
18 if [ ! -e acinclude.m4 ]; then 21 if [ ! -e acinclude.m4 ]; then
19 cat aclocal.m4 > acinclude.m4 22 cat aclocal.m4 > acinclude.m4
20 fi 23 fi
21} 24}
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 edd9706b1e..0000000000
--- a/meta/packages/libpcap/libpcap_1.0.0.bb
+++ /dev/null
@@ -1,19 +0,0 @@
1require libpcap.inc
2
3PR = "r0"
4
5SRC_URI += "file://config-fixes.patch;patch=1 \
6 file://aclocal.patch;patch=1 \
7 file://ieee80215-arphrd.patch;patch=1 \
8 file://ldflags.patch;patch=1"
9
10#
11# make install doesn't cover the shared lib
12# make install-shared is just broken (no symlinks)
13#
14do_install_prepend () {
15 install -d ${D}${libdir}
16 install -d ${D}${bindir}
17 oe_runmake install-shared DESTDIR=${D}
18 oe_libinstall -a -so libpcap ${D}${libdir}
19}
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 0000000000..58ab5e6c95
--- /dev/null
+++ b/meta/packages/libpcap/libpcap_1.1.1.bb
@@ -0,0 +1,17 @@
1require libpcap.inc
2
3PR = "r0"
4
5SRC_URI += "file://aclocal.patch \
6 file://ieee80215-arphrd.patch"
7
8#
9# make install doesn't cover the shared lib
10# make install-shared is just broken (no symlinks)
11#
12do_install_prepend () {
13 install -d ${D}${libdir}
14 install -d ${D}${bindir}
15 oe_runmake install-shared DESTDIR=${D}
16 oe_libinstall -a -so libpcap ${D}${libdir}
17}