[pkgsrc/pkgsrc-2006Q3]: pkgsrc/databases Pullup ticket 1820 - requested by xt...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2006Q3]: pkgsrc/databases Pullup ticket 1820 - requested by xt...
From: salo <salo%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 04:01:14 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/539923241dba
branches:  pkgsrc-2006Q3
changeset: 519131:539923241dba
user:      salo <salo%pkgsrc.org@localhost>
date:      Sun Oct 15 10:18:20 2006 +0000

description:
Pullup ticket 1820 - requested by xtraeme
security update for mysql5

Revisions pulled up:
- pkgsrc/databases/mysql5-client/Makefile.common        1.17
- pkgsrc/databases/mysql5-client/buildlink3.mk          1.8
- pkgsrc/databases/mysql5-client/distinfo               1.10, 1.11, 1.12, 1.13
- pkgsrc/databases/mysql5-client/patches/patch-aa       1.2
- pkgsrc/databases/mysql5-client/patches/patch-ac       1.3
- pkgsrc/databases/mysql5-client/patches/patch-ad       1.3, 1.4
- pkgsrc/databases/mysql5-client/patches/patch-af       1.5
- pkgsrc/databases/mysql5-client/patches/patch-ah       removed
- pkgsrc/databases/mysql5-client/patches/patch-bf       1.1
- pkgsrc/databases/mysql5-server/PLIST                  1.8
- pkgsrc/databases/mysql5-server/distinfo               1.12
- pkgsrc/databases/mysql5-server/patches/patch-aa       1.3
- pkgsrc/databases/mysql5-server/patches/patch-ab       1.3
- pkgsrc/databases/mysql5-server/patches/patch-af       1.3
- pkgsrc/databases/mysql5-server/patches/patch-ac       1.4
- pkgsrc/databases/mysql5-server/patches/patch-ag       1.5
- pkgsrc/databases/mysql5-server/patches/patch-aj       1.2
- pkgsrc/databases/mysql5-server/patches/patch-an       1.1
- pkgsrc/databases/mysql5-server/patches/patch-bf       1.1

   Module Name:         pkgsrc
   Committed By:        rillig
   Date:                Sun Oct  8 13:30:59 UTC 2006

   Modified Files:
        pkgsrc/databases/mysql5-client: distinfo
   Added Files:
        pkgsrc/databases/mysql5-client/patches: patch-bf

   Log Message:
   Fixed "test ==".
---
   Module Name:         pkgsrc
   Committed By:        xtraeme
   Date:                Sat Oct 14 18:41:34 UTC 2006

   Modified Files:
        pkgsrc/databases/mysql5-client: Makefile.common buildlink3.mk distinfo
        pkgsrc/databases/mysql5-client/patches: patch-aa patch-ac patch-ad
            patch-af
        pkgsrc/databases/mysql5-server: PLIST distinfo
        pkgsrc/databases/mysql5-server/patches: patch-aa patch-ab patch-ac
            patch-af patch-ag patch-aj
   Added Files:
        pkgsrc/databases/mysql5-server/patches: patch-an patch-bf
   Removed Files:
        pkgsrc/databases/mysql5-client/patches: patch-ah

   Log Message:
   Update to the long awaited 5.0.26 release, codenamed "houston we have
   a problem with vulnerabilities".

   Please see the following URLs for changes:

   http://dev.mysql.com/doc/refman/5.0/en/news-5-0-26.html
   http://dev.mysql.com/doc/refman/5.0/en/news-5-0-25.html

   Two patches were sent upstream, I hope to get them in the next version.
---
   Module Name:         pkgsrc
   Committed By:        xtraeme
   Date:                Sat Oct 14 18:46:51 UTC 2006

   Modified Files:
        pkgsrc/databases/mysql5-client: distinfo

   Log Message:
   regen with right checksums.
---
   Module Name:         pkgsrc
   Committed By:        salo
   Date:                Sun Oct 15 08:58:15 UTC 2006

   Modified Files:
        pkgsrc/databases/mysql5-client/patches: patch-ad

   Log Message:
   missing rcsid. (hi xtraeme!)
---
   Module Name:         pkgsrc
   Committed By:        salo
   Date:                Sun Oct 15 08:59:37 UTC 2006

   Modified Files:
        pkgsrc/databases/mysql5-client: distinfo

   Log Message:
   regen.

