pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases/mysql-client Update mysql-client to 3.23.58
details: https://anonhg.NetBSD.org/pkgsrc/rev/0cb1e5e9d3eb
branches: trunk
changeset: 462589:0cb1e5e9d3eb
user: martti <martti%pkgsrc.org@localhost>
date: Sun Oct 05 17:55:13 2003 +0000
description:
Update mysql-client to 3.23.58
A lot of bug and security fixes since 3.23.51...
diffstat:
databases/mysql-client/Makefile | 4 +-
databases/mysql-client/Makefile.common | 5 +-
databases/mysql-client/buildlink2.mk | 4 +-
databases/mysql-client/distinfo | 10 ++---
databases/mysql-client/patches/patch-af | 10 ++--
databases/mysql-client/patches/patch-al | 65 ---------------------------------
databases/mysql-client/patches/patch-am | 12 ------
7 files changed, 16 insertions(+), 94 deletions(-)
diffs (177 lines):
diff -r cd11bd926feb -r 0cb1e5e9d3eb databases/mysql-client/Makefile
--- a/databases/mysql-client/Makefile Sun Oct 05 17:45:25 2003 +0000
+++ b/databases/mysql-client/Makefile Sun Oct 05 17:55:13 2003 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2003/09/29 02:48:35 jdolecek Exp $
+# $NetBSD: Makefile,v 1.29 2003/10/05 17:55:13 martti Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
-PKGREVISION= 1
SVR4_PKGNAME= mysqc
COMMENT= MySQL, a free SQL database (client)
@@ -10,6 +9,7 @@
CONFIGURE_ARGS+= --without-server
USE_BUILDLINK2= YES
+USE_NEW_TEXINFO= YES
INFO_FILES= mysql.info
post-install:
diff -r cd11bd926feb -r 0cb1e5e9d3eb databases/mysql-client/Makefile.common
--- a/databases/mysql-client/Makefile.common Sun Oct 05 17:45:25 2003 +0000
+++ b/databases/mysql-client/Makefile.common Sun Oct 05 17:55:13 2003 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.18 2003/09/28 09:03:52 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.19 2003/10/05 17:55:13 martti Exp $
-DISTNAME= mysql-3.23.51
+DISTNAME= mysql-3.23.58
CATEGORIES= databases
MASTER_SITES= http://mirrors.sunsite.dk/mysql/Downloads/MySQL-3.23/ \
ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-3.23/ \
@@ -29,6 +29,7 @@
USE_BUILDLINK2= # defined
GNU_CONFIGURE= # defined
+USE_GMAKE= # defined
CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR}
CONFIGURE_ARGS+= --with-named-z-libs=z
CONFIGURE_ARGS+= --without-libwrap
diff -r cd11bd926feb -r 0cb1e5e9d3eb databases/mysql-client/buildlink2.mk
--- a/databases/mysql-client/buildlink2.mk Sun Oct 05 17:45:25 2003 +0000
+++ b/databases/mysql-client/buildlink2.mk Sun Oct 05 17:55:13 2003 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/09/28 09:03:52 jdolecek Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/10/05 17:55:13 martti Exp $
.if !defined(MYSQL_CLIENT_BUILDLINK2_MK)
MYSQL_CLIENT_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= mysql-client
-BUILDLINK_DEPENDS.mysql-client?= mysql-client>=3.23.51nb1
+BUILDLINK_DEPENDS.mysql-client?= mysql-client>=3.23.58
BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql-client
EVAL_PREFIX+= BUILDLINK_PREFIX.mysql-client=mysql-client
diff -r cd11bd926feb -r 0cb1e5e9d3eb databases/mysql-client/distinfo
--- a/databases/mysql-client/distinfo Sun Oct 05 17:45:25 2003 +0000
+++ b/databases/mysql-client/distinfo Sun Oct 05 17:55:13 2003 +0000
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.12 2003/09/29 10:13:23 jdolecek Exp $
+$NetBSD: distinfo,v 1.13 2003/10/05 17:55:13 martti Exp $
-SHA1 (mysql-3.23.51.tar.gz) = 5833feb9ecacd9870586d20a94c4c4650f988770
-Size (mysql-3.23.51.tar.gz) = 11203102 bytes
-SHA1 (patch-af) = 89dc4d3761cb9f2be0afc2658b80595ceacd1643
-SHA1 (patch-al) = 8d8738a168233dcf968b02c7c48c0711342ea200
-SHA1 (patch-am) = 08ee3c8ee3068a267a9f29063c1585ba2405583a
+SHA1 (mysql-3.23.58.tar.gz) = f3383e41e8926c040a295173881414a1e96e0266
+Size (mysql-3.23.58.tar.gz) = 12039843 bytes
+SHA1 (patch-af) = 0ac0172c264b9c9e8f173d29085096bc1c611132
diff -r cd11bd926feb -r 0cb1e5e9d3eb databases/mysql-client/patches/patch-af
--- a/databases/mysql-client/patches/patch-af Sun Oct 05 17:45:25 2003 +0000
+++ b/databases/mysql-client/patches/patch-af Sun Oct 05 17:55:13 2003 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-af,v 1.7 2003/09/28 09:03:53 jdolecek Exp $
+$NetBSD: patch-af,v 1.8 2003/10/05 17:55:13 martti Exp $
---- configure.orig 2002-06-03 12:39:20.000000000 +0200
-+++ configure 2003-09-28 10:31:36.000000000 +0200
-@@ -13397,7 +13397,6 @@
+--- configure.orig Fri Jun 6 14:39:41 2003
++++ configure Wed Jul 9 17:15:10 2003
+@@ -19952,7 +19952,6 @@
else
bench_dirs=""
fi
-bench_dirs="$bench_dirs mysql-test"
+
# Don't build readline, i have it already
-
diff -r cd11bd926feb -r 0cb1e5e9d3eb databases/mysql-client/patches/patch-al
--- a/databases/mysql-client/patches/patch-al Sun Oct 05 17:45:25 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-$NetBSD: patch-al,v 1.1 2002/12/13 14:19:54 tron Exp $
-
---- libmysql/libmysql.c.orig Thu Feb 14 18:30:17 2002
-+++ libmysql/libmysql.c Fri Dec 13 15:11:45 2002
-@@ -886,7 +886,7 @@
- uint field,pkt_len;
- ulong len;
- uchar *cp;
-- char *to;
-+ char *to, *end_to;
- MYSQL_DATA *result;
- MYSQL_ROWS **prev_ptr,*cur;
- NET *net = &mysql->net;
-@@ -924,6 +924,7 @@
- *prev_ptr=cur;
- prev_ptr= &cur->next;
- to= (char*) (cur->data+fields+1);
-+ end_to=to+pkt_len-1;
- for (field=0 ; field < fields ; field++)
- {
- if ((len=(ulong) net_field_length(&cp)) == NULL_LENGTH)
-@@ -933,6 +934,13 @@
- else
- {
- cur->data[field] = to;
-+ if (len > end_to - to)
-+ {
-+ free_rows(result);
-+ net->last_errno=CR_UNKNOWN_ERROR;
-+ strmov(net->last_error,ER(net->last_errno));
-+ DBUG_RETURN(0);
-+ }
- memcpy(to,(char*) cp,len); to[len]=0;
- to+=len+1;
- cp+=len;
-@@ -967,7 +975,7 @@
- {
- uint field;
- ulong pkt_len,len;
-- uchar *pos,*prev_pos;
-+ uchar *pos,*prev_pos, *end_pos;
-
- if ((pkt_len=(uint) net_safe_read(mysql)) == packet_error)
- return -1;
-@@ -975,6 +983,7 @@
- return 1; /* End of data */
- prev_pos= 0; /* allowed to write at packet[-1] */
- pos=mysql->net.read_pos;
-+ end_pos=pos+pkt_len;
- for (field=0 ; field < fields ; field++)
- {
- if ((len=(ulong) net_field_length(&pos)) == NULL_LENGTH)
-@@ -984,6 +993,12 @@
- }
- else
- {
-+ if (len > end_pos - pos)
-+ {
-+ mysql->net.last_errno=CR_UNKNOWN_ERROR;
-+ strmov(mysql->net.last_error,ER(mysql->net.last_errno));
-+ return -1;
-+ }
- row[field] = (char*) pos;
- pos+=len;
- *lengths++=len;
diff -r cd11bd926feb -r 0cb1e5e9d3eb databases/mysql-client/patches/patch-am
--- a/databases/mysql-client/patches/patch-am Sun Oct 05 17:45:25 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-am,v 1.1 2003/09/28 15:09:48 jdolecek Exp $
-
---- mysys/my_gethostbyname.c.orig Sun Sep 28 16:33:05 2003
-+++ mysys/my_gethostbyname.c Sun Sep 28 16:33:20 2003
-@@ -18,7 +18,6 @@
- /* Thread safe version of gethostbyname_r() */
-
- #include "mysys_priv.h"
--#include "my_pthread.h"
- #include <assert.h>
- #if !defined(MSDOS) && !defined(__WIN__)
- #include <netdb.h>
Home |
Main Index |
Thread Index |
Old Index