Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15711/unstable/main/finkinfo/database
Modified Files: mysql.info mysql.patch Added Files: mysql-3.23.58-23.info mysql-3.23.58-23.patch mysql-4.0.22-12.info mysql-4.0.22-12.patch mysql-4.1.10-2.info mysql-4.1.10-2.patch Removed Files: mysql-3.23.58-22.info mysql-3.23.58-22.patch mysql-4.0.22-11.info mysql-4.0.22-11.patch Log Message: Update package: MySQL --- mysql-4.0.22-11.info DELETED --- --- NEW FILE: mysql-4.0.22-12.patch --- diff -urN mysql-4.0.17.orig/configure mysql-4.0.17/configure --- mysql-4.0.17.orig/configure Mon Dec 15 06:24:06 2003 +++ mysql-4.0.17/configure Fri Jan 9 07:58:24 2004 @@ -23695,6 +23695,15 @@ fi ;; *darwin6*) + if test "$ac_cv_c_compiler_gnu" = "yes" + then + FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DFN_NO_CASE_SENCE" + CFLAGS="$CFLAGS $FLAGS" + CXXFLAGS="$CXXFLAGS $FLAGS" + MAX_C_OPTIMIZE="-O" + fi + ;; + *darwin8*) if test "$ac_cv_c_compiler_gnu" = "yes" then FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DFN_NO_CASE_SENCE" Index: mysql.info =================================================================== RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/database/mysql.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mysql.info 27 Apr 2005 03:25:35 -0000 1.1 +++ mysql.info 25 Nov 2005 11:19:43 -0000 1.2 @@ -1,92 +1,183 @@ Package: mysql -Version: 4.1.10 +Version: 5.0.15 Revision: 1 Description: Open Source SQL database License: GPL/LGPL -Maintainer: Peter O'Gorman <[EMAIL PROTECTED]> +Maintainer: ASARI Takashi <[EMAIL PROTECTED]> # Dependencies: -Depends: %N14-shlibs (= %v-%r), %N-client (= %v-%r), daemonic (>= 20010902-1) -BuildDepends: readline (>= 4.3-26) +Depends: %N15-shlibs (= %v-%r), %N-client (= %v-%r), daemonic (>= 20010902-1) +BuildDepends: readline5, system-openssl-dev # Unpack Phase: -Source: mirror:custom:Downloads/MySQL-4.1/%n-%v.tar.gz -Source-MD5: 27b27b74f430aaeb77fb8d4e6f32ac4d +Source: mirror:custom:Downloads/MySQL-5.0/%n-%v.tar.gz +Source-MD5: b19e03de0ec348552b4bfac2e215f335 CustomMirror: << - eur-AR: ftp://mysql.abideweb.com/mirrors/MySQL/ + eur-AT: http://gd.tuwien.ac.at/db/mysql/ eur-AT: ftp://gd.tuwien.ac.at/db/mysql/ + eur-BE: http://mysql.mirror.netmonic.com/ + eur-BE: http://mysql.belnet.be/ eur-BE: ftp://ftp.belnet.be/mirror/ftp.mysql.com/pub/mysql/ + eur-BE: http://mysql.easynet.be/ + eur-BE: ftp://ftp.easynet.be/mysql/ + eur-BE: http://mysql.skynet.be/ + eur-BE: ftp://ftp.mysql.skynet.be/pub/ftp.mysql.com/ + eur-BE: http://mysql.easyhost.be/ + eur-BA: http://mysql.blic.net/ + eur-BG: http://mysql.online.bg/ + eur-BG: ftp://mysql.online.bg/ + eur-CZ: http://mysql.linux.cz/ eur-CZ: ftp://ftp.fi.muni.cz/pub/mysql/ - eur-CZ: ftp://ftp.gin.cz/pub/MIRRORS/www.mysql.com/ - eur-DK: ftp://sunsite.dk/mirrors/mysql/ - eur-DE: ftp://ftp.gwdg.de/pub/misc/mysql/ - eur-DE: ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/www.mysql.com/ - eur-DE: ftp://filepile.tiscali.de/mirror/mysql/ - eur-DE: ftp://ftp.fh-wolfenbuettel.de/pub/database/mysql/ - eur-FR: ftp://ftp.free.fr/pub/MySQL/ + eur-DK: http://mysql.borsen.dk/ + eur-DK: http://mysql.mirrors.cybercity.dk/ + eur-DK: http://mirrors.dotsrc.org/mysql/ + eur-DK: ftp://mirrors.dotsrc.org/mysql/ + eur-EE: http://mysql.mirror.ok.ee/ + eur-FI: http://mysql.tonnikala.org/ + eur-FI: http://mysql.netello.fi/ + eur-FR: http://mir2.ovh.net/ftp.mysql.com/ eur-FR: ftp://mir1.ovh.net/ftp.mysql.com/ - eur-FR: ftp://ftp.u-paris10.fr/mysql.com/ + eur-FR: http://mysql.crihan.fr/ + eur-FR: ftp://ftp.inria.fr/pub/MySQL/ + eur-FR: http://ftp.club-internet.fr/mirrors/ftp.mysql.com/ + eur-FR: ftp://ftp.club-internet.fr/pub/mirrors/ftp.mysql.com/ + eur-FR: http://mirrors.ircam.fr/pub/mysql/ + eur-FR: ftp://mirrors.ircam.fr/pub/mysql/ + eur-DE: http://sunsite.informatik.rwth-aachen.de/mysql/ + eur-DE: ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/www.mysql.com/ + eur-DE: http://ftp.gwdg.de/pub/misc/mysql/ + eur-DE: ftp://ftp.gwdg.de/pub/misc/mysql/ + eur-DE: ftp://ftp.fu-berlin.de/unix/databases/mysql/ + eur-DE: http://ftp.plusline.de/mysql/ + eur-DE: ftp://ftp.plusline.de/pub/mysql/ + eur-GR: http://mirrors.ntua.gr/MySQL/ eur-GR: ftp://ftp.ntua.gr/pub/databases/mysql/ - eur-HU: ftp://mysql.tiszanet.hu/pub/mirrors/mysql/ - eur-HU: ftp://xenia.sote.hu/pub/mirrors/www.mysql.com/ - eur-IE: ftp://ftp.esat.net/mirrors/download.sourceforge.net/pub/mirrors/mysql/ - eur-LV: ftp://ftp.linux.lv/pub/software/mysql/ - eur-NE: ftp://mirror.widexs.nl/pub/mysql/ - eur-PO: ftp://sunsite.icm.edu.pl/pub/unix/mysql/ - eur-PL: ftp://darkstar.ist.utl.pt/pub/mysql/ - eur-PL: ftp://mirrors2.netvisao.pt/pub/mysql/ - eur-PL: ftp://ftp.telepac.pt/pub/mysql/ - eur-PL: ftp://ftp.vizzavi.pt/pub/mysql/ - eur-RU: ftp://ftp.dn.ru/pub/MySQL/ - eur-RU: ftp://ftp.chg.ru/pub/databases/mysql/ + eur-GR: http://mirrors.ee.teiath.gr/mysql/ + eur-GR: ftp://mirrors.ee.teiath.gr/pub/mysql/ + eur-HU: http://mysql.mirrors.crysys.hit.bme.hu/ + eur-HU: ftp://ftp.crysys.hu/pub/mysql/ + eur-IS: http://mysql.rhnet.is/ + eur-IS: ftp://ftp.rhnet.is/pub/mysql/ + eur-IE: http://ftp.heanet.ie/mirrors/www.mysql.com/ + eur-IE: ftp://ftp.heanet.ie/mirrors/www.mysql.com/ + eur-IT: http://mirror.tomato.it/mysql/ + eur-IT: http://na.mirror.garr.it/mirrors/MySQL/ + eur-IT: ftp://na.mirror.garr.it/mirrors/MySQL/ + eur-NL: http://mysql.proserve.nl/ + eur-NL: ftp://mysql.proserve.nl/pub/mysql/Downloads + eur-NL: http://mysql.mirror.nedlinux.nl/ + eur-NL: ftp://mysql.mirror.nedlinux.nl/pub/mirror/mysql/ + eur-PL: http://sunsite.icm.edu.pl/mysql/ + eur-PL: ftp://sunsite.icm.edu.pl/pub/unix/mysql/ + eur-PT: http://mysql.nfsi.pt/ + eur-PT: ftp://ftp.nfsi.pt/pub/mysql/ + eur-PT: http://mysql.netvisao.pt/ + eur-PT: ftp://mirrors2.netvisao.pt/mysql/ + eur-RO: ftp://ftp.roedu.net/pub/mirrors/ftp.mysql.com/ + eur-RU: http://ftp.citkit.ru/pub/MySQL/ + eur-RU: ftp://ftp.citkit.ru/pub/MySQL/ + eur-YU: http://mirror.etf.bg.ac.yu/mysql/ + eur-YU: ftp://mirror.etf.bg.ac.yu/mysql/ + eur-SI: http://mirrors.bevc.net/mysql/ + eur-SI: ftp://ftp.bevc.net/mirrors/mysql/ + eur-SI: http://ftp.arnes.si/mysql/ eur-SI: ftp://ftp.arnes.si/packages/mysql/ + eur-SI: http://www.fastmirrors.org/mysql/ + eur-ES: http://mysql.rediris.es/ + eur-ES: ftp://ftp.rediris.es/mirror/mysql/ + eur-SE: http://ftp.sunet.se/pub/unix/databases/relational/mysql/ eur-SE: ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/ - eur-CH: ftp://sunsite.cnlab-switch.ch/mirror/mysql/ - eur-UK: ftp://ftp.plig.org/pub/mysql/ + eur-SE: http://mysql.dataphone.se/ + eur-SE: ftp://mirror2.dataphone.se/pub/mysql/ + eur-CH: http://mirror.switch.ch/ftp/mirror/mysql/ + eur-CH: ftp://mirror.switch.ch/mirror/mysql/ + eur-CH: ftp://ftp.solnet.ch/mirror/mysql/ + eur-TR: http://mysql.progen.com.tr/ + eur-UA: http://mysql.dp.ua/ eur-UA: ftp://ftp.tlk-l.net/pub/mirrors/mysql.com/ - eur-UA: ftp://mysql.paco.net.ua/ - eur-YU: ftp://ftp.linux.org.yu/pub/MySQL/ - nam-MX: ftp://mysql.azc.uam.mx/mirrors/mysql/ - nam-MX: ftp://mysql.unam.mx/pub/mysql/ - nam-US: ftp://mysql.nixc.net/pub/mysql/ + eur-UK: http://mysql.mirror.anlx.net/ + eur-UK: http://www.mirrorservice.org/sites/ftp.mysql.com/ + eur-UK: ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/ + eur-UK: http://www.mirror.ac.uk/mirror/www.mysql.org/ + nam-CA: http://mysql.mirrored.ca/ + nam-CA: ftp://mysql.mirrored.ca/ + nam-CA: http://mysql.mirror.rafal.ca/ + nam-CA: ftp://mysql.mirror.rafal.ca/pub/mysql/ + nam-CA: http://mysql.serenitynet.com/ + nam-CA: ftp://ftp.mysql.serenitynet.com/ + #nam-PR: http://mirrors.hpcf.upr.edu/mysql/ + nam-US: http://mysql.he.net/ + nam-US: http://mirror.services.wisc.edu/mysql/ + nam-US: ftp://mirror.services.wisc.edu/mirrors/mysql/ + nam-US: http://mysql.mirrors.pair.com/ + nam-US: http://mysql.orst.edu/ nam-US: ftp://ftp.orst.edu/pub/mysql/ nam-US: ftp://mirror.mcs.anl.gov/pub/mysql/ - nam-US: ftp://mirror.sit.wisc.edu/mirrors/mysql/ - nam-US: ftp://mysql.secsup.org/pub/software/mysql/ - sam-AR: ftp://mysql.bannerlandia.com.ar/mirrors/mysql/ - sam-BR: ftp://ftp.linorg.usp.br/mysql/ - sam-CL: ftp://ftp.psinet.cl/pub/database/mysql/ - sam-CR: ftp://mysql.ogmios.co.cr/pub/mysql/ - asi-CN: ftp://mysql.ihostunit.com/pub/Mirror/mysql/ - asi-CN: ftp://ftp.shellhung.org/pub/Mirror/mysql/ - asi-ID: ftp://mysql.incaf.net/ - asi-ID: ftp://mysql.mweb.net.id/pub/database/mysql/ - asi-ID: ftp://mysql.itb.web.id/pub/MySQL/ + nam-US: http://mysql.mirror.redwire.net/ + nam-US: ftp://mysql.mirror.redwire.net/pub/mysql/ + nam-US: http://mysql.binarycompass.org/ + nam-US: http://mysql.mirrors.hoobly.com/ + nam-US: http://mirror.trouble-free.net/mysql_mirror/ + sam-AR: http://mysql.localhost.net.ar/ + sam-CL: http://mysql.vision.cl/ + sam-CL: http://mysql.tecnoera.com/ + asi-CN: http://mirror.vmmatrix.net/mysql/ + asi-ID: http://mysql.cbn.net.id/ + asi-ID: ftp://mirror.cbn.net.id/pub/mysql/ + asi-ID: http://komo.padinet.com/mysql/ + asi-ID: ftp://komo.padinet.com/mysql/ + asi-JP: http://www.softagency.co.jp/MySQL/ asi-JP: ftp://ftp.u-aizu.ac.jp/ftp/pub/dbms/mysql/mysql.com/ - asi-SG: ftp://ftp.hjc.edu.sg/mysql/ - asi-TW: ftp://mysql.uahrc.se.ntou.edu.tw/ - oce-AU: ftp://planetmirror.com/pub/mysql/ + asi-JP: http://download.softagency.net/MySQL/ + asi-SG: http://mysql.oss.eznetsols.org/ + asi-SG: ftp://ftp.oss.eznetsols.org/mysql/ + asi-KR: http://mysql.byungsoo.net/ + asi-KR: ftp://mysql.byungsoo.net/pub/mysql/ + asi-KR: http://mysql.holywar.net/ + asi-KR: http://mysql.new21.com/ + asi-TW: http://mysql.isu.edu.tw/ + asi-TW: http://mysql.cs.pu.edu.tw/ + asi-TW: ftp://ftp.cs.pu.edu.tw/Unix/mysql/ + asi-TW: http://ftp.stu.edu.tw/pub/Unix/Database/Mysql/ + asi-TW: ftp://ftp.stu.edu.tw/pub/Unix/Database/Mysql/ + aus-AU: http://mysql.planetmirror.com/ + aus-AU: ftp://ftp.planetmirror.com/pub/mysql/ + aus-AU: http://mysql.mirrors.ilisys.com.au/ + aus-NZ: http://mysql.inspire.net.nz/ + aus-NZ: ftp://mysql.inspire.net.nz/mysql/ + afr-ZA: ftp://ftp.is.co.za/mirrors/mysql/ << # Patch Phase -Patch: %n.patch +PatchScript: /usr/bin/sed "s|@PREFIX@|%p|g" %a/%n.patch | /usr/bin/patch -p1 # Compile Phase: -SetCFLAGS: -O3 -fomit-frame-pointer -DFINK_ETC="\"%p/etc/\"" -SetCXXFLAGS: -O3 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti -DFINK_ETC="\"%p/etc/\"" -NoSetLDFLAGS: true -NoSetCXX: true -SetLIBS: -L%p/lib -NoSetMAKEFLAGS: true +SetCFLAGS: -O3 -fomit-frame-pointer +SetCXXFLAGS: -O3 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti +SetCPPFLAGS: -I%p/lib/system-openssl/include +SetLDFLAGS: -L%p/lib/system-openssl/lib +#NoSetLDFLAGS: true +#NoSetCXX: true +#SetLIBS: -L%p/lib +#NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 -ConfigureParams: --disable-dependency-tracking --with-innodb --without-readline --with-mysqld-user=mysql --with-extra-charsets=complex --mandir=%p/share/man --infodir=%p/share/info --localstatedir=%p/var/mysql --libexecdir=%p/sbin --sysconfdir=%p/etc --with-embedded-server --enable-thread-safe-client --enable-local-infile -GCC: 3.3 - -CompileScript: << -mysql_cv_btype_last_arg_accept=socklen_t F77=no ./configure %c -perl -pi.bak -e 's/CCLD =.*/CCLD = g++/g' isam/Makefile -perl -pi.bak -e 's/CCLD =.*/CCLD = g++/g' myisam/Makefile -make +ConfigureParams: << + --disable-dependency-tracking \ + --with-innodb \ + --without-readline \ + --with-mysqld-user=mysql \ + --with-extra-charsets=complex \ + --mandir=%p/share/man \ + --infodir=%p/share/info \ + --localstatedir=%p/var/mysql \ + --libexecdir=%p/sbin \ + --sysconfdir=%p/etc \ + --with-embedded-server \ + --enable-thread-safe-client \ + --enable-local-infile \ + \ + --with-openssl << +GCC: 3.3 # Install Phase: InstallScript: << @@ -94,40 +185,69 @@ mkdir -p %i/var/mysql chmod 700 %i/var/mysql chown mysql %i/var/mysql - mkdir -p %i/share/doc/%n - cd Docs/; cp -R *.html *.ps *.txt INSTALL-BINARY %i/share/doc/%n/ - cd %i/lib && ln -s mysql/libmysqlclient.la . && ln -s mysql/libmysqlclient.a . && ln -s mysql/libmysqlclient.dylib . + ln -s mysql/libmysqlclient.la %i/lib + ln -s mysql/libmysqlclient.a %i/lib + ln -s mysql/libmysqlclient.dylib %i/lib << SplitOff: << Description: Open Source SQL database - Development headers and libraries - Package: %N14-dev - Depends: %N14-shlibs (= %v-%r) + Package: %N15-dev + Depends: %N15-shlibs (= %v-%r) BuildDependsOnly: True - Replaces: mysql (<= 3.23.56-1), mysql-dev, mysql12-dev - Conflicts: mysql (<= 3.23.56-1), mysql-dev, mysql21-dev - Files: include lib/mysql/*.a lib/mysql/*.la lib/mysql/libmysqlclient.dylib lib/mysql/libmysqlclient_r.dylib bin/mysql_config lib/libmysqlclient.* + Replaces: mysql (<= 3.23.56-1), mysql-dev, mysql12-dev, mysql14-dev + Conflicts: mysql (<= 3.23.56-1), mysql-dev, mysql12-dev, mysql14-dev + Files: << + include + lib/mysql/*.a + lib/mysql/*.la + lib/mysql/libmysqlclient.dylib + lib/mysql/libmysqlclient_r.dylib + bin/mysql_config + lib/libmysqlclient.* + << DocFiles: README COPYING << SplitOff2: << Description: Open Source SQL database - Shared libraries - Package: %N14-shlibs + Package: %N15-shlibs Replaces: mysql (<= 3.23.51-1) - Files: lib/mysql/libmysqlclient.14.0.0.dylib lib/mysql/libmysqlclient.14.dylib lib/mysql/libmysqlclient_r.14.0.0.dylib lib/mysql/libmysqlclient_r.14.dylib + Files: << + lib/mysql/libmysqlclient.15.0.0.dylib + lib/mysql/libmysqlclient.15.dylib + lib/mysql/libmysqlclient_r.15.0.0.dylib + lib/mysql/libmysqlclient_r.15.dylib + << Shlibs: << - %p/lib/mysql/libmysqlclient.14.dylib 15.0.0 %n (>= 4.1.7-11) - %p/lib/mysql/libmysqlclient_r.14.dylib 15.0.0 %n (>= 4.1.7-11) + %p/lib/mysql/libmysqlclient.15.dylib 16.0.0 %n (>= 4.1.7-11) + %p/lib/mysql/libmysqlclient_r.15.dylib 16.0.0 %n (>= 4.1.7-11) << DocFiles: README COPYING << SplitOff3: << Description: Open Source SQL database - Client Package: %N-client - Depends: %N14-shlibs (= %v-%r), readline-shlibs (>= 4.3-5) + Depends: %N15-shlibs (= %v-%r), readline5-shlibs Conflicts: mysql (<= 3.23.54a-2) - Files: bin/mysql bin/mysql_find_rows bin/mysqlaccess bin/mysqladmin bin/mysqlbug bin/mysqlcheck bin/mysqldump bin/mysqldumpslow bin/mysqlimport bin/mysqlshow share/man/man1/mysql.1 share/man/man1/mysqlaccess.1 share/man/man1/mysqladmin.1 share/man/man1/mysqldump.1 share/man/man1/mysqlshow.1 + Files: << + bin/mysql + bin/mysql_find_rows + bin/mysqlaccess + bin/mysqladmin + bin/mysqlbug + bin/mysqlcheck + bin/mysqldump + bin/mysqldumpslow + bin/mysqlimport + bin/mysqlshow + share/man/man1/mysql.1 + share/man/man1/mysqlaccess.1 + share/man/man1/mysqladmin.1 + share/man/man1/mysqldump.1 + share/man/man1/mysqlshow.1 + << DocFiles: README COPYING << -DocFiles: README COPYING +DocFiles: README COPYING Docs/INSTALL-BINARY # Build Phase: InfoDocs: mysql.info @@ -198,7 +318,7 @@ The InnoDB package revision by Andrei Verovski. http://homepage.mac.com/macgurutemple/downloads.html -Previous package revisions by Christoph Pfisterer. +Previous package revisions by Christoph Pfisterer and Peter O'Gorman. http://fink.sourceforge.net << DescPort: << Index: mysql.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/database/mysql.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mysql.patch 27 Apr 2005 03:25:35 -0000 1.1 +++ mysql.patch 25 Nov 2005 11:19:43 -0000 1.2 @@ -1,31 +1,55 @@ -diff -urN mysql-4.0.17.orig/configure mysql-4.0.17/configure ---- mysql-4.0.17.orig/configure Mon Dec 15 06:24:06 2003 -+++ mysql-4.0.17/configure Fri Jan 9 07:58:24 2004 -@@ -23695,6 +23695,15 @@ - fi - ;; - *darwin6*) -+ if test "$ac_cv_c_compiler_gnu" = "yes" -+ then -+ FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DFN_NO_CASE_SENCE" -+ CFLAGS="$CFLAGS $FLAGS" -+ CXXFLAGS="$CXXFLAGS $FLAGS" -+ MAX_C_OPTIMIZE="-O" -+ fi -+ ;; -+ *darwin8*) - if test "$ac_cv_c_compiler_gnu" = "yes" - then - FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DFN_NO_CASE_SENCE" ---- mysql-4.1.7/mysys/default.c~ 2004-10-23 16:28:44.000000000 +0900 -+++ mysql-4.1.7/mysys/default.c 2005-02-18 23:17:10.000000000 +0900 -@@ -43,6 +43,9 @@ - /* Which directories are searched for options (and in which order) */ +diff -Naur mysql-5.0.13-rc/mysys/default.c mysql-5.0.13-rc.fink/mysys/default.c +--- mysql-5.0.13-rc/mysys/default.c 2005-09-23 04:39:57.000000000 +0900 ++++ mysql-5.0.13-rc.fink/mysys/default.c 2005-10-16 02:13:52.000000000 +0900 +@@ -980,6 +980,8 @@ + { + const char *env, **ptr= default_directories; - const char *default_directories[]= { -+#ifdef FINK_ETC -+ FINK_ETC, -+#endif ++ *ptr++= "@PREFIX@/etc/"; ++ #ifdef __WIN__ - "C:/", - #elif defined(__NETWARE__) + *ptr++= "C:/"; + +diff -Naur mysql-5.0.13-rc/scripts/mysqld_safe.sh mysql-5.0.13-rc.fink/scripts/mysqld_safe.sh +--- mysql-5.0.13-rc/scripts/mysqld_safe.sh 2005-09-23 04:40:24.000000000 +0900 ++++ mysql-5.0.13-rc.fink/scripts/mysqld_safe.sh 2005-10-16 02:18:56.000000000 +0900 +@@ -132,22 +132,24 @@ + # Second, try to find the data directory + # + +-# Try where the binary installs put it +-if test -d $MY_BASEDIR_VERSION/data/mysql +-then +- DATADIR=$MY_BASEDIR_VERSION/data +- if test -z "$defaults" -a -r "$DATADIR/my.cnf" +- then +- defaults="--defaults-extra-file=$DATADIR/my.cnf" +- fi +-# Next try where the source installs put it +-elif test -d $MY_BASEDIR_VERSION/var/mysql +-then +- DATADIR=$MY_BASEDIR_VERSION/var +-# Or just give up and use our compiled-in default +-else ++# Fink's MySQL uses @PREFIX@/var/lib by default.. ++ ++# # Try where the binary installs put it ++# if test -d $MY_BASEDIR_VERSION/data/mysql ++# then ++# DATADIR=$MY_BASEDIR_VERSION/data ++# if test -z "$defaults" -a -r "$DATADIR/my.cnf" ++# then ++# defaults="--defaults-extra-file=$DATADIR/my.cnf" ++# fi ++# # Next try where the source installs put it ++# elif test -d $MY_BASEDIR_VERSION/var/mysql ++# then ++# DATADIR=$MY_BASEDIR_VERSION/var ++# # Or just give up and use our compiled-in default ++# else + [EMAIL PROTECTED]@ +-fi ++# fi + + if test -z "$MYSQL_HOME" + then --- mysql-3.23.58-22.info DELETED --- --- mysql-3.23.58-22.patch DELETED --- --- mysql-4.0.22-11.patch DELETED --- --- NEW FILE: mysql-3.23.58-23.info --- Package: mysql Version: 3.23.58 Revision: 23 Description: Open Source SQL database License: GPL/LGPL Maintainer: Peter O'Gorman <[EMAIL PROTECTED]> # Dependencies: Depends: %N-shlibs (= %v-%r), %N-client (= %v-%r), daemonic (>= 20010902-1) BuildDepends: readline (>= 4.3-5), libxml2, gdbm, expat, libtool14, libncurses5 # Unpack Phase: Source: mirror:custom:Downloads/MySQL-3.23/%n-%v.tar.gz Source-MD5: 835a96c86132fbde0db36db60c5b34cd CustomMirror: << eur-AR: ftp://mysql.abideweb.com/mirrors/MySQL/ eur-AT: ftp://gd.tuwien.ac.at/db/mysql/ eur-BE: ftp://ftp.belnet.be/mirror/ftp.mysql.com/pub/mysql/ eur-CZ: ftp://ftp.fi.muni.cz/pub/mysql/ eur-CZ: ftp://ftp.gin.cz/pub/MIRRORS/www.mysql.com/ eur-DK: ftp://sunsite.dk/mirrors/mysql/ eur-DE: ftp://ftp.gwdg.de/pub/misc/mysql/ eur-DE: ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/www.mysql.com/ eur-DE: ftp://filepile.tiscali.de/mirror/mysql/ eur-DE: ftp://ftp.fh-wolfenbuettel.de/pub/database/mysql/ eur-FR: ftp://ftp.free.fr/pub/MySQL/ eur-FR: ftp://mir1.ovh.net/ftp.mysql.com/ eur-FR: ftp://ftp.u-paris10.fr/mysql.com/ eur-GR: ftp://ftp.ntua.gr/pub/databases/mysql/ eur-HU: ftp://mysql.tiszanet.hu/pub/mirrors/mysql/ eur-HU: ftp://xenia.sote.hu/pub/mirrors/www.mysql.com/ eur-IE: ftp://ftp.esat.net/mirrors/download.sourceforge.net/pub/mirrors/mysql/ eur-LV: ftp://ftp.linux.lv/pub/software/mysql/ eur-NE: ftp://mirror.widexs.nl/pub/mysql/ eur-PO: ftp://sunsite.icm.edu.pl/pub/unix/mysql/ eur-PL: ftp://darkstar.ist.utl.pt/pub/mysql/ eur-PL: ftp://mirrors2.netvisao.pt/pub/mysql/ eur-PL: ftp://ftp.telepac.pt/pub/mysql/ eur-PL: ftp://ftp.vizzavi.pt/pub/mysql/ eur-RU: ftp://ftp.dn.ru/pub/MySQL/ eur-RU: ftp://ftp.chg.ru/pub/databases/mysql/ eur-SI: ftp://ftp.arnes.si/packages/mysql/ eur-SE: ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/ eur-CH: ftp://sunsite.cnlab-switch.ch/mirror/mysql/ eur-UK: ftp://ftp.plig.org/pub/mysql/ eur-UA: ftp://ftp.tlk-l.net/pub/mirrors/mysql.com/ eur-UA: ftp://mysql.paco.net.ua/ eur-YU: ftp://ftp.linux.org.yu/pub/MySQL/ nam-MX: ftp://mysql.azc.uam.mx/mirrors/mysql/ nam-MX: ftp://mysql.unam.mx/pub/mysql/ nam-US: ftp://mysql.nixc.net/pub/mysql/ nam-US: ftp://ftp.orst.edu/pub/mysql/ nam-US: ftp://mirror.mcs.anl.gov/pub/mysql/ nam-US: ftp://mirror.sit.wisc.edu/mirrors/mysql/ nam-US: ftp://mysql.secsup.org/pub/software/mysql/ sam-AR: ftp://mysql.bannerlandia.com.ar/mirrors/mysql/ sam-BR: ftp://ftp.linorg.usp.br/mysql/ sam-CL: ftp://ftp.psinet.cl/pub/database/mysql/ sam-CR: ftp://mysql.ogmios.co.cr/pub/mysql/ asi-CN: ftp://mysql.ihostunit.com/pub/Mirror/mysql/ asi-CN: ftp://ftp.shellhung.org/pub/Mirror/mysql/ asi-ID: ftp://mysql.incaf.net/ asi-ID: ftp://mysql.mweb.net.id/pub/database/mysql/ asi-ID: ftp://mysql.itb.web.id/pub/MySQL/ asi-JP: ftp://ftp.u-aizu.ac.jp/ftp/pub/dbms/mysql/mysql.com/ asi-SG: ftp://ftp.hjc.edu.sg/mysql/ asi-TW: ftp://mysql.uahrc.se.ntou.edu.tw/ oce-AU: ftp://planetmirror.com/pub/mysql/ << # Patch Patch: %f.patch PatchScript: << mv configure configure_ori sed 's,-traditional-cpp,-no-cpp-precomp,' < configure_ori > configure chmod a+x configure << # Compile Phase: SetCFLAGS: -O3 -fomit-frame-pointer SetCXXFLAGS: -O3 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti NoSetLDFLAGS: true NoSetCXX: true SetLIBS: -L%p/lib NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 ConfigureParams: --with-innodb --without-readline --with-mysqld-user=mysql --with-extra-charsets=complex --mandir=%p/share/man --infodir=%p/share/info --localstatedir=%p/var/mysql --libexecdir=%p/sbin --sysconfdir=%p/etc GCC: 3.3 CompileScript: mysql_cv_btype_last_arg_accept=socklen_t ./configure %c ; make # Install Phase: InstallScript: << make install DESTDIR=%d benchdir_root=%p/share/mysql libsdir=%p/lib/mysql mkdir -p %i/var/mysql chmod 700 %i/var/mysql chown mysql %i/var/mysql mkdir -p %i/share/doc/%n cd Docs/; cp -R *.html Flags *.ps *.txt INSTALL-BINARY %i/share/doc/%n/ cd %i/lib && ln -s mysql/libmysqlclient.la . && ln -s mysql/libmysqlclient.a . && ln -s mysql/libmysqlclient.dylib . << SplitOff: << Description: Open Source SQL database - Development headers and libraries Package: %N-dev Depends: %N-shlibs (= %v-%r) BuildDependsOnly: True Replaces: mysql (<< 3.23.56-2), mysql12-dev, mysql14-dev, mysql15-dev Conflicts: mysql (<< 3.23.56-2), mysql12-dev, mysql14-dev, mysql15-dev Files: include lib/mysql/*.a lib/mysql/*.la lib/mysql/libmysqlclient.dylib bin/mysql_config lib/libmysqlclient.* DocFiles: README COPYING COPYING.LIB << SplitOff2: << Description: Open Source SQL database - Shared libraries Package: %N-shlibs Replaces: mysql (<= 3.23.51-1) Depends: readline-shlibs (>= 4.3-5) Files: lib/mysql/libmysqlclient.10.0.0.dylib lib/mysql/libmysqlclient.10.dylib Shlibs: %p/lib/mysql/libmysqlclient.10.dylib 11.0.0 %n (>= 3.23.58-11) DocFiles: README COPYING COPYING.LIB << SplitOff3: << Description: Open Source SQL database - Client Package: %N-client Depends: %N-shlibs (= %v-%r) Conflicts: mysql (<= 3.23.54a-2) Files: bin/mysql bin/mysql_find_rows bin/mysqlaccess bin/mysqladmin bin/mysqlbug bin/mysqlcheck bin/mysqldump bin/mysqldumpslow bin/mysqlimport bin/mysqlshow share/man/man1/mysql.1 share/man/man1/mysqlaccess.1 share/man/man1/mysqladmin.1 share/man/man1/mysqldump.1 share/man/man1/mysqlshow.1 DocFiles: README COPYING COPYING.LIB << DocFiles: README COPYING COPYING.LIB # Build Phase: InfoDocs: mysql.info PostInstScript: << # determine directory where databases are living data_dir=$(my_print_defaults mysqld | grep datadir | cut -d= -f2) if [ -z "$data_dir" ]; then data_dir=%p/var/mysql fi # create initial database if [ ! -d $data_dir/mysql ]; then %p/bin/mysql_install_db --user=mysql chown -R mysql:mysql $data_dir/mysql $data_dir/test fi # update daemonic init script if necessary daemonic install mysql << PreRmScript: << # clean up if [ $1 != "upgrade" ]; then daemonic remove mysql fi << DaemonicFile: << <service> <description>MySQL database server</description> <message>MySQL database server</message> <daemon name="mysqld"> <executable background="yes">%p/bin/safe_mysqld</executable> </daemon> </service> << # Additional Data: DescUsage: << The package creates the administrative tables on installation. Be sure to set a MySQL root password using mysqladmin: 'mysqladmin -u root password your-new-password' or 'mysqladmin -u root -h localhost -p password your-new-password' You can start the MySQL server manually using 'safe_mysqld --user=mysql &' or you can run 'daemonic enable mysql' to create a StartupItem for it. All of these must be done as root. << DescPackaging: << Note: Do not remove this package. MySQL 3 is needed as a runtime dependency for gpsdrive and some other packages. Changes in version 3.23.58: http://www.mysql.com/doc/en/News-3.23.58.html Changes in version 3.23.57: http://www.mysql.com/doc/en/News-3.23.57.html Especially note: Fixed kill pid-of-mysqld to work on Mac OS X Changes in version 3.23.56: http://www.mysql.com/doc/en/News-3.23.56.html Especially note: Security enhancement: `mysqld' no longer reads options from world-writeable config files. Security enhancement: `mysqld' and `safe_mysqld' now only use the first --user option Changes in version 3.23.55: http://www.mysql.com/doc/en/News-3.23.55.html Especially note: "Make --lower-case-table-names default on MacOSX as the file system is case insensitive." Version 3.23.54a-3 adds a -client splitoff. Version 3.23.54a-2 adds 'NoSetLDFLAGS: true, SetLIBS: -L%p/lib' to enable old mysql installations to be upgraded. Also makes it possible to set a different location for the databases in 'my.cnf' Version 3.23.52 removes passwd dependency - for OSX 10.2 only which has mysql user. Built with InnoDB transaction safe table support (http://www.innodb.com/). You should install and update /sw/var/mysql/my.cnf in order to use InnoDB. The MySQL benchmark suite is stowed away in <prefix>/share/mysql. The InnoDB package revision by Andrei Verovski. http://homepage.mac.com/macgurutemple/downloads.html Previous package revisions by Christoph Pfisterer. http://fink.sourceforge.net << DescPort: << Supports Darwin out of the box, although the libtool scripts are updated to build shared libraries. Version 3.23.47 fixes shutdown problem on MacOS X/Darwin platform. The 'without-readline' configure flag needs to be there to use the readline from fink instead of the bundled copy. << Homepage: http://www.mysql.com/ --- NEW FILE: mysql-4.1.10-2.patch --- diff -urN mysql-4.0.17.orig/configure mysql-4.0.17/configure --- mysql-4.0.17.orig/configure Mon Dec 15 06:24:06 2003 +++ mysql-4.0.17/configure Fri Jan 9 07:58:24 2004 @@ -23695,6 +23695,15 @@ fi ;; *darwin6*) + if test "$ac_cv_c_compiler_gnu" = "yes" + then + FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DFN_NO_CASE_SENCE" + CFLAGS="$CFLAGS $FLAGS" + CXXFLAGS="$CXXFLAGS $FLAGS" + MAX_C_OPTIMIZE="-O" + fi + ;; + *darwin8*) if test "$ac_cv_c_compiler_gnu" = "yes" then FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DFN_NO_CASE_SENCE" --- mysql-4.1.7/mysys/default.c~ 2004-10-23 16:28:44.000000000 +0900 +++ mysql-4.1.7/mysys/default.c 2005-02-18 23:17:10.000000000 +0900 @@ -43,6 +43,9 @@ /* Which directories are searched for options (and in which order) */ const char *default_directories[]= { +#ifdef FINK_ETC + FINK_ETC, +#endif #ifdef __WIN__ "C:/", #elif defined(__NETWARE__) --- NEW FILE: mysql-4.1.10-2.info --- Package: mysql Version: 4.1.10 Revision: 2 Description: Open Source SQL database License: GPL/LGPL Maintainer: Peter O'Gorman <[EMAIL PROTECTED]> # Dependencies: Depends: %N14-shlibs (= %v-%r), %N-client (= %v-%r), daemonic (>= 20010902-1) BuildDepends: readline (>= 4.3-26) # Unpack Phase: Source: mirror:custom:Downloads/MySQL-4.1/%n-%v.tar.gz Source-MD5: 27b27b74f430aaeb77fb8d4e6f32ac4d CustomMirror: << eur-AR: ftp://mysql.abideweb.com/mirrors/MySQL/ eur-AT: ftp://gd.tuwien.ac.at/db/mysql/ eur-BE: ftp://ftp.belnet.be/mirror/ftp.mysql.com/pub/mysql/ eur-CZ: ftp://ftp.fi.muni.cz/pub/mysql/ eur-CZ: ftp://ftp.gin.cz/pub/MIRRORS/www.mysql.com/ eur-DK: ftp://sunsite.dk/mirrors/mysql/ eur-DE: ftp://ftp.gwdg.de/pub/misc/mysql/ eur-DE: ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/www.mysql.com/ eur-DE: ftp://filepile.tiscali.de/mirror/mysql/ eur-DE: ftp://ftp.fh-wolfenbuettel.de/pub/database/mysql/ eur-FR: ftp://ftp.free.fr/pub/MySQL/ eur-FR: ftp://mir1.ovh.net/ftp.mysql.com/ eur-FR: ftp://ftp.u-paris10.fr/mysql.com/ eur-GR: ftp://ftp.ntua.gr/pub/databases/mysql/ eur-HU: ftp://mysql.tiszanet.hu/pub/mirrors/mysql/ eur-HU: ftp://xenia.sote.hu/pub/mirrors/www.mysql.com/ eur-IE: ftp://ftp.esat.net/mirrors/download.sourceforge.net/pub/mirrors/mysql/ eur-LV: ftp://ftp.linux.lv/pub/software/mysql/ eur-NE: ftp://mirror.widexs.nl/pub/mysql/ eur-PO: ftp://sunsite.icm.edu.pl/pub/unix/mysql/ eur-PL: ftp://darkstar.ist.utl.pt/pub/mysql/ eur-PL: ftp://mirrors2.netvisao.pt/pub/mysql/ eur-PL: ftp://ftp.telepac.pt/pub/mysql/ eur-PL: ftp://ftp.vizzavi.pt/pub/mysql/ eur-RU: ftp://ftp.dn.ru/pub/MySQL/ eur-RU: ftp://ftp.chg.ru/pub/databases/mysql/ eur-SI: ftp://ftp.arnes.si/packages/mysql/ eur-SE: ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/ eur-CH: ftp://sunsite.cnlab-switch.ch/mirror/mysql/ eur-UK: ftp://ftp.plig.org/pub/mysql/ eur-UA: ftp://ftp.tlk-l.net/pub/mirrors/mysql.com/ eur-UA: ftp://mysql.paco.net.ua/ eur-YU: ftp://ftp.linux.org.yu/pub/MySQL/ nam-MX: ftp://mysql.azc.uam.mx/mirrors/mysql/ nam-MX: ftp://mysql.unam.mx/pub/mysql/ nam-US: ftp://mysql.nixc.net/pub/mysql/ nam-US: ftp://ftp.orst.edu/pub/mysql/ nam-US: ftp://mirror.mcs.anl.gov/pub/mysql/ nam-US: ftp://mirror.sit.wisc.edu/mirrors/mysql/ nam-US: ftp://mysql.secsup.org/pub/software/mysql/ sam-AR: ftp://mysql.bannerlandia.com.ar/mirrors/mysql/ sam-BR: ftp://ftp.linorg.usp.br/mysql/ sam-CL: ftp://ftp.psinet.cl/pub/database/mysql/ sam-CR: ftp://mysql.ogmios.co.cr/pub/mysql/ asi-CN: ftp://mysql.ihostunit.com/pub/Mirror/mysql/ asi-CN: ftp://ftp.shellhung.org/pub/Mirror/mysql/ asi-ID: ftp://mysql.incaf.net/ asi-ID: ftp://mysql.mweb.net.id/pub/database/mysql/ asi-ID: ftp://mysql.itb.web.id/pub/MySQL/ asi-JP: ftp://ftp.u-aizu.ac.jp/ftp/pub/dbms/mysql/mysql.com/ asi-SG: ftp://ftp.hjc.edu.sg/mysql/ asi-TW: ftp://mysql.uahrc.se.ntou.edu.tw/ oce-AU: ftp://planetmirror.com/pub/mysql/ << # Patch Phase Patch: %n.patch # Compile Phase: SetCFLAGS: -O3 -fomit-frame-pointer -DFINK_ETC="\"%p/etc/\"" SetCXXFLAGS: -O3 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti -DFINK_ETC="\"%p/etc/\"" NoSetLDFLAGS: true NoSetCXX: true SetLIBS: -L%p/lib NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 ConfigureParams: --disable-dependency-tracking --with-innodb --without-readline --with-mysqld-user=mysql --with-extra-charsets=complex --mandir=%p/share/man --infodir=%p/share/info --localstatedir=%p/var/mysql --libexecdir=%p/sbin --sysconfdir=%p/etc --with-embedded-server --enable-thread-safe-client --enable-local-infile GCC: 3.3 CompileScript: << mysql_cv_btype_last_arg_accept=socklen_t F77=no ./configure %c perl -pi.bak -e 's/CCLD =.*/CCLD = g++/g' isam/Makefile perl -pi.bak -e 's/CCLD =.*/CCLD = g++/g' myisam/Makefile make << # Install Phase: InstallScript: << make install DESTDIR=%d benchdir_root=%p/share/mysql libsdir=%p/lib/mysql mkdir -p %i/var/mysql chmod 700 %i/var/mysql chown mysql %i/var/mysql mkdir -p %i/share/doc/%n cd Docs/; cp -R *.html *.ps *.txt INSTALL-BINARY %i/share/doc/%n/ cd %i/lib && ln -s mysql/libmysqlclient.la . && ln -s mysql/libmysqlclient.a . && ln -s mysql/libmysqlclient.dylib . << SplitOff: << Description: Open Source SQL database - Development headers and libraries Package: %N14-dev Depends: %N14-shlibs (= %v-%r) BuildDependsOnly: True Replaces: mysql (<= 3.23.56-1), mysql-dev, mysql12-dev, mysql15-dev Conflicts: mysql (<= 3.23.56-1), mysql-dev, mysql12-dev, mysql15-dev Files: include lib/mysql/*.a lib/mysql/*.la lib/mysql/libmysqlclient.dylib lib/mysql/libmysqlclient_r.dylib bin/mysql_config lib/libmysqlclient.* DocFiles: README COPYING << SplitOff2: << Description: Open Source SQL database - Shared libraries Package: %N14-shlibs Replaces: mysql (<= 3.23.51-1) Files: lib/mysql/libmysqlclient.14.0.0.dylib lib/mysql/libmysqlclient.14.dylib lib/mysql/libmysqlclient_r.14.0.0.dylib lib/mysql/libmysqlclient_r.14.dylib Shlibs: << %p/lib/mysql/libmysqlclient.14.dylib 15.0.0 %n (>= 4.1.7-11) %p/lib/mysql/libmysqlclient_r.14.dylib 15.0.0 %n (>= 4.1.7-11) << DocFiles: README COPYING << SplitOff3: << Description: Open Source SQL database - Client Package: %N-client Depends: %N14-shlibs (= %v-%r), readline-shlibs (>= 4.3-5) Conflicts: mysql (<= 3.23.54a-2) Files: bin/mysql bin/mysql_find_rows bin/mysqlaccess bin/mysqladmin bin/mysqlbug bin/mysqlcheck bin/mysqldump bin/mysqldumpslow bin/mysqlimport bin/mysqlshow share/man/man1/mysql.1 share/man/man1/mysqlaccess.1 share/man/man1/mysqladmin.1 share/man/man1/mysqldump.1 share/man/man1/mysqlshow.1 DocFiles: README COPYING << DocFiles: README COPYING # Build Phase: InfoDocs: mysql.info PostInstScript: << # determine directory where databases are living data_dir=$(my_print_defaults mysqld | grep datadir | cut -d= -f2) if [ -z "$data_dir" ]; then data_dir=%p/var/mysql fi # create initial database # it is safe to call mysql_install_db even if a db is already present %p/bin/mysql_install_db --user=mysql chown -R mysql:mysql $data_dir/mysql $data_dir/test # update daemonic init script if necessary daemonic install mysql << PreRmScript: << # clean up if [ $1 != "upgrade" ]; then daemonic remove mysql fi << DaemonicFile: << <service> <description>MySQL database server</description> <message>MySQL database server</message> <daemon name="mysqld"> <executable background="yes">%p/bin/mysqld_safe</executable> </daemon> </service> << # Additional Data: DescUsage: << The package creates the administrative tables on installation. Be sure to set a MySQL root password using mysqladmin: 'mysqladmin -u root password your-new-password' or 'mysqladmin -u root -h localhost -p password your-new-password' # In general, you should do the following when upgrading to MySQL 4.1 from 4.0: Important note: MySQL 4.1 stores table names and column names in UTF8. If you have table names or column names that use characters outside of the standard 7-bit US-ASCII range, you may have to do a mysqldump of your tables in MySQL 4.0 and restore them after upgrading to MySQL 4.1. The symptom for this problem is that you get a table not found error when trying to access your tables. In this case, you should be able to downgrade back to MySQL 4.0 and access your data. After upgrading, update the grant tables to have the new longer Password column that is needed for more secure handling of passwords. The procedure uses mysql_fix_privilege_tables and is described in section 2.10.7 Upgrading the Grant Tables. If you don't do this, MySQL will not us the new more secure protocol to authenticate. You can start the MySQL server manually using 'mysqld_safe --user=mysql &' or you can run 'daemonic enable mysql' to create a StartupItem for it. All of these must be done as root. << DescPackaging: << The MySQL benchmark suite is stowed away in <prefix>/share/mysql. The InnoDB package revision by Andrei Verovski. http://homepage.mac.com/macgurutemple/downloads.html Previous package revisions by Christoph Pfisterer. http://fink.sourceforge.net << DescPort: << Supports Darwin out of the box, although the libtool scripts are updated to build shared libraries. Version 3.23.47 fixes shutdown problem on MacOS X/Darwin platform. The 'without-readline' configure flag needs to be there to use the readline from fink instead of the bundled copy. << Homepage: http://www.mysql.com/ --- NEW FILE: mysql-3.23.58-23.patch --- --- mysql-4.0.13/configure.old Fri Jun 13 22:51:38 2003 +++ mysql-4.0.13/configure Fri Jun 13 22:52:44 2003 @@ -6059,8 +6059,9 @@ archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' - hardcode_direct=yes + hardcode_direct=no hardcode_shlibpath_var=no + hardcode_libdir_flag_spec=' ' whole_archive_flag_spec='-all_load $convenience' ;; --- NEW FILE: mysql-4.0.22-12.info --- Package: mysql Version: 4.0.22 Revision: 12 Description: Open Source SQL database License: GPL/LGPL Maintainer: Peter O'Gorman <[EMAIL PROTECTED]> # Dependencies: Depends: %N12-shlibs (= %v-%r), %N-client (= %v-%r), daemonic (>= 20010902-1) BuildDepends: readline (>= 4.3-5), libxml2, gdbm3, expat, darwin (>= 7.0-1), libtool14, libncurses5 # Unpack Phase: Source: mirror:custom:Downloads/MySQL-4.0/%n-%v.tar.gz Source-MD5: fab53259c3ba9f729a319bf271fc8587 CustomMirror: << eur-AR: ftp://mysql.abideweb.com/mirrors/MySQL/ eur-AT: ftp://gd.tuwien.ac.at/db/mysql/ eur-BE: ftp://ftp.belnet.be/mirror/ftp.mysql.com/pub/mysql/ eur-CZ: ftp://ftp.fi.muni.cz/pub/mysql/ eur-CZ: ftp://ftp.gin.cz/pub/MIRRORS/www.mysql.com/ eur-DK: ftp://sunsite.dk/mirrors/mysql/ eur-DE: ftp://ftp.gwdg.de/pub/misc/mysql/ eur-DE: ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/www.mysql.com/ eur-DE: ftp://filepile.tiscali.de/mirror/mysql/ eur-DE: ftp://ftp.fh-wolfenbuettel.de/pub/database/mysql/ eur-FR: ftp://ftp.free.fr/pub/MySQL/ eur-FR: ftp://mir1.ovh.net/ftp.mysql.com/ eur-FR: ftp://ftp.u-paris10.fr/mysql.com/ eur-GR: ftp://ftp.ntua.gr/pub/databases/mysql/ eur-HU: ftp://mysql.tiszanet.hu/pub/mirrors/mysql/ eur-HU: ftp://xenia.sote.hu/pub/mirrors/www.mysql.com/ eur-IE: ftp://ftp.esat.net/mirrors/download.sourceforge.net/pub/mirrors/mysql/ eur-LV: ftp://ftp.linux.lv/pub/software/mysql/ eur-NE: ftp://mirror.widexs.nl/pub/mysql/ eur-PO: ftp://sunsite.icm.edu.pl/pub/unix/mysql/ eur-PL: ftp://darkstar.ist.utl.pt/pub/mysql/ eur-PL: ftp://mirrors2.netvisao.pt/pub/mysql/ eur-PL: ftp://ftp.telepac.pt/pub/mysql/ eur-PL: ftp://ftp.vizzavi.pt/pub/mysql/ eur-RU: ftp://ftp.dn.ru/pub/MySQL/ eur-RU: ftp://ftp.chg.ru/pub/databases/mysql/ eur-SI: ftp://ftp.arnes.si/packages/mysql/ eur-SE: ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/ eur-CH: ftp://sunsite.cnlab-switch.ch/mirror/mysql/ eur-UK: ftp://ftp.plig.org/pub/mysql/ eur-UA: ftp://ftp.tlk-l.net/pub/mirrors/mysql.com/ eur-UA: ftp://mysql.paco.net.ua/ eur-YU: ftp://ftp.linux.org.yu/pub/MySQL/ nam-MX: ftp://mysql.azc.uam.mx/mirrors/mysql/ nam-MX: ftp://mysql.unam.mx/pub/mysql/ nam-US: ftp://mysql.nixc.net/pub/mysql/ nam-US: ftp://ftp.orst.edu/pub/mysql/ nam-US: ftp://mirror.mcs.anl.gov/pub/mysql/ nam-US: ftp://mirror.sit.wisc.edu/mirrors/mysql/ nam-US: ftp://mysql.secsup.org/pub/software/mysql/ sam-AR: ftp://mysql.bannerlandia.com.ar/mirrors/mysql/ sam-BR: ftp://ftp.linorg.usp.br/mysql/ sam-CL: ftp://ftp.psinet.cl/pub/database/mysql/ sam-CR: ftp://mysql.ogmios.co.cr/pub/mysql/ asi-CN: ftp://mysql.ihostunit.com/pub/Mirror/mysql/ asi-CN: ftp://ftp.shellhung.org/pub/Mirror/mysql/ asi-ID: ftp://mysql.incaf.net/ asi-ID: ftp://mysql.mweb.net.id/pub/database/mysql/ asi-ID: ftp://mysql.itb.web.id/pub/MySQL/ asi-JP: ftp://ftp.u-aizu.ac.jp/ftp/pub/dbms/mysql/mysql.com/ asi-SG: ftp://ftp.hjc.edu.sg/mysql/ asi-TW: ftp://mysql.uahrc.se.ntou.edu.tw/ oce-AU: ftp://planetmirror.com/pub/mysql/ << # Patch Phase Patch: %f.patch # Compile Phase: SetCFLAGS: -O3 -fomit-frame-pointer SetCXXFLAGS: -O3 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti NoSetLDFLAGS: true NoSetCXX: true SetLIBS: -L%p/lib NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 ConfigureParams: --with-innodb --without-readline --with-mysqld-user=mysql --with-extra-charsets=complex --mandir=%p/share/man --infodir=%p/share/info --localstatedir=%p/var/mysql --libexecdir=%p/sbin --sysconfdir=%p/etc --with-embedded-server --disable-dependency-tracking --enable-thread-safe-client --enable-local-infile GCC: 3.3 CompileScript: << mysql_cv_btype_last_arg_accept=socklen_t F77=no ./configure %c make << # Install Phase: InstallScript: << make install DESTDIR=%d benchdir_root=%p/share/mysql libsdir=%p/lib/mysql mkdir -p %i/var/mysql chmod 700 %i/var/mysql chown mysql %i/var/mysql mkdir -p %i/share/doc/%n cd Docs/; cp -R *.html Flags *.ps *.txt INSTALL-BINARY %i/share/doc/%n/ cd %i/lib && ln -s mysql/libmysqlclient.la . && ln -s mysql/libmysqlclient.a . && ln -s mysql/libmysqlclient.dylib . << SplitOff: << Description: Open Source SQL database - Development headers and libraries Package: %N12-dev Depends: %N12-shlibs (= %v-%r) BuildDependsOnly: True Replaces: mysql (<= 3.23.56-1), mysql-dev, mysql14-dev, mysql15-dev Conflicts: mysql (<= 3.23.56-1), mysql-dev, mysql14-dev, mysql15-dev Files: include lib/mysql/*.a lib/mysql/*.la lib/mysql/libmysqlclient.dylib bin/mysql_config lib/libmysqlclient.* DocFiles: README COPYING << SplitOff2: << Description: Open Source SQL database - Shared libraries Package: %N12-shlibs Replaces: mysql (<= 3.23.51-1) Depends: readline-shlibs (>= 4.3-5) Files: lib/mysql/libmysqlclient.12.0.0.dylib lib/mysql/libmysqlclient.12.dylib Shlibs: %p/lib/mysql/libmysqlclient.12.dylib 13.0.0 %n (>= 4.0.13-1) DocFiles: README COPYING << SplitOff3: << Description: Open Source SQL database - Client Package: %N-client Depends: %N12-shlibs (= %v-%r) Conflicts: mysql (<= 3.23.54a-2) Files: bin/mysql bin/mysql_find_rows bin/mysqlaccess bin/mysqladmin bin/mysqlbug bin/mysqlcheck bin/mysqldump bin/mysqldumpslow bin/mysqlimport bin/mysqlshow share/man/man1/mysql.1 share/man/man1/mysqlaccess.1 share/man/man1/mysqladmin.1 share/man/man1/mysqldump.1 share/man/man1/mysqlshow.1 DocFiles: README COPYING << DocFiles: README COPYING # Build Phase: InfoDocs: mysql.info PostInstScript: << # determine directory where databases are living data_dir=$(my_print_defaults mysqld | grep datadir | cut -d= -f2) if [ -z "$data_dir" ]; then data_dir=%p/var/mysql fi # create initial database # it is safe to call mysql_install_db even if a db is already present %p/bin/mysql_install_db --user=mysql chown -R mysql:mysql $data_dir/mysql $data_dir/test # update daemonic init script if necessary daemonic install mysql << PreRmScript: << # clean up if [ $1 != "upgrade" ]; then daemonic remove mysql fi << DaemonicFile: << <service> <description>MySQL database server</description> <message>MySQL database server</message> <daemon name="mysqld"> <executable background="yes">%p/bin/mysqld_safe</executable> </daemon> </service> << # Additional Data: DescUsage: << The package creates the administrative tables on installation. Be sure to set a MySQL root password using mysqladmin: 'mysqladmin -u root password your-new-password' or 'mysqladmin -u root -h localhost -p password your-new-password' In general, what you have to do when upgrading to 4.0 from an earlier MySQL version: * Run the script mysql_fix_privilege_tables to add new privileges and features to the MySQL privilege tables. * Edit any MySQL startup scripts or configure files to not use any of the deprecated options listed below. * Convert your old ISAM files to MyISAM files with the command: mysql_convert_table_format database. Note that this should only be run if all tables in the given database is ISAM or MyISAM tables. If this is not the case you should run ALTER TABLE table_name TYPE=MyISAM on all ISAM tables. MySQL 4.0 will work even if you don't do the above, but you will not be able to use the new security privileges that MySQL 4.0 and you may run into problems when upgrading later to MySQL 4.1 or newer. The ISAM file format still works in MySQL 4.0 but it's deprecated and will be disabled in MySQL 5.0. You can start the MySQL server manually using 'mysqld_safe --user=mysql &' or you can run 'daemonic enable mysql' to create a StartupItem for it. All of these must be done as root. << DescPackaging: << Changes in version 3.23.56: http://www.mysql.com/doc/en/News-3.23.56.html Especially note: Security enhancement: `mysqld' no longer reads options from world-writeable config files. Security enhancement: `mysqld' and `mysqld_safe' now only use the first --user option Changes in version 3.23.55: http://www.mysql.com/doc/en/News-3.23.55.html Especially note: "Make --lower-case-table-names default on MacOSX as the file system is case insensitive." Version 3.23.54a-3 adds a -client splitoff. Version 3.23.54a-2 adds 'NoSetLDFLAGS: true, SetLIBS: -L%p/lib' to enable old mysql installations to be upgraded. Also makes it possible to set a different location for the databases in 'my.cnf' Version 3.23.52 removes passwd dependency - for OSX 10.2 only which has mysql user. Built with InnoDB transaction safe table support (http://www.innodb.com/). You should install and update /sw/var/mysql/my.cnf in order to use InnoDB. The MySQL benchmark suite is stowed away in <prefix>/share/mysql. The InnoDB package revision by Andrei Verovski. http://homepage.mac.com/macgurutemple/downloads.html Previous package revisions by Christoph Pfisterer. http://fink.sourceforge.net << DescPort: << Supports Darwin out of the box, although the libtool scripts are updated to build shared libraries. Version 3.23.47 fixes shutdown problem on MacOS X/Darwin platform. The 'without-readline' configure flag needs to be there to use the readline from fink instead of the bundled copy. << Homepage: http://www.mysql.com/ ------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits