summaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorale <ale@FreeBSD.org>2005-01-10 08:53:10 +0000
committerale <ale@FreeBSD.org>2005-01-10 08:53:10 +0000
commit4aa9dca635989b4d914609faa75da9ac1eb9cc9a (patch)
tree5cd48984e9ee1d5dfbd3374c80ffa986d0d7eb2b /databases
parent0447b4300ce59fd0e7a048cf6d1d4909749c6733 (diff)
downloadFreeBSD-ports-4aa9dca635989b4d914609faa75da9ac1eb9cc9a.zip
FreeBSD-ports-4aa9dca635989b4d914609faa75da9ac1eb9cc9a.tar.gz
Update to 4.1.8a release [1][2]:
- Use MASTER_SITES_MYSQL - Add WITHOUT_INNODB knob [3] - Fix tcp wrappers (hopefully definitely!) - Add WITH_NDB knob PR: ports/75556 [1], ports/75565 [2] Submitted by: Sergey Prikhodko <sergey@network-asp.biz> [1], Marcus Grando <marcus@corp.grupos.com.br> [2], sobomax [3]
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql41-server/Makefile37
-rw-r--r--databases/mysql41-server/distinfo4
-rw-r--r--databases/mysql41-server/files/patch-Docs::Makefile.in40
-rw-r--r--databases/mysql41-server/files/patch-Makefile.in12
-rw-r--r--databases/mysql41-server/files/patch-man::Makefile.in10
-rw-r--r--databases/mysql41-server/files/patch-scripts::Makefile.in16
-rw-r--r--databases/mysql41-server/files/patch-sql::Makefile.in39
-rw-r--r--databases/mysql41-server/files/patch-sql::mylibwrap.c23
-rw-r--r--databases/mysql41-server/files/patch-sql::mylibwrap.h12
-rw-r--r--databases/mysql41-server/files/patch-sql::mysqld.cc36
-rw-r--r--databases/mysql41-server/files/patch-sql::mytcpd.h147
-rw-r--r--databases/mysql41-server/pkg-plist86
12 files changed, 289 insertions, 173 deletions
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index dceb1b3..4ba4228 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -6,20 +6,11 @@
#
PORTNAME?= mysql
-PORTVERSION= 4.1.7
+PORTVERSION= 4.1.8a
PORTREVISION?= 0
CATEGORIES= databases
-MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
- http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \
- ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
- http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \
- ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.1/ \
- http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.1/ \
- ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.1/ \
- http://www.mysql.cz/Downloads/MySQL-4.1/ \
- ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.1/ \
- http://mysql.proserve.nl/Downloads/MySQL-4.1/ \
- ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.1/
+MASTER_SITES= ${MASTER_SITE_MYSQL}
+MASTER_SITE_SUBDIR= MySQL-4.1
PKGNAMESUFFIX?= -server
MAINTAINER= ale@FreeBSD.org
@@ -30,7 +21,6 @@ PKGINSTALL?= ${WRKDIR}/pkg-install
DB_DIR?= /var/db/mysql
USE_LIBTOOL_VER=15
USE_REINPLACE= yes
-USE_GMAKE= yes
USE_RC_SUBR= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -44,7 +34,6 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \
--with-mysqlfs \
--with-vio \
--with-low-memory \
- --with-ndbcluster \
--with-comment='FreeBSD port: ${PKGNAME}' \
--enable-thread-safe-client
@@ -65,6 +54,12 @@ CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
.if defined(BUILD_STATIC)
CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
.endif
+.if defined(WITHOUT_INNODB)
+CONFIGURE_ARGS+=--without-innodb
+.endif
+.if defined(WITH_NDB)
+CONFIGURE_ARGS+=--with-ndbcluster
+.endif
.include <bsd.port.pre.mk>
@@ -113,6 +108,12 @@ CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.*
PLIST_SUB= DB_DIR=${DB_DIR} \
VER=${PORTVERSION}
+.if defined(WITH_NDB)
+PLIST_SUB+= NDB=""
+.else
+PLIST_SUB+= NDB="@comment "
+.endif
+
MAN1= isamchk.1 isamlog.1 mysqld.1 \
mysqld_safe.1 perror.1 replace.1
@@ -140,6 +141,8 @@ pre-fetch:
@${ECHO} " (use it if you need speed)."
@${ECHO} " BUILD_STATIC=yes Build a static version of mysqld."
@${ECHO} " (use it if you need even more speed)."
+ @${ECHO} " WITHOUT_INNODB=yes Disable support for InnoDB table handler."
+ @${ECHO} " WITH_NDB=yes Disable support for NDB Cluster."
@${ECHO} ""
post-patch:
@@ -197,7 +200,8 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/mysql
CONFIGURE_ARGS+=--without-server
post-patch:
- @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ scripts man|g" ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include strings regex @sql_client_dirs@ scripts man|g" ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/Makefile.in
@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in
@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
@@ -240,5 +244,8 @@ post-patch:
@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
.endif
.endif
+# Common part
+post-extract:
+ @${CP} /usr/include/tcpd.h ${WRKSRC}/sql/mytcpd.h
.include <bsd.port.post.mk>
diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo
index e94dd5d..d702aa8 100644
--- a/databases/mysql41-server/distinfo
+++ b/databases/mysql41-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (mysql-4.1.7.tar.gz) = 04c08d2a5cc39050d9fa4727f8f197e8
-SIZE (mysql-4.1.7.tar.gz) = 19849046
+MD5 (mysql-4.1.8a.tar.gz) = 2886edbe5cc826727fbb79a79d41145c
+SIZE (mysql-4.1.8a.tar.gz) = 22945198
diff --git a/databases/mysql41-server/files/patch-Docs::Makefile.in b/databases/mysql41-server/files/patch-Docs::Makefile.in
index cb417e0..a9744c1 100644
--- a/databases/mysql41-server/files/patch-Docs::Makefile.in
+++ b/databases/mysql41-server/files/patch-Docs::Makefile.in
@@ -1,21 +1,29 @@
---- Docs/Makefile.in.orig Fri Mar 5 15:59:43 2004
-+++ Docs/Makefile.in Fri Mar 5 16:00:00 2004
-@@ -446,7 +446,7 @@
+--- Docs/Makefile.in.orig Sun Jan 9 12:51:43 2005
++++ Docs/Makefile.in Sun Jan 9 12:58:11 2005
+@@ -316,7 +316,7 @@
- all: $(targets) txt_files
+ SUBDIRS = Images
+ GT = $(srcdir)/Support/generate-text-files.pl
+-all: $(BUILT_SOURCES)
++all:
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
--txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
-+txt_files: ../INSTALL-SOURCE ../COPYING ../EXCEPTIONS-CLIENT \
- INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
+ .SUFFIXES:
+@@ -626,7 +626,7 @@
+ for dir in "$(DESTDIR)$(infodir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+-install: $(BUILT_SOURCES)
++install:
+ $(MAKE) $(AM_MAKEFLAGS) install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -750,7 +750,7 @@
+ tags tags-recursive uninstall uninstall-am uninstall-info-am
- CLEAN_FILES: $(BUILD_SOURCES)
-@@ -609,9 +609,6 @@
- ../INSTALL-SOURCE: mysql.info $(GT)
- perl -w $(GT) mysql.info "Installing" "Tutorial" > $@
--
--../INSTALL-WIN-SOURCE: mysql.info $(GT)
-- perl -w $(GT) mysql.info "Windows source build" "Post-installation" > $@
+-all: $(targets) txt_files
++all:
- # We put the description for the binary installation here so that
- # people who download source wont have to see it. It is moved up to
+ txt_files: ../INSTALL-SOURCE ../COPYING ../EXCEPTIONS-CLIENT \
+ INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
diff --git a/databases/mysql41-server/files/patch-Makefile.in b/databases/mysql41-server/files/patch-Makefile.in
index 54fcf35..4ae2c3e 100644
--- a/databases/mysql41-server/files/patch-Makefile.in
+++ b/databases/mysql41-server/files/patch-Makefile.in
@@ -1,16 +1,16 @@
---- Makefile.in.orig Thu Aug 26 23:47:06 2004
-+++ Makefile.in Thu Sep 2 12:49:11 2004
-@@ -297,12 +297,7 @@
+--- Makefile.in.orig Tue Dec 14 13:41:10 2004
++++ Makefile.in Sun Dec 19 11:48:00 2004
+@@ -338,12 +338,7 @@
# These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
- @readline_topdir@ sql-common \
-- @thread_dirs@ pstack @sql_client_dirs@ \
-- @sql_server_dirs@ scripts man tests \
+- @thread_dirs@ pstack \
+- @sql_server_dirs@ @sql_client_dirs@ scripts man tests \
- netware @libmysqld_dirs@ \
- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@
+SUBDIRS =
-
DIST_SUBDIRS = . include @docs_dirs@ zlib \
+ @readline_topdir@ sql-common \
diff --git a/databases/mysql41-server/files/patch-man::Makefile.in b/databases/mysql41-server/files/patch-man::Makefile.in
index 86d18ce..36ea5bc 100644
--- a/databases/mysql41-server/files/patch-man::Makefile.in
+++ b/databases/mysql41-server/files/patch-man::Makefile.in
@@ -1,13 +1,13 @@
---- man/Makefile.in.orig Mon Feb 23 14:54:10 2004
-+++ man/Makefile.in Mon Feb 23 14:54:34 2004
-@@ -272,9 +272,7 @@
+--- man/Makefile.in.orig Tue Dec 14 13:41:14 2004
++++ man/Makefile.in Sun Dec 19 11:53:40 2004
+@@ -313,9 +313,7 @@
vio_dir = @vio_dir@
vio_libs = @vio_libs@
-
+ zlib_dir = @zlib_dir@
-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 mysqld_safe.1 mysql_fix_privilege_tables.1
+man_MANS =
-
EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
+ mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
diff --git a/databases/mysql41-server/files/patch-scripts::Makefile.in b/databases/mysql41-server/files/patch-scripts::Makefile.in
index 961fbb5..3ee7b0e 100644
--- a/databases/mysql41-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql41-server/files/patch-scripts::Makefile.in
@@ -1,9 +1,9 @@
---- scripts/Makefile.in.orig Fri May 28 21:38:37 2004
-+++ scripts/Makefile.in Mon May 31 15:14:31 2004
-@@ -276,26 +276,7 @@
+--- scripts/Makefile.in.orig Tue Dec 14 13:41:31 2004
++++ scripts/Makefile.in Sun Dec 19 11:52:42 2004
+@@ -316,26 +316,7 @@
vio_dir = @vio_dir@
vio_libs = @vio_libs@
-
+ zlib_dir = @zlib_dir@
-bin_SCRIPTS = @server_scripts@ \
- msql2mysql \
- mysql_config \
@@ -26,18 +26,18 @@
- mysql_create_system_tables
+bin_SCRIPTS =
-
EXTRA_SCRIPTS = make_binary_distribution.sh \
-@@ -329,7 +310,7 @@
+ make_sharedlib_distribution.sh \
+@@ -366,7 +347,7 @@
+ mysqlaccess.conf \
mysqlbug
-
-dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql
+dist_pkgdata_DATA =
# mysqlbug should be distributed built so that people can report build
# failures with it.
-@@ -605,8 +586,6 @@
+@@ -652,8 +633,6 @@
all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution
diff --git a/databases/mysql41-server/files/patch-sql::Makefile.in b/databases/mysql41-server/files/patch-sql::Makefile.in
deleted file mode 100644
index f985188..0000000
--- a/databases/mysql41-server/files/patch-sql::Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- sql/Makefile.in.orig Thu Aug 26 22:47:18 2004
-+++ sql/Makefile.in Sun Sep 19 15:03:56 2004
-@@ -378,7 +378,7 @@
- gstream.cc spatial.cc sql_help.cc protocol_cursor.cc \
- tztime.cc my_time.c \
- examples/ha_example.cc examples/ha_archive.cc \
-- examples/ha_tina.cc
-+ examples/ha_tina.cc mylibwrap.c
-
-
- gen_lex_hash_SOURCES = gen_lex_hash.cc
-@@ -450,7 +450,8 @@
- pack.$(OBJEXT) stacktrace.$(OBJEXT) repl_failsafe.$(OBJEXT) \
- gstream.$(OBJEXT) spatial.$(OBJEXT) sql_help.$(OBJEXT) \
- protocol_cursor.$(OBJEXT) tztime.$(OBJEXT) my_time.$(OBJEXT) \
-- ha_example.$(OBJEXT) ha_archive.$(OBJEXT) ha_tina.$(OBJEXT)
-+ ha_example.$(OBJEXT) ha_archive.$(OBJEXT) ha_tina.$(OBJEXT) \
-+ mylibwrap.$(OBJEXT)
- mysqld_OBJECTS = $(am_mysqld_OBJECTS)
- mysqld_DEPENDENCIES = $(top_builddir)/myisam/libmyisam.a \
- $(top_builddir)/myisammrg/libmyisammrg.a \
-@@ -518,7 +519,8 @@
- @AMDEP_TRUE@ ./$(DEPDIR)/stacktrace.Po ./$(DEPDIR)/strfunc.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/table.Po ./$(DEPDIR)/thr_malloc.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/time.Po ./$(DEPDIR)/tztime.Po \
--@AMDEP_TRUE@ ./$(DEPDIR)/uniques.Po ./$(DEPDIR)/unireg.Po
-+@AMDEP_TRUE@ ./$(DEPDIR)/uniques.Po ./$(DEPDIR)/unireg.Po \
-+@AMDEP_TRUE@ ./$(DEPDIR)/mylibwrap.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -748,6 +750,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tztime.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniques.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unireg.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mylibwrap.Po@am__quote@
-
- distclean-depend:
- -rm -rf ./$(DEPDIR)
diff --git a/databases/mysql41-server/files/patch-sql::mylibwrap.c b/databases/mysql41-server/files/patch-sql::mylibwrap.c
deleted file mode 100644
index 39a3118..0000000
--- a/databases/mysql41-server/files/patch-sql::mylibwrap.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- sql/mylibwrap.c.orig Thu Jan 1 01:00:00 1970
-+++ sql/mylibwrap.c Sun Sep 19 15:37:22 2004
-@@ -0,0 +1,20 @@
-+#include <tcpd.h>
-+#include "mylibwrap.h"
-+
-+void
-+my_fromhost(struct request_info *req)
-+{
-+ fromhost(req);
-+}
-+
-+int
-+my_hosts_access(struct request_info *req)
-+{
-+ return hosts_access(req);
-+}
-+
-+char *
-+my_eval_client(struct request_info *req)
-+{
-+ return eval_client(req);
-+}
diff --git a/databases/mysql41-server/files/patch-sql::mylibwrap.h b/databases/mysql41-server/files/patch-sql::mylibwrap.h
deleted file mode 100644
index 1fa9e8c..0000000
--- a/databases/mysql41-server/files/patch-sql::mylibwrap.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- sql/mylibwrap.h.orig Thu Jan 1 01:00:00 1970
-+++ sql/mylibwrap.h Sun Sep 19 15:04:21 2004
-@@ -0,0 +1,9 @@
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+extern void my_fromhost(struct request_info *);
-+extern int my_hosts_access(struct request_info *);
-+extern char *my_eval_client(struct request_info *);
-+#ifdef __cplusplus
-+}
-+#endif
diff --git a/databases/mysql41-server/files/patch-sql::mysqld.cc b/databases/mysql41-server/files/patch-sql::mysqld.cc
index e9c1222..c98d38b 100644
--- a/databases/mysql41-server/files/patch-sql::mysqld.cc
+++ b/databases/mysql41-server/files/patch-sql::mysqld.cc
@@ -1,6 +1,15 @@
---- sql/mysqld.cc.orig Thu Sep 16 23:47:47 2004
-+++ sql/mysqld.cc Tue Sep 21 23:56:49 2004
-@@ -115,15 +115,7 @@
+--- sql/mysqld.cc.orig Tue Dec 14 13:40:36 2004
++++ sql/mysqld.cc Mon Jan 10 00:28:52 2005
+@@ -128,7 +128,7 @@
+ #endif /* __WIN__ */
+
+ #ifdef HAVE_LIBWRAP
+-#include <tcpd.h>
++#include "mytcpd.h"
+ #include <syslog.h>
+ #ifdef NEED_SYS_SYSLOG_H
+ #include <sys/syslog.h>
+@@ -136,15 +136,6 @@
int allow_severity = LOG_INFO;
int deny_severity = LOG_WARNING;
@@ -13,7 +22,26 @@
-#define my_hosts_access(A) hosts_access()
-#define my_eval_client(A) eval_client()
-#endif /* __STDC__ */
-+#include "mylibwrap.h"
#endif /* HAVE_LIBWRAP */
#ifdef HAVE_SYS_MMAN_H
+@@ -3565,8 +3556,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)
+@@ -3574,7 +3565,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/mysql41-server/files/patch-sql::mytcpd.h b/databases/mysql41-server/files/patch-sql::mytcpd.h
new file mode 100644
index 0000000..466e189
--- /dev/null
+++ b/databases/mysql41-server/files/patch-sql::mytcpd.h
@@ -0,0 +1,147 @@
+--- 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/mysql41-server/files/patch-sql::mytcpd.h,v 1.1 2005-01-10 08:53:10 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 */
diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist
index e4cf25b..1b8e7cc 100644
--- a/databases/mysql41-server/pkg-plist
+++ b/databases/mysql41-server/pkg-plist
@@ -11,46 +11,46 @@ bin/mysql_install_db
bin/mysql_tzinfo_to_sql
bin/mysql_waitpid
bin/mysqld_safe
-bin/ndb_delete_all
-bin/ndb_desc
-bin/ndb_drop_index
-bin/ndb_drop_table
-bin/ndb_mgm
-bin/ndb_restore
-bin/ndb_select_all
-bin/ndb_select_count
-bin/ndb_show_tables
-bin/ndb_waiter
+%%NDB%%bin/ndb_delete_all
+%%NDB%%bin/ndb_desc
+%%NDB%%bin/ndb_drop_index
+%%NDB%%bin/ndb_drop_table
+%%NDB%%bin/ndb_mgm
+%%NDB%%bin/ndb_restore
+%%NDB%%bin/ndb_select_all
+%%NDB%%bin/ndb_select_count
+%%NDB%%bin/ndb_show_tables
+%%NDB%%bin/ndb_waiter
bin/pack_isam
bin/perror
bin/replace
bin/resolve_stack_dump
bin/resolveip
etc/rc.d/mysql-server.sh
-include/mysql/ndb/mgmapi/mgmapi.h
-include/mysql/ndb/mgmapi/mgmapi_debug.h
-include/mysql/ndb/ndb_types.h
-include/mysql/ndb/ndb_version.h
-include/mysql/ndb/ndbapi/Ndb.hpp
-include/mysql/ndb/ndbapi/NdbApi.hpp
-include/mysql/ndb/ndbapi/NdbBlob.hpp
-include/mysql/ndb/ndbapi/NdbConnection.hpp
-include/mysql/ndb/ndbapi/NdbCursorOperation.hpp
-include/mysql/ndb/ndbapi/NdbDictionary.hpp
-include/mysql/ndb/ndbapi/NdbError.hpp
-include/mysql/ndb/ndbapi/NdbEventOperation.hpp
-include/mysql/ndb/ndbapi/NdbIndexOperation.hpp
-include/mysql/ndb/ndbapi/NdbIndexScanOperation.hpp
-include/mysql/ndb/ndbapi/NdbOperation.hpp
-include/mysql/ndb/ndbapi/NdbPool.hpp
-include/mysql/ndb/ndbapi/NdbRecAttr.hpp
-include/mysql/ndb/ndbapi/NdbReceiver.hpp
-include/mysql/ndb/ndbapi/NdbResultSet.hpp
-include/mysql/ndb/ndbapi/NdbScanFilter.hpp
-include/mysql/ndb/ndbapi/NdbScanOperation.hpp
-include/mysql/ndb/ndbapi/ndb_cluster_connection.hpp
-include/mysql/ndb/ndbapi/ndbapi_limits.h
-include/mysql/ndb/ndbapi/ndberror.h
+%%NDB%%include/mysql/ndb/mgmapi/mgmapi.h
+%%NDB%%include/mysql/ndb/mgmapi/mgmapi_debug.h
+%%NDB%%include/mysql/ndb/ndb_types.h
+%%NDB%%include/mysql/ndb/ndb_version.h
+%%NDB%%include/mysql/ndb/ndbapi/Ndb.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbApi.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbBlob.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbConnection.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbCursorOperation.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbDictionary.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbError.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbEventOperation.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbIndexOperation.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbIndexScanOperation.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbOperation.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbPool.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbRecAttr.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbReceiver.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbResultSet.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbScanFilter.hpp
+%%NDB%%include/mysql/ndb/ndbapi/NdbScanOperation.hpp
+%%NDB%%include/mysql/ndb/ndbapi/ndb_cluster_connection.hpp
+%%NDB%%include/mysql/ndb/ndbapi/ndbapi_limits.h
+%%NDB%%include/mysql/ndb/ndbapi/ndberror.h
lib/mysql/libdbug.a
lib/mysql/libheap.a
lib/mysql/libmerge.a
@@ -58,15 +58,15 @@ lib/mysql/libmyisam.a
lib/mysql/libmyisammrg.a
lib/mysql/libmystrings.a
lib/mysql/libmysys.a
-lib/mysql/libndbclient.a
-lib/mysql/libndbclient.so
-lib/mysql/libndbclient.so.0
+%%NDB%%lib/mysql/libndbclient.a
+%%NDB%%lib/mysql/libndbclient.so
+%%NDB%%lib/mysql/libndbclient.so.0
lib/mysql/libnisam.a
lib/mysql/libvio.a
libexec/mysqld
-libexec/ndb_cpcd
-libexec/ndb_mgmd
-libexec/ndbd
+%%NDB%%libexec/ndb_cpcd
+%%NDB%%libexec/ndb_mgmd
+%%NDB%%libexec/ndbd
%%DATADIR%%/Description.plist
%%DATADIR%%/Info.plist
%%DATADIR%%/MySQL-shared-compat.spec
@@ -156,9 +156,9 @@ libexec/ndbd
%%DATADIR%%/swedish/errmsg.txt
%%DATADIR%%/ukrainian/errmsg.sys
%%DATADIR%%/ukrainian/errmsg.txt
-@dirrm include/mysql/ndb/mgmapi
-@dirrm include/mysql/ndb/ndbapi
-@dirrm include/mysql/ndb
+%%NDB%%@dirrm include/mysql/ndb/mgmapi
+%%NDB%%@dirrm include/mysql/ndb/ndbapi
+%%NDB%%@dirrm include/mysql/ndb
@unexec rmdir %D/include/mysql 2> /dev/null || true
@unexec rmdir %D/lib/mysql 2> /dev/null || true
@dirrm %%DATADIR%%/charsets
OpenPOWER on IntegriCloud