* Fix compiling on 3.0.x. They include headers in the most non-"standard"

  order I've ever seen.  Haven't these guys ever done Unix programming
  before?
* Quiet some compiling warnings.  For "security" software, this code should
  NOT have as many warnings and unused vars as it does.

3 files changed, 43 insertions, 4 deletions

diff --git a/security/fwtk/files/patch-ad b/security/fwtk/files/patch-ad
index 9e6b874..9b0b404 100644
--- a/security/fwtk/files/patch-ad
+++ b/security/fwtk/files/patch-ad
@@ -1,6 +1,17 @@
 --- firewall.h.orig	Sun Mar  1 06:54:20 1998
-+++ firewall.h	Sat Apr 18 00:33:53 1998
-@@ -47,7 +47,7 @@
++++ firewall.h	Thu Dec 10 08:26:28 1998
+@@ -1,3 +1,10 @@
++/* I don't like including these here, but it is the least intrusive fix
++   I can see at the moment.  -- David O'Brien for the FreeBSD port */
++#include <stdlib.h>
++#include <stdio.h>
++/* #include <unistd.h> */	/* conflicts with gethostname() in socket.c */
++#include <string.h>
++
+ /*-
+  * Copyright (c) 1993, 1996, 1997 Trusted Information Systems, Incorporated
+  * All rights reserved.
+@@ -47,7 +54,7 @@
  system.
  */
  #ifndef	PERMFILE
@@ -9,7 +20,7 @@
  #endif
  
  /*
-@@ -67,7 +67,7 @@
+@@ -67,7 +74,7 @@
  
  /* Choose a system logging facility for the firewall toolkit.  */
  #ifndef	LFAC
@@ -18,7 +29,7 @@
  #endif
  
  
-@@ -89,7 +89,7 @@
+@@ -89,7 +96,7 @@
  makes no difference. make sure that whichever your machine uses
  is defined below.
  */
diff --git a/security/fwtk/files/patch-am b/security/fwtk/files/patch-am
new file mode 100644
index 0000000..a5472f2
--- /dev/null
+++ b/security/fwtk/files/patch-am
@@ -0,0 +1,14 @@
+--- lib/daemon.c.orig	Thu Feb  5 16:01:34 1998
++++ lib/daemon.c	Thu Dec 10 07:57:36 1998
+@@ -11,10 +11,10 @@
+  *           added sleep on bind failure.
+  */
+ 
++#include	<sys/types.h>
+ #include	<sys/signal.h>
+ #include	<syslog.h>
+ #include	<errno.h>
+-#include	<sys/types.h>
+ #include	<sys/socket.h>
+ #ifdef SYSV
+ #include	<sys/sockio.h>
diff --git a/security/fwtk/files/patch-an b/security/fwtk/files/patch-an
new file mode 100644
index 0000000..f5fb218
--- /dev/null
+++ b/security/fwtk/files/patch-an
@@ -0,0 +1,14 @@
+--- lib/strerror.c.orig	Tue Jan  7 18:03:01 1997
++++ lib/strerror.c	Thu Dec 10 08:19:59 1998
+@@ -11,9 +11,11 @@
+ 
+ #include <sys/errno.h>
+ 
++/*
+ extern	int	errno;
+ extern	char	*sys_errlist[];
+ extern	int	sys_nerr;
++*/
+ 
+ char	*
+ strerror(x)