Hello community, here is the log from the commit of package sendmail for openSUSE:Factory checked in at 2013-10-20 10:53:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sendmail (Old) and /work/SRC/openSUSE:Factory/.sendmail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sendmail" Changes: -------- --- /work/SRC/openSUSE:Factory/sendmail/sendmail.changes 2013-09-27 18:30:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sendmail.new/sendmail.changes 2013-10-20 10:53:45.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Oct 8 12:00:16 UTC 2013 - [email protected] + +- Add config.starttls script to ask mail/imap server for certificates + +------------------------------------------------------------------- +Tue Oct 1 08:34:03 UTC 2013 - [email protected] + +- Add saslauthd as optional requirement in the systemd service unit +- Add SENDMAIL_MTA_MODIFIER and SENDMAIL_MTA_SSL_PORT to configuration +- Split off SuSE specific file into a own tar ball +- Avoid SysVinit boot scripts on systemd based systems + +------------------------------------------------------------------- New: ---- sendmail-suse.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sendmail.spec ++++++ --- /var/tmp/diff_new_pack.CiJrbv/_old 2013-10-20 10:53:47.000000000 +0200 +++ /var/tmp/diff_new_pack.CiJrbv/_new 2013-10-20 10:53:47.000000000 +0200 @@ -16,6 +16,14 @@ # +# +# sysvinit -- build for SysVinit and not for systemd +# +%if %{undefined systemd_requires} +%global with_sysvinit 1 +%endif +%bcond_with sysvinit + Name: sendmail BuildRequires: cyrus-sasl-devel BuildRequires: db-devel @@ -57,6 +65,7 @@ Requires(posttrans): findutils Requires(posttrans): m4 Requires(verify): permissions +%{?systemd_requires} Conflicts: smail postfix postfix-tls Obsoletes: sendmail-tls Version: 8.14.7 @@ -65,6 +74,7 @@ License: SUSE-Sendmail Group: Productivity/Networking/Email/Servers Source0: ftp://ftp.sendmail.org/pub/sendmail/sendmail.%{version}.tar.gz +Source1: sendmail-suse.tar.bz2 Source2: sendmail-rpmlintrc Source3: sendmail-client.path Source4: sendmail.service @@ -82,7 +92,7 @@ %global _sysconfdir %{_sysconfdir} %global _mailcnfdir %{_sysconfdir}/mail %global _localstatedir %{_localstatedir} -%if 0%{?suse_version} > 1140 +%if %{without sysvinit} %{expand: %%global sysdsysunitdir %(pkg-config systemd --variable=systemdsystemunitdir)} %{expand: %%global sysdsysconfdir %(pkg-config systemd --variable=systemdsystemconfdir)} %endif @@ -123,6 +133,18 @@ -------- Eric Allman <[email protected]> +%package -n sendmail-starttls +Summary: BSD Sendmail Starttls helper scripts +Group: Productivity/Networking/Security +Requires: cyrus-sasl-saslauthd +Requires: openssl + +%description -n sendmail-starttls +This package includes the directory layout as well as some useful +helper scripts for better SSL/TLS support. + +"sendmail" is a trademark of Sendmail, Inc. + %package -n rmail Version: %{version} Release: 0 @@ -145,6 +167,7 @@ %patch -P 2 -p 0 -b .warning %patch -P 0 -p 0 -b .p0 %patch -P 3 -p1 + tar --strip-components=1 -xf %{S:1} set -f cat <<-EOF > file-list %%defattr(-,root,root) @@ -202,8 +225,15 @@ mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_mailcnfdir}/certs + mkdir -p %{buildroot}%{_mailcnfdir}/certs/certs + mkdir -p %{buildroot}%{_mailcnfdir}/certs/crl + mkdir -p %{buildroot}%{_mailcnfdir}/certs/private + mkdir -p %{buildroot}%{_mailcnfdir}/certs/newcerts + mkdir -p %{buildroot}%{_mailcnfdir}/certs/scripts mkdir -p %{buildroot}%{_mailcnfdir}/auth +%if %{with sysvinit} mkdir -p %{buildroot}%{_sysconfdir}/init.d +%endif mkdir -p %{buildroot}%{_sysconfdir}/pam.d mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services mkdir -p %{buildroot}%{_libdir} @@ -218,7 +248,7 @@ mkdir -p %{buildroot}%{_mandir}/man5 mkdir -p %{buildroot}%{_mandir}/man8 mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates -%if 0%{?suse_version} > 1140 +%if %{without sysvinit} mkdir -p %{buildroot}%{sysdsysunitdir} mkdir -p %{buildroot}/%{_mailcnfdir}/system %endif @@ -322,7 +352,12 @@ install -m 0755 sendmail.nissl %{buildroot}%{_sbindir}/ install -m 0644 permissions %{buildroot}%{_sysconfdir}/permissions.d/sendmail install -m 0644 permissions.paranoid %{buildroot}%{_sysconfdir}/permissions.d/sendmail.paranoid +%if %{with sysvinit} install -m 0755 rc %{buildroot}%{_sysconfdir}/init.d/sendmail +%else + sed -ri '\@/etc/init.d/sendmail@d' %{buildroot}%{_sysconfdir}/permissions.d/sendmail + sed -ri '\@/etc/init.d/sendmail@d' %{buildroot}%{_sysconfdir}/permissions.d/sendmail.paranoid +%endif install -m 0644 smtp %{buildroot}%{_sysconfdir}/pam.d/smtp install -m 0644 fw %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/sendmail install update.sendmail %{buildroot}%{_libexecdir}/sendmail.d/update @@ -359,7 +394,9 @@ chmod 0644 %{_sysconfdir}/sendmail.cf chmod 0644 %{_mailcnfdir}/submit.cf fi +%if %{with sysvinit} ln -sf %{_sysconfdir}/init.d/sendmail %{buildroot}%{_sbindir}/rcsendmail +%endif ln -sf ../aliases %{buildroot}%{_mailcnfdir}/aliases pushd %{buildroot}%{_mailcnfdir}/ OPATH=$PATH @@ -367,7 +404,7 @@ make DESTDIR=%{buildroot} short PATH=$OPATH popd -%if 0%{?suse_version} > 1140 +%if %{without sysvinit} # # systemd unit conf files install -m 0644 %{S:3} %{buildroot}%{sysdsysunitdir}/ @@ -392,7 +429,9 @@ %verify_permissions -e %{_localstatedir}/run/sendmail/ %verify_permissions -e %{_localstatedir}/spool/mqueue/ %verify_permissions -e %{_sysconfdir}/sendmail.cf +%if %{with sysvinit} %verify_permissions -e %{_sysconfdir}/init.d/sendmail +%endif %verify_permissions -e %{_mailcnfdir}/auth/ %verify_permissions -e %{_mailcnfdir}/certs/ %verify_permissions -e %{_libexecdir}/sendmail.d/bin/ @@ -424,18 +463,26 @@ N }' /etc/sysconfig/sendmail fi -%{fillup_and_insserv -nY sendmail sendmail} %{fillup_only -an mail} -if test -x bin/systemctl ; then - bin/systemctl enable sendmail.service >/dev/null 2>&1 || : - bin/systemctl enable sendmail-client.service >/dev/null 2>&1 || : - bin/systemctl enable sendmail-client.path >/dev/null 2>&1 || : +%if %{with sysvinit} +%{fillup_and_insserv -nY sendmail sendmail} +%else +%{fillup_only -an sendmail} +%service_add_post sendmail.service sendmail-client.service sendmail-client.path +PATH=bin:usr/bin:$PATH +if type -p systemctl > /dev/null 2>&1 ; then + systemctl enable sendmail.service >/dev/null 2>&1 || : + systemctl enable sendmail-client.service >/dev/null 2>&1 || : + systemctl enable sendmail-client.path >/dev/null 2>&1 || : fi +%endif %if %{defined set_permissions} %set_permissions %{_localstatedir}/run/sendmail/ %set_permissions %{_localstatedir}/spool/mqueue/ %set_permissions %{_sysconfdir}/sendmail.cf +%if %{with sysvinit} %set_permissions %{_sysconfdir}/init.d/sendmail +%endif %set_permissions %{_mailcnfdir}/auth/ %set_permissions %{_mailcnfdir}/certs/ %set_permissions %{_libexecdir}/sendmail.d/bin/ @@ -445,12 +492,11 @@ %endif %preun +%if %{with sysvinit} %{stop_on_removal sendmail} -if test -x bin/systemctl ; then - bin/systemctl disable sendmail.service >/dev/null 2>&1 || : - bin/systemctl disable sendmail-client.service >/dev/null 2>&1 || : - bin/systemctl disable sendmail-client.path >/dev/null 2>&1 || : -fi +%else +%service_del_preun sendmail.service sendmail-client.service sendmail-client.path +%endif %postun if test $1 = 0; then @@ -472,7 +518,7 @@ # %dir %attr(0750,root,mail) %{_sysconfdir}/aliases.d %dir %attr(0750,root,root) %{_mailcnfdir}/auth %dir %attr(0750,root,root) %{_mailcnfdir}/certs -%if 0%{?suse_version} > 1140 +%if %{without sysvinit} %dir %attr(0750,root,root) %{_mailcnfdir}/system %endif %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sendmail.cf @@ -504,10 +550,12 @@ %{_localstatedir}/adm/fillup-templates/sysconfig.mail-sendmail %config %attr(0644,root,root) %{_sysconfdir}/pam.d/smtp %config %attr(0644,root,root) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/sendmail +%if %{with sysvinit} %config %attr(0744,root,root) %{_sysconfdir}/init.d/sendmail +%endif %attr(0755,root,root) %{_libexecdir}/sendmail.d/update %attr(0755,root,root) %{_sbindir}/config.sendmail -%if 0%{?suse_version} > 1140 +%if %{without sysvinit} %config %attr(0644,root,root) %{sysdsysunitdir}/sendmail-client.path %config %attr(0644,root,root) %{sysdsysunitdir}/sendmail.service %config %attr(0644,root,root) %{sysdsysunitdir}/sendmail-client.service @@ -546,7 +594,9 @@ # Should we do 6555?? %attr(2555,root,mail) %{_sbindir}/sendmail %{_sbindir}/sendmail.nissl +%if %{with sysvinit} %{_sbindir}/rcsendmail +%endif %files -n sendmail-devel %defattr(-,root,root) @@ -560,6 +610,14 @@ %{_libdir}/libsmutil.a %{_libdir}/libsm.a +%files -n sendmail-starttls +%defattr(-,root,root) +%dir %attr(0700,root,root) %{_mailcnfdir}/certs/certs/ +%dir %attr(0700,root,root) %{_mailcnfdir}/certs/crl/ +%dir %attr(0700,root,root) %{_mailcnfdir}/certs/private/ +%dir %attr(0700,root,root) %{_mailcnfdir}/certs/newcerts/ +%dir %attr(0700,root,root) %{_mailcnfdir}/certs/scripts/ + %files -n rmail %defattr(-,root,root) %{_bindir}/rmail ++++++ sendmail-8.14.7.dif ++++++ ++++ 3435 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/sendmail/sendmail-8.14.7.dif ++++ and /work/SRC/openSUSE:Factory/.sendmail.new/sendmail-8.14.7.dif ++++++ sendmail-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.CiJrbv/_old 2013-10-20 10:53:47.000000000 +0200 +++ /var/tmp/diff_new_pack.CiJrbv/_new 2013-10-20 10:53:47.000000000 +0200 @@ -10,3 +10,8 @@ addFilter(".*no-manual-page-for-binary.*purgestat.*") addFilter(".*no-manual-page-for-binary.*sendmail.nissl.*") addFilter(".*macro-in-comment.*") +addFilter(".*self-obsoletion.*") +addFilter(".*non-conffile-in-etc.*/etc/mail/README.*") +addFilter(".*no-manual-page-for-binary.*config.sendmail.*") +addFilter(".*name-repeated-in-summary.*") +addFilter(".*binary-or-shlib-calls-gethostbyname.*") ++++++ sendmail.service ++++++ --- /var/tmp/diff_new_pack.CiJrbv/_old 2013-10-20 10:53:47.000000000 +0200 +++ /var/tmp/diff_new_pack.CiJrbv/_new 2013-10-20 10:53:47.000000000 +0200 @@ -16,8 +16,8 @@ Description=Sendmail Mail Transport Agent Requires=var-run.mount nss-lookup.target network.target remote-fs.target time-sync.target After=var-run.mount nss-lookup.target network.target remote-fs.target time-sync.target -Wants=amavis.service cyrus.service ldap.service nscd.service ypbind.service sendmail-client.service -After=amavis.service cyrus.service ldap.service nscd.service ypbind.service +Wants=amavis.service cyrus.service ldap.service nscd.service ypbind.service sendmail-client.service saslauthd.service +After=amavis.service cyrus.service ldap.service nscd.service ypbind.service saslauthd.service Before=sendmail-client.service mail-transfer-agent.target Conflicts=postfix.service exim.service -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
