--- linux.orig/net/ipsec/crypto/blowfish/bf_skey.c	Tue Jun 29 15:40:33 1999
+++ linux/net/ipsec/crypto/blowfish/bf_skey.c	Fri Jun 25 10:54:53 1999
@@ -57,7 +57,11 @@
  */
 
 #include <stdio.h>
+#if !defined __GLIBC__ || __GLIBC__ < 2
 #include <string.h>
+#else
+#include <linux/socket.h>
+#endif
 #include "blowfish.h"
 #include "bf_locl.h"
 #include "bf_pi.h"
--- linux.orig/net/ipsec/br.h	Tue Jun 29 15:40:33 1999
+++ linux/net/ipsec/br.h	Fri Jun 25 10:22:30 1999
@@ -5,7 +5,10 @@
 on the appropriate ENDIAN machines */
 
 #include <endian.h>
+
+#if !defined __GLIBC__ || __GLIBC__ < 2
 #include <bytesex.h>
+#endif
 
 static __inline__ void ByteReverse( unsigned long *buffer, int byteCount )
 {
--- linux.orig/net/ipv4/ip_output.c	Tue Jun 29 15:40:32 1999
+++ linux/net/ipv4/ip_output.c	Wed Jun 23 16:11:11 1999
@@ -512,7 +512,7 @@
 	switch (call_out_firewall(PF_INET, rt->u.dst.dev, skb->nh.iph, NULL, &skb)) {
 	case FW_QUEUE:
 		kfree_skb(skb);
-		continue;
+		return 0;
 	case FW_BLOCK:
 	case FW_REJECT:
 		kfree_skb(skb);
--- linux.orig/net/ipsec/sadb.c	Tue Jun 29 15:40:33 1999
+++ linux/net/ipsec/sadb.c	Fri Jun 25 10:14:38 1999
@@ -1933,8 +1933,8 @@
 			printk(KERN_INFO "SADBM_UPDATE spi=%lx peer_spi=%lx\n", 
 			sadbm->sadb_info.dst.sa_info.spi, 
 			sadbm->sadb_info.dst.sa_info.peer_spi);
-			found = 0;
 		#endif
+		found = 0;
 		for (k=0;k<ISAKMP_ADDR_ARRAY_SIZE;k++)
 		{
 			if (isakmp_addr_array[k] == sadbm->sadb_info.dst.dst.addr_union.ip_addr.s_addr) 
--- linux/net/ipsec/crypto/sha/sha.c.orig	Fri Apr 30 12:05:20 1999
+++ linux/net/ipsec/crypto/sha/sha.c	Wed Jun 30 11:19:03 1999
@@ -36,9 +36,7 @@
  version that supports non-byte-aligned data is being tested and will be
  released later. */
 
-#include <stdio.h>
-#include <time.h>
-#include <memory.h>
+#include <sys/types.h>
 #include <linux/string.h>
 #include "../../br.h"
 #include "sha.h"
--- linux/net/ipsec/Makefile.orig	Wed Jun 30 14:28:20 1999
+++ linux/net/ipsec/Makefile	Wed Jun 30 14:32:55 1999
@@ -30,8 +30,8 @@
 ifeq ($(CONFIG_IPSEC),y)
 O_OBJS += $(IPSEC_OBJS) 
 O_OBJS +=  ipsec_register.o
-IPSEC_DEP := crypto_dir
-ipsec.o: crypto_dir $(O_OBJS)
+IPSEC_DEP := crypto_dir transform_dir
+ipsec.o: $(IPSEC_DEP) $(O_OBJS)
 	$(LD) $(LD_RFLAG) -r -o $@ $(O_OBJS)
 
 else