mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
tcpslice: upgrade 1.2a3 -> 1.5
* Update SRC_URI to official download page * Drop patches which had been fixed upstream. * Add UPSTREAM_CHECK_REGEX Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao
Khem Raj
@@ -1,75 +0,0 @@
|
||||
Upstream-Status: Pending [from tcpdump-4.1.1-1.fc14.src.rpm]
|
||||
|
||||
Signed-off-by: Roy Li <rongqing.li@windriver.com>
|
||||
|
||||
--- tcpslice-1.2a3.orig/search.c 2000-09-10 10:52:40.000000000 +0200
|
||||
+++ tcpslice-1.2a3/search.c 2006-07-28 14:56:55.000000000 +0200
|
||||
@@ -53,7 +53,7 @@
|
||||
/* Size of a packet header in bytes; easier than typing the sizeof() all
|
||||
* the time ...
|
||||
*/
|
||||
-#define PACKET_HDR_LEN (sizeof( struct pcap_pkthdr ))
|
||||
+#define PACKET_HDR_LEN (sizeof( struct pcap_sf_pkthdr ))
|
||||
|
||||
extern int snaplen;
|
||||
|
||||
@@ -111,16 +111,24 @@
|
||||
static void
|
||||
extract_header( pcap_t *p, u_char *buf, struct pcap_pkthdr *hdr )
|
||||
{
|
||||
- memcpy((char *) hdr, (char *) buf, sizeof(struct pcap_pkthdr));
|
||||
+ struct pcap_sf_pkthdr hdri;
|
||||
+
|
||||
+ memcpy((char *) &hdri, (char *) buf, sizeof(struct pcap_sf_pkthdr));
|
||||
|
||||
if ( pcap_is_swapped( p ) )
|
||||
{
|
||||
- hdr->ts.tv_sec = SWAPLONG(hdr->ts.tv_sec);
|
||||
- hdr->ts.tv_usec = SWAPLONG(hdr->ts.tv_usec);
|
||||
- hdr->len = SWAPLONG(hdr->len);
|
||||
- hdr->caplen = SWAPLONG(hdr->caplen);
|
||||
+ hdr->ts.tv_sec = SWAPLONG(hdri.ts.tv_sec);
|
||||
+ hdr->ts.tv_usec = SWAPLONG(hdri.ts.tv_usec);
|
||||
+ hdr->len = SWAPLONG(hdri.len);
|
||||
+ hdr->caplen = SWAPLONG(hdri.caplen);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ hdr->ts.tv_sec = hdri.ts.tv_sec;
|
||||
+ hdr->ts.tv_usec = hdri.ts.tv_usec;
|
||||
+ hdr->len = hdri.len;
|
||||
+ hdr->caplen = hdri.caplen;
|
||||
}
|
||||
-
|
||||
/*
|
||||
* From bpf/libpcap/savefile.c:
|
||||
*
|
||||
--- tcpslice-1.2a3.orig/tcpslice.h 1995-11-02 00:40:53.000000000 +0100
|
||||
+++ tcpslice-1.2a3/tcpslice.h 2006-07-28 14:56:55.000000000 +0200
|
||||
@@ -20,6 +20,26 @@
|
||||
*/
|
||||
|
||||
|
||||
+#include <time.h>
|
||||
+/* #include <net/bpf.h> */
|
||||
+
|
||||
+/*
|
||||
+ * This is a timeval as stored in disk in a dumpfile.
|
||||
+ * It has to use the same types everywhere, independent of the actual
|
||||
+ * `struct timeval'
|
||||
+ */
|
||||
+
|
||||
+struct pcap_timeval {
|
||||
+ bpf_int32 tv_sec; /* seconds */
|
||||
+ bpf_int32 tv_usec; /* microseconds */
|
||||
+};
|
||||
+
|
||||
+struct pcap_sf_pkthdr {
|
||||
+ struct pcap_timeval ts; /* time stamp */
|
||||
+ bpf_u_int32 caplen; /* length of portion present */
|
||||
+ bpf_u_int32 len; /* length this packet (off wire) */
|
||||
+};
|
||||
+
|
||||
time_t gwtm2secs( struct tm *tm );
|
||||
|
||||
int sf_find_end( struct pcap *p, struct timeval *first_timestamp,
|
||||
@@ -1,15 +0,0 @@
|
||||
Upstream-Status: Pending [from tcpdump-4.1.1-1.fc14.src.rpm]
|
||||
|
||||
Signed-off-by: Roy Li <rongqing.li@windriver.com>
|
||||
diff -ur tcpdump-3.8.1/tcpslice/tcpslice.c tcpdump-3.8.1.new/tcpslice/tcpslice.c
|
||||
--- tcpslice/tcpslice.c 2004-01-15 17:35:53.000000000 +0100
|
||||
+++ tcpslice/tcpslice.c 2004-01-15 16:12:57.000000000 +0100
|
||||
@@ -35,7 +35,7 @@
|
||||
#include <sys/file.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
-#include <net/bpf.h>
|
||||
+/* #include <net/bpf.h> */
|
||||
|
||||
#include <ctype.h>
|
||||
#ifdef HAVE_FCNTL_H
|
||||
@@ -1,36 +0,0 @@
|
||||
SUMMARY = "tcpslice"
|
||||
DESCRIPTION = "A tool for extracting parts of a tcpdump packet trace."
|
||||
HOMEPAGE = "http://www.tcpdump.org/related.html"
|
||||
SECTION = "net"
|
||||
|
||||
LICENSE = "BSD-4-Clause"
|
||||
LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa62c64e"
|
||||
|
||||
SRC_URI = "ftp://ftp.ee.lbl.gov/${BP}.tar.gz \
|
||||
file://tcpslice-1.2a3-time.patch \
|
||||
file://tcpslice-CVS.20010207-bpf.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "e329cbeb7e589f132d92c3447c477190"
|
||||
SRC_URI[sha256sum] = "4096e8debc898cfaa16b5306f1c42f8d18b19e30e60da8d4deb781c8f684c840"
|
||||
|
||||
inherit autotools-brokensep
|
||||
|
||||
DEPENDS += "libpcap"
|
||||
|
||||
# We do not want to autoreconf. We must specify srcdir as ".".
|
||||
# We have to set the ac_cv_* cache variables as well as pass the normal
|
||||
# cross-compilation options to configure!
|
||||
#
|
||||
do_configure () {
|
||||
oe_runconf \
|
||||
--srcdir="." \
|
||||
ac_cv_build=${BUILD_SYS} \
|
||||
ac_cv_host=${HOST_SYS} \
|
||||
ac_cv_target=${HOST_SYS}
|
||||
}
|
||||
|
||||
do_install () {
|
||||
mkdir -p ${D}/usr/sbin
|
||||
install -c -m 555 tcpslice ${D}/usr/sbin
|
||||
}
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
SUMMARY = "tcpslice"
|
||||
DESCRIPTION = "A tool for extracting parts of a tcpdump packet trace."
|
||||
HOMEPAGE = "http://www.tcpdump.org/related.html"
|
||||
SECTION = "net"
|
||||
|
||||
LICENSE = "BSD-4-Clause"
|
||||
LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa62c64e"
|
||||
|
||||
SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz \
|
||||
"
|
||||
SRC_URI[md5sum] = "8907e60376e629f6e6ce2255988aaf47"
|
||||
SRC_URI[sha256sum] = "f6935e3e7ca00ef50c515d062fddd410868467ec5b6d8f2eca12066f8d91dda2"
|
||||
|
||||
UPSTREAM_CHECK_REGEX = "tcpslice-(?P<pver>\d+(\.\d+)+)\.tar"
|
||||
|
||||
inherit autotools-brokensep pkgconfig
|
||||
|
||||
DEPENDS = "libpcap"
|
||||
|
||||
EXTRA_AUTORECONF += "--exclude=aclocal"
|
||||
|
||||
do_install () {
|
||||
install -d ${D}${sbindir}
|
||||
install -m 0755 tcpslice ${D}${sbindir}
|
||||
}
|
||||
Reference in New Issue
Block a user