diff options
author | xtraeme <xtraeme> | 2006-10-14 18:41:34 +0000 |
---|---|---|
committer | xtraeme <xtraeme> | 2006-10-14 18:41:34 +0000 |
commit | fbffac141649d2846fdc7c5104250cfd3c432282 (patch) | |
tree | cf705324778eaa2b82532e5988059ee56849d3be /databases/mysql5-server | |
parent | 763f737bec602e63d04f2d4817a9d20e4eec39fa (diff) | |
download | pkgsrc-fbffac141649d2846fdc7c5104250cfd3c432282.tar.gz |
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.
Diffstat (limited to 'databases/mysql5-server')
-rw-r--r-- | databases/mysql5-server/PLIST | 36 | ||||
-rw-r--r-- | databases/mysql5-server/distinfo | 22 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-aa | 10 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-ab | 26 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-ac | 12 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-af | 86 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-ag | 14 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-aj | 30 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-an | 33 | ||||
-rw-r--r-- | databases/mysql5-server/patches/patch-bf | 13 |
10 files changed, 148 insertions, 134 deletions
diff --git a/databases/mysql5-server/PLIST b/databases/mysql5-server/PLIST index 64ddcca54c5..534189b07db 100644 --- a/databases/mysql5-server/PLIST +++ b/databases/mysql5-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2006/08/06 16:30:40 tron Exp $ +@comment $NetBSD: PLIST,v 1.8 2006/10/14 18:41:34 xtraeme Exp $ bin/comp_err bin/innochecksum bin/my_print_defaults @@ -27,6 +27,8 @@ lib/mysql/libvio.a libexec/mysqld man/man1/mysqld.1 man/man1/mysqld_multi.1 +man/man8/mysqld.8 +man/man8/mysqlmanager.8 share/examples/rc.d/mysqld share/mysql-test/README share/mysql-test/cacert.pem @@ -48,6 +50,7 @@ share/mysql-test/include/have_archive.inc share/mysql-test/include/have_bdb.inc share/mysql-test/include/have_big5.inc share/mysql-test/include/have_blackhole.inc +share/mysql-test/include/have_case_sensitive_file_system.inc share/mysql-test/include/have_compress.inc share/mysql-test/include/have_cp1250_ch.inc share/mysql-test/include/have_cp932.inc @@ -74,8 +77,9 @@ share/mysql-test/include/have_tis620.inc share/mysql-test/include/have_ucs2.inc share/mysql-test/include/have_udf.inc share/mysql-test/include/have_ujis.inc -share/mysql-test/include/im_check_os.inc +share/mysql-test/include/im_check_env.inc share/mysql-test/include/is_debug_build.inc +share/mysql-test/include/loaddata_autocom.inc share/mysql-test/include/master-slave.inc share/mysql-test/include/mysqltest-x.inc share/mysql-test/include/mysqltest_while.inc @@ -96,6 +100,7 @@ share/mysql-test/include/show_msg80.inc share/mysql-test/include/sourced.inc share/mysql-test/include/sourced1.inc share/mysql-test/include/sp-vars.inc +share/mysql-test/include/strict_autoinc.inc share/mysql-test/include/system_db_struct.inc share/mysql-test/include/test_outfile.inc share/mysql-test/include/testdb_only.inc @@ -115,6 +120,7 @@ share/mysql-test/lib/mtr_process.pl share/mysql-test/lib/mtr_report.pl share/mysql-test/lib/mtr_stress.pl share/mysql-test/lib/mtr_timer.pl +share/mysql-test/mtr share/mysql-test/mysql-test-run share/mysql-test/mysql-test-run.pl share/mysql-test/r/alias.result @@ -142,6 +148,7 @@ share/mysql-test/r/blackhole.result share/mysql-test/r/bool.result share/mysql-test/r/bulk_replace.result share/mysql-test/r/case.result +share/mysql-test/r/case_sensitive_file_system.require share/mysql-test/r/cast.result share/mysql-test/r/check.result share/mysql-test/r/check_var_limit.require @@ -279,6 +286,7 @@ share/mysql-test/r/have_ndb.require share/mysql-test/r/have_ndb_status_ok.require share/mysql-test/r/have_openssl.require share/mysql-test/r/have_outfile.require +share/mysql-test/r/have_perror.require share/mysql-test/r/have_query_cache.require share/mysql-test/r/have_raid.require share/mysql-test/r/have_sjis.require @@ -340,11 +348,14 @@ share/mysql-test/r/keywords.result share/mysql-test/r/kill.result share/mysql-test/r/limit.result share/mysql-test/r/loaddata.result +share/mysql-test/r/loaddata_autocom_innodb.result +share/mysql-test/r/loaddata_autocom_ndb.result share/mysql-test/r/lock.result share/mysql-test/r/lock_multi.result share/mysql-test/r/lock_tables_lost_commit.result share/mysql-test/r/lowercase0.require share/mysql-test/r/lowercase2.require +share/mysql-test/r/lowercase_fs_off.result share/mysql-test/r/lowercase_table.result share/mysql-test/r/lowercase_table2.result share/mysql-test/r/lowercase_table3.result @@ -403,6 +414,7 @@ share/mysql-test/r/ndb_replace.result share/mysql-test/r/ndb_restore.result share/mysql-test/r/ndb_subquery.result share/mysql-test/r/ndb_transaction.result +share/mysql-test/r/ndb_trigger.result share/mysql-test/r/ndb_truncate.result share/mysql-test/r/ndb_types.result share/mysql-test/r/ndb_update.result @@ -422,6 +434,7 @@ share/mysql-test/r/order_fill_sortbuf.result share/mysql-test/r/outfile.result share/mysql-test/r/overflow.result share/mysql-test/r/packet.result +share/mysql-test/r/perror.result share/mysql-test/r/preload.result share/mysql-test/r/ps.result share/mysql-test/r/ps_10nestset.result @@ -513,6 +526,7 @@ share/mysql-test/r/rpl_multi_update2.result share/mysql-test/r/rpl_multi_update3.result share/mysql-test/r/rpl_multi_update4.result share/mysql-test/r/rpl_mystery22.result +share/mysql-test/r/rpl_ndb_innodb_trans.result share/mysql-test/r/rpl_openssl.result share/mysql-test/r/rpl_optimize.result share/mysql-test/r/rpl_ps.result @@ -569,6 +583,11 @@ share/mysql-test/r/ssl.result share/mysql-test/r/ssl_compress.result share/mysql-test/r/status.result share/mysql-test/r/strict.result +share/mysql-test/r/strict_autoinc_1myisam.result +share/mysql-test/r/strict_autoinc_2innodb.result +share/mysql-test/r/strict_autoinc_3heap.result +share/mysql-test/r/strict_autoinc_4bdb.result +share/mysql-test/r/strict_autoinc_5ndb.result share/mysql-test/r/subselect.result share/mysql-test/r/subselect2.result share/mysql-test/r/subselect_gis.result @@ -630,6 +649,7 @@ share/mysql-test/r/windows.result share/mysql-test/r/xa.result share/mysql-test/server-cert.pem share/mysql-test/server-key.pem +share/mysql-test/std_data/14897.frm share/mysql-test/std_data/Moscow_leap share/mysql-test/std_data/bug15328.cnf share/mysql-test/std_data/bug16266.000001 @@ -865,10 +885,13 @@ share/mysql-test/t/kill.test share/mysql-test/t/kill_n_check.sh share/mysql-test/t/limit.test share/mysql-test/t/loaddata.test +share/mysql-test/t/loaddata_autocom_innodb.test +share/mysql-test/t/loaddata_autocom_ndb.test share/mysql-test/t/lock.test share/mysql-test/t/lock_multi.test share/mysql-test/t/lock_tables_lost_commit-master.opt share/mysql-test/t/lock_tables_lost_commit.test +share/mysql-test/t/lowercase_fs_off.test share/mysql-test/t/lowercase_table-master.opt share/mysql-test/t/lowercase_table.test share/mysql-test/t/lowercase_table2.test @@ -939,6 +962,7 @@ share/mysql-test/t/ndb_replace.test share/mysql-test/t/ndb_restore.test share/mysql-test/t/ndb_subquery.test share/mysql-test/t/ndb_transaction.test +share/mysql-test/t/ndb_trigger.test share/mysql-test/t/ndb_truncate.test share/mysql-test/t/ndb_types.test share/mysql-test/t/ndb_update.test @@ -956,6 +980,7 @@ share/mysql-test/t/order_fill_sortbuf.test share/mysql-test/t/outfile.test share/mysql-test/t/overflow.test share/mysql-test/t/packet.test +share/mysql-test/t/perror.test share/mysql-test/t/preload.test share/mysql-test/t/ps.test share/mysql-test/t/ps_10nestset.test @@ -1086,6 +1111,8 @@ share/mysql-test/t/rpl_multi_update3.test share/mysql-test/t/rpl_multi_update4-slave.opt share/mysql-test/t/rpl_multi_update4.test share/mysql-test/t/rpl_mystery22.test +share/mysql-test/t/rpl_ndb_innodb_trans-slave.opt +share/mysql-test/t/rpl_ndb_innodb_trans.test share/mysql-test/t/rpl_openssl.test share/mysql-test/t/rpl_optimize.test share/mysql-test/t/rpl_ps.test @@ -1158,6 +1185,11 @@ share/mysql-test/t/ssl.test share/mysql-test/t/ssl_compress.test share/mysql-test/t/status.test share/mysql-test/t/strict.test +share/mysql-test/t/strict_autoinc_1myisam.test +share/mysql-test/t/strict_autoinc_2innodb.test +share/mysql-test/t/strict_autoinc_3heap.test +share/mysql-test/t/strict_autoinc_4bdb.test +share/mysql-test/t/strict_autoinc_5ndb.test share/mysql-test/t/subselect.test share/mysql-test/t/subselect2.test share/mysql-test/t/subselect_gis.test diff --git a/databases/mysql5-server/distinfo b/databases/mysql5-server/distinfo index c2f610287ea..ada8b4aa0d9 100644 --- a/databases/mysql5-server/distinfo +++ b/databases/mysql5-server/distinfo @@ -1,19 +1,21 @@ -$NetBSD: distinfo,v 1.11 2006/09/02 12:32:12 xtraeme Exp $ +$NetBSD: distinfo,v 1.12 2006/10/14 18:41:34 xtraeme 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) = fcd1222f9939070a45bbb8ddf72bb1bdadea1f8b -SHA1 (patch-ab) = 3edc7889d3fec049104bd0aba7b9db1cdc4a83d6 -SHA1 (patch-ac) = e7b0216336a156bdd28a63b0316b9b4615d8efa7 +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) = 82be9c02ebb483ac0fd2eac1e6e086d17b156794 +SHA1 (patch-ab) = 147f8afd19634e62d6a794b0b96f29ebfd920895 +SHA1 (patch-ac) = e75a01f7efe477060cb6e1639c9a7b68a832761d SHA1 (patch-ad) = 36fb22fa10f2d379decf8e6fc86fc966472930e2 SHA1 (patch-ae) = adc6956d4be304db61aa0323061143fffc1b9751 -SHA1 (patch-af) = cc38ae24173192d40b4be5820355da30d49292b3 -SHA1 (patch-ag) = 6ec3c6dd509f3a331728808972b9b0c1c57e3d32 +SHA1 (patch-af) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec +SHA1 (patch-ag) = ec9e2465b14d16b0479427548a9a0150cbea78ac SHA1 (patch-ah) = 81a8cdd4f3ebea640ee5fa75ab8884c452ed3cd7 SHA1 (patch-ai) = 725a3a6e06d39b26efb706bebbe3ff95da82be96 -SHA1 (patch-aj) = 07e4016a0629b7737ad4956962c15e97ddcc6f5d +SHA1 (patch-aj) = c4e27a4332df3079891935fe963a86c2cbdced20 SHA1 (patch-ak) = 516460b0aa9f641d74f83c5514f258a980033e41 SHA1 (patch-al) = 6deee284643a474d5bc0674d149b49e36913fe12 SHA1 (patch-am) = 999bb2dbca518a7e19a96b53678de35c0b227434 +SHA1 (patch-an) = a186d330698f1d6e178aacc8b91f942b41cdb878 SHA1 (patch-ao) = c6c56cbff6fbb7ff809b9b544c28ea28fcd18517 +SHA1 (patch-bf) = c63133d40c2008ba57a968af693173a1fd97a927 diff --git a/databases/mysql5-server/patches/patch-aa b/databases/mysql5-server/patches/patch-aa index e667053bb52..0d3c787ef1b 100644 --- a/databases/mysql5-server/patches/patch-aa +++ b/databases/mysql5-server/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.2 2006/01/09 16:25:01 xtraeme Exp $ +$NetBSD: patch-aa,v 1.3 2006/10/14 18:41:34 xtraeme Exp $ ---- Makefile.in.orig 2006-01-09 16:46:08.000000000 +0100 -+++ Makefile.in 2006-01-09 16:46:27.000000000 +0100 -@@ -365,12 +365,8 @@ +--- Makefile.in.orig 2006-10-14 19:47:57.000000000 +0200 ++++ Makefile.in 2006-10-14 19:48:09.000000000 +0200 +@@ -370,12 +370,8 @@ 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 \ diff --git a/databases/mysql5-server/patches/patch-ab b/databases/mysql5-server/patches/patch-ab index 31ad74d2923..bdf83f77a54 100644 --- a/databases/mysql5-server/patches/patch-ab +++ b/databases/mysql5-server/patches/patch-ab @@ -1,26 +1,26 @@ -$NetBSD: patch-ab,v 1.2 2006/08/06 16:30:40 tron Exp $ +$NetBSD: patch-ab,v 1.3 2006/10/14 18:41:34 xtraeme Exp $ ---- tests/Makefile.in.orig 2006-07-27 19:53:37.000000000 +0100 -+++ tests/Makefile.in 2006-08-06 16:03:47.000000000 +0100 -@@ -102,7 +102,7 @@ - @HAVE_NETWARE_TRUE@ mysql_client_test.$(OBJEXT) \ - @HAVE_NETWARE_TRUE@ $(am__objects_1) my_memmem.$(OBJEXT) +--- tests/Makefile.in.orig 2006-10-14 19:48:42.000000000 +0200 ++++ tests/Makefile.in 2006-10-14 19:49:16.000000000 +0200 +@@ -99,7 +99,7 @@ + am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT) \ + $(am__objects_1) my_memmem.$(OBJEXT) mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS) -am__DEPENDENCIES_1 = $(top_builddir)/libmysql/libmysqlclient.la +am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = - @HAVE_NETWARE_FALSE@mysql_client_test_DEPENDENCIES = \ - @HAVE_NETWARE_FALSE@ $(am__DEPENDENCIES_1) \ -@@ -117,7 +117,7 @@ + mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_2) +@@ -111,7 +111,7 @@ thread_test_SOURCES = thread_test.c thread_test_OBJECTS = thread_test.$(OBJEXT) thread_test_LDADD = $(LDADD) -thread_test_DEPENDENCIES = $(top_builddir)/libmysql/libmysqlclient.la -+thread_test_DEPENDENCIES = ++thread_test_DEPENDENCIES = DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@@ -420,8 +420,7 @@ +@@ -416,8 +416,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ $(openssl_includes) @@ -28,5 +28,5 @@ $NetBSD: patch-ab,v 1.2 2006/08/06 16:30:40 tron Exp $ - $(top_builddir)/libmysql/libmysqlclient.la +LDADD = @CLIENT_EXTRA_LDFLAGS@ -lmysqlclient - @HAVE_NETWARE_FALSE@mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys - @HAVE_NETWARE_TRUE@mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS) + mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS) + mysql_client_test_SOURCES = mysql_client_test.c $(yassl_dummy_link_fix) \ diff --git a/databases/mysql5-server/patches/patch-ac b/databases/mysql5-server/patches/patch-ac index e4bc1fade7d..17d4508e0dd 100644 --- a/databases/mysql5-server/patches/patch-ac +++ b/databases/mysql5-server/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2006/07/10 20:16:53 sketch Exp $ +$NetBSD: patch-ac,v 1.4 2006/10/14 18:41:34 xtraeme Exp $ ---- mysql-test/Makefile.in.orig Thu May 25 09:57:37 2006 -+++ mysql-test/Makefile.in Mon Jul 10 20:00:56 2006 -@@ -388,7 +388,7 @@ +--- mysql-test/Makefile.in.orig 2006-10-14 19:50:21.000000000 +0200 ++++ mysql-test/Makefile.in 2006-10-14 19:51:30.000000000 +0200 +@@ -389,7 +389,7 @@ @HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\" @HAVE_NDBCLUSTER_DB_TRUE@USE_NDBCLUSTER = \"--ndbcluster\" benchdir_root = $(prefix) @@ -10,8 +10,8 @@ $NetBSD: patch-ac,v 1.3 2006/07/10 20:16:53 sketch Exp $ +testdir = $(benchdir_root)/share/mysql-test EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh valgrind.supp $(PRESCRIPTS) EXTRA_DIST = $(EXTRA_SCRIPTS) - GENSCRIPTS = mysql-test-run install_test_db -@@ -819,12 +819,11 @@ + GENSCRIPTS = mysql-test-run install_test_db mtr +@@ -820,12 +820,11 @@ $(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib install-data-local: diff --git a/databases/mysql5-server/patches/patch-af b/databases/mysql5-server/patches/patch-af index 80067a7bb2b..149a604ed77 100644 --- a/databases/mysql5-server/patches/patch-af +++ b/databases/mysql5-server/patches/patch-af @@ -1,79 +1,15 @@ -$NetBSD: patch-af,v 1.2 2006/08/06 16:30:40 tron Exp $ +$NetBSD: patch-af,v 1.3 2006/10/14 18:41:34 xtraeme Exp $ ---- configure.orig 2006-07-27 19:53:44.000000000 +0100 -+++ configure 2006-08-06 16:53:36.000000000 +0100 -@@ -21500,7 +21500,7 @@ - FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null" - else - case $SYSTEM_TYPE in -- *freebsd*) -+ *freebsd* | *dragonfly*) - FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null" - ;; - *darwin*) -@@ -24458,13 +24458,13 @@ - : - else - --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 - -- LIBS="-lposix4 $LIBS" -+ LIBS="-lrt $LIBS" - - fi - -@@ -25792,6 +25792,10 @@ - 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 () - { - +Patch reported: http://bugs.mysql.com/bug.php?id=23293&thanks=4 + +--- 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); - - ; -@@ -41815,6 +41819,8 @@ - _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ : Avoid regenerating within pkgsrc -+ exit 0 - ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; + ], + [ diff --git a/databases/mysql5-server/patches/patch-ag b/databases/mysql5-server/patches/patch-ag index fd0de8e80d1..ca41472f5ea 100644 --- a/databases/mysql5-server/patches/patch-ag +++ b/databases/mysql5-server/patches/patch-ag @@ -1,15 +1,13 @@ -$NetBSD: patch-ag,v 1.4 2006/05/18 16:11:15 cube Exp $ +$NetBSD: patch-ag,v 1.5 2006/10/14 18:41:34 xtraeme Exp $ ---- man/Makefile.in.orig 2006-04-26 20:31:55.000000000 +0200 -+++ man/Makefile.in -@@ -342,8 +342,8 @@ yassl_includes = @yassl_includes@ +--- man/Makefile.in.orig 2006-10-04 13:25:43.000000000 +0200 ++++ man/Makefile.in 2006-10-14 20:17:36.000000000 +0200 +@@ -344,7 +344,7 @@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -man1_MANS = @man1_files@ --EXTRA_DIST = $(man1_MANS) +man1_MANS = mysqld.1 mysqld_multi.1 -+EXTRA_DIST = mysqld.1.in mysqld_multi.1.in + man8_MANS = @man8_files@ + EXTRA_DIST = $(man1_MANS) $(man8_MANS) all: all-am - - .SUFFIXES: diff --git a/databases/mysql5-server/patches/patch-aj b/databases/mysql5-server/patches/patch-aj index 579259e6fba..4b21020e764 100644 --- a/databases/mysql5-server/patches/patch-aj +++ b/databases/mysql5-server/patches/patch-aj @@ -1,9 +1,9 @@ -$NetBSD: patch-aj,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ +$NetBSD: patch-aj,v 1.2 2006/10/14 18:41:34 xtraeme Exp $ ---- scripts/mysqld_safe.sh.orig 2005-01-17 15:16:35.000000000 +0100 -+++ scripts/mysqld_safe.sh 2005-01-17 15:20:03.000000000 +0100 -@@ -253,6 +253,14 @@ - fi +--- scripts/mysqld_safe.sh.orig 2006-10-14 19:56:04.000000000 +0200 ++++ scripts/mysqld_safe.sh 2006-10-14 19:59:48.000000000 +0200 +@@ -330,6 +330,14 @@ + ulimit -c $core_file_size fi +datemsg() @@ -17,13 +17,13 @@ $NetBSD: patch-aj,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ # # If there exists an old pid file, check if the daemon is already running # Note: The switches to 'ps' may depend on your operating system -@@ -263,18 +271,16 @@ +@@ -340,18 +348,16 @@ then if @FIND_PROC@ then # The pid contains a mysqld process - echo "A mysqld process already exists" - echo "A mysqld process already exists at " `date` >> $err_log -+ datemsg "A mysqld process already exists" ++ datemsg "A mysqld process already exists" exit 1 fi fi @@ -34,13 +34,13 @@ $NetBSD: patch-aj,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ - echo "Fatal error: Can't remove the pid file: $pid_file at " `date` >> $err_log - echo "Please remove it manually and start $0 again" - echo "mysqld daemon not started" -+ datemsg "Fatal error: Can't remove the pid file: $pid_file" -+ datemsg "Please remove it manually and start $0 again" -+ datemsg "mysqld daemon not started" ++ datemsg "Fatal error: Can't remove the pid file: $pid_file" ++ datemsg "Please remove it manually and start $0 again" ++ datemsg "mysqld daemon not started" exit 1 fi fi -@@ -287,11 +293,11 @@ +@@ -364,11 +370,11 @@ # Alternatively, you can start mysqld with the "myisam-recover" option. See # the manual for details. # @@ -54,7 +54,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ # Does this work on all systems? #if type ulimit | grep "shell builtin" > /dev/null -@@ -299,7 +305,7 @@ +@@ -376,7 +382,7 @@ # ulimit -n 256 > /dev/null 2>&1 # Fix for BSD and FreeBSD systems #fi @@ -63,7 +63,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ while true do rm -f $safe_mysql_unix_port $pid_file # Some extra safety -@@ -311,7 +317,7 @@ +@@ -388,7 +394,7 @@ fi if test ! -f $pid_file # This is removed if normal shutdown then @@ -72,7 +72,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ break fi -@@ -324,7 +330,7 @@ +@@ -401,7 +407,7 @@ # kill -9 is used or the process won't react on the kill. numofproces=`ps xaww | grep -v "grep" | grep "$ledir/$MYSQLD\>" | grep -c "pid-file=$pid_file"` @@ -81,7 +81,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ I=1 while test "$I" -le "$numofproces" do -@@ -337,16 +343,14 @@ +@@ -414,16 +420,14 @@ # echo "TEST $I - $T **" if kill -9 $T then diff --git a/databases/mysql5-server/patches/patch-an b/databases/mysql5-server/patches/patch-an new file mode 100644 index 00000000000..a41c60a0607 --- /dev/null +++ b/databases/mysql5-server/patches/patch-an @@ -0,0 +1,33 @@ +$NetBSD: patch-an,v 1.1 2006/10/14 18:41:34 xtraeme Exp $ + +Patch reported: http://bugs.mysql.com/bug.php?id=23294&thanks=4 + +--- 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 +- *freebsd*) ++ *freebsd*|*dragonfly*) + FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null" + ;; + *darwin*) +@@ -752,6 +752,8 @@ + + # 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 + + # For large pages support +@@ -1077,7 +1079,7 @@ + MAX_C_OPTIMIZE="-O" + fi + ;; +- *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 --git a/databases/mysql5-server/patches/patch-bf b/databases/mysql5-server/patches/patch-bf new file mode 100644 index 00000000000..78b8659f30a --- /dev/null +++ b/databases/mysql5-server/patches/patch-bf @@ -0,0 +1,13 @@ +$NetBSD: patch-bf,v 1.1 2006/10/14 18:41:34 xtraeme Exp $ + +--- bdb/dist/configure.orig 2006-10-08 15:25:31.000000000 +0200 ++++ bdb/dist/configure 2006-10-08 15:26:39.000000000 +0200 +@@ -5038,7 +5038,7 @@ fi + # we're using. + case "$host_os" in + sysv5UnixWare*|sysv5OpenUNIX8*) +- if test "$GCC" == "yes"; then ++ if test "$GCC" = "yes"; then + CPPFLAGS="$CPPFLAGS -pthread" + LDFLAGS="$LDFLAGS -pthread" + else |