diffstat:

 databases/mysql5-client/Makefile.common  |  17 ++----
 databases/mysql5-client/buildlink3.mk    |   4 +-
 databases/mysql5-client/distinfo         |  18 +++---
 databases/mysql5-client/patches/patch-aa |  26 +++++----
 databases/mysql5-client/patches/patch-ac |  75 +++++++--------------------
 databases/mysql5-client/patches/patch-ad |  12 ++--
 databases/mysql5-client/patches/patch-af |  12 ++-
 databases/mysql5-client/patches/patch-ah |  30 -----------
 databases/mysql5-client/patches/patch-bf |  13 ++++
 databases/mysql5-server/PLIST            |  36 ++++++++++++-
 databases/mysql5-server/distinfo         |  22 ++++---
 databases/mysql5-server/patches/patch-aa |  10 +-
 databases/mysql5-server/patches/patch-ab |  26 ++++----
 databases/mysql5-server/patches/patch-ac |  12 ++--
 databases/mysql5-server/patches/patch-af |  86 ++++---------------------------
 databases/mysql5-server/patches/patch-ag |  14 ++--
 databases/mysql5-server/patches/patch-aj |  30 +++++-----
 databases/mysql5-server/patches/patch-an |  33 ++++++++++++
 databases/mysql5-server/patches/patch-bf |  13 ++++
 19 files changed, 224 insertions(+), 265 deletions(-)

diffs (truncated from 890 to 300 lines):

diff -r 2587bfdf0c80 -r 539923241dba databases/mysql5-client/Makefile.common
--- a/databases/mysql5-client/Makefile.common   Sat Oct 14 13:13:13 2006 +0000
+++ b/databases/mysql5-client/Makefile.common   Sun Oct 15 10:18:20 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.16 2006/09/02 12:32:12 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.16.2.1 2006/10/15 10:18:20 salo Exp $
 
-DISTNAME=              mysql-5.0.24a
+DISTNAME=              mysql-5.0.26
 CATEGORIES=            databases
 MASTER_SITES=          ${MASTER_SITE_MYSQL:=MySQL-5.0/}
 
@@ -95,7 +95,7 @@
 .endif
 
 USE_LANGUAGES+=                c c++
-USE_TOOLS+=            gmake perl:run
+USE_TOOLS+=            autoconf gmake perl:run
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 
 SUBST_CLASSES+=                mk scripts
@@ -112,14 +112,6 @@
 SUBST_SED.scripts+=    -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
 SUBST_MESSAGE.scripts= Fixing scripts.
 
-# Detect correctly sem_init(3) on NetBSD.
-.if !empty(OPSYS:MNetBSD)
-SUBST_CLASSES+=                sem
-SUBST_STAGE.sem=       post-patch
-SUBST_FILES.sem=       configure
-SUBST_SED.sem=         -e "s|-lposix4|-lrt|g"
-.endif
-
 # Fix broken shared library detection under Mac OS X
 .if ${OPSYS} == Darwin
 SUBST_CLASSES+=                dylib
@@ -128,5 +120,8 @@
 SUBST_SED.dylib=       -e "s|\\\$$shrext_cmds|\\.dylib|g"
 .endif
 
+pre-configure:
+       cd ${WRKSRC} && autoconf
+
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff -r 2587bfdf0c80 -r 539923241dba databases/mysql5-client/buildlink3.mk
--- a/databases/mysql5-client/buildlink3.mk     Sat Oct 14 13:13:13 2006 +0000
+++ b/databases/mysql5-client/buildlink3.mk     Sun Oct 15 10:18:20 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/09/02 12:36:04 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.7.2.1 2006/10/15 10:18:20 salo Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=   ${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@
 
 .if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.mysql-client+=   mysql-client>=5.0.15
-BUILDLINK_ABI_DEPENDS.mysql-client?=   mysql-client>=5.0.24a
+BUILDLINK_ABI_DEPENDS.mysql-client?=   mysql-client>=5.0.26
 BUILDLINK_PKGSRCDIR.mysql-client?=     ../../databases/mysql5-client
 BUILDLINK_LIBDIRS.mysql-client?=       lib/mysql
 BUILDLINK_INCDIRS.mysql-client?=       include/mysql
diff -r 2587bfdf0c80 -r 539923241dba databases/mysql5-client/distinfo
--- a/databases/mysql5-client/distinfo  Sat Oct 14 13:13:13 2006 +0000
+++ b/databases/mysql5-client/distinfo  Sun Oct 15 10:18:20 2006 +0000
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.9 2006/09/02 12:32:12 xtraeme Exp $
+$NetBSD: distinfo,v 1.9.2.1 2006/10/15 10:18:20 salo Exp $
 
-SHA1 (mysql-5.0.24a.tar.gz) = 4bd685e6dda903b321afb8c36e0eac4a2d915f78
-RMD160 (mysql-5.0.24a.tar.gz) = 892376fc617dadfd34cbfe8c15f53ad2784131c5
-Size (mysql-5.0.24a.tar.gz) = 19993102 bytes
-SHA1 (patch-aa) = adc6956d4be304db61aa0323061143fffc1b9751
+SHA1 (mysql-5.0.26.tar.gz) = 7197159f9214722aa41b82ad80f87b4af5d232ce
+RMD160 (mysql-5.0.26.tar.gz) = 98ee85457de4bc8c8f8acddc8b6f0dc7687f32c7
+Size (mysql-5.0.26.tar.gz) = 25986952 bytes
+SHA1 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
 SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
-SHA1 (patch-ac) = 86f7e2755d313bf2debc8dfa53cbe3fa0e8bd893
-SHA1 (patch-ad) = 81c48274e3a43e46cf9d53f9ed4620c02761902a
+SHA1 (patch-ac) = a186d330698f1d6e178aacc8b91f942b41cdb878
+SHA1 (patch-ad) = 47e79812178e022e85ea522d3c15618b6c245318
 SHA1 (patch-ae) = f94e786b15089174b33045cdcdc76ba195609f34
-SHA1 (patch-af) = ecd74709e969fb1c6a03e836ee3e7ff8238b3dd5
+SHA1 (patch-af) = fee9e6d92a6657145a197edbaa11be8f331a921e
 SHA1 (patch-ag) = 52fb37b6f0db7eefd9ca9102451d13a365dd0816
-SHA1 (patch-ah) = bd34391e522ae12ee63ec6a734f7a31116b2918d
 SHA1 (patch-ai) = 242c97ab4658838a6001d9c288e01209abfcee77
 SHA1 (patch-aj) = 31c933a03e2b05aeaff1d89d3fa542aad663e96a
 SHA1 (patch-ak) = a09c2bf961d0e40e328d246e821efc36461dbdf8
 SHA1 (patch-al) = 56bb803eecfde5052fecae365d5fcad369ce954c
+SHA1 (patch-bf) = c63133d40c2008ba57a968af693173a1fd97a927
diff -r 2587bfdf0c80 -r 539923241dba databases/mysql5-client/patches/patch-aa
--- a/databases/mysql5-client/patches/patch-aa  Sat Oct 14 13:13:13 2006 +0000
+++ b/databases/mysql5-client/patches/patch-aa  Sun Oct 15 10:18:20 2006 +0000
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+$NetBSD: patch-aa,v 1.1.1.1.8.1 2006/10/15 10:18:20 salo Exp $
+
+Patch reported: http://bugs.mysql.com/bug.php?id=23293&thanks=4
 
---- mysys/my_gethwaddr.c.orig  2005-10-14 10:21:10.000000000 +0000
-+++ mysys/my_gethwaddr.c
-@@ -31,7 +31,7 @@ static my_bool memcpy_and_test(uchar *to
-   return res;
- }
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- 
- #include <net/ethernet.h>
- #include <sys/sysctl.h>
+--- config/ac-macros/readline.m4.orig  2006-10-14 19:03:29.000000000 +0200
++++ config/ac-macros/readline.m4       2006-10-14 19:03:37.000000000 +0200
+@@ -26,7 +26,7 @@
+               #include "readline/readline.h"
+           ],
+           [ 
+-              char res= *(*rl_completion_entry_function)(0,0);
++              char res= (*rl_completion_entry_function)(0,0);
+               completion_matches(0,0);
+           ],
+           [
diff -r 2587bfdf0c80 -r 539923241dba databases/mysql5-client/patches/patch-ac
--- a/databases/mysql5-client/patches/patch-ac  Sat Oct 14 13:13:13 2006 +0000
+++ b/databases/mysql5-client/patches/patch-ac  Sun Oct 15 10:18:20 2006 +0000
@@ -1,8 +1,10 @@
-$NetBSD: patch-ac,v 1.2 2006/08/06 16:30:40 tron Exp $
+$NetBSD: patch-ac,v 1.2.2.1 2006/10/15 10:18:20 salo Exp $
+
+Patch reported: http://bugs.mysql.com/bug.php?id=23294&thanks=4
 
---- configure.orig     2006-07-27 19:53:44.000000000 +0100
-+++ configure  2006-08-06 15:34:25.000000000 +0100
-@@ -21500,7 +21500,7 @@
+--- configure.in.orig  2006-10-14 18:56:35.000000000 +0200
++++ configure.in       2006-10-14 18:58:41.000000000 +0200
+@@ -475,7 +475,7 @@
    FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
  else
    case $SYSTEM_TYPE in
@@ -11,60 +13,21 @@
        FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
        ;;
      *darwin*)
