openpkg-packages/dsniff/dsniff.patch

--- record.c.orig	Sat Jan  5 20:39:48 2002
+++ record.c	Sat Jan  5 20:39:59 2002
@@ -15,6 +15,7 @@
 #include <md5.h>
 #ifdef HAVE_DB_185_H
 #define DB_LIBRARY_COMPATIBILITY_API
+#define DB185 DB
 #include <db_185.h>
 #elif HAVE_DB_H
 #include <db.h>
--- Libnet-1.0.2a/include/libnet.h.orig	Wed Feb  7 00:19:25 2001
+++ Libnet-1.0.2a/include/libnet.h	Mon Jun  9 14:13:22 2003
@@ -83,10 +83,8 @@
 
 #define LIBNET_VERSION  "1.0.2a"
 
-#if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)
-#error "byte order has not been specified, you'll
-need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the
-documentation regarding the libnet-config script."
+#if (!defined(LIBNET_LIL_ENDIAN) && !defined(LIBNET_BIG_ENDIAN))
+#error "byte order has not been specified, you'll need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN.  See the documentation regarding the libnet-config script."
 #endif
 
 #endif  /* __LIBNET_H */
--- libnids-1.16/src/checksum.c.orig	Tue Jun 20 23:06:32 2000
+++ libnids-1.16/src/checksum.c	Mon Jun  9 14:42:03 2003
@@ -4,193 +4,6 @@
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
 
