diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2008-10-10 18:35:13 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2008-10-10 18:35:13 +0000 |
| commit | c7d5687bb9a73bf4004dbf9db68007e021ae2127 (patch) | |
| tree | e37411286e743304687adc47b2269ed9c165b10b /databases/mysql55-server | |
| parent | a0bc190df236350920036c581d62c3f2b2e2eaa0 (diff) | |
- Fix client input validation vulnerability
- Fix my.cnf search path
Notes
Notes:
svn path=/head/; revision=221400
Diffstat (limited to 'databases/mysql55-server')
| -rw-r--r-- | databases/mysql55-server/Makefile | 2 | ||||
| -rw-r--r-- | databases/mysql55-server/files/patch-client_mysql.cc | 27 | ||||
| -rw-r--r-- | databases/mysql55-server/files/patch-mysys_default.c | 2 |
3 files changed, 29 insertions, 2 deletions
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 : +- " ") : "NULL")); ++ tee_fputs("<TH>", PAGER); ++ if (field->name && field->name[0]) ++ xmlencode_print(field->name, field->name_length); ++ else ++ tee_fputs(field->name ? " " : "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 */ |