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 openpkg-web Date: 16-Jan-2003 09:35:08
Branch: HEAD Handle: 2003011608350602
Modified files:
openpkg-src/mysql my.cnf mysql.patch mysql.spec rc.mysql
openpkg-web news.txt
Removed files:
openpkg-src/mysql mysql-defaults.patch
Log:
cleanup package and make sure it binds to 127.0.0.1 by default
Summary:
Revision Changes Path
1.5 +13 -31 openpkg-src/mysql/my.cnf
1.2 +0 -11 openpkg-src/mysql/mysql-defaults.patch
1.3 +11 -0 openpkg-src/mysql/mysql.patch
1.47 +2 -4 openpkg-src/mysql/mysql.spec
1.7 +5 -3 openpkg-src/mysql/rc.mysql
1.2847 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/my.cnf
============================================================================
$ cvs diff -u -r1.4 -r1.5 my.cnf
--- openpkg-src/mysql/my.cnf 10 Jan 2003 12:23:55 -0000 1.4
+++ openpkg-src/mysql/my.cnf 16 Jan 2003 08:35:07 -0000 1.5
@@ -1,3 +1,7 @@
+##
+## my.cnf -- MySQL configuration
+##
+
[client]
socket = @l_prefix@/var/mysql/mysql.sock
port = 3306
@@ -6,19 +10,20 @@
datadir = @l_prefix@/var/mysql
socket = @l_prefix@/var/mysql/mysql.sock
set-variable = pid_file=@l_prefix@/var/mysql/mysqld.pid
+host = 127.0.0.1
port = 3306
user = @l_rusr@
basedir = @l_prefix@
-# Logfile destinations - you must update rc.mysql accordingly
+# logfile destinations (update rc.mysql accordingly)
log = @l_prefix@/var/mysql/common.log
log-update = @l_prefix@/var/mysql/update.log
-# these are the most important tuning parameters for mysqld
+# most important tuning parameters for mysqld
set-variable = key_buffer_size=16M
set-variable = table_cache=64
-# change these parameters if special problems occur
+# 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
@@ -32,42 +37,19 @@
set-variable = key_buffer=1M
set-variable = tmp_table_size=32M
-#
-# BERKELEY DB
-#
-
-# memory parameters - set these to values <> 0 if bdb
-# tables are used
+# Berkeley DB
set-variable = bdb_cache_size=@mysql_bdb_cache_size@
set-variable = bdb_log_buffer_size=@mysql_bdb_log_buffer_size@
set-variable = bdb_max_lock=@mysql_bdb_max_lock@
-#
-# INNOBASE
-#
-
-# The common part of the directory path for all InnoDB datafiles.
-# default is the mysql data directory
-#innodb_data_home_dir =
-
-# Tablespaces
-# specify a list of pathtodatafile:sizespecification separated
-# by semicolon. The last datafile can have options
-# - :autoextend increment datafile in 8M chunks
-# - :max:sizespecification max size of the datafile
-#innodb_data_file_path=@innodb_data_file_path@
-
-# Tunings
-# Set buffer pool size to 50 -80 % of your computer's memory
-# Set the log file size to about 25 % of the buffer pool size
-# Set ..flush_log_at_trx_commit to 0 if you can afford losing
-# some last transactions
-# Set innodb_lock_wait_timeout to bail out of external deadlocks
+# 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
-#innodb_flush_log_at_trx_commit=1
#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
@@ .
rm -f openpkg-src/mysql/mysql-defaults.patch <<'@@ .'
Index: openpkg-src/mysql/mysql-defaults.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 mysql.patch
--- openpkg-src/mysql/mysql.patch 30 Dec 2002 19:15:05 -0000 1.2
+++ openpkg-src/mysql/mysql.patch 16 Jan 2003 08:35:08 -0000 1.3
@@ -81,3 +81,14 @@
echo
fi
echo "Please report any problems with the @scriptdir@/mysqlbug script!"
+--- mysys/default.c.dist Fri Jan 10 11:42:15 2003
++++ mysys/default.c Fri Jan 10 11:42:31 2003
+@@ -48,7 +48,7 @@
+ #ifdef __WIN__
+ "C:/",
+ #else
+-"/etc/",
++"@l_prefix@/etc/mysql/",
+ #endif
+ #ifdef DATADIR
+ DATADIR,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.spec
============================================================================
$ cvs diff -u -r1.46 -r1.47 mysql.spec
--- openpkg-src/mysql/mysql.spec 10 Jan 2003 12:23:55 -0000 1.46
+++ openpkg-src/mysql/mysql.spec 16 Jan 2003 08:35:08 -0000 1.47
@@ -37,7 +37,7 @@
Group: Database
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20030110
+Release: 20030116
# package options
%option with_berkeleydb yes
@@ -66,7 +66,6 @@
Source2: my.pwd
Source3: rc.mysql
Patch0: mysql.patch
-Patch1: mysql-defaults.patch
# build information
Prefix: %{l_prefix}
@@ -86,8 +85,7 @@
%prep
%setup -q
- %patch0 -p0
- %patch1 -p0
+ %patch -p0
%build
# patch file search path
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/rc.mysql
============================================================================
$ cvs diff -u -r1.6 -r1.7 rc.mysql
--- openpkg-src/mysql/rc.mysql 10 Jan 2003 12:23:55 -0000 1.6
+++ openpkg-src/mysql/rc.mysql 16 Jan 2003 08:35:08 -0000 1.7
@@ -12,8 +12,9 @@
mysql_log_numfiles="10"
mysql_log_minsize="1M"
mysql_log_complevel="9"
- #
- # same files as in my.cnf
+
+%common
+ # same paths as in my.cnf
mysql_pid_file=@l_prefix@/var/mysql/mysqld.pid
mysql_log_err=@l_prefix@/var/mysql/mysqld.err
mysql_log_common=@l_prefix@/var/mysql/common.log
@@ -52,7 +53,8 @@
-P "${mysql_log_prolog}" \
-E "@l_prefix@/bin/mysqladmin \
--defaults-extra-file=${mysql_pwd_file} \
- flush-logs ; ${mysql_log_epilog}" \
+ flush-logs; ${mysql_log_epilog}" \
${mysql_log_common} \
${mysql_log_update} \
${mysql_log_err}
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2846 -r1.2847 news.txt
--- openpkg-web/news.txt 16 Jan 2003 08:05:20 -0000 1.2846
+++ openpkg-web/news.txt 16 Jan 2003 08:35:06 -0000 1.2847
@@ -1,3 +1,4 @@
+16-Jan-2003: Upgraded package: P<mysql-3.23.54a-20030116>
16-Jan-2003: Upgraded package: P<tftp-0.32-20030116>
16-Jan-2003: Upgraded package: P<xmake-1.06-20030116>
16-Jan-2003: Upgraded package: P<libtasn1-0.1.2-20030116>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
