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: 11-Mar-2006 13:20:16
Branch: HEAD Handle: 2006031112200802
Added files:
openpkg-src/mysql4 my.cnf my.pwd mysql4.patch mysql4.spec rc.mysql
Log:
upgrade MySQL (package 'mysql') from 4.1 to 5.0. MySQL 4.1 is still
available as package 'mysql4' for backward compatibility reasons.
Summary:
Revision Changes Path
1.10 +89 -0 openpkg-src/mysql4/my.cnf
1.3 +8 -0 openpkg-src/mysql4/my.pwd
1.5 +199 -0 openpkg-src/mysql4/mysql4.patch
1.18 +307 -0 openpkg-src/mysql4/mysql4.spec
1.1 +95 -0 openpkg-src/mysql4/rc.mysql
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql4/my.cnf
============================================================================
$ cvs diff -u -r0 -r1.10 my.cnf
--- /dev/null 2006-03-11 13:20:06 +0100
+++ my.cnf 2006-03-11 13:20:10 +0100
@@ -0,0 +1,89 @@
+##
+## my.cnf -- MySQL configuration
+##
+
+[client]
+socket = @l_prefix@/var/mysql/mysql.sock
+port = 3306
+
+[mysqld]
+#
+# Network settings
+#
+
+bind-address = 127.0.0.1
+port = 3306
+
+# Unix domain socket only, disables TCP/IP
+#skip-networking
+
+#
+# Log file settings
+#
+
+# log file destinations (must be in sync with settings in rc.conf)
+log = @l_prefix@/var/mysql/common.log
+log-update = @l_prefix@/var/mysql/update.log
+# binary log (use instead of log-update, server-id must be unique for
+# replication)
+#log-bin = @l_prefix@/var/mysql/binary.log
+#server-id = 1
+
+#
+# Performance settings
+#
+
+# most important tuning parameters for mysqld
+set-variable = key_buffer_size=64M
+set-variable = table_cache=256
+
+# less important tuning parameters (change if special problems occur)
+set-variable = join_buffer_size=1M
+set-variable = max_connections=1000
+set-variable = max_connect_errors=10
+set-variable = max_delayed_threads=20
+set-variable = max_heap_table_size=16777216
+set-variable = max_sort_length=1024
+set-variable = max_user_connections=1000
+set-variable = record_buffer=131072
+set-variable = sort_buffer=4M
+set-variable = key_buffer=1M
+set-variable = tmp_table_size=32M
+
+# permanent query caching
+set-variable = query_cache_type=1
+# maximum caching size of an individual query
+set-variable = query_cache_limit=1M
+# maximum query cache size
+set-variable = query_cache_size=32M
+
+# minimum chars for full-text search (FTS) index
+#ft_min_word_len=3
+
+# Berkeley DB
+set-variable = [EMAIL PROTECTED]@
+set-variable = [EMAIL PROTECTED]@
+set-variable = [EMAIL PROTECTED]@
+
+# Innobase DB
+#set-variable = innodb_buffer_pool_size=70M
+#set-variable = innodb_additional_mem_pool_size=2M
+#set-variable = innodb_log_files_in_group=3
+#set-variable = innodb_log_file_size=20M
+#set-variable = innodb_log_buffer_size=8M
+#set-variable = innodb_lock_wait_timeout=50
+
+#
+# Miscellaneous
+#
+
+# directory for temporary tables
[EMAIL PROTECTED]@/var/mysql/tmp
+
+[mysqld_safe]
+datadir = @l_prefix@/var/mysql
+socket = @l_prefix@/var/mysql/mysql.sock
+set-variable = [EMAIL PROTECTED]@/var/mysql/mysqld.pid
+user = @l_rusr@
+basedir = @l_prefix@
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql4/my.pwd
============================================================================
$ cvs diff -u -r0 -r1.3 my.pwd
--- /dev/null 2006-03-11 13:20:06 +0100
+++ my.pwd 2006-03-11 13:20:10 +0100
@@ -0,0 +1,8 @@
+##
+## my.pwd -- MySQL configuration (administrator password only)
+##
+
+[mysqladmin]
+user = root
+password =
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql4/mysql4.patch
============================================================================
$ cvs diff -u -r0 -r1.5 mysql4.patch
--- /dev/null 2006-03-11 13:20:06 +0100
+++ mysql4.patch 2006-03-11 13:20:10 +0100
@@ -0,0 +1,199 @@
+Index: include/Makefile.in
+--- include/Makefile.in.orig 2005-10-10 00:47:19 +0200
++++ include/Makefile.in 2005-11-07 18:12:04 +0100
+@@ -330,14 +330,14 @@
+ errmsg.h my_global.h my_net.h my_alloc.h \
+ my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
+ sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
+- sql_state.h mysql_time.h $(BUILT_SOURCES)
++ sql_state.h mysql_time.h my_aes.h rijndael.h
$(BUILT_SOURCES)
+
+ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
+ nisam.h heap.h merge.h my_bitmap.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 hash.h thr_alarm.h \
++ my_nosys.h my_alarm.h queues.h sha1.h \
++ my_tree.h hash.h thr_alarm.h \
+ thr_lock.h t_ctype.h violite.h md5.h \
+ mysql_version.h.in my_handler.h my_time.h
+
+Index: include/my_global.h
+--- include/my_global.h.orig 2005-10-10 00:46:23 +0200
++++ include/my_global.h 2005-11-07 18:12:04 +0100
+@@ -680,9 +680,8 @@
+ #define FLT_MAX ((float)3.40282346638528860e+38)
+ #endif
+
+-#if !defined(HAVE_ISINF) && !defined(isinf)
++#undef isinf
+ #define isinf(X) 0
+-#endif
+
+ /*
+ Max size that must be added to a so that we know Size to make
+Index: scripts/mysql_config.sh
+--- scripts/mysql_config.sh.orig 2005-10-10 00:46:25 +0200
++++ scripts/mysql_config.sh 2005-11-07 18:12:04 +0100
+@@ -93,11 +93,11 @@
+
+ # Create options
+
+-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=`echo "$libs" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's;
*\$;;'`
+
+-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@"
+ libs_r=`echo "$libs_r" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e
's; *\$;;'`
+ cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
+ include="-I$pkgincludedir"
+Index: scripts/mysql_create_system_tables.sh
+--- scripts/mysql_create_system_tables.sh.orig 2005-10-10 00:46:35
+0200
++++ scripts/mysql_create_system_tables.sh 2005-11-07 18:12:04 +0100
+@@ -71,9 +71,6 @@
+ c_d="$c_d ) engine=MyISAM"
+ c_d="$c_d CHARACTER SET utf8 COLLATE utf8_bin"
+ c_d="$c_d comment='Database privileges';"
+-
+- i_d="INSERT INTO db VALUES
('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');
+- INSERT INTO db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');"
+ fi
+
+ if test ! -f $mdata/host.frm
+@@ -150,17 +147,13 @@
+ then
+ i_u="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','','','','',0,0,0);
+ INSERT 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','','','','',0,0,0);
+- REPLACE INTO user VALUES
('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+- INSERT INTO user (host,user) values ('localhost','');
+- INSERT INTO user (host,user) values ('$hostname','');"
++ REPLACE INTO user VALUES
('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
+ else
+ i_u="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','','','','',0,0,0);"
+ if test "$windows" = "0"
+ then
+ i_u="$i_u
+- INSERT 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','','','','',0,0,0);
+- INSERT INTO user (host,user) values ('$hostname','');
+- INSERT INTO user (host,user) values ('localhost','');"
++ INSERT 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','','','','',0,0,0);"
+ else
+ i_u="$i_u
+ INSERT INTO user VALUES
('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
+Index: scripts/mysqld_safe.sh
+--- scripts/mysqld_safe.sh.orig 2005-10-10 00:46:44 +0200
++++ scripts/mysqld_safe.sh 2005-11-07 18:12:04 +0100
+@@ -121,7 +121,7 @@
+ # Next try where the source installs put it
+ elif test -d $MY_BASEDIR_VERSION/var/mysql
+ then
+- DATADIR=$MY_BASEDIR_VERSION/var
++ DATADIR=$MY_BASEDIR_VERSION/var/mysql
+ # Or just give up and use our compiled-in default
+ else
+ [EMAIL PROTECTED]@
+Index: mysys/Makefile.in
+--- mysys/Makefile.in.orig 2005-10-10 00:47:23 +0200
++++ mysys/Makefile.in 2005-11-10 11:50:57 +0100
+@@ -247,6 +247,7 @@
+ DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
+ DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
+ DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \
++ -DETCDIR="\"$(MYSQLETCdir)\"" \
+ -DDATADIR="\"$(MYSQLDATAdir)\"" \
+ -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
+ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
+@@ -452,6 +453,7 @@
+ vio_dir = @vio_dir@
+ vio_libs = @vio_libs@
+ zlib_dir = @zlib_dir@
++MYSQLETCdir = $(sysconfdir)
+ MYSQLDATAdir = $(localstatedir)
+ MYSQLSHAREdir = $(pkgdatadir)
+ MYSQLBASEdir = $(prefix)
+Index: mysys/default.c
+--- mysys/default.c.orig 2005-11-10 10:26:30 +0100
++++ mysys/default.c 2005-11-10 11:53:32 +0100
+@@ -48,7 +48,7 @@
+ #elif defined(__NETWARE__)
+ "sys:/etc/",
+ #else
+-"/etc/",
++ETCDIR,
+ #endif
+ #ifdef DATADIR
+ DATADIR,
+Index: libmysql/Makefile.in
+--- libmysql/Makefile.in.orig 2005-10-10 00:47:20 +0200
++++ libmysql/Makefile.in 2005-11-10 12:13:57 +0100
+@@ -213,6 +213,7 @@
+ DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
+ DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
+ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
++ -DETCDIR="\"$(MYSQLETCdir)\"" \
+ -DDATADIR="\"$(MYSQLDATAdir)\"" \
+ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
+
+@@ -420,6 +421,7 @@
+ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
+ $(openssl_includes) @ZLIB_INCLUDES@
+
++MYSQLETCdir = $(sysconfdir)
+ MYSQLDATAdir = $(localstatedir)
+ MYSQLSHAREdir = $(pkgdatadir)
+ MYSQLBASEdir = $(prefix)
+Index: libmysql_r/Makefile.in
+--- libmysql_r/Makefile.in.orig 2005-10-10 00:47:20 +0200
++++ libmysql_r/Makefile.in 2005-11-10 12:14:34 +0100
+@@ -211,6 +211,7 @@
+ DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
+ DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
+ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
++ -DETCDIR="\"$(MYSQLETCdir)\"" \
+ -DDATADIR="\"$(MYSQLDATAdir)\"" \
+ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
+
+@@ -419,6 +420,7 @@
+ -I$(top_builddir)/include -I$(top_srcdir)/include \
+ $(openssl_includes) @ZLIB_INCLUDES@
+
++MYSQLETCdir = $(sysconfdir)
+ MYSQLDATAdir = $(localstatedir)
+ MYSQLSHAREdir = $(pkgdatadir)
+ MYSQLBASEdir = $(prefix)
+Index: bdb/mutex/mut_fcntl.c
+--- bdb/mutex/mut_fcntl.c.orig 2005-10-10 00:46:27 +0200
++++ bdb/mutex/mut_fcntl.c 2005-11-11 13:44:07 +0100
+@@ -101,7 +101,7 @@
+
+ /* Acquire an exclusive kernel lock. */
+ k_lock.l_type = F_WRLCK;
+- if (fcntl(dbenv->lockfhp->fd, F_SETLKW, &k_lock))
++ if (fcntl(dbenv->lockfhp->fd, F_SETLKW, &k_lock) == -1)
+ return (__os_get_errno());
+
+ /* If the resource is still available, it's ours. */
+@@ -112,7 +112,7 @@
+
+ /* Release the kernel lock. */
+ k_lock.l_type = F_UNLCK;
+- if (fcntl(dbenv->lockfhp->fd, F_SETLK, &k_lock))
++ if (fcntl(dbenv->lockfhp->fd, F_SETLK, &k_lock) == -1)
+ return (__os_get_errno());
+
+ /*
+Index: bdb/os/os_open.c
+--- bdb/os/os_open.c.orig 2005-10-10 00:46:27 +0200
++++ bdb/os/os_open.c 2005-11-11 13:44:07 +0100
+@@ -93,7 +93,7 @@
+ if (LF_ISSET(DB_OSO_TRUNC))
+ oflags |= O_TRUNC;
+
+-#ifdef HAVE_O_DIRECT
++#if defined(HAVE_O_DIRECT) && defined(__FreeBSD__)
+ if (LF_ISSET(DB_OSO_DIRECT))
+ oflags |= O_DIRECT;
+ #endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql4/mysql4.spec
============================================================================
$ cvs diff -u -r0 -r1.18 mysql4.spec
--- /dev/null 2006-03-11 13:20:06 +0100
+++ mysql4.spec 2006-03-11 13:20:11 +0100
@@ -0,0 +1,307 @@
+##
+## mysql4.spec -- OpenPKG RPM Package Specification
+## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2006 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 4.1
+%define V_minor 18
+%define V_mysql %{V_major}.%{V_minor}
+%define V_opkg %{V_major}.%{V_minor}
+
+# package information
+Name: mysql4
+Summary: Fast Relational Database Management System
+URL: http://www.mysql.com/products/mysql/
+Vendor: MySQL AB
+Packager: OpenPKG
+Distribution: OpenPKG
+Class: PLUS
+Group: Database
+License: GPL
+Version: %{V_opkg}
+Release: 20060311
+
+# package options
+%option with_server yes
+%option with_bdb yes
+%option with_innodb no
+%option with_ssl no
+%option with_ndb no
+%option with_embedded no
+
+# 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: mysql4.patch
+
+# build information
+Prefix: %{l_prefix}
+BuildRoot: %{l_buildroot}
+BuildPreReq: OpenPKG, openpkg >= 20040130, perl, gcc, make
+PreReq: OpenPKG, openpkg >= 20040130, 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 mysql4 = {
+ 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
+ # 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`/bdb/build_unix -L`pwd`/libmysql %{l_ldflags}" \
+ ./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 \
+%endif
+%if "%{with_bdb}" == "yes"
+ --with-berkeley-db \
+%endif
+%if "%{with_innodb}" == "no"
+ --without-innodb \
+%endif
+%if "%{with_ssl}" == "yes"
+ --with-openssl \
+ --with-openssl-includes=%{l_prefix}/include \
+ --with-openssl-libs=%{l_prefix}/lib \
+%endif
+%if "%{with_ndb}" == "yes"
+ --with-ndbcluster \
+ --with-ndb-shm \
+%endif
+%if "%{with_embedded}" == "yes"
+ --with-embedded-server \
+%endif
+ --without-readline \
+ --without-libedit \
+ --with-vio \
+ --with-named-z-libs=no \
+ --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
+
+ # determine default parameters
+%if "%{with_bdb}" == "yes"
+ l_mysql_bdb_cache_size=8M
+ l_mysql_bdb_log_buffer_size=32k
+ l_mysql_bdb_max_lock=10000
+%else
+ l_mysql_bdb_cache_size=0
+ l_mysql_bdb_log_buffer_size=0
+ l_mysql_bdb_max_lock=0
+%endif
+%if "%{with_bdb}" == "yes" || "%{with_innodb}" == "yes"
+ l_mysqld=mysqld
+%else
+ l_mysqld=mysqld-max
+%endif
+
+ # install global configuration
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/mysql
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ -e "s;@l_mysql_bdb_cache_size@;${l_mysql_bdb_cache_size};g" \
+ -e
"s;@l_mysql_bdb_log_buffer_size@;${l_mysql_bdb_log_buffer_size};g" \
+ -e "s;@l_mysql_bdb_max_lock@;${l_mysql_bdb_max_lock};g" \
+ %{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} \
+ -e "s;@l_mysqld@;${l_mysqld};g" \
+ %{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/etc/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/mysql4/rc.mysql
============================================================================
$ cvs diff -u -r0 -r1.1 rc.mysql
--- /dev/null 2006-03-11 13:20:06 +0100
+++ rc.mysql 2006-03-11 13:20:11 +0100
@@ -0,0 +1,95 @@
[EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/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_update_prolog="true"
+ mysql_update_epilog="true"
+ mysql_update_numfiles="10"
+ mysql_update_minsize="1M"
+ mysql_update_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
+ [EMAIL PROTECTED]@/var/mysql/update.log
+
+%status -u @l_susr@ -o
+ mysql_usable="unknown"
+ mysql_active="no"
+ @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_rusr@
+ rcService mysql enable yes || exit 0
+ rcService mysql active yes && exit 0
+ cd @l_prefix@
+ @l_prefix@/bin/mysqld_safe >/dev/null 2>&1 \
+ [EMAIL PROTECTED]@ \
+ --pid-file="$mysql_pid_file" \
+ --err-log="$mysql_err_log" &
+
+%stop -p 600 -u @l_susr@
+ rcService mysql enable yes || exit 0
+ rcService mysql active no && exit 0
+ [EMAIL PROTECTED]@/etc/mysql @l_prefix@/bin/mysqladmin \
+ --defaults-extra-file=${mysql_pwd_file} \
+ 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_update_numfiles} -s ${mysql_update_minsize} -d \
+ -z ${mysql_update_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
+ -P "${mysql_update_prolog}" \
+ -E "${mysql_update_epilog}; echo 1 >$hintfile" \
+ ${mysql_update_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
+ rc mysql restart
+ fi
+ rcTmp -k
+
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
