OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-May-2007 22:31:02
Branch: HEAD Handle: 2007052021310100
Added files:
openpkg-src/mysql6 my.cnf my.pwd mysql6.patch mysql6.spec rc.mysql
Log:
quick packaging of MySQL 6.0.0 ALPHA to allow playing with the new
Falcon storage engine
Summary:
Revision Changes Path
1.1 +55 -0 openpkg-src/mysql6/my.cnf
1.1 +8 -0 openpkg-src/mysql6/my.pwd
1.1 +177 -0 openpkg-src/mysql6/mysql6.patch
1.1 +341 -0 openpkg-src/mysql6/mysql6.spec
1.1 +86 -0 openpkg-src/mysql6/rc.mysql
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql6/my.cnf
============================================================================
$ cvs diff -u -r0 -r1.1 my.cnf
--- /dev/null 2007-05-20 22:30:53 +0200
+++ my.cnf 2007-05-20 22:31:02 +0200
@@ -0,0 +1,55 @@
+##
+## my.cnf -- MySQL configuration
+##
+
+[client]
+
+socket = @l_prefix@/var/mysql/mysql.sock
+port = 3306
+
+[mysqld]
+
+bind-address = 127.0.0.1
+port = 3306
+#skip-networking
+
+tmpdir = @l_prefix@/var/mysql/tmp
+log = @l_prefix@/var/mysql/common.log
+#log-bin = @l_prefix@/var/mysql/binary.log
+#server-id = 1
+
+key_buffer_size = 64M
+table_cache = 256
+join_buffer_size = 1M
+max_connections = 1000
+max_connect_errors = 10
+max_delayed_threads = 20
+max_heap_table_size = 16777216
+max_sort_length = 1024
+max_user_connections = 1000
+record_buffer = 131072
+sort_buffer = 4M
+key_buffer = 1M
+tmp_table_size = 32M
+query_cache_type = 1
+query_cache_limit = 1M
+query_cache_size = 32M
+ft_min_word_len = 3
+
+<with_innobase>
+innodb_buffer_pool_size = 70M
+innodb_additional_mem_pool_size = 2M
+innodb_log_files_in_group = 3
+innodb_log_file_size = 20M
+innodb_log_buffer_size = 8M
+innodb_lock_wait_timeout = 50
+
+</with_innobase>
+[mysqld_safe]
+
+datadir = @l_prefix@/var/mysql
+socket = @l_prefix@/var/mysql/mysql.sock
+pid_file = @l_prefix@/var/mysql/mysqld.pid
+user = @l_rusr@
+basedir = @l_prefix@
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql6/my.pwd
============================================================================
$ cvs diff -u -r0 -r1.1 my.pwd
--- /dev/null 2007-05-20 22:30:53 +0200
+++ my.pwd 2007-05-20 22:31:02 +0200
@@ -0,0 +1,8 @@
+##
+## my.pwd -- MySQL configuration (administrator password only)
+##
+
+[mysqladmin]
+user = root
+password =
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql6/mysql6.patch
============================================================================
$ cvs diff -u -r0 -r1.1 mysql6.patch
--- /dev/null 2007-05-20 22:30:53 +0200
+++ mysql6.patch 2007-05-20 22:31:02 +0200
@@ -0,0 +1,177 @@
+Index: include/Makefile.in
+--- include/Makefile.in.orig 2007-04-26 22:28:24 +0200
++++ include/Makefile.in 2007-05-20 20:03:20 +0200
+@@ -398,14 +398,14 @@
+ errmsg.h my_global.h my_net.h \
+ my_getopt.h sslopt-longopts.h my_dir.h \
+ sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
+- m_ctype.h mysql/plugin.h $(HEADERS_GEN)
++ m_ctype.h mysql/plugin.h rijndael.h sha1.h my_aes.h
$(HEADERS_GEN)
+
+ noinst_HEADERS = config-win.h config-netware.h \
+ heap.h my_bitmap.h my_uctype.h \
+ myisam.h myisampack.h myisammrg.h ft_global.h\
+ mysys_err.h my_base.h help_start.h help_end.h \
+- my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \
+- my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
++ my_nosys.h my_alarm.h queues.h \
++ my_tree.h my_trie.h hash.h thr_alarm.h \
+ thr_lock.h t_ctype.h violite.h md5.h base64.h \
+ mysql_version.h.in my_handler.h my_time.h decimal.h \
+ my_vle.h my_user.h my_atomic.h atomic/nolock.h \
+Index: include/my_global.h
+--- include/my_global.h.orig 2007-04-26 22:26:39 +0200
++++ include/my_global.h 2007-05-20 20:03:20 +0200
+@@ -1515,4 +1515,11 @@
+ /* Length of decimal number represented by INT64. */
+ #define MY_INT64_NUM_DECIMAL_DIGITS 21
+
++#ifndef max
++#define max(a,b) ((a) >= (b) ? (a) : (b))
++#endif
++#ifndef min
++#define min(a,b) ((a) <= (b) ? (a) : (b))
++#endif
++
+ #endif /* my_global_h */
+Index: scripts/mysql_config.sh
+--- scripts/mysql_config.sh.orig 2007-04-26 22:26:26 +0200
++++ scripts/mysql_config.sh 2007-05-20 20:03:20 +0200
+@@ -97,9 +97,9 @@
+
+ # Create options
+ # We intentionally add a space to the beginning and end of lib strings,
simplifies replace later
+-libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
++libs=" $ldflags -L$pkglibdir -lmysqlclient -lmysys @ZLIB_DEPS@
@NON_THREADED_LIBS@"
+ libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
+-libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@
@openssl_libs@ "
++libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r -lmysys @ZLIB_DEPS@ @LIBS@
@openssl_libs@ "
+ embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@
@WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
+
+ cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
+Index: scripts/mysql_system_tables_data.sql
+--- scripts/mysql_system_tables_data.sql.orig 2007-04-26 22:26:12
+0200
++++ scripts/mysql_system_tables_data.sql 2007-05-20 20:03:20 +0200
+@@ -2,10 +2,6 @@
+ -- The inital data for system tables of MySQL Server
+ --
+
+--- default grants for anyone to access database 'test' and 'test_%'
+-INSERT INTO db VALUES
('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
+-INSERT INTO db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
+-
+ -- default users allowing root access from local machine
+ INSERT INTO user VALUES
('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
+ REPLACE INTO user VALUES
(@@hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
+Index: sql/Makefile.in
+--- sql/Makefile.in.orig 2007-04-26 22:28:43 +0200
++++ sql/Makefile.in 2007-05-20 20:03:20 +0200
+@@ -507,7 +507,7 @@
+ $(top_builddir)/strings/libmystrings.a
+
+ mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS)
+-LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@
++LDADD = $(SUPPORTING_LIBS)
+ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
+ @pstack_libs@ \
+ @mysql_plugin_libs@ \
+Index: storage/falcon/DateTime.cpp
+--- storage/falcon/DateTime.cpp.orig 2007-04-26 22:26:07 +0200
++++ storage/falcon/DateTime.cpp 2007-05-20 20:57:04 +0200
+@@ -924,8 +924,10 @@
+
+ bool DateTime::isDayLightSavings(tm *time)
+ {
++#if 0
+ if (!daylight)
+ return false;
++#endif
+
+ // Jan to March and November and December are definitely no
+
+Index: storage/falcon/MACAddress.cpp
+--- storage/falcon/MACAddress.cpp.orig 2007-04-26 22:26:06 +0200
++++ storage/falcon/MACAddress.cpp 2007-05-20 21:36:05 +0200
+@@ -25,11 +25,16 @@
+
+ #else
+ #include <unistd.h>
+-#include <net/if.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <netinet/in.h>
++#include <net/if.h>
+ #include <sys/ioctl.h>
+ #endif
+
++#include <my_global.h>
++#include <my_sys.h>
++
+ #include <stdio.h>
+ #include <string.h>
+ #include "Engine.h"
+@@ -83,7 +88,7 @@
+ if (length > 0 && length <= 8)
+ macAddresses [count++] = getAddress (length,
ifTable->table[n].bPhysAddr);
+ }
+-#else
++#elif defined(__linux__)
+ int fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_IP);
+
+ if (fd < 0)
+@@ -99,6 +104,10 @@
+ }
+
+ close (fd);
++#else
++ UCHAR mac[6];
++ if (my_gethwaddr(mac) == 0)
++ macAddresses[count++] = getAddress(6, (UCHAR *)mac);
+ #endif
+
+ return count;
+Index: storage/falcon/MemMgr.cpp
+--- storage/falcon/MemMgr.cpp.orig 2007-04-26 22:26:29 +0200
++++ storage/falcon/MemMgr.cpp 2007-05-20 21:36:46 +0200
+@@ -19,7 +19,7 @@
+ #endif
+
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <memory.h>
+ #include "Engine.h"
+ #include "MemMgr.h"
+Index: storage/falcon/Stream.cpp
+--- storage/falcon/Stream.cpp.orig 2007-04-26 22:26:40 +0200
++++ storage/falcon/Stream.cpp 2007-05-20 22:03:41 +0200
+@@ -19,7 +19,7 @@
+
+ #include <memory.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include "Engine.h"
+Index: storage/falcon/Thread.cpp
+--- storage/falcon/Thread.cpp.orig 2007-04-26 22:26:13 +0200
++++ storage/falcon/Thread.cpp 2007-05-20 22:08:44 +0200
+@@ -244,7 +244,7 @@
+
+ #ifdef _PTHREADS
+ if (!thread->threadId)
+- thread->threadId = pthread_self();
++ thread->threadId = (long unsigned int)pthread_self();
+ #endif
+
+ return thread;
+@@ -335,7 +335,7 @@
+ pthread_attr_t attributes;
+ pthread_attr_init(&attributes);
+ pthread_attr_setdetachstate(&attributes, PTHREAD_CREATE_DETACHED);
+- int ret = pthread_create (&threadId, &attributes, thread, this);
++ int ret = pthread_create ((pthread **)&threadId, &attributes, thread,
this);
+ pthread_attr_destroy(&attributes);
+
+ if (ret)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql6/mysql6.spec
============================================================================
$ cvs diff -u -r0 -r1.1 mysql6.spec
--- /dev/null 2007-05-20 22:30:53 +0200
+++ mysql6.spec 2007-05-20 22:31:02 +0200
@@ -0,0 +1,341 @@
+##
+## mysql6.spec -- OpenPKG RPM Package Specification
+## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/>
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+##
+
+# package version
+%define V_major 6.0
+%define V_minor 0
+%define V_mysql %{V_major}.%{V_minor}-alpha
+%define V_opkg %{V_major}.%{V_minor}
+
+# package information
+Name: mysql6
+Summary: Fast Relational Database Management System
+URL: http://www.mysql.com/products/mysql/
+Vendor: MySQL AB
+Packager: OpenPKG Foundation e.V.
+Distribution: OpenPKG Community
+Class: EVAL
+Group: Database
+License: GPL
+Version: %{V_opkg}
+Release: 20070520
+
+# package options
+%option with_server yes
+%option with_falcon yes
+%option with_innobase yes
+%option with_archive no
+%option with_blackhole no
+%option with_federated no
+%option with_ndbcluster no
+%option with_partition no
+%option with_ssl no
+%option with_embedded no
+%option with_charset utf8
+%option with_collation utf8_unicode_ci
+
+# fixing implicit inter-plugin dependencies and correlations
+%if "%{with_ndbcluster}" == "yes"
+%undefine with_partition
+%define with_partition yes
+%endif
+
+# list of sources
+Source0:
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-%{V_major}/mysql-%{V_mysql}.tar.gz
+Source1: my.cnf
+Source2: my.pwd
+Source3: rc.mysql
+Patch0: mysql6.patch
+
+# build information
+Prefix: %{l_prefix}
+BuildRoot: %{l_buildroot}
+BuildPreReq: OpenPKG, openpkg >= 20060823, perl, make, gcc, gcc::with_cxx =
yes
+PreReq: OpenPKG, openpkg >= 20060823, perl
+BuildPreReq: zlib, readline, ncurses
+PreReq: zlib, readline, ncurses
+%if "%{with_ssl}" == "yes"
+BuildPreReq: openssl
+PreReq: openssl
+%endif
+AutoReq: no
+AutoReqProv: no
+Provides: mysql = %{version}-%{release}
+
+%description
+ MySQL is a multi-user Relational Database Management System (RDBMS),
+ which is controlled through Structured Query Language (SQL)
+ operating in full multi-threading mode. The main goals of MySQL are
+ speed, robustness and ease of use. MySQL was originally developed
+ because of the need for a SQL server that could handle very big
+ databases with magnitude higher speed than what any database vendor
+ could offer.
+
+%track
+ prog mysql6 = {
+ version = %{V_mysql}
+ url = http://dev.mysql.com/downloads/mysql/%{V_major}.html
+ regex = mysql-(__VER__)\.tar\.gz
+ }
+
+%prep
+ %setup -q -n mysql-%{V_mysql}
+ %patch -p0
+
+%build
+ # patch file search path
+ %{l_shtool} subst %{l_value -s -a} \
+ mysys/default.c
+
+ # determine additional configure options
+ case "%{l_platform -t}" in
+ *-freebsd* ) opt="--with-client-ldflags=-static
--with-mysqld-ldflags=-static" ;;
+ *-linux* ) opt="--with-client-ldflags=-static
--with-mysqld-ldflags=-static" ;;
+ *-sunos* ) opt="--with-client-ldflags=-static
--with-mysqld-ldflags=-static" ;;
+ esac
+
+ # configure source tree
+ CC="%{l_cc}" \
+ CXX="%{l_cxx}" \
+ CFLAGS="%{l_cflags -O}" \
+ CXXFLAGS="%{l_cxxflags -O}" \
+ CPPFLAGS="%{l_cppflags ncurses}" \
+ LDFLAGS="-L`pwd`/libmysql %{l_ldflags}" \
+ LIBS="-lz" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --sysconfdir=%{l_prefix}/etc/mysql \
+ --localstatedir=%{l_prefix}/var/mysql \
+ --libexecdir=%{l_prefix}/libexec/mysql \
+ --with-unix-socket-path=%{l_prefix}/var/mysql/mysql.sock \
+ --with-mysqld-user=%{l_musr} \
+ --enable-thread-safe-client \
+ --with-comment="%{l_openpkg_release}" \
+%if "%{with_server}" != "yes"
+ --without-server \
+%else
+ --with-server \
+ --with-plugin-csv \
+ --with-plugin-heap \
+ --with-plugin-myisam \
+ --with-plugin-myisammrg \
+%if "%{with_falcon}" == "yes"
+ --with-plugin-falcon \
+%else
+ --without-plugin-falcon \
+%endif
+%if "%{with_innobase}" == "yes"
+ --with-plugin-innobase \
+%else
+ --without-plugin-innobase \
+%endif
+%if "%{with_archive}" == "yes"
+ --with-plugin-archive \
+%else
+ --without-plugin-archive \
+%endif
+%if "%{with_blackhole}" == "yes"
+ --with-plugin-blackhole \
+%else
+ --without-plugin-blackhole \
+%endif
+%if "%{with_federated}" == "yes"
+ --with-plugin-federated \
+%else
+ --without-plugin-federated \
+%endif
+%if "%{with_ndbcluster}" == "yes"
+ --with-plugin-ndbcluster \
+%else
+ --without-plugin-ndbcluster \
+%endif
+%if "%{with_partition}" == "yes"
+ --with-plugin-partition \
+%else
+ --without-plugin-partition \
+%endif
+%endif
+ --with-zlib-dir=%{l_prefix} \
+%if "%{with_ssl}" == "yes"
+ --with-ssl=%{l_prefix} \
+%endif
+%if "%{with_embedded}" == "yes"
+ --with-embedded-server \
+%endif
+ --with-charset=%{with_charset} \
+ --with-collation=%{with_collation} \
+ --without-readline \
+ --without-libedit \
+ --with-big-tables \
+ --with-low-memory \
+ --disable-shared \
+ $opt
+
+ # build source tree
+ %{l_make} %{l_mflags}
+
+%install
+ rm -rf $RPM_BUILD_ROOT
+
+ # patch init script
+ %{l_shtool} subst %{l_value -s -a} \
+ scripts/mysql_install_db.sh
+
+ # perform standard installation procedure
+ %{l_make} %{l_mflags} install \
+ AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" \
+ DESTDIR=$RPM_BUILD_ROOT
+
+ # move utility 'replace', msql2mysql is patched for new path
+ mv $RPM_BUILD_ROOT%{l_prefix}/bin/replace \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/mysql/
+
+ # strip installation area
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/mysql-test
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/sql-bench
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/share/mysql/mysql-%{V_mysql}.spec
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/share/mysql/binary-configure
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/make_win_src_distribution
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/make_win_binary_distribution
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/comp_err
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
+ strip $RPM_BUILD_ROOT%{l_prefix}/libexec/mysql/* 2>/dev/null || true
+
+ # install global configuration
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/mysql
+ %{l_shtool} install%{l_nil} -c -m 644 %{l_value -s -a} \
+%if "%{with_innobase}" == "yes"
+ -e '/<\/\{0,1\}with_innobase>/d' \
+%else
+ -e '/<with_innobase>/,/<\/with_innobase>/d' \
+%endif
+ %{SOURCE my.cnf} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/mysql/
+ %{l_shtool} install -c -m 600 \
+ %{SOURCE my.pwd} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/mysql/
+
+ # install run-command script
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
+ %{l_shtool} install -c -m 755 %{l_value -s -a} \
+ %{SOURCE rc.mysql} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+ # make sure the database directory exists
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/mysql
+
+ # directory for temporary tables
+ %{l_shtool} mkdir -f -p -m 700 $RPM_BUILD_ROOT%{l_prefix}/var/mysql/tmp
+
+ # optional client-only installation
+%if "%{with_server}" != "yes"
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/mysql
+ ( cd $RPM_BUILD_ROOT%{l_prefix}/bin
+ for bin in *; do
+ case "$bin" in
+ mysql | mysql_config ) ;;
+ * ) rm -f $bin ;;
+ esac
+ done
+ ) || exit $?
+ ( cd $RPM_BUILD_ROOT%{l_prefix}/man/man1
+ for man in *; do
+ case "$man" in
+ mysql.1 | mysql_config.1 ) ;;
+ * ) rm -f $man ;;
+ esac
+ done
+ ) || exit $?
+%endif
+
+ # determine the package files
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+%if "%{with_server}" == "yes"
+ %{l_files_std} \
+ '%config %attr(644,%{l_musr},%{l_mgrp})
%{l_prefix}/etc/mysql/my.cnf' \
+ '%config %attr(600,%{l_susr},%{l_mgrp})
%{l_prefix}/etc/mysql/my.pwd' \
+ '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/mysql' \
+ '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/mysql/tmp'
+%else
+ %{l_files_std}
+%endif
+
+%files -f files
+
+%clean
+ rm -rf $RPM_BUILD_ROOT
+
+%pre
+%if "%{with_server}" == "yes"
+ # before upgrade, save status and stop service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} mysql status 2>/dev/null | tee %{l_tmpfile}`
+ %{l_rc} mysql stop 2>/dev/null
+%endif
+ exit 0
+
+%post
+%if "%{with_server}" == "yes"
+ if [ $1 -eq 1 ]; then
+ # after install, create initial database
+ $RPM_INSTALL_PREFIX/bin/mysql_install_db \
+ --defaults-file=$RPM_INSTALL_PREFIX/etc/mysql/my.cnf >/dev/null
2>&1
+ chown -R %{l_rusr}:%{l_rgrp} $RPM_INSTALL_PREFIX/var/mysql/*
+ ( echo "An initial MySQL DB was created. The owner of the database"
+ echo "is the DB user 'root'. Its initial password is empty."
+ echo "After starting MySQL with..."
+ echo ""
+ echo " \$ $RPM_INSTALL_PREFIX/bin/openpkg rc mysql start"
+ echo ""
+ echo "...you should change the password as soon as possible with:"
+ echo ""
+ echo " \$ $RPM_INSTALL_PREFIX/bin/mysqladmin \\ "
+ echo " -u root password '<new-password>'"
+ echo ""
+ echo "Additionally, because the MySQL package includes automated"
+ echo "maintenance procedures that require administrator access to"
+ echo "the database, you must maintain a (plain text) copy of the"
+ echo "administrator account name and password:"
+ echo ""
+ echo " \$ vi $RPM_INSTALL_PREFIX/etc/mysql/my.pwd"
+ ) | %{l_rpmtool} msg -b -t notice
+ fi
+ if [ $1 -eq 2 ]; then
+ # after upgrade, restore status
+ { eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}; true; } >/dev/null
2>&1
+ [ ".$mysql_active" = .yes ] && %{l_rc} mysql start
+ fi
+%endif
+ exit 0
+
+%preun
+%if "%{with_server}" == "yes"
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} mysql stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/mysql/*.log* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/mysql/*.err* >/dev/null 2>&1 || true
+%endif
+ exit 0
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql6/rc.mysql
============================================================================
$ cvs diff -u -r0 -r1.1 rc.mysql
--- /dev/null 2007-05-20 22:30:53 +0200
+++ rc.mysql 2007-05-20 22:31:02 +0200
@@ -0,0 +1,86 @@
[EMAIL PROTECTED]@/bin/openpkg rc
+##
+## rc.mysql -- Run-Commands
+##
+
+%config
+ mysql_enable="$openpkg_rc_def"
+ [EMAIL PROTECTED]@/etc/mysql/my.pwd
+ [EMAIL PROTECTED]@/etc/mysql/my.cnf
+ mysql_common_prolog="true"
+ mysql_common_epilog="true"
+ mysql_common_numfiles="10"
+ mysql_common_minsize="1M"
+ mysql_common_complevel="9"
+ mysql_err_prolog="true"
+ mysql_err_epilog="true"
+ mysql_err_numfiles="10"
+ mysql_err_minsize="1M"
+ mysql_err_complevel="9"
+
+%common
+ [EMAIL PROTECTED]@/var/mysql/mysqld.pid
+ [EMAIL PROTECTED]@/var/mysql/mysqld.err
+ [EMAIL PROTECTED]@/var/mysql/common.log
+ mysql_flush_logs () {
+ [EMAIL PROTECTED]@/etc/mysql @l_prefix@/bin/mysqladmin \
+ --defaults-extra-file=${mysql_pwd_file} \
+ flush-logs
+ }
+
+%status -u @l_susr@ -o
+ mysql_usable="unknown"
+ mysql_active="no"
+ [EMAIL PROTECTED]@/etc/mysql @l_prefix@/bin/mysqladmin \
+ --defaults-extra-file=${mysql_pwd_file} \
+ ping >/dev/null 2>&1 && mysql_active="yes"
+ if [ $mysql_active = "no" -a -f $mysql_pid_file ] ; then
+ kill -0 `cat $mysql_pid_file` && mysql_active="unknown"
+ fi
+ echo "mysql_enable=\"$mysql_enable\""
+ echo "mysql_usable=\"$mysql_usable\""
+ echo "mysql_active=\"$mysql_active\""
+
+%start -p 400 -u @l_susr@
+ rcService mysql enable yes || exit 0
+ rcService mysql active yes && exit 0
+ cd @l_prefix@
+ cmd="@l_prefix@/bin/mysqld_safe"
+ cmd="$cmd --pid-file=$mysql_pid_file"
+ cmd="$cmd --log-error=$mysql_err_log"
+ su @l_rusr@ -c "$cmd </dev/null >/dev/null 2>&1 &" </dev/null >/dev/null
2>&1
+
+%stop -p 600 -u @l_susr@
+ rcService mysql enable yes || exit 0
+ rcService mysql active no && exit 0
+ mysql_flush_logs
+ [EMAIL PROTECTED]@/etc/mysql @l_prefix@/bin/mysqladmin \
+ --defaults-extra-file=${mysql_pwd_file} \
+ shutdown
+
+%restart -p 400 -u @l_susr@
+ rcService mysql enable yes || exit 0
+ rcService mysql active no && exit 0
+ rc mysql stop start
+
+%daily -u @l_susr@
+ rcService mysql enable yes || exit 0
+ rcTmp -i
+ hintfile=`rcTmp -f -n hint`
+ shtool rotate -f \
+ -n ${mysql_common_numfiles} -s ${mysql_common_minsize} -d \
+ -z ${mysql_common_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
+ -P "${mysql_common_prolog}" \
+ -E "${mysql_common_epilog}; echo 1 >$hintfile" \
+ ${mysql_common_log}
+ shtool rotate -f \
+ -n ${mysql_err_numfiles} -s ${mysql_err_minsize} -d \
+ -z ${mysql_err_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
+ -P "${mysql_err_prolog}" \
+ -E "${mysql_err_epilog}; echo 1 >$hintfile" \
+ ${mysql_err_log}
+ if [ -s $hintfile ]; then
+ mysql_flush_logs
+ fi
+ rcTmp -k
+
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
