OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [email protected]
  Module: openpkg-src                      Date:   23-Dec-2008 11:43:14
  Branch: HEAD                             Handle: 2008122310431301

  Modified files:
    openpkg-src/sasl        rc.sasl sasl.spec

  Log:
    adjust paths once again

  Summary:
    Revision    Changes     Path
    1.26        +1  -1      openpkg-src/sasl/rc.sasl
    1.162       +5  -7      openpkg-src/sasl/sasl.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/sasl/rc.sasl
  ============================================================================
  $ cvs diff -u -r1.25 -r1.26 rc.sasl
  --- openpkg-src/sasl/rc.sasl  23 Dec 2008 10:18:59 -0000      1.25
  +++ openpkg-src/sasl/rc.sasl  23 Dec 2008 10:43:13 -0000      1.26
  @@ -15,7 +15,7 @@
       sasl_log_complevel="9"
   
   %common
  -    sasl_pidfile="@l_prefix@/var/sasl/run/saslauthd.pid"
  +    sasl_pidfile="@l_prefix@/var/sasl/run/saslauthd/saslauthd.pid"
       sasl_signal () {
           [ -f $sasl_pidfile ] && kill -$1 `cat $sasl_pidfile`
       }
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sasl/sasl.spec
  ============================================================================
  $ cvs diff -u -r1.161 -r1.162 sasl.spec
  --- openpkg-src/sasl/sasl.spec        23 Dec 2008 10:34:30 -0000      1.161
  +++ openpkg-src/sasl/sasl.spec        23 Dec 2008 10:43:14 -0000      1.162
  @@ -194,7 +194,7 @@
           --enable-anon \
   %if "%{with_sasldb}" == "yes"
           --enable-auth-sasldb \
  -        --with-dbpath=%{l_prefix}/var/sasl/db/sasl.db \
  +        --with-dbpath=%{l_prefix}/var/sasl/run/sasl.db \
           --with-dblib=berkeley \
           --with-bdb-incdir=%{l_prefix}/include \
           --with-bdb-libdir=%{l_prefix}/lib \
  @@ -357,9 +357,8 @@
   
       #   create necessary additional directories
       %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/sasl/run \
           $RPM_BUILD_ROOT%{l_prefix}/var/sasl/log \
  -        $RPM_BUILD_ROOT%{l_prefix}/var/sasl/db/saslauthd \
  +        $RPM_BUILD_ROOT%{l_prefix}/var/sasl/run/saslauthd \
           $RPM_BUILD_ROOT%{l_prefix}/etc/sasl/sasl.d
   
       #   install run-command script
  @@ -389,10 +388,9 @@
           %{l_files_std} \
           '%config %{l_prefix}/etc/fsl/fsl.sasl' \
           '%config %{l_prefix}/etc/sasl/saslauthd.conf' \
  -        '%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/sasl' \
  -        '%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/sasl/db' \
  -        '%dir %attr(0750,%{l_musr},%{l_rgrp}) 
%{l_prefix}/var/sasl/db/saslauthd' \
  -        '%dir %attr(0750,%{l_musr},%{l_mgrp}) %{l_prefix}/var/sasl/run' \
  +        '%dir %attr(0755,%{l_musr},%{l_rgrp}) %{l_prefix}/var/sasl' \
  +        '%dir %attr(0755,%{l_musr},%{l_rgrp}) %{l_prefix}/var/sasl/run' \
  +        '%dir %attr(0755,%{l_musr},%{l_rgrp}) 
%{l_prefix}/var/sasl/run/saslauthd' \
           '%dir %attr(0700,%{l_susr},%{l_sgrp}) %{l_prefix}/var/sasl/log'
   
   %files -f files
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to