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: 10-Dec-2004 11:27:34
Branch: HEAD Handle: 2004121010273300
Modified files:
openpkg-src/ircd ircd.spec rc.ircd
Log:
switch to running under restricted user instead of root
Summary:
Revision Changes Path
1.62 +3 -2 openpkg-src/ircd/ircd.spec
1.18 +7 -7 openpkg-src/ircd/rc.ircd
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ircd/ircd.spec
============================================================================
$ cvs diff -u -r1.61 -r1.62 ircd.spec
--- openpkg-src/ircd/ircd.spec 10 Dec 2004 10:20:32 -0000 1.61
+++ openpkg-src/ircd/ircd.spec 10 Dec 2004 10:27:33 -0000 1.62
@@ -144,7 +144,8 @@
%{l_files_std} \
'%not %dir %{l_prefix}/etc/fsl' \
'%config %{l_prefix}/etc/fsl/fsl.ircd' \
- '%config %{l_prefix}/etc/ircd/*'
+ '%config %{l_prefix}/etc/ircd/*' \
+ '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/ircd'
%files -f files
@@ -162,6 +163,6 @@
# before erase, stop service and remove log files
[ $1 -eq 0 ] || exit 0
%{l_rc} ircd stop 2>/dev/null
- rm -f $RPM_INSTALL_PREFIX/var/ircd/ircd.log* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/ircd/* >/dev/null 2>&1 || true
exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ircd/rc.ircd
============================================================================
$ cvs diff -u -r1.17 -r1.18 rc.ircd
--- openpkg-src/ircd/rc.ircd 20 Sep 2004 14:33:25 -0000 1.17
+++ openpkg-src/ircd/rc.ircd 10 Dec 2004 10:27:33 -0000 1.18
@@ -17,7 +17,7 @@
[ -f $ircd_pidfile ] && kill -$1 `cat $ircd_pidfile`
}
-%status -u @l_susr@ -o
+%status -u @l_rusr@ -o
ircd_usable="unknown"
ircd_active="no"
rcService ircd enable yes && \
@@ -26,33 +26,33 @@
echo "ircd_usable=\"$ircd_usable\""
echo "ircd_active=\"$ircd_active\""
-%start -u @l_susr@
+%start -u @l_rusr@
rcService ircd enable yes || exit 0
rcService ircd active yes && exit 0
@l_prefix@/sbin/ircd -c
-%stop -u @l_susr@
+%stop -u @l_rusr@
rcService ircd enable yes || exit 0
rcService ircd active no && exit 0
ircd_signal TERM
sleep 2
rm -f $ircd_pidfile 2>/dev/null || true
-%restart -u @l_susr@
+%restart -u @l_rusr@
rcService ircd enable yes || exit 0
rcService ircd active no && exit 0
rc ircd stop start
-%reload -u @l_susr@
+%reload -u @l_rusr@
rcService ircd enable yes || exit 0
rcService ircd active no && exit 0
ircd_signal HUP
-%daily -u @l_susr@
+%daily -u @l_rusr@
rcService ircd enable yes || exit 0
shtool rotate -f \
-n ${ircd_log_numfiles} -s ${ircd_log_minsize} -d \
- -z ${ircd_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
+ -z ${ircd_log_complevel} -m 644 -o @l_rusr@ -g @l_rgrp@ \
-P "${ircd_log_prolog}" \
-E "${ircd_log_epilog}; rc ircd restart" \
@l_prefix@/var/ircd/ircd.log
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
