diff --git a/config/rootfiles/common/libpcap b/config/rootfiles/common/libpcap index 52169a74a..b8e96489c 100644 --- a/config/rootfiles/common/libpcap +++ b/config/rootfiles/common/libpcap @@ -1,13 +1,13 @@ #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/bluetooth.h #usr/include/pcap/bpf.h +#usr/include/pcap/ipnet.h #usr/include/pcap/namedb.h +#usr/include/pcap/nflog.h #usr/include/pcap/pcap.h #usr/include/pcap/sll.h #usr/include/pcap/usb.h @@ -15,7 +15,7 @@ #usr/lib/libpcap.a usr/lib/libpcap.so usr/lib/libpcap.so.1 -usr/lib/libpcap.so.1.4.0 +usr/lib/libpcap.so.1.6.2 #usr/share/man/man1/pcap-config.1 #usr/share/man/man3/pcap.3pcap #usr/share/man/man3/pcap_activate.3pcap @@ -40,11 +40,13 @@ usr/lib/libpcap.so.1.4.0 #usr/share/man/man3/pcap_fileno.3pcap #usr/share/man/man3/pcap_findalldevs.3pcap #usr/share/man/man3/pcap_fopen_offline.3pcap +#usr/share/man/man3/pcap_fopen_offline_with_tstamp_precision.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 +#usr/share/man/man3/pcap_get_tstamp_precision.3pcap #usr/share/man/man3/pcap_geterr.3pcap #usr/share/man/man3/pcap_getnonblock.3pcap #usr/share/man/man3/pcap_inject.3pcap @@ -61,16 +63,20 @@ usr/lib/libpcap.so.1.4.0 #usr/share/man/man3/pcap_next_ex.3pcap #usr/share/man/man3/pcap_offline_filter.3pcap #usr/share/man/man3/pcap_open_dead.3pcap +#usr/share/man/man3/pcap_open_dead_with_tstamp_precision.3pcap #usr/share/man/man3/pcap_open_live.3pcap #usr/share/man/man3/pcap_open_offline.3pcap +#usr/share/man/man3/pcap_open_offline_with_tstamp_precision.3pcap #usr/share/man/man3/pcap_perror.3pcap #usr/share/man/man3/pcap_sendpacket.3pcap #usr/share/man/man3/pcap_set_buffer_size.3pcap #usr/share/man/man3/pcap_set_datalink.3pcap +#usr/share/man/man3/pcap_set_immediate_mode.3pcap #usr/share/man/man3/pcap_set_promisc.3pcap #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_precision.3pcap #usr/share/man/man3/pcap_set_tstamp_type.3pcap #usr/share/man/man3/pcap_setdirection.3pcap #usr/share/man/man3/pcap_setfilter.3pcap @@ -80,6 +86,7 @@ usr/lib/libpcap.so.1.4.0 #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_description.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 diff --git a/lfs/libpcap b/lfs/libpcap index 0f118a428..07e65cd20 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) 2014 Michael Tremer & Christian Schmidt # # # # 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 = 1.4.0 +VER = 1.6.2 THISAPP = libpcap-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 56e88a5aabdd1e04414985ac24f7e76c +$(DL_FILE)_MD5 = 5f14191c1a684a75532c739c2c4059fa install : $(TARGET) @@ -72,7 +72,10 @@ $(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) && ./configure --prefix=/usr + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-bluetooth=no + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP)