OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 04-Sep-2003 19:29:54
Branch: HEAD Handle: 2003090418295201
Modified files:
openpkg-src/mysql3 mysql3.spec rc.mysql3
openpkg-web news.txt
Log:
Repair log rotation restart logic, simplify restart section, and
abstract mysqladmin flush-logs (do we really need this?) to stop
section
Summary:
Revision Changes Path
1.21 +1 -1 openpkg-src/mysql3/mysql3.spec
1.11 +7 -14 openpkg-src/mysql3/rc.mysql3
1.6401 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql3/mysql3.spec
============================================================================
$ cvs diff -u -r1.20 -r1.21 mysql3.spec
--- openpkg-src/mysql3/mysql3.spec 29 Aug 2003 15:02:52 -0000 1.20
+++ openpkg-src/mysql3/mysql3.spec 4 Sep 2003 17:29:53 -0000 1.21
@@ -37,7 +37,7 @@
Group: Database
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20030829
+Release: 20030904
# package options
%option with_berkeleydb yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql3/rc.mysql3
============================================================================
$ cvs diff -u -r1.10 -r1.11 rc.mysql3
--- openpkg-src/mysql3/rc.mysql3 29 Aug 2003 15:02:52 -0000 1.10
+++ openpkg-src/mysql3/rc.mysql3 4 Sep 2003 17:29:53 -0000 1.11
@@ -57,19 +57,15 @@
rcService mysql3 active no && exit 0
@l_prefix@/bin/mysqladmin \
--defaults-extra-file=${mysql3_pwd_file} \
+ flush-logs
+ @l_prefix@/bin/mysqladmin \
+ --defaults-extra-file=${mysql3_pwd_file} \
shutdown
%restart -p 400 -u @l_rusr@
rcService mysql3 enable yes || exit 0
rcService mysql3 active no && 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" &
+ rc mysql3 stop start
%daily -u @l_rusr@
rcService mysql3 enable yes || exit 0
@@ -81,22 +77,19 @@
-n ${mysql3_common_numfiles} -s ${mysql3_common_minsize} -d \
-z ${mysql3_common_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
-P "${mysql3_common_prolog}" \
- -E "${mysql3_common_epilog} && @l_prefix@/bin/mysqladmin \
- --defaults-extra-file=${mysql3_pwd_file} flush-logs" \
+ -E "${mysql3_common_epilog} && echo 1 >$hintfile" \
${mysql3_common_log}
shtool rotate -f \
-n ${mysql3_update_numfiles} -s ${mysql3_update_minsize} -d \
-z ${mysql3_update_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
-P "${mysql3_update_prolog}" \
- -E "${mysql3_update_epilog} && @l_prefix@/bin/mysqladmin \
- --defaults-extra-file=${mysql3_pwd_file} flush-logs" \
+ -E "${mysql3_update_epilog} && echo 1 >$hintfile" \
${mysql3_update_log}
shtool rotate -f \
-n ${mysql3_err_numfiles} -s ${mysql3_err_minsize} -d \
-z ${mysql3_err_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
-P "${mysql3_err_prolog}" \
- -E "${mysql3_err_epilog} && @l_prefix@/bin/mysqladmin \
- --defaults-extra-file=${mysql3_pwd_file} flush-logs" \
+ -E "${mysql3_err_epilog} && echo 1 >$hintfile" \
${mysql3_err_log}
if [ -s $hintfile ]; then
rc mysql3 restart
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6400 -r1.6401 news.txt
--- openpkg-web/news.txt 4 Sep 2003 17:02:12 -0000 1.6400
+++ openpkg-web/news.txt 4 Sep 2003 17:29:52 -0000 1.6401
@@ -1,3 +1,4 @@
+04-Sep-2003: Upgraded package: P<mysql3-3.23.57-20030904>
04-Sep-2003: Upgraded package: P<qt-3.2.1-20030904>
04-Sep-2003: Upgraded package: P<radius-1.1-20030904>
04-Sep-2003: New package: P<p0f-2.0.1-20030904>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
