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

  Server: cvs.openpkg.org                  Name:   Christoph Schug
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   28-Mar-2003 13:24:46
  Branch: HEAD                             Handle: 2003032812244402

  Modified files:
    openpkg-src/sendmail    rc.sendmail sendmail.spec
    openpkg-web             news.txt

  Log:
    rc script and spec file clean up

  Summary:
    Revision    Changes     Path
    1.5         +5  -5      openpkg-src/sendmail/rc.sendmail
    1.58        +20 -19     openpkg-src/sendmail/sendmail.spec
    1.3861      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/sendmail/rc.sendmail
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 rc.sendmail
  --- openpkg-src/sendmail/rc.sendmail  7 Feb 2002 14:21:11 -0000       1.4
  +++ openpkg-src/sendmail/rc.sendmail  28 Mar 2003 12:24:46 -0000      1.5
  @@ -59,25 +59,25 @@
           fi
       }
   
  -%start -p 200 -u root
  +%start -p 200 -u @l_susr@
       sendmail_start
   
  -%stop -p 200 -u root
  +%stop -p 200 -u @l_susr@
       sendmail_signal TERM KILL
   
  -%restart -u root
  +%restart -u @l_susr@
       sendmail_signal TERM KILL
       sleep 2
       sendmail_start
   
  -%reload -u root
  +%reload -u @l_susr@
       #   sendmail does not like SIGHUP on queue-only processes,
       #   so we have to perform actually a restart...
       sendmail_signal TERM KILL
       sleep 2
       sendmail_start
   
  -%daily -u root
  +%daily -u @l_susr@
       if opServiceEnabled sendmail; then
           opTmpDirGen sendmail
           opTmpDirFile sendmail hint hintfile
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sendmail/sendmail.spec
  ============================================================================
  $ cvs diff -u -r1.57 -r1.58 sendmail.spec
  --- openpkg-src/sendmail/sendmail.spec        27 Mar 2003 16:27:48 -0000      1.57
  +++ openpkg-src/sendmail/sendmail.spec        28 Mar 2003 12:24:46 -0000      1.58
  @@ -33,7 +33,7 @@
   Group:        Mail
   License:      BSD
   Version:      8.12.8
  -Release:      20030327
  +Release:      20030328
   
   #   package options
   %option       with_tls      no
  @@ -258,6 +258,7 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
       %{l_shtool} install -c -m 755 \
           -e 's;@l_prefix@;%{l_prefix};g' \
  +        -e 's;@l_susr@;%{l_susr};g' \
           -e 's;@l_musr@;%{l_musr};g' \
           -e 's;@l_mgrp@;%{l_mgrp};g' \
           %{SOURCE rc.sendmail} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  @@ -283,26 +284,26 @@
       #   determine file list
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
  -        '%attr(2755,root,%{l_rgrp})        %{l_prefix}/sbin/sendmail' \
  -        '%attr(4755,root,%{l_mgrp})        %{l_prefix}/bin/hoststat' \
  -        '%attr(4755,root,%{l_mgrp})        %{l_prefix}/bin/mailq' \
  -        '%attr(4755,root,%{l_mgrp})        %{l_prefix}/bin/newaliases' \
  -        '%attr(4755,root,%{l_mgrp})        %{l_prefix}/bin/purgestat' \
  -        '%attr(4755,root,%{l_mgrp})        %{l_prefix}/bin/vacation' \
  -        '%attr(4755,root,%{l_mgrp})        %{l_prefix}/libexec/sendmail/smrsh' \
  -        '%attr(755,root,%{l_mgrp})         %{l_prefix}/etc/sendmail' \
  -        '%config                           %{l_prefix}/etc/sendmail/*' \
  -        '%config %attr(644,root,%{l_mgrp}) %{l_prefix}/etc/sendmail/ca.crt' \
  -        '%config %attr(644,root,%{l_mgrp}) %{l_prefix}/etc/sendmail/sendmail.crt' \
  -        '%config %attr(600,root,%{l_mgrp}) %{l_prefix}/etc/sendmail/sendmail.key' \
  +        '%attr(2755,%{l_susr},%{l_rgrp})        %{l_prefix}/sbin/sendmail' \
  +        '%attr(4755,%{l_susr},%{l_mgrp})        %{l_prefix}/bin/hoststat' \
  +        '%attr(4755,%{l_susr},%{l_mgrp})        %{l_prefix}/bin/mailq' \
  +        '%attr(4755,%{l_susr},%{l_mgrp})        %{l_prefix}/bin/newaliases' \
  +        '%attr(4755,%{l_susr},%{l_mgrp})        %{l_prefix}/bin/purgestat' \
  +        '%attr(4755,%{l_susr},%{l_mgrp})        %{l_prefix}/bin/vacation' \
  +        '%attr(4755,%{l_susr},%{l_mgrp})        %{l_prefix}/libexec/sendmail/smrsh' 
