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

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   22-Mar-2005 16:18:32
  Branch: HEAD                             Handle: 2005032215183200

  Modified files:
    openpkg-src/imapd       imapd.conf imapd.spec

  Log:
    add usermove option to configuration, and put temp files in instance
    local path

  Summary:
    Revision    Changes     Path
    1.13        +2  -0      openpkg-src/imapd/imapd.conf
    1.141       +7  -2      openpkg-src/imapd/imapd.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/imapd/imapd.conf
  ============================================================================
  $ cvs diff -u -r1.12 -r1.13 imapd.conf
  --- openpkg-src/imapd/imapd.conf      30 Apr 2004 09:16:53 -0000      1.12
  +++ openpkg-src/imapd/imapd.conf      22 Mar 2005 15:18:32 -0000      1.13
  @@ -12,10 +12,12 @@
   sasl_mech_list:         PLAIN
   sendmail:               @l_prefix@/sbin/sendmail
   lmtpsocket:             @l_prefix@/var/imapd/socket/lmtp
  +temp_path:              @l_prefix@/var/imapd/tmp
   unixhierarchysep:       yes
   #altnamespace:           yes
   allowanonymouslogin:    no
   allowplaintext:         yes
  +allowusermoves:         no
   servername:             @[EMAIL PROTECTED]@l_domainname@
   autocreatequota:        10000
   reject8bit:             no
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/imapd/imapd.spec
  ============================================================================
  $ cvs diff -u -r1.140 -r1.141 imapd.spec
  --- openpkg-src/imapd/imapd.spec      18 Mar 2005 14:51:19 -0000      1.140
  +++ openpkg-src/imapd/imapd.spec      22 Mar 2005 15:18:32 -0000      1.141
  @@ -34,7 +34,7 @@
   Group:        Mail
   License:      BSD
   Version:      2.2.12
  -Release:      20050318
  +Release:      20050322
   
   #   package options
   %option       with_fsl    yes
  @@ -213,6 +213,8 @@
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/etc/imapd \
           $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
  +        $RPM_BUILD_ROOT%{l_prefix}/var/imapd/log \
  +        $RPM_BUILD_ROOT%{l_prefix}/var/imapd/tmp \
           $RPM_BUILD_ROOT%{l_prefix}/var/imapd/spool \
           $RPM_BUILD_ROOT%{l_prefix}/bin
   
  @@ -276,6 +278,7 @@
           '%dir %attr(0750,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/imapd' \
           '%dir %attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/imapd/*' \
           '%dir %attr(0770,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/imapd/*/*' \
  +        '%dir %attr(0770,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/imapd/tmp' \
           '%dir %attr(0770,%{l_musr},%{l_rgrp}) %{l_prefix}/var/imapd/socket' \
           `cat perl-openpkg-files`
   
  @@ -300,8 +303,10 @@
       exit 0
   
   %preun
  -    #   before erase, stop service and remove log files
  +    #   before erase, stop service and remove log and temp files
       [ $1 -eq 0 ] || exit 0
       %{l_rc} imapd stop 2>/dev/null
  +    rm -f $RPM_INSTALL_PREFIX/var/imapd/log/*.log >/dev/null 2>&1 || true
  +    rm -rf $RPM_INSTALL_PREFIX/var/imapd/tmp >/dev/null 2>&1 || true
       exit 0
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to