Update to 5.0.26 release and fix two security vulnerabilities

(CVE-2006-4226 and CVE-2006-4227).

Approved by:	portmgr (erwin)

6 files changed, 14 insertions, 23 deletions

diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile
index 5d093767548b..302a1133672f 100644
--- a/databases/mysql50-client/Makefile
+++ b/databases/mysql50-client/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 7e647956d946..9e4576ddfed2 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.0.24a
+PORTVERSION=	5.0.26
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -181,6 +181,8 @@ CONFLICTS=	mysql-client-3.* mysql-client-4.* mysql-client-5.1.*
 MAN1=		mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
 		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
 
+MAN8=		mysqlmanager.8
+
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 
 CONFIGURE_ARGS+=--without-server
@@ -197,7 +199,7 @@ post-patch:
 	@${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
-	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
+	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|g" ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
 .if defined(WITH_PROC_SCOPE_PTH)
diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo
index 8405efa0bdba..274f0d0e5be2 100644
--- a/databases/mysql50-server/distinfo
+++ b/databases/mysql50-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.0.24a.tar.gz) = 6b07546389f75c52611adb7af38c3667
-SHA256 (mysql-5.0.24a.tar.gz) = 1400d02f58ffe1c1570bd5590b75143bec270ad15fc98c868bbb82e7f59f70f2
-SIZE (mysql-5.0.24a.tar.gz) = 19993102
+MD5 (mysql-5.0.26.tar.gz) = 63ec8afeaf202c435b12d112f5ce7857
+SHA256 (mysql-5.0.26.tar.gz) = 4266fe6a3593700d4157b8cc4278fa8ae98837d4757735fc6ed70d9df6bb2680
+SIZE (mysql-5.0.26.tar.gz) = 25986952
diff --git a/databases/mysql50-server/files/patch-configure b/databases/mysql50-server/files/patch-configure
index 1f0615bc62ff..b20e5d7226b7 100644
--- a/databases/mysql50-server/files/patch-configure
+++ b/databases/mysql50-server/files/patch-configure
@@ -20,14 +20,3 @@
  
  ndb_cxxflags_fix=
  case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_c_compiler_gnu in
-@@ -39038,8 +39036,8 @@
-         OPENSSL_INCLUDE=-I$incs
-       fi
-       # Test for libssl using all known library file endings
--      if test -f $d/libssl.a || test -f $d/libssl.so || \
--         test -f $d/libssl.sl || test -f $d/libssl.dylib ; then
-+      if test -f $libs/libssl.a || test -f $libs/libssl.so || \
-+         test -f $libs/libssl.sl || test -f $libs/libssl.dylib ; then
-         OPENSSL_LIB=$libs
-       fi
-       ;;
diff --git a/databases/mysql50-server/files/patch-man::Makefile.in b/databases/mysql50-server/files/patch-man::Makefile.in
index 35f0e88ddc3d..a8f1ca7157c0 100644
--- a/databases/mysql50-server/files/patch-man::Makefile.in
+++ b/databases/mysql50-server/files/patch-man::Makefile.in
@@ -1,11 +1,13 @@
---- man/Makefile.in.orig	Sun Nov 27 00:09:54 2005
-+++ man/Makefile.in	Sun Nov 27 00:09:03 2005
-@@ -338,7 +338,7 @@
+--- man/Makefile.in.orig	Wed Oct  4 13:25:43 2006
++++ man/Makefile.in	Sun Oct 22 10:07:26 2006
+@@ -344,8 +344,8 @@
  yassl_libs = @yassl_libs@
- yassl_libs_with_path = @yassl_libs_with_path@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
 -man1_MANS = @man1_files@
+-man8_MANS = @man8_files@
 +man1_MANS =
- EXTRA_DIST = $(man1_MANS)
++man8_MANS =
+ EXTRA_DIST = $(man1_MANS) $(man8_MANS)
  all: all-am
  
diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist
index 29380181a6c9..af6a09b0a3b9 100644
--- a/databases/mysql50-server/pkg-plist
+++ b/databases/mysql50-server/pkg-plist
@@ -45,7 +45,6 @@ bin/resolveip
 %%NDB%%include/mysql/ndb/ndbapi/NdbBlob.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