<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d4a3c2901ecd163f437f80afeb9adea00f4e2e4b">https://github.com/macports/macports-ports/commit/d4a3c2901ecd163f437f80afeb9adea00f4e2e4b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d4a3c29 ngrep: add various patches + use pcre
</span>d4a3c29 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d4a3c2901ecd163f437f80afeb9adea00f4e2e4b
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Sat Dec 17 17:53:56 2016 -0500
<span style='display:block; white-space:pre;color:#404040;'> ngrep: add various patches + use pcre
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - avoid sourceforge redirects
</span><span style='display:block; white-space:pre;color:#404040;'> - add openmaintainer for now - maintainer timeout
</span><span style='display:block; white-space:pre;color:#404040;'> - use macports pcre instead of ngrep's regex
</span><span style='display:block; white-space:pre;color:#404040;'> - use Debian's patches : ipv6, man, building, locale
</span><span style='display:block; white-space:pre;color:#404040;'> - enable-ipv6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes https://trac.macports.org/ticket/40792
</span><span style='display:block; white-space:pre;color:#404040;'> closes https://trac.macports.org/ticket/52840
</span><span style='display:block; white-space:pre;color:#404040;'> closes https://trac.macports.org/ticket/48123
</span><span style='display:block; white-space:pre;color:#404040;'> closes https://trac.macports.org/ticket/52207
</span>---
net/ngrep/Portfile | 31 +++++++---
net/ngrep/files/10_debian-build.diff | 115 +++++++++++++++++++++++++++++++++++
net/ngrep/files/10_man-fixes.diff | 42 +++++++++++++
net/ngrep/files/20_setlocale.diff | 27 ++++++++
net/ngrep/files/40_ipv6-offsets.diff | 45 ++++++++++++++
5 files changed, 252 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ngrep/Portfile b/net/ngrep/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 39d02c9..053ed34 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/ngrep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ngrep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,9 @@ PortSystem 1.0
</span>
name ngrep
version 1.45
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers flipt.com:grace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers flipt.com:grace openmaintainer
</span>
description Network grep
long_description \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,17 +21,31 @@ long_description \
</span>
platforms darwin
homepage http://ngrep.sourceforge.net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/${name}/${name}/${version}/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 bc8150331601f3b869549c94866b4f1c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 f26090a6ac607db66df99c6fa9aef74968f3330f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d4b89dfa23f6a7c65d3ccefc846362054a46605f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d4b89dfa23f6a7c65d3ccefc846362054a46605f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 aea6dd337da8781847c75b3b5b876e4de9c58520e0d77310679a979fc6402fa7
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:libpcap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:libpcap \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pcre
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles Makefile.in.patch regex-0.12_Makefile.in.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 10_debian-build.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10_man-fixes.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 20_setlocale.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 40_ipv6-offsets.diff
</span>
configure.args --with-pcap-includes=${prefix}/include \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --mandir=${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-pcre \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-ipv6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-pcap-restart
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # above line required to avoid segfaults
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/jpr5/ngrep/commit/e29fc29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/Homebrew/homebrew/issues/27171
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS='${configure.cflags} [get_canonical_archflags cc]' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS='${configure.ldflags} [get_canonical_archflags ld]'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ngrep/files/10_debian-build.diff b/net/ngrep/files/10_debian-build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..78952be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ngrep/files/10_debian-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,115 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change ngrep's build system to use the system's version of PCRE.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Makefile.in | 6 ++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure | 11 +++--------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.in | 11 +++--------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ngrep.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4 files changed, 9 insertions(+), 21 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3624,13 +3624,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test $use_pcre = yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo 'Configuring Perl-Compatible Regular Expression (PCRE) library ...'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- REGEX_DIR='pcre-5.0'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ REGEX_DIR=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ REGEX_OBJS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_PCRE="1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXTRA_LIBS="$EXTRA_LIBS -lpcre"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3644,8 +3641,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-( cd $REGEX_DIR && ./configure )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,13 +126,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test $use_pcre = yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo 'Configuring Perl-Compatible Regular Expression (PCRE) library ...'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- REGEX_DIR='pcre-5.0'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ REGEX_DIR=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ REGEX_OBJS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_PCRE="1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXTRA_LIBS="$EXTRA_LIBS -lpcre"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,8 +143,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-( cd $REGEX_DIR && ./configure )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(REGEX_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(REGEX_OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,7 +7,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=@CC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS=@CFLAGS@ -D@OS@ @DEFS@ @EXTRA_DEFINES@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS=@CFLAGS@ @CPPFLAGS@ -D@OS@ @DEFS@ @EXTRA_DEFINES@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDES=-I@srcdir@ @PCAP_INCLUDE@ @EXTRA_INCLUDES@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=@LDFLAGS@ @PCAP_LINK@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,13 +39,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all: $(TARGET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(TARGET): $(REGEX_OBJS) $(OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ debug: $(REGEX_OBJS) $(OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(CFLAGS) $(LDFLAGS) -g -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static: $(REGEX_OBJS) $(OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET).static -static $(OBJS) $(REGEX_OBJS) $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET).static -static $(OBJS) $(REGEX_OBJS) $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: $(TARGET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -c -m 0755 $(TARGET) $(DESTDIR)/$(BINDIR_INSTALL)/$(TARGET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,11 +55,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(CFLAGS) $(INCLUDES) -g -c $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clean:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- make -C $(REGEX_DIR) clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f *~ $(OBJS) $(REGEX_OBJS) $(TARGET) $(TARGET).static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distclean: clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- make -C $(REGEX_DIR) distclean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f config.status config.cache config.log config.h Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(REGEX_OBJS): $(REGEX_OBJS:.o=.c) $(REGEX_DIR)/*.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ngrep.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ngrep.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,7 +92,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if USE_PCRE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "pcre-5.0/pcre.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <pcre.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "regex-0.12/regex.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ngrep/files/10_man-fixes.diff b/net/ngrep/files/10_man-fixes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..60c91af
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ngrep/files/10_man-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Misc fixes to the man page.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ngrep.8 | 21 +++++++--------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 7 insertions(+), 14 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ngrep.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ngrep.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,13 +144,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP "-W normal|byline|single|none"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Specify an alternate manner for displaying packets, when not in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hexadecimal mode. The ``byline'' mode honors embedded linefeeds,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-wrapping text only when a linefeed is encountered. The ``none'' mode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-doesn't wrap under any circumstance (entire payload is displayed on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-one line). The ``single'' mode is conceptually the same as ``none'',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-except that everything including IP and source/destination header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-information is all on one line. ``normal'' is the default mode and is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-only included for completeness. This option is incompatible with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-``-x''.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++wrapping text only when a linefeed is encountered (useful for observing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HTTP transactions, for instance). The ``none'' mode doesn't wrap under
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++any circumstance (entire payload is displayed on one line). The
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++``single'' mode is conceptually the same as ``none'', except that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++everything including IP and source/destination header information is all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++on one line. ``normal'' is the default mode and is only included for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++completeness. This option is incompatible with ``-x''.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP "-s snaplen"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Set the bpf caplen to snaplen (default 65536).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -181,13 +181,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP "-A num"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Dump \fInum\fP packets of trailing context after matching a packet.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.IP "-W normal|byline|none"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Alter the method by which ngrep displays packet payload. ``normal''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-mode represents the standard behaviour, ``byline'' instructs ngrep to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-respect embedded linefeeds (useful for observing HTTP transactions,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-for instance), and ``none'' results in the payload on one single line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-(useful for scripted processing of ngrep output).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .IP "-c cols"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Ignore the detected terminal width and force the column width to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ specified size.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ngrep/files/20_setlocale.diff b/net/ngrep/files/20_setlocale.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d71c8e7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ngrep/files/20_setlocale.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Call setlocale to make isprint() decide what's printable depending
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+on the current locale. See #307496.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ngrep.c | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ngrep.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ngrep.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,6 +97,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "regex-0.12/regex.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <locale.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ngrep.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -195,6 +197,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ signal(SIGWINCH, update_windowsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ setlocale(LC_ALL, "");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while ((c = getopt(argc, argv, "LNhXViwqpevxlDtTRMs:n:c:d:A:I:O:S:P:F:W:")) != EOF) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (c) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'W': {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ngrep/files/40_ipv6-offsets.diff b/net/ngrep/files/40_ipv6-offsets.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..465721a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ngrep/files/40_ipv6-offsets.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit ca90da66ac237005af6fbdbdc16837ba41f19beb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Jordan Ritter <jpr5@darkridge.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue Jun 19 10:12:08 2007 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Fix for bug #1738953: why would I subtract the payload's length from a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variable that is supposed to describe exactly that?? Removed ip6_plen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from TCP, UDP and ICMPv6 calculations.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/ngrep.c b/ngrep.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fd95cbe..6c3c902 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ngrep.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ngrep.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -721,11 +721,6 @@ void process(u_char *d, struct pcap_pkthdr *h, u_char *p) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data = (unsigned char *)(tcp_pkt) + tcphdr_offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ len -= link_offset + ip_hl + tcphdr_offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if USE_IPv6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ip_ver == 6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- len -= ntohs(ip6_pkt->ip6_plen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((int32_t)len < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ len = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -741,11 +736,6 @@ void process(u_char *d, struct pcap_pkthdr *h, u_char *p) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data = (unsigned char *)(udp_pkt) + udphdr_offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ len -= link_offset + ip_hl + udphdr_offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if USE_IPv6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ip_ver == 6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- len -= ntohs(ip6_pkt->ip6_plen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((int32_t)len < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ len = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -779,7 +769,7 @@ void process(u_char *d, struct pcap_pkthdr *h, u_char *p) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint16_t icmp6hdr_offset = (frag_offset) ? 0 : 4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data = (unsigned char *)(icmp6_pkt) + icmp6hdr_offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- len -= link_offset + ip_hl + ntohs(ip6_pkt->ip6_plen) + icmp6hdr_offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ len -= link_offset + ip_hl + icmp6hdr_offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((int32_t)len < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ len = 0;
</span></pre><pre style='margin:0'>
</pre>