-#if ( __i386  )
-// all asm procedures are copied from Linux 2.0.36 and 2.2.10 kernels
-
-/*
-  computes the checksum of a memory block at buff, length len, and
-  adds in "sum" (32-bit)
- 
-  returns a 32-bit number suitable for feeding into itself or
-  csum_tcpudp_magic
- 
-  this function must be called with even lengths, except for the last
-  fragment, which may be odd
- 
-  it's best to have buff aligned on a 32-bit boundary
-*/
-u_int
-csum_partial(const u_char * buff, int len, u_int sum)
-{
-  __asm__ (
-/*		"pushl %esi
-	pushl %ebx
-	movl 20(%esp),%eax	# Function arg: u_int sum
-	movl 16(%esp),%ecx	# Function arg: int len
-        movl 12(%esp),%esi	# Function arg: u_char *buff*/
-
-       "testl $2, %%esi		
-	jz 2f			
-	subl $2, %%ecx		
-	jae 1f			
-	addl $2, %%ecx		
-	jmp 4f
-1:	movw (%%esi), %%bx
-	addl $2, %%esi
-	addw %%bx, %%ax
-	adcl $0, %%eax
-2:
-	movl %%ecx, %%edx
-	shrl $5, %%ecx
-	jz 2f
-	testl %%esi, %%esi
-1:	movl (%%esi), %%ebx
-	adcl %%ebx, %%eax
-	movl 4(%%esi), %%ebx
-	adcl %%ebx, %%eax
-	movl 8(%%esi), %%ebx
-	adcl %%ebx, %%eax
-	movl 12(%%esi), %%ebx
-	adcl %%ebx, %%eax
-	movl 16(%%esi), %%ebx
-	adcl %%ebx, %%eax
-	movl 20(%%esi), %%ebx
-	adcl %%ebx, %%eax
-	movl 24(%%esi), %%ebx
-	adcl %%ebx, %%eax
-	movl 28(%%esi), %%ebx
-	adcl %%ebx, %%eax
-	lea 32(%%esi), %%esi
-	dec %%ecx
-	jne 1b
-	adcl $0, %%eax
-2:	movl %%edx, %%ecx
-	andl $0x1c, %%edx
-	je 4f
-	shrl $2, %%edx		
-3:	adcl (%%esi), %%eax
-	lea 4(%%esi), %%esi
-	dec %%edx
-	jne 3b
-	adcl $0, %%eax
-4:	andl $3, %%ecx
-	jz 7f
-	cmpl $2, %%ecx
-	jb 5f
-	movw (%%esi),%%cx
-	leal 2(%%esi),%%esi
-	je 6f
-	shll $16,%%ecx
-5:	movb (%%esi),%%cl
-6:	addl %%ecx,%%eax
-	adcl $0, %%eax
-7: "
-       : "=a"(sum)
-       : "0"(sum), "c"(len), "S"(buff)
-       : "bx", "dx");
-
-  return (sum);
-}
-
-/*
-  This is a version of ip_compute_csum() optimized for IP headers,
-  which always checksum on 4 octet boundaries.
- 
-  By Jorge Cwik <jorge@laser.satlink.net>, adapted for linux by Arnt
-  Gulbrandsen.
-*/
-inline u_short ip_fast_csum(u_char * iph, u_int ihl)
-{
-  u_int sum;
-  
-  __asm__ __volatile__("
-	    movl (%1), %0
-	    subl $4, %2
-	    jbe 2f
-	    addl 4(%1), %0
-	    adcl 8(%1), %0
-	    adcl 12(%1), %0
-1:	    adcl 16(%1), %0
-	    lea 4(%1), %1
-	    decl %2
-	    jne	1b
-	    adcl $0, %0
-	    movl %0, %2
-	    shrl $16, %0
-	    addw %w2, %w0
-	    adcl $0, %0
-	    notl %0
-2:
-	    "
-	/*
-	  Since the input registers which are loaded with iph and ipl
-	  are modified, we must also specify them as outputs, or gcc
-	  will assume they contain their original values.
-	*/
-	: "=r" (sum), "=r" (iph), "=r" (ihl)
-	: "1" (iph), "2" (ihl));
-  
-  return (sum);
-}
-
-/* Fold a partial checksum. */
-static inline u_int
-csum_fold(u_int sum)
-{
-  __asm__("
-	addl %1, %0
-	adcl $0xffff, %0
-	"
-	: "=r" (sum)
-	: "r" (sum << 16), "0" (sum & 0xffff0000)
-	  );
-  return ((~sum) >> 16);
-}
- 
-/*
-  computes the checksum of the TCP/UDP pseudo-header
-  returns a 16-bit checksum, already complemented
-*/
-static inline u_short
-csum_tcpudp_magic(u_int saddr, u_int daddr, u_short len,
-		  u_short proto, u_int sum)
-{
-  __asm__("
-	addl %1, %0
-	adcl %2, %0
-	adcl %3, %0
-	adcl $0, %0
-	"
-	: "=r" (sum)
-	: "g" (daddr), "g"(saddr), "g"((ntohs(len) << 16) + proto * 256), "0"(sum));
-  return (csum_fold(sum));
-}
-
-/*
-  this routine is used for miscellaneous IP-like checksums, mainly in
-  icmp.c
-*/
-inline u_short
-ip_compute_csum(u_char * buff, int len)
-{
-  return (csum_fold(csum_partial(buff, len, 0)));
-}
-
-inline u_short
-my_tcp_check(struct tcphdr *th, int len, u_int saddr, u_int daddr)
-{
-  return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_TCP,
-			   csum_partial((char *)th, len, 0));
-}
-inline u_short
-my_udp_check(void *u, int len, u_int saddr, u_int daddr)
-{
-  return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_UDP,
-			   csum_partial((char *)u, len, 0));
-}
-
-#else /* !i386 */
-
 struct psuedo_hdr
 {
   u_int saddr;      
@@ -275,4 +88,3 @@
   return (ip_check_ext((u_short *)u, len, sum));
 }                     
 
-#endif /* !i386 */
--- missing/md5.c.dist	2003-08-11 18:01:03.000000000 +0200
+++ missing/md5.c	2003-08-11 18:01:15.000000000 +0200
@@ -15,6 +15,7 @@
  * will fill a supplied 16-byte array with the digest.
  */
 
