summaryrefslogtreecommitdiff
path: root/community-staging/ngrep/ngrep-fix-ipv6-support.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community-staging/ngrep/ngrep-fix-ipv6-support.patch')
-rw-r--r--community-staging/ngrep/ngrep-fix-ipv6-support.patch107
1 files changed, 107 insertions, 0 deletions
diff --git a/community-staging/ngrep/ngrep-fix-ipv6-support.patch b/community-staging/ngrep/ngrep-fix-ipv6-support.patch
new file mode 100644
index 000000000..9a07d7d38
--- /dev/null
+++ b/community-staging/ngrep/ngrep-fix-ipv6-support.patch
@@ -0,0 +1,107 @@
+diff -rupN trunk/ngrep-fix-ipv6-support.patch trunk.notarch/ngrep-fix-ipv6-support.patch
+--- trunk/ngrep-fix-ipv6-support.patch 1970-01-01 01:00:00.000000000 +0100
++++ trunk.notarch/ngrep-fix-ipv6-support.patch 2011-11-30 05:12:48.068790633 +0100
+@@ -0,0 +1,40 @@
++--- ngrep-1.45.ds2/ngrep.c 2010-04-21 12:16:52.000000000 +0200
+++++ ngrep-1.45.ds2-ipv6-patch/ngrep.c 2010-04-21 12:11:49.581088102 +0200
++@@ -711,10 +711,12 @@ void process(u_char *d, struct pcap_pkth
++ data = (unsigned char *)(tcp_pkt) + tcphdr_offset;
++ len -= link_offset + ip_hl + tcphdr_offset;
++
+++/*
++ #if USE_IPv6
++ if (ip_ver == 6)
++ len -= ntohs(ip6_pkt->ip6_plen);
++-#endif
+++#endif
+++*/
++
++ if ((int32_t)len < 0)
++ len = 0;
++@@ -731,11 +733,12 @@ void process(u_char *d, struct pcap_pkth
++ data = (unsigned char *)(udp_pkt) + udphdr_offset;
++ len -= link_offset + ip_hl + udphdr_offset;
++
+++/*
++ #if USE_IPv6
++ if (ip_ver == 6)
++ len -= ntohs(ip6_pkt->ip6_plen);
++ #endif
++-
+++*/
++ if ((int32_t)len < 0)
++ len = 0;
++
++@@ -769,7 +772,7 @@ void process(u_char *d, struct pcap_pkth
++ uint16_t icmp6hdr_offset = (frag_offset) ? 0 : 4;
++
++ data = (unsigned char *)(icmp6_pkt) + icmp6hdr_offset;
++- len -= link_offset + ip_hl + ntohs(ip6_pkt->ip6_plen) + icmp6hdr_offset;
+++ len -= link_offset + ip_hl + icmp6hdr_offset;
++
++ if ((int32_t)len < 0)
++ len = 0;
++
+diff -rupN trunk/ngrep-system-pcre.patch trunk.notarch/ngrep-system-pcre.patch
+--- trunk/ngrep-system-pcre.patch 1970-01-01 01:00:00.000000000 +0100
++++ trunk.notarch/ngrep-system-pcre.patch 2011-11-30 05:12:48.068790633 +0100
+@@ -0,0 +1,59 @@
++diff -urN ngrep-1.45/configure.in ngrep-1.45-patched/configure.in
++--- ngrep-1.45/configure.in 2006-11-14 21:43:56.000000000 -0600
+++++ ngrep-1.45-patched/configure.in 2006-11-29 10:34:48.000000000 -0600
++@@ -28,8 +28,8 @@
++ dnl
++
++ EXTRA_DEFINES=""
++-EXTRA_INCLUDES=""
++-EXTRA_LIBS=""
+++EXTRA_INCLUDES="$EXTRA_INCLUDES"
+++EXTRA_LIBS="$EXTRA_LIBS"
++
++
++ dnl
++@@ -130,8 +130,8 @@
++ echo 'Configuring Perl-Compatible Regular Expression (PCRE) library ...'
++ echo
++
++- REGEX_DIR='pcre-5.0'
++- REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
+++# REGEX_DIR='pcre-5.0'
+++# REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
++ USE_PCRE="1"
++
++ else
++@@ -146,7 +146,7 @@
++
++ fi
++
++-( cd $REGEX_DIR && ./configure )
+++#( cd $REGEX_DIR && ./configure )
++
++ AC_SUBST(REGEX_DIR)
++ AC_SUBST(REGEX_OBJS)
++diff -urN ngrep-1.45/Makefile.in ngrep-1.45-patched/Makefile.in
++--- ngrep-1.45/Makefile.in 2006-11-28 07:35:37.000000000 -0600
+++++ ngrep-1.45-patched/Makefile.in 2006-11-29 08:20:32.000000000 -0600
++@@ -38,7 +38,7 @@
++
++ all: $(TARGET)
++
++-$(TARGET): $(REGEX_OBJS) $(OBJS)
+++$(TARGET): $(OBJS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS)
++
++ debug: $(REGEX_OBJS) $(OBJS)
++diff -urN ngrep-1.45/ngrep.c ngrep-1.45-patched/ngrep.c
++--- ngrep-1.45/ngrep.c 2006-11-28 07:38:43.000000000 -0600
+++++ ngrep-1.45-patched/ngrep.c 2006-11-29 08:10:48.000000000 -0600
++@@ -92,7 +92,7 @@
++ #endif
++
++ #if USE_PCRE
++-#include "pcre-5.0/pcre.h"
+++#include "pcre.h"
++ #else
++ #include "regex-0.12/regex.h"
++ #endif
++