version bump, autoconf patch, closes #52000; added metadata

6 files changed, 321 insertions, 6 deletions

diff --git a/net-analyzer/ngrep/ChangeLog b/net-analyzer/ngrep/ChangeLog
index f3a66c3b8a9f..20328a2747e4 100644
--- a/net-analyzer/ngrep/ChangeLog
+++ b/net-analyzer/ngrep/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/ngrep
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v 1.15 2004/07/03 05:29:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v 1.16 2004/07/05 10:03:38 eldad Exp $
+
+*ngrep-1.42 (05 Jul 2004)
+
+  05 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  +files/ngrep-1.42-libpcap-include.patch, +ngrep-1.42.ebuild:
+  Version bump. Patch to autoconf contributed by lo0ol@eyou.com. Closes #52000.
+  added metadata.
 
   02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ngrep-1.41.ebuild:
   Stable amd64.
diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest
index 57504d105436..40d64f02ec91 100644
--- a/net-analyzer/ngrep/Manifest
+++ b/net-analyzer/ngrep/Manifest
@@ -1,8 +1,12 @@
-MD5 89c746fe48a77f3606e802b9c51bdf58 ChangeLog 2041
-MD5 683e64667af43e734a8e8e95dd32a0dd ngrep-1.40.ebuild 690
 MD5 4ab9f9baab346808505c62c1a953b3dc ngrep-1.41.ebuild 890
-MD5 5f8cb88ab65dc7e41938e74b1ae80257 files/digest-ngrep-1.40 62
-MD5 27a5fb2463a3a04049149b52e991cb72 files/digest-ngrep-1.41 63
-MD5 25121c21888e24c6bea5ca388fc07d5c files/ngrep-1.38-r2-gentoo.diff 201
+MD5 683e64667af43e734a8e8e95dd32a0dd ngrep-1.40.ebuild 690
+MD5 57df8c7d77917c1276847a8eb77507bc ngrep-1.42.ebuild 830
+MD5 45a48b7d6c9820bcf48ad60aa9dd6ab9 ChangeLog 2285
+MD5 e99ee6f3b5e19365555835847126019c metadata.xml 220
 MD5 7f3fb523c91eb34349228d8a33087777 files/ngrep-1.41-fix-HAVE_DUMB_UDPHDR-test.patch 403
+MD5 25121c21888e24c6bea5ca388fc07d5c files/ngrep-1.38-r2-gentoo.diff 201
 MD5 c24376fcf32b73b917074846599e69c4 files/ngrep-1.41-libpcap-include.patch 3099
+MD5 5f8cb88ab65dc7e41938e74b1ae80257 files/digest-ngrep-1.40 62
+MD5 27a5fb2463a3a04049149b52e991cb72 files/digest-ngrep-1.41 63
+MD5 85a227510da15e6a2af304931c2ec1e7 files/digest-ngrep-1.42 63
+MD5 a7fdfbde749237f8813aefb8a2a93d7e files/ngrep-1.42-libpcap-include.patch 6398
diff --git a/net-analyzer/ngrep/files/digest-ngrep-1.42 b/net-analyzer/ngrep/files/digest-ngrep-1.42
new file mode 100644
index 000000000000..a8da416eb840
--- /dev/null
+++ b/net-analyzer/ngrep/files/digest-ngrep-1.42
@@ -0,0 +1 @@
+MD5 35e821cfd888e9523a90fb7e5074a072 ngrep-1.42.tar.bz2 527699
diff --git a/net-analyzer/ngrep/files/ngrep-1.42-libpcap-include.patch b/net-analyzer/ngrep/files/ngrep-1.42-libpcap-include.patch
new file mode 100644
index 000000000000..31307a71cd93
--- /dev/null
+++ b/net-analyzer/ngrep/files/ngrep-1.42-libpcap-include.patch
@@ -0,0 +1,255 @@
+diff -Nru ngrep-1.42/config.h.in ngrep-1.42-libpcap-include-patched/config.h.in
+--- ngrep-1.42/config.h.in	2003-12-29 06:25:07.000000000 +0800
++++ ngrep-1.42-libpcap-include-patched/config.h.in	2004-05-23 19:22:46.178903608 +0800
+@@ -18,3 +18,4 @@
+ #define DROPPRIVS_USER         @DROPPRIVS_USER@
+ #define DROPPRIVS_ONLY_ROOT    @DROPPRIVS_ONLY_ROOT@
+ 
++#define USE_PCAP_BPF           @USE_PCAP_BPF@
+diff -Nru ngrep-1.42/configure.in ngrep-1.42-libpcap-include-patched/configure.in
+--- ngrep-1.42/configure.in	2004-01-05 05:03:27.000000000 +0800
++++ ngrep-1.42-libpcap-include-patched/configure.in	2004-05-23 19:22:47.125759664 +0800
+@@ -162,56 +162,6 @@
+ echo 'Configuring Network Grep (ngrep) ...'
+ echo 
+ 
+-dnl
+-dnl Check for DLT_* types that might not have existed in older
+-dnl libpcap's
+-dnl
+-
+-present=""
+-AC_MSG_CHECKING(for DLT_LINUX_SLL in bpf.h)
+-AC_EGREP_CPP(yes,
+-[
+-#include <net/bpf.h>
+-#ifdef DLT_LINUX_SLL
+-yes
+-#endif
+-],
+-[HAVE_DLT_LINUX_SLL="1" && echo yes], [HAVE_DLT_LINUX_SLL="0" && echo no])
+-
+-present=""
+-AC_MSG_CHECKING(for DLT_LOOP in bpf.h)
+-AC_EGREP_CPP(yes,
+-[
+-#include <net/bpf.h>
+-#ifdef DLT_LOOP
+-yes
+-#endif
+-],
+-[HAVE_DLT_LOOP="1" && echo yes], [HAVE_DLT_LOOP="0" && echo no])
+-
+-
+-present=""
+-AC_MSG_CHECKING(for DLT_IEEE802_11 in bpf.h)
+-AC_EGREP_CPP(yes,
+-[
+-#include <net/bpf.h>
+-#ifdef DLT_IEEE802_11
+-yes
+-#endif
+-],
+-[HAVE_DLT_IEEE802_11="1" && echo yes], [HAVE_DLT_IEEE802_11="0" && echo no])
+-
+-
+-present=""
+-AC_MSG_CHECKING(for DLT_RAW in bpf.h)
+-AC_EGREP_CPP(yes,
+-[
+-#include <net/bpf.h>
+-#ifdef DLT_RAW
+-yes
+-#endif
+-],
+-[HAVE_DLT_RAW="1" && echo yes], [HAVE_DLT_RAW="0" && echo no])
+ 
+ 
+ dnl
+@@ -315,26 +265,6 @@
+ EXTRA_DEFINES="$EXTRA_DEFINES -D_BSD_SOURCE=1 -D__FAVOR_BSD=1"
+ 
+ 
+-dnl
+-dnl Now that we're past the OS-specific stuff, which could have
+-dnl modified our USE_* and other defines, define them all now.
+-dnl 
+-
+-AC_DEFINE_UNQUOTED(USE_PCAP_RESTART,    $USE_PCAP_RESTART)
+-
+-AC_DEFINE_UNQUOTED(USE_PCRE,            $USE_PCRE)
+-
+-AC_DEFINE_UNQUOTED(USE_DROPPRIVS,       $USE_DROPPRIVS)
+-AC_DEFINE_UNQUOTED(DROPPRIVS_USER,     "$DROPPRIVS_USER")
+-AC_DEFINE_UNQUOTED(DROPPRIVS_ONLY_ROOT, $DROPPRIVS_ONLY_ROOT)
+-
+-AC_DEFINE_UNQUOTED(HAVE_DUMB_UDPHDR,    $HAVE_DUMB_UDPHDR)
+-
+-AC_DEFINE_UNQUOTED(HAVE_DLT_RAW,        $HAVE_DLT_RAW) 
+-AC_DEFINE_UNQUOTED(HAVE_DLT_IEEE802_11, $HAVE_DLT_IEEE802_11) 
+-AC_DEFINE_UNQUOTED(HAVE_DLT_LOOP,       $HAVE_DLT_LOOP) 
+-AC_DEFINE_UNQUOTED(HAVE_DLT_LINUX_SLL,  $HAVE_DLT_LINUX_SLL) 
+-
+ 
+ dnl
+ dnl Find ourselves some usable PCAP headers.
+@@ -353,22 +283,33 @@
+ [PCAP_DIR=$possible_dirs])
+ 
+ pcap_dir=""
+-for dir in $PCAP_DIR ; do 
+-    if test -d $dir -a -r "$dir/pcap.h" -a \
+-                       -r "$dir/net/bpf.h" ; then 
+-       if test -n "$pcap_dir" -a "$pcap_dir" != "$dir"; then
+-          echo 
+-          echo; echo more than one set found in:
+-          echo  $pcap_dir 
+-          echo  $dir
+-          echo; echo please wipe out all unused pcap installations
+-          exit
+-       else 
+-          pcap_dir="$dir"
+-       fi
++for dir in $PCAP_DIR ; do
++    if test -d $dir ; then
++        if test -r "$dir/pcap.h" ; then
++            if test -r "$dir/net/$bpf_h" -o -r "$dir/pcap-$bpf_h" ; then
++                if test -n "$pcap_dir" -a "$pcap_dir" != "$dir"; then
++                  echo 
++                  echo; echo more than one set found in:
++                  echo  $pcap_dir 
++                  echo  $dir
++                  echo; echo please wipe out all unused pcap installations
++                  exit
++                else 
++                  pcap_dir="$dir"
++                fi
++            fi
++        fi
+     fi
+ done
+ 
++if test -r "$pcap_dir/pcap-bpf.h" ; then
++  bpf_h="pcap-bpf.h"
++  USE_PCAP_BPF="1"&&echo "bpf: use <pcap-bpf.h>"
++else
++  bpf_h="net/bpf.h"
++  USE_PCAP_BPF="0"&&echo "bpf: use <net/bpf.h>"
++fi
++
+ if test -z "$pcap_dir" ; then
+    echo no; echo couldn\'t find a complete set of pcap headers
+    exit
+@@ -384,6 +325,56 @@
+ fi
+ 
+ dnl
++dnl Check for DLT_* types that might not have existed in older
++dnl libpcap's
++dnl
++
++present=""
++AC_MSG_CHECKING(for DLT_LINUX_SLL in $bpf_h)
++AC_EGREP_CPP(yes,
++[
++#include <$bpf_h>
++#ifdef DLT_LINUX_SLL
++yes
++#endif
++],
++[HAVE_DLT_LINUX_SLL="1" && echo yes], [HAVE_DLT_LINUX_SLL="0" && echo no])
++
++present=""
++AC_MSG_CHECKING(for DLT_LOOP in $bpf_h)
++AC_EGREP_CPP(yes,
++[
++#include <$bpf_h>
++#ifdef DLT_LOOP
++yes
++#endif
++],
++[HAVE_DLT_LOOP="1" && echo yes], [HAVE_DLT_LOOP="0" && echo no])
++
++
++present=""
++AC_MSG_CHECKING(for DLT_IEEE802_11 in $bpf_h)
++AC_EGREP_CPP(yes,
++[
++#include <$bpf_h>
++#ifdef DLT_IEEE802_11
++yes
++#endif
++],
++[HAVE_DLT_IEEE802_11="1" && echo yes], [HAVE_DLT_IEEE802_11="0" && echo no])
++
++
++present=""
++AC_MSG_CHECKING(for DLT_RAW in $bpf_h)
++AC_EGREP_CPP(yes,
++[
++#include <$bpf_h>
++#ifdef DLT_RAW
++yes
++#endif
++],
++[HAVE_DLT_RAW="1" && echo yes], [HAVE_DLT_RAW="0" && echo no])
++dnl
+ dnl And the library..
+ dnl
+ 
+@@ -410,6 +401,29 @@
+ AC_DEFINE_UNQUOTED(PCAP_RESTART_FUNC, $pcap_restart_func)
+ 
+ dnl
++dnl Now that we're past the OS-specific stuff, which could have
++dnl modified our USE_* and other defines, define them all now.
++dnl 
++
++AC_DEFINE_UNQUOTED(USE_PCAP_RESTART,    $USE_PCAP_RESTART)
++
++AC_DEFINE_UNQUOTED(USE_PCRE,            $USE_PCRE)
++
++AC_DEFINE_UNQUOTED(USE_DROPPRIVS,       $USE_DROPPRIVS)
++AC_DEFINE_UNQUOTED(DROPPRIVS_USER,     "$DROPPRIVS_USER")
++AC_DEFINE_UNQUOTED(DROPPRIVS_ONLY_ROOT, $DROPPRIVS_ONLY_ROOT)
++
++AC_DEFINE_UNQUOTED(HAVE_DUMB_UDPHDR,    $HAVE_DUMB_UDPHDR)
++
++AC_DEFINE_UNQUOTED(HAVE_DLT_RAW,        $HAVE_DLT_RAW) 
++AC_DEFINE_UNQUOTED(HAVE_DLT_IEEE802_11, $HAVE_DLT_IEEE802_11) 
++AC_DEFINE_UNQUOTED(HAVE_DLT_LOOP,       $HAVE_DLT_LOOP) 
++AC_DEFINE_UNQUOTED(HAVE_DLT_LINUX_SLL,  $HAVE_DLT_LINUX_SLL) 
++AC_DEFINE_UNQUOTED(USE_PCAP_BPF,        $USE_PCAP_BPF) 
++
++
++
++dnl
+ dnl AC_SUBST in the tack-on globals..
+ dnl
+ 
+diff -Nru ngrep-1.42/ngrep.c ngrep-1.42-libpcap-include-patched/ngrep.c
+--- ngrep-1.42/ngrep.c	2004-03-29 10:15:59.000000000 +0800
++++ ngrep-1.42-libpcap-include-patched/ngrep.c	2004-05-23 19:22:47.705671504 +0800
+@@ -55,7 +55,7 @@
+ #include <netinet/ip_icmp.h>
+ 
+ #include <pcap.h>
+-#include <net/bpf.h>
++
+ 
+ #include <stdlib.h>
+ #include <string.h>
+@@ -68,6 +68,13 @@
+ #include "config.h"
+ #endif
+ 
++#if USE_PCAP_BPF
++#include <pcap-bpf.h>
++#else
++#include <net/bpf.h>
++#endif
++
++
+ #if USE_PCRE
+ #include "pcre-3.4/pcre.h"
+ #else
diff --git a/net-analyzer/ngrep/metadata.xml b/net-analyzer/ngrep/metadata.xml
new file mode 100644
index 000000000000..08cca393b1b2
--- /dev/null
+++ b/net-analyzer/ngrep/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+<longdescription>A grep for network layers</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/ngrep/ngrep-1.42.ebuild b/net-analyzer/ngrep/ngrep-1.42.ebuild
new file mode 100644
index 000000000000..662d78f36834
--- /dev/null
+++ b/net-analyzer/ngrep/ngrep-1.42.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.42.ebuild,v 1.1 2004/07/05 10:03:38 eldad Exp $
+
+inherit eutils
+
+IUSE=""
+DESCRIPTION="A grep for network layers"
+SRC_URI="mirror://sourceforge/ngrep/${P}.tar.bz2"
+RESTRICT="nomirror"
+HOMEPAGE="http://ngrep.sourceforge.net"
+
+DEPEND="virtual/libc
+	>=net-libs/libpcap-0.5.2
+	sys-devel/autoconf"
+
+RDEPEND="virtual/libc"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-libpcap-include.patch
+}
+
+src_compile() {
+	WANT_AUTOCONF=2.5 autoconf
+
+	econf || die
+	make || die
+}
+
+src_install() {
+	into /usr
+	dobin ngrep
+	doman ngrep.8
+	dodoc BUGS CHANGES COPYRIGHT CREDITS README TODO USAGE
+}