OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Jul-2003 21:22:34
Branch: HEAD Handle: 2003071120223400
Added files:
openpkg-src/squid fsl.squid
Modified files:
openpkg-src/squid rc.squid squid.spec
Log:
add OSSP fsl support and run Squid as restricted user
Summary:
Revision Changes Path
1.1 +16 -0 openpkg-src/squid/fsl.squid
1.10 +13 -2 openpkg-src/squid/rc.squid
1.43 +25 -3 openpkg-src/squid/squid.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/squid/fsl.squid
============================================================================
$ cvs diff -u -r0 -r1.1 fsl.squid
--- /dev/null 2003-07-11 21:22:34.000000000 +0200
+++ fsl.squid 2003-07-11 21:22:34.000000000 +0200
@@ -0,0 +1,16 @@
+##
+## fsl.squid -- OSSP fsl configuration
+##
+
+ident (squid)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/squid/logs/squid.log",
+ append=1, perm=0644
+ )
+ }
+};
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/squid/rc.squid
============================================================================
$ cvs diff -u -r1.9 -r1.10 rc.squid
--- openpkg-src/squid/rc.squid 11 Jul 2003 18:48:37 -0000 1.9
+++ openpkg-src/squid/rc.squid 11 Jul 2003 19:22:34 -0000 1.10
@@ -5,10 +5,15 @@
%config
squid_enable="$openpkg_rc_def"
+ squid_log_prolog="true"
+ squid_log_epilog="true"
+ squid_log_numfiles="10"
+ squid_log_minsize="1M"
+ squid_log_complevel="9"
%start -p 200 -u @l_susr@
opServiceEnabled squid || exit 0
- @l_prefix@/sbin/squid -D
+ @l_prefix@/sbin/squid -D -s
%stop -p 200 -u @l_susr@
opServiceEnabled squid || exit 0
@@ -18,7 +23,7 @@
opServiceEnabled squid || exit 0
@l_prefix@/sbin/squid -k shutdown
sleep 1
- @l_prefix@/sbin/squid -D
+ @l_prefix@/sbin/squid -D -s
%reload -u @l_susr@
opServiceEnabled squid || exit 0
@@ -27,4 +32,10 @@
%daily -u @l_susr@
opServiceEnabled squid || exit 0
@l_prefix@/sbin/squid -k rotate
+ shtool rotate -f \
+ -n${squid_log_numfiles} -s${squid_log_minsize} -d \
+ -z${squid_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+ -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.42 -r1.43 squid.spec
--- openpkg-src/squid/squid.spec 11 Jul 2003 18:38:24 -0000 1.42
+++ openpkg-src/squid/squid.spec 11 Jul 2003 19:22:34 -0000 1.43
@@ -41,18 +41,24 @@
Release: 20030711
# package options
+%option with_fsl yes
%option with_ssl no
%option with_snmp no
# list of sources
Source0:
http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}.tar.gz
Source1: rc.squid
+Source2: fsl.squid
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20030710, gcc
PreReq: OpenPKG, openpkg >= 20030710
+%if "%{with_fsl}" == "yes"
+BuildPreReq: fsl
+PreReq: fsl
+%endif
%if "%{with_ssl}" == "yes"
BuildPreReq: openssl
PreReq: openssl
@@ -76,6 +82,9 @@
src/cachemgr.c
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs}" \
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/squid \
@@ -131,8 +140,8 @@
# post-adjust default configuration
%{l_shtool} subst \
-e 's;^# \(cache_mgr\).*;\1 %{l_musr};' \
- -e 's;^# \(cache_effective_user\).*;\1 %{l_musr};' \
- -e 's;^# \(cache_effective_group\).*;\1 %{l_mgrp};' \
+ -e 's;^# \(cache_effective_user\).*;\1 %{l_rusr};' \
+ -e 's;^# \(cache_effective_group\).*;\1 %{l_rgrp};' \
$RPM_BUILD_ROOT%{l_prefix}/etc/squid/squid.conf
# install run-command script
@@ -141,9 +150,19 @@
%{l_shtool} install -c -m 755 \
-e 's;@l_prefix@;%{l_prefix};g' \
-e 's;@l_susr@;%{l_susr};g' \
+ -e 's;@l_rusr@;%{l_rusr};g' \
+ -e 's;@l_rgrp@;%{l_rgrp};g' \
%{SOURCE rc.squid} \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+ # install OSSP fsl configuration
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+ %{l_shtool} install -c -m 644 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ %{SOURCE fsl.squid} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
# strip executables
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
@@ -151,7 +170,10 @@
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%config %{l_prefix}/etc/squid/squid.conf'
+ '%config %{l_prefix}/etc/squid/squid.conf' \
+ '%not %dir %{l_prefix}/etc/fsl' \
+ '%config %{l_prefix}/etc/fsl/fsl.squid' \
+ '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/squid/*'
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
