From d933a5382863634d927498031b046aa1659b5675 Mon Sep 17 00:00:00 2001
From: Michael van Elst <mlestv@openpkg.org>
Date: Thu, 9 Jan 2003 16:50:33 +0000
Subject: [PATCH] use our my.cnf explicitely, only build -static, but
 dynamically link against system libs

---
 mysql/mysql.spec | 12 +++++++-----
 mysql/rc.mysql   |  5 +++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/mysql/mysql.spec b/mysql/mysql.spec
index 51b86b12d3..78d5c57010 100644
--- a/mysql/mysql.spec
+++ b/mysql/mysql.spec
@@ -37,7 +37,7 @@ Distribution: OpenPKG [BASE]
 Group:        Database
 License:      GPL
 Version:      %{V_major}.%{V_minor}
-Release:      20030103
+Release:      20030109
 
 #   package options
 %option       with_berkeleydb  yes
@@ -90,9 +90,10 @@ AutoReqProv:  no
 %build
     #   determine additional configure options
     case "%{l_target}" in
-        *-freebsd* ) opt="--with-client-ldflags=-all-static --with-mysqld-ldflags=-all-static" ;;
-        *-linux*   ) opt="--with-client-ldflags=-all-static --with-mysqld-ldflags=-all-static" ;;
-        *-solaris* ) opt="" ;; # static compiling doesn't work under Solaris because of missing libdl.a
+        *-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
@@ -188,7 +189,8 @@ AutoReqProv:  no
 
 %post
     #   create initial database
-    $RPM_INSTALL_PREFIX/bin/mysql_install_db
+    $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
diff --git a/mysql/rc.mysql b/mysql/rc.mysql
index c343fd7967..3ffdb4b3ac 100644
--- a/mysql/rc.mysql
+++ b/mysql/rc.mysql
@@ -6,6 +6,7 @@
 %config
     mysql_enable="yes"
     mysql_pwd_file=@l_prefix@/etc/mysql/my.pwd
+    mysql_cnf_file=@l_prefix@/etc/mysql/my.cnf
     mysql_log_prolog="true"
     mysql_log_epilog="true"
     mysql_log_numfiles="10"
@@ -23,12 +24,14 @@
     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
 
@@ -36,6 +39,7 @@
     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 \
@@ -50,6 +54,7 @@
         -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} \