- Update to 4.0.27

PR:		97502
Approved by:	maintainer timeout (security bypass by mnag with secteam hat)
Security:	CVE-2006-1516, CVE-2006-1517

5 files changed, 17 insertions, 19 deletions

diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile
index 02cd2c7b9f65..ed5bc9dffa7c 100644
--- a/databases/mysql40-client/Makefile
+++ b/databases/mysql40-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql40-scripts/Makefile b/databases/mysql40-scripts/Makefile
index f2001cb3961e..51c445d89205 100644
--- a/databases/mysql40-scripts/Makefile
+++ b/databases/mysql40-scripts/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-scripts
 
 COMMENT=	Multithreaded SQL database (scripts)
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index eb1b6a115d8d..0a42738ab5c1 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.0.26
-PORTREVISION?=	2
+PORTVERSION=	4.0.27
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-4.0
@@ -126,7 +126,7 @@ pre-fetch:
 post-patch:
 	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts man support-files|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
+	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
 .if defined(WITH_PROC_SCOPE_PTH)
@@ -157,7 +157,7 @@ CONFIGURE_ARGS+=--without-server
 post-patch:
 	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests scripts man|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|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
+	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
 .if defined(WITH_PROC_SCOPE_PTH)
 	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c
@@ -190,7 +190,7 @@ SCRIPTS=	msql2mysql mysql_fix_extensions mysql_setpermission \
 post-patch:
 	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = scripts man|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = ${SCRIPTS}|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
+	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 .endif
 .endif
 # Common part
diff --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo
index 10b12e3039e9..7e85b94b5dce 100644
--- a/databases/mysql40-server/distinfo
+++ b/databases/mysql40-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-4.0.26.tar.gz) = 4e2060a3875470e0d853391e8647a019
-SHA256 (mysql-4.0.26.tar.gz) = 571186c57c576dab262df4c2f2008254e1b083d5c2c14e17956e0a904de741dd
-SIZE (mysql-4.0.26.tar.gz) = 11144366
+MD5 (mysql-4.0.27.tar.gz) = 315f88a902c59e230212b3ccf137f92f
+SHA256 (mysql-4.0.27.tar.gz) = c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f
+SIZE (mysql-4.0.27.tar.gz) = 11152643
diff --git a/databases/mysql40-server/files/patch-man::Makefile.in b/databases/mysql40-server/files/patch-man::Makefile.in
index 2ed1bfc9f51e..18a44c36cf57 100644
--- a/databases/mysql40-server/files/patch-man::Makefile.in
+++ b/databases/mysql40-server/files/patch-man::Makefile.in
@@ -1,13 +1,11 @@
---- man/Makefile.in.orig	Mon Dec 27 16:29:53 2004
-+++ man/Makefile.in	Sun Jan  9 10:26:07 2005
-@@ -290,9 +290,7 @@
+--- man/Makefile.in.orig	Sat May  6 15:56:15 2006
++++ man/Makefile.in	Fri May 19 15:59:41 2006
+@@ -293,7 +293,7 @@
  uname_prog = @uname_prog@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
--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 =
+-man1_MANS = @man1_files@
++man1_MANS = 
+ EXTRA_DIST = $(man1_MANS)
+ all: all-am
  
- 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 \