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: 09-Jan-2003 17:50:33
Branch: HEAD Handle: 2003010916503201
Modified files:
openpkg-src/mysql mysql.spec rc.mysql
openpkg-web news.txt
Log:
use our my.cnf explicitely, only build -static, but dynamically link
against system libs
Summary:
Revision Changes Path
1.45 +7 -5 openpkg-src/mysql/mysql.spec
1.5 +5 -0 openpkg-src/mysql/rc.mysql
1.2625 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.spec
============================================================================
$ cvs diff -u -r1.44 -r1.45 mysql.spec
--- openpkg-src/mysql/mysql.spec 3 Jan 2003 11:32:12 -0000 1.44
+++ openpkg-src/mysql/mysql.spec 9 Jan 2003 16:50:33 -0000 1.45
@@ -37,7 +37,7 @@
Group: Database
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20030103
+Release: 20030109
# package options
%option with_berkeleydb yes
@@ -90,9 +90,10 @@
%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 @@
%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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/rc.mysql
============================================================================
$ cvs diff -u -r1.4 -r1.5 rc.mysql
--- openpkg-src/mysql/rc.mysql 4 Dec 2002 10:02:43 -0000 1.4
+++ openpkg-src/mysql/rc.mysql 9 Jan 2003 16:50:33 -0000 1.5
@@ -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} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2624 -r1.2625 news.txt
--- openpkg-web/news.txt 9 Jan 2003 14:23:16 -0000 1.2624
+++ openpkg-web/news.txt 9 Jan 2003 16:50:32 -0000 1.2625
@@ -1,3 +1,4 @@
+09-Jan-2003: Upgraded package: P<mysql-3.23.54a-20030109>
09-Jan-2003: Upgraded package: P<openpkg-tool-20030109-20030109>
09-Jan-2003: Upgraded package: P<make-3.80-20030109>
09-Jan-2003: Upgraded package: P<openpkg-20030109-20030109>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
