OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 10-Jan-2003 13:23:56
Branch: HEAD Handle: 2003011012235401
Added files:
openpkg-src/mysql mysql-defaults.patch
Modified files:
openpkg-src/mysql my.cnf mysql.spec rc.mysql
openpkg-web news.txt
Log:
fix default settings, now hardcodes @l_prefix@/etc/mysql instead of
/etc
Summary:
Revision Changes Path
1.4 +5 -3 openpkg-src/mysql/my.cnf
1.1 +11 -0 openpkg-src/mysql/mysql-defaults.patch
1.46 +9 -3 openpkg-src/mysql/mysql.spec
1.6 +0 -4 openpkg-src/mysql/rc.mysql
1.2636 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/my.cnf
============================================================================
$ cvs diff -u -r1.3 -r1.4 my.cnf
--- openpkg-src/mysql/my.cnf 4 Dec 2002 10:02:43 -0000 1.3
+++ openpkg-src/mysql/my.cnf 10 Jan 2003 12:23:55 -0000 1.4
@@ -1,9 +1,11 @@
+[client]
+socket = @l_prefix@/var/mysql/mysql.sock
+port = 3306
[safe_mysqld]
-datadir = @l_prefix@/var/mysql/db
-socket = @l_prefix@/var/mysql/mysqld.sock
+datadir = @l_prefix@/var/mysql
+socket = @l_prefix@/var/mysql/mysql.sock
set-variable = pid_file=@l_prefix@/var/mysql/mysqld.pid
-set-variable = max_connections=1000
port = 3306
user = @l_rusr@
basedir = @l_prefix@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql-defaults.patch
============================================================================
$ cvs diff -u -r0 -r1.1 mysql-defaults.patch
--- /dev/null 2003-01-10 13:23:56.000000000 +0100
+++ mysql-defaults.patch 2003-01-10 13:23:56.000000000 +0100
@@ -0,0 +1,11 @@
+--- 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.45 -r1.46 mysql.spec
--- openpkg-src/mysql/mysql.spec 9 Jan 2003 16:50:33 -0000 1.45
+++ openpkg-src/mysql/mysql.spec 10 Jan 2003 12:23:55 -0000 1.46
@@ -37,7 +37,7 @@
Group: Database
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20030109
+Release: 20030110
# package options
%option with_berkeleydb yes
@@ -66,6 +66,7 @@
Source2: my.pwd
Source3: rc.mysql
Patch0: mysql.patch
+Patch1: mysql-defaults.patch
# build information
Prefix: %{l_prefix}
@@ -85,15 +86,20 @@
%prep
%setup -q
- %patch -p0
+ %patch0 -p0
+ %patch1 -p0
%build
+ # patch file search path
+ %{l_shtool} subst \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ mysys/default.c
+
# 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" ;;
- #*-solaris* ) opt="" ;; # static compiling doesn't work under Solaris
because of missing libdl.a
esac
# configure source tree
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/rc.mysql
============================================================================
$ cvs diff -u -r1.5 -r1.6 rc.mysql
--- openpkg-src/mysql/rc.mysql 9 Jan 2003 16:50:33 -0000 1.5
+++ openpkg-src/mysql/rc.mysql 10 Jan 2003 12:23:55 -0000 1.6
@@ -24,14 +24,12 @@
cd @l_prefix@
@l_prefix@/bin/safe_mysqld >/dev/null 2>&1 \
--mysqld=@mysqld@ \
- --defaults-file=${mysql_cnf_file} \
--pid-file="$mysql_pid_file" \
--err-log="$mysql_log_err" &
%stop -p 200 -u @l_rusr@
opServiceEnabled mysql || exit 0
@l_prefix@/bin/mysqladmin \
- --defaults-file=${mysql_cnf_file} \
--defaults-extra-file=${mysql_pwd_file} \
shutdown
@@ -39,7 +37,6 @@
opServiceEnabled mysql || exit 0
cd @l_prefix@
@l_prefix@/bin/mysqladmin \
- --defaults-file=${mysql_cnf_file} \
--defaults-extra-file=${mysql_pwd_file} \
shutdown
@l_prefix@/bin/safe_mysqld >/dev/null 2>&1 \
@@ -54,7 +51,6 @@
-z${mysql_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${mysql_log_prolog}" \
-E "@l_prefix@/bin/mysqladmin \
- --defaults-file=${mysql_cnf_file} \
--defaults-extra-file=${mysql_pwd_file} \
flush-logs ; ${mysql_log_epilog}" \
${mysql_log_common} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2635 -r1.2636 news.txt
--- openpkg-web/news.txt 10 Jan 2003 12:11:13 -0000 1.2635
+++ openpkg-web/news.txt 10 Jan 2003 12:23:54 -0000 1.2636
@@ -1,3 +1,4 @@
+10-Jan-2003: Upgraded package: P<mysql-3.23.54a-20030110>
10-Jan-2003: Upgraded package: P<postfix-2.0.0.2-20030110>
10-Jan-2003: Upgraded package: P<ncurses-5.3.20030105-20030110>
10-Jan-2003: Upgraded package: P<gdb-5.3-20030110>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
