dsniff-libnet1.patch

   1 diff -Nur dsniff-2.3.org/arpspoof.c dsniff-2.3/arpspoof.c
   2 --- dsniff-2.3.org/arpspoof.c   2000-11-28 07:43:43.000000000 +0000
   3 +++ dsniff-2.3/arpspoof.c       2003-07-03 20:04:23.000000000 +0000
   4 @@ -17,7 +17,7 @@
   5  #include <string.h>
   6  #include <signal.h>
   7  #include <err.h>
   8 -#include <libnet.h>
   9 +#include <libnet1.h>
  10  #include <pcap.h>
  11
  12  #include "version.h"
  13 diff -Nur dsniff-2.3.org/decode_portmap.c dsniff-2.3/decode_portmap.c
  14 --- dsniff-2.3.org/decode_portmap.c     2000-12-15 20:13:29.000000000 +0000
  15 +++ dsniff-2.3/decode_portmap.c 2003-07-03 20:04:23.000000000 +0000
  16 @@ -15,7 +15,7 @@
  17  #include <rpc/pmap_prot.h>
  18  #include <stdio.h>
  19  #include <stdlib.h>
  20 -#include <libnet.h>
  21 +#include <libnet1.h>
  22  #include <nids.h>
  23  #include "rpc.h"
  24  #include "trigger.h"
  25 diff -Nur dsniff-2.3.org/dnsspoof.c dsniff-2.3/dnsspoof.c
  26 --- dsniff-2.3.org/dnsspoof.c   2003-07-03 19:56:40.000000000 +0000
  27 +++ dsniff-2.3/dnsspoof.c       2003-07-03 20:04:23.000000000 +0000
  28 @@ -21,7 +21,7 @@
  29  #include <string.h>
  30  #include <resolv.h>
  31  #include <err.h>
  32 -#include <libnet.h>
  33 +#include <libnet1.h>
  34  #include <pcap.h>
  35  #include "slist.h"
  36  #include "pcaputil.h"
  37 diff -Nur dsniff-2.3.org/dsniff.c dsniff-2.3/dsniff.c
  38 --- dsniff-2.3.org/dsniff.c     2000-12-01 21:27:15.000000000 +0000
  39 +++ dsniff-2.3/dsniff.c 2003-07-03 20:04:23.000000000 +0000
  40 @@ -18,7 +18,7 @@
  41  #include <unistd.h>
  42  #include <signal.h>
  43  #include <err.h>
  44 -#include <libnet.h>
  45 +#include <libnet1.h>
  46  #include <nids.h>
  47  #include <pcap.h>
  48  #include "options.h"
  49 diff -Nur dsniff-2.3.org/filesnarf.c dsniff-2.3/filesnarf.c
  50 --- dsniff-2.3.org/filesnarf.c  2000-12-15 20:16:58.000000000 +0000
  51 +++ dsniff-2.3/filesnarf.c      2003-07-03 20:04:23.000000000 +0000
  52 @@ -19,7 +19,7 @@
  53  #include <fcntl.h>
  54  #include <regex.h>
  55  #include <err.h>
  56 -#include <libnet.h>
  57 +#include <libnet1.h>
  58  #include <nids.h>
  59  #include <pcap.h>
  60
  61 diff -Nur dsniff-2.3.org/macof.c dsniff-2.3/macof.c
  62 --- dsniff-2.3.org/macof.c      2000-11-14 15:50:55.000000000 +0000
  63 +++ dsniff-2.3/macof.c  2003-07-03 20:04:23.000000000 +0000
  64 @@ -18,7 +18,7 @@
  65  #include <stdio.h>
  66  #include <string.h>
  67  #include <err.h>
  68 -#include <libnet.h>
  69 +#include <libnet1.h>
  70  #include <pcap.h>
  71
  72  #include "version.h"
  73 diff -Nur dsniff-2.3.org/mailsnarf.c dsniff-2.3/mailsnarf.c
  74 --- dsniff-2.3.org/mailsnarf.c  2000-11-19 19:39:41.000000000 +0000
  75 +++ dsniff-2.3/mailsnarf.c      2003-07-03 20:04:23.000000000 +0000
  76 @@ -18,7 +18,7 @@
  77  #include <time.h>
  78  #include <regex.h>
  79  #include <err.h>
  80 -#include <libnet.h>
  81 +#include <libnet1.h>
  82  #include <nids.h>
  83  #include <pcap.h>
  84  #include "pcaputil.h"
  85 diff -Nur dsniff-2.3.org/msgsnarf.c dsniff-2.3/msgsnarf.c
  86 --- dsniff-2.3.org/msgsnarf.c   2003-07-03 19:56:40.000000000 +0000
  87 +++ dsniff-2.3/msgsnarf.c       2003-07-03 20:04:23.000000000 +0000
  88 @@ -17,7 +17,7 @@
  89  #include <string.h>
  90  #include <regex.h>
  91  #include <err.h>
  92 -#include <libnet.h>
  93 +#include <libnet1.h>
  94  #include <nids.h>
  95  #include <pcap.h>
  96  #include <pcaputil.h>
  97 diff -Nur dsniff-2.3.org/record.c dsniff-2.3/record.c
  98 --- dsniff-2.3.org/record.c     2003-07-03 19:56:40.000000000 +0000
  99 +++ dsniff-2.3/record.c 2003-07-03 20:04:23.000000000 +0000
 100 @@ -19,7 +19,7 @@
 101  #elif HAVE_DB_H
 102  #include <db.h>
 103  #endif
 104 -#include <libnet.h>
 105 +#include <libnet1.h>
 106  #include "options.h"
 107  #include "record.h"
 108
 109 diff -Nur dsniff-2.3.org/sshmitm.c dsniff-2.3/sshmitm.c
 110 --- dsniff-2.3.org/sshmitm.c    2000-12-17 21:09:43.000000000 +0000
 111 +++ dsniff-2.3/sshmitm.c        2003-07-03 20:04:23.000000000 +0000
 112 @@ -16,7 +16,7 @@
 113  #include <sys/wait.h>
 114  #include <arpa/nameser.h>
 115  #include <openssl/ssl.h>
 116 -#include <libnet.h>
 117 +#include <libnet1.h>
 118
 119  #include <err.h>
 120  #include <errno.h>
 121 diff -Nur dsniff-2.3.org/tcp_raw.c dsniff-2.3/tcp_raw.c
 122 --- dsniff-2.3.org/tcp_raw.c    2000-11-28 07:48:25.000000000 +0000
 123 +++ dsniff-2.3/tcp_raw.c        2003-07-03 20:04:23.000000000 +0000
 124 @@ -12,7 +12,7 @@
 125  #include <sys/uio.h>
 126  #include <time.h>
 127  #include <err.h>
 128 -#include <libnet.h>
 129 +#include <libnet1.h>
 130  #include "options.h"
 131  #include "tcp_raw.h"
 132
 133 diff -Nur dsniff-2.3.org/tcpkill.c dsniff-2.3/tcpkill.c
 134 --- dsniff-2.3.org/tcpkill.c    2000-11-30 00:39:05.000000000 +0000
 135 +++ dsniff-2.3/tcpkill.c        2003-07-03 20:04:23.000000000 +0000
 136 @@ -16,7 +16,7 @@
 137  #include <unistd.h>
 138  #include <string.h>
 139  #include <err.h>
 140 -#include <libnet.h>
 141 +#include <libnet1.h>
 142  #include <pcap.h>
 143  #include "pcaputil.h"
 144  #include "version.h"
 145 diff -Nur dsniff-2.3.org/tcpnice.c dsniff-2.3/tcpnice.c
 146 --- dsniff-2.3.org/tcpnice.c    2000-11-30 00:39:05.000000000 +0000
 147 +++ dsniff-2.3/tcpnice.c        2003-07-03 20:04:23.000000000 +0000
 148 @@ -18,7 +18,7 @@
 149  #include <unistd.h>
 150  #include <string.h>
 151  #include <err.h>
 152 -#include <libnet.h>
 153 +#include <libnet1.h>
 154  #include <pcap.h>
 155  #include "pcaputil.h"
 156  #include "version.h"
 157 diff -Nur dsniff-2.3.org/trigger.c dsniff-2.3/trigger.c
 158 --- dsniff-2.3.org/trigger.c    2000-11-19 21:44:29.000000000 +0000
 159 +++ dsniff-2.3/trigger.c        2003-07-03 20:04:23.000000000 +0000
 160 @@ -12,7 +12,7 @@
 161  #include <sys/uio.h>
 162  #include <stdlib.h>
 163  #include <err.h>
 164 -#include <libnet.h>
 165 +#include <libnet1.h>
 166  #include <nids.h>
 167  #include "decode.h"
 168  #include "magic.h"
 169 diff -Nur dsniff-2.3.org/urlsnarf.c dsniff-2.3/urlsnarf.c
 170 --- dsniff-2.3.org/urlsnarf.c   2000-12-19 02:53:36.000000000 +0000
 171 +++ dsniff-2.3/urlsnarf.c       2003-07-03 20:04:23.000000000 +0000
 172 @@ -21,7 +21,7 @@
 173  #include <regex.h>
 174  #include <time.h>
 175  #include <err.h>
 176 -#include <libnet.h>
 177 +#include <libnet1.h>
 178  #include <nids.h>
 179  #include <pcap.h>
 180  #include "pcaputil.h"
 181 diff -Nur dsniff-2.3.org/webmitm.c dsniff-2.3/webmitm.c
 182 --- dsniff-2.3.org/webmitm.c    2000-12-03 05:13:28.000000000 +0000
 183 +++ dsniff-2.3/webmitm.c        2003-07-03 20:04:23.000000000 +0000
 184 @@ -20,7 +20,7 @@
 185
 186  #include <err.h>
 187  #include <errno.h>
 188 -#include <libnet.h>
 189 +#include <libnet1.h>
 190  #include <signal.h>
 191  #include <stdio.h>
 192  #include <stdlib.h>
 193 diff -Nur dsniff-2.3.org/webspy.c dsniff-2.3/webspy.c
 194 --- dsniff-2.3.org/webspy.c     2000-11-14 15:51:04.000000000 +0000
 195 +++ dsniff-2.3/webspy.c 2003-07-03 20:04:23.000000000 +0000
 196 @@ -21,7 +21,7 @@
 197  #include <string.h>
 198  #include <err.h>
 199  #include <X11/Xlib.h>
 200 -#include <libnet.h>
 201 +#include <libnet1.h>
 202  #include <nids.h>
 203  #include "base64.h"
 204  #include "buf.h"
 205 --- dsniff-2.3.org/configure.in 2003-07-03 19:56:40.000000000 +0000
 206 +++ dsniff-2.3/configure.in     2003-07-03 20:10:06.000000000 +0000
 207 @@ -199,9 +199,9 @@
 208  AC_SUBST(PCAPINC)
 209  AC_SUBST(PCAPLIB)
 210
 211 -dnl Checks for libnet
 212 -AC_MSG_CHECKING(for libnet)
 213 -AC_ARG_WITH(libnet,
 214 +dnl Checks for libnet1
 215 +AC_MSG_CHECKING(for libnet1)
 216 +AC_ARG_WITH(libnet1,
 217  [  --with-libnet=DIR       use libnet in DIR],
 218  [ case "$withval" in
 219    yes|no)
 220 @@ -209,33 +209,33 @@
 221       ;;
 222    *)
 223       AC_MSG_RESULT($withval)
 224 -     if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a; then
 225 +     if test -f $withval/include/libnet1.h -a -f $withval/lib/libnet1.a; then
 226          owd=`pwd`
 227          if cd $withval; then withval=`pwd`; cd $owd; fi
 228 -       if test -f $withval/bin/libnet-config; then
 229 -          CFLAGS="$CFLAGS `$withval/bin/libnet-config --defines`"
 230 -       elif test -f $withval/libnet-config; then
 231 -          CFLAGS="$CFLAGS `$withval/libnet-config --defines`"
 232 +       if test -f $withval/bin/libnet1-config; then
 233 +          CFLAGS="$CFLAGS `$withval/bin/libnet1-config --defines`"
 234 +       elif test -f $withval/libnet1-config; then
 235 +          CFLAGS="$CFLAGS `$withval/libnet1-config --defines`"
 236         else
 237 -          CFLAGS="$CFLAGS `libnet-config --defines`"
 238 +          CFLAGS="$CFLAGS `libnet1-config --defines`"
 239         fi
 240         LNETINC="-I$withval/include"
 241 -       LNETLIB="-L$withval/lib -lnet"
 242 +       LNETLIB="-L$withval/lib -lnet1"
 243       else
 244 -        AC_ERROR(libnet.h or libnet.a not found in $withval)
 245 +        AC_ERROR(libnet1.h or libnet1.a not found in $withval)
 246       fi
 247       ;;
 248    esac ],
 249 -[ if test -f ${prefix}/include/libnet.h; then
 250 -     CFLAGS="$CFLAGS `${prefix}/bin/libnet-config --defines`"
 251 +[ if test -f ${prefix}/include/libnet1.h; then
 252 +     CFLAGS="$CFLAGS `${prefix}/bin/libnet1-config --defines`"
 253       LNETINC="-I${prefix}/include"
 254 -     LNETLIB="-L${prefix}/lib -lnet"
 255 -  elif test -f /usr/include/libnet.h; then
 256 -     CFLAGS="$CFLAGS `libnet-config --defines`"
 257 -     LNETLIB="-lnet"
 258 +     LNETLIB="-L${prefix}/lib -lnet1"
 259 +  elif test -f /usr/include/libnet1.h; then
 260 +     CFLAGS="$CFLAGS `libnet1-config --defines`"
 261 +     LNETLIB="-lnet1"
 262    else
 263       AC_MSG_RESULT(no)
 264 -     AC_ERROR(libnet not found)
 265 +     AC_ERROR(libnet1 not found)
 266    fi
 267    AC_MSG_RESULT(yes) ]
 268  )