Upgrade to 3.23.54.

This fixes a security hole which is remotely exploitable.

See http://security.e-matters.de/advisories/042002.html for details.

Submitted by:	sobomax
Approved by:	sobomax

5 files changed, 44 insertions, 52 deletions

diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 899d59b731ad..64a47ec085b9 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	3.23.53
-PORTREVISION?=	4
+PORTVERSION=	3.23.54
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \
 		http://mysql.he.net/Downloads/MySQL-3.23/ \
@@ -18,8 +18,6 @@ MASTER_SITES=	http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \
 		ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-3.23/
 DISTFILES=	mysql-${PORTVERSION}${EXTRACT_SUFX}
 
-FORBIDDEN=	"Myltiple security vulnerabilities - see http://security.e-matters.de/advisories/042002.html"
-
 MAINTAINER=	dirk@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/mysql-${PORTVERSION}
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index 7ae4388d1728..e7d8a2823302 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.23.53.tar.gz) = ad28097b22238227a813779839349f0c
+MD5 (mysql-3.23.54.tar.gz) = 03e1b9c2a76e4bff4f0ec68b62f3aaca
diff --git a/databases/mysql60-server/files/patch-Makefile.in b/databases/mysql60-server/files/patch-Makefile.in
index b002d685b504..9e6ffdf83049 100644
--- a/databases/mysql60-server/files/patch-Makefile.in
+++ b/databases/mysql60-server/files/patch-Makefile.in
@@ -1,16 +1,18 @@
---- Makefile.in.orig	Mon Jun  3 12:45:17 2002
-+++ Makefile.in	Mon Jun 17 20:57:29 2002
-@@ -185,8 +185,11 @@
- # These are built from source in the Docs directory
- EXTRA_DIST = INSTALL-SOURCE README 			COPYING COPYING.LIB MIRRORS
+--- Makefile.in.orig	Thu Dec  5 10:37:22 2002
++++ Makefile.in	Sat Dec 14 16:24:26 2002
+@@ -195,10 +195,11 @@
+ EXTRA_DIST = INSTALL-SOURCE README \
+ 			COPYING COPYING.LIB MIRRORS
  
--SUBDIRS = include @docs_dirs@ @readline_dir@ 			@thread_dirs@ @sql_client_dirs@ 			@sql_server_dirs@ scripts tests man 			@bench_dirs@ support-files os2
--
+-SUBDIRS = include @docs_dirs@ @readline_dir@ \
+-			@thread_dirs@ @sql_client_dirs@ \
+-			@sql_server_dirs@ scripts tests man \
+-			@bench_dirs@ support-files os2
 +.if defined(CLIENT_ONLY)
 +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man
 +.else
 +SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files
 +.endif
  
+ 
  # Relink after clean
- CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources
diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure
index 29f1b9ed960f..609572cbafcc 100644
--- a/databases/mysql60-server/files/patch-configure
+++ b/databases/mysql60-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Oct 10 12:17:48 2002
-+++ configure	Sun Nov 10 23:07:01 2002
-@@ -4222,7 +4222,7 @@
+--- configure.orig	Thu Dec  5 10:37:31 2002
++++ configure	Sat Dec 14 16:07:17 2002
+@@ -8988,7 +8988,7 @@
    ;;
  esac
  fi
@@ -8,12 +8,12 @@
 +HOSTNAME="$ac_cv_path_HOSTNAME -s"
  
  if test -n "$HOSTNAME"; then
-   echo "$as_me:4228: result: $HOSTNAME" >&5
-@@ -4397,43 +4397,7 @@
+   echo "$as_me:$LINENO: result: $HOSTNAME" >&5
+@@ -9177,43 +9177,7 @@
  echo "${ECHO_T}no" >&6
  fi
  
--echo "$as_me:4400: checking \"how to check if pid exists\"" >&5
+-echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5
 -echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6
 -PS=$ac_cv_path_PS
 -# Linux style
@@ -45,43 +45,35 @@
 -      FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
 -      ;;
 -    *)
