Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/database
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7882/main/finkinfo/database
Modified Files:
Tag: pangocairo-branch
mysql.info mysql.patch
Log Message:
merge from HEAD, pangocairo-root-7 to pangocairo-root-8
Index: mysql.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/database/mysql.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- mysql.patch 7 Jan 2007 01:11:14 -0000 1.1.2.1
+++ mysql.patch 23 Jan 2007 18:39:47 -0000 1.1.2.2
@@ -53,159 +53,9 @@
if test -z "$MYSQL_HOME"
then
-From: msvensson at mysql dot com
-Date: December 22 2006 12:38am
-Subject: bk commit into 5.0 tree (msvensson:1.2353) BUG#23125
-
-Below is the list of changes that have just been committed into a local
-5.0 repository of msvensson. When msvensson does a push these changes will
-be propagated to the main repository and, within 24 hours after the
-push, to the public repository.
-For information on how to access the public repository
-see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
-
[EMAIL PROTECTED], 2006-12-22 00:38:34+01:00, [EMAIL PROTECTED] +5 -0
- Bug #23125 [patch] trigger test fails when run as root
- - Skip tests using chmod when running as root
-
- mysql-test/t/[EMAIL PROTECTED], 2006-12-22 00:38:30+01:00, [EMAIL PROTECTED]
+2 -2
- Use mysqltest builtin "chmode"
-
- mysql-test/t/[EMAIL PROTECTED], 2006-12-22 00:38:30+01:00, [EMAIL PROTECTED]
+3 -0
- Dont run as root - test chmod
-
- mysql-test/t/[EMAIL PROTECTED], 2006-12-22 00:38:30+01:00, [EMAIL PROTECTED]
+5 -3
- Use mysqltest builtin "chmode"
- Use 'write_file' and 'chmod' instead of system
-
- mysql-test/t/[EMAIL PROTECTED], 2006-12-22 00:38:30+01:00, [EMAIL PROTECTED]
+10 -4
- Don't run as root
- Use 'write_file' and 'chmod'
-
- mysql-test/t/[EMAIL PROTECTED], 2006-12-22 00:38:31+01:00, [EMAIL PROTECTED]
+4 -0
- Don't run as root
-
-# This is a BitKeeper patch. What follows are the unified diffs for the
-# set of deltas contained in the patch. The rest of the patch, the part
-# that BitKeeper cares about, is below these diffs.
-# User: msvensson
-# Host: pilot.mysql.com
-# Root: /home/msvensson/mysql/mysql-5.0-maint
-
---- 1.56/mysql-test/t/trigger.test 2006-11-13 23:38:34 +01:00
-+++ 1.57/mysql-test/t/trigger.test 2006-12-22 00:38:30 +01:00
-@@ -1,3 +1,7 @@
-+# This test uses chmod, can't be run with root permissions
-+-- source include/not_as_root.inc
-+
-+
- #
- # Basic triggers test
- #
-@@ -1138,8 +1142,10 @@
- event_object_table, action_statement from information_schema.triggers
- where event_object_schema = 'test';
- # Trick which makes update of second .TRN file impossible
--system echo dummy >$MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
--system chmod 000 $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
-+write_file $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
-+dummy
-+EOF
-+chmod 0000 $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
- --error 1
- rename table t1 to t2;
- # 't1' should be still there and triggers should work correctly
-@@ -1148,8 +1154,8 @@
- select trigger_schema, trigger_name, event_object_schema,
- event_object_table, action_statement from information_schema.triggers
- where event_object_schema = 'test';
--system chmod 600 $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
--system rm $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
-+chmod 0600 $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
-+remove_file $MYSQLTEST_VARDIR/master-data/test/t1_ai.TRN~;
- # Let us check that updates to .TRN files were rolled back too
- drop trigger t1_bi;
- drop trigger t1_ai;
-
---- 1.49/mysql-test/t/mysqltest.test 2006-11-30 10:56:30 +01:00
-+++ 1.50/mysql-test/t/mysqltest.test 2006-12-22 00:38:30 +01:00
-@@ -1,6 +1,9 @@
- # This test should work in embedded server after mysqltest is fixed
- -- source include/not_embedded.inc
-
-+# This test uses chmod, can't be run with root permissions
-+-- source include/not_as_root.inc
-+
- # ============================================================================
- #
- # Test of mysqltest itself
-
---- 1.11/mysql-test/t/varbinary.test 2006-11-29 23:03:43 +01:00
-+++ 1.12/mysql-test/t/varbinary.test 2006-12-22 00:38:31 +01:00
-@@ -1,3 +1,7 @@
-+# This test uses chmod, can't be run with root permissions
-+-- source include/not_as_root.inc
-+
-+
- # Initialise
- --disable_warnings
- drop table if exists t1;
-
---- 1.2/mysql-test/t/information_schema_chmod.test 2006-05-23 10:52:46
+02:00
-+++ 1.3/mysql-test/t/information_schema_chmod.test 2006-12-22 00:38:30
+01:00
-@@ -17,7 +17,7 @@
- #
- create database mysqltest;
- create table mysqltest.t1(a int);
----exec chmod -r $MYSQLTEST_VARDIR/master-data/mysqltest
-+chmod 0000 $MYSQLTEST_VARDIR/master-data/mysqltest;
- select table_schema from information_schema.tables where
table_schema='mysqltest';
----exec chmod +r $MYSQLTEST_VARDIR/master-data/mysqltest
-+exec chmod 0777 $MYSQLTEST_VARDIR/master-data/mysqltest;
- drop database mysqltest;
-
---- 1.65/mysql-test/t/rpl_rotate_logs.test 2006-04-24 10:21:04 +02:00
-+++ 1.66/mysql-test/t/rpl_rotate_logs.test 2006-12-22 00:38:30 +01:00
-@@ -17,8 +17,10 @@
- drop table if exists t1, t2, t3, t4;
- --enable_warnings
- connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);
--system cat /dev/null > $MYSQLTEST_VARDIR/slave-data/master.info;
--system chmod 000 $MYSQLTEST_VARDIR/slave-data/master.info;
-+# Create empty file
-+write_file $MYSQLTEST_VARDIR/slave-data/master.info;
-+EOF
-+chmod 0000 $MYSQLTEST_VARDIR/slave-data/master.info;
- connection slave;
- --disable_warnings
- drop table if exists t1, t2, t3, t4;
-@@ -29,7 +31,7 @@
- --replace_result $MYSQL_TEST_DIR TESTDIR
- --error 1105,1105,29
- start slave;
--system chmod 600 $MYSQLTEST_VARDIR/slave-data/master.info;
-+chmod 0600 $MYSQLTEST_VARDIR/slave-data/master.info;
- # It will fail again because the file is empty so the slave cannot get
valuable
- # info about how to connect to the master from it (failure in
- # init_strvar_from_file() in init_master_info()).
-From: kent at mysql dot com
-Date: January 2 2007 11:01am
-Subject: bk commit into 5.0 tree (kent:1.2357) BUG#25359
-
-Below is the list of changes that have just been committed into a local
-5.0 repository of kent. When kent does a push these changes will
-be propagated to the main repository and, within 24 hours after the
-push, to the public repository.
-For information on how to access the public repository
-see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
-
[EMAIL PROTECTED], 2007-01-02 11:01:48+01:00, [EMAIL PROTECTED] +1 -0
- view.result:
- Temporary work around for bug#25359
-
- mysql-test/r/[EMAIL PROTECTED], 2007-01-02 11:01:39+01:00, [EMAIL PROTECTED]
+4 -4
- Temporary work around for bug#25359
+# Temporary work around for #25359 (http://bugs.mysql.com/25359)
+#
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
@@ -232,3 +82,4 @@
DROP VIEW v1;
DROP TABLE t1;
CREATE TABLE t1 (id int NOT NULL PRIMARY KEY, a char(6) DEFAULT 'xxx');
+
Index: mysql.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/database/mysql.info,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- mysql.info 7 Jan 2007 01:11:14 -0000 1.1.2.1
+++ mysql.info 23 Jan 2007 18:39:47 -0000 1.1.2.2
@@ -1,5 +1,5 @@
Package: mysql
-Version: 5.0.27
+Version: 5.0.33
Revision: 1001
Description: Open Source SQL database
License: GPL/LGPL
@@ -11,8 +11,9 @@
# Unpack Phase:
Source: mirror:custom:Downloads/MySQL-5.0/%n-%v.tar.gz
-Source-MD5: 584d423440a9d9c859678e3d4f2690b3
-#SHA1: 656de9c03f07c2371f40277076ec2fc6eac51ec8
+# For Enterprise Server
+# Source: ftp://ftp.%n.com/pub/%n/src/%n-%v.tar.gz
+Source-MD5: 10cb85276a1468c7906a4ff4dd565d61
CustomMirror: <<
# Some country codes not in /sw/lib/fink/mirror/_keys
eur-AM: http://mysql.mirrors.arminco.com/
@@ -29,6 +30,7 @@
eur-BG: ftp://mysql.online.bg/
eur-CZ: http://mysql.linux.cz/
eur-CZ: ftp://ftp.fi.muni.cz/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/
@@ -69,8 +71,6 @@
eur-NL: ftp://ftp.snt.utwente.nl/pub/software/mysql/
eur-PL: http://sunsite.icm.edu.pl/mysql/
eur-PL: ftp://sunsite.icm.edu.pl/pub/unix/mysql/
- eur-PL: http://ftp.tpnet.pl/vol/d3/ftp.mysql.com/
- eur-PL: ftp://ftp.tpnet.pl/d3/ftp.mysql.com/
eur-PT: http://mysql.nfsi.pt/
eur-PT: ftp://ftp.nfsi.pt/pub/mysql/
eur-PT: http://mysql.netvisao.pt/
@@ -78,6 +78,8 @@
eur-PT: http://lisa.gov.pt/ftp/mysql/
eur-PT: ftp://ftp.roedu.net/pub/mirrors/ftp.mysql.com/
eur-RO: ftp://mirrors.fibernet.ro/1/MySQL/
+ eur-RO: http://mysql.ran.ro/
+ eur-RO: ftp://ftp.ran.ro/pub/mirrors/ftp.mysql.com/
eur-RU: http://mysql.directnet.ru/
eur-RU: ftp://ftp.dn.ru/pub/MySQL/
eur-RU: http://mysql.dn.ru/
@@ -90,8 +92,6 @@
eur-SI: http://www.wsection.com/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-SE: http://mysql.dataphone.se/
eur-SE: ftp://mirror2.dataphone.se/pub/mysql/
eur-CH: http://mirror.switch.ch/ftp/mirror/mysql/
@@ -101,6 +101,7 @@
eur-UA: http://mysql.net.ua/
eur-UA: ftp://ftp.tlk-l.net/pub/mirrors/mysql.com/
eur-UA: http://mysql.infocom.ua/
+ 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://mirrors.dedipower.com/www.mysql.com/
@@ -109,27 +110,25 @@
nam-CA: http://mysql.serenitynet.com/
nam-CA: ftp://ftp.mysql.serenitynet.com/
nam-PR: http://mirrors.hpcf.upr.edu/mysql/
+ nam-US: http://mirror.trouble-free.net/mysql_mirror/
+ nam-US: http://mysql.binarycompass.org/
nam-US: http://mysql.he.net/
+ nam-US: http://www.stathy.com/mysql/
+ nam-US: ftp://www.stathy.com/mysql/
+ nam-US: http://mysql.mirrors.hoobly.com/
+ nam-US: ftp://mirror.mcs.anl.gov/pub/mysql/
+ nam-US: http://mysql.mirrors.pair.com/
+ nam-US: http://mirror.x10.com/mirror/mysql/
+ nam-US: ftp://mirror.x10.com/mysql/
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://mirrors.24-7-solutions.net/pub/mysql/
+ nam-US: ftp://mirrors.24-7-solutions.net/pub/mysql/
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: 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/
- nam-US: http://mirrors.24-7-solutions.net/pub/mysql/
- nam-US: ftp://mirrors.24-7-solutions.net/pub/mysql/
- nam-US: http://www.stathy.com/mysql/
- nam-US: ftp://www.stathy.com/mysql/
- nam-US: http://mirror.x10.com/mirror/mysql/
- nam-US: ftp://mirror.x10.com/mysql/
sam-AR: http://mysql.localhost.net.ar/
- sam-BR: http://www.linorg.usp.br/mysql/
- sam-BR: ftp://ftp.linorg.usp.br/mysql/
sam-BR: ftp://ftp.pucpr.br/mysql/
sam-BR: http://mirrors.uol.com.br/pub/mysql/
sam-CL: http://mysql.vision.cl/
@@ -160,48 +159,52 @@
<<
# Patch Phase
PatchFile: %n.patch
-PatchFile-MD5: 30355e41bfbe7d51b37336dd65c5eb6a
+PatchFile-MD5: 1be31b59410b879aca5d986127a3de06
PatchScript: /usr/bin/sed "s|@PREFIX@|%p|g" %{PatchFile} | /usr/bin/patch -p1
# Compile Phase:
-SetCFLAGS: -O3 -fomit-frame-pointer
-SetCXXFLAGS: -O3 -fomit-frame-pointer -felide-constructors -fno-exceptions
-fno-rtti
+# See BUILD/compile-ppc-max
+SetCFLAGS: -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W
-Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings
-Wunused -O3 -fno-omit-frame-pointer -g
+SetCXXFLAGS: -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W
-Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings
-Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy
-Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3
-fno-omit-frame-pointer -g
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 \
+ --enable-assembler \
+ --with-extra-charsets=complex \
+ --enable-thread-safe-client \
+ --with-big-tables \
--with-innodb \
+ --with-archive-storage-engine \
+ --with-big-tables \
+ --with-blackhole-storage-engine \
+ --with-federated-storage-engine \
+ --with-csv-storage-engine \
+ --with-embedded-server \
+ --enable-local-infile \
+ \
--without-readline \
+ --disable-dependency-tracking \
--with-mysqld-user=mysql \
- --with-extra-charsets=complex \
+ --with-openssl \
+ \
--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
+ --sysconfdir=%p/etc
<<
+# --with-ndbcluster \
+# --with-yassl \
GCC: 4.0
InfoTest: <<
- TestScript: make test || exit 2
+ TestScript: [[ "$UID" -eq 0 ]] && { chown -R nobody. ./mysql-test &&
/usr/bin/sudo -u nobody make test-force || exit 2; } || { make test-force ||
exit 2; }
<<
# 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
ln -s mysql/libmysqlclient.la %i/lib
ln -s mysql/libmysqlclient.a %i/lib
ln -s mysql/libmysqlclient.dylib %i/lib
@@ -269,6 +272,8 @@
# Build Phase:
InfoDocs: mysql.info
PostInstScript: <<
+ /usr/bin/install -o mysql -g mysql -m 700 -d %p/var/mysql
+
# determine directory where databases are living
data_dir=$(my_print_defaults mysqld | grep datadir | cut -d= -f2)
if [ -z "$data_dir" ]; then
@@ -345,5 +350,15 @@
The 'without-readline' configure flag needs to be there to use the
readline from fink instead of the bundled copy.
+
+Known problem:
+
+"make test-force" script reports fails on testing with some SSL-
+related test cases. It doesn't seem to have such failure when
+compiled with --with-yassl. If you face problem with SSL feature,
+please try recompile with --with-yassl and see if it helps.
+
+(Of cource, you can download MySQL AB's official binary which is
+compiled with statically linked yaSSL.)
<<
Homepage: http://www.mysql.com/
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
