- Fix client input validation vulnerability

- Fix my.cnf search path

15 files changed, 145 insertions, 10 deletions

diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 5ad8a12c2db5..4ade8dec8095 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.0.67
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.0
diff --git a/databases/mysql50-server/files/patch-client_mysql.cc b/databases/mysql50-server/files/patch-client_mysql.cc
new file mode 100644
index 000000000000..73bccef5bdb9
--- /dev/null
+++ b/databases/mysql50-server/files/patch-client_mysql.cc
@@ -0,0 +1,27 @@
+--- client/mysql.cc.orig	2007-11-13 13:29:42 +0000
++++ client/mysql.cc	2008-05-01 19:16:09 +0000
+@@ -2636,9 +2636,12 @@
+   {
+     while((field = mysql_fetch_field(result)))
+     {
+-      tee_fprintf(PAGER, "<TH>%s</TH>", (field->name ? 
+-					 (field->name[0] ? field->name : 
+-					  " &nbsp; ") : "NULL"));
++      tee_fputs("<TH>", PAGER);
++      if (field->name && field->name[0])
++        xmlencode_print(field->name, field->name_length);
++      else
++        tee_fputs(field->name ? " &nbsp; " : "NULL", PAGER);
++      tee_fputs("</TH>", PAGER);
+     }
+     (void) tee_fputs("</TR>", PAGER);
+   }
+@@ -2651,7 +2654,7 @@
+     for (uint i=0; i < mysql_num_fields(result); i++)
+     {
+       (void) tee_fputs("<TD>", PAGER);
+-      safe_put_field(cur[i],lengths[i]);
++      xmlencode_print(cur[i], lengths[i]);
+       (void) tee_fputs("</TD>", PAGER);
+     }
+     (void) tee_fputs("</TR>", PAGER);
diff --git a/databases/mysql50-server/files/patch-mysys_default.c b/databases/mysql50-server/files/patch-mysys_default.c
index 16c246c81cda..ee50c05541cd 100644
--- a/databases/mysql50-server/files/patch-mysys_default.c
+++ b/databases/mysql50-server/files/patch-mysys_default.c
@@ -15,7 +15,7 @@
    if (DEFAULT_SYSCONFDIR != "")
 +  {
      errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "mysql", dirs);
++    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
 +  }
  #endif /* __EMX__ || __OS2__ */
  
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index d1a9f7e0c667..ee676ffc8b9b 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.1.28
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
diff --git a/databases/mysql51-server/files/patch-client_mysql.cc b/databases/mysql51-server/files/patch-client_mysql.cc
new file mode 100644
index 000000000000..73bccef5bdb9
--- /dev/null
+++ b/databases/mysql51-server/files/patch-client_mysql.cc
@@ -0,0 +1,27 @@
+--- client/mysql.cc.orig	2007-11-13 13:29:42 +0000
++++ client/mysql.cc	2008-05-01 19:16:09 +0000
+@@ -2636,9 +2636,12 @@
+   {
+     while((field = mysql_fetch_field(result)))
+     {
+-      tee_fprintf(PAGER, "<TH>%s</TH>", (field->name ? 
+-					 (field->name[0] ? field->name : 
+-					  " &nbsp; ") : "NULL"));
++      tee_fputs("<TH>", PAGER);
++      if (field->name && field->name[0])
++        xmlencode_print(field->name, field->name_length);
++      else
++        tee_fputs(field->name ? " &nbsp; " : "NULL", PAGER);
++      tee_fputs("</TH>", PAGER);
+     }
+     (void) tee_fputs("</TR>", PAGER);
+   }
+@@ -2651,7 +2654,7 @@
+     for (uint i=0; i < mysql_num_fields(result); i++)
+     {
+       (void) tee_fputs("<TD>", PAGER);
+-      safe_put_field(cur[i],lengths[i]);
++      xmlencode_print(cur[i], lengths[i]);
+       (void) tee_fputs("</TD>", PAGER);
+     }
+     (void) tee_fputs("</TR>", PAGER);
diff --git a/databases/mysql51-server/files/patch-mysys_default.c b/databases/mysql51-server/files/patch-mysys_default.c
index d9fa1b430881..60d2b30ba25e 100644
--- a/databases/mysql51-server/files/patch-mysys_default.c
+++ b/databases/mysql51-server/files/patch-mysys_default.c
@@ -15,7 +15,7 @@
    if (DEFAULT_SYSCONFDIR != "")
 +  {
      errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "mysql", dirs);
++    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
 +  }
  #endif /* DEFAULT_SYSCONFDIR */
  
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index d1a9f7e0c667..ee676ffc8b9b 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.1.28
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
diff --git a/databases/mysql54-server/files/patch-client_mysql.cc b/databases/mysql54-server/files/patch-client_mysql.cc
new file mode 100644
index 000000000000..73bccef5bdb9
--- /dev/null
+++ b/databases/mysql54-server/files/patch-client_mysql.cc
@@ -0,0 +1,27 @@
+--- client/mysql.cc.orig	2007-11-13 13:29:42 +0000
++++ client/mysql.cc	2008-05-01 19:16:09 +0000
+@@ -2636,9 +2636,12 @@
+   {
+     while((field = mysql_fetch_field(result)))
+     {
+-      tee_fprintf(PAGER, "<TH>%s</TH>", (field->name ? 
+-					 (field->name[0] ? field->name : 
+-					  " &nbsp; ") : "NULL"));
++      tee_fputs("<TH>", PAGER);
++      if (field->name && field->name[0])
++        xmlencode_print(field->name, field->name_length);
++      else
++        tee_fputs(field->name ? " &nbsp; " : "NULL", PAGER);
++      tee_fputs("</TH>", PAGER);
+     }
+     (void) tee_fputs("</TR>", PAGER);
+   }
+@@ -2651,7 +2654,7 @@
+     for (uint i=0; i < mysql_num_fields(result); i++)
+     {
+       (void) tee_fputs("<TD>", PAGER);
+-      safe_put_field(cur[i],lengths[i]);
++      xmlencode_print(cur[i], lengths[i]);
+       (void) tee_fputs("</TD>", PAGER);
+     }
+     (void) tee_fputs("</TR>", PAGER);
diff --git a/databases/mysql54-server/files/patch-mysys_default.c b/databases/mysql54-server/files/patch-mysys_default.c
index d9fa1b430881..60d2b30ba25e 100644
--- a/databases/mysql54-server/files/patch-mysys_default.c
+++ b/databases/mysql54-server/files/patch-mysys_default.c
@@ -15,7 +15,7 @@
    if (DEFAULT_SYSCONFDIR != "")
 +  {
      errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "mysql", dirs);
