dsniff: fix build, correct mandir

5 files changed, 94 insertions, 31 deletions

diff --git a/dsniff/.footprint b/dsniff/.footprint
index 484d30c8e..45c3f3e67 100644
--- a/dsniff/.footprint
+++ b/dsniff/.footprint
@@ -1,20 +1,4 @@
 drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man8/
--rw-r--r--	root/root	usr/man/man8/arpspoof.8.gz
--rw-r--r--	root/root	usr/man/man8/dnsspoof.8.gz
--rw-r--r--	root/root	usr/man/man8/dsniff.8.gz
--rw-r--r--	root/root	usr/man/man8/filesnarf.8.gz
--rw-r--r--	root/root	usr/man/man8/macof.8.gz
--rw-r--r--	root/root	usr/man/man8/mailsnarf.8.gz
--rw-r--r--	root/root	usr/man/man8/msgsnarf.8.gz
--rw-r--r--	root/root	usr/man/man8/sshmitm.8.gz
--rw-r--r--	root/root	usr/man/man8/sshow.8.gz
--rw-r--r--	root/root	usr/man/man8/tcpkill.8.gz
--rw-r--r--	root/root	usr/man/man8/tcpnice.8.gz
--rw-r--r--	root/root	usr/man/man8/urlsnarf.8.gz
--rw-r--r--	root/root	usr/man/man8/webmitm.8.gz
--rw-r--r--	root/root	usr/man/man8/webspy.8.gz
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/arpspoof
 -rwxr-xr-x	root/root	usr/sbin/dnsspoof
@@ -29,9 +13,24 @@ drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/tcpnice
 -rwxr-xr-x	root/root	usr/sbin/urlsnarf
 -rwxr-xr-x	root/root	usr/sbin/webmitm
--rwxr-xr-x	root/root	usr/sbin/webspy
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/dsniff/
 -rw-r--r--	root/root	usr/share/dsniff/dnsspoof.hosts
 -rw-r--r--	root/root	usr/share/dsniff/dsniff.magic
 -rw-r--r--	root/root	usr/share/dsniff/dsniff.services
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/arpspoof.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/dnsspoof.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/dsniff.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/filesnarf.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/macof.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/mailsnarf.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/msgsnarf.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/sshmitm.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/sshow.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/tcpkill.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/tcpnice.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/urlsnarf.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/webmitm.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/webspy.8.gz
diff --git a/dsniff/.signature b/dsniff/.signature
index 2129861e8..8dbb40ee3 100644
--- a/dsniff/.signature
+++ b/dsniff/.signature
@@ -1,8 +1,13 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3wFcbdEFpS7lyEmrqVMixsTXsmHzgt5X+zrejdA28i0scJNwVYYuYn25XofCompP9N6BhQcQ+ymh0SCSO1JAFQo=
-SHA256 (Pkgfile) = b85e5ae6b93bcf336a0b35858319d292cc1ca1b047323a569381f89114f15850
-SHA256 (.footprint) = 9c33fa3b949681280333284e12ecc595cb1bc620c5adc60e35fb1cd431c64308
+RWSagIOpLGJF37fQFpaPHxw7MiZrfDWM08N543vWsSJFBazju+FxL5qYHxV1Z4MRfa3Zo4vtE0oJMbSlg16/mUAifn+uo9YIYg4=
+SHA256 (Pkgfile) = 82dff69764b0aae661d109ac0e7ee3239de7d26b88788036938e26e0d1de5ff7
+SHA256 (.footprint) = 4454386cb70edee48b829d683ac4e583baeddba361b5f893e4f36a461b1243ed
 SHA256 (dsniff-2.4b1.tar.gz) = a9803a7a02ddfe5fb9704ce86f0ffc48453c321e88db85810db411ba0841152a
+SHA256 (dsniff_2.4b1+debian-29.debian.tar.xz) = 3f2263452facf9f0a402497b34c7a2573da0700005bb3c7940df9c5e099b5835
 SHA256 (2.3-makefile.patch) = bc1d92546b3de8ff6958eee40dc086cf489c6f2b4623998e155c1586d083fee3
 SHA256 (dsniff-2.4_beta1-debian-r1.patch) = b3690529ad3b282cb49161fed9a3ebc60600fccbab3a3c99a5a7abd74ab53eb3
 SHA256 (dsniff-httppostfix.patch) = 320dab87c7c7f9ce86acf8830041da39aa367ba4149fa4eeffac93041d459293
+SHA256 (dsniff-rpc.patch) = 21b37ba4c386aa576d6829c298bdd62df6fa227e44164d9e96675e66b93bb134
+SHA256 (dsniff-macof-size-calculation.patch) = d8f5cc5d14a614410a84a8eaba5a4212ee03466c4fe2fd4a634f5d7c3f688ec7
+SHA256 (dsniff-rpc.patch) = 21b37ba4c386aa576d6829c298bdd62df6fa227e44164d9e96675e66b93bb134
+SHA256 (dsniff-macof-size-calculation.patch) = d8f5cc5d14a614410a84a8eaba5a4212ee03466c4fe2fd4a634f5d7c3f688ec7
diff --git a/dsniff/Pkgfile b/dsniff/Pkgfile
index fbe6cd715..627ea3a18 100644
--- a/dsniff/Pkgfile
+++ b/dsniff/Pkgfile
@@ -5,30 +5,38 @@
 
 name=dsniff
 version=2.4b1
