Explorar o código

rc script and spec file clean up

Christoph Schug %!s(int64=23) %!d(string=hai) anos
pai
achega
1ef997dffa
Modificáronse 2 ficheiros con 25 adicións e 24 borrados
  1. 5 5
      sendmail/rc.sendmail
  2. 20 19
      sendmail/sendmail.spec

+ 5 - 5
sendmail/rc.sendmail

@@ -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

+ 20 - 19
sendmail/sendmail.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Mail
 License:      BSD
 Version:      8.12.8
-Release:      20030327
+Release:      20030328
 
 #   package options
 %option       with_tls      no
@@ -258,6 +258,7 @@ Conflicts:    ssmtp, exim, postfix
     %{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 @@ Conflicts:    ssmtp, exim, postfix
     #   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