ports/56703: [Maintainer Update] Port: MySQL 4.0.15 (Security Fix)

[Alex Dupre]

>Number:         56703
>Category:       ports
>Synopsis:       [Maintainer Update] Port: MySQL 4.0.15 (Security Fix)
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 11 07:20:10 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Alex Dupre
>Release:        FreeBSD 4.8-ALEXDUPRE i386
>Organization:
>Environment:
System: FreeBSD 4.8-ALEXDUPRE i386
>Description:
Update to 4.0.15 release.
Fix exploitable buffer overflow (maybe we can ignore the port freeze (?)).
Whitespace fix.
Check OVERWRITE_DB is not set to "no", when defined.
>How-To-Repeat:
>Fix:

--- mysql40.diff begins here ---
diff -ruN mysql40-server.orig/Makefile mysql40-server/Makefile
--- mysql40-server.orig/Makefile	Thu Sep 11 16:06:55 2003
+++ mysql40-server/Makefile	Thu Sep 11 16:07:23 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.0.14
+PORTVERSION=	4.0.15
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
@@ -124,8 +124,8 @@
 	@${ECHO} ""
 
 post-patch:
-	 @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in
-	 @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
 
 .if defined(WITH_OPENSSL) && defined(BUILD_STATIC)
 pre-configure:
@@ -135,10 +135,10 @@
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
-.if exists(${DB_DIR}) && defined(OVERWRITE_DB)
+.if exists(${DB_DIR}) && defined(OVERWRITE_DB) && ${OVERWRITE_DB} != "no"
 	@${RM} -r ${DB_DIR}/mysql ${DB_DIR}/test 2>/dev/null || true
 .endif
-.if !exists(${DB_DIR}) || defined(OVERWRITE_DB)
+.if !exists(${DB_DIR}) || (defined(OVERWRITE_DB) && ${OVERWRITE_DB} != "no")
 .if defined(SKIP_DNS_CHECK)
 	${PREFIX}/bin/mysql_install_db --force
 .else
@@ -171,7 +171,7 @@
 CONFIGURE_ARGS+=--without-server
 
 post-patch:
-	 @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in
 
 post-install:
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh
diff -ruN mysql40-server.orig/distinfo mysql40-server/distinfo
--- mysql40-server.orig/distinfo	Thu Sep 11 16:06:55 2003
+++ mysql40-server/distinfo	Thu Sep 11 16:07:05 2003
@@ -1 +1 @@
-MD5 (mysql-4.0.14.tar.gz) = 9764f09c89692345d3b7800ab014f822
+MD5 (mysql-4.0.15.tar.gz) = a6ce917730e8778ef7c9e1f7b5053b2d
diff -ruN mysql40-server.orig/pkg-plist mysql40-server/pkg-plist
--- mysql40-server.orig/pkg-plist	Thu Sep 11 16:06:55 2003
+++ mysql40-server/pkg-plist	Thu Sep 11 16:07:05 2003
@@ -1,6 +1,7 @@
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_win_src_distribution
 bin/msql2mysql
 bin/my_print_defaults
 bin/myisamchk
--- mysql40.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: