Date: 12 Dec 2002 18:14:09 -0000 From: Paulius Bulotas <paulius@noname.csdl.lt> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46214: MySQL client and server upgrade to 3.23.54 Message-ID: <20021212181409.47870.qmail@noname.csdl.lt>
next in thread | raw e-mail | index | archive | help
>Number: 46214
>Category: ports
>Synopsis: MySQL client and server upgrade to 3.23.54
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Dec 12 10:20:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Paulius Bulotas <paulius@kaktusas.org>
>Release: FreeBSD 4.6.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD noname.csdl.lt 4.6.2-RELEASE FreeBSD 4.6.2-RELEASE #0: Thu Aug 15 06:12:24 GMT 2002 root@test.csdl.lt:/usr/src/sys/compile/NONAME i386
>Description:
MySQL server and client upgrade to new version, which fixes recently announced security bugs
I've tested just installation/deinstallation ;)
>How-To-Repeat:
>Fix:
patch for mysql client port:
--- databases/mysql323-client/Makefile.orig Thu Dec 12 20:05:46 2002
+++ databases/mysql323-client/Makefile Thu Dec 12 20:05:50 2002
@@ -6,7 +6,6 @@
#
PORTNAME= mysql-client
-PORTREVISION= 1
MASTERDIR= ${.CURDIR}/../mysql323-server
COMMENT= ${PKGDIR}/pkg-comment.client
patch for mysql server port:
--- databases/mysql323-server/Makefile.orig Thu Nov 21 23:04:16 2002
+++ databases/mysql323-server/Makefile Thu Dec 12 19:59:49 2002
@@ -6,16 +6,13 @@
#
PORTNAME?= ${MASTERPORTNAME}
-PORTVERSION= 3.23.53
-PORTREVISION?= 4
+PORTVERSION= 3.23.54
CATEGORIES= databases
-MASTER_SITES= http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+ http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \
http://mysql.he.net/Downloads/MySQL-3.23/ \
- ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/ \
- ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-3.23/ \
- http://mysql.orst.edu/Downloads/MySQL-3.23/ \
- http://web.tryc.on.ca/mysql/Downloads/MySQL-3.23/ \
- ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-3.23/
+ ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/
+MASTER_SITE_SUBDIR= mirrors/mysql/Downloads/MySQL-3.23
DISTFILES= mysql-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= dirk@FreeBSD.org
@@ -43,9 +40,9 @@
.endif
.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
-.endif
.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
+.endif
.endif
.if defined(BUILD_STATIC)
CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
--- databases/mysql323-server/distinfo.orig Mon Oct 21 11:22:13 2002
+++ databases/mysql323-server/distinfo Thu Dec 12 17:02:26 2002
@@ -1 +1 @@
-MD5 (mysql-3.23.53.tar.gz) = ad28097b22238227a813779839349f0c
+MD5 (mysql-3.23.54.tar.gz) = 03e1b9c2a76e4bff4f0ec68b62f3aaca
--- databases/mysql323-server/files/patch-ag.orig Mon Nov 11 00:22:17 2002
+++ databases/mysql323-server/files/patch-ag Thu Dec 12 17:51:53 2002
@@ -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 12 17:14:53 2002
++++ configure Thu Dec 12 17:51:32 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"
--- databases/mysql323-server/files/patch-an.orig Thu Jun 20 16:47:47 2002
+++ databases/mysql323-server/files/patch-an Thu Dec 12 17:57:53 2002
@@ -1,10 +1,13 @@
---- 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 11:37:22 2002
++++ Makefile.in Thu Dec 12 17:57:38 2002
+@@ -195,11 +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
--- databases/mysql323-server/files/patch-ar.orig Tue Jan 23 00:46:32 2001
+++ databases/mysql323-server/files/patch-ar Thu Dec 12 19:36:25 2002
@@ -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 12 19:34:09 2002
++++ include/Makefile.in Thu Dec 12 19:35:54 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
--- databases/mysql323-server/pkg-plist.client.orig Mon Feb 11 15:35:35 2002
+++ databases/mysql323-server/pkg-plist.client Thu Dec 12 19:08:47 2002
@@ -28,6 +28,7 @@
include/mysql/sslopt-usage.h
include/mysql/sslopt-vars.h
lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.la
lib/mysql/libmysqlclient.so
lib/mysql/libmysqlclient.so.10
@dirrm include/mysql
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021212181409.47870.qmail>