OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Jul-2003 22:03:19
Branch: HEAD Handle: 2003072521031900
Modified files:
openpkg-src/uucp rc.uucp uucp.spec
Log:
PR#202 run-time check and related issues; for port fallback, use name
"uucp" not number 540;
Summary:
Revision Changes Path
1.13 +5 -3 openpkg-src/uucp/rc.uucp
1.38 +2 -7 openpkg-src/uucp/uucp.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/uucp/rc.uucp
============================================================================
$ cvs diff -u -r1.12 -r1.13 rc.uucp
--- openpkg-src/uucp/rc.uucp 25 Jul 2003 19:53:10 -0000 1.12
+++ openpkg-src/uucp/rc.uucp 25 Jul 2003 20:03:19 -0000 1.13
@@ -20,7 +20,7 @@
[ -f $uucp_pidfile ] && kill -$1 `cat $uucp_pidfile`
}
uucp_start () {
- ( @l_prefix@/sbin/uucpd ${uucp_bind}${uucp_bind:+:}${uucp_port:-540} \
+ ( @l_prefix@/sbin/uucpd ${uucp_bind}${uucp_bind:+:}${uucp_port:-uucp} \
@l_prefix@/sbin/uucico ${uucp_flags} \
</dev/null >/dev/null 2>&1 &
echo "$!" >$uucp_pidfile
@@ -59,8 +59,10 @@
# rotate logfile
shtool rotate -f \
-n ${uucp_log_numfiles} -s ${uucp_log_minsize} -d \
- -z ${uucp_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
+ -z ${uucp_log_complevel} -m 644 -o @l_musr@ -g @l_mgrp@ \
-P "${uucp_log_prolog}" \
-E "${uucp_log_epilog} && rc uucp restart" \
- @l_prefix@/var/uucp/uucp.log
+ @l_prefix@/var/uucp/log/uucp.debug \
+ @l_prefix@/var/uucp/log/uucp.log \
+ @l_prefix@/var/uucp/log/uucp.stat
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/uucp/uucp.spec
============================================================================
$ cvs diff -u -r1.37 -r1.38 uucp.spec
--- openpkg-src/uucp/uucp.spec 25 Jul 2003 19:53:10 -0000 1.37
+++ openpkg-src/uucp/uucp.spec 25 Jul 2003 20:03:19 -0000 1.38
@@ -110,12 +110,6 @@
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.uucp} \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- %{l_shtool} install -c -m 644 /dev/null \
- $RPM_BUILD_ROOT%{l_prefix}/var/uucp/log/uucp.log
- %{l_shtool} install -c -m 644 /dev/null \
- $RPM_BUILD_ROOT%{l_prefix}/var/uucp/log/uucp.stat
- %{l_shtool} install -c -m 644 /dev/null \
- $RPM_BUILD_ROOT%{l_prefix}/var/uucp/log/uucp.debug
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* 2>/dev/null || true
@@ -139,6 +133,7 @@
# before erase, stop service and remove log files
[ $1 -eq 0 ] || exit 0
%{l_rc} uucp stop 2>/dev/null
- rm -f $RPM_INSTALL_PREFIX/var/uucp/uucp.log* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/uucp/log/* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/uucp/run/* >/dev/null 2>&1 || true
exit 0
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
