OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Jun-2003 13:37:55
Branch: HEAD Handle: 2003060912375202
Added files:
openpkg-src/mysql3 my.cnf my.pwd mysql3.patch mysql3.spec rc.mysql3
Modified files:
openpkg-src/mysql my.cnf mysql.patch mysql.spec rc.mysql
Removed files:
openpkg-src/mysql4 my.cnf my.pwd mysql4.patch mysql4.spec rc.mysql4
Log:
Following our general rules for dealing with versioned packages (and
the fact that we only want _one_ single version in each release, of
course), the old (MySQL-3 based) "mysql" package was first merged up to
1-STABLE (for possible inclusion into OpenPKG 1.3), then "mysql" was
renamed to "mysql3" (in case you still have to drive MySQL 3 within
OpenPKG-CURRENT), "mysql4" become "mysql" and "mysql4" has gone.
Summary:
Revision Changes Path
1.9 +12 -7 openpkg-src/mysql/my.cnf
1.5 +31 -60 openpkg-src/mysql/mysql.patch
1.58 +37 -59 openpkg-src/mysql/mysql.spec
1.9 +2 -2 openpkg-src/mysql/rc.mysql
1.1 +57 -0 openpkg-src/mysql3/my.cnf
1.1 +3 -0 openpkg-src/mysql3/my.pwd
1.1 +94 -0 openpkg-src/mysql3/mysql3.patch
1.1 +234 -0 openpkg-src/mysql3/mysql3.spec
1.1 +60 -0 openpkg-src/mysql3/rc.mysql3
1.9 +0 -62 openpkg-src/mysql4/my.cnf
1.2 +0 -3 openpkg-src/mysql4/my.pwd
1.4 +0 -65 openpkg-src/mysql4/mysql4.patch
1.17 +0 -208 openpkg-src/mysql4/mysql4.spec
1.5 +0 -60 openpkg-src/mysql4/rc.mysql4
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/my.cnf
============================================================================
$ cvs diff -u -r1.8 -r1.9 my.cnf
--- openpkg-src/mysql/my.cnf 5 May 2003 13:47:41 -0000 1.8
+++ openpkg-src/mysql/my.cnf 9 Jun 2003 11:37:53 -0000 1.9
@@ -9,30 +9,35 @@
[mysqld]
bind-address = 127.0.0.1
port = 3306
+# logfile destinations (overwrite values of rc.mysql in rc.conf accordingly)
+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
+
-[safe_mysqld]
+[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@
-# logfile destinations (overwrite values of rc.mysql in rc.conf accordingly)
-log = @l_prefix@/var/mysql/common.log
-log-update = @l_prefix@/var/mysql/update.log
-
# most important tuning parameters for mysqld
set-variable = key_buffer_size=16M
set-variable = table_cache=64
-# less important tuning paramaters (change if special problems occur)
+# 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=0
+# for max_user_connections=0 (unlimited) comment out the following line
+set-variable = max_user_connections=1000
set-variable = record_buffer=131072
set-variable = record_rnd_buffer=131072
set-variable = sort_buffer=2M
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 mysql.patch
--- openpkg-src/mysql/mysql.patch 18 Mar 2003 11:16:15 -0000 1.4
+++ openpkg-src/mysql/mysql.patch 9 Jun 2003 11:37:53 -0000 1.5
@@ -1,43 +1,6 @@
---- sql/mini_client.cc.dist Tue Mar 18 12:10:58 2003
-+++ sql/mini_client.cc Tue Mar 18 12:11:17 2003
-@@ -318,7 +318,7 @@
- */
-
- s_err=0;
-- if (getsockopt(s, SOL_SOCKET, SO_ERROR, (char*) &s_err, &s_err_size) != 0)
-+ if (getsockopt(s, SOL_SOCKET, SO_ERROR, (char*) &s_err, (socklen_t
*)&s_err_size) != 0)
- return(-1);
-
- if (s_err)
---- sql/mysqld.cc.dist Tue Mar 18 12:10:58 2003
-+++ sql/mysqld.cc Tue Mar 18 12:11:18 2003
-@@ -2476,7 +2476,7 @@
- {
- size_socket length=sizeof(struct sockaddr_in);
- new_sock = accept(sock, my_reinterpret_cast(struct sockaddr *) (&cAddr),
-- &length);
-+ (socklen_t *)&length);
- if (new_sock != INVALID_SOCKET ||
- (socket_errno != SOCKET_EINTR && socket_errno != SOCKET_EAGAIN))
- break;
-@@ -2542,7 +2542,7 @@
- size_socket dummyLen;
- struct sockaddr dummy;
- dummyLen = sizeof(struct sockaddr);
-- if (getsockname(new_sock,&dummy, &dummyLen) < 0)
-+ if (getsockname(new_sock,&dummy, (socklen_t *)&dummyLen) < 0)
- {
- sql_perror("Error on new connection socket");
- (void) shutdown(new_sock,2);
---- scripts/mysql_install_db.sh.dist Tue Mar 18 12:10:58 2003
-+++ scripts/mysql_install_db.sh Tue Mar 18 12:11:18 2003
-@@ -133,14 +133,13 @@
- fi
- fi
-
--# Create database directories mysql & test
-+# Create database directories mysql
- if test "$IN_RPM" -eq 0
+--- scripts/mysql_install_db.sh.dist Wed Jan 29 12:29:21 2003
++++ scripts/mysql_install_db.sh Wed Feb 5 09:56:12 2003
+@@ -138,9 +138,8 @@
then
if test ! -d $ldata; then mkdir $ldata; chmod 700 $ldata ; fi
if test ! -d $ldata/mysql; then mkdir $ldata/mysql; chmod 700 $ldata/mysql ; fi
@@ -48,44 +11,52 @@
fi
fi
-@@ -176,8 +175,6 @@
+@@ -178,8 +177,6 @@
c_d="$c_d )"
c_d="$c_d comment='Database privileges';"
-- i_d="INSERT INTO db VALUES
('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y');
-- INSERT INTO db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y');"
+- 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
-@@ -232,10 +229,8 @@
- INSERT INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+@@ -250,10 +247,7 @@
+ 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
('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
-- REPLACE INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
-+ REPLACE INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');"
-
-- INSERT INTO user VALUES
('localhost','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');
-- INSERT INTO user VALUES
('$hostname','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');"
+ REPLACE 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);
+- 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','','','','',0,0,0);
+-
+- INSERT INTO user (host,user) values ('localhost','');
+- INSERT INTO user (host,user) values ('$hostname','');"
++ 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','','','','',0,0,0);"
fi
if test ! -f $mdata/func.frm
-@@ -333,10 +328,8 @@
+@@ -351,10 +345,7 @@
if test "$IN_RPM" -eq 0
then
echo "You can start the MySQL daemon with:"
-- echo "cd @prefix@ ; $bindir/safe_mysqld &"
-+ echo "@l_prefix@/etc/rc mysql start"
- echo
+- echo "cd @prefix@ ; $bindir/mysqld_safe &"
+- echo
- echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench'
directory:"
-- echo "cd sql-bench ; run-all-tests"
+- echo "cd sql-bench ; perl run-all-tests"
++ echo "@l_prefix@/etc/rc mysql start"
echo
fi
echo "Please report any problems with the @scriptdir@/mysqlbug script!"
---- mysys/default.c.dist Tue Mar 18 12:10:58 2003
-+++ mysys/default.c Tue Mar 18 12:11:18 2003
+--- scripts/msql2mysql.sh.dist Tue Feb 11 09:50:29 2003
++++ scripts/msql2mysql.sh Tue Feb 11 09:53:08 2003
+@@ -13,4 +13,4 @@
+ # described in the License. Among other things, the License requires that
+ # the copyright notice and this notice be preserved on all copies.
+
[EMAIL PROTECTED]@/replace msqlConnect mysql_connect msqlListDBs mysql_list_dbs
msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row msqlFetchField
mysql_fetch_field msqlFreeResult mysql_free_result msqlListFields mysql_list_fields
msqlListTables mysql_list_tables msqlErrMsg 'mysql_error(mysql)' msqlStoreResult
mysql_store_result msqlQuery mysql_query msqlField mysql_field msqlSelect mysql_select
msqlSelectDB mysql_select_db msqlNumFields mysql_num_fields msqlClose mysql_close
msqlDataSeek mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW
msql mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB mysql_drop_db
msqlFieldSeek mysql_field_seek -- $*
[EMAIL PROTECTED]@/replace msqlConnect mysql_connect msqlListDBs mysql_list_dbs
msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row msqlFetchField
mysql_fetch_field msqlFreeResult mysql_free_result msqlListFields mysql_list_fields
msqlListTables mysql_list_tables msqlErrMsg 'mysql_error(mysql)' msqlStoreResult
mysql_store_result msqlQuery mysql_query msqlField mysql_field msqlSelect mysql_select
msqlSelectDB mysql_select_db msqlNumFields mysql_num_fields msqlClose mysql_close
msqlDataSeek mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW
msql mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB mysql_drop_db
msqlFieldSeek mysql_field_seek -- $*
+--- mysys/default.c.dist Wed Jan 29 12:29:20 2003
++++ mysys/default.c Wed Feb 5 09:58:40 2003
@@ -49,7 +49,7 @@
- #ifdef __WIN__
- "C:/",
+ #elif defined(__NETWARE__)
+ "sys:/etc/",
#else
-"/etc/",
+"@l_prefix@/etc/mysql/",
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.spec
============================================================================
$ cvs diff -u -r1.57 -r1.58 mysql.spec
--- openpkg-src/mysql/mysql.spec 5 May 2003 13:47:41 -0000 1.57
+++ openpkg-src/mysql/mysql.spec 9 Jun 2003 11:37:53 -0000 1.58
@@ -24,8 +24,10 @@
##
# package version
-%define V_major 3.23
-%define V_minor 56
+%define V_major 4.0
+%define V_minor 13
+%define V_mysql %{V_major}.%{V_minor}
+%define V_opkg %{V_major}.%{V_minor}
# package information
Name: mysql
@@ -33,23 +35,22 @@
URL: http://www.mysql.com/
Vendor: MySQL AB
Packager: The OpenPKG Project
-Distribution: OpenPKG [BASE]
+Distribution: OpenPKG [PLUS]
Group: Database
License: GPL
-Version: %{V_major}.%{V_minor}
-Release: 20030505
+Version: %{V_opkg}
+Release: 20030609
# package options
%option with_berkeleydb yes
%option with_innobase no
-%option with_gemini no
# list of sources
-Source0:
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-%{V_major}/mysql-%{version}.tar.gz
+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: mysql.patch
+Source3: rc.%{name}
+Patch0: %{name}.patch
# build information
Prefix: %{l_prefix}
@@ -59,7 +60,7 @@
AutoReq: no
AutoReqProv: no
Provides: MYSQL
-Conflicts: mysql4
+Conflicts: mysql3
%description
MySQL is a multi-user Relational Database Management System (RDBMS),
@@ -79,24 +80,6 @@
-e 's;@l_prefix@;%{l_prefix};g' \
mysys/default.c
- # patch socklen_t for Sol6
- case "%{l_target}" in
- *-solaris2.6* )
- %{l_shtool} subst \
- -e 's;socklen_t;size_t;g' \
- acinclude.m4 \
- aclocal.m4 \
- configure \
- include/global.h \
- include/my_global.h \
- libmysql/acinclude.m4
- %{l_shtool} subst \
- -e 's;socklen_t;size_socket;g' \
- sql/mini_client.cc \
- sql/mysqld.cc
- ;;
- esac
-
# determine additional configure options
case "%{l_target}" in
*-freebsd* ) opt="--with-client-ldflags=-static
--with-mysqld-ldflags=-static" ;;
@@ -104,9 +87,6 @@
*-solaris* ) opt="--with-client-ldflags=-static
--with-mysqld-ldflags=-static" ;;
esac
- # only use system default path
- unset LD_LIBRARY_PATH || true
-
# configure source tree
CC="%{l_cc}" \
CXX="%{l_cxx}" \
@@ -114,26 +94,24 @@
CXXFLAGS="%{l_cxxflags -O}" \
./configure \
--prefix=%{l_prefix} \
- --sysconfdir=%{l_prefix}/etc/mysql \
- --localstatedir=%{l_prefix}/var/mysql \
- --with-unix-socket-path=%{l_prefix}/var/mysql/mysql.sock \
+ --sysconfdir=%{l_prefix}/etc/%{name} \
+ --localstatedir=%{l_prefix}/var/%{name} \
+ --libexecdir=%{l_prefix}/libexec/%{name} \
+ --with-unix-socket-path=%{l_prefix}/var/%{name}/mysql.sock \
--with-mysqld-user=%{l_musr} \
--enable-thread-safe-client \
%if "%{with_berkeleydb}" == "yes"
--with-berkeley-db \
%endif
-%if "%{with_innobase}" == "yes"
- --with-innodb \
-%endif
-%if "%{with_gemini}" == "yes"
- --with-gemini \
+%if "%{with_innobase}" == "no"
+ --without-innodb \
%endif
--with-low-memory \
--disable-shared \
$opt
# build source tree
- %{l_make} %{l_mflags -O}
+ %{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ -148,18 +126,18 @@
AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" \
DESTDIR=$RPM_BUILD_ROOT
- # KLUDGE: my_dir.h is not installed!
- %{l_shtool} install -c -m 644 \
- include/my_dir.h $RPM_BUILD_ROOT%{l_prefix}/include/mysql/
+ # move utility 'replace', msql2mysql is patched for new path
+ mv $RPM_BUILD_ROOT%{l_prefix}/bin/replace \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}
# 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-%{version}.spec
- rm -f $RPM_BUILD_ROOT%{l_prefix}/share/mysql/binary-configure
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
- strip $RPM_BUILD_ROOT%{l_prefix}/libexec/* 2>/dev/null || true
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/share/%{name}/mysql-%{V_mysql}.spec
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/share/%{name}/binary-configure
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
+ strip $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}/* 2>/dev/null || true
# determine default parameters
%if "%{with_berkeleydb}" == "yes"
@@ -178,7 +156,7 @@
%endif
# install global configuration
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/mysql
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}
%{l_shtool} install -c -m 644 \
-e 's;@l_prefix@;%{l_prefix};g' \
-e 's;@l_rusr@;%{l_rusr};g' \
@@ -186,10 +164,10 @@
-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/
+ $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}/
%{l_shtool} install -c -m 600 \
%{SOURCE my.pwd} \
- $RPM_BUILD_ROOT%{l_prefix}/etc/mysql/
+ $RPM_BUILD_ROOT%{l_prefix}/etc/%{name}/
# install run-command script
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
@@ -198,16 +176,16 @@
-e 's;@l_rusr@;%{l_rusr};g' \
-e 's;@l_rgrp@;%{l_rgrp};g' \
-e "s;@l_mysqld@;${l_mysqld};g" \
- %{SOURCE rc.mysql} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+ %{SOURCE rc.%{name}} $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
+ %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/%{name}
# determine the package files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%config %{l_prefix}/etc/mysql/my.cnf' \
- '%config %{l_prefix}/etc/mysql/my.pwd'
+ '%config %{l_prefix}/etc/%{name}/my.cnf' \
+ '%config %{l_prefix}/etc/%{name}/my.pwd'
%files -f files
@@ -217,14 +195,14 @@
%post
# create initial database
$RPM_INSTALL_PREFIX/bin/mysql_install_db \
- --defaults-file=$RPM_INSTALL_PREFIX/etc/mysql/my.cnf
+ --defaults-file=$RPM_INSTALL_PREFIX/etc/%{name}/my.cnf
chown %{l_rusr}:%{l_rgrp} \
- $RPM_INSTALL_PREFIX/etc/mysql/my.cnf \
- $RPM_INSTALL_PREFIX/etc/mysql/my.pwd
- chown -R %{l_rusr}:%{l_rgrp} $RPM_INSTALL_PREFIX/var/mysql/
+ $RPM_INSTALL_PREFIX/etc/%{name}/my.cnf \
+ $RPM_INSTALL_PREFIX/etc/%{name}/my.pwd
+ chown -R %{l_rusr}:%{l_rgrp} $RPM_INSTALL_PREFIX/var/%{name}/
( echo "The MySQL package includes automated maintenance procedures"
echo "that require administrator access to the database. For this"
echo "to work you must keep a copy (plain text) of the administrator"
- echo "account in '$RPM_INSTALL_PREFIX/etc/mysql/my.pwd'."
+ echo "account in '$RPM_INSTALL_PREFIX/etc/%{name}/my.pwd'."
) | %{l_rpmtool} msg -b -t notice
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/rc.mysql
============================================================================
$ cvs diff -u -r1.8 -r1.9 rc.mysql
--- openpkg-src/mysql/rc.mysql 24 Mar 2003 20:08:34 -0000 1.8
+++ openpkg-src/mysql/rc.mysql 9 Jun 2003 11:37:53 -0000 1.9
@@ -23,7 +23,7 @@
%start -p 200 -u @l_rusr@
opServiceEnabled mysql || exit 0
cd @l_prefix@
- @l_prefix@/bin/safe_mysqld >/dev/null 2>&1 \
+ @l_prefix@/bin/mysqld_safe >/dev/null 2>&1 \
[EMAIL PROTECTED]@ \
--pid-file="$mysql_pid_file" \
--err-log="$mysql_log_err" &
@@ -40,7 +40,7 @@
@l_prefix@/bin/mysqladmin \
--defaults-extra-file=${mysql_pwd_file} \
shutdown
- @l_prefix@/bin/safe_mysqld >/dev/null 2>&1 \
+ @l_prefix@/bin/mysqld_safe >/dev/null 2>&1 \
[EMAIL PROTECTED]@ \
--pid-file="$mysql_pid_file" \
--err-log="$mysql_log_err" &
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql3/my.cnf
============================================================================
$ cvs diff -u -r0 -r1.1 my.cnf
--- /dev/null 2003-06-09 13:37:52.000000000 +0200
+++ my.cnf 2003-06-09 13:37:52.000000000 +0200
@@ -0,0 +1,57 @@
+##
+## my.cnf -- MySQL configuration
+##
+
+[client]
+socket = @l_prefix@/var/mysql/mysql.sock
+port = 3306
+
+[mysqld]
+bind-address = 127.0.0.1
+port = 3306
+
+[safe_mysqld]
+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@
+
+# logfile destinations (overwrite values of rc.mysql in rc.conf accordingly)
+log = @l_prefix@/var/mysql/common.log
+log-update = @l_prefix@/var/mysql/update.log
+
+# most important tuning parameters for mysqld
+set-variable = key_buffer_size=16M
+set-variable = table_cache=64
+
+# less important tuning paramaters (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=0
+set-variable = record_buffer=131072
+set-variable = record_rnd_buffer=131072
+set-variable = sort_buffer=2M
+set-variable = key_buffer=1M
+set-variable = tmp_table_size=32M
+
+# Berkeley DB
+set-variable = [EMAIL PROTECTED]@
+set-variable = [EMAIL PROTECTED]@
+set-variable = [EMAIL PROTECTED]@
+
+# Innobase
+#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
+#innodb_data_home_dir =
+#innodb_data_file_path = @innodb_data_file_path@
+#innodb_flush_log_at_trx_commit = 1
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql3/my.pwd
============================================================================
$ cvs diff -u -r0 -r1.1 my.pwd
--- /dev/null 2003-06-09 13:37:52.000000000 +0200
+++ my.pwd 2003-06-09 13:37:52.000000000 +0200
@@ -0,0 +1,3 @@
+[mysqladmin]
+user = root
+password =
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql3/mysql3.patch
============================================================================
$ cvs diff -u -r0 -r1.1 mysql3.patch
--- /dev/null 2003-06-09 13:37:52.000000000 +0200
+++ mysql3.patch 2003-06-09 13:37:52.000000000 +0200
@@ -0,0 +1,94 @@
+--- sql/mini_client.cc.dist Tue Mar 18 12:10:58 2003
++++ sql/mini_client.cc Tue Mar 18 12:11:17 2003
+@@ -318,7 +318,7 @@
+ */
+
+ s_err=0;
+- if (getsockopt(s, SOL_SOCKET, SO_ERROR, (char*) &s_err, &s_err_size) != 0)
++ if (getsockopt(s, SOL_SOCKET, SO_ERROR, (char*) &s_err, (socklen_t
*)&s_err_size) != 0)
+ return(-1);
+
+ if (s_err)
+--- sql/mysqld.cc.dist Tue Mar 18 12:10:58 2003
++++ sql/mysqld.cc Tue Mar 18 12:11:18 2003
+@@ -2476,7 +2476,7 @@
+ {
+ size_socket length=sizeof(struct sockaddr_in);
+ new_sock = accept(sock, my_reinterpret_cast(struct sockaddr *) (&cAddr),
+- &length);
++ (socklen_t *)&length);
+ if (new_sock != INVALID_SOCKET ||
+ (socket_errno != SOCKET_EINTR && socket_errno != SOCKET_EAGAIN))
+ break;
+@@ -2542,7 +2542,7 @@
+ size_socket dummyLen;
+ struct sockaddr dummy;
+ dummyLen = sizeof(struct sockaddr);
+- if (getsockname(new_sock,&dummy, &dummyLen) < 0)
++ if (getsockname(new_sock,&dummy, (socklen_t *)&dummyLen) < 0)
+ {
+ sql_perror("Error on new connection socket");
+ (void) shutdown(new_sock,2);
+--- scripts/mysql_install_db.sh.dist Tue Mar 18 12:10:58 2003
++++ scripts/mysql_install_db.sh Tue Mar 18 12:11:18 2003
+@@ -133,14 +133,13 @@
+ fi
+ fi
+
+-# Create database directories mysql & test
++# Create database directories mysql
+ if test "$IN_RPM" -eq 0
+ then
+ if test ! -d $ldata; then mkdir $ldata; chmod 700 $ldata ; fi
+ if test ! -d $ldata/mysql; then mkdir $ldata/mysql; chmod 700 $ldata/mysql ; fi
+- if test ! -d $ldata/test; then mkdir $ldata/test; chmod 700 $ldata/test ; fi
+ if test -w / -a ! -z "$user"; then
+- chown $user $ldata $ldata/mysql $ldata/test;
++ chown $user $ldata $ldata/mysql
+ fi
+ fi
+
+@@ -176,8 +175,6 @@
+ c_d="$c_d )"
+ c_d="$c_d comment='Database privileges';"
+
+- i_d="INSERT INTO db VALUES
('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y');
+- INSERT INTO db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y');"
+ fi
+
+ if test ! -f $mdata/host.frm
+@@ -232,10 +229,8 @@
+ INSERT INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+
+ REPLACE INTO user VALUES
('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+- REPLACE INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
++ REPLACE INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');"
+
+- INSERT INTO user VALUES
('localhost','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');
+- INSERT INTO user VALUES
('$hostname','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');"
+ fi
+
+ if test ! -f $mdata/func.frm
+@@ -333,10 +328,8 @@
+ if test "$IN_RPM" -eq 0
+ then
+ echo "You can start the MySQL daemon with:"
+- echo "cd @prefix@ ; $bindir/safe_mysqld &"
++ echo "@l_prefix@/etc/rc mysql start"
+ echo
+- echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench'
directory:"
+- echo "cd sql-bench ; run-all-tests"
+ echo
+ fi
+ echo "Please report any problems with the @scriptdir@/mysqlbug script!"
+--- mysys/default.c.dist Tue Mar 18 12:10:58 2003
++++ mysys/default.c Tue Mar 18 12:11:18 2003
+@@ -49,7 +49,7 @@
+ #ifdef __WIN__
+ "C:/",
+ #else
+-"/etc/",
++"@l_prefix@/etc/mysql/",
+ #endif
+ #ifdef DATADIR
+ DATADIR,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql3/mysql3.spec
============================================================================
$ cvs diff -u -r0 -r1.1 mysql3.spec
--- /dev/null 2003-06-09 13:37:52.000000000 +0200
+++ mysql3.spec 2003-06-09 13:37:52.000000000 +0200
@@ -0,0 +1,234 @@
+##
+## mysql3.spec -- OpenPKG RPM Specification
+## Copyright (c) 2000-2003 Cable & Wireless Deutschland GmbH
+## Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
+## Copyright (c) 2000-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+##
+## 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 3.23
+%define V_minor 56
+
+# package information
+Name: mysql3
+Summary: Fast Relational Database Management System
+URL: http://www.mysql.com/
+Vendor: MySQL AB
+Packager: The OpenPKG Project
+Distribution: OpenPKG [BASE]
+Group: Database
+License: GPL
+Version: %{V_major}.%{V_minor}
+Release: 20030609
+
+# package options
+%option with_berkeleydb yes
+%option with_innobase no
+%option with_gemini no
+
+# list of sources
+Source0:
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-%{V_major}/mysql-%{version}.tar.gz
+Source1: my.cnf
+Source2: my.pwd
+Source3: rc.mysql3
+Patch0: mysql3.patch
+
+# build information
+Prefix: %{l_prefix}
+BuildRoot: %{l_buildroot}
+BuildPreReq: OpenPKG, openpkg >= 20030103, gcc, zlib
+PreReq: OpenPKG, openpkg >= 20030103, zlib
+AutoReq: no
+AutoReqProv: no
+Provides: MYSQL
+Conflicts: mysql
+
+%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.
+
+ NOTICE: This package contains the old and already deprecated MySQL
+ 3.x version. Please use the "mysql" package, containing the current
+ stable MySQL 4.x version.
+
+%prep
+ %setup -q -n mysql-%{version}
+ %patch -p0
+
+%build
+ # patch file search path
+ %{l_shtool} subst \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ mysys/default.c
+
+ # patch socklen_t for Sol6
+ case "%{l_target}" in
+ *-solaris2.6* )
+ %{l_shtool} subst \
+ -e 's;socklen_t;size_t;g' \
+ acinclude.m4 \
+ aclocal.m4 \
+ configure \
+ include/global.h \
+ include/my_global.h \
+ libmysql/acinclude.m4
+ %{l_shtool} subst \
+ -e 's;socklen_t;size_socket;g' \
+ sql/mini_client.cc \
+ sql/mysqld.cc
+ ;;
+ esac
+
+ # determine additional configure options
+ case "%{l_target}" in
+ *-freebsd* ) opt="--with-client-ldflags=-static
--with-mysqld-ldflags=-static" ;;
+ *-linux* ) opt="--with-client-ldflags=-static
--with-mysqld-ldflags=-static" ;;
+ *-solaris* ) opt="--with-client-ldflags=-static
--with-mysqld-ldflags=-static" ;;
+ esac
+
+ # only use system default path
+ unset LD_LIBRARY_PATH || true
+
+ # configure source tree
+ CC="%{l_cc}" \
+ CXX="%{l_cxx}" \
+ CFLAGS="%{l_cflags -O}" \
+ CXXFLAGS="%{l_cxxflags -O}" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --sysconfdir=%{l_prefix}/etc/mysql \
+ --localstatedir=%{l_prefix}/var/mysql \
+ --with-unix-socket-path=%{l_prefix}/var/mysql/mysql.sock \
+ --with-mysqld-user=%{l_musr} \
+ --enable-thread-safe-client \
+%if "%{with_berkeleydb}" == "yes"
+ --with-berkeley-db \
+%endif
+%if "%{with_innobase}" == "yes"
+ --with-innodb \
+%endif
+%if "%{with_gemini}" == "yes"
+ --with-gemini \
+%endif
+ --with-low-memory \
+ --disable-shared \
+ $opt
+
+ # build source tree
+ %{l_make} %{l_mflags -O}
+
+%install
+ rm -rf $RPM_BUILD_ROOT
+
+ # patch init script
+ %{l_shtool} subst \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ scripts/mysql_install_db.sh
+
+ # perform standard installation procedure
+ %{l_make} %{l_mflags} install \
+ AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" \
+ DESTDIR=$RPM_BUILD_ROOT
+
+ # KLUDGE: my_dir.h is not installed!
+ %{l_shtool} install -c -m 644 \
+ include/my_dir.h $RPM_BUILD_ROOT%{l_prefix}/include/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-%{version}.spec
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/share/mysql/binary-configure
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
+ strip $RPM_BUILD_ROOT%{l_prefix}/libexec/* 2>/dev/null || true
+
+ # determine default parameters
+%if "%{with_berkeleydb}" == "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_berkeleydb}" == "yes" || "%{with_innobase}" == "yes" ||
"%{with_gemini}" == "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 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ -e 's;@l_rusr@;%{l_rusr};g' \
+ -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 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ -e 's;@l_rusr@;%{l_rusr};g' \
+ -e 's;@l_rgrp@;%{l_rgrp};g' \
+ -e "s;@l_mysqld@;${l_mysqld};g" \
+ %{SOURCE rc.mysql3} $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
+
+ # determine the package files
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ '%config %{l_prefix}/etc/mysql/my.cnf' \
+ '%config %{l_prefix}/etc/mysql/my.pwd'
+
+%files -f files
+
+%clean
+ rm -rf $RPM_BUILD_ROOT
+
+%post
+ # create initial database
+ $RPM_INSTALL_PREFIX/bin/mysql_install_db \
+ --defaults-file=$RPM_INSTALL_PREFIX/etc/mysql/my.cnf
+ chown %{l_rusr}:%{l_rgrp} \
+ $RPM_INSTALL_PREFIX/etc/mysql/my.cnf \
+ $RPM_INSTALL_PREFIX/etc/mysql/my.pwd
+ chown -R %{l_rusr}:%{l_rgrp} $RPM_INSTALL_PREFIX/var/mysql/
+ ( echo "The MySQL package includes automated maintenance procedures"
+ echo "that require administrator access to the database. For this"
+ echo "to work you must keep a copy (plain text) of the administrator"
+ echo "account in '$RPM_INSTALL_PREFIX/etc/mysql/my.pwd'."
+ ) | %{l_rpmtool} msg -b -t notice
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql3/rc.mysql3
============================================================================
$ cvs diff -u -r0 -r1.1 rc.mysql3
--- /dev/null 2003-06-09 13:37:52.000000000 +0200
+++ rc.mysql3 2003-06-09 13:37:53.000000000 +0200
@@ -0,0 +1,60 @@
[EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
+##
+## rc.mysql3 -- Run-Command for MySQL3 Database
+##
+
+%config
+ mysql3_enable="yes"
+ [EMAIL PROTECTED]@/etc/mysql/my.pwd
+ [EMAIL PROTECTED]@/etc/mysql/my.cnf
+ mysql3_log_prolog="true"
+ mysql3_log_epilog="true"
+ mysql3_log_numfiles="10"
+ mysql3_log_minsize="1M"
+ mysql3_log_complevel="9"
+
+%common
+ # same paths as in my.cnf
+ [EMAIL PROTECTED]@/var/mysql/mysqld.pid
+ [EMAIL PROTECTED]@/var/mysql/mysqld.err
+ [EMAIL PROTECTED]@/var/mysql/common.log
+ [EMAIL PROTECTED]@/var/mysql/update.log
+
+%start -p 200 -u @l_rusr@
+ opServiceEnabled mysql || exit 0
+ cd @l_prefix@
+ @l_prefix@/bin/safe_mysqld >/dev/null 2>&1 \
+ [EMAIL PROTECTED]@ \
+ --pid-file="$mysql3_pid_file" \
+ --err-log="$mysql3_log_err" &
+
+%stop -p 200 -u @l_rusr@
+ opServiceEnabled mysql || exit 0
+ @l_prefix@/bin/mysqladmin \
+ --defaults-extra-file=${mysql3_pwd_file} \
+ shutdown
+
+%restart -u @l_rusr@
+ opServiceEnabled mysql || exit 0
+ cd @l_prefix@
+ @l_prefix@/bin/mysqladmin \
+ --defaults-extra-file=${mysql3_pwd_file} \
+ shutdown
+ @l_prefix@/bin/safe_mysqld >/dev/null 2>&1 \
+ [EMAIL PROTECTED]@ \
+ --pid-file="$mysql3_pid_file" \
+ --err-log="$mysql3_log_err" &
+
+%daily -u @l_rusr@
+ opServiceEnabled mysql || exit 0
+ shtool rotate -f \
+ -n${mysql3_log_numfiles} -s${mysql3_log_minsize} -d \
+ -z${mysql3_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+ -P "${mysql3_log_prolog}" \
+ -E "@l_prefix@/bin/mysqladmin \
+ --defaults-extra-file=${mysql3_pwd_file} \
+ flush-logs; ${mysql3_log_epilog}" \
+ ${mysql3_log_common} \
+ ${mysql3_log_update} \
+ ${mysql3_log_err}
+
@@ .
rm -f openpkg-src/mysql4/my.cnf <<'@@ .'
Index: openpkg-src/mysql4/my.cnf
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f openpkg-src/mysql4/my.pwd <<'@@ .'
Index: openpkg-src/mysql4/my.pwd
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f openpkg-src/mysql4/mysql4.patch <<'@@ .'
Index: openpkg-src/mysql4/mysql4.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f openpkg-src/mysql4/mysql4.spec <<'@@ .'
Index: openpkg-src/mysql4/mysql4.spec
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f openpkg-src/mysql4/rc.mysql4 <<'@@ .'
Index: openpkg-src/mysql4/rc.mysql4
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
