Sat Feb 25 23:15:06 UTC 2012

3 files changed, 120 insertions, 8 deletions

diff --git a/community/ngrep/PKGBUILD b/community/ngrep/PKGBUILD
index 2b50b67f6..2bc220a0e 100644
--- a/community/ngrep/PKGBUILD
+++ b/community/ngrep/PKGBUILD
@@ -1,27 +1,38 @@
-# $Id: PKGBUILD 64341 2012-02-11 23:22:31Z allan $
+# $Id: PKGBUILD 66459 2012-02-25 02:54:09Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=ngrep
 pkgver=1.45
-pkgrel=8
+pkgrel=9
 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')
+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-fix-ipv6-support.patch")
-md5sums=('bc8150331601f3b869549c94866b4f1c' '90e6dfb335bccf12615d3c468ceeb60f')
-# Added patch for broken ipv6 support (FS#27225)
+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}"
-  patch -Np1 -i $srcdir/ngrep-fix-ipv6-support.patch
 
-  ./configure --prefix=/usr --with-pcap-includes=/usr/include/pcap --enable-ipv6
+  # 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
 }
 
diff --git a/community/ngrep/ngrep-1.45-fix-ipv6.patch b/community/ngrep/ngrep-1.45-fix-ipv6.patch
new file mode 100644
index 000000000..66c5ff399
--- /dev/null
+++ b/community/ngrep/ngrep-1.45-fix-ipv6.patch
@@ -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;
+
+
diff --git a/community/ngrep/ngrep-1.45-use-system-pcre.patch b/community/ngrep/ngrep-1.45-use-system-pcre.patch
new file mode 100644
index 000000000..973dd25d6
--- /dev/null
+++ b/community/ngrep/ngrep-1.45-use-system-pcre.patch
@@ -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
+
+