pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2005Q2]: pkgsrc/databases Pullup ticket 677 - requested by Jua...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c68d33976264
branches:  pkgsrc-2005Q2
changeset: 495980:c68d33976264
user:      salo <salo%pkgsrc.org@localhost>
date:      Fri Aug 12 16:23:16 2005 +0000

description:
Pullup ticket 677 - requested by Juan Romero Pardines
security update for mysql

Revisions pulled up:
- pkgsrc/databases/mysql-client/Makefile.common         1.47
- pkgsrc/databases/mysql-client/buildlink3.mk           1.13
- pkgsrc/databases/mysql-client/distinfo                1.19
- pkgsrc/databases/mysql-client/patches/patch-au        removed
- pkgsrc/databases/mysql-server/distinfo                1.31
- pkgsrc/databases/mysql-server/patches/patch-au        removed

   Module Name:         pkgsrc
   Committed By:        schmonz
   Date:                Thu Jul 14 03:35:41 UTC 2005

   Modified Files:
        pkgsrc/databases/mysql-client: buildlink3.mk

   Log Message:
   Define BUILDLINK_INCDIRS.mysql-client to ensure that the MySQL
   include dir is automatically available in ${CPPFLAGS}, following
   the example of postgres74-lib.
---
   Module Name:         pkgsrc
   Committed By:        xtraeme
   Date:                Fri Aug 12 13:03:05 UTC 2005

   Modified Files:
        pkgsrc/databases/mysql-client: Makefile.common
   distinfo pkgsrc/databases/mysql-server: distinfo
   Removed Files:
        pkgsrc/databases/mysql-client/patches: patch-au
        pkgsrc/databases/mysql-server/patches: patch-au

   Log Message:
   Update mysql-{client,server} to 4.0.25, which should fix
   the following vulnerabilities:

   http://www.appsecinc.com/resources/alerts/mysql/2005-001.html
   http://www.appsecinc.com/resources/alerts/mysql/2005-002.html

   Please see changelog: http://dev.mysql.com/doc/mysql/en/news-4-0-25.html

diffstat:

 databases/mysql-client/Makefile.common  |   4 ++--
 databases/mysql-client/buildlink3.mk    |   3 ++-
 databases/mysql-client/distinfo         |   9 ++++-----
 databases/mysql-client/patches/patch-au |  13 -------------
 databases/mysql-server/distinfo         |   9 ++++-----
 databases/mysql-server/patches/patch-au |  13 -------------
 6 files changed, 12 insertions(+), 39 deletions(-)

diffs (104 lines):

diff -r 1d1f34f9f716 -r c68d33976264 databases/mysql-client/Makefile.common
--- a/databases/mysql-client/Makefile.common    Thu Aug 11 19:16:33 2005 +0000
+++ b/databases/mysql-client/Makefile.common    Fri Aug 12 16:23:16 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.43.2.1 2005/07/16 04:34:33 snj Exp $
+# $NetBSD: Makefile.common,v 1.43.2.2 2005/08/12 16:23:16 salo Exp $
 
-DISTNAME=              mysql-4.0.24
+DISTNAME=              mysql-4.0.25
 CATEGORIES=            databases
 MASTER_SITES=          http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.0/ \
                        ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \
