OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Oct-2006 21:14:50
Branch: HEAD Handle: 2006101220145000
Modified files:
openpkg-src/tcpdump tcpdump.patch tcpdump.spec
Log:
Hell, seems like I'm the only guy who cares about Solaris or what...
fix tcpdump for Solaris
Summary:
Revision Changes Path
1.9 +92 -2 openpkg-src/tcpdump/tcpdump.patch
1.51 +1 -1 openpkg-src/tcpdump/tcpdump.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tcpdump/tcpdump.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 tcpdump.patch
--- openpkg-src/tcpdump/tcpdump.patch 15 Jul 2005 07:56:21 -0000 1.8
+++ openpkg-src/tcpdump/tcpdump.patch 12 Oct 2006 19:14:50 -0000 1.9
@@ -6,8 +6,8 @@
referenced symbol is actually undefined.
Index: configure.in
---- configure.in.orig 2005-04-24 03:36:19 +0200
-+++ configure.in 2005-07-15 09:42:17 +0200
+--- configure.in.orig 2005-09-21 18:50:01.000000000 +0200
++++ configure.in 2006-10-12 21:10:04.494299959 +0200
@@ -711,10 +711,10 @@
if test $ac_cv_func_pcap_lib_version = "no" ; then
@@ -47,3 +47,93 @@
return yydebug;
],
ac_lbl_cv_yydebug_defined=yes,
+Index: ether.h
+--- ether.h.orig 2002-12-11 08:13:51.000000000 +0100
++++ ether.h 2006-10-12 21:10:04.494616121 +0200
+@@ -34,7 +34,9 @@
+ * @(#)if_ether.h 8.3 (Berkeley) 5/2/95
+ */
+
++#ifndef ETHERMTU
+ #define ETHERMTU 1500
++#endif
+
+ /*
+ * The number of bytes in an ethernet (MAC) address.
+@@ -44,7 +46,7 @@
+ /*
+ * Structure of a DEC/Intel/Xerox or 802.3 Ethernet header.
+ */
+-struct ether_header {
++struct tcpdump_ether_header {
+ u_int8_t ether_dhost[ETHER_ADDR_LEN];
+ u_int8_t ether_shost[ETHER_ADDR_LEN];
+ u_int16_t ether_type;
+Index: print-ether.c
+--- print-ether.c.orig 2006-02-20 19:15:03.000000000 +0100
++++ print-ether.c 2006-10-12 21:10:04.494879335 +0200
+@@ -79,8 +79,8 @@
+ static inline void
+ ether_hdr_print(register const u_char *bp, u_int length)
+ {
+- register const struct ether_header *ep;
+- ep = (const struct ether_header *)bp;
++ register const struct tcpdump_ether_header *ep;
++ ep = (const struct tcpdump_ether_header *)bp;
+
+ (void)printf("%s > %s",
+ etheraddr_string(ESRC(ep)),
+@@ -106,7 +106,7 @@
+ void
+ ether_print(const u_char *p, u_int length, u_int caplen)
+ {
+- struct ether_header *ep;
++ struct tcpdump_ether_header *ep;
+ u_short ether_type;
+ u_short extracted_ether_type;
+
+@@ -120,7 +120,7 @@
+
+ length -= ETHER_HDRLEN;
+ caplen -= ETHER_HDRLEN;
+- ep = (struct ether_header *)p;
++ ep = (struct tcpdump_ether_header *)p;
+ p += ETHER_HDRLEN;
+
+ ether_type = ntohs(ep->ether_type);
+Index: print-fddi.c
+--- print-fddi.c.orig 2005-11-13 13:12:59.000000000 +0100
++++ print-fddi.c 2006-10-12 21:10:04.495111950 +0200
+@@ -242,7 +242,7 @@
+ fddi_print(const u_char *p, u_int length, u_int caplen)
+ {
+ const struct fddi_header *fddip = (const struct fddi_header *)p;
+- struct ether_header ehdr;
++ struct tcpdump_ether_header ehdr;
+ u_short extracted_ethertype;
+
+ if (caplen < FDDI_HDRLEN) {
+Index: print-ipfc.c
+--- print-ipfc.c.orig 2005-11-13 13:12:59.000000000 +0100
++++ print-ipfc.c 2006-10-12 21:10:04.495301089 +0200
+@@ -81,7 +81,7 @@
+ ipfc_print(const u_char *p, u_int length, u_int caplen)
+ {
+ const struct ipfc_header *ipfcp = (const struct ipfc_header *)p;
+- struct ether_header ehdr;
++ struct tcpdump_ether_header ehdr;
+ u_short extracted_ethertype;
+
+ if (caplen < IPFC_HDRLEN) {
+Index: print-token.c
+--- print-token.c.orig 2005-11-13 13:13:01.000000000 +0100
++++ print-token.c 2006-10-12 21:10:47.628239160 +0200
+@@ -102,7 +102,7 @@
+ {
+ const struct token_header *trp;
+ u_short extracted_ethertype;
+- struct ether_header ehdr;
++ struct tcpdump_ether_header ehdr;
+ u_int route_len = 0, hdr_len = TOKEN_HDRLEN;
+ int seg;
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tcpdump/tcpdump.spec
============================================================================
$ cvs diff -u -r1.50 -r1.51 tcpdump.spec
--- openpkg-src/tcpdump/tcpdump.spec 9 Oct 2006 13:39:37 -0000 1.50
+++ openpkg-src/tcpdump/tcpdump.spec 12 Oct 2006 19:14:50 -0000 1.51
@@ -33,7 +33,7 @@
Group: Capturing
License: GPL
Version: 3.9.5
-Release: 20061009
+Release: 20061012
# list of sources
Source0: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
