X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Flibpcap;h=0fb62dc92a449b0c6728ab5fc414d8be3fe6d9b1;hb=cb1b213c5ccd2bc957b191a1eea50967ced7f4f7;hp=4d4ca7de8346bdc53351a7bb994e68ab80e8c9c6;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/libpcap b/lfs/libpcap
index 4d4ca7de83..0fb62dc92a 100644
--- a/lfs/libpcap
+++ b/lfs/libpcap
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2017  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.8.3
+VER        = 1.8.1
 
 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 = 56a9d4615d8354fcfe8cff8c8443c77b
+$(DL_FILE)_MD5 = 3d48f9cd171ff12b0efd9134b52f1447
 
 install : $(TARGET)
 
@@ -70,11 +72,12 @@ $(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) && patch -Np0 < $(DIR_SRC)/src/patches/libpcap-0.8.3-ppp.patch
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--enable-bluetooth=no \
+		--disable-dbus
+
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	cd $(DIR_APP) && cp -vf pcap-int.h /usr/include
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)