diff -r 1d1f34f9f716 -r c68d33976264 databases/mysql-client/buildlink3.mk
--- a/databases/mysql-client/buildlink3.mk      Thu Aug 11 19:16:33 2005 +0000
+++ b/databases/mysql-client/buildlink3.mk      Fri Aug 12 16:23:16 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2005/03/15 15:43:28 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.12.4.1 2005/08/12 16:23:16 salo Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=   ${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -15,6 +15,7 @@
 BUILDLINK_RECOMMENDED.mysql-client?=   mysql-client>=4.0.24
 BUILDLINK_PKGSRCDIR.mysql-client?=     ../../databases/mysql-client
 BUILDLINK_LIBDIRS.mysql-client?=       lib/mysql
+BUILDLINK_INCDIRS.mysql-client?=       include/mysql
 .endif # MYSQL_CLIENT_BUILDLINK3_MK
 
 .include "../../security/openssl/buildlink3.mk"
diff -r 1d1f34f9f716 -r c68d33976264 databases/mysql-client/distinfo
--- a/databases/mysql-client/distinfo   Thu Aug 11 19:16:33 2005 +0000
+++ b/databases/mysql-client/distinfo   Fri Aug 12 16:23:16 2005 +0000
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.18 2005/03/15 15:43:28 xtraeme Exp $
+$NetBSD: distinfo,v 1.18.4.1 2005/08/12 16:23:16 salo Exp $
 
-SHA1 (mysql-4.0.24.tar.gz) = 523de9f374d4e8c08d5e6520ced05a32dfa2d35d
-RMD160 (mysql-4.0.24.tar.gz) = 595a162be1bc4e09eab7bc751c9c02214ba41ed7
-Size (mysql-4.0.24.tar.gz) = 16885399 bytes
+SHA1 (mysql-4.0.25.tar.gz) = 65315c7659c75fcc9f3d9f749dbed26581f6da9c
+RMD160 (mysql-4.0.25.tar.gz) = 9c32ff5b7332712929eb2eb8eb58ae1f4be7ad46
+Size (mysql-4.0.25.tar.gz) = 11159288 bytes
 SHA1 (patch-af) = 2f3bab4108c002420e243a4ca6c9c0c3d4bdd21b
-SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
 SHA1 (patch-av) = 684c1e2ff1f96652225045653c25707850fe0ff2
 SHA1 (patch-aw) = 23d54ceddd0631aa93b32666853965a5fc7bdfab
 SHA1 (patch-ax) = 0ee6c30cc814d9404625191ac3b248ba9d9e094a
diff -r 1d1f34f9f716 -r c68d33976264 databases/mysql-client/patches/patch-au
--- a/databases/mysql-client/patches/patch-au   Thu Aug 11 19:16:33 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.1 2004/11/09 06:11:48 xtraeme Exp $
-
---- include/my_global.h.orig   2003-10-17 07:29:15.000000000 +0200
-+++ include/my_global.h        2003-12-11 15:13:14.000000000 +0100
-@@ -250,7 +250,7 @@
- # endif
- #endif /* TIME_WITH_SYS_TIME */
- #ifdef HAVE_UNISTD_H
--#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
-+#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) && !defined(__NetBSD__)
- #define crypt unistd_crypt
- #endif
- #include <unistd.h>
diff -r 1d1f34f9f716 -r c68d33976264 databases/mysql-server/distinfo
--- a/databases/mysql-server/distinfo   Thu Aug 11 19:16:33 2005 +0000
+++ b/databases/mysql-server/distinfo   Fri Aug 12 16:23:16 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2005/03/15 15:43:28 xtraeme Exp $
+$NetBSD: distinfo,v 1.30.4.1 2005/08/12 16:23:16 salo Exp $
 
-SHA1 (mysql-4.0.24.tar.gz) = 523de9f374d4e8c08d5e6520ced05a32dfa2d35d
-RMD160 (mysql-4.0.24.tar.gz) = 595a162be1bc4e09eab7bc751c9c02214ba41ed7
-Size (mysql-4.0.24.tar.gz) = 16885399 bytes
+SHA1 (mysql-4.0.25.tar.gz) = 65315c7659c75fcc9f3d9f749dbed26581f6da9c
+RMD160 (mysql-4.0.25.tar.gz) = 9c32ff5b7332712929eb2eb8eb58ae1f4be7ad46
+Size (mysql-4.0.25.tar.gz) = 11159288 bytes
 SHA1 (patch-aa) = d753d777adfa3d1357a285c0c18dfd0f6fc988b6
 SHA1 (patch-af) = 038b5d570265e1f821de6502d05f94225eba5672
 SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
@@ -11,6 +11,5 @@
 SHA1 (patch-ar) = d7c44e5bbed3c58e7516de5e155a82417818a39a
 SHA1 (patch-as) = d5ee30fad87682d3ed4315e41788c5ae6f68ba6e
 SHA1 (patch-at) = 62d5ccb0fdb5488b98979f2bb53d6029d0bd3d27
-SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
 SHA1 (patch-aw) = c82aa82430b42eaed2b6f4d588306e663e386ce1
 SHA1 (patch-ax) = 29b3087d240dbbb8a780816a115759994c6f4639
diff -r 1d1f34f9f716 -r c68d33976264 databases/mysql-server/patches/patch-au
--- a/databases/mysql-server/patches/patch-au   Thu Aug 11 19:16:33 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.4 2004/10/28 01:08:15 xtraeme Exp $
-
---- include/my_global.h.orig   2003-10-17 07:29:15.000000000 +0200
-+++ include/my_global.h        2003-12-11 15:13:14.000000000 +0100
-@@ -250,7 +250,7 @@
- # endif
- #endif /* TIME_WITH_SYS_TIME */
- #ifdef HAVE_UNISTD_H
--#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
-+#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) && !defined(__NetBSD__)
- #define crypt unistd_crypt
- #endif
- #include <unistd.h>



Home | Main Index | Thread Index | Old Index