Tcpdump repariert.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@385 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/common/tcpdump b/config/rootfiles/common/tcpdump
new file mode 100644 (file)
index 0000000..8a87a59
--- /dev/null
+++ b/config/rootfiles/common/tcpdump
@@ -0,0 +1,2 @@
+#usr/man/man1/tcpdump.1
+usr/sbin/tcpdump

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 8a439d8e1b9b2a17a239344650392586a8a87542..7afbc7a354dac14b310e880901c9da3687ab6dd8 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -223,6 +223,7 @@
 * sysvinit-2.86
 * tar-1.15.1
 * tcp_wrappers_7.6
+* tcpdump-3.8.3
 * texinfo-4.8
 * tftp-hpa-0.42
 * tiff-3.8.2

diff --git a/lfs/tcpdump b/lfs/tcpdump
index 94625d2797f8008b6073790343e818a26faa5dfd..cba9b1d4b0704c4af738c77b583dca992f81a54d 100644 (file)
--- a/lfs/tcpdump
+++ b/lfs/tcpdump
@@ -77,7 +77,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-bgp-dos-2.patch      #CAN 2005-1279
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-isis-dos.patch       #CAN 2005-1278
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/tcpdump-3.8.2-ldp-dos.patch        #CAN 2005-1279
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --disable-ipv6
+       cd $(DIR_APP) && sed -i -e 's/#define\ HAVE_PCAP_DEBUG\ 1/#undef\ HAVE_PCAP_DEBUG/' config.h
        cd $(DIR_APP) && make $(MAKETUNING) DEFS="-D_U_=\"\" -DHAVE_CONFIG_H"
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/make.sh b/make.sh
index b6e472074752caa9f3cb68ba0a81a0e245d2d080..045898b3e52fab46549cb53b1617f0f64d189491 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -444,7 +444,7 @@ buildipfire() {
   ipfiremake squid
   ipfiremake squid-graph
   ipfiremake squidguard
-#  ipfiremake tcpdump
+  ipfiremake tcpdump
   ipfiremake traceroute
   ipfiremake vlan
   ipfiremake wireless