cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to MySQL 3.22.32

Browse Source
This commit is contained in:
brad 2000-02-14 21:28:05 +00:00
parent 40cc3ece85
commit 56b79fc7f8
6 changed files with 21 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
databases/mysql/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.14 2000/02/11 07:56:30 brad Exp $
# $OpenBSD: Makefile,v 1.15 2000/02/14 21:28:05 brad Exp $
# $FreeBSD: Makefile,v 1.44 1999/03/04 21:27:58 dirk Exp $
DISTNAME= mysql-3.22.30
DISTNAME= mysql-3.22.32
CATEGORIES= databases
MASTER_SITES= http://web.tryc.on.ca/mysql/Downloads/MySQL-3.22/ \
http://mysql.he.net/Downloads/MySQL-3.22/ \
@ -65,7 +65,6 @@ pre-install:
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mysql
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mysql/Img
${INSTALL_DATA_DIR} ${PREFIX}/share/mysql/mysql
${INSTALL_SCRIPT} ${WRKDIR}/startup.sh ${PREFIX}/lib/mysql
cd ${WRKSRC}/Docs; ${INSTALL_DATA} manual.html manual.ps \
manual_toc.html manual.txt ${PREFIX}/share/doc/mysql

6
databases/mysql/files/md5
View File

@ -1,3 +1,3 @@
MD5 (mysql-3.22.30.tar.gz) = 26d0ba5f19e4d93ba81611cbe35da81a
RMD160 (mysql-3.22.30.tar.gz) = 447de83af48609321067986ae7b8ff0326473340
SHA1 (mysql-3.22.30.tar.gz) = db71e5ab7932a48c840c958cc60af52ec882bfed
MD5 (mysql-3.22.32.tar.gz) = 244e08d9a1f4b2ad799aa40ad3cc897a
RMD160 (mysql-3.22.32.tar.gz) = f89cef4bea95e6e997dc12c63d26adf3a5f75193
SHA1 (mysql-3.22.32.tar.gz) = a9aba1f35153ae72eb06cad33f81faeb24559500

31
databases/mysql/patches/patch-ad
View File

@ -1,31 +0,0 @@
--- sql/sql_parse.cc.orig Fri Feb 11 01:48:52 2000
+++ sql/sql_parse.cc Fri Feb 11 01:53:47 2000
@@ -17,6 +17,8 @@
#include <m_ctype.h>
#include <thr_alarm.h>
+#define SCRAMBLE_LENGTH 8
+
extern int yyparse(void);
extern "C" pthread_mutex_t THR_LOCK_keycache;
@@ -127,8 +129,8 @@
end=strmov(buff,server_version)+1;
int4store((uchar*) end,thd->thread_id);
end+=4;
- memcpy(end,thd->scramble,9);
- end+=9;
+ memcpy(end,thd->scramble,SCRAMBLE_LENGTH+1);
+ end+=SCRAMBLE_LENGTH+1;
#ifdef HAVE_COMPRESS
int2store(end,CLIENT_LONG_FLAG | CLIENT_CONNECT_WITH_DB | CLIENT_COMPRESS);
#else
@@ -153,6 +155,8 @@
if (!(thd->user = my_strdup((char*) net->read_pos+5, MYF(MY_FAE))))
return(ER_OUT_OF_RESOURCES);
char *passwd= strend((char*) net->read_pos+5)+1;
+ if (passwd[0] && strlen(passwd) != SCRAMBLE_LENGTH)
+ return ER_HANDSHAKE_ERROR;
thd->master_access=acl_getroot(thd->host, thd->ip, thd->user,
passwd, thd->scramble, &thd->priv_user,
protocol_version == 9 ||

8
databases/mysql/patches/patch-ag
View File

@ -1,5 +1,5 @@
--- configure.orig Tue Jan 11 22:32:17 2000
+++ configure Thu Jan 13 13:22:15 2000
--- configure.orig Sat Feb 12 21:46:09 2000
+++ configure Sun Feb 13 22:09:51 2000
@@ -2743,7 +2743,7 @@
;;
esac
@ -40,7 +40,7 @@
echo "$ac_t"""$FIND_PROC"" 1>&6
@@ -4614,8 +4592,6 @@
@@ -4646,8 +4624,6 @@
#define $ac_tr_lib 1
EOF
@ -49,7 +49,7 @@
else
echo "$ac_t""no" 1>&6
fi
@@ -4849,28 +4825,6 @@
@@ -4881,28 +4857,6 @@
fi

7
databases/mysql/pkg/PLIST
View File

@ -25,6 +25,7 @@ include/mysql/m_string.h
include/mysql/my_config.h
include/mysql/my_global.h
include/mysql/my_list.h
include/mysql/my_net.h
include/mysql/my_pthread.h
include/mysql/my_sys.h
include/mysql/mysql.h
@ -32,6 +33,10 @@ include/mysql/mysql_com.h
include/mysql/mysql_version.h
include/mysql/mysqld_error.h
include/mysql/raid.h
include/mysql/sslopt-case.h
include/mysql/sslopt-longopts.h
include/mysql/sslopt-usage.h
include/mysql/sslopt-vars.h
@unexec install-info --delete %D/info/mysql.info %D/info/dir
info/mysql.info
@exec install-info %D/info/mysql.info %D/info/dir
@ -121,7 +126,7 @@ share/mysql/korean/errmsg.sys
share/mysql/korean/errmsg.txt
share/mysql/make_binary_distribution
share/mysql/my-example.cnf
share/mysql/mysql-3.22.30.spec
share/mysql/mysql-3.22.32.spec
share/mysql/mysql-log-rotate
share/mysql/mysql.server
share/mysql/norwegian-ny/errmsg.sys

7
databases/mysql/pkg/PLIST.noshared
View File

@ -25,6 +25,7 @@ include/mysql/m_string.h
include/mysql/my_config.h
include/mysql/my_global.h
include/mysql/my_list.h
include/mysql/my_net.h
include/mysql/my_pthread.h
include/mysql/my_sys.h
include/mysql/mysql.h
@ -32,6 +33,10 @@ include/mysql/mysql_com.h
include/mysql/mysql_version.h
include/mysql/mysqld_error.h
include/mysql/raid.h
include/mysql/sslopt-case.h
include/mysql/sslopt-longopts.h
include/mysql/sslopt-usage.h
include/mysql/sslopt-vars.h
@unexec install-info --delete %D/info/mysql.info %D/info/dir
info/mysql.info
@exec install-info %D/info/mysql.info %D/info/dir
@ -119,7 +124,7 @@ share/mysql/korean/errmsg.sys
share/mysql/korean/errmsg.txt
share/mysql/make_binary_distribution
share/mysql/my-example.cnf
share/mysql/mysql-3.22.30.spec
share/mysql/mysql-3.22.32.spec
share/mysql/mysql-log-rotate
share/mysql/mysql.server
share/mysql/norwegian-ny/errmsg.sys