From 3bbede4b7f01b36dd98893db4b3daf985161579a Mon Sep 17 00:00:00 2001 From: tnut Date: Tue, 27 Apr 2010 17:30:13 +0200 Subject: mysql dans test --- extra/mysql/.footprint | 200 ------------------------------ extra/mysql/.md5sum | 2 - extra/mysql/Pkgfile | 52 -------- extra/mysql/README | 29 ----- extra/mysql/my.cnf | 20 --- extra/mysql/mysql.nutyx.patch | 27 ---- extra/mysql/post-install | 6 - test/mysql/.footprint | 200 ++++++++++++++++++++++++++++++ test/mysql/.md5sum | 3 + test/mysql/Pkgfile | 52 ++++++++ test/mysql/README | 29 +++++ test/mysql/my.cnf | 20 +++ test/mysql/mysql-5.1-gcc45-apicheck.patch | 28 +++++ test/mysql/mysql.nutyx.patch | 27 ++++ test/mysql/post-install | 6 + 15 files changed, 365 insertions(+), 336 deletions(-) delete mode 100644 extra/mysql/.footprint delete mode 100644 extra/mysql/.md5sum delete mode 100644 extra/mysql/Pkgfile delete mode 100644 extra/mysql/README delete mode 100644 extra/mysql/my.cnf delete mode 100644 extra/mysql/mysql.nutyx.patch delete mode 100755 extra/mysql/post-install create mode 100644 test/mysql/.footprint create mode 100644 test/mysql/.md5sum create mode 100644 test/mysql/Pkgfile create mode 100644 test/mysql/README create mode 100644 test/mysql/my.cnf create mode 100644 test/mysql/mysql-5.1-gcc45-apicheck.patch create mode 100644 test/mysql/mysql.nutyx.patch create mode 100755 test/mysql/post-install diff --git a/extra/mysql/.footprint b/extra/mysql/.footprint deleted file mode 100644 index 7c9879898..000000000 --- a/extra/mysql/.footprint +++ /dev/null @@ -1,200 +0,0 @@ -drwxr-xr-x root/root etc/ --rw-r--r-- root/root etc/my.cnf -drwxr-xr-x root/root etc/rc.d/ -drwxr-xr-x root/root etc/rc.d/init.d/ --rwxr-xr-- root/root etc/rc.d/init.d/mysql -drwxr-xr-x root/root etc/rc.d/rc0.d/ -lrwxrwxrwx root/root etc/rc.d/rc0.d/K26mysql -> ../init.d/mysql -drwxr-xr-x root/root etc/rc.d/rc1.d/ -lrwxrwxrwx root/root etc/rc.d/rc1.d/K26mysql -> ../init.d/mysql -drwxr-xr-x root/root etc/rc.d/rc2.d/ -lrwxrwxrwx root/root etc/rc.d/rc2.d/K26mysql -> ../init.d/mysql -drwxr-xr-x root/root etc/rc.d/rc3.d/ -lrwxrwxrwx root/root etc/rc.d/rc3.d/S34mysql -> ../init.d/mysql -drwxr-xr-x root/root etc/rc.d/rc4.d/ -lrwxrwxrwx root/root etc/rc.d/rc4.d/S34mysql -> ../init.d/mysql -drwxr-xr-x root/root etc/rc.d/rc5.d/ -lrwxrwxrwx root/root etc/rc.d/rc5.d/S34mysql -> ../init.d/mysql -drwxr-xr-x root/root etc/rc.d/rc6.d/ -lrwxrwxrwx root/root etc/rc.d/rc6.d/K26mysql -> ../init.d/mysql -drwxr-xr-x root/root etc/rc.d/rcsysinit.d/ -drwxr-xr-x root/root etc/sysconfig/ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --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 --rwxr-xr-x root/root usr/bin/myisam_ftdump --rwxr-xr-x root/root usr/bin/myisamchk --rwxr-xr-x root/root usr/bin/myisamlog --rwxr-xr-x root/root usr/bin/myisampack --rwxr-xr-x root/root usr/bin/mysql_client_test --rwxr-xr-x root/root usr/bin/mysql_convert_table_format --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_tzinfo_to_sql --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 --rwxr-xr-x root/root usr/bin/mysqlbug --rwxr-xr-x root/root usr/bin/mysqld_multi --rwxr-xr-x root/root usr/bin/mysqld_safe --rwxr-xr-x root/root usr/bin/mysqldumpslow --rwxr-xr-x root/root usr/bin/mysqlhotcopy --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 --rwxr-xr-x root/root usr/bin/resolveip -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/man/ -drwxr-xr-x root/root usr/share/man/man1/ --rw-r--r-- root/root usr/share/man/man1/comp_err.1.gz --rw-r--r-- root/root usr/share/man/man1/innochecksum.1.gz --rw-r--r-- root/root usr/share/man/man1/msql2mysql.1.gz --rw-r--r-- root/root usr/share/man/man1/my_print_defaults.1.gz --rw-r--r-- root/root usr/share/man/man1/myisam_ftdump.1.gz --rw-r--r-- root/root usr/share/man/man1/myisamchk.1.gz --rw-r--r-- root/root usr/share/man/man1/myisamlog.1.gz --rw-r--r-- root/root usr/share/man/man1/myisampack.1.gz --rw-r--r-- root/root usr/share/man/man1/mysql-stress-test.pl.1.gz --rw-r--r-- root/root usr/share/man/man1/mysql-test-run.pl.1.gz --rw-r--r-- root/root usr/share/man/man1/mysql.1.gz --rw-r--r-- root/root usr/share/man/man1/mysql.server.1.gz --rw-r--r-- root/root usr/share/man/man1/mysql_client_test.1.gz --rw-r--r-- root/root usr/share/man/man1/mysql_config.1.gz --rw-r--r-- root/root usr/share/man/man1/mysql_convert_table_format.1.gz --rw-r--r-- root/root usr/share/man/man1/mysql_find_rows.1.gz --rw-r--r-- root/root usr/share/man/man1/mysql_fix_extensions.1.gz --rw-r--r-- root/root usr/share/man/man1/mysql_fix_privilege_tables.1.gz --rw-r--r-- root/root usr/share/man/man1/mysql_install_db.1.gz --rw-r--r-- root/root usr/share/man/man1/mysql_secure_installation.1.gz --rw-r--r-- root/root usr/share/man/man1/mysql_setpermission.1.gz --rw-r--r-- root/root usr/share/man/man1/mysql_tzinfo_to_sql.1.gz --rw-r--r-- root/root usr/share/man/man1/mysql_upgrade.1.gz --rw-r--r-- root/root usr/share/man/man1/mysql_waitpid.1.gz --rw-r--r-- root/root usr/share/man/man1/mysql_zap.1.gz --rw-r--r-- root/root usr/share/man/man1/mysqlaccess.1.gz --rw-r--r-- root/root usr/share/man/man1/mysqladmin.1.gz --rw-r--r-- root/root usr/share/man/man1/mysqlbinlog.1.gz --rw-r--r-- root/root usr/share/man/man1/mysqlbug.1.gz --rw-r--r-- root/root usr/share/man/man1/mysqlcheck.1.gz --rw-r--r-- root/root usr/share/man/man1/mysqld_multi.1.gz --rw-r--r-- root/root usr/share/man/man1/mysqld_safe.1.gz --rw-r--r-- root/root usr/share/man/man1/mysqldump.1.gz --rw-r--r-- root/root usr/share/man/man1/mysqldumpslow.1.gz --rw-r--r-- root/root usr/share/man/man1/mysqlhotcopy.1.gz --rw-r--r-- root/root usr/share/man/man1/mysqlimport.1.gz --rw-r--r-- root/root usr/share/man/man1/mysqlman.1.gz --rw-r--r-- root/root usr/share/man/man1/mysqlshow.1.gz --rw-r--r-- root/root usr/share/man/man1/mysqlslap.1.gz --rw-r--r-- root/root usr/share/man/man1/mysqltest.1.gz --rw-r--r-- root/root usr/share/man/man1/perror.1.gz --rw-r--r-- root/root usr/share/man/man1/replace.1.gz --rw-r--r-- root/root usr/share/man/man1/resolve_stack_dump.1.gz --rw-r--r-- root/root usr/share/man/man1/resolveip.1.gz -drwxr-xr-x root/root usr/share/man/man8/ --rw-r--r-- root/root usr/share/man/man8/mysqld.8.gz --rw-r--r-- root/root usr/share/man/man8/mysqlmanager.8.gz -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 --rw-r--r-- root/root usr/share/mysql/charsets/ascii.xml --rw-r--r-- root/root usr/share/mysql/charsets/cp1250.xml --rw-r--r-- root/root usr/share/mysql/charsets/cp1251.xml --rw-r--r-- root/root usr/share/mysql/charsets/cp1256.xml --rw-r--r-- root/root usr/share/mysql/charsets/cp1257.xml --rw-r--r-- root/root usr/share/mysql/charsets/cp850.xml --rw-r--r-- root/root usr/share/mysql/charsets/cp852.xml --rw-r--r-- root/root usr/share/mysql/charsets/cp866.xml --rw-r--r-- root/root usr/share/mysql/charsets/dec8.xml --rw-r--r-- root/root usr/share/mysql/charsets/geostd8.xml --rw-r--r-- root/root usr/share/mysql/charsets/greek.xml --rw-r--r-- root/root usr/share/mysql/charsets/hebrew.xml --rw-r--r-- root/root usr/share/mysql/charsets/hp8.xml --rw-r--r-- root/root usr/share/mysql/charsets/keybcs2.xml --rw-r--r-- root/root usr/share/mysql/charsets/koi8r.xml --rw-r--r-- root/root usr/share/mysql/charsets/koi8u.xml --rw-r--r-- root/root usr/share/mysql/charsets/latin1.xml --rw-r--r-- root/root usr/share/mysql/charsets/latin2.xml --rw-r--r-- root/root usr/share/mysql/charsets/latin5.xml --rw-r--r-- root/root usr/share/mysql/charsets/latin7.xml --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/czech/ --rw-r--r-- root/root usr/share/mysql/czech/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/danish/ --rw-r--r-- root/root usr/share/mysql/danish/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/dutch/ --rw-r--r-- root/root usr/share/mysql/dutch/errmsg.sys -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 -drwxr-xr-x root/root usr/share/mysql/estonian/ --rw-r--r-- root/root usr/share/mysql/estonian/errmsg.sys --rw-r--r-- root/root usr/share/mysql/fill_help_tables.sql -drwxr-xr-x root/root usr/share/mysql/french/ --rw-r--r-- root/root usr/share/mysql/french/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/german/ --rw-r--r-- root/root usr/share/mysql/german/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/greek/ --rw-r--r-- root/root usr/share/mysql/greek/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/hungarian/ --rw-r--r-- root/root usr/share/mysql/hungarian/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/italian/ --rw-r--r-- root/root usr/share/mysql/italian/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/japanese/ --rw-r--r-- root/root usr/share/mysql/japanese/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/korean/ --rw-r--r-- root/root usr/share/mysql/korean/errmsg.sys --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 usr/share/mysql/norwegian-ny/ --rw-r--r-- root/root usr/share/mysql/norwegian-ny/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/norwegian/ --rw-r--r-- root/root usr/share/mysql/norwegian/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/polish/ --rw-r--r-- root/root usr/share/mysql/polish/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/portuguese/ --rw-r--r-- root/root usr/share/mysql/portuguese/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/romanian/ --rw-r--r-- root/root usr/share/mysql/romanian/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/russian/ --rw-r--r-- root/root usr/share/mysql/russian/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/serbian/ --rw-r--r-- root/root usr/share/mysql/serbian/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/slovak/ --rw-r--r-- root/root usr/share/mysql/slovak/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/spanish/ --rw-r--r-- root/root usr/share/mysql/spanish/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/swedish/ --rw-r--r-- root/root usr/share/mysql/swedish/errmsg.sys -drwxr-xr-x root/root usr/share/mysql/ukrainian/ --rw-r--r-- root/root usr/share/mysql/ukrainian/errmsg.sys diff --git a/extra/mysql/.md5sum b/extra/mysql/.md5sum deleted file mode 100644 index f71bb9c63..000000000 --- a/extra/mysql/.md5sum +++ /dev/null @@ -1,2 +0,0 @@ -b5d39e8789174753f3c782959729e68c mysql-5.1.41.tar.gz -d98ff5376214c095d885cd4be4d3bef7 mysql.nutyx.patch diff --git a/extra/mysql/Pkgfile b/extra/mysql/Pkgfile deleted file mode 100644 index 2e50c579f..000000000 --- a/extra/mysql/Pkgfile +++ /dev/null @@ -1,52 +0,0 @@ -# Description: Serveur de base de données MySQL -# URL: http://www.mysql.com -# Maintainer: NuTyX core team -# Packager: thierryn1 at hispeed dot ch -# Depends on: mysqlclient - -name=mysql -version=5.1.41 -release=1 -source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/$name-$version.tar.gz \ - mysql.nutyx.patch) - -build () { - source /etc/blfs-bootscripts - wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2 - tar xvf $scripts-$scriptsversion.tar.bz2 - patch -Np0 -i mysql.nutyx.patch - cd $name-$version - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/sbin \ - --localstatedir=/srv/mysql \ - --enable-assembler \ - --enable-thread-safe-client \ - --enable-local-infile \ - --with-unix-socket-path=/var/run/mysql/mysql.sock \ - --with-extra-charsets=all \ - --with-berkeley-db \ - --without-debug \ - --without-readline \ - --without-docs \ - --without-bench - make -j2 - make DESTDIR=$PKG install - rm -r $PKG/usr/{mysql-test,sql-bench} - for i in mysql mysql_upgrade \ - mysqladmin mysqlbinlog \ - mysqlcheck mysqldump mysqlimport mysqlshow \ - mysqlslap mysqltest mysql_config - do rm -r $PKG/usr/bin/$i - done - rm $PKG/usr/share/mysql/charsets/README - mkdir -p $PKG/etc - install -v -m644 $PKG/usr/share/mysql/my-medium.cnf \ - $PKG/etc/my.cnf - sed -i -e s/^skip-federated/#skip-federated/ \ - $PKG/etc/my.cnf - cd ../$scripts-$scriptsversion - make DESTDIR=$PKG install-mysql - # Suppression des librairies - rm -r $PKG/usr/{include,lib} -} diff --git a/extra/mysql/README b/extra/mysql/README deleted file mode 100644 index b0ba4cc38..000000000 --- a/extra/mysql/README +++ /dev/null @@ -1,29 +0,0 @@ -Il est très important de procéder comme ci-dessous pour avoir un serveur mysql sécurisé. -Installer le serveur mysql en procédant comme ceci - -/etc/rc.d/init.d/mysql stop - -mysqld_safe --user=mysql 2>&1 >/dev/null & - -Noter que le & est très important pour avoir la main en console - -On spécifie maintenant un mot de passe pour le root - -mysqladmin -u root password - -La configuration du serveur est terminée. On peut maintenant l'arrêter. - -mysqladmin -p shutdown - -Le mot de passe sera demandé. - -Lancer le serveur de façon définitive - -/etc/rc.d/init.d/mysql start - -Aucune erreur ne doit apparaître. - -Au prochain lancement de la machine, mysql se lancera correctement. - -pour plus d'info: http://www.nutyx.org - diff --git a/extra/mysql/my.cnf b/extra/mysql/my.cnf deleted file mode 100644 index 37070a679..000000000 --- a/extra/mysql/my.cnf +++ /dev/null @@ -1,20 +0,0 @@ -# -# /etc/my.cnf -# - -[mysqld] -datadir = /var/lib/mysql -user = daemon -log = /var/log/mysqld.log -pid-file = /var/run/mysqld.pid -socket = /tmp/mysql.sock -port = 3306 - -skip-networking -skip-innodb - -[client] -socket = /tmp/mysql.sock -port = 3306 - -# End of file diff --git a/extra/mysql/mysql.nutyx.patch b/extra/mysql/mysql.nutyx.patch deleted file mode 100644 index cc1cdb43e..000000000 --- a/extra/mysql/mysql.nutyx.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- blfs-bootscripts-20090302/blfs/init.d/mysql 2005-08-01 19:29:19.000000000 +0000 -+++ blfs-bootscripts-20090302/blfs/init.d/mysql.nutyx 2009-06-26 06:55:05.000000000 +0000 -@@ -5,11 +5,23 @@ - # Rewritten by Gerard Beekmans - gerard@linuxfromscratch.org - - #$LastChangedBy: bdubbs $ --#$Date: 2005-08-01 19:29:19 +0000 (Mon, 01 Aug 2005) $ -+#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ - - . /etc/sysconfig/rc - . $rc_functions - -+newgroup=mysql -+newuser=mysql -+newid=40 -+ -+# check for mysql group or add one -+getent group $newgroup > /dev/null || /usr/sbin/groupadd -g $newid $newgroup -+ -+# check for mysql user or add one -+getent passwd $newuser > /dev/null || /usr/sbin/useradd -g $newgroup \ -+-u $newid -d /dev/null \ -+-s /bin/false -c "MySQL Server" $newuser -+ - PIDFILE=/srv/mysql/`/bin/hostname`.pid - KILLDELAY=20 - diff --git a/extra/mysql/post-install b/extra/mysql/post-install deleted file mode 100755 index 056fe5500..000000000 --- a/extra/mysql/post-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - - -mysql_install_db --user=mysql -chgrp mysql /srv/mysql{,/test,/mysql} -install -m755 -o mysql -g mysql -d /var/run/mysql diff --git a/test/mysql/.footprint b/test/mysql/.footprint new file mode 100644 index 000000000..7c9879898 --- /dev/null +++ b/test/mysql/.footprint @@ -0,0 +1,200 @@ +drwxr-xr-x root/root etc/ +-rw-r--r-- root/root etc/my.cnf +drwxr-xr-x root/root etc/rc.d/ +drwxr-xr-x root/root etc/rc.d/init.d/ +-rwxr-xr-- root/root etc/rc.d/init.d/mysql +drwxr-xr-x root/root etc/rc.d/rc0.d/ +lrwxrwxrwx root/root etc/rc.d/rc0.d/K26mysql -> ../init.d/mysql +drwxr-xr-x root/root etc/rc.d/rc1.d/ +lrwxrwxrwx root/root etc/rc.d/rc1.d/K26mysql -> ../init.d/mysql +drwxr-xr-x root/root etc/rc.d/rc2.d/ +lrwxrwxrwx root/root etc/rc.d/rc2.d/K26mysql -> ../init.d/mysql +drwxr-xr-x root/root etc/rc.d/rc3.d/ +lrwxrwxrwx root/root etc/rc.d/rc3.d/S34mysql -> ../init.d/mysql +drwxr-xr-x root/root etc/rc.d/rc4.d/ +lrwxrwxrwx root/root etc/rc.d/rc4.d/S34mysql -> ../init.d/mysql +drwxr-xr-x root/root etc/rc.d/rc5.d/ +lrwxrwxrwx root/root etc/rc.d/rc5.d/S34mysql -> ../init.d/mysql +drwxr-xr-x root/root etc/rc.d/rc6.d/ +lrwxrwxrwx root/root etc/rc.d/rc6.d/K26mysql -> ../init.d/mysql +drwxr-xr-x root/root etc/rc.d/rcsysinit.d/ +drwxr-xr-x root/root etc/sysconfig/ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-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 +-rwxr-xr-x root/root usr/bin/myisam_ftdump +-rwxr-xr-x root/root usr/bin/myisamchk +-rwxr-xr-x root/root usr/bin/myisamlog +-rwxr-xr-x root/root usr/bin/myisampack +-rwxr-xr-x root/root usr/bin/mysql_client_test +-rwxr-xr-x root/root usr/bin/mysql_convert_table_format +-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_tzinfo_to_sql +-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 +-rwxr-xr-x root/root usr/bin/mysqlbug +-rwxr-xr-x root/root usr/bin/mysqld_multi +-rwxr-xr-x root/root usr/bin/mysqld_safe +-rwxr-xr-x root/root usr/bin/mysqldumpslow +-rwxr-xr-x root/root usr/bin/mysqlhotcopy +-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 +-rwxr-xr-x root/root usr/bin/resolveip +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/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/comp_err.1.gz +-rw-r--r-- root/root usr/share/man/man1/innochecksum.1.gz +-rw-r--r-- root/root usr/share/man/man1/msql2mysql.1.gz +-rw-r--r-- root/root usr/share/man/man1/my_print_defaults.1.gz +-rw-r--r-- root/root usr/share/man/man1/myisam_ftdump.1.gz +-rw-r--r-- root/root usr/share/man/man1/myisamchk.1.gz +-rw-r--r-- root/root usr/share/man/man1/myisamlog.1.gz +-rw-r--r-- root/root usr/share/man/man1/myisampack.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysql-stress-test.pl.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysql-test-run.pl.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysql.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysql.server.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysql_client_test.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysql_config.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysql_convert_table_format.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysql_find_rows.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysql_fix_extensions.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysql_fix_privilege_tables.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysql_install_db.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysql_secure_installation.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysql_setpermission.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysql_tzinfo_to_sql.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysql_upgrade.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysql_waitpid.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysql_zap.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysqlaccess.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysqladmin.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysqlbinlog.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysqlbug.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysqlcheck.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysqld_multi.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysqld_safe.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysqldump.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysqldumpslow.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysqlhotcopy.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysqlimport.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysqlman.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysqlshow.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysqlslap.1.gz +-rw-r--r-- root/root usr/share/man/man1/mysqltest.1.gz +-rw-r--r-- root/root usr/share/man/man1/perror.1.gz +-rw-r--r-- root/root usr/share/man/man1/replace.1.gz +-rw-r--r-- root/root usr/share/man/man1/resolve_stack_dump.1.gz +-rw-r--r-- root/root usr/share/man/man1/resolveip.1.gz +drwxr-xr-x root/root usr/share/man/man8/ +-rw-r--r-- root/root usr/share/man/man8/mysqld.8.gz +-rw-r--r-- root/root usr/share/man/man8/mysqlmanager.8.gz +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 +-rw-r--r-- root/root usr/share/mysql/charsets/ascii.xml +-rw-r--r-- root/root usr/share/mysql/charsets/cp1250.xml +-rw-r--r-- root/root usr/share/mysql/charsets/cp1251.xml +-rw-r--r-- root/root usr/share/mysql/charsets/cp1256.xml +-rw-r--r-- root/root usr/share/mysql/charsets/cp1257.xml +-rw-r--r-- root/root usr/share/mysql/charsets/cp850.xml +-rw-r--r-- root/root usr/share/mysql/charsets/cp852.xml +-rw-r--r-- root/root usr/share/mysql/charsets/cp866.xml +-rw-r--r-- root/root usr/share/mysql/charsets/dec8.xml +-rw-r--r-- root/root usr/share/mysql/charsets/geostd8.xml +-rw-r--r-- root/root usr/share/mysql/charsets/greek.xml +-rw-r--r-- root/root usr/share/mysql/charsets/hebrew.xml +-rw-r--r-- root/root usr/share/mysql/charsets/hp8.xml +-rw-r--r-- root/root usr/share/mysql/charsets/keybcs2.xml +-rw-r--r-- root/root usr/share/mysql/charsets/koi8r.xml +-rw-r--r-- root/root usr/share/mysql/charsets/koi8u.xml +-rw-r--r-- root/root usr/share/mysql/charsets/latin1.xml +-rw-r--r-- root/root usr/share/mysql/charsets/latin2.xml +-rw-r--r-- root/root usr/share/mysql/charsets/latin5.xml +-rw-r--r-- root/root usr/share/mysql/charsets/latin7.xml +-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/czech/ +-rw-r--r-- root/root usr/share/mysql/czech/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/danish/ +-rw-r--r-- root/root usr/share/mysql/danish/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/dutch/ +-rw-r--r-- root/root usr/share/mysql/dutch/errmsg.sys +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 +drwxr-xr-x root/root usr/share/mysql/estonian/ +-rw-r--r-- root/root usr/share/mysql/estonian/errmsg.sys +-rw-r--r-- root/root usr/share/mysql/fill_help_tables.sql +drwxr-xr-x root/root usr/share/mysql/french/ +-rw-r--r-- root/root usr/share/mysql/french/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/german/ +-rw-r--r-- root/root usr/share/mysql/german/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/greek/ +-rw-r--r-- root/root usr/share/mysql/greek/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/hungarian/ +-rw-r--r-- root/root usr/share/mysql/hungarian/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/italian/ +-rw-r--r-- root/root usr/share/mysql/italian/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/japanese/ +-rw-r--r-- root/root usr/share/mysql/japanese/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/korean/ +-rw-r--r-- root/root usr/share/mysql/korean/errmsg.sys +-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 usr/share/mysql/norwegian-ny/ +-rw-r--r-- root/root usr/share/mysql/norwegian-ny/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/norwegian/ +-rw-r--r-- root/root usr/share/mysql/norwegian/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/polish/ +-rw-r--r-- root/root usr/share/mysql/polish/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/portuguese/ +-rw-r--r-- root/root usr/share/mysql/portuguese/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/romanian/ +-rw-r--r-- root/root usr/share/mysql/romanian/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/russian/ +-rw-r--r-- root/root usr/share/mysql/russian/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/serbian/ +-rw-r--r-- root/root usr/share/mysql/serbian/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/slovak/ +-rw-r--r-- root/root usr/share/mysql/slovak/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/spanish/ +-rw-r--r-- root/root usr/share/mysql/spanish/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/swedish/ +-rw-r--r-- root/root usr/share/mysql/swedish/errmsg.sys +drwxr-xr-x root/root usr/share/mysql/ukrainian/ +-rw-r--r-- root/root usr/share/mysql/ukrainian/errmsg.sys diff --git a/test/mysql/.md5sum b/test/mysql/.md5sum new file mode 100644 index 000000000..b1738a8dc --- /dev/null +++ b/test/mysql/.md5sum @@ -0,0 +1,3 @@ +4cbf0fc3eb76057f7a8dd52a3e2a58e6 mysql-5.1-gcc45-apicheck.patch +04f7c1422199c73a88a3d408b9161b63 mysql-5.1.46.tar.gz +d98ff5376214c095d885cd4be4d3bef7 mysql.nutyx.patch diff --git a/test/mysql/Pkgfile b/test/mysql/Pkgfile new file mode 100644 index 000000000..90350d5db --- /dev/null +++ b/test/mysql/Pkgfile @@ -0,0 +1,52 @@ +# Description: Serveur de base de données MySQL +# URL: http://www.mysql.com +# Maintainer: NuTyX core team +# Packager: thierryn1 at hispeed dot ch +# Depends on: mysqlclient + +name=mysql +version=5.1.46 +release=1 +source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/$name-$version.tar.gz \ + mysql.nutyx.patch mysql-5.1-gcc45-apicheck.patch ) + +build () { + source /etc/blfs-bootscripts + wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2 + tar xvf $scripts-$scriptsversion.tar.bz2 +# patch -Np0 -i mysql.nutyx.patch + cd $name-$version + patch -Np1 -i ../mysql-5.1-gcc45-apicheck.patch + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/sbin \ + --localstatedir=/srv/mysql \ + --enable-assembler \ + --enable-thread-safe-client \ + --enable-local-infile \ + --with-unix-socket-path=/var/run/mysql/mysql.sock \ + --with-extra-charsets=all \ + --without-debug \ + --without-readline \ + --without-docs \ + --without-bench + make -j2 + make DESTDIR=$PKG install + rm -r $PKG/usr/{mysql-test,sql-bench} + for i in mysql mysql_upgrade \ + mysqladmin mysqlbinlog \ + mysqlcheck mysqldump mysqlimport mysqlshow \ + mysqlslap mysqltest mysql_config + do rm -r $PKG/usr/bin/$i + done + rm $PKG/usr/share/mysql/charsets/README + mkdir -p $PKG/etc + install -v -m644 $PKG/usr/share/mysql/my-medium.cnf \ + $PKG/etc/my.cnf + sed -i -e s/^skip-federated/#skip-federated/ \ + $PKG/etc/my.cnf + cd ../$scripts-$scriptsversion + make DESTDIR=$PKG install-mysql + # Suppression des librairies + rm -r $PKG/usr/{include,lib} +} diff --git a/test/mysql/README b/test/mysql/README new file mode 100644 index 000000000..b0ba4cc38 --- /dev/null +++ b/test/mysql/README @@ -0,0 +1,29 @@ +Il est très important de procéder comme ci-dessous pour avoir un serveur mysql sécurisé. +Installer le serveur mysql en procédant comme ceci + +/etc/rc.d/init.d/mysql stop + +mysqld_safe --user=mysql 2>&1 >/dev/null & + +Noter que le & est très important pour avoir la main en console + +On spécifie maintenant un mot de passe pour le root + +mysqladmin -u root password + +La configuration du serveur est terminée. On peut maintenant l'arrêter. + +mysqladmin -p shutdown + +Le mot de passe sera demandé. + +Lancer le serveur de façon définitive + +/etc/rc.d/init.d/mysql start + +Aucune erreur ne doit apparaître. + +Au prochain lancement de la machine, mysql se lancera correctement. + +pour plus d'info: http://www.nutyx.org + diff --git a/test/mysql/my.cnf b/test/mysql/my.cnf new file mode 100644 index 000000000..37070a679 --- /dev/null +++ b/test/mysql/my.cnf @@ -0,0 +1,20 @@ +# +# /etc/my.cnf +# + +[mysqld] +datadir = /var/lib/mysql +user = daemon +log = /var/log/mysqld.log +pid-file = /var/run/mysqld.pid +socket = /tmp/mysql.sock +port = 3306 + +skip-networking +skip-innodb + +[client] +socket = /tmp/mysql.sock +port = 3306 + +# End of file diff --git a/test/mysql/mysql-5.1-gcc45-apicheck.patch b/test/mysql/mysql-5.1-gcc45-apicheck.patch new file mode 100644 index 000000000..46125c73e --- /dev/null +++ b/test/mysql/mysql-5.1-gcc45-apicheck.patch @@ -0,0 +1,28 @@ +--- mysql-5.1.45/Makefile.am.orig 2010-03-31 10:52:25.000000000 -0400 ++++ mysql-5.1.45/Makefile.am 2010-03-31 10:55:05.000000000 -0400 +@@ -312,24 +312,7 @@ + $(MAKE) abi_headers="$^" do_abi_check + + do_abi_check: +- set -ex; \ +- for file in $(abi_headers); do \ +- @CC@ -E -nostdinc -dI \ +- -I$(top_srcdir)/include \ +- -I$(top_srcdir)/include/mysql \ +- -I$(top_srcdir)/sql \ +- -I$(top_builddir)/include \ +- -I$(top_builddir)/include/mysql \ +- -I$(top_builddir)/sql \ +- $$file 2>/dev/null | \ +- @SED@ -e '/^# /d' \ +- -e '/^[ ]*$$/d' \ +- -e '/^#pragma GCC set_debug_pwd/d' \ +- -e '/^#ident/d' > \ +- $(top_builddir)/abi_check.out; \ +- @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \ +- @RM@ $(top_builddir)/abi_check.out; \ +- done ++ echo "Skipping do_abi_check" + + # Don't update the files from bitkeeper + %::SCCS/s.% diff --git a/test/mysql/mysql.nutyx.patch b/test/mysql/mysql.nutyx.patch new file mode 100644 index 000000000..cc1cdb43e --- /dev/null +++ b/test/mysql/mysql.nutyx.patch @@ -0,0 +1,27 @@ +--- blfs-bootscripts-20090302/blfs/init.d/mysql 2005-08-01 19:29:19.000000000 +0000 ++++ blfs-bootscripts-20090302/blfs/init.d/mysql.nutyx 2009-06-26 06:55:05.000000000 +0000 +@@ -5,11 +5,23 @@ + # Rewritten by Gerard Beekmans - gerard@linuxfromscratch.org + + #$LastChangedBy: bdubbs $ +-#$Date: 2005-08-01 19:29:19 +0000 (Mon, 01 Aug 2005) $ ++#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ + + . /etc/sysconfig/rc + . $rc_functions + ++newgroup=mysql ++newuser=mysql ++newid=40 ++ ++# check for mysql group or add one ++getent group $newgroup > /dev/null || /usr/sbin/groupadd -g $newid $newgroup ++ ++# check for mysql user or add one ++getent passwd $newuser > /dev/null || /usr/sbin/useradd -g $newgroup \ ++-u $newid -d /dev/null \ ++-s /bin/false -c "MySQL Server" $newuser ++ + PIDFILE=/srv/mysql/`/bin/hostname`.pid + KILLDELAY=20 + diff --git a/test/mysql/post-install b/test/mysql/post-install new file mode 100755 index 000000000..056fe5500 --- /dev/null +++ b/test/mysql/post-install @@ -0,0 +1,6 @@ +#!/bin/sh + + +mysql_install_db --user=mysql +chgrp mysql /srv/mysql{,/test,/mysql} +install -m755 -o mysql -g mysql -d /var/run/mysql -- cgit v1.2.3-70-g09d2