+#include "../../config.h"
 #include "config.h"
 
 #include <sys/types.h>
--- configure.dist	2000-12-03 05:35:46.000000000 +0100
+++ configure	2006-04-10 16:12:01.413580000 +0200
@@ -3023,7 +3023,7 @@
 	PCAPINC="-I$withval -I$withval/bpf"
 	PCAPLIB="-L$withval -lpcap"
      elif test -f $withval/include/pcap.h -a \
-	       -f $withval/include/net/bpf.h -a \
+	       -f $withval/include/pcap-bpf.h -a \
 	       -f $withval/lib/libpcap.a; then
 	owd=`pwd`
 	if cd $withval; then withval=`pwd`; cd $owd; fi
--- sshcrypto.c.dist	2006-04-10 16:23:47.620867000 +0200
+++ sshcrypto.c	2006-04-10 16:23:51.097252000 +0200
@@ -14,6 +14,8 @@
 
 #include <sys/types.h>
 #include <openssl/ssl.h>
+#include <openssl/blowfish.h>
+#include <openssl/des.h>
 
 #include <err.h>
 #include <stdio.h>
add missing patch 24 years ago			`--- record.c.orig Sat Jan 5 20:39:48 2002`
			`+++ record.c Sat Jan 5 20:39:59 2002`
			`@@ -15,6 +15,7 @@`
			`#include <md5.h>`
			`#ifdef HAVE_DB_185_H`
			`#define DB_LIBRARY_COMPATIBILITY_API`
			`+#define DB185 DB`
			`#include <db_185.h>`
			`#elif HAVE_DB_H`
			`#include <db.h>`