-release=1
+release=2
 source=(http://monkey.org/~dugsong/dsniff/beta/$name-$version.tar.gz
+        http://ftp.de.debian.org/debian/pool/main/d/$name/${name}_2.4b1+debian-29.debian.tar.xz
         2.3-makefile.patch dsniff-2.4_beta1-debian-r1.patch
-        dsniff-httppostfix.patch)
+        dsniff-httppostfix.patch dsniff-rpc.patch
+        dsniff-macof-size-calculation.patch
+        dsniff-rpc.patch dsniff-macof-size-calculation.patch)
 
 build() {
     cd  $name-2.4
-    patch -i ../2.3-makefile.patch
-    patch -i ../dsniff-2.4_beta1-debian-r1.patch
+    ## https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/dsniff
+    while IFS='' read -r patch || [[ -n "${patch}" ]]; do
+      echo "** Applying patch ${patch}"
+      patch -Np1 < "../debian/patches/${patch}"
+    done < ../debian/patches/series
+    patch -i ../dsniff-macof-size-calculation.patch
     patch -i ../dsniff-httppostfix.patch
+    patch -i ../dsniff-rpc.patch
     sed -i -e 's/CLK_TCK/CLOCKS_PER_SEC/g' sshow.c
-    export LDFLAGS="`pkg-config --libs gthread-2.0` -lresolv" 
-    export CFLAGS="`pkg-config --cflags gthread-2.0`" 
-    ./configure --prefix=/usr
+    export LDFLAGS="`pkg-config --libs gthread-2.0` -lresolv"
+    export CFLAGS="`pkg-config --cflags gthread-2.0`"
+    autoreconf -fiv
+    ./configure --prefix=/usr --with-libtirpc
     #echo 'LDFLAGS += -lresolv' >> Makefile
     make
     install -d -m 755 $PKG/usr/sbin
     for prog in arpspoof dnsspoof dsniff filesnarf macof mailsnarf msgsnarf \
-    sshmitm sshow tcpkill tcpnice  urlsnarf webmitm webspy; do \
+    sshmitm sshow tcpkill tcpnice  urlsnarf webmitm; do \
       install -m 755 $prog $PKG/usr/sbin/; done
-    install -d -m 755 $PKG/usr/man/man8
-    for man in *.8; do install -D -m 644 $man $PKG/usr/man/man8; done
+    install -d -m 755 $PKG/usr/share/man/man8
+    for man in *.8; do install -D -m 644 $man $PKG/usr/share/man/man8; done
     install -d -m 755 $PKG/usr/share/dsniff
     for shares in dnsspoof.hosts dsniff.magic dsniff.services; do \
       install -m 644 $shares $PKG/usr/share/dsniff; done
-
 }
diff --git a/dsniff/dsniff-macof-size-calculation.patch b/dsniff/dsniff-macof-size-calculation.patch
new file mode 100644
index 000000000..068133de2
--- /dev/null
+++ b/dsniff/dsniff-macof-size-calculation.patch
@@ -0,0 +1,11 @@
+--- a/macof.c
++++ b/macof.c
+@@ -134,7 +134,7 @@ main(int argc, char *argv[])
+ 		libnet_build_tcp(sport, dport, seq, 0, TH_SYN, 512,
+ 				 0, 0, LIBNET_TCP_H, NULL, 0, l, 0);
+ 		
+-		libnet_build_ipv4(LIBNET_TCP_H, 0,
++		libnet_build_ipv4(LIBNET_IPV4_H + LIBNET_TCP_H, 0,
+ 				  libnet_get_prand(LIBNET_PRu16), 0, 64,
+ 				  IPPROTO_TCP, 0, src, dst, NULL, 0, l, 0);
+ 		
diff --git a/dsniff/dsniff-rpc.patch b/dsniff/dsniff-rpc.patch
new file mode 100644
index 000000000..dcd9a5778
--- /dev/null
+++ b/dsniff/dsniff-rpc.patch
@@ -0,0 +1,40 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -37,8 +37,8 @@
+ X11INC	= @X_CFLAGS@
+ X11LIB	= @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
+ 
+-INCS	= -I. $(NIDSINC) $(PCAPINC) $(LNETINC) $(DBINC) $(SSLINC) $(X11INC) \
+-	  -I$(srcdir)/missing
+-LIBS	= @LIBS@ -L$(srcdir) -lmissing
++INCS	= -I. $(NIDSINC) $(PCAPINC) $(LNETINC) $(DBINC) $(SSLINC) $(X11INC) @RPC_CFLAGS@ \
++	  -I$(srcdir)/missing
++LIBS	= @LIBS@ -L$(srcdir) -lmissing @RPC_LIBS@
+ 
+ INSTALL	= @INSTALL@
+--- a/configure.in
++++ b/configure.in
+@@ -337,4 +337,23 @@
+ AC_SUBST(SSLINC)
+ AC_SUBST(SSLLIB)
+ 
++AC_ARG_WITH([libtirpc],
++	    AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
++	    [], [ with_libtirpc=no ])
++
++AS_IF([test "x$with_libtirpc" != xno], 
++      [PKG_CHECK_MODULES([TIRPC], 
++                         [libtirpc], 
++                         [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
++			 [AC_MSG_ERROR([libtirpc requested, but library not found.])]
++	                )], 
++      [AC_CHECK_HEADER(rpc/rpc.h, 
++		       [RPC_CFLAGS=""; RPC_LIBS="";],
++		       [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
++	              )]
++)
++
++AC_SUBST(RPC_CFLAGS)
++AC_SUBST(RPC_LIBS)
++
+ AC_OUTPUT(Makefile)