[libpcap] version bump 1.0.0 -> 1.1.1

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

6 files changed, 88 insertions, 133 deletions

diff --git a/patches/libpcap-1.0.0/0003-creakte-hardlinks-with-force-during-install.patch b/patches/libpcap-1.0.0/0003-creakte-hardlinks-with-force-during-install.patch
deleted file mode 100644
index e292fe7a5..000000000
--- a/patches/libpcap-1.0.0/0003-creakte-hardlinks-with-force-during-install.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 14c3a49996ec9ba0d92b86e441024a1960557b66 Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Sun, 10 Jan 2010 00:47:38 +0100
-Subject: [PATCH 3/4] creakte hardlinks with force during install
-
-Without this patch a repeated "make install" fails,
-because the destination of the links already exists from the
-previous "make install".
-
-This patch add the "-f" parameter to "ln" to remove the link destination
-in order to overwrite it.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- Makefile.in |   18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index d8d12b3..46ef86a 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -454,23 +454,23 @@ install: libpcap.a pcap-config
- 	for i in $(MAN3PCAP); do \
- 		$(INSTALL_DATA) $(srcdir)/$$i \
- 		    $(DESTDIR)$(mandir)/man3/$$i; done
--	ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \
-+	ln -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \
- 		 $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \
-+	ln -f $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \
- 		 $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \
-+	ln -f $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \
- 		 $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \
-+	ln -f $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \
- 		 $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \
-+	ln -f $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \
- 		 $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \
-+	ln -f $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \
- 		 $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \
-+	ln -f $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \
- 		 $(DESTDIR)$(mandir)/man3/pcap_next.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \
-+	ln -f $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \
- 		 $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap
--	ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \
-+	ln -f $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \
- 		 $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
- 	for i in $(MANFILE); do \
- 		$(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manfile.in/.manfile/'` \
--- 
-1.6.6
-
diff --git a/patches/libpcap-1.0.0/0004-pcap-config-add-SYSROOT-support.patch b/patches/libpcap-1.0.0/0004-pcap-config-add-SYSROOT-support.patch
deleted file mode 100644
index 33c90b15d..000000000
--- a/patches/libpcap-1.0.0/0004-pcap-config-add-SYSROOT-support.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e41188c0eb0cbd906c4c649ea2f13de2d57b79ee Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Sun, 10 Jan 2010 00:49:07 +0100
-Subject: [PATCH 4/4] pcap-config: add SYSROOT support
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- pcap-config.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pcap-config.in b/pcap-config.in
-index 19f2114..2a127f4 100644
---- a/pcap-config.in
-+++ b/pcap-config.in
-@@ -7,10 +7,10 @@
- case "$1" in
- 
- --cflags)
--	echo "-I @includedir@"
-+	echo "-I ${SYSROOT}@includedir@"
- 	;;
- 
- --libs)
--	echo "-L @libdir@ -lpcap @DEPLIBS@"
-+	echo "-L ${SYSROOT}@libdir@ -lpcap @DEPLIBS@"
- 	;;
- esac
--- 
-1.6.6
-
diff --git a/patches/libpcap-1.0.0/0001-add-CFLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch b/patches/libpcap-1.1.1/0001-add-CFLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch
index 58a66bef4..25e5c9d38 100644
--- a/patches/libpcap-1.0.0/0001-add-CFLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch
+++ b/patches/libpcap-1.1.1/0001-add-CFLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch
@@ -4,19 +4,19 @@ Date: Sun, 10 Jan 2010 00:47:38 +0100
 Subject: [PATCH 1/4] add CFLAGS, CPPFLAGS and LDFLAGS to Makefile.in
 
 the build system is autoconf but not automake :(
-It doesn't care about CFLAGS, CPPFLAGS or LDFLAGS from outside.
+It doesn't care about CFLAGS or CPPFLAGS from outside.
 This patch adds them.
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- Makefile.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ Makefile.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/Makefile.in b/Makefile.in
-index 5c4d679..0551ae5 100644
+Index: b/Makefile.in
+===================================================================
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -55,7 +55,7 @@ DYEXT = @DYEXT@
+@@ -58,7 +58,7 @@ V_RPATH_OPT = @V_RPATH_OPT@
  PROG=libpcap
  
  # Standard CFLAGS
@@ -25,15 +25,3 @@ index 5c4d679..0551ae5 100644
  
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -326,7 +326,7 @@ shared: libpcap.$(DYEXT)
- #
- 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.
--- 
-1.6.6
-
diff --git a/patches/libpcap-1.0.0/0002-compile-static-lib-without-fPIC.patch b/patches/libpcap-1.1.1/0002-compile-static-lib-without-fPIC.patch
index 31dda3be6..d417732bd 100644
--- a/patches/libpcap-1.0.0/0002-compile-static-lib-without-fPIC.patch
+++ b/patches/libpcap-1.1.1/0002-compile-static-lib-without-fPIC.patch
@@ -6,13 +6,13 @@ Subject: [PATCH 2/4] compile static lib without -fPIC
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
  Makefile.in |   26 ++++++++++++++------------
- 1 files changed, 14 insertions(+), 12 deletions(-)
+ 1 file changed, 14 insertions(+), 12 deletions(-)
 
-diff --git a/Makefile.in b/Makefile.in
-index 0551ae5..d8d12b3 100644
+Index: b/Makefile.in
+===================================================================
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -73,9 +73,13 @@ YACC = @V_YACC@
+@@ -76,9 +76,13 @@ YACC = @V_YACC@
  # Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
  # Also, gcc does not remove the .o before forking 'as', which can be a
  # problem if you don't own the file but can write to the directory.
@@ -26,46 +26,49 @@ index 0551ae5..d8d12b3 100644
 +	@rm -f $@
 +	$(CC) $(CFLAGS) -c $(srcdir)/$*.c -o $@
  
- PSRC =	pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@
+ PSRC =	pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @CAN_SRC@
  FSRC =  fad-@V_FINDALLDEVS@.c
-@@ -90,6 +94,7 @@ SRC =	$(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC)
+@@ -94,6 +98,7 @@ SRC =	$(PSRC) $(FSRC) $(CSRC) $(SSRC) $(
  # 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)
 +DOBJ =	$(PSRC:.c=.do) $(FSRC:.c=.do) $(CSRC:.c=.do) $(SSRC:.c=.do) $(GENSRC:.c=.do) $(LIBOBJS:.o=.do)
- HDR = \
- 	acconfig.h \
- 	arcnet.h \
-@@ -122,7 +127,7 @@ TAGHDR = \
+ PUBHDR = \
+ 	pcap.h \
+ 	pcap-bpf.h \
+@@ -129,7 +134,7 @@ GENHDR = \
  TAGFILES = \
- 	$(SRC) $(HDR) $(TAGHDR)
+ 	$(SRC) $(HDR)
  
--CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
-+CLEANFILES = $(OBJ) $(DOBJ) libpcap.a libpcap.$(DYEXT) $(GENSRC) $(GENHDR) lex.yy.c
+-CLEANFILES = $(OBJ) libpcap.* filtertest findalldevstest selpolltest \
++CLEANFILES = $(OBJ) $(DOBJ) libpcap.* filtertest findalldevstest selpolltest \
+ 	opentest $(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \
+ 	lex.yy.c pcap-config
  
- MAN1 = pcap-config.1
+@@ -333,12 +338,12 @@ libpcap.a: $(OBJ)
+ 
+ shared: libpcap.$(DYEXT)
  
-@@ -324,9 +329,9 @@ shared: libpcap.$(DYEXT)
- # XXX - this works with GNU ld, but won't necessarily work with native
- # ld on, for example, various SVR4-flavored platforms, or Digital UNIX.
- #
 -libpcap.so: $(OBJ)
 +libpcap.so: $(DOBJ)
  	@rm -f $@
--	$(CC) $(LDFLAGS) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS)
-+	$(CC) $(LDFLAGS) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(DOBJ) $(DAGLIBS)
+ 	VER=`cat $(srcdir)/VERSION`; \
+ 	MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
+ 	@V_SHLIB_CMD@ @V_SHLIB_OPT@ @V_SONAME_OPT@$@.$$MAJOR_VER $(LDFLAGS) \
+-	    -o $@.$$VER $(OBJ) $(ADDLOBJS) $(LIBS)
++	    -o $@.$$VER $(DOBJ) $(ADDLOBJS) $(LIBS)
  
  #
  # The following rule succeeds, but the result is untested.
-@@ -349,7 +354,6 @@ scanner.c: $(srcdir)/scanner.l
- 	./runlex.sh $(LEX) -o$@ $<
+@@ -414,7 +419,6 @@ scanner.c: $(srcdir)/scanner.l
+ 	$(srcdir)/runlex.sh $(LEX) -o$@ $<
  
  scanner.o: scanner.c tokdefs.h
 -	$(CC) $(CFLAGS) -c scanner.c
  
  pcap.o: version.h
  
-@@ -362,10 +366,11 @@ grammar.c: $(srcdir)/grammar.y
+@@ -427,10 +431,11 @@ grammar.c: $(srcdir)/grammar.y
  
  grammar.o: grammar.c
  	@rm -f $@
@@ -80,7 +83,7 @@ index 0551ae5..d8d12b3 100644
  
  snprintf.o: $(srcdir)/missing/snprintf.c
  	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
-@@ -389,9 +394,6 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filter.c
+@@ -466,9 +471,6 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
  	rm -f bpf_filter.c
  	ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c
  
@@ -90,6 +93,3 @@ index 0551ae5..d8d12b3 100644
  #
  # Generate the pcap-config script.
  #
--- 
-1.6.6
-
diff --git a/patches/libpcap-1.1.1/0004-pcap-config-add-SYSROOT-support.patch b/patches/libpcap-1.1.1/0004-pcap-config-add-SYSROOT-support.patch
new file mode 100644
index 000000000..457a7aa41
--- /dev/null
+++ b/patches/libpcap-1.1.1/0004-pcap-config-add-SYSROOT-support.patch
@@ -0,0 +1,55 @@
+From e41188c0eb0cbd906c4c649ea2f13de2d57b79ee Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sun, 10 Jan 2010 00:49:07 +0100
+Subject: [PATCH 4/4] pcap-config: add SYSROOT support
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ pcap-config.in |   16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+Index: b/pcap-config.in
+===================================================================
+--- a/pcap-config.in
++++ b/pcap-config.in
+@@ -47,16 +47,16 @@ then
+ 	#
+ 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
+ 	then
+-		echo "-I@includedir@ -L@libdir@ -lpcap @LIBS@"
++		echo "-I${SYSROOT}@includedir@ -L${SYSROOT}@libdir@ -lpcap @LIBS@"
+ 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
+ 	then
+-		echo "-I@includedir@ -L@libdir@ @LIBS@"
++		echo "-I${SYSROOT}@includedir@ -L${SYSROOT}@libdir@ @LIBS@"
+ 	elif [ "$show_cflags" = 1 ]
+ 	then
+-		echo "-I@includedir@"
++		echo "-I${SYSROOT}@includedir@"
+ 	elif [ "$show_libs" = 1 ]
+ 	then
+-		echo "-L@libdir@ -lpcap @LIBS@"
++		echo "-L${SYSROOT}@libdir@ -lpcap @LIBS@"
+ 	elif [ "$show_additional_libs" = 1 ]
+ 	then
+ 		echo "@LIBS@"
+@@ -68,15 +68,15 @@ else
+ 	#
+ 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
+ 	then
+-		echo "-I@includedir@ -L@libdir@ $RPATH -lpcap"
++		echo "-I${SYSROOT}@includedir@ -L${SYSROOT}@libdir@ $RPATH -lpcap"
+ 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
+ 	then
+-		echo "-I@includedir@"
++		echo "-I${SYSROOT}@includedir@"
+ 	elif [ "$show_cflags" = 1 ]
+ 	then
+-		echo "-I@includedir@"
++		echo "-I${SYSROOT}@includedir@"
+ 	elif [ "$show_libs" = 1 ]
+ 	then
+-		echo "-L@libdir@ $RPATH -lpcap"
++		echo "-L:{SYSROOT}@libdir@ $RPATH -lpcap"
+ 	fi
+ fi
diff --git a/patches/libpcap-1.0.0/series b/patches/libpcap-1.1.1/series
index 842b18030..5e6f782dd 100644
--- a/patches/libpcap-1.0.0/series
+++ b/patches/libpcap-1.1.1/series
@@ -1,4 +1,3 @@
 0001-add-CFLAGS-CPPFLAGS-and-LDFLAGS-to-Makefile.in.patch
 0002-compile-static-lib-without-fPIC.patch
-0003-creakte-hardlinks-with-force-during-install.patch
 0004-pcap-config-add-SYSROOT-support.patch