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:   12-Mar-2003 16:34:18
  Branch: HEAD                             Handle: 2003031215341500

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

  Log:
    fix rc script again; simplify auth method determination

  Summary:
    Revision    Changes     Path
    1.6         +1  -5      openpkg-src/sasl/rc.sasl
    1.63        +1  -5      openpkg-src/sasl/sasl.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/sasl/rc.sasl
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 rc.sasl
  --- openpkg-src/sasl/rc.sasl  12 Mar 2003 15:08:22 -0000      1.5
  +++ openpkg-src/sasl/rc.sasl  12 Mar 2003 15:34:15 -0000      1.6
  @@ -5,11 +5,7 @@
   
   %config
       sasl_enable="yes"
  -    sasl_authmech="@authmech@"
  -    #sasl_authmech="sasldb"
  -    #sasl_authmech="rimap -O remote.imap.server"
  -    #sasl_authmech="pam"
  -    #sasl_authmech="ldap"
  +    sasl_authmech="@l_authmech@"
       sasl_threads="2"
   
   %start -p 200 -u @l_susr@
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sasl/sasl.spec
  ============================================================================
  $ cvs diff -u -r1.62 -r1.63 sasl.spec
  --- openpkg-src/sasl/sasl.spec        12 Mar 2003 15:08:22 -0000      1.62
  +++ openpkg-src/sasl/sasl.spec        12 Mar 2003 15:34:15 -0000      1.63
  @@ -237,11 +237,7 @@
   %if "%{with_pam}" == "yes"
       l_authmech="pam"
   %else
  -    case "%{l_target}" in
  -        ix86-linux* ) l_authmech="shadow"   ;;
  -        *-solaris*  ) l_authmech="shadow"   ;;
  -        *           ) l_authmech="getpwent" ;;
  -    esac
  +    l_authmech="getpwent"
   %endif
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to