Просмотр исходного кода

fix MSP permissions and add config

Michael van Elst 23 лет назад
Родитель
Сommit
23b0d5830a
2 измененных файлов с 10 добавлено и 5 удалено
  1. BIN
      sendmail/etc.sendmail.tar
  2. 10 5
      sendmail/sendmail.spec

BIN
sendmail/etc.sendmail.tar


+ 10 - 5
sendmail/sendmail.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Mail
 License:      BSD
 Version:      8.12.8
-Release:      20030304
+Release:      20030327
 
 #   package options
 %option       with_tls      no
@@ -123,6 +123,7 @@ Conflicts:    ssmtp, exim, postfix
           echo "define(\`confFORCE_RMAIL', \`yes')dnl"
           echo "APPENDDEF(\`confENVDEF', \`-D_PATH_SENDMAILCF=\\\"%{l_prefix}/etc/sendmail/sendmail.cf\\\"')dnl"
           echo "APPENDDEF(\`confENVDEF', \`-D_PATH_SENDMAILPID=\\\"%{l_prefix}/var/sendmail/sendmail.pid\\\"')dnl"
+          echo "APPENDDEF(\`confENVDEF', \`-D_DIR_SENDMAILCF=\\\"%{l_prefix}/etc/sendmail/\\\"')dnl"
           echo "APPENDDEF(\`confENVDEF', \`-DNEWDB')dnl"
           echo "APPENDDEF(\`confINCDIRS', \`-I%{l_prefix}/include')dnl"
           echo "APPENDDEF(\`confLIBDIRS', \`-L%{l_prefix}/lib')dnl"
@@ -220,7 +221,7 @@ Conflicts:    ssmtp, exim, postfix
       (%{l_tar} cf $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/cf.tar cf)
       compress $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/cf.tar
       %{l_shtool} install -c -m 644 cf/README \
-          $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/cf.README
+          $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/submit.cf
       %{l_shtool} install -c -m 755 contrib/re-mqueue.pl \
           $RPM_BUILD_ROOT%{l_prefix}/sbin/re-mqueue
       %{l_shtool} install -c -m 755 -e 's;^#!.*;#!%{l_prefix}/bin/perl;' \
@@ -245,6 +246,8 @@ Conflicts:    ssmtp, exim, postfix
           -e 's;@l_prefix@;%{l_prefix};g' \
           -e 's;@l_musr@;%{l_musr};g' \
           -e 's;@l_mgrp@;%{l_mgrp};g' \
+          -e 's;@l_rusr@;%{l_rusr};g' \
+          -e 's;@l_rgrp@;%{l_rgrp};g' \
           -e "s;@l_hostname@;${l_hostname};g" \
           -e "s;@l_domainname@;${l_domainname};g" \
           -e "s;@l_ostype@;${l_ostype};g" \
@@ -260,10 +263,10 @@ Conflicts:    ssmtp, exim, postfix
         %{SOURCE rc.sendmail} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
     #   create important files which have to be present from the beginning
-    %{l_shtool} mkdir -f -p -m 700 \
+    %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/var/sendmail/mqueue \
         $RPM_BUILD_ROOT%{l_prefix}/var/sendmail/mqueue/.hoststat
-    %{l_shtool} mkdir -f -p -m 770 \
+    %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/var/sendmail/clientmqueue \
         $RPM_BUILD_ROOT%{l_prefix}/var/sendmail/clientmqueue/.hoststat
     touch $RPM_BUILD_ROOT%{l_prefix}/var/sendmail/sendmail.in.pid
@@ -295,7 +298,9 @@ Conflicts:    ssmtp, exim, postfix
         '%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,%{l_rusr},%{l_rgrp})    %{l_prefix}/var/sendmail/clientmqueue' \
+        '%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'