-@@ -24458,13 +24458,13 @@
-   :
- else
+@@ -752,6 +752,8 @@
  
--echo "$as_me:$LINENO: checking for sem_init in -lposix4" >&5
--echo $ECHO_N "checking for sem_init in -lposix4... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for sem_init in -lrt" >&5
-+echo $ECHO_N "checking for sem_init in -lrt... $ECHO_C" >&6
- if test "${ac_cv_lib_posix4_sem_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lposix4  $LIBS"
-+LIBS="-lrt  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24527,7 +24527,7 @@
- #define HAVE_LIBPOSIX4 1
- _ACEOF
+ # For sem_xxx functions on Solaris 2.6
+ AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
++# For sem_xxx functions on NetBSD
++AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(rt, sem_init))
+ MYSQL_CHECK_ZLIB_WITH_COMPRESS
  
--  LIBS="-lposix4 $LIBS"
-+  LIBS="-lrt $LIBS"
- 
- fi
- 
-@@ -25792,6 +25792,10 @@
+ # For large pages support
+@@ -1077,7 +1079,7 @@
        MAX_C_OPTIMIZE="-O"
      fi
      ;;
-+  *dragonfly*)
-+      CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
-+   ;;
-+
-   *freebsd*)
-     { echo "$as_me:$LINENO: WARNING: Adding fix for interrupted reads" >&5
- echo "$as_me: WARNING: Adding fix for interrupted reads" >&2;}
-@@ -39038,8 +39042,8 @@
-         OPENSSL_INCLUDE=-I$incs
-       fi
-       # Test for libssl using all known library file endings
--      if test -f $d/libssl.a || test -f $d/libssl.so || \
--         test -f $d/libssl.sl || test -f $d/libssl.dylib ; then
-+      if test -f $libs/libssl.a || test -f $libs/libssl.so || \
-+         test -f $libs/libssl.sl || test -f $libs/libssl.dylib ; then
-         OPENSSL_LIB=$libs
-       fi
-       ;;
-@@ -39377,7 +39381,7 @@
- main ()
- {
- 
--              char res= *(*rl_completion_entry_function)(0,0);
-+              char res= (*rl_completion_entry_function)(0,0);
-               completion_matches(0,0);
- 
-   ;
+-  *freebsd*)
++  *freebsd*|*dragonfly*)
+     AC_MSG_WARN([Adding fix for interrupted reads])
+     OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
+     if test "$OSVERSION" -gt "480100" && \
diff -r 2587bfdf0c80 -r 539923241dba databases/mysql5-client/patches/patch-ad
--- a/databases/mysql5-client/patches/patch-ad  Sat Oct 14 13:13:13 2006 +0000
+++ b/databases/mysql5-client/patches/patch-ad  Sun Oct 15 10:18:20 2006 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.2 2006/01/09 16:25:01 xtraeme Exp $
+$NetBSD: patch-ad,v 1.2.6.1 2006/10/15 10:18:20 salo Exp $
 
---- Makefile.in.orig   2006-01-09 15:51:25.000000000 +0100
-+++ Makefile.in        2006-01-09 15:51:43.000000000 +0100
-@@ -365,12 +365,7 @@
+--- Makefile.in.orig   2006-10-14 18:55:43.000000000 +0200
++++ Makefile.in        2006-10-14 18:55:59.000000000 +0200
+@@ -370,12 +370,7 @@
  EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
