OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Feb-2003 15:32:39
Branch: HEAD Handle: 2003021314323800
Modified files:
openpkg-src/sasl rc.sasl sasl.spec
Log:
Modernize rc file to current standards and choose correct auth method
for platform
Summary:
Revision Changes Path
1.2 +14 -8 openpkg-src/sasl/rc.sasl
1.51 +19 -4 openpkg-src/sasl/sasl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/rc.sasl
============================================================================
$ cvs diff -u -r1.1 -r1.2 rc.sasl
--- openpkg-src/sasl/rc.sasl 12 Aug 2002 08:04:38 -0000 1.1
+++ openpkg-src/sasl/rc.sasl 13 Feb 2003 14:32:38 -0000 1.2
@@ -8,15 +8,21 @@
sasl_authmech="@authmech@"
sasl_threads="5"
-%start -p 200 -u root
- if opServiceEnabled sasl; then
- @l_prefix@/sbin/saslauthd -a ${sasl_authmech} -n ${sasl_threads}
+%start -p 200 -u @l_susr@
+ opServiceEnabled sasl || exit 0
+ @l_prefix@/sbin/saslauthd -a ${sasl_authmech} -n ${sasl_threads}
+
+%stop -p 200 -u @l_susr@
+ opServiceEnabled sasl || exit 0
+ if [ -f @l_prefix@/var/sasl/saslauthd/mux.pid ]; then
+ kill -TERM `cat @l_prefix@/var/sasl/saslauthd/mux.pid`
fi
-%stop -p 200 -u root
- if opServiceEnabled sasl; then
- if [ -f @l_prefix@/var/sasl/saslauthd/mux.pid ]; then
- kill -TERM `cat @l_prefix@/var/sasl/saslauthd/mux.pid`
- fi
+%restart -p 200 -u @l_susr@
+ opServiceEnabled sasl || exit 0
+ if [ -f @l_prefix@/var/sasl/saslauthd/mux.pid ]; then
+ kill -TERM `cat @l_prefix@/var/sasl/saslauthd/mux.pid`
fi
+ sleep 2
+ @l_prefix@/sbin/saslauthd -a ${sasl_authmech} -n ${sasl_threads}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
============================================================================
$ cvs diff -u -r1.50 -r1.51 sasl.spec
--- openpkg-src/sasl/sasl.spec 13 Feb 2003 12:45:41 -0000 1.50
+++ openpkg-src/sasl/sasl.spec 13 Feb 2003 14:32:38 -0000 1.51
@@ -126,13 +126,28 @@
$RPM_BUILD_ROOT%{l_prefix}/sbin/
%{l_shtool} install -c -m 755 \
-e 's;@l_prefix@;%{l_prefix};g' \
+ -e 's;@l_susr@;%{l_susr};g' \
+ %{SOURCE rc.sasl} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
%if "%{with_pam}" == "yes"
- -e 's;@authmech@;pam;g' \
+ %{l_shtool} subst -e 's;@authmech@;pam;g' \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/rc.sasl
%else
- -e 's;@authmech@;getpwent;g' \
+ case "%{l_target}" in
+ ix86-linux* )
+ %{l_shtool} subst -e 's;@authmech@;shadow;g' \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/rc.sasl
+ ;;
+ *-solaris* )
+ %{l_shtool} subst -e 's;@authmech@;shadow;g' \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/rc.sasl
+ ;;
+ * )
+ %{l_shtool} subst -e 's;@authmech@;getpwent;g' \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/rc.sasl
+ ;;
+ esac
%endif
- %{SOURCE rc.sasl} \
- $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
%if "%{with_fsl}" == "yes"
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
%{l_shtool} install -c -m 644 \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
