From 8576536d44d66528e8a945d1ecef8577afd8dacf Mon Sep 17 00:00:00 2001 From: Juergen Daubert Date: Sat, 13 Jun 2009 23:15:46 +0200 Subject: [PATCH] mysql: update to 5.1.35 --- mysql/.footprint | 75 ++++++++++++++++++++++++++++++++++------------- mysql/.md5sum | 4 +-- mysql/Pkgfile | 24 +++++++-------- mysql/README | 14 ++++++--- mysql/my.cnf | 2 +- mysql/pre-install | 6 ++++ 6 files changed, 85 insertions(+), 40 deletions(-) create mode 100644 mysql/pre-install diff --git a/mysql/.footprint b/mysql/.footprint index c58ba089f..9903c7469 100644 --- a/mysql/.footprint +++ b/mysql/.footprint @@ -6,7 +6,6 @@ drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/mysqld drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/comp_err -rwxr-xr-x root/root usr/bin/innochecksum -rwxr-xr-x root/root usr/bin/msql2mysql -rwxr-xr-x root/root usr/bin/my_print_defaults @@ -18,17 +17,14 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/mysql_client_test -rwxr-xr-x root/root usr/bin/mysql_config -rwxr-xr-x root/root usr/bin/mysql_convert_table_format --rwxr-xr-x root/root usr/bin/mysql_explain_log -rwxr-xr-x root/root usr/bin/mysql_find_rows -rwxr-xr-x root/root usr/bin/mysql_fix_extensions -rwxr-xr-x root/root usr/bin/mysql_fix_privilege_tables -rwxr-xr-x root/root usr/bin/mysql_install_db -rwxr-xr-x root/root usr/bin/mysql_secure_installation -rwxr-xr-x root/root usr/bin/mysql_setpermission --rwxr-xr-x root/root usr/bin/mysql_tableinfo -rwxr-xr-x root/root usr/bin/mysql_tzinfo_to_sql -rwxr-xr-x root/root usr/bin/mysql_upgrade --rwxr-xr-x root/root usr/bin/mysql_upgrade_shell -rwxr-xr-x root/root usr/bin/mysql_waitpid -rwxr-xr-x root/root usr/bin/mysql_zap -rwxr-xr-x root/root usr/bin/mysqlaccess @@ -43,10 +39,8 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/mysqlhotcopy -rwxr-xr-x root/root usr/bin/mysqlimport -rwxr-xr-x root/root usr/bin/mysqlshow +-rwxr-xr-x root/root usr/bin/mysqlslap -rwxr-xr-x root/root usr/bin/mysqltest --rwxr-xr-x root/root usr/bin/mysqltestmanager --rwxr-xr-x root/root usr/bin/mysqltestmanager-pwgen --rwxr-xr-x root/root usr/bin/mysqltestmanagerc -rwxr-xr-x root/root usr/bin/perror -rwxr-xr-x root/root usr/bin/replace -rwxr-xr-x root/root usr/bin/resolve_stack_dump @@ -78,7 +72,7 @@ drwxr-xr-x root/root usr/include/mysql/ -rw-r--r-- root/root usr/include/mysql/mysql_version.h -rw-r--r-- root/root usr/include/mysql/mysqld_ername.h -rw-r--r-- root/root usr/include/mysql/mysqld_error.h --rw-r--r-- root/root usr/include/mysql/raid.h +-rw-r--r-- root/root usr/include/mysql/plugin.h -rw-r--r-- root/root usr/include/mysql/sql_common.h -rw-r--r-- root/root usr/include/mysql/sql_state.h -rw-r--r-- root/root usr/include/mysql/sslopt-case.h @@ -93,23 +87,53 @@ drwxr-xr-x root/root usr/lib/mysql/ -rw-r--r-- root/root usr/lib/mysql/libmyisammrg.a -rw-r--r-- root/root usr/lib/mysql/libmysqlclient.a -rwxr-xr-x root/root usr/lib/mysql/libmysqlclient.la -lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient.so -> libmysqlclient.so.15.0.0 -lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient.so.15 -> libmysqlclient.so.15.0.0 --rwxr-xr-x root/root usr/lib/mysql/libmysqlclient.so.15.0.0 +lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient.so -> libmysqlclient.so.16.0.0 +lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient.so.16 -> libmysqlclient.so.16.0.0 +-rwxr-xr-x root/root usr/lib/mysql/libmysqlclient.so.16.0.0 -rw-r--r-- root/root usr/lib/mysql/libmysqlclient_r.a -rwxr-xr-x root/root usr/lib/mysql/libmysqlclient_r.la -lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient_r.so -> libmysqlclient_r.so.15.0.0 -lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient_r.so.15 -> libmysqlclient_r.so.15.0.0 --rwxr-xr-x root/root usr/lib/mysql/libmysqlclient_r.so.15.0.0 +lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient_r.so -> libmysqlclient_r.so.16.0.0 +lrwxrwxrwx root/root usr/lib/mysql/libmysqlclient_r.so.16 -> libmysqlclient_r.so.16.0.0 +-rwxr-xr-x root/root usr/lib/mysql/libmysqlclient_r.so.16.0.0 -rw-r--r-- root/root usr/lib/mysql/libmystrings.a -rw-r--r-- root/root usr/lib/mysql/libmysys.a -rw-r--r-- root/root usr/lib/mysql/libvio.a +drwxr-xr-x root/root usr/lib/mysql/plugin/ +-rw-r--r-- root/root usr/lib/mysql/plugin/ha_archive.a +-rwxr-xr-x root/root usr/lib/mysql/plugin/ha_archive.la +lrwxrwxrwx root/root usr/lib/mysql/plugin/ha_archive.so -> ha_archive.so.0.0.0 +lrwxrwxrwx root/root usr/lib/mysql/plugin/ha_archive.so.0 -> ha_archive.so.0.0.0 +-rwxr-xr-x root/root usr/lib/mysql/plugin/ha_archive.so.0.0.0 +-rw-r--r-- root/root usr/lib/mysql/plugin/ha_blackhole.a +-rwxr-xr-x root/root usr/lib/mysql/plugin/ha_blackhole.la +lrwxrwxrwx root/root usr/lib/mysql/plugin/ha_blackhole.so -> ha_blackhole.so.0.0.0 +lrwxrwxrwx root/root usr/lib/mysql/plugin/ha_blackhole.so.0 -> ha_blackhole.so.0.0.0 +-rwxr-xr-x root/root usr/lib/mysql/plugin/ha_blackhole.so.0.0.0 +-rw-r--r-- root/root usr/lib/mysql/plugin/ha_example.a +-rwxr-xr-x root/root usr/lib/mysql/plugin/ha_example.la +lrwxrwxrwx root/root usr/lib/mysql/plugin/ha_example.so -> ha_example.so.0.0.0 +lrwxrwxrwx root/root usr/lib/mysql/plugin/ha_example.so.0 -> ha_example.so.0.0.0 +-rwxr-xr-x root/root usr/lib/mysql/plugin/ha_example.so.0.0.0 +-rw-r--r-- root/root usr/lib/mysql/plugin/ha_federated.a +-rwxr-xr-x root/root usr/lib/mysql/plugin/ha_federated.la +lrwxrwxrwx root/root usr/lib/mysql/plugin/ha_federated.so -> ha_federated.so.0.0.0 +lrwxrwxrwx root/root usr/lib/mysql/plugin/ha_federated.so.0 -> ha_federated.so.0.0.0 +-rwxr-xr-x root/root usr/lib/mysql/plugin/ha_federated.so.0.0.0 +-rw-r--r-- root/root usr/lib/mysql/plugin/libdaemon_example.a +-rwxr-xr-x root/root usr/lib/mysql/plugin/libdaemon_example.la +lrwxrwxrwx root/root usr/lib/mysql/plugin/libdaemon_example.so -> libdaemon_example.so.0.0.0 +lrwxrwxrwx root/root usr/lib/mysql/plugin/libdaemon_example.so.0 -> libdaemon_example.so.0.0.0 +-rwxr-xr-x root/root usr/lib/mysql/plugin/libdaemon_example.so.0.0.0 +-rw-r--r-- root/root usr/lib/mysql/plugin/mypluglib.a +-rwxr-xr-x root/root usr/lib/mysql/plugin/mypluglib.la +lrwxrwxrwx root/root usr/lib/mysql/plugin/mypluglib.so -> mypluglib.so.0.0.0 +lrwxrwxrwx root/root usr/lib/mysql/plugin/mypluglib.so.0 -> mypluglib.so.0.0.0 +-rwxr-xr-x root/root usr/lib/mysql/plugin/mypluglib.so.0.0.0 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/comp_err.1.gz -rw-r--r-- root/root usr/man/man1/innochecksum.1.gz -rw-r--r-- root/root usr/man/man1/make_win_bin_dist.1.gz --rw-r--r-- root/root usr/man/man1/make_win_src_distribution.1.gz -rw-r--r-- root/root usr/man/man1/msql2mysql.1.gz -rw-r--r-- root/root usr/man/man1/my_print_defaults.1.gz -rw-r--r-- root/root usr/man/man1/myisam_ftdump.1.gz @@ -123,14 +147,12 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/mysql_client_test.1.gz -rw-r--r-- root/root usr/man/man1/mysql_config.1.gz -rw-r--r-- root/root usr/man/man1/mysql_convert_table_format.1.gz --rw-r--r-- root/root usr/man/man1/mysql_explain_log.1.gz -rw-r--r-- root/root usr/man/man1/mysql_find_rows.1.gz -rw-r--r-- root/root usr/man/man1/mysql_fix_extensions.1.gz -rw-r--r-- root/root usr/man/man1/mysql_fix_privilege_tables.1.gz -rw-r--r-- root/root usr/man/man1/mysql_install_db.1.gz -rw-r--r-- root/root usr/man/man1/mysql_secure_installation.1.gz -rw-r--r-- root/root usr/man/man1/mysql_setpermission.1.gz --rw-r--r-- root/root usr/man/man1/mysql_tableinfo.1.gz -rw-r--r-- root/root usr/man/man1/mysql_tzinfo_to_sql.1.gz -rw-r--r-- root/root usr/man/man1/mysql_upgrade.1.gz -rw-r--r-- root/root usr/man/man1/mysql_waitpid.1.gz @@ -148,12 +170,12 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/mysqlimport.1.gz -rw-r--r-- root/root usr/man/man1/mysqlman.1.gz -rw-r--r-- root/root usr/man/man1/mysqlshow.1.gz +-rw-r--r-- root/root usr/man/man1/mysqlslap.1.gz -rw-r--r-- root/root usr/man/man1/mysqltest.1.gz -rw-r--r-- root/root usr/man/man1/perror.1.gz -rw-r--r-- root/root usr/man/man1/replace.1.gz -rw-r--r-- root/root usr/man/man1/resolve_stack_dump.1.gz -rw-r--r-- root/root usr/man/man1/resolveip.1.gz --rw-r--r-- root/root usr/man/man1/safe_mysqld.1.gz drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/mysqld.8.gz -rw-r--r-- root/root usr/man/man8/mysqlmanager.8.gz @@ -161,7 +183,10 @@ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/mysqld -rwxr-xr-x root/root usr/sbin/mysqlmanager drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/aclocal/ +-rw-r--r-- root/root usr/share/aclocal/mysql.m4 drwxr-xr-x root/root usr/share/mysql/ +-rw-r--r-- root/root usr/share/mysql/binary-configure drwxr-xr-x root/root usr/share/mysql/charsets/ -rw-r--r-- root/root usr/share/mysql/charsets/Index.xml -rw-r--r-- root/root usr/share/mysql/charsets/armscii8.xml @@ -188,20 +213,30 @@ drwxr-xr-x root/root usr/share/mysql/charsets/ -rw-r--r-- root/root usr/share/mysql/charsets/macce.xml -rw-r--r-- root/root usr/share/mysql/charsets/macroman.xml -rw-r--r-- root/root usr/share/mysql/charsets/swe7.xml +-rw-r--r-- root/root usr/share/mysql/config.huge.ini +-rw-r--r-- root/root usr/share/mysql/config.medium.ini +-rw-r--r-- root/root usr/share/mysql/config.small.ini drwxr-xr-x root/root usr/share/mysql/english/ -rw-r--r-- root/root usr/share/mysql/english/errmsg.sys +-rw-r--r-- root/root usr/share/mysql/errmsg.txt -rw-r--r-- root/root usr/share/mysql/fill_help_tables.sql +-rw-r--r-- root/root usr/share/mysql/mi_test_all +-rw-r--r-- root/root usr/share/mysql/mi_test_all.res -rw-r--r-- root/root usr/share/mysql/my-huge.cnf -rw-r--r-- root/root usr/share/mysql/my-innodb-heavy-4G.cnf -rw-r--r-- root/root usr/share/mysql/my-large.cnf -rw-r--r-- root/root usr/share/mysql/my-medium.cnf -rw-r--r-- root/root usr/share/mysql/my-small.cnf +-rw-r--r-- root/root usr/share/mysql/mysql-log-rotate +-rwxr-xr-x root/root usr/share/mysql/mysql.server -rw-r--r-- root/root usr/share/mysql/mysql_fix_privilege_tables.sql -rw-r--r-- root/root usr/share/mysql/mysql_system_tables.sql -rw-r--r-- root/root usr/share/mysql/mysql_system_tables_data.sql -rw-r--r-- root/root usr/share/mysql/mysql_test_data_timezone.sql +-rwxr-xr-x root/root usr/share/mysql/mysqld_multi.server +-rw-r--r-- root/root usr/share/mysql/ndb-config-2-node.ini drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ -drwx------ daemon/daemon var/lib/mysql/ +drwx------ mysql/mysql var/lib/mysql/ drwxr-xr-x root/root var/log/ --rw------- daemon/daemon var/log/mysqld.log (EMPTY) +-rw------- mysql/mysql var/log/mysqld.log (EMPTY) diff --git a/mysql/.md5sum b/mysql/.md5sum index 5ed9e5486..bdf5f0824 100644 --- a/mysql/.md5sum +++ b/mysql/.md5sum @@ -1,3 +1,3 @@ -c92bf44516b82cad857fb386dbb64bfe my.cnf -051392064a1e32cca5c23a593908b10e mysql-5.0.83.tar.gz +345bcdf6f46ce0c6c8bdc90dd0854ee7 my.cnf +327bffc7a2a5fd4471fbbaab125275cd mysql-5.1.35.tar.gz 642a596f13ebd7e459c5ff2fd382f06b mysqld diff --git a/mysql/Pkgfile b/mysql/Pkgfile index c4860f34f..e7ca850db 100644 --- a/mysql/Pkgfile +++ b/mysql/Pkgfile @@ -4,13 +4,14 @@ # Depends on: ncurses readline zlib name=mysql -version=5.0.83 +version=5.1.35 release=1 -source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.0/$name-$version.tar.gz \ +source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/$name-$version.tar.gz \ my.cnf mysqld) build () { cd $name-$version + ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/sbin \ @@ -18,24 +19,21 @@ build () { --mandir=/usr/man \ --enable-assembler \ --enable-thread-safe-client \ - --without-berkeley-db \ - --enable-innodb \ - --without-readline \ - --without-debug \ - --without-docs \ - --without-bench + --without-{readline,debug,docs} \ + --with-ssl \ + --with-plugins=myisam,innobase + make make DESTDIR=$PKG install - rm -r $PKG/usr/mysql-test + rm -r $PKG/usr/{mysql-test,sql-bench} rm $PKG/usr/share/mysql/charsets/README - find $PKG/usr/share/mysql/* -prune -type f ! -regex '.*\(cnf\|sql\)$' | xargs rm -f {} \; find $PKG/usr/share/mysql/* -type d ! -name english ! -name charsets | xargs rm -rf {} \; - mkdir -p $PKG/{var/lib,var/log} + install -d $PKG/var/{lib,log} touch mysqld.log - install -m 600 -o daemon -g daemon mysqld.log $PKG/var/log - install -d -m 700 -o daemon -g daemon $PKG/var/lib/mysql + install -m 600 -o mysql -g mysql mysqld.log $PKG/var/log + install -d -m 700 -o mysql -g mysql $PKG/var/lib/mysql install -D -m 755 $SRC/mysqld $PKG/etc/rc.d/mysqld install -m 600 $SRC/my.cnf $PKG/etc diff --git a/mysql/README b/mysql/README index cc895ceb3..222ad89bb 100644 --- a/mysql/README +++ b/mysql/README @@ -1,16 +1,22 @@ -README for mysql 5.0.xx +README for mysql 5.1.xx REQUIREMENTS PRE-INSTALL + Run the included pre-install script to create a new + user/group mysql. POST-INSTALL -1. run 'mysql_install_db' to build the system database +1. Fix user/group of your mysql databases and the log file + if you are upgrading mysql from 5.0.x: + chown -R mysql:mysql /var/lib/mysql + chown mysql:mysql /var/log/mysqld.log +2. run 'mysql_install_db' to build the system database in /var/lib/mysql -2. run 'mysql_upgrade' to add new privileges and features +3. run 'mysql_upgrade' to add new privileges and features to the MySQL privilege tables if you have 4.x or 3.x databases -3. Set a password for the mysql root user: +4. Set a password for the mysql root user: mysqladmin -u root password PRECAUTION diff --git a/mysql/my.cnf b/mysql/my.cnf index 37070a679..587935199 100644 --- a/mysql/my.cnf +++ b/mysql/my.cnf @@ -4,7 +4,7 @@ [mysqld] datadir = /var/lib/mysql -user = daemon +user = mysql log = /var/log/mysqld.log pid-file = /var/run/mysqld.pid socket = /tmp/mysql.sock diff --git a/mysql/pre-install b/mysql/pre-install new file mode 100644 index 000000000..f856e4005 --- /dev/null +++ b/mysql/pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +getent group mysql || /usr/sbin/groupadd -g 46 mysql +getent passwd mysql || /usr/sbin/useradd -g mysql -u 46 -d /var/lib/mysql -s /bin/false mysql +/usr/bin/passwd -l mysql +