Ok, just before going onto holidays, let's finally (puhhh) repair this package, too. This package was broken since a longer time because of the newer libnids package. And I've found workaround int the past. This solution now is the hard-core one: include all libs it requires locally and patch those locally to fit together. 23 years ago			`--- Libnet-1.0.2a/include/libnet.h.orig Wed Feb 7 00:19:25 2001`
			`+++ Libnet-1.0.2a/include/libnet.h Mon Jun 9 14:13:22 2003`
			`@@ -83,10 +83,8 @@`

			`#define LIBNET_VERSION "1.0.2a"`

			`-#if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN)`
			`-#error "byte order has not been specified, you'll`
			`-need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the`
			`-documentation regarding the libnet-config script."`
			`+#if (!defined(LIBNET_LIL_ENDIAN) && !defined(LIBNET_BIG_ENDIAN))`
			`+#error "byte order has not been specified, you'll need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the documentation regarding the libnet-config script."`
			`#endif`

			`#endif /* __LIBNET_H */`
			`--- libnids-1.16/src/checksum.c.orig Tue Jun 20 23:06:32 2000`
			`+++ libnids-1.16/src/checksum.c Mon Jun 9 14:42:03 2003`
			`@@ -4,193 +4,6 @@`
			`#include <netinet/tcp.h>`
			`#include <netinet/udp.h>`

			`-#if ( __i386 )`
			`-// all asm procedures are copied from Linux 2.0.36 and 2.2.10 kernels`
			`-`
			`-/*`
			`- computes the checksum of a memory block at buff, length len, and`
			`- adds in "sum" (32-bit)`
			`-`
			`- returns a 32-bit number suitable for feeding into itself or`
			`- csum_tcpudp_magic`
			`-`
			`- this function must be called with even lengths, except for the last`
			`- fragment, which may be odd`
			`-`
			`- it's best to have buff aligned on a 32-bit boundary`
			`-*/`
			`-u_int`
			`-csum_partial(const u_char * buff, int len, u_int sum)`
			`-{`
			`- __asm__ (`
			`-/* "pushl %esi`
			`- pushl %ebx`
			`- movl 20(%esp),%eax # Function arg: u_int sum`
			`- movl 16(%esp),%ecx # Function arg: int len`
			`- movl 12(%esp),%esi # Function arg: u_char buff/`
			`-`
			`- "testl $2, %%esi`
			`- jz 2f`
			`- subl $2, %%ecx`
			`- jae 1f`
			`- addl $2, %%ecx`
			`- jmp 4f`
			`-1: movw (%%esi), %%bx`
			`- addl $2, %%esi`
			`- addw %%bx, %%ax`
			`- adcl $0, %%eax`
			`-2:`
			`- movl %%ecx, %%edx`
			`- shrl $5, %%ecx`
			`- jz 2f`
			`- testl %%esi, %%esi`
			`-1: movl (%%esi), %%ebx`
			`- adcl %%ebx, %%eax`
			`- movl 4(%%esi), %%ebx`
			`- adcl %%ebx, %%eax`
			`- movl 8(%%esi), %%ebx`
			`- adcl %%ebx, %%eax`
			`- movl 12(%%esi), %%ebx`
			`- adcl %%ebx, %%eax`
			`- movl 16(%%esi), %%ebx`
			`- adcl %%ebx, %%eax`
			`- movl 20(%%esi), %%ebx`
			`- adcl %%ebx, %%eax`
			`- movl 24(%%esi), %%ebx`
			`- adcl %%ebx, %%eax`
			`- movl 28(%%esi), %%ebx`
			`- adcl %%ebx, %%eax`
			`- lea 32(%%esi), %%esi`
			`- dec %%ecx`
			`- jne 1b`
			`- adcl $0, %%eax`
			`-2: movl %%edx, %%ecx`
			`- andl $0x1c, %%edx`
			`- je 4f`
			`- shrl $2, %%edx`
			`-3: adcl (%%esi), %%eax`
			`- lea 4(%%esi), %%esi`
			`- dec %%edx`
			`- jne 3b`
			`- adcl $0, %%eax`
			`-4: andl $3, %%ecx`
			`- jz 7f`
			`- cmpl $2, %%ecx`
			`- jb 5f`
			`- movw (%%esi),%%cx`
			`- leal 2(%%esi),%%esi`
			`- je 6f`
			`- shll $16,%%ecx`
			`-5: movb (%%esi),%%cl`
			`-6: addl %%ecx,%%eax`
			`- adcl $0, %%eax`
			`-7: "`
			`- : "=a"(sum)`
			`- : "0"(sum), "c"(len), "S"(buff)`
			`- : "bx", "dx");`
			`-`
			`- return (sum);`
			`-}`
			`-`
			`-/*`
			`- This is a version of ip_compute_csum() optimized for IP headers,`
			`- which always checksum on 4 octet boundaries.`
			`-`
			`- By Jorge Cwik <jorge@laser.satlink.net>, adapted for linux by Arnt`
			`- Gulbrandsen.`
			`-*/`
			`-inline u_short ip_fast_csum(u_char * iph, u_int ihl)`
			`-{`
			`- u_int sum;`
			`-`
			`- __asm__ __volatile__("`
			`- movl (%1), %0`
			`- subl $4, %2`
			`- jbe 2f`
			`- addl 4(%1), %0`
			`- adcl 8(%1), %0`
			`- adcl 12(%1), %0`
			`-1: adcl 16(%1), %0`
			`- lea 4(%1), %1`
			`- decl %2`
			`- jne 1b`
			`- adcl $0, %0`
			`- movl %0, %2`
			`- shrl $16, %0`
			`- addw %w2, %w0`
			`- adcl $0, %0`
			`- notl %0`
			`-2:`
			`- "`
			`- /*`
			`- Since the input registers which are loaded with iph and ipl`
			`- are modified, we must also specify them as outputs, or gcc`
			`- will assume they contain their original values.`
			`- */`
			`- : "=r" (sum), "=r" (iph), "=r" (ihl)`
			`- : "1" (iph), "2" (ihl));`
			`-`
			`- return (sum);`
			`-}`
			`-`
			`-/* Fold a partial checksum. */`
			`-static inline u_int`
			`-csum_fold(u_int sum)`
			`-{`
			`- __asm__("`
			`- addl %1, %0`
			`- adcl $0xffff, %0`
			`- "`
			`- : "=r" (sum)`
			`- : "r" (sum << 16), "0" (sum & 0xffff0000)`
			`- );`
			`- return ((~sum) >> 16);`
			`-}`
			`-`
			`-/*`
			`- computes the checksum of the TCP/UDP pseudo-header`
			`- returns a 16-bit checksum, already complemented`
			`-*/`
			`-static inline u_short`
			`-csum_tcpudp_magic(u_int saddr, u_int daddr, u_short len,`
			`- u_short proto, u_int sum)`
			`-{`
			`- __asm__("`
			`- addl %1, %0`
			`- adcl %2, %0`
			`- adcl %3, %0`
			`- adcl $0, %0`
			`- "`
			`- : "=r" (sum)`
			`- : "g" (daddr), "g"(saddr), "g"((ntohs(len) << 16) + proto * 256), "0"(sum));`
			`- return (csum_fold(sum));`
			`-}`
			`-`
			`-/*`
			`- this routine is used for miscellaneous IP-like checksums, mainly in`
			`- icmp.c`
			`-*/`
			`-inline u_short`
			`-ip_compute_csum(u_char * buff, int len)`
			`-{`
			`- return (csum_fold(csum_partial(buff, len, 0)));`
			`-}`
			`-`
			`-inline u_short`
			`-my_tcp_check(struct tcphdr *th, int len, u_int saddr, u_int daddr)`
			`-{`
			`- return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_TCP,`
			`- csum_partial((char *)th, len, 0));`
			`-}`
			`-inline u_short`
			`-my_udp_check(void *u, int len, u_int saddr, u_int daddr)`
			`-{`
			`- return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_UDP,`
			`- csum_partial((char *)u, len, 0));`
			`-}`
			`-`
			`-#else /* !i386 */`
			`-`
			`struct psuedo_hdr`
			`{`
			`u_int saddr;`
			`@@ -275,4 +88,3 @@`
			`return (ip_check_ext((u_short *)u, len, sum));`
			`}`

			`-#endif /* !i386 */`
