wok rev 13187
Up: mysql to 5.5.27.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Fri Aug 03 08:06:59 2012 +0000 (2012-08-03) |
| parents | a8fcb4e54df0 |
| children | 90bf9e9c31ca |
| files | libmysqlclient/receipt mysql-client/receipt mysql-dev/receipt mysql-test/receipt mysql/receipt mysql/stuff/etc/mysql/my.cnf mysql/stuff/mysql-client.files-list |
line diff
1.1 --- a/libmysqlclient/receipt Fri Aug 03 13:19:54 2012 +0200 1.2 +++ b/libmysqlclient/receipt Fri Aug 03 08:06:59 2012 +0000 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="libmysqlclient" 1.7 -VERSION="5.1.54" 1.8 +VERSION="5.5.27" 1.9 CATEGORY="misc" 1.10 SHORT_DESC="SQL database system client libraries." 1.11 MAINTAINER="pascal.bellard@slitaz.org" 1.12 @@ -12,13 +12,7 @@ 1.13 # Rules to gen a SliTaz package suitable for Tazpkg. 1.14 genpkg_rules() 1.15 { 1.16 - mkdir -p $fs/usr/lib/mysql 1.17 - cp -a $_pkg/usr/lib/mysql/libmysqlclient*so* $fs/usr/lib/mysql 1.18 - cd $fs/usr/lib 1.19 - ln -s mysql/libmysqlclient.so . 1.20 - ln -s mysql/libmysqlclient.so.16 . 1.21 - ln -s mysql/libmysqlclient.so.16.0.0 . 1.22 - ln -s mysql/libmysqlclient_r.so . 1.23 - ln -s mysql/libmysqlclient_r.so.16 . 1.24 - ln -s mysql/libmysqlclient_r.so.16.0.0 . 1.25 + mkdir -p $fs/usr/lib 1.26 + cp -a $install/usr/lib/libmysqlclient*so* $fs/usr/lib 1.27 } 1.28 +
2.1 --- a/mysql-client/receipt Fri Aug 03 13:19:54 2012 +0200 2.2 +++ b/mysql-client/receipt Fri Aug 03 08:06:59 2012 +0000 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="mysql-client" 2.7 -VERSION="5.1.54" 2.8 +VERSION="5.5.27" 2.9 CATEGORY="office" 2.10 SHORT_DESC="SQL database system client files." 2.11 MAINTAINER="pascal.bellard@slitaz.org" 2.12 @@ -16,6 +16,6 @@ 2.13 while read file; do 2.14 dir=$(dirname $file) 2.15 [ -d $fs$dir ] || mkdir -p $fs$dir 2.16 - cp -a $_pkg$file $fs$file 2.17 + cp -a $install$file $fs$file 2.18 done < $wanted_stuff/$PACKAGE.files-list 2.19 }
3.1 --- a/mysql-dev/receipt Fri Aug 03 13:19:54 2012 +0200 3.2 +++ b/mysql-dev/receipt Fri Aug 03 08:06:59 2012 +0000 3.3 @@ -1,11 +1,11 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="mysql-dev" 3.7 -VERSION="5.1.54" 3.8 +VERSION="5.5.27" 3.9 CATEGORY="development" 3.10 SHORT_DESC="SQL database system devel files." 3.11 MAINTAINER="pascal.bellard@slitaz.org" 3.12 -DEPENDS="zlib" 3.13 +DEPENDS="libmysqlclient zlib" 3.14 WEB_SITE="http://www.mysql.com/" 3.15 WANTED="mysql" 3.16 3.17 @@ -13,13 +13,10 @@ 3.18 genpkg_rules() 3.19 { 3.20 mkdir -p $fs/usr/lib/mysql/plugin $fs/usr/share 3.21 - cp -a $_pkg/usr/include $fs/usr 3.22 - cp -a $_pkg/usr/share/aclocal $fs/usr/share 3.23 - cp -a $_pkg/usr/lib/mysql/*.*a $fs/usr/lib/mysql 3.24 - cp -a $_pkg/usr/lib/mysql/plugin/*.*a $fs/usr/lib/mysql/plugin 3.25 + cp -a $install/usr/include $fs/usr 3.26 while read file; do 3.27 dir=$(dirname $file) 3.28 [ -d $fs$dir ] || mkdir -p $fs$dir 3.29 - cp -a $_pkg$file $fs$file 3.30 + cp -a $install$file $fs$file 3.31 done < $wanted_stuff/$PACKAGE.files-list 3.32 }
4.1 --- a/mysql-test/receipt Fri Aug 03 13:19:54 2012 +0200 4.2 +++ b/mysql-test/receipt Fri Aug 03 08:06:59 2012 +0000 4.3 @@ -1,7 +1,7 @@ 4.4 # SliTaz package receipt. 4.5 4.6 PACKAGE="mysql-test" 4.7 -VERSION="5.1.54" 4.8 +VERSION="5.5.27" 4.9 CATEGORY="misc" 4.10 SHORT_DESC="SQL database system tests and benchs." 4.11 MAINTAINER="pascal.bellard@slitaz.org" 4.12 @@ -13,14 +13,12 @@ 4.13 genpkg_rules() 4.14 { 4.15 mkdir -p $fs/usr/share 4.16 - cp -a $_pkg/usr/mysql-test $fs/usr 4.17 - cp -a $_pkg/usr/sql-bench $fs/usr 4.18 - find $fs/usr/mysql-test $fs/usr/sql-bench -type d -exec chmod 2777 {} \; 4.19 + cp -a $install/usr/mysql-test $fs/usr/share/mysql-test 4.20 + cp -a $install/usr/sql-bench $fs/usr/share/sql-bench 4.21 + find $fs/usr/share/mysql-test $fs/usr/share/sql-bench -type d -exec chmod 2777 {} \; 4.22 while read file; do 4.23 dir=$(dirname $file) 4.24 [ -d $fs$dir ] || mkdir -p $fs$dir 4.25 - cp -a $_pkg$file $fs$file 4.26 + cp -a $install$file $fs$file 4.27 done < $wanted_stuff/$PACKAGE.files-list 4.28 - mv $fs/usr/mysql-test $fs/usr/share/mysql-test 4.29 - mv $fs/usr/sql-bench $fs/usr/share/sql-bench 4.30 }
5.1 --- a/mysql/receipt Fri Aug 03 13:19:54 2012 +0200 5.2 +++ b/mysql/receipt Fri Aug 03 08:06:59 2012 +0000 5.3 @@ -1,43 +1,62 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="mysql" 5.7 -VERSION="5.1.54" 5.8 +VERSION="5.5.27" 5.9 CATEGORY="office" 5.10 SHORT_DESC="SQL database system." 5.11 MAINTAINER="pascal.bellard@slitaz.org" 5.12 TARBALL="$PACKAGE-$VERSION.tar.gz" 5.13 WEB_SITE="http://www.mysql.com/" 5.14 -WGET_URL="http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.1/$TARBALL" 5.15 +WGET_URL="ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.5/$TARBALL" 5.16 CONFIG_FILES="/etc/mysql/my.cnf" 5.17 DATABASE_FILES="/var/lib/mysql" 5.18 CROSS="bug: can not run test programm" 5.19 5.20 DEPENDS="busybox libmysqlclient mysql-client zlib slitaz-base-files \ 5.21 -gcc-lib-base" 5.22 +gcc-lib-base openssl readline" 5.23 +BUILD_DEPENDS="cmake openssl-dev zlib-dev ncurses-dev readline-dev" 5.24 5.25 # Rules to configure and make the package. 5.26 compile_rules() 5.27 { 5.28 - 5.29 - cd $src 5.30 - grep -q skip_do_abi_check Makefile.am || 5.31 - sed -i 's/^do_abi_check/&:\n\techo "Skipping &"\n\nreally_&/' Makefile.* 5.32 - ./configure \ 5.33 - --prefix=/usr \ 5.34 - --infodir=/usr/share/info \ 5.35 - --datadir=/usr/share \ 5.36 - --localstatedir=/var/lib/mysql \ 5.37 - --sysconfdir=/etc/mysql \ 5.38 - --libexecdir=/usr/sbin \ 5.39 - --with-unix-socket-path=/var/run/mysqld/mysqld.sock \ 5.40 - --with-mysqld-user=mysql \ 5.41 - --enable-thread-safe-client \ 5.42 - --with-plugins=innobase,innodb_plugin \ 5.43 - --mandir=/usr/share/man \ 5.44 - --build=$HOST_SYSTEM \ 5.45 - --host=$HOST_SYSTEM && 5.46 - make $MAKEFLAGS && 5.47 - make install 5.48 + mkdir -p $WOK/$PACKAGE/source/build 5.49 + cd $WOK/$PACKAGE/source/build 5.50 + # CFLAGS/CXXFLAGS as suggested upstream 5.51 + CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ 5.52 + CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ 5.53 + cmake ../$PACKAGE-$VERSION \ 5.54 + -DCMAKE_BUILD_TYPE=Release \ 5.55 + -DCMAKE_INSTALL_PREFIX=/usr \ 5.56 + -DSYSCONFDIR=/etc/mysql \ 5.57 + -DMYSQL_DATADIR=/var/lib/mysql \ 5.58 + -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ 5.59 + -DDEFAULT_CHARSET=utf8 \ 5.60 + -DDEFAULT_COLLATION=utf8_general_ci \ 5.61 + -DENABLED_LOCAL_INFILE=ON \ 5.62 + -DINSTALL_INFODIR=share/mysql/docs \ 5.63 + -DINSTALL_MANDIR=share/man \ 5.64 + -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \ 5.65 + -DINSTALL_SCRIPTDIR=bin \ 5.66 + -DINSTALL_INCLUDEDIR=include/mysql \ 5.67 + -DINSTALL_DOCREADMEDIR=share/mysql \ 5.68 + -DINSTALL_SUPPORTFILESDIR=share/mysql \ 5.69 + -DINSTALL_MYSQLSHAREDIR=share/mysql \ 5.70 + -DINSTALL_DOCDIR=share/mysql/docs \ 5.71 + -DINSTALL_SHAREDIR=share/mysql \ 5.72 + -DWITH_READLINE=ON \ 5.73 + -DWITH_ZLIB=system \ 5.74 + -DWITH_SSL=system \ 5.75 + -DWITH_LIBWRAP=OFF \ 5.76 + -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ 5.77 + -DWITH_EXTRA_CHARSETS=complex \ 5.78 + -DWITH_EMBEDDED_SERVER=ON \ 5.79 + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ 5.80 + -DWITH_PARTITION_STORAGE_ENGINE=1 \ 5.81 + -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ 5.82 + -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ 5.83 + -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ 5.84 + -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 && 5.85 + make && make DESTDIR=$DESTDIR install 5.86 } 5.87 5.88 # Rules to gen a SliTaz package suitable for Tazpkg. 5.89 @@ -52,14 +71,12 @@ 5.90 $fs/var/run/mysqld 5.91 5.92 cp -a $install/usr/bin $fs/usr 5.93 - cp -a $install/usr/sbin $fs/usr 5.94 cp -a $install/usr/lib/mysql/plugin/*.so* $fs/usr/lib/mysql/plugin 5.95 cp -a $install/usr/share/mysql $fs/usr/share 5.96 5.97 # Configuration file 5.98 cp -a $stuff/etc/init.d $fs/etc 5.99 - cp -a $src/support-files/my-medium.cnf $fs/etc/mysql/my.cnf 5.100 - cp -a $src/support-files/my-small.cnf $fs/etc/mysql 5.101 + cp -a $stuff/etc/mysql $fs/etc 5.102 grep -q "bind-address" $fs/etc/mysql/my.cnf || sed -i \ 5.103 's/^\[mysqld\]/[mysqld]\nbind-address\t= 127.0.0.1/' \ 5.104 $fs/etc/mysql/my.cnf 5.105 @@ -89,9 +106,16 @@ 5.106 chroot $1/ adduser -s /bin/false -S -D -H -G $group $user 5.107 status 5.108 fi 5.109 - 5.110 - chroot $1/ chown -R ${user}.${group} /var/lib/mysql /var/run/mysqld 5.111 - 5.112 + # adduser mysql if needed 5.113 + if ! grep -q ${user} $1/etc/passwd; then 5.114 + echo -n "Adding user MySQL..." 5.115 + chroot $1/ /bin/adduser -s /bin/false -h /dev/null \ 5.116 + -g "MySQL Daemon user" -u 27 -H -D -S -G ${group} ${user} 5.117 + status 5.118 + fi 5.119 + #chroot $1/ /bin/chown ${user}.${group} $(cat $1/$INSTALLED/$PACKAGE/files.list) 5.120 + chroot "$1/" /bin/chown -R ${user}.${group} /var/lib/mysql /var/run/mysqld 5.121 + chroot "$1/" mysql_install_db --user=${user} --basedir=/usr 5.122 cat <<EOF 5.123 ---- 5.124 To start $PACKAGE server you can run : 5.125 @@ -113,6 +137,6 @@ 5.126 5.127 post_remove() 5.128 { 5.129 - echo "Removing user/group squid" 5.130 - deluser mysql 5.131 + echo "Removing user/group mysql" 5.132 + chroot "$1/" deluser mysql 5.133 }
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/mysql/stuff/etc/mysql/my.cnf Fri Aug 03 08:06:59 2012 +0000 6.3 @@ -0,0 +1,145 @@ 6.4 +# MySQL config file for medium systems. 6.5 +# 6.6 +# This is for a system with little memory (32M - 64M) where MySQL plays 6.7 +# an important part, or systems up to 128M where MySQL is used together with 6.8 +# other programs (such as a web server) 6.9 +# 6.10 +# MySQL programs look for option files in a set of 6.11 +# locations which depend on the deployment platform. 6.12 +# You can copy this option file to one of those 6.13 +# locations. For information about these locations, see: 6.14 +# http://dev.mysql.com/doc/mysql/en/option-files.html 6.15 +# 6.16 +# In this file, you can use all long options that a program supports. 6.17 +# If you want to know which options a program supports, run the program 6.18 +# with the "--help" option. 6.19 + 6.20 +# The following options will be passed to all MySQL clients 6.21 +[client] 6.22 +#password = your_password 6.23 +port = 3306 6.24 +socket = /var/run/mysqld/mysqld.sock 6.25 + 6.26 +# Here follows entries for some specific programs 6.27 + 6.28 +# The MySQL server 6.29 +[mysqld] 6.30 +port = 3306 6.31 +socket = /var/run/mysqld/mysqld.sock 6.32 +datadir = /var/lib/mysql 6.33 +skip-external-locking 6.34 +key_buffer_size = 16M 6.35 +max_allowed_packet = 1M 6.36 +table_open_cache = 64 6.37 +sort_buffer_size = 512K 6.38 +net_buffer_length = 8K 6.39 +read_buffer_size = 256K 6.40 +read_rnd_buffer_size = 512K 6.41 +myisam_sort_buffer_size = 8M 6.42 + 6.43 +# Don't listen on a TCP/IP port at all. This can be a security enhancement, 6.44 +# if all processes that need to connect to mysqld run on the same host. 6.45 +# All interaction with mysqld must be made via Unix sockets or named pipes. 6.46 +# Note that using this option without enabling named pipes on Windows 6.47 +# (via the "enable-named-pipe" option) will render mysqld useless! 6.48 +# 6.49 +skip-networking 6.50 + 6.51 +# Replication Master Server (default) 6.52 +# binary logging is required for replication 6.53 +log-bin=mysql-bin 6.54 + 6.55 +# binary logging format - mixed recommended 6.56 +binlog_format=mixed 6.57 + 6.58 +# required unique id between 1 and 2^32 - 1 6.59 +# defaults to 1 if master-host is not set 6.60 +# but will not function as a master if omitted 6.61 +server-id = 1 6.62 + 6.63 +# Replication Slave (comment out master section to use this) 6.64 +# 6.65 +# To configure this host as a replication slave, you can choose between 6.66 +# two methods : 6.67 +# 6.68 +# 1) Use the CHANGE MASTER TO command (fully described in our manual) - 6.69 +# the syntax is: 6.70 +# 6.71 +# CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>, 6.72 +# MASTER_USER=<user>, MASTER_PASSWORD=<password> ; 6.73 +# 6.74 +# where you replace <host>, <user>, <password> by quoted strings and 6.75 +# <port> by the master's port number (3306 by default). 6.76 +# 6.77 +# Example: 6.78 +# 6.79 +# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, 6.80 +# MASTER_USER='joe', MASTER_PASSWORD='secret'; 6.81 +# 6.82 +# OR 6.83 +# 6.84 +# 2) Set the variables below. However, in case you choose this method, then 6.85 +# start replication for the first time (even unsuccessfully, for example 6.86 +# if you mistyped the password in master-password and the slave fails to 6.87 +# connect), the slave will create a master.info file, and any later 6.88 +# change in this file to the variables' values below will be ignored and 6.89 +# overridden by the content of the master.info file, unless you shutdown 6.90 +# the slave server, delete master.info and restart the slaver server. 6.91 +# For that reason, you may want to leave the lines below untouched 6.92 +# (commented) and instead use CHANGE MASTER TO (see above) 6.93 +# 6.94 +# required unique id between 2 and 2^32 - 1 6.95 +# (and different from the master) 6.96 +# defaults to 2 if master-host is set 6.97 +# but will not function as a slave if omitted 6.98 +#server-id = 2 6.99 +# 6.100 +# The replication master for this slave - required 6.101 +#master-host = <hostname> 6.102 +# 6.103 +# The username the slave will use for authentication when connecting 6.104 +# to the master - required 6.105 +#master-user = <username> 6.106 +# 6.107 +# The password the slave will authenticate with when connecting to 6.108 +# the master - required 6.109 +#master-password = <password> 6.110 +# 6.111 +# The port the master is listening on. 6.112 +# optional - defaults to 3306 6.113 +#master-port = <port> 6.114 +# 6.115 +# binary logging - not required for slaves, but recommended 6.116 +#log-bin=mysql-bin 6.117 + 6.118 +# Uncomment the following if you are using InnoDB tables 6.119 +#innodb_data_home_dir = /var/lib/mysql 6.120 +#innodb_data_file_path = ibdata1:10M:autoextend 6.121 +#innodb_log_group_home_dir = /var/lib/mysql 6.122 +# You can set .._buffer_pool_size up to 50 - 80 % 6.123 +# of RAM but beware of setting memory usage too high 6.124 +#innodb_buffer_pool_size = 16M 6.125 +#innodb_additional_mem_pool_size = 2M 6.126 +# Set .._log_file_size to 25 % of buffer pool size 6.127 +#innodb_log_file_size = 5M 6.128 +#innodb_log_buffer_size = 8M 6.129 +#innodb_flush_log_at_trx_commit = 1 6.130 +#innodb_lock_wait_timeout = 50 6.131 + 6.132 +[mysqldump] 6.133 +quick 6.134 +max_allowed_packet = 16M 6.135 + 6.136 +[mysql] 6.137 +no-auto-rehash 6.138 +# Remove the next comment character if you are not familiar with SQL 6.139 +#safe-updates 6.140 + 6.141 +[myisamchk] 6.142 +key_buffer_size = 20M 6.143 +sort_buffer_size = 20M 6.144 +read_buffer = 2M 6.145 +write_buffer = 2M 6.146 + 6.147 +[mysqlhotcopy] 6.148 +interactive-timeout
7.1 --- a/mysql/stuff/mysql-client.files-list Fri Aug 03 13:19:54 2012 +0200 7.2 +++ b/mysql/stuff/mysql-client.files-list Fri Aug 03 08:06:59 2012 +0000 7.3 @@ -1,6 +1,25 @@ 7.4 +/usr/bin/innochecksum 7.5 /usr/bin/msql2mysql 7.6 /usr/bin/mysql 7.7 +/usr/bin/myisamchk 7.8 +/usr/bin/myisamlog 7.9 +/usr/bin/myisampack 7.10 +/usr/bin/myisam_ftdump 7.11 +/usr/bin/mysqlaccess 7.12 +/usr/bin/mysqlbinlog 7.13 +/usr/bin/mysqlbug 7.14 +/usr/bin/mysqld 7.15 +/usr/bin/mysqldumpslow 7.16 +/usr/bin/mysqld_multi 7.17 +/usr/bin/mysqld_safe 7.18 +/usr/bin/mysqlhotcopy 7.19 +/usr/bin/mysql_convert_table_format 7.20 /usr/bin/mysql_find_rows 7.21 +/usr/bin/mysql_fix_extensions 7.22 +/usr/bin/mysql_install_db 7.23 +/usr/bin/mysql_secure_installation 7.24 +/usr/bin/mysql_tzinfo_to_sql 7.25 +/usr/bin/mysql_upgrade 7.26 /usr/bin/mysql_waitpid 7.27 /usr/bin/mysqlaccess 7.28 /usr/bin/mysqladmin 7.29 @@ -9,3 +28,9 @@ 7.30 /usr/bin/mysqldump 7.31 /usr/bin/mysqlimport 7.32 /usr/bin/mysqlshow 7.33 +/usr/bin/mysql_zap 7.34 +/usr/bin/my_print_defaults 7.35 +/usr/bin/perror 7.36 +/usr/bin/replace 7.37 +/usr/bin/resolveip 7.38 +/usr/bin/resolve_stack_dump