++    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
 +  }
  #endif /* DEFAULT_SYSCONFDIR */
  
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index d1a9f7e0c667..ee676ffc8b9b 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.1.28
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
diff --git a/databases/mysql55-server/files/patch-client_mysql.cc b/databases/mysql55-server/files/patch-client_mysql.cc
new file mode 100644
index 000000000000..73bccef5bdb9
--- /dev/null
+++ b/databases/mysql55-server/files/patch-client_mysql.cc
@@ -0,0 +1,27 @@
+--- client/mysql.cc.orig	2007-11-13 13:29:42 +0000
++++ client/mysql.cc	2008-05-01 19:16:09 +0000
+@@ -2636,9 +2636,12 @@
+   {
+     while((field = mysql_fetch_field(result)))
+     {
+-      tee_fprintf(PAGER, "<TH>%s</TH>", (field->name ? 
+-					 (field->name[0] ? field->name : 
+-					  " &nbsp; ") : "NULL"));
++      tee_fputs("<TH>", PAGER);
++      if (field->name && field->name[0])
++        xmlencode_print(field->name, field->name_length);
++      else
++        tee_fputs(field->name ? " &nbsp; " : "NULL", PAGER);
++      tee_fputs("</TH>", PAGER);
+     }
+     (void) tee_fputs("</TR>", PAGER);
+   }
+@@ -2651,7 +2654,7 @@
+     for (uint i=0; i < mysql_num_fields(result); i++)
+     {
+       (void) tee_fputs("<TD>", PAGER);
+-      safe_put_field(cur[i],lengths[i]);
++      xmlencode_print(cur[i], lengths[i]);
+       (void) tee_fputs("</TD>", PAGER);
+     }
+     (void) tee_fputs("</TR>", PAGER);
diff --git a/databases/mysql55-server/files/patch-mysys_default.c b/databases/mysql55-server/files/patch-mysys_default.c
index d9fa1b430881..60d2b30ba25e 100644
--- a/databases/mysql55-server/files/patch-mysys_default.c
+++ b/databases/mysql55-server/files/patch-mysys_default.c
@@ -15,7 +15,7 @@
    if (DEFAULT_SYSCONFDIR != "")
 +  {
      errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "mysql", dirs);
++    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
 +  }
  #endif /* DEFAULT_SYSCONFDIR */
  
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index d1a9f7e0c667..ee676ffc8b9b 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.1.28
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.1
diff --git a/databases/percona55-server/files/patch-client_mysql.cc b/databases/percona55-server/files/patch-client_mysql.cc
new file mode 100644
index 000000000000..73bccef5bdb9
--- /dev/null
+++ b/databases/percona55-server/files/patch-client_mysql.cc
@@ -0,0 +1,27 @@
+--- client/mysql.cc.orig	2007-11-13 13:29:42 +0000
++++ client/mysql.cc	2008-05-01 19:16:09 +0000
+@@ -2636,9 +2636,12 @@
+   {
+     while((field = mysql_fetch_field(result)))
+     {
+-      tee_fprintf(PAGER, "<TH>%s</TH>", (field->name ? 
+-					 (field->name[0] ? field->name : 
+-					  " &nbsp; ") : "NULL"));
++      tee_fputs("<TH>", PAGER);
++      if (field->name && field->name[0])
++        xmlencode_print(field->name, field->name_length);
++      else
++        tee_fputs(field->name ? " &nbsp; " : "NULL", PAGER);
++      tee_fputs("</TH>", PAGER);
+     }
+     (void) tee_fputs("</TR>", PAGER);
+   }
+@@ -2651,7 +2654,7 @@
+     for (uint i=0; i < mysql_num_fields(result); i++)
+     {
+       (void) tee_fputs("<TD>", PAGER);
+-      safe_put_field(cur[i],lengths[i]);
++      xmlencode_print(cur[i], lengths[i]);
+       (void) tee_fputs("</TD>", PAGER);
+     }
+     (void) tee_fputs("</TR>", PAGER);
diff --git a/databases/percona55-server/files/patch-mysys_default.c b/databases/percona55-server/files/patch-mysys_default.c
index d9fa1b430881..60d2b30ba25e 100644
--- a/databases/percona55-server/files/patch-mysys_default.c
+++ b/databases/percona55-server/files/patch-mysys_default.c
@@ -15,7 +15,7 @@
    if (DEFAULT_SYSCONFDIR != "")
 +  {
      errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "mysql", dirs);
++    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
 +  }
  #endif /* DEFAULT_SYSCONFDIR */