pull in global config.h to get proper type definitions in helper functions 23 years ago			`--- missing/md5.c.dist 2003-08-11 18:01:03.000000000 +0200`
			`+++ missing/md5.c 2003-08-11 18:01:15.000000000 +0200`
			`@@ -15,6 +15,7 @@`
			`* will fill a supplied 16-byte array with the digest.`
			`*/`

			`+#include "../../config.h"`
			`#include "config.h"`

			`#include <sys/types.h>`
apply a bunch of Solaris fixes from Michael Schloh 19 years ago			`--- configure.dist 2000-12-03 05:35:46.000000000 +0100`
			`+++ configure 2006-04-10 16:12:01.413580000 +0200`
			`@@ -3023,7 +3023,7 @@`
			`PCAPINC="-I$withval -I$withval/bpf"`
			`PCAPLIB="-L$withval -lpcap"`
			`elif test -f $withval/include/pcap.h -a \`
			`- -f $withval/include/net/bpf.h -a \`
			`+ -f $withval/include/pcap-bpf.h -a \`
			`-f $withval/lib/libpcap.a; then`
			owd=`pwd`
			if cd $withval; then withval=`pwd`; cd $owd; fi
			`--- sshcrypto.c.dist 2006-04-10 16:23:47.620867000 +0200`
			`+++ sshcrypto.c 2006-04-10 16:23:51.097252000 +0200`
			`@@ -14,6 +14,8 @@`

			`#include <sys/types.h>`
			`#include <openssl/ssl.h>`
			`+#include <openssl/blowfish.h>`
			`+#include <openssl/des.h>`

			`#include <err.h>`
			`#include <stdio.h>`