Revision: 6143
http://ipcop.svn.sourceforge.net/ipcop/?rev=6143&view=rev
Author: owes
Date: 2011-11-30 12:52:19 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Upgrade tcpdump to 4.2.0
Modified Paths:
--------------
ipcop/trunk/lfs/tcpdump
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
ipcop/trunk/updates/2.0.3/information.xml
Added Paths:
-----------
ipcop/trunk/src/patches/tcpdump-4.2.0_add-missing-ppi.h.patch
Modified: ipcop/trunk/lfs/tcpdump
===================================================================
--- ipcop/trunk/lfs/tcpdump 2011-11-30 12:41:59 UTC (rev 6142)
+++ ipcop/trunk/lfs/tcpdump 2011-11-30 12:52:19 UTC (rev 6143)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = tcpdump
-VER = 4.1.1
+VER = 4.2.0
HOST_ARCH = all
OTHER_SRC = yes
@@ -53,7 +53,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d0dd58bbd6cd36795e05c6f1f74420b0
+$(DL_FILE)_MD5 = 0296d4c487c3a156879783643704bd39
install : $(TARGET)
@@ -83,6 +83,7 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/$(THISAPP)_add-missing-ppi.h.patch
# force ipv6 as autodetection could fail (at least on centos-5.5 2.6.18
kernel)
cd $(DIR_APP) && ./configure --prefix=/usr --disable-smb
--enable-ipv6
cd $(DIR_APP) && make -j $(PARALLELISM)
@@ -91,6 +92,8 @@
#-cd $(DIR_APP) && make check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
endif
cd $(DIR_APP) && make install
+ # Probably a fluke in Makefile, but we do not need tcpdump.VERSION
+ rm -f /usr/sbin/tcpdump.$(VER)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Added: ipcop/trunk/src/patches/tcpdump-4.2.0_add-missing-ppi.h.patch
===================================================================
--- ipcop/trunk/src/patches/tcpdump-4.2.0_add-missing-ppi.h.patch
(rev 0)
+++ ipcop/trunk/src/patches/tcpdump-4.2.0_add-missing-ppi.h.patch
2011-11-30 12:52:19 UTC (rev 6143)
@@ -0,0 +1,27 @@
+From 3a7f5fb4d0c5e632c439c7ae3e8189a64f77c853 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <[email protected]>
+Date: Tue, 29 Nov 2011 13:55:57 +0100
+Subject: [PATCH] Add missing ppi.h from upstream GIT
+
+---
+ ppi.h | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+ create mode 100644 ppi.h
+
+diff --git a/ppi.h b/ppi.h
+new file mode 100644
+index 0000000..fa3359e
+--- /dev/null
++++ b/ppi.h
+@@ -0,0 +1,8 @@
++typedef struct ppi_header {
++ uint8_t ppi_ver;
++ uint8_t ppi_flags;
++ uint16_t ppi_len;
++ uint32_t ppi_dlt;
++} ppi_header_t;
++
++#define PPI_HDRLEN 8
+--
+1.7.6.1
+
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-30 12:41:59 UTC
(rev 6142)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-30 12:52:19 UTC
(rev 6143)
@@ -68,3 +68,6 @@
## squid-langpack
/usr/lib/squid/errors.ipcop
/usr/lib/squid/errors
+##
+## tcpdump-4.2.0
+/usr/sbin/tcpdump
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2011-11-30 12:41:59 UTC (rev
6142)
+++ ipcop/trunk/updates/2.0.3/information.xml 2011-11-30 12:52:19 UTC (rev
6143)
@@ -9,7 +9,7 @@
Language updates.<br />
Upgrade acpid to 2.0.13, bash to 4.2.20, diffutils to 3.2,
kbd to 1.15.3, kernel to 2.6.32.49, libpcap to 1.2.0,
- smartmontools to 5.42, Solos PCI to 1.03.
+ smartmontools to 5.42, Solos PCI to 1.03, tcpdump to 4.2.0.
</description>
<previousversion>2.0.2</previousversion>
<installdate>INSTALLDATE</installdate>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
