From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 12 Jun 2014 14:55:29 +0000 (+0200)
Subject: libpcap: Update to 1.4.0.
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=7c56112cf4014e2b4c887e48301dfb68df48bd68

libpcap: Update to 1.4.0.
---

diff --git a/config/rootfiles/common/libpcap b/config/rootfiles/common/libpcap
index 0fc7c0090..e300c9bb5 100644
--- a/config/rootfiles/common/libpcap
+++ b/config/rootfiles/common/libpcap
@@ -1,7 +1,9 @@
 #usr/bin/pcap-config
 #usr/include/pcap
+#usr/include/pcap/bluetooth.h
 #usr/include/pcap-bpf.h
 #usr/include/pcap-int.h
+#usr/include/pcap/ipnet.h
 #usr/include/pcap-namedb.h
 #usr/include/pcap.h
 #usr/include/pcap/bpf.h
@@ -9,11 +11,12 @@
 #usr/include/pcap/pcap.h
 #usr/include/pcap/sll.h
 #usr/include/pcap/usb.h
+#usr/include/pcap/vlan.h
 #usr/lib/libpcap.a
 usr/lib/libpcap.so
 usr/lib/libpcap.so.1
 usr/lib/libpcap.so.1.0
-usr/lib/libpcap.so.1.0.0
+usr/lib/libpcap.so.1.4.0
 #usr/share/man/man1/pcap-config.1
 #usr/share/man/man3/pcap.3pcap
 #usr/share/man/man3/pcap_activate.3pcap
@@ -39,6 +42,7 @@ usr/lib/libpcap.so.1.0.0
 #usr/share/man/man3/pcap_findalldevs.3pcap
 #usr/share/man/man3/pcap_fopen_offline.3pcap
 #usr/share/man/man3/pcap_free_datalinks.3pcap
+#usr/share/man/man3/pcap_free_tstamp_types.3pcap
 #usr/share/man/man3/pcap_freealldevs.3pcap
 #usr/share/man/man3/pcap_freecode.3pcap
 #usr/share/man/man3/pcap_get_selectable_fd.3pcap
@@ -48,6 +52,7 @@ usr/lib/libpcap.so.1.0.0
 #usr/share/man/man3/pcap_is_swapped.3pcap
 #usr/share/man/man3/pcap_lib_version.3pcap
 #usr/share/man/man3/pcap_list_datalinks.3pcap
+#usr/share/man/man3/pcap_list_tstamp_types.3pcap
 #usr/share/man/man3/pcap_lookupdev.3pcap
 #usr/share/man/man3/pcap_lookupnet.3pcap
 #usr/share/man/man3/pcap_loop.3pcap
@@ -67,6 +72,7 @@ usr/lib/libpcap.so.1.0.0
 #usr/share/man/man3/pcap_set_rfmon.3pcap
 #usr/share/man/man3/pcap_set_snaplen.3pcap
 #usr/share/man/man3/pcap_set_timeout.3pcap
+#usr/share/man/man3/pcap_set_tstamp_type.3pcap
 #usr/share/man/man3/pcap_setdirection.3pcap
 #usr/share/man/man3/pcap_setfilter.3pcap
 #usr/share/man/man3/pcap_setnonblock.3pcap
@@ -74,6 +80,9 @@ usr/lib/libpcap.so.1.0.0
 #usr/share/man/man3/pcap_stats.3pcap
 #usr/share/man/man3/pcap_statustostr.3pcap
 #usr/share/man/man3/pcap_strerror.3pcap
+#usr/share/man/man3/pcap_tstamp_type_name_to_val.3pcap
+#usr/share/man/man3/pcap_tstamp_type_val_to_name.3pcap
 #usr/share/man/man5/pcap-savefile.5
 #usr/share/man/man7/pcap-filter.7
 #usr/share/man/man7/pcap-linktype.7
+#usr/share/man/man7/pcap-tstamp.7
diff --git a/config/rootfiles/core/79/filelists/libpcap b/config/rootfiles/core/79/filelists/libpcap
new file mode 120000
index 000000000..c7f9f52a8
--- /dev/null
+++ b/config/rootfiles/core/79/filelists/libpcap
@@ -0,0 +1 @@
+../../../common/libpcap
\ No newline at end of file
diff --git a/lfs/libpcap b/lfs/libpcap
index c6fdc2ef0..0f118a428 100644
--- a/lfs/libpcap
+++ b/lfs/libpcap
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.0
+VER        = 1.4.0
 
 THISAPP    = libpcap-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,6 +32,8 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+CFLAGS    += -fno-strict-aliasing
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9ad1358c5dec48456405eac197a46d3d
+$(DL_FILE)_MD5 = 56e88a5aabdd1e04414985ac24f7e76c
 
 install : $(TARGET)
 
@@ -70,15 +72,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libpcap-0.8.3-shared.patch
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
-	cd $(DIR_APP) && make
-	cd $(DIR_APP) && make shared
+	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	cd $(DIR_APP) && make install-shared-so
-	ln -svf libpcap.so.1.0.0 /usr/lib/libpcap.so.1.0
-	ln -svf libpcap.so.1.0 /usr/lib/libpcap.so.1
-	ln -svf libpcap.so.1 /usr/lib/libpcap.so	
-	cd $(DIR_APP) && cp -vf pcap-int.h /usr/include
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)