-                       README COPYING EXCEPTIONS-CLIENT
+                       README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
  
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
 -                      @readline_topdir@ sql-common \
@@ -12,7 +12,7 @@
 -                      @sql_union_dirs@ scripts @man_dirs@ tests \
 -                      netware @libmysqld_dirs@ \
 -                      @bench_dirs@ support-files @tools_dirs@
-+SUBDIRS = . include strings @sql_client_dirs@ scripts man 
++SUBDIRS = . include strings @sql_client_dirs@ scripts man
  
  DIST_SUBDIRS = . include @docs_dirs@ zlib \
                        @readline_topdir@ sql-common \
diff -r 2587bfdf0c80 -r 539923241dba databases/mysql5-client/patches/patch-af
--- a/databases/mysql5-client/patches/patch-af  Sat Oct 14 13:13:13 2006 +0000
+++ b/databases/mysql5-client/patches/patch-af  Sun Oct 15 10:18:20 2006 +0000
@@ -1,14 +1,16 @@
-$NetBSD: patch-af,v 1.4 2006/05/18 16:11:15 cube Exp $
+$NetBSD: patch-af,v 1.4.4.1 2006/10/15 10:18:20 salo Exp $
 
---- man/Makefile.in.orig       2006-04-26 20:31:55.000000000 +0200
-+++ man/Makefile.in
-@@ -342,7 +342,8 @@ yassl_includes = @yassl_includes@
+--- man/Makefile.in.orig       2006-10-04 13:25:43.000000000 +0200
++++ man/Makefile.in    2006-10-14 19:20:57.000000000 +0200
+@@ -344,8 +344,9 @@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
 -man1_MANS = @man1_files@
+-man8_MANS = @man8_files@
 +man1_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \
 +      mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1
- EXTRA_DIST = $(man1_MANS)
++man8_MANS =
+ EXTRA_DIST = $(man1_MANS) $(man8_MANS)
  all: all-am
  
diff -r 2587bfdf0c80 -r 539923241dba databases/mysql5-client/patches/patch-ah
--- a/databases/mysql5-client/patches/patch-ah  Sat Oct 14 13:13:13 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
-
---- client/mysql.cc.orig       2005-02-18 01:36:23.000000000 +0100
-+++ client/mysql.cc    2005-02-18 01:38:00.000000000 +0100
-@@ -39,6 +39,9 @@
- #include "my_readline.h"
- #include <signal.h>
- #include <violite.h>
-+#ifdef NEEDS_BSTRING_H              // defines bzero()
-+#include <bstring.h>
-+#endif
- 
- #if defined(USE_LIBEDIT_INTERFACE) && defined(HAVE_LOCALE_H)
- #include <locale.h>
-@@ -408,8 +411,13 @@
-   if (opt_sigint_ignore)
-     signal(SIGINT, SIG_IGN);
-   else
--    signal(SIGINT, mysql_end);                        // Catch SIGINT to clean up
--  signal(SIGQUIT, mysql_end);                 // Catch SIGQUIT to clean up
-+#ifdef IRIX5
-+#define _MYSQL_END_TYPE (void (*)(...))
-+#else
-+#define _MYSQL_END_TYPE
-+#endif
-+      signal(SIGINT, _MYSQL_END_TYPE mysql_end); // Catch SIGINT to clean up
-+    signal(SIGQUIT, _MYSQL_END_TYPE mysql_end);  // Catch SIGQUIT to clean up
Prev by Date: [pkgsrc/pkgsrc-2006Q3]: pkgsrc/math/R Pullup ticket 1853 - requested by dmcma...
Next by Date: [pkgsrc/pkgsrc-2006Q3]: pkgsrc/lang/sun-jre14 Pullup ticket 1852 - requested ...
Previous by Thread: [pkgsrc/pkgsrc-2006Q3]: pkgsrc/math/R Pullup ticket 1853 - requested by dmcma...
Next by Thread: [pkgsrc/pkgsrc-2006Q3]: pkgsrc/lang/sun-jre14 Pullup ticket 1852 - requested ...
Indexes:
Home | Main Index | Thread Index | Old Index