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: 08-Dec-2003 16:43:26
Branch: HEAD Handle: 2003120815432401
Modified files:
openpkg-src/cups cups.spec rc.cups
openpkg-web news.txt
Log:
implement PR#202
Summary:
Revision Changes Path
1.12 +15 -1 openpkg-src/cups/cups.spec
1.8 +48 -0 openpkg-src/cups/rc.cups
1.7691 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cups/cups.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 cups.spec
--- openpkg-src/cups/cups.spec 24 Nov 2003 19:31:09 -0000 1.11
+++ openpkg-src/cups/cups.spec 8 Dec 2003 15:43:25 -0000 1.12
@@ -33,7 +33,7 @@
Group: Print
License: GPL/LGPL with exceptions
Version: 1.1.20
-Release: 20031124
+Release: 20031208
# package options
%option with_openssl no
@@ -151,4 +151,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} cups status 2>/dev/null`
+ [ ".$cups_active" = .yes ] && %{l_rc} cups restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} cups stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/cups/log/* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cups/rc.cups
============================================================================
$ cvs diff -u -r1.7 -r1.8 rc.cups
--- openpkg-src/cups/rc.cups 22 Jul 2003 08:10:42 -0000 1.7
+++ openpkg-src/cups/rc.cups 8 Dec 2003 15:43:25 -0000 1.8
@@ -5,6 +5,24 @@
%config
cups_enable="$openpkg_rc_def"
+ cups_access_file="@l_prefix@/var/cups/log/access_log"
+ cups_access_prolog="true"
+ cups_access_epilog="true"
+ cups_access_numfiles="10"
+ cups_access_minsize="1M"
+ cups_access_complevel="9"
+ cups_error_file="@l_prefix@/var/cups/log/error_log"
+ cups_error_prolog="true"
+ cups_error_epilog="true"
+ cups_error_numfiles="10"
+ cups_error_minsize="1M"
+ cups_error_complevel="9"
+ cups_page_file="@l_prefix@/var/cups/log/page_log"
+ cups_page_prolog="true"
+ cups_page_epilog="true"
+ cups_page_numfiles="10"
+ cups_page_minsize="1M"
+ cups_page_complevel="9"
%common
cups_pidfile="@l_prefix@/var/cups/cupsd.pid"
@@ -23,16 +41,46 @@
%start -u @l_susr@
rcService cups enable yes || exit 0
+ rcService cups active yes && exit 0
@l_prefix@/libexec/cups/cupsd
%stop -u @l_susr@
rcService cups enable yes || exit 0
+ rcService cups active no && exit 0
cups_signal TERM
rm -f $cups_pidfile 2>/dev/null || true
%restart -u @l_susr@
rcService cups enable yes || exit 0
+ rcService cups active no && exit 0
rc cups stop
sleep 2
rc cups start
+
+%daily -u @l_susr@
+ rcService cups enable yes || exit 0
+
+ # rotate logfiles
+ shtool rotate -f \
+ -n ${cups_access_numfiles} -s ${cups_access_minsize} -d \
+ -z ${cups_access_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
+ -P "${cups_access_prolog}" \
+ -E "${cups_access_epilog} && echo 1 >$hintfile" \
+ ${cups_access_file}
+ shtool rotate -f \
+ -n ${cups_error_numfiles} -s ${cups_error_minsize} -d \
+ -z ${cups_error_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
+ -P "${cups_error_prolog}" \
+ -E "${cups_error_epilog} && echo 1 >$hintfile" \
+ ${cups_error_file}
+ shtool rotate -f \
+ -n ${cups_page_numfiles} -s ${cups_page_minsize} -d \
+ -z ${cups_page_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
+ -P "${cups_page_prolog}" \
+ -E "${cups_page_epilog} && echo 1 >$hintfile" \
+ ${cups_page_file}
+ if [ -s $hintfile ]; then
+ rc cups restart
+ fi
+ rcTmp -k
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7690 -r1.7691 news.txt
--- openpkg-web/news.txt 8 Dec 2003 12:40:18 -0000 1.7690
+++ openpkg-web/news.txt 8 Dec 2003 15:43:24 -0000 1.7691
@@ -1,3 +1,4 @@
+08-Dec-2003: Upgraded package: P<cups-1.1.20-20031208>
08-Dec-2003: Upgraded package: P<tomcat4-4.1.27-20031208>
08-Dec-2003: Upgraded package: P<cacti-0.8.4-20031208>
06-Dec-2003: Upgraded package: P<atool-0.27.0-20031206>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
