summaryrefslogtreecommitdiff
path: root/databases/mysql50-server/files
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2013-06-04 18:01:46 +0000
committerFlorian Smeets <flo@FreeBSD.org>2013-06-04 18:01:46 +0000
commit7144facbd7bad85c1d0739d10ba2ac1b3895c5f0 (patch)
tree428910fb1e40352bc03fe08edbf3d2f2686a7a13 /databases/mysql50-server/files
parentUpdate Shibboleth-sp and its tool chain to 2.5.1. (diff)
Remove MySQL 5.0, it has been unsupported upstream for about 1.5 years
Approved by: ale (maintainer)
Notes
Notes: svn path=/head/; revision=319886
Diffstat (limited to 'databases/mysql50-server/files')
-rw-r--r--databases/mysql50-server/files/mysql-server.in83
-rw-r--r--databases/mysql50-server/files/patch-Docs::Makefile.in20
-rw-r--r--databases/mysql50-server/files/patch-Makefile.in16
-rw-r--r--databases/mysql50-server/files/patch-configure13
-rw-r--r--databases/mysql50-server/files/patch-include_my_net.h11
-rw-r--r--databases/mysql50-server/files/patch-include_myisam.h11
-rw-r--r--databases/mysql50-server/files/patch-man::Makefile.in13
-rw-r--r--databases/mysql50-server/files/patch-mysys_default.c22
-rw-r--r--databases/mysql50-server/files/patch-mysys_my_clock.c30
-rw-r--r--databases/mysql50-server/files/patch-ndb::src::mgmclient::main.cpp11
-rw-r--r--databases/mysql50-server/files/patch-scripts::Makefile.in41
-rw-r--r--databases/mysql50-server/files/patch-scripts_mysqld_safe.sh24
-rw-r--r--databases/mysql50-server/files/patch-sql::mysqld.cc11
-rw-r--r--databases/mysql50-server/files/patch-sql::mytcpd.h147
14 files changed, 0 insertions, 453 deletions
diff --git a/databases/mysql50-server/files/mysql-server.in b/databases/mysql50-server/files/mysql-server.in
deleted file mode 100644
index 020eed19d8c8..000000000000
--- a/databases/mysql50-server/files/mysql-server.in
+++ /dev/null
@@ -1,83 +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_pidfile (str): Custum PID file path and name.
-# Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_socket (str): Default to "/tmp/mysql.sock"
-# Unix socket file.
-# mysql_args (str): Custom additional arguments to be passed
-# to mysqld_safe (default empty).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-: ${mysql_limits="NO"}
-: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_socket="/tmp/mysql.sock"}
-
-mysql_user="mysql"
-mysql_limits_args="-e -U ${mysql_user}"
-: ${hostname:=`/bin/hostname`}
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
-command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --socket=${mysql_socket} --pid-file=${pidfile} ${mysql_args}"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--ldata=${mysql_dbdir}"
-mysqladmin="%%LOCALBASE%%/bin/mysqladmin"
-mysqladmin_args="-s --socket=${mysql_socket} ping"
-
-mysql_create_auth_tables()
-{
- eval $mysql_install_db $mysql_install_db_args >/dev/null
- [ $? -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
-}
-
-mysql_poststart()
-{
- count=0
- while [ $count -lt 10 ] ; do
- eval $mysqladmin $mysqladmin_args >/dev/null
- [ $? -eq 0 ] && return 0
- count=`expr $count + 1`
- sleep 1
- done
- return 1
-}
-
-run_rc_command "$1"
diff --git a/databases/mysql50-server/files/patch-Docs::Makefile.in b/databases/mysql50-server/files/patch-Docs::Makefile.in
deleted file mode 100644
index 03eb804855c0..000000000000
--- a/databases/mysql50-server/files/patch-Docs::Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- Docs/Makefile.in.orig 2008-08-04 14:22:00.000000000 +0200
-+++ Docs/Makefile.in 2008-08-27 12:15:55.000000000 +0200
-@@ -348,7 +348,7 @@
- yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
- zlib_dir = @zlib_dir@
- EXTRA_DIST = mysql.info INSTALL-BINARY @extra_docs@
--all: all-am
-+all:
-
- .SUFFIXES:
- $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-@@ -433,7 +433,7 @@
- install-data: install-data-am
- uninstall: uninstall-am
-
--install-am: all-am
-+install-am:
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
- installcheck: installcheck-am
diff --git a/databases/mysql50-server/files/patch-Makefile.in b/databases/mysql50-server/files/patch-Makefile.in
deleted file mode 100644
index 3086b959a062..000000000000
--- a/databases/mysql50-server/files/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.in.orig Thu Dec 15 00:34:48 2005
-+++ Makefile.in Thu Dec 22 15:29:54 2005
-@@ -365,12 +365,7 @@
- EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
- README COPYING EXCEPTIONS-CLIENT
-
--SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
-- @readline_topdir@ sql-common scripts \
-- @thread_dirs@ pstack \
-- @sql_union_dirs@ @man_dirs@ tests \
-- netware @libmysqld_dirs@ \
-- @bench_dirs@ support-files @tools_dirs@
-+SUBDIRS =
-
- DIST_SUBDIRS = . include @docs_dirs@ zlib \
- @readline_topdir@ sql-common scripts \
diff --git a/databases/mysql50-server/files/patch-configure b/databases/mysql50-server/files/patch-configure
deleted file mode 100644
index 6a5a8cacdeee..000000000000
--- a/databases/mysql50-server/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig Thu Jul 27 20:53:44 2006
-+++ configure Thu Aug 10 10:16:48 2006
-@@ -25651,8 +25651,8 @@
- # Some system specific hacks
- #
-
--MAX_C_OPTIMIZE="-O3"
--MAX_CXX_OPTIMIZE="-O3"
-+MAX_C_OPTIMIZE=""
-+MAX_CXX_OPTIMIZE=""
-
- ndb_cxxflags_fix=
- case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_c_compiler_gnu in
diff --git a/databases/mysql50-server/files/patch-include_my_net.h b/databases/mysql50-server/files/patch-include_my_net.h
deleted file mode 100644
index 045f226b8b3e..000000000000
--- a/databases/mysql50-server/files/patch-include_my_net.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_net.h.orig 2013-05-06 10:44:34.000000000 +0200
-+++ include/my_net.h 2013-05-06 10:45:11.000000000 +0200
-@@ -110,7 +110,7 @@
- int buflen, int *h_errnop);
- #define my_gethostbyname_r_free()
- #else
--#define my_gethostbyname_r(A,B,C,D,E) gethostbyname_r((A),(B),(C),(D),(E))
-+#define my_gethostbyname_r(A,B,C,D,E) gethostbyname_r((A),(B),(C),(D),(E),NULL)
- #define my_gethostbyname_r_free()
- #endif /* !defined(HAVE_GETHOSTBYNAME_R) */
-
diff --git a/databases/mysql50-server/files/patch-include_myisam.h b/databases/mysql50-server/files/patch-include_myisam.h
deleted file mode 100644
index 450645400dd5..000000000000
--- a/databases/mysql50-server/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig 2009-02-16 23:04:54.000000000 +0100
-+++ include/myisam.h 2009-02-16 23:10:08.000000000 +0100
-@@ -48,7 +48,7 @@
- The following defines can be increased if necessary.
- But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */
- #define MI_MAX_KEY_SEG 16 /* Max segments for key */
-
- #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/mysql50-server/files/patch-man::Makefile.in b/databases/mysql50-server/files/patch-man::Makefile.in
deleted file mode 100644
index a8f1ca7157c0..000000000000
--- a/databases/mysql50-server/files/patch-man::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/Makefile.in.orig Wed Oct 4 13:25:43 2006
-+++ man/Makefile.in Sun Oct 22 10:07:26 2006
-@@ -344,8 +344,8 @@
- yassl_libs = @yassl_libs@
- yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
- zlib_dir = @zlib_dir@
--man1_MANS = @man1_files@
--man8_MANS = @man8_files@
-+man1_MANS =
-+man8_MANS =
- EXTRA_DIST = $(man1_MANS) $(man8_MANS)
- all: all-am
-
diff --git a/databases/mysql50-server/files/patch-mysys_default.c b/databases/mysql50-server/files/patch-mysys_default.c
deleted file mode 100644
index cfa46d3422dd..000000000000
--- a/databases/mysql50-server/files/patch-mysys_default.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- mysys/default.c.orig 2009-04-16 13:49:52.000000000 +0200
-+++ mysys/default.c 2009-05-12 07:54:11.000000000 +0200
-@@ -634,7 +634,7 @@
- {
- MY_STAT stat_info;
- if (!my_stat(name,&stat_info,MYF(0)))
-- return 1;
-+ return 0;
- /*
- Ignore world-writable regular files.
- This is mainly done to protect us to not read a file created by
-@@ -1084,7 +1084,10 @@
- errors += add_directory(alloc, env, dirs);
- #elif defined(DEFAULT_SYSCONFDIR)
- if (DEFAULT_SYSCONFDIR[0])
-+ {
- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
-+ }
- #endif /* __EMX__ || __OS2__ */
-
- #endif
diff --git a/databases/mysql50-server/files/patch-mysys_my_clock.c b/databases/mysql50-server/files/patch-mysys_my_clock.c
deleted file mode 100644
index 9dcd80ce1021..000000000000
--- a/databases/mysql50-server/files/patch-mysys_my_clock.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- mysys/my_clock.c.orig 2010-01-15 10:48:59.000000000 +0100
-+++ mysys/my_clock.c 2010-10-26 12:29:27.000000000 +0200
-@@ -16,6 +16,9 @@
- #define USES_TYPES
- #include "my_global.h"
-
-+#if defined(__FreeBSD__)
-+#include <osreldate.h>
-+#endif
- #if !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(OS2) && !defined(__NETWARE__)
- #include "mysys_priv.h"
- #include <sys/times.h>
-@@ -23,6 +26,11 @@
-
- long my_clock(void)
- {
-+#if defined(__FreeBSD__) && __FreeBSD_version__ >= 700000
-+ struct timespec ts;
-+ clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts);
-+ return (ts.tv_sec * CLK_TCK + ts.tv_nsec / (1000000000 / CLK_TCK));
-+#else
- #if !defined(MSDOS) && !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
- struct tms tmsbuf;
- VOID(times(&tmsbuf));
-@@ -30,4 +38,5 @@
- #else
- return clock();
- #endif
-+#endif
- }
diff --git a/databases/mysql50-server/files/patch-ndb::src::mgmclient::main.cpp b/databases/mysql50-server/files/patch-ndb::src::mgmclient::main.cpp
deleted file mode 100644
index ef1f6711f469..000000000000
--- a/databases/mysql50-server/files/patch-ndb::src::mgmclient::main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ndb/src/mgmclient/main.cpp.orig Mon Jan 10 15:36:57 2005
-+++ ndb/src/mgmclient/main.cpp Mon Jan 10 15:37:26 2005
-@@ -122,7 +122,7 @@
- }
- #ifdef HAVE_READLINE
- /* Get a line from the user. */
-- line_read = readline (prompt);
-+ line_read = readline ((char *)prompt);
- /* If the line has any text in it, save it on the history. */
- if (line_read && *line_read)
- add_history (line_read);
diff --git a/databases/mysql50-server/files/patch-scripts::Makefile.in b/databases/mysql50-server/files/patch-scripts::Makefile.in
deleted file mode 100644
index 0c6f9a18a6d1..000000000000
--- a/databases/mysql50-server/files/patch-scripts::Makefile.in
+++ /dev/null
@@ -1,41 +0,0 @@
---- scripts/Makefile.in.orig Wed Jul 4 15:10:00 2007
-+++ scripts/Makefile.in Thu Jul 12 08:27:29 2007
-@@ -377,24 +377,7 @@
- BUILT_SOURCES = mysql_fix_privilege_tables.sql \
- mysql_fix_privilege_tables_sql.c
-
--bin_SCRIPTS = @server_scripts@ \
-- msql2mysql \
-- mysql_config \
-- mysql_fix_privilege_tables \
-- mysql_fix_extensions \
-- mysql_setpermission \
-- mysql_secure_installation \
-- mysql_zap \
-- mysqlaccess \
-- mysqlbug \
-- mysql_convert_table_format \
-- mysql_find_rows \
-- mysqlhotcopy \
-- mysqldumpslow \
-- mysql_explain_log \
-- mysql_tableinfo \
-- mysql_upgrade_shell \
-- mysqld_multi
-+bin_SCRIPTS =
-
- noinst_SCRIPTS = make_binary_distribution \
- make_sharedlib_distribution \
-@@ -431,11 +414,7 @@
- mysql_system_tables_fix.sql \
- CMakeLists.txt
-
--dist_pkgdata_DATA = fill_help_tables.sql \
-- mysql_fix_privilege_tables.sql \
-- mysql_system_tables.sql \
-- mysql_system_tables_data.sql \
-- mysql_test_data_timezone.sql
-+dist_pkgdata_DATA =
-
- CLEANFILES = @server_scripts@ \
- make_binary_distribution \
diff --git a/databases/mysql50-server/files/patch-scripts_mysqld_safe.sh b/databases/mysql50-server/files/patch-scripts_mysqld_safe.sh
deleted file mode 100644
index 960a8458d37a..000000000000
--- a/databases/mysql50-server/files/patch-scripts_mysqld_safe.sh
+++ /dev/null
@@ -1,24 +0,0 @@
---- scripts/mysqld_safe.sh.orig 2007-12-12 10:04:16.000000000 +0100
-+++ scripts/mysqld_safe.sh 2007-12-12 10:04:52.000000000 +0100
-@@ -152,10 +152,10 @@
-
- if test -z "$MYSQL_HOME"
- then
-- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
-+ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
- then
- echo "WARNING: Found two instances of my.cnf -"
-- echo "$MY_BASEDIR_VERSION/my.cnf and"
-+ echo "$MY_BASEDIR_VERSION/etc/my.cnf and"
- echo "$DATADIR/my.cnf"
- echo "IGNORING $DATADIR/my.cnf"
- echo
-@@ -163,7 +163,7 @@
- elif test -r "$DATADIR/my.cnf"
- then
- echo "WARNING: Found $DATADIR/my.cnf"
-- echo "Datadir is deprecated place for my.cnf, please move it to $MY_BASEDIR_VERSION"
-+ echo "Datadir is deprecated place for my.cnf, please move it to $MY_BASEDIR_VERSION/etc"
- echo
- MYSQL_HOME=$DATADIR
- else
diff --git a/databases/mysql50-server/files/patch-sql::mysqld.cc b/databases/mysql50-server/files/patch-sql::mysqld.cc
deleted file mode 100644
index 4feed825cb11..000000000000
--- a/databases/mysql50-server/files/patch-sql::mysqld.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- sql/mysqld.cc.orig Sat Aug 6 03:39:41 2005
-+++ sql/mysqld.cc Sun Aug 28 20:41:38 2005
-@@ -3177,7 +3177,7 @@
- init_ssl();
-
- #ifdef HAVE_LIBWRAP
-- libwrapName= my_progname+dirname_length(my_progname);
-+ libwrapName= (char *) my_progname+dirname_length(my_progname);
- openlog(libwrapName, LOG_PID, LOG_AUTH);
- #endif
-
diff --git a/databases/mysql50-server/files/patch-sql::mytcpd.h b/databases/mysql50-server/files/patch-sql::mytcpd.h
deleted file mode 100644
index f98dde57bc23..000000000000
--- a/databases/mysql50-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/mysql50-server/files/patch-sql::mytcpd.h,v 1.1 2005-01-10 13:17:30 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 */