OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 23-Jul-2003 16:51:15
Branch: HEAD Handle: 2003072315511301
Modified files:
openpkg-src/squid fsl.squid rc.squid squid.spec
openpkg-web news.txt
Log:
PR#202 run-time check and related issues
Summary:
Revision Changes Path
1.3 +1 -1 openpkg-src/squid/fsl.squid
1.16 +9 -4 openpkg-src/squid/rc.squid
1.50 +14 -6 openpkg-src/squid/squid.spec
1.5758 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/squid/fsl.squid
============================================================================
$ cvs diff -u -r1.2 -r1.3 fsl.squid
--- openpkg-src/squid/fsl.squid 14 Jul 2003 18:32:50 -0000 1.2
+++ openpkg-src/squid/fsl.squid 23 Jul 2003 14:51:14 -0000 1.3
@@ -9,7 +9,7 @@
-> {
debug: file(
path="@l_prefix@/var/squid/logs/squid.log",
- perm=0644
+ perm=0644, jitter=1
)
}
};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/squid/rc.squid
============================================================================
$ cvs diff -u -r1.15 -r1.16 rc.squid
--- openpkg-src/squid/rc.squid 22 Jul 2003 08:11:13 -0000 1.15
+++ openpkg-src/squid/rc.squid 23 Jul 2003 14:51:14 -0000 1.16
@@ -22,17 +22,20 @@
%start -u @l_susr@
rcService squid enable yes || exit 0
+ rcService squid active yes && exit 0
@l_prefix@/sbin/squid -D -s
+ sleep 2
%stop -u @l_susr@
rcService squid enable yes || exit 0
+ rcService squid active no && exit 0
@l_prefix@/sbin/squid -k shutdown
+ sleep 2
%restart -u @l_susr@
rcService squid enable yes || exit 0
- @l_prefix@/sbin/squid -k shutdown
- sleep 1
- @l_prefix@/sbin/squid -D -s
+ rcService squid active no && exit 0
+ rc squid stop start
%reload -u @l_susr@
rcService squid enable yes || exit 0
@@ -40,10 +43,12 @@
%daily -u @l_susr@
rcService squid enable yes || exit 0
+
+ # rotate logfile
@l_prefix@/sbin/squid -k rotate
shtool rotate -f \
-n ${squid_log_numfiles} -s ${squid_log_minsize} -d \
- -z ${squid_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -z ${squid_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${squid_log_prolog}" \
-E "${squid_log_epilog}" \
@l_prefix@/var/squid/logs/squid.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/squid/squid.spec
============================================================================
$ cvs diff -u -r1.49 -r1.50 squid.spec
--- openpkg-src/squid/squid.spec 22 Jul 2003 08:11:13 -0000 1.49
+++ openpkg-src/squid/squid.spec 23 Jul 2003 14:51:14 -0000 1.50
@@ -38,7 +38,7 @@
Group: Web
License: GPL
Version: %{V_maj}.%{V_min}.%{V_rev}
-Release: 20030722
+Release: 20030723
# package options
%option with_fsl yes
@@ -142,6 +142,7 @@
-e 's;^# \(cache_mgr\).*;\1 %{l_musr};' \
-e 's;^# \(cache_effective_user\).*;\1 %{l_rusr};' \
-e 's;^# \(cache_effective_group\).*;\1 %{l_rgrp};' \
+ -e 's;^# \(http_port\).*;\1 127.0.0.1:3128;' \
$RPM_BUILD_ROOT%{l_prefix}/etc/squid/squid.conf
# install run-command script
@@ -181,10 +182,17 @@
$RPM_INSTALL_PREFIX/sbin/squid -z >/dev/null 2>&1
fi
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} squid status 2>/dev/null`
+ [ ".$squid_active" = .yes ] && %{l_rc} squid restart
+ exit 0
+
%preun
- if [ $1 -eq 0 ]; then
- # remove cache directory structure (including contents) and logfiles
- rm -rf $RPM_INSTALL_PREFIX/var/squid/cache/[0-9ABCDEF][0-9ABCDEF]
>/dev/null 2>&1 || true
- rm -rf $RPM_INSTALL_PREFIX/var/squid/logs/* >/dev/null 2>&1 || true
- fi
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} squid stop 2>/dev/null
+ rm -rf $RPM_INSTALL_PREFIX/var/squid/cache/[0-9ABCDEF][0-9ABCDEF] >/dev/null
2>&1 || true
+ rm -rf $RPM_INSTALL_PREFIX/var/squid/logs/* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5757 -r1.5758 news.txt
--- openpkg-web/news.txt 23 Jul 2003 14:26:16 -0000 1.5757
+++ openpkg-web/news.txt 23 Jul 2003 14:51:13 -0000 1.5758
@@ -1,3 +1,4 @@
+23-Jul-2003: Upgraded package: P<squid-2.5.3-20030723>
23-Jul-2003: Upgraded package: P<openpkg-tool-20030723-20030723>
23-Jul-2003: Upgraded package: P<squirrelmail-1.4.1-20030723>
23-Jul-2003: Upgraded package: P<mgv-3.1.5-20030723>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
