Update of /cvsroot/fink/experimental/asari
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21197
Modified Files:
mysql.info mysql.patch
Log Message:
Version bumped.
Index: mysql.patch
===================================================================
RCS file: /cvsroot/fink/experimental/asari/mysql.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mysql.patch 10 Feb 2007 14:14:06 -0000 1.8
+++ mysql.patch 19 Mar 2007 05:24:51 -0000 1.9
@@ -54,11 +54,3 @@
if test -z "$MYSQL_HOME"
then
-# 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.
-# User: kent
-# Host: kent-amd64.(none)
-# Root: /home/kent/bk/main/mysql-5.0
Index: mysql.info
===================================================================
RCS file: /cvsroot/fink/experimental/asari/mysql.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- mysql.info 10 Feb 2007 14:14:06 -0000 1.17
+++ mysql.info 19 Mar 2007 05:24:51 -0000 1.18
@@ -1,19 +1,23 @@
-Package: mysql
-Version: 5.0.34
+Info2:<<
+Package: mysql%type_pkg[-ssl]
+Version: 5.0.37
Revision: 1001
Description: Open Source SQL database
License: GPL/LGPL
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
+Type: -ssl (.)
# Dependencies:
-Depends: %N15-shlibs (= %v-%r), %N-client (= %v-%r), daemonic (>= 20010902-1),
passwd
-BuildDepends: readline5 (>= 5.0-1004), system-openssl-dev, fink (>= 0.24.12)
+Depends: %N15-shlibs (= %v-%r), %N-client (= %v-%r), daemonic (>= 20010902-1)
+BuildDepends: readline5 (>= 5.0-1004), fink (>= 0.25)
+Conflicts: %{Ni}, %{Ni}-ssl
+Replaces: %{Ni}, %{Ni}-ssl
# Unpack Phase:
-# Source: mirror:custom:Downloads/MySQL-5.0/%n-%v.tar.gz
+Source: mirror:custom:Downloads/MySQL-5.0/%{ni}-%v.tar.gz
# For Enterprise Server
-Source: ftp://ftp.%n.com/pub/%n/src/%n-%v.tar.gz
-Source-MD5: 043c8cb8820b6d1fb67d679e54daba5d
+# Source: ftp://ftp.%{ni}.com/pub/%{ni}/src/%{ni}-%v.tar.gz
+Source-MD5: 26ed76facb58bdeae40c8310e337dde2
CustomMirror: <<
# Some country codes not in /sw/lib/fink/mirror/_keys
eur-AM: http://mysql.mirrors.arminco.com/
@@ -158,16 +162,14 @@
afr-ZA: ftp://ftp.is.co.za/mirrors/mysql/
<<
# Patch Phase
-PatchFile: %n.patch
-PatchFile-MD5: d68460700951bf289a28ae6a5ad7ab26
+PatchFile: %{ni}.patch
+PatchFile-MD5: a8deb268b18c5cd38be857c9290562fc
PatchScript: /usr/bin/sed "s|@PREFIX@|%p|g" %{PatchFile} | /usr/bin/patch -p1
# Compile Phase:
# 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
SetMAKEFLAGS: -j1
ConfigureParams: <<
--enable-assembler \
@@ -182,11 +184,12 @@
--with-csv-storage-engine \
--with-embedded-server \
--enable-local-infile \
+ --with-ndbcluster \
\
--without-readline \
--disable-dependency-tracking \
--with-mysqld-user=mysql \
- --with-openssl \
+ (%type_pkg[-ssl]) --with-yassl \
\
--mandir=%p/share/man \
--infodir=%p/share/info \
@@ -194,8 +197,6 @@
--libexecdir=%p/sbin \
--sysconfdir=%p/etc
<<
-# --with-ndbcluster \
-# --with-yassl \
GCC: 4.0
InfoTest: <<
@@ -208,14 +209,17 @@
ln -s mysql/libmysqlclient.la %i/lib
ln -s mysql/libmysqlclient.a %i/lib
ln -s mysql/libmysqlclient.dylib %i/lib
+
+ # Remove %p/bin/test, which is also included in coreutils.
+ rm -f %i/bin/test
<<
SplitOff: <<
Description: Open Source SQL database - Development headers and libraries
Package: %N15-dev
Depends: %N15-shlibs (= %v-%r)
BuildDependsOnly: True
- Replaces: mysql (<= 3.23.56-1), mysql-dev, mysql12-dev, mysql14-dev
- Conflicts: mysql (<= 3.23.56-1), mysql-dev, mysql12-dev, mysql14-dev
+ Conflicts: %{Ni} (<= 3.23.56-1), %{Ni}-dev, %{Ni}12-dev, %{Ni}14-dev,
%{Ni}15-dev, %{Ni}-ssl15-dev
+ Replaces: %{Ni} (<= 5.0.34-1006), %{Ni}-dev, %{Ni}12-dev, %{Ni}14-dev,
%{Ni}15-dev, %{Ni}-ssl15-dev
Files: <<
include
lib/mysql/*.a
@@ -224,13 +228,15 @@
lib/mysql/libmysqlclient_r.dylib
bin/mysql_config
lib/libmysqlclient.*
+ share/man/man1/mysql_config.1
<<
DocFiles: README COPYING
<<
SplitOff2: <<
Description: Open Source SQL database - Shared libraries
Package: %N15-shlibs
- Replaces: mysql (<= 3.23.51-1)
+ Conflicts: %{Ni}15-shlibs, %{Ni}-ssl15-shilbs
+ Replaces: %{Ni} (<= 3.23.51-1), %{Ni}15-shlibs, %{Ni}-ssl15-shilbs
Files: <<
lib/mysql/libmysqlclient.15.0.0.dylib
lib/mysql/libmysqlclient.15.dylib
@@ -247,10 +253,18 @@
Description: Open Source SQL database - Client
Package: %N-client
Depends: %N15-shlibs (= %v-%r), readline5-shlibs (>= 5.0-1004)
- Conflicts: mysql (<= 3.23.54a-2)
+ Conflicts: %{Ni} (<= 3.23.54a-2), %{Ni}-client, %{Ni}-ssl-client
+ Replaces: %{Ni} (<= 5.0.34-1006), %{Ni}-client, %{Ni}-ssl-client
Files: <<
+ bin/myisam_ftdump
bin/mysql
+ bin/mysql_client_test
+ bin/mysql_client_test_embedded
+ bin/mysql_explain_log
bin/mysql_find_rows
+ bin/mysql_fix_extensions
+ bin/mysql_tableinfo
+ bin/mysql_waitpid
bin/mysqlaccess
bin/mysqladmin
bin/mysqlbug
@@ -259,15 +273,23 @@
bin/mysqldumpslow
bin/mysqlimport
bin/mysqlshow
+ bin/mysqltest_embedded
+ bin/mysqltestmanager
+ bin/mysqltestmanager-pwgen
+ bin/mysqltestmanagerc
share/man/man1/mysql.1
- share/man/man1/mysqlaccess.1
share/man/man1/mysqladmin.1
+ share/man/man1/mysqlcheck.1
share/man/man1/mysqldump.1
+ share/man/man1/mysqlimport.1
share/man/man1/mysqlshow.1
+ share/man/man1/myisam_ftdump.1
+ share/man/man1/mysql_explain_log.1
+ share/man/man8/mysqlmanager.8
<<
DocFiles: README COPYING
<<
-DocFiles: README COPYING Docs/INSTALL-BINARY
+DocFiles: README COPYING
# Build Phase:
InfoDocs: mysql.info
@@ -294,12 +316,13 @@
daemonic remove mysql
fi
<<
+DaemonicName: mysql
DaemonicFile: <<
<service>
<description>MySQL database server</description>
<message>MySQL database server</message>
-<daemon name="mysqld">
+<daemon name="mysql">
<executable background="yes">%p/bin/mysqld_safe</executable>
</daemon>
@@ -351,19 +374,10 @@
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.)
-
It is being considered that installation directory for MySQL from
%p to %p/lib/mysql, in order to avoid having utility programs
like "perror", or "replace" in %p/bin. Maybe their names are too
much neutral.
<<
-Homepage: http://www.mysql.com/
+Homepage: http://dev.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
