FreeBSD Bugzilla – Attachment 160732 Details for
Bug 201686
[patch] databases/mysql51-client poudriere build error
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
svn_diff_mysql51-server__v02
mysql51-server.patch (text/plain), 20.85 KB, created by
Danilo G. Baio
on 2015-09-04 23:03:25 UTC
(
hide
)
Description:
svn_diff_mysql51-server__v02
Filename:
MIME Type:
Creator:
Danilo G. Baio
Created:
2015-09-04 23:03:25 UTC
Size:
20.85 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 396146) >+++ Makefile (working copy) >@@ -14,7 +14,7 @@ > SLAVEDIRS= databases/mysql51-client databases/mysql51-scripts > GNU_CONFIGURE= yes > >-USES+= libtool makeinfo >+USES+= libtool makeinfo readline > CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ > --without-debug \ > --without-readline \ >@@ -63,10 +63,6 @@ > CONFIGURE_ARGS+=--with-collation=${WITH_COLLATION} > .endif > >-.if defined(CLIENT_ONLY) >-USES+= readline >-.endif >- > .include <bsd.port.pre.mk> > > .if ${ARCH} == "arm" >@@ -218,4 +214,11 @@ > @${FALSE} > .endif > >+# MFC tcp_wrappers (PR 42336,32808) >+.if (${OSVERSION} > 903507 && ${OSVERSION} < 1000000) || (${OSVERSION} > 1001506 && ${OSVERSION} < 1100000) || ${OSVERSION} > 1100038 >+EXTRA_PATCHES+= ${FILESDIR}/extrapatch-mfc-tcp_wrappers-include_my_tcpd.h >+.else >+EXTRA_PATCHES+= ${FILESDIR}/extrapatch-include_my_tcpd.h >+.endif >+ > .include <bsd.port.post.mk> >Index: files/extrapatch-include_my_tcpd.h >=================================================================== >--- files/extrapatch-include_my_tcpd.h (revision 0) >+++ files/extrapatch-include_my_tcpd.h (working copy) >@@ -0,0 +1,147 @@ >+--- include/my_tcpd.h.orig Sun Jan 9 13:33:51 2005 >++++ include/my_tcpd.h Sun Jan 9 13:41:42 2005 >+@@ -6,6 +6,25 @@ >+ * $FreeBSD: releng/10.1/contrib/tcp_wrappers/tcpd.h 56977 2000-02-03 10:27:03Z shin $ >+ */ >+ >++#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 */ > >Property changes on: files/extrapatch-include_my_tcpd.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/extrapatch-mfc-tcp_wrappers-include_my_tcpd.h >=================================================================== >--- files/extrapatch-mfc-tcp_wrappers-include_my_tcpd.h (revision 0) >+++ files/extrapatch-mfc-tcp_wrappers-include_my_tcpd.h (working copy) >@@ -0,0 +1,148 @@ >+--- include/my_tcpd.h.orig 2015-09-03 20:19:54 UTC >++++ include/my_tcpd.h >+@@ -6,6 +6,25 @@ >+ * $FreeBSD: head/contrib/tcp_wrappers/tcpd.h 272950 2014-10-11 18:54:37Z pfg $ >+ */ >+ >++#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 @@ struct request_info { >+ 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) (int); /* datagram sink function or 0 */ >+- void (*hostname) (struct host_info *); /* address to printable hostname */ >+- void (*hostaddr) (struct host_info *); /* address to printable address */ >+- void (*cleanup) (struct request_info *); /* 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,21 +86,24 @@ extern char paranoid[]; >+ /* 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 int hosts_ctl(); /* wrapper around request_init() */ >+-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. */ >+ >+@@ -99,9 +121,13 @@ extern int resident; /* > 0 if residen >+ */ >+ >+ #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 >+@@ -124,27 +150,27 @@ extern struct request_info *request_set( >+ * 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 *)); /* look up endpoint addresses */ >++extern void sock_hostname __P((struct host_info *)); /* translate address to hostname */ >++extern void sock_hostaddr __P((struct host_info *)); /* address to printable address */ >+ #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 >+ >+ /* >+@@ -185,7 +211,7 @@ extern struct tcpd_context tcpd_context; >+ * 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. */ >+@@ -224,3 +250,7 @@ extern char *fix_strtok(); >+ #define strtok my_strtok >+ extern char *my_strtok(); >+ #endif >++ >++__END_DECLS >++ >++#endif /* tcpd.h */ > >Property changes on: files/extrapatch-mfc-tcp_wrappers-include_my_tcpd.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/patch-include_my_tcpd.h >=================================================================== >--- files/patch-include_my_tcpd.h (revision 396146) >+++ files/patch-include_my_tcpd.h (working copy) >@@ -1,147 +0,0 @@ >---- include/my_tcpd.h.orig Sun Jan 9 13:33:51 2005 >-+++ include/my_tcpd.h Sun Jan 9 13:41:42 2005 >-@@ -6,6 +6,25 @@ >- * $FreeBSD: releng/10.1/contrib/tcp_wrappers/tcpd.h 56977 2000-02-03 10:27:03Z shin $ >- */ >- >-+#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 */
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=160732">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 201686
:
160693
| 160732