pool/postfix
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 79210 from server:mail

Browse Source 
- Move SuSEconfig.postfix into /usr/sbin/
  (FATE#311272: Do not rewrite postfix.cf via SuSEconfig)
  SuSEconfig.postfix will be executed only once after installation
  automaticaly. Afterwards only you can start it manually or via
  yast2 mail module.
 

- Just the first strep forward to systemd, please test out
    /etc/postfix/system/update_chroot
    /etc/postfix/system/wait_qmgr
    /etc/postfix/system/cond_slp
  and 
    /lib/systemd/system/postfix.service
  and also fill out the missing description.

OBS-URL: https://build.opensuse.org/request/show/79210
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/postfix?expand=0&rev=74
This commit is contained in:
Sascha Peilicke
2011-08-18 12:05:27 +00:00
committed by Git OBS Bridge
parent a24403116d 281953ba26
commit 189541299d
3 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
postfix-SuSE.tar.gz
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:33fc02faba118ad24c994a3d71ea526755fe9d4283fb687f06e6b54f649a642c
size 30867
oid sha256:c3b1f635a74e32d766f35896a10b08b489c735a4b33dcfff76ac348137555cac
size 24347

20
postfix.changes
View File

@@ -1,3 +1,23 @@
-------------------------------------------------------------------
Thu Aug 18 09:32:04 UTC 2011 - varkoly@novell.com
- Move SuSEconfig.postfix into /usr/sbin/
(FATE#311272: Do not rewrite postfix.cf via SuSEconfig)
SuSEconfig.postfix will be executed only once after installation
automaticaly. Afterwards only you can start it manually or via
yast2 mail module.
-------------------------------------------------------------------
Fri Aug 12 16:40:40 UTC 2011 - werner@suse.de
- Just the first strep forward to systemd, please test out
/etc/postfix/system/update_chroot
/etc/postfix/system/wait_qmgr
/etc/postfix/system/cond_slp
and
/lib/systemd/system/postfix.service
and also fill out the missing description.
-------------------------------------------------------------------
Tue Aug 9 11:03:55 UTC 2011 - chris@computersalat.de

28
postfix.spec
View File

@@ -225,7 +225,7 @@ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
rm -f $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.%{name}
sed -e 's;@lib@;%{_lib};g' %{name}-SuSE/sysconfig.%{name} > $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.%{name}
install -m 644 %{name}-SuSE/sysconfig.mail-%{name} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.mail-%{name}
rm -f $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.%{name}
test -e $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.%{name} && rm -f $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.%{name}
sed -e 's;@lib@;%{_lib};g' \
-e 's;@conf_backup_dir@;%{conf_backup_dir};' \
-e 's;@daemon_directory@;%{pf_daemon_directory};' \
@@ -237,8 +237,8 @@ sed -e 's;@lib@;%{_lib};g' \
-e 's;@newaliases_path@;%{pf_newaliases_path};' \
-e 's;@sample_directory@;%{pf_sample_directory};' \
-e 's;@mailq_path@;%{pf_mailq_path};' %{name}-SuSE/SuSEconfig.%{name} \
> $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.%{name}
chmod 755 $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.%{name}
> $RPM_BUILD_ROOT/usr/sbin/SuSEconfig.%{name}
chmod 755 $RPM_BUILD_ROOT/usr/sbin/SuSEconfig.%{name}
install -m 644 %{name}-SuSE/dynamicmaps.cf $RPM_BUILD_ROOT/etc/%{name}/dynamicmaps.cf
install -m 644 %{name}-SuSE/ldap_aliases.cf $RPM_BUILD_ROOT/etc/%{name}/ldap_aliases.cf
install -m 644 %{name}-SuSE/helo_access $RPM_BUILD_ROOT/etc/postfix/helo_access
@@ -295,6 +295,14 @@ done
cp -a examples/* $RPM_BUILD_ROOT%{pf_sample_directory}
cp -a html/* $RPM_BUILD_ROOT%{pf_html_directory}
cp -a auxiliary/ $RPM_BUILD_ROOT%{pf_docdir}/
%if 0%{?suse_version} >= 1140
mkdir -p %{buildroot}/lib/systemd/system
mkdir -p %{buildroot}/etc/postfix/system
install -m 0644 %{name}-SuSE/postfix.service %{buildroot}/lib/systemd/system/
install -m 0755 %{name}-SuSE/update_chroot.systemd %{buildroot}/etc/postfix/system/update_chroot
install -m 0755 %{name}-SuSE/wait_qmgr.systemd %{buildroot}/etc/postfix/system/wait_qmgr
install -m 0755 %{name}-SuSE/cond_slp.systemd %{buildroot}/etc/postfix/system/cond_slp
%endif
%if 0%{?suse_version} >= 1100
%fdupes $RPM_BUILD_ROOT%{pf_docdir}
%fdupes $RPM_BUILD_ROOT%{_mandir}
@@ -378,6 +386,11 @@ fi
/usr/sbin/postfix set-permissions
if [ ${1:-0} -gt 1 ]; then
/usr/sbin/postfix upgrade-configuration || :
else
if [ ! -e /sbin/conf.d/SuSEconfig.postfix ]
then
ln -s /usr/sbin/SuSEconfig.postfix /sbin/conf.d/SuSEconfig.postfix
fi
fi
# before fillup we need to fix something
%{__sed} -i \
@@ -419,7 +432,7 @@ rm -rf $RPM_BUILD_ROOT
%config /etc/pam.d/*
/var/adm/fillup-templates/sysconfig.%{name}
/var/adm/fillup-templates/sysconfig.mail-%{name}
/sbin/conf.d/SuSEconfig.%{name}
/usr/sbin/SuSEconfig.%{name}
%config(noreplace) %{omc_dir}/%{name}.xml
%dir /etc/%{name}
%config /etc/%{name}/main.cf.default
@@ -452,6 +465,13 @@ rm -rf $RPM_BUILD_ROOT
%attr(0644, root, root) %config /etc/%{name}/makedefs.out
/usr/lib/%{name}/%{name}-files
%config %attr(0755,root,root) /etc/init.d/%{name}
%if 0%{?suse_version} >= 1140
%dir /etc/postfix/system
%config %attr(0755,root,root) /etc/postfix/system/update_chroot
%config %attr(0755,root,root) /etc/postfix/system/wait_qmgr
%config %attr(0755,root,root) /etc/postfix/system/cond_slp
%config /lib/systemd/system/postfix.service
%endif
/usr/bin/mailq
/usr/bin/newaliases
%attr(0755, root, root) /usr/sbin/sendmail