[arch-commits] Commit in ngrep/repos (12 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Sat Mar 25 11:28:41 UTC 2017
Date: Saturday, March 25, 2017 @ 11:28:40
Author: bpiotrowski
Revision: 218733
archrelease: copy trunk to community-i686, community-x86_64
Added:
ngrep/repos/community-i686/PKGBUILD
(from rev 218732, ngrep/trunk/PKGBUILD)
ngrep/repos/community-i686/ngrep-1.45-fix-ipv6.patch
(from rev 218732, ngrep/trunk/ngrep-1.45-fix-ipv6.patch)
ngrep/repos/community-i686/ngrep-1.45-use-system-pcre.patch
(from rev 218732, ngrep/trunk/ngrep-1.45-use-system-pcre.patch)
ngrep/repos/community-x86_64/PKGBUILD
(from rev 218732, ngrep/trunk/PKGBUILD)
ngrep/repos/community-x86_64/ngrep-1.45-fix-ipv6.patch
(from rev 218732, ngrep/trunk/ngrep-1.45-fix-ipv6.patch)
ngrep/repos/community-x86_64/ngrep-1.45-use-system-pcre.patch
(from rev 218732, ngrep/trunk/ngrep-1.45-use-system-pcre.patch)
Deleted:
ngrep/repos/community-i686/PKGBUILD
ngrep/repos/community-i686/ngrep-1.45-fix-ipv6.patch
ngrep/repos/community-i686/ngrep-1.45-use-system-pcre.patch
ngrep/repos/community-x86_64/PKGBUILD
ngrep/repos/community-x86_64/ngrep-1.45-fix-ipv6.patch
ngrep/repos/community-x86_64/ngrep-1.45-use-system-pcre.patch
---------------------------------------------------+
/PKGBUILD | 96 ++++++++++++++++
/ngrep-1.45-fix-ipv6.patch | 82 +++++++++++++
/ngrep-1.45-use-system-pcre.patch | 120 ++++++++++++++++++++
community-i686/PKGBUILD | 44 -------
community-i686/ngrep-1.45-fix-ipv6.patch | 41 ------
community-i686/ngrep-1.45-use-system-pcre.patch | 60 ----------
community-x86_64/PKGBUILD | 44 -------
community-x86_64/ngrep-1.45-fix-ipv6.patch | 41 ------
community-x86_64/ngrep-1.45-use-system-pcre.patch | 60 ----------
9 files changed, 298 insertions(+), 290 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-03-25 11:28:32 UTC (rev 218732)
+++ community-i686/PKGBUILD 2017-03-25 11:28:40 UTC (rev 218733)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=ngrep
-pkgver=1.45
-pkgrel=11
-pkgdesc='A grep-like utility that allows you to search for network packets on an interface.'
-arch=('i686' 'x86_64')
-url='http://ngrep.sourceforge.net/'
-license=('custom')
-depends=('libpcap>=1.0.0' 'pcre')
-# Fix build failure when using "-j" (FS#27091).
-options=(!makeflags)
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
- 'ngrep-1.45-fix-ipv6.patch'
- 'ngrep-1.45-use-system-pcre.patch')
-md5sums=('bc8150331601f3b869549c94866b4f1c'
- '524ee2e0d9ff3c6a262eca836ddf63ed'
- 'c546da1e47d3e8bddc7678c81a22a6b7')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # add patch for broken ipv6 support (FS#27225)
- patch -Np1 -i "$srcdir/ngrep-1.45-fix-ipv6.patch"
-
- # use system PCRE (FS#27225)
- patch -Np1 -i "$srcdir/ngrep-1.45-use-system-pcre.patch"
- autoreconf
-
- export EXTRA_INCLUDES=$(pcre-config --cflags)
- export EXTRA_LIBS=$(pcre-config --libs)
- ./configure --prefix=/usr --with-pcap-includes=/usr/include/pcap --enable-ipv6 --enable-pcre
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
- install -Dm0644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
-}
Copied: ngrep/repos/community-i686/PKGBUILD (from rev 218732, ngrep/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-03-25 11:28:40 UTC (rev 218733)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=ngrep
+pkgver=1.45
+pkgrel=12
+pkgdesc='A grep-like utility that allows you to search for network packets on an interface.'
+arch=('i686' 'x86_64')
+url='http://ngrep.sourceforge.net/'
+license=('custom')
+depends=('libpcap>=1.0.0' 'pcre')
+# Fix build failure when using "-j" (FS#27091).
+options=(!makeflags)
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+ 'ngrep-1.45-fix-ipv6.patch'
+ 'ngrep-1.45-use-system-pcre.patch')
+md5sums=('bc8150331601f3b869549c94866b4f1c'
+ '524ee2e0d9ff3c6a262eca836ddf63ed'
+ 'c546da1e47d3e8bddc7678c81a22a6b7')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # add patch for broken ipv6 support (FS#27225)
+ patch -Np1 -i "$srcdir/ngrep-1.45-fix-ipv6.patch"
+
+ # use system PCRE (FS#27225)
+ patch -Np1 -i "$srcdir/ngrep-1.45-use-system-pcre.patch"
+ autoreconf
+
+ export EXTRA_INCLUDES=$(pcre-config --cflags)
+ export EXTRA_LIBS=$(pcre-config --libs)
+ ./configure --prefix=/usr \
+ --with-pcap-includes=/usr/include/pcap\
+ --enable-ipv6 \
+ --enable-pcre \
+ --disable-pcap-restart
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+ install -Dm0644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+}
Deleted: community-i686/ngrep-1.45-fix-ipv6.patch
===================================================================
--- community-i686/ngrep-1.45-fix-ipv6.patch 2017-03-25 11:28:32 UTC (rev 218732)
+++ community-i686/ngrep-1.45-fix-ipv6.patch 2017-03-25 11:28:40 UTC (rev 218733)
@@ -1,41 +0,0 @@
---- 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;
-
-
Copied: ngrep/repos/community-i686/ngrep-1.45-fix-ipv6.patch (from rev 218732, ngrep/trunk/ngrep-1.45-fix-ipv6.patch)
===================================================================
--- community-i686/ngrep-1.45-fix-ipv6.patch (rev 0)
+++ community-i686/ngrep-1.45-fix-ipv6.patch 2017-03-25 11:28:40 UTC (rev 218733)
@@ -0,0 +1,41 @@
+--- 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;
+
+
Deleted: community-i686/ngrep-1.45-use-system-pcre.patch
===================================================================
--- community-i686/ngrep-1.45-use-system-pcre.patch 2017-03-25 11:28:32 UTC (rev 218732)
+++ community-i686/ngrep-1.45-use-system-pcre.patch 2017-03-25 11:28:40 UTC (rev 218733)
@@ -1,60 +0,0 @@
-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
-
-
Copied: ngrep/repos/community-i686/ngrep-1.45-use-system-pcre.patch (from rev 218732, ngrep/trunk/ngrep-1.45-use-system-pcre.patch)
===================================================================
--- community-i686/ngrep-1.45-use-system-pcre.patch (rev 0)
+++ community-i686/ngrep-1.45-use-system-pcre.patch 2017-03-25 11:28:40 UTC (rev 218733)
@@ -0,0 +1,60 @@
+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
+
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-03-25 11:28:32 UTC (rev 218732)
+++ community-x86_64/PKGBUILD 2017-03-25 11:28:40 UTC (rev 218733)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=ngrep
-pkgver=1.45
-pkgrel=11
-pkgdesc='A grep-like utility that allows you to search for network packets on an interface.'
-arch=('i686' 'x86_64')
-url='http://ngrep.sourceforge.net/'
-license=('custom')
-depends=('libpcap>=1.0.0' 'pcre')
-# Fix build failure when using "-j" (FS#27091).
-options=(!makeflags)
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
- 'ngrep-1.45-fix-ipv6.patch'
- 'ngrep-1.45-use-system-pcre.patch')
-md5sums=('bc8150331601f3b869549c94866b4f1c'
- '524ee2e0d9ff3c6a262eca836ddf63ed'
- 'c546da1e47d3e8bddc7678c81a22a6b7')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # add patch for broken ipv6 support (FS#27225)
- patch -Np1 -i "$srcdir/ngrep-1.45-fix-ipv6.patch"
-
- # use system PCRE (FS#27225)
- patch -Np1 -i "$srcdir/ngrep-1.45-use-system-pcre.patch"
- autoreconf
-
- export EXTRA_INCLUDES=$(pcre-config --cflags)
- export EXTRA_LIBS=$(pcre-config --libs)
- ./configure --prefix=/usr --with-pcap-includes=/usr/include/pcap --enable-ipv6 --enable-pcre
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
- install -Dm0644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
-}
Copied: ngrep/repos/community-x86_64/PKGBUILD (from rev 218732, ngrep/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-03-25 11:28:40 UTC (rev 218733)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=ngrep
+pkgver=1.45
+pkgrel=12
+pkgdesc='A grep-like utility that allows you to search for network packets on an interface.'
+arch=('i686' 'x86_64')
+url='http://ngrep.sourceforge.net/'
+license=('custom')
+depends=('libpcap>=1.0.0' 'pcre')
+# Fix build failure when using "-j" (FS#27091).
+options=(!makeflags)
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+ 'ngrep-1.45-fix-ipv6.patch'
+ 'ngrep-1.45-use-system-pcre.patch')
+md5sums=('bc8150331601f3b869549c94866b4f1c'
+ '524ee2e0d9ff3c6a262eca836ddf63ed'
+ 'c546da1e47d3e8bddc7678c81a22a6b7')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # add patch for broken ipv6 support (FS#27225)
+ patch -Np1 -i "$srcdir/ngrep-1.45-fix-ipv6.patch"
+
+ # use system PCRE (FS#27225)
+ patch -Np1 -i "$srcdir/ngrep-1.45-use-system-pcre.patch"
+ autoreconf
+
+ export EXTRA_INCLUDES=$(pcre-config --cflags)
+ export EXTRA_LIBS=$(pcre-config --libs)
+ ./configure --prefix=/usr \
+ --with-pcap-includes=/usr/include/pcap\
+ --enable-ipv6 \
+ --enable-pcre \
+ --disable-pcap-restart
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+ install -Dm0644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+}
Deleted: community-x86_64/ngrep-1.45-fix-ipv6.patch
===================================================================
--- community-x86_64/ngrep-1.45-fix-ipv6.patch 2017-03-25 11:28:32 UTC (rev 218732)
+++ community-x86_64/ngrep-1.45-fix-ipv6.patch 2017-03-25 11:28:40 UTC (rev 218733)
@@ -1,41 +0,0 @@
---- 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;
-
-
Copied: ngrep/repos/community-x86_64/ngrep-1.45-fix-ipv6.patch (from rev 218732, ngrep/trunk/ngrep-1.45-fix-ipv6.patch)
===================================================================
--- community-x86_64/ngrep-1.45-fix-ipv6.patch (rev 0)
+++ community-x86_64/ngrep-1.45-fix-ipv6.patch 2017-03-25 11:28:40 UTC (rev 218733)
@@ -0,0 +1,41 @@
+--- 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;
+
+
Deleted: community-x86_64/ngrep-1.45-use-system-pcre.patch
===================================================================
--- community-x86_64/ngrep-1.45-use-system-pcre.patch 2017-03-25 11:28:32 UTC (rev 218732)
+++ community-x86_64/ngrep-1.45-use-system-pcre.patch 2017-03-25 11:28:40 UTC (rev 218733)
@@ -1,60 +0,0 @@
-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
-
-
Copied: ngrep/repos/community-x86_64/ngrep-1.45-use-system-pcre.patch (from rev 218732, ngrep/trunk/ngrep-1.45-use-system-pcre.patch)
===================================================================
--- community-x86_64/ngrep-1.45-use-system-pcre.patch (rev 0)
+++ community-x86_64/ngrep-1.45-use-system-pcre.patch 2017-03-25 11:28:40 UTC (rev 218733)
@@ -0,0 +1,60 @@
+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
+
+
More information about the arch-commits
mailing list