Add enough ANSI C prototypes to tcpd.h to keep mysql4-server happy.

3 files changed, 54 insertions, 6 deletions

diff --git a/security/tcp_wrappers/Makefile b/security/tcp_wrappers/Makefile
index b2b36eb999b..b9f837b3b33 100644
--- a/security/tcp_wrappers/Makefile
+++ b/security/tcp_wrappers/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2005/04/11 21:47:20 tv Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/26 02:25:22 markd Exp $
 
 DISTNAME= 	tcp_wrappers_7.6-ipv6.1
 PKGNAME=	tcp_wrappers-7.6.1
-PKGREVISION= 	3
+PKGREVISION= 	4
 CATEGORIES=	security net
 MASTER_SITES=	ftp://ftp.porcupine.org/pub/security/
 
diff --git a/security/tcp_wrappers/distinfo b/security/tcp_wrappers/distinfo
index 6e926f3a3f4..30a0104b084 100644
--- a/security/tcp_wrappers/distinfo
+++ b/security/tcp_wrappers/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2005/02/24 13:10:13 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/05/26 02:25:22 markd Exp $
 
 SHA1 (tcp_wrappers_7.6-ipv6.1.tar.gz) = d0b70d4f0c0ac0375d8283a18ec2b6d602f82fde
 RMD160 (tcp_wrappers_7.6-ipv6.1.tar.gz) = 948f5ac4ede3999273399b641474ca26fd967b70
 Size (tcp_wrappers_7.6-ipv6.1.tar.gz) = 144708 bytes
 SHA1 (patch-aa) = 06dfe3b11a086c575e626feee8c7096e46c3e1e5
-SHA1 (patch-ab) = 51b094f55afcea6ef1063af1b27be0b22b07eaa6
+SHA1 (patch-ab) = e6b485b21623395a6ca6b1ce0054d3dc5c9b2232
 SHA1 (patch-ac) = a9cd493a470782e8f6bdd38fde6c746fb1e371c0
 SHA1 (patch-ad) = 2f2fa789599e2fca652e240f05bec8460287e79e
 SHA1 (patch-ae) = feddad07e9661c220a5be279fcf2cec87eb1b6b2
diff --git a/security/tcp_wrappers/patches/patch-ab b/security/tcp_wrappers/patches/patch-ab
index faf1fd5c0be..d27d31201c6 100644
--- a/security/tcp_wrappers/patches/patch-ab
+++ b/security/tcp_wrappers/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2004/02/10 09:17:22 grant Exp $
+$NetBSD: patch-ab,v 1.2 2005/05/26 02:25:22 markd Exp $
 
---- tcpd.h.orig	2000-08-22 03:59:52.000000000 +1000
+--- tcpd.h.orig	2000-08-22 05:59:52.000000000 +1200
 +++ tcpd.h
 @@ -8,6 +8,7 @@
  
@@ -10,3 +10,51 @@ $NetBSD: patch-ab,v 1.1 2004/02/10 09:17:22 grant Exp $
  #include <sys/socket.h>
  #include <netinet/in.h>
  
+@@ -136,7 +137,11 @@ extern void fromhost();			/* get/validat
+ #define fromhost sock_host		/* no TLI support needed */
+ #endif
+ 
++#ifdef __STDC__
++extern int hosts_access(struct request_info *);		/* access control */
++#else
+ extern int hosts_access();		/* access control */
++#endif
+ extern void shell_cmd();		/* execute shell command */
+ extern char *percent_x();		/* do %<char> expansion */
+ extern void rfc931();			/* client name from RFC 931 daemon */
+@@ -195,20 +200,35 @@ extern struct request_info *request_set(
+   * host_info structures serve as caches for the lookup results.
+   */
+ 
++#ifdef __STDC__
++extern char *eval_user(struct request_info *);		/* client user */
++extern char *eval_hostname(struct host_info *);		/* printable hostname */
++extern char *eval_hostaddr(struct host_info *);		/* printable host address */
++extern char *eval_hostinfo(struct host_info *);		/* host name or address */
++extern char *eval_client(struct request_info *);		/* whatever is available */
++extern char *eval_server(struct request_info *);		/* whatever is available */
++#else
+ extern char *eval_user();		/* client user */
+ extern char *eval_hostname();		/* printable hostname */
+ extern char *eval_hostaddr();		/* printable host address */
+ extern char *eval_hostinfo();		/* host name or address */
+ extern char *eval_client();		/* whatever is available */
+ extern char *eval_server();		/* whatever is available */
++#endif
+ #define eval_daemon(r)	((r)->daemon)	/* daemon process name */
+ #define eval_pid(r)	((r)->pid)	/* process id */
+ 
+ /* Socket-specific methods, including DNS hostname lookups. */
+ 
++#ifdef __STDC__
++extern void sock_host(struct request_info *);		/* look up endpoint addresses */
++extern void sock_hostname(struct host_info *);		/* translate address to hostname */
++extern void sock_hostaddr(struct host_info *);		/* address to printable address */
++#else
+ extern void sock_host();		/* look up endpoint addresses */
+ extern void sock_hostname();		/* translate address to hostname */
+ extern void sock_hostaddr();		/* address to printable address */
++#endif
+ #define sock_methods(r) \
+ 	{ (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
+