summaryrefslogtreecommitdiff
path: root/databases/mysql323-server/files
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2011-10-14 22:30:49 +0000
committerDoug Barton <dougb@FreeBSD.org>2011-10-14 22:30:49 +0000
commit4eb5b88d9eb1a88094ac3ae85f20e29e7510e97b (patch)
tree07820ebb6104ca954e4d94f3a2fdb93d78912435 /databases/mysql323-server/files
parentAdd doulos-compact 4.110, Doulos SIL TrueType font collection, compact (diff)
As previously advertised, complete removal of vulnerable ports that
no one has stepped up to deal with: archivers/pecl-phar Vulnerable since 2011-01-13 comms/libsyncml Depends on devel/libsoup22, which is FORBIDDEN databases/mysql323-server Vulnerable since 2006-10-29 databases/mysql323-client Vulnerable since 2006-10-29 databases/mysql323-scripts Vulnerable since 2006-10-29 databases/mysql40-server Vulnerable since 2006-10-29 databases/mysql40-client Vulnerable since 2006-10-29 databases/mysql40-scripts Vulnerable since 2006-10-29 databases/p5-DBD-mysql40 Depends on databases/mysql40-server, which is FORBIDDEN deskutils/buoh Depends on devel/libsoup22, which is FORBIDDEN deskutils/libopensync-plugin-syncml Depends on comms/libsyncml, which is DEPRECATED devel/libsoup22 Vulnerable since 2011-07-28 dns/bind9-sdb-ldap Vulnerable since 2011-06-04 dns/bind9-sdb-postgresql Vulnerable since 2011-06-04 ftp/wgetpro Vulnerable since 2004-12-14 games/quake2forge Vulnerable since 2005-01-21 graphics/linux-tiff Vulnerable since 2004-10-13 japanese/mutt Vulnerable since 2007-07-29 japanese/asterisk14-sounds Depends on net/asterisk14, which is FORBIDDEN net/asterisk14 Vulnerable since 2011-06-25 net/isc-dhcp31-client Vulnerable since 2011-04-10 net/isc-dhcp31-server Vulnerable since 2011-04-10 net/isc-dhcp31-relay Vulnerable since 2011-04-10 net/asterisk-app-ldap Depends on net/asterisk14, which is FORBIDDEN net/asterisk-app-notify Depends on net/asterisk14, which is FORBIDDEN net/asterisk-oh323 Depends on net/asterisk14, which is FORBIDDEN, does not compile on sparc64 net/asterisk14-addons Depends on net/asterisk14, which is FORBIDDEN net/astfax Depends on net/asterisk14, which is FORBIDDEN net-mgmt/nagios2 Vulnerable since 2009-06-30 www/gforge Vulnerable since 2005-08-09 www/linux-flashplugin7 Vulnerable since at least 2008-05-30 www/opera-devel Vulnerable since 2010-06-25, does not fetch www/plone3 Vulnerable and unsupported upstream www/serendipity-devel Vulnerable since 2008-04-25 www/ziproxy Vulnerable since 2010-06-15 www/asterisk-gui Depends on net/asterisk14, which is FORBIDDEN x11-toolkits/linux-pango Vulnerable since 2009-05-13
Notes
Notes: svn path=/head/; revision=283540
Diffstat (limited to 'databases/mysql323-server/files')
-rw-r--r--databases/mysql323-server/files/mysql-server.sh.in62
-rw-r--r--databases/mysql323-server/files/patch-Makefile.in14
-rw-r--r--databases/mysql323-server/files/patch-configure102
-rw-r--r--databases/mysql323-server/files/patch-man::Makefile.in13
-rw-r--r--databases/mysql323-server/files/patch-mysys_default.c13
-rw-r--r--databases/mysql323-server/files/patch-scripts::Makefile.in33
-rw-r--r--databases/mysql323-server/files/patch-scripts::mysql_install_db.sh22
-rw-r--r--databases/mysql323-server/files/patch-scripts::mysqlhotcopy.sh49
-rw-r--r--databases/mysql323-server/files/patch-sql::mysqld.cc47
-rw-r--r--databases/mysql323-server/files/patch-sql::mytcpd.h147
10 files changed, 0 insertions, 502 deletions
diff --git a/databases/mysql323-server/files/mysql-server.sh.in b/databases/mysql323-server/files/mysql-server.sh.in
deleted file mode 100644
index e1e46e89ac82..000000000000
--- a/databases/mysql323-server/files/mysql-server.sh.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable MySQL.
-# mysql_limits (bool): Set to "NO" by default.
-# Set it to yes to run `limits -e -U mysql`
-# just before mysql starts.
-# mysql_dbdir (str): Default to "/var/db/mysql"
-# Base database directory.
-# mysql_args (str): Custom additional arguments to be passed
-# to mysqld_safe (default empty).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-: ${mysql_limits="NO"}
-: ${mysql_dbdir="/var/db/mysql"}
-
-mysql_user="mysql"
-mysql_limits_args="-e -U ${mysql_user}"
-pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
-command="%%PREFIX%%/bin/safe_mysqld"
-command_args="--defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} > /dev/null 2>&1 &"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--ldata=${mysql_dbdir}"
-
-mysql_create_auth_tables()
-{
- eval $mysql_install_db $mysql_install_db_args >/dev/null 2>&1
- [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
- if [ ! -d "${mysql_dbdir}/mysql/." ]; then
- mysql_create_auth_tables || return 1
- fi
- if checkyesno mysql_limits; then
- eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
- else
- return 0
- fi
-}
-
-run_rc_command "$1"
diff --git a/databases/mysql323-server/files/patch-Makefile.in b/databases/mysql323-server/files/patch-Makefile.in
deleted file mode 100644
index 228501c8599e..000000000000
--- a/databases/mysql323-server/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.in.orig Sat Jan 17 00:29:13 2004
-+++ Makefile.in Sat Jan 17 00:29:28 2004
-@@ -195,10 +195,7 @@
- EXTRA_DIST = INSTALL-SOURCE README \
- COPYING COPYING.LIB
-
--SUBDIRS = . include @docs_dirs@ @readline_dir@ \
-- @thread_dirs@ @sql_client_dirs@ \
-- @sql_server_dirs@ scripts tests man \
-- @bench_dirs@ support-files os2
-+SUBDIRS =
-
-
- # Relink after clean
diff --git a/databases/mysql323-server/files/patch-configure b/databases/mysql323-server/files/patch-configure
deleted file mode 100644
index 6596fa03ff1f..000000000000
--- a/databases/mysql323-server/files/patch-configure
+++ /dev/null
@@ -1,102 +0,0 @@
---- configure.orig Thu Sep 11 13:49:33 2003
-+++ configure Wed Sep 29 12:17:28 2004
-@@ -8071,8 +8071,6 @@
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
- # Prevent multiple expansion
-
-@@ -9191,40 +9189,8 @@
- echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5
- echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6
- PS=$ac_cv_path_PS
--# Linux style
--if $PS p $$ 2> /dev/null | grep $0 > /dev/null
--then
-- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null"
--# Solaris
--elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null
--then
-- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null"
- # BSD style
--elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null
--then
- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
--# SysV style
--elif $PS -ef 2> /dev/null | grep $0 > /dev/null
--then
-- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null"
--# Do anybody use this?
--elif $PS $$ 2> /dev/null | grep $0 > /dev/null
--then
-- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null"
--else
-- case $SYSTEM_TYPE in
-- *darwin*)
-- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
-- ;;
-- *cygwin*)
-- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
-- ;;
-- *)
-- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5
--echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;}
-- { (exit 1); exit 1; }; }
-- esac
--fi
-
- echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
- echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -12509,8 +12475,16 @@
- ;;
- *freebsd*)
- echo "Adding fix for interrupted reads"
-- CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
-- CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+ OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
-+ if test "$OSVERSION" -gt "480100" && \
-+ test "$OSVERSION" -lt "500000" || \
-+ test "$OSVERSION" -gt "500109"
-+ then
-+ CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
-+ else
-+ CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
-+ CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+ fi
- ;;
- *netbsd*)
- echo "Adding flag -Dunix"
-@@ -13710,30 +13684,6 @@
- #define HAVE_RESTARTABLE_SYSCALLS 1
- _ACEOF
-
--fi
--
--
--# Build optimized or debug version ?
--# First check for gcc and g++
--if test "$ac_cv_c_compiler_gnu" = "yes"
--then
-- DEBUG_CFLAGS="-g"
-- DEBUG_OPTIMIZE_CC="-O"
-- OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE"
--else
-- DEBUG_CFLAGS="-g"
-- DEBUG_OPTIMIZE_CC=""
-- OPTIMIZE_CFLAGS="-O"
--fi
--if test "$ac_cv_prog_cxx_g" = "yes"
--then
-- DEBUG_CXXFLAGS="-g"
-- DEBUG_OPTIMIZE_CXX="-O"
-- OPTIMIZE_CXXFLAGS="-O3"
--else
-- DEBUG_CXXFLAGS="-g"
-- DEBUG_OPTIMIZE_CXX=""
-- OPTIMIZE_CXXFLAGS="-O"
- fi
-
-
diff --git a/databases/mysql323-server/files/patch-man::Makefile.in b/databases/mysql323-server/files/patch-man::Makefile.in
deleted file mode 100644
index 9ce6d7e4a837..000000000000
--- a/databases/mysql323-server/files/patch-man::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/Makefile.in.orig Tue Mar 1 05:31:24 2005
-+++ man/Makefile.in Tue Mar 15 12:55:49 2005
-@@ -266,9 +266,7 @@
- target_vendor = @target_vendor@
- thread_dirs = @thread_dirs@
- uname_prog = @uname_prog@
--man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
-- mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
-- perror.1 replace.1 safe_mysqld.1
-+man_MANS =
-
- EXTRA_DIST = $(man_MANS)
- all: all-am
diff --git a/databases/mysql323-server/files/patch-mysys_default.c b/databases/mysql323-server/files/patch-mysys_default.c
deleted file mode 100644
index 40b3ce450ec3..000000000000
--- a/databases/mysql323-server/files/patch-mysys_default.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- mysys/default.c.orig Mon Apr 11 10:56:31 2005
-+++ mysys/default.c Mon Apr 11 10:57:04 2005
-@@ -50,9 +50,7 @@
- "C:/",
- #else
- "/etc/",
--#endif
--#ifdef DATADIR
--DATADIR,
-+"%%PREFIX%%/etc/",
- #endif
- "", /* Place for defaults_extra_dir */
- #ifndef __WIN__
diff --git a/databases/mysql323-server/files/patch-scripts::Makefile.in b/databases/mysql323-server/files/patch-scripts::Makefile.in
deleted file mode 100644
index 567359e28571..000000000000
--- a/databases/mysql323-server/files/patch-scripts::Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
---- scripts/Makefile.in.orig Tue Mar 1 05:31:27 2005
-+++ scripts/Makefile.in Tue Mar 15 12:58:38 2005
-@@ -268,20 +268,7 @@
- target_vendor = @target_vendor@
- thread_dirs = @thread_dirs@
- uname_prog = @uname_prog@
--bin_SCRIPTS = @server_scripts@ \
-- msql2mysql \
-- mysql_config \
-- mysql_fix_privilege_tables \
-- mysql_setpermission \
-- mysql_zap \
-- mysqlaccess \
-- mysqlbug \
-- mysql_convert_table_format \
-- mysql_find_rows \
-- mysqlhotcopy \
-- mysqldumpslow \
-- mysqld_multi \
-- make_win_src_distribution
-+bin_SCRIPTS =
-
- EXTRA_SCRIPTS = make_binary_distribution.sh \
- make_win_src_distribution.sh \
-@@ -451,7 +438,7 @@
- uninstall: uninstall-am
-
- install-am: all-am
-- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am
-
- installcheck: installcheck-am
- install-strip:
diff --git a/databases/mysql323-server/files/patch-scripts::mysql_install_db.sh b/databases/mysql323-server/files/patch-scripts::mysql_install_db.sh
deleted file mode 100644
index 12d394167e4b..000000000000
--- a/databases/mysql323-server/files/patch-scripts::mysql_install_db.sh
+++ /dev/null
@@ -1,22 +0,0 @@
---- scripts/mysql_install_db.sh.orig Thu Sep 11 13:49:21 2003
-+++ scripts/mysql_install_db.sh Fri Mar 12 11:32:09 2004
-@@ -116,7 +116,7 @@
- if [ $? -ne 0 ]
- then
- resolved=`$bindir/resolveip localhost 2>&1`
-- if [ $? -eq 0 ]
-+ if [ $? -ne 0 ]
- then
- echo "Sorry, the host '$hostname' could not be looked up."
- echo "Please configure the 'hostname' command to return a correct hostname."
-@@ -125,8 +125,8 @@
- exit 1
- fi
- echo "WARNING: The host '$hostname' could not be looked up with resolveip."
-- echo "This probably means that your libc libraries are not 100 % compatible"
-- echo "with this binary MySQL version. The MySQL deamon, mysqld, should work"
-+ echo "This probably means that your host name is not listed in your"
-+ echo "/etc/hosts file (as it should). The MySQL daemon, mysqld, should work"
- echo "normally with the exception that host name resolving will not work."
- echo "This means that you should use IP addresses instead of hostnames"
- echo "when specifying MySQL privileges !"
diff --git a/databases/mysql323-server/files/patch-scripts::mysqlhotcopy.sh b/databases/mysql323-server/files/patch-scripts::mysqlhotcopy.sh
deleted file mode 100644
index 19d4395fa09f..000000000000
--- a/databases/mysql323-server/files/patch-scripts::mysqlhotcopy.sh
+++ /dev/null
@@ -1,49 +0,0 @@
---- scripts/mysqlhotcopy.sh.orig Sun Dec 21 19:01:29 2003
-+++ scripts/mysqlhotcopy.sh Thu Sep 23 11:02:45 2004
-@@ -7,6 +7,7 @@
- use File::Path;
- use DBI;
- use Sys::Hostname;
-+use File::Temp;
-
- =head1 NAME
-
-@@ -607,7 +608,6 @@
- sub copy_index
- {
- my ($method, $files, $source, $target) = @_;
-- my $tmpfile="$opt_tmpdir/mysqlhotcopy$$";
-
- print "Copying indices for ".@$files." files...\n" unless $opt{quiet};
- foreach my $file (@$files)
-@@ -633,23 +633,23 @@
- }
- close OUTPUT || die "Error on close of $to: $!\n";
- }
-- elsif ($opt{method} eq 'scp')
-+ elsif ($opt{method} =~ /^scp\b/)
- {
-- my $tmp=$tmpfile;
-- open(OUTPUT,">$tmp") || die "Can\'t create file $tmp: $!\n";
-- if (syswrite(OUTPUT,$buff) != length($buff))
-+ my ($fh, $tmp)=tempfile('mysqlhotcopy-XXXXXX', DIR => $opt_tmpdir);
-+ die "Can\'t create/open file in $opt_tmpdir\n";
-+ if (syswrite($fh,$buff) != length($buff))
- {
- die "Error when writing data to $tmp: $!\n";
- }
-- close OUTPUT || die "Error on close of $tmp: $!\n";
-- safe_system("scp $tmp $to");
-+ close $fh || die "Error on close of $tmp: $!\n";
-+ safe_system("$opt{method} $tmp $to");
-+ unlink $tmp;
- }
- else
- {
- die "Can't use unsupported method '$opt{method}'\n";
- }
- }
-- unlink "$tmpfile" if ($opt{method} eq 'scp');
- }
-
-
diff --git a/databases/mysql323-server/files/patch-sql::mysqld.cc b/databases/mysql323-server/files/patch-sql::mysqld.cc
deleted file mode 100644
index 8b6159b9c32b..000000000000
--- a/databases/mysql323-server/files/patch-sql::mysqld.cc
+++ /dev/null
@@ -1,47 +0,0 @@
---- sql/mysqld.cc.orig Sat Dec 18 18:25:05 2004
-+++ sql/mysqld.cc Sun Jan 9 12:43:21 2005
-@@ -99,7 +99,7 @@
- #endif /* __WIN__ */
-
- #ifdef HAVE_LIBWRAP
--#include <tcpd.h>
-+#include "mytcpd.h"
- #include <syslog.h>
- #ifdef NEED_SYS_SYSLOG_H
- #include <sys/syslog.h>
-@@ -107,15 +107,6 @@
- int allow_severity = LOG_INFO;
- int deny_severity = LOG_WARNING;
-
--#ifdef __STDC__
--#define my_fromhost(A) fromhost(A)
--#define my_hosts_access(A) hosts_access(A)
--#define my_eval_client(A) eval_client(A)
--#else
--#define my_fromhost(A) fromhost()
--#define my_hosts_access(A) hosts_access()
--#define my_eval_client(A) eval_client()
--#endif
- #endif /* HAVE_LIBWRAP */
-
- #ifdef HAVE_SYS_MMAN_H
-@@ -3240,8 +3231,8 @@
- struct request_info req;
- signal(SIGCHLD, SIG_DFL);
- request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, new_sock, NULL);
-- my_fromhost(&req);
-- if (!my_hosts_access(&req))
-+ fromhost(&req);
-+ if (!hosts_access(&req))
- {
- /*
- This may be stupid but refuse() includes an exit(0)
-@@ -3249,7 +3240,7 @@
- clean_exit() - same stupid thing ...
- */
- syslog(deny_severity, "refused connect from %s",
-- my_eval_client(&req));
-+ eval_client(&req));
-
- /*
- C++ sucks (the gibberish in front just translates the supplied
diff --git a/databases/mysql323-server/files/patch-sql::mytcpd.h b/databases/mysql323-server/files/patch-sql::mytcpd.h
deleted file mode 100644
index 3eb28a0f42fe..000000000000
--- a/databases/mysql323-server/files/patch-sql::mytcpd.h
+++ /dev/null
@@ -1,147 +0,0 @@
---- sql/mytcpd.h.orig Sun Jan 9 13:33:51 2005
-+++ sql/mytcpd.h Sun Jan 9 13:41:42 2005
-@@ -6,6 +6,25 @@
- * $FreeBSD: /tmp/pcvs/ports/databases/mysql323-server/files/Attic/patch-sql::mytcpd.h,v 1.1 2005-01-10 14:44:25 ale Exp $
- */
-
-+#ifndef _TCPWRAPPERS_TCPD_H
-+#define _TCPWRAPPERS_TCPD_H
-+
-+/* someone else may have defined this */
-+#undef __P
-+
-+/* use prototypes if we have an ANSI C compiler or are using C++ */
-+#if defined(__STDC__) || defined(__cplusplus)
-+#define __P(args) args
-+#else
-+#define __P(args) ()
-+#endif
-+
-+/* Need definitions of struct sockaddr_in and FILE. */
-+#include <netinet/in.h>
-+#include <stdio.h>
-+
-+__BEGIN_DECLS
-+
- /* Structure to describe one communications endpoint. */
-
- #define STRING_LENGTH 128 /* hosts, users, processes */
-@@ -31,10 +50,10 @@
- char pid[10]; /* access via eval_pid(request) */
- struct host_info client[1]; /* client endpoint info */
- struct host_info server[1]; /* server endpoint info */
-- void (*sink) (); /* datagram sink function or 0 */
-- void (*hostname) (); /* address to printable hostname */
-- void (*hostaddr) (); /* address to printable address */
-- void (*cleanup) (); /* cleanup function or 0 */
-+ void (*sink) __P((int)); /* datagram sink function or 0 */
-+ void (*hostname) __P((struct host_info *)); /* address to printable hostname */
-+ void (*hostaddr) __P((struct host_info *)); /* address to printable address */
-+ void (*cleanup) __P((struct request_info *)); /* cleanup function or 0 */
- struct netconfig *config; /* netdir handle */
- };
-
-@@ -67,20 +86,23 @@
- /* Global functions. */
-
- #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
--extern void fromhost(); /* get/validate client host info */
-+extern void fromhost __P((struct request_info *)); /* get/validate client host info */
- #else
- #define fromhost sock_host /* no TLI support needed */
- #endif
-
--extern int hosts_access(); /* access control */
--extern void shell_cmd(); /* execute shell command */
--extern char *percent_x(); /* do %<char> expansion */
--extern void rfc931(); /* client name from RFC 931 daemon */
--extern void clean_exit(); /* clean up and exit */
--extern void refuse(); /* clean up and exit */
--extern char *xgets(); /* fgets() on steroids */
--extern char *split_at(); /* strchr() and split */
--extern unsigned long dot_quad_addr(); /* restricted inet_addr() */
-+extern void shell_cmd __P((char *)); /* execute shell command */
-+extern char *percent_x __P((char *, int, char *, struct request_info *)); /* do %<char> expansion */
-+#ifdef INET6
-+extern void rfc931 __P((struct sockaddr *, struct sockaddr *, char *)); /* client name from RFC 931 daemon */
-+#else
-+extern void rfc931 __P((struct sockaddr_in *, struct sockaddr_in *, char *)); /* client name from RFC 931 daemon */
-+#endif
-+extern void clean_exit __P((struct request_info *)); /* clean up and exit */
-+extern void refuse __P((struct request_info *)); /* clean up and exit */
-+extern char *xgets __P((char *, int, FILE *)); /* fgets() on steroids */
-+extern char *split_at __P((char *, int)); /* strchr() and split */
-+extern unsigned long dot_quad_addr __P((char *)); /* restricted inet_addr() */
-
- /* Global variables. */
-
-@@ -98,9 +120,14 @@
- */
-
- #ifdef __STDC__
-+extern int hosts_access(struct request_info *request);
-+extern int hosts_ctl(char *daemon, char *client_name, char *client_addr,
-+ char *client_user);
- extern struct request_info *request_init(struct request_info *,...);
- extern struct request_info *request_set(struct request_info *,...);
- #else
-+extern int hosts_access();
-+extern int hosts_ctl();
- extern struct request_info *request_init(); /* initialize request */
- extern struct request_info *request_set(); /* update request structure */
- #endif
-@@ -123,27 +150,27 @@
- * host_info structures serve as caches for the lookup results.
- */
-
--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 */
-+extern char *eval_user __P((struct request_info *)); /* client user */
-+extern char *eval_hostname __P((struct host_info *)); /* printable hostname */
-+extern char *eval_hostaddr __P((struct host_info *)); /* printable host address */
-+extern char *eval_hostinfo __P((struct host_info *)); /* host name or address */
-+extern char *eval_client __P((struct request_info *)); /* whatever is available */
-+extern char *eval_server __P((struct request_info *)); /* whatever is available */
- #define eval_daemon(r) ((r)->daemon) /* daemon process name */
- #define eval_pid(r) ((r)->pid) /* process id */
-
- /* Socket-specific methods, including DNS hostname lookups. */
-
--extern void sock_host(); /* look up endpoint addresses */
--extern void sock_hostname(); /* translate address to hostname */
--extern void sock_hostaddr(); /* address to printable address */
-+extern void sock_host __P((struct request_info *));
-+extern void sock_hostname __P((struct host_info *));
-+extern void sock_hostaddr __P((struct host_info *));
- #define sock_methods(r) \
- { (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
-
- /* The System V Transport-Level Interface (TLI) interface. */
-
- #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
--extern void tli_host(); /* look up endpoint addresses etc. */
-+extern void tli_host __P((struct request_info *)); /* look up endpoint addresses etc. */
- #endif
-
- /*
-@@ -184,7 +211,7 @@
- * behavior.
- */
-
--extern void process_options(); /* execute options */
-+extern void process_options __P((char *, struct request_info *)); /* execute options */
- extern int dry_run; /* verification flag */
-
- /* Bug workarounds. */
-@@ -223,3 +250,7 @@
- #define strtok my_strtok
- extern char *my_strtok();
- #endif
-+
-+__END_DECLS
-+
-+#endif /* tcpd.h */