\
  +        '%attr(755,%{l_susr},%{l_mgrp})         %{l_prefix}/etc/sendmail' \
  +        '%config                                %{l_prefix}/etc/sendmail/*' \
  +        '%config %attr(644,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/sendmail/ca.crt' \
  +        '%config %attr(644,%{l_susr},%{l_mgrp}) 
%{l_prefix}/etc/sendmail/sendmail.crt' \
  +        '%config %attr(600,%{l_susr},%{l_mgrp}) 
%{l_prefix}/etc/sendmail/sendmail.key' \
           '%config %{l_prefix}/etc/fsl/fsl.sendmail' \
           '%not %dir %{l_prefix}/etc/fsl' \
  -        '%attr(700,root,%{l_mgrp})         %{l_prefix}/var/sendmail/mqueue' \
  -        '%attr(700,root,%{l_mgrp})         
%{l_prefix}/var/sendmail/mqueue/.hoststat' \
  -        '%attr(770,%{l_rusr},%{l_rgrp})    %{l_prefix}/var/sendmail/clientmqueue' \
  -        '%attr(750,%{l_rusr},%{l_rgrp})    
%{l_prefix}/var/sendmail/clientmqueue/.hoststat' \
  -        '%attr(644,root,%{l_mgrp})         %{l_prefix}/var/sendmail/sendmail.log' \
  -        '%attr(644,root,%{l_mgrp})         %{l_prefix}/var/sendmail/sendmail.*.pid'
  +        '%attr(700,%{l_susr},%{l_mgrp})         %{l_prefix}/var/sendmail/mqueue' \
  +        '%attr(700,%{l_susr},%{l_mgrp})         
%{l_prefix}/var/sendmail/mqueue/.hoststat' \
  +        '%attr(770,%{l_rusr},%{l_rgrp})         
%{l_prefix}/var/sendmail/clientmqueue' \
  +        '%attr(750,%{l_rusr},%{l_rgrp})         
%{l_prefix}/var/sendmail/clientmqueue/.hoststat' \
  +        '%attr(644,%{l_susr},%{l_mgrp})         
%{l_prefix}/var/sendmail/sendmail.log' \
  +        '%attr(644,%{l_susr},%{l_mgrp})         
%{l_prefix}/var/sendmail/sendmail.*.pid'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.3860 -r1.3861 news.txt
  --- openpkg-web/news.txt      28 Mar 2003 12:11:39 -0000      1.3860
  +++ openpkg-web/news.txt      28 Mar 2003 12:24:44 -0000      1.3861
  @@ -1,3 +1,4 @@
  +28-Mar-2003: Upgraded package: P<sendmail-8.12.8-20030328>
   28-Mar-2003: Upgraded package: P<openssh-3.5p1-20030328>
   28-Mar-2003: Upgraded package: P<ntp-4.1.1b-20030328>
   28-Mar-2003: Upgraded package: P<bind8-8.3.4-20030328>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to