From 172c8a4075bf4e5ca5241d10f869edade345219a Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Mon, 6 Apr 2009 14:30:30 +0200 Subject: [PATCH] Updated libpcap to Version 1.0.0 --- config/rootfiles/common/libpcap | 77 ++++++++++++++++++++++++++++++--- doc/packages-list.txt | 8 ++-- lfs/libpcap | 8 ++-- 3 files changed, 78 insertions(+), 15 deletions(-) diff --git a/config/rootfiles/common/libpcap b/config/rootfiles/common/libpcap index ebd0a58e90..138e41feaf 100644 --- a/config/rootfiles/common/libpcap +++ b/config/rootfiles/common/libpcap @@ -1,10 +1,75 @@ +usr/bin/pcap-config +#usr/include/pcap #usr/include/pcap-bpf.h #usr/include/pcap-int.h #usr/include/pcap-namedb.h #usr/include/pcap.h -#usr/lib/libpcap.a -usr/lib/libpcap.so -usr/lib/libpcap.so.0 -usr/lib/libpcap.so.0.8 -usr/lib/libpcap.so.0.8.3 -#usr/man/man3/pcap.3 +#usr/include/pcap/bpf.h +#usr/include/pcap/namedb.h +#usr/include/pcap/pcap.h +#usr/include/pcap/sll.h +#usr/include/pcap/usb.h +usr/lib/libpcap.a +#usr/share/man/man1/pcap-config.1 +#usr/share/man/man3/pcap.3pcap +#usr/share/man/man3/pcap_activate.3pcap +#usr/share/man/man3/pcap_breakloop.3pcap +#usr/share/man/man3/pcap_can_set_rfmon.3pcap +#usr/share/man/man3/pcap_close.3pcap +#usr/share/man/man3/pcap_compile.3pcap +#usr/share/man/man3/pcap_create.3pcap +#usr/share/man/man3/pcap_datalink.3pcap +#usr/share/man/man3/pcap_datalink_name_to_val.3pcap +#usr/share/man/man3/pcap_datalink_val_to_description.3pcap +#usr/share/man/man3/pcap_datalink_val_to_name.3pcap +#usr/share/man/man3/pcap_dispatch.3pcap +#usr/share/man/man3/pcap_dump.3pcap +#usr/share/man/man3/pcap_dump_close.3pcap +#usr/share/man/man3/pcap_dump_file.3pcap +#usr/share/man/man3/pcap_dump_flush.3pcap +#usr/share/man/man3/pcap_dump_fopen.3pcap +#usr/share/man/man3/pcap_dump_ftell.3pcap +#usr/share/man/man3/pcap_dump_open.3pcap +#usr/share/man/man3/pcap_file.3pcap +#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_free_datalinks.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_geterr.3pcap +#usr/share/man/man3/pcap_getnonblock.3pcap +#usr/share/man/man3/pcap_inject.3pcap +#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_lookupdev.3pcap +#usr/share/man/man3/pcap_lookupnet.3pcap +#usr/share/man/man3/pcap_loop.3pcap +#usr/share/man/man3/pcap_major_version.3pcap +#usr/share/man/man3/pcap_minor_version.3pcap +#usr/share/man/man3/pcap_next.3pcap +#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_live.3pcap +#usr/share/man/man3/pcap_open_offline.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_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_setdirection.3pcap +#usr/share/man/man3/pcap_setfilter.3pcap +#usr/share/man/man3/pcap_setnonblock.3pcap +#usr/share/man/man3/pcap_snapshot.3pcap +#usr/share/man/man3/pcap_stats.3pcap +#usr/share/man/man3/pcap_statustostr.3pcap +#usr/share/man/man3/pcap_strerror.3pcap +#usr/share/man/man5/pcap-savefile.5 +#usr/share/man/man7/pcap-filter.7 +#usr/share/man/man7/pcap-linktype.7 diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 080b547de5..cdb1d69aec 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -161,7 +161,7 @@ * libmad-0.15.1b * libnet-1.1.2.1 * libogg-1.1.3 -* libpcap-0.8.3 +* libpcap-1.0.0 * libpng-1.2.12 * libpri-1.4.1 * libsafe_2.0-16 @@ -185,7 +185,6 @@ * lynis-1.2.3 * lzo-2.02 * m4-1.4.4 -* mISDNuser-1_1_9 * mISDNuser.git-f69adb52764c392135800f9a87c9018f9f268139 * madwifi-hal-0.10.5.6-r3942-20090205-kmod-2.6.27.21 * make-3.81 @@ -219,7 +218,7 @@ * netpbm-10.26.46 * newt-0.51.6 * nfs-utils-1.1.1 -* nmap-4.03 +* nmap-4.76 * noip_updater_v1.6 * ntfs-3g-2009.2.1 * ntp-4.2.2 @@ -259,7 +258,6 @@ * rssdler-0.4.0a * rsync-3.0.4 * rtorrent-0.8.4 -* samba-3.3.2 * samba-3.3.3 * sane-1.0.19 * screen-4.0.3 @@ -306,7 +304,7 @@ * urlgrabber-3.1.0 * usbutils-0.72 * util-linux-2.12r -* v4l-dvb-b386f0d3baaf-kmod-2.6.27.21 +* v4l-dvb-4cd17f5a20cc-kmod-2.6.27.21 * vdr-1.6.0 * vdradmin-am-3.6.4 * vim-7.0 diff --git a/lfs/libpcap b/lfs/libpcap index 4d4ca7de83..cdfa46bece 100644 --- a/lfs/libpcap +++ b/lfs/libpcap @@ -24,7 +24,7 @@ include Config -VER = 0.8.3 +VER = 1.0.0 THISAPP = libpcap-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 56a9d4615d8354fcfe8cff8c8443c77b +$(DL_FILE)_MD5 = 9ad1358c5dec48456405eac197a46d3d install : $(TARGET) @@ -70,8 +70,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) && patch -Np0 < $(DIR_SRC)/src/patches/libpcap-0.8.3-ppp.patch +# 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) && make install -- 2.39.2