Date: Sat, 08 Nov 2003 09:08:56 -0800 From: walt <wa1ter@myrealbox.com> To: freebsd-ports@freebsd.org Subject: ngrep in -current [PATCH] Message-ID: <3FAD2328.3010900@myrealbox.com>
next in thread | raw e-mail | index | archive | help
These two patches let ngrep compile in -CURRENT. This is the
first patch I've ever submitted, so it's most likely not in the
format you prefer. Any hints would be welcome.
The first is just an edit of the existing files/patch-ngrep.c
(rather than a diff against the old patch-ngrep.c):
==================================================================
#cat files/patch-ngrep.c
--- ngrep.c.orig Wed Aug 8 23:36:09 2001
+++ ngrep.c Wed Aug 8 23:36:31 2001
@@ -62,6 +62,7 @@
#include "ngrep.h"
+extern FILE *pcapyyin;
static char rcsver[] = "$Revision: 1.18 $";
@@ -232,7 +233,7 @@
filter = get_filter(&argv[optind-1]);
#ifdef NEED_RESTART
- PCAP_RESTART();
+ PCAP_RESTART(pcapyyin);
#endif
if (pcap_compile(pd, &pcapfilter, filter, 0, mask.s_addr)) {
pcap_perror(pd, "pcap compile");
===================================================================
This is a new patch for 'configure':
#cat work/ngrep/patch-configure
--- configure.orig Mon Dec 31 14:04:08 2001
+++ configure Sat Nov 8 08:40:23 2003
@@ -1978,9 +1978,9 @@
else
echo "$ac_t""no" 1>&6
-echo $ac_n "checking for pcap_yyrestart in -lpcap""... $ac_c" 1>&6
-echo "configure:1983: checking for pcap_yyrestart in -lpcap" >&5
-ac_lib_var=`echo pcap'_'pcap_yyrestart | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for pcapyyrestart in -lpcap""... $ac_c" 1>&6
+echo "configure:1983: checking for pcapyyrestart in -lpcap" >&5
+ac_lib_var=`echo pcap'_'pcapyyrestart | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1992,10 +1992,10 @@
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char pcap_yyrestart();
+char pcapyyrestart();
int main() {
-pcap_yyrestart()
+pcapyyrestart()
; return 0; }
EOF
if { (eval echo configure:2002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -2014,7 +2014,7 @@
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
-#define PCAP_RESTART pcap_yyrestart
+#define PCAP_RESTART pcapyyrestart
EOF
else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3FAD2328.3010900>