--      { { echo "$as_me:4432: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5
+-      { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5
 -echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;}
 -   { (exit 1); exit 1; }; }
 -  esac
 -fi
 +FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
  
- echo "$as_me:4438: result: \"$FIND_PROC\"" >&5
+ echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -7420,6 +7384,7 @@
-     ;;
-   *freebsd*)
-     echo "Adding fix for interrupted reads"
-+    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
-     CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
-     ;;
-   *netbsd*)
-@@ -8090,7 +8055,6 @@
+@@ -13208,7 +13172,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lc_r  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line 8095 "configure"
+ #line $LINENO "configure"
  #include "confdefs.h"
-@@ -8138,7 +8102,6 @@
+@@ -13262,7 +13225,6 @@
  #define HAVE_LIBC_R 1
- EOF
+ _ACEOF
  
 -  LIBS="-lc_r $LIBS"
  
  fi
  
-@@ -8495,29 +8458,6 @@
- 
+@@ -13706,29 +13668,6 @@
  fi
  
+ 
 -# Build optimized or debug version ?
 -# First check for gcc and g++
 -if test "$ac_cv_c_compiler_gnu" = "yes"
@@ -105,10 +97,10 @@
 -  OPTIMIZE_CXXFLAGS="-O"
 -fi
 -
+ 
  # Check whether --with-debug or --without-debug was given.
  if test "${with_debug+set}" = set; then
-   withval="$with_debug"
-@@ -10249,10 +10189,6 @@
+@@ -16081,10 +16020,6 @@
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
@@ -118,11 +110,11 @@
 -fi
  mysql_cv_btype_last_arg_accept=none
  cat >conftest.$ac_ext <<_ACEOF
- #line 10258 "configure"
-@@ -12922,14 +12858,6 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ #line $LINENO "configure"
+@@ -19222,14 +19157,6 @@
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
+ 
 -# Do not treat warnings as errors if we are linking against other libc
 -# this is to work around gcc not being permissive on non-system includes
 -# with respect to ANSI C++
@@ -132,9 +124,9 @@
 -fi
 -
  cat >conftest.$ac_ext <<_ACEOF
- #line 12934 "configure"
+ #line $LINENO "configure"
  #include "confdefs.h"
-@@ -13006,10 +12934,6 @@
+@@ -19313,10 +19240,6 @@
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
@@ -143,9 +135,9 @@
 -  CXXFLAGS="$CXXFLAGS -Werror"
 -fi
  cat >conftest.$ac_ext <<_ACEOF
- #line 13014 "configure"
+ #line $LINENO "configure"
  #include "confdefs.h"
-@@ -13085,10 +13009,6 @@
+@@ -19399,10 +19322,6 @@
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
@@ -154,5 +146,5 @@
 -  CXXFLAGS="$CXXFLAGS -Werror"
 -fi
  cat >conftest.$ac_ext <<_ACEOF
- #line 13093 "configure"
+ #line $LINENO "configure"
  #include "confdefs.h"
diff --git a/databases/mysql60-server/files/patch-include::Makefile.in b/databases/mysql60-server/files/patch-include::Makefile.in
index eb2d5e52e794..3ff10ce708d5 100644
--- a/databases/mysql60-server/files/patch-include::Makefile.in
+++ b/databases/mysql60-server/files/patch-include::Makefile.in
@@ -1,14 +1,14 @@
---- include/Makefile.in.orig	Mon Jan 22 14:43:55 2001
-+++ include/Makefile.in	Mon Jan 22 23:14:48 2001
-@@ -284,7 +284,11 @@
+--- include/Makefile.in.orig	Thu Dec  5 10:37:22 2002
++++ include/Makefile.in	Sat Dec 14 16:26:53 2002
+@@ -324,7 +324,11 @@
+ installdirs:
+ 	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
  
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 +.if defined(CLIENT_ONLY)
  install: install-am
 +.else
 +install:
 +.endif
- uninstall-am: uninstall-pkgincludeHEADERS
+ install-exec: install-exec-am
+ install-data: install-data-am
  uninstall: uninstall-am
- all-am: Makefile $(HEADERS) all-local