![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package sendmail checked in at Fri Feb 22 01:50:37 CET 2008. -------- --- sendmail/sendmail.changes 2008-02-18 15:57:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/sendmail/sendmail.changes 2008-02-20 19:03:57.472048000 +0100 @@ -1,0 +2,7 @@ +Wed Feb 20 19:02:58 CET 2008 - werner@suse.de + +- Clean up spec file +- Add support for an other MTA port, be sure the client can connect + to the new port of the MTA + +------------------------------------------------------------------- @@ -1292 +1299 @@ -- add support for anti-spam macros from Claus A�mann +- add support for anti-spam macros from Claus Aßmann New: ---- sendmail-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sendmail.spec ++++++ --- /var/tmp/diff_new_pack.G29388/_old 2008-02-22 01:49:35.000000000 +0100 +++ /var/tmp/diff_new_pack.G29388/_new 2008-02-22 01:49:35.000000000 +0100 @@ -12,27 +12,37 @@ Name: sendmail -BuildRequires: db-devel mailx openldap2-devel procmail tcpd-devel vacation +BuildRequires: mailx openldap2-devel procmail tcpd-devel vacation +%if %suse_version < 1030 +BuildRequires: db-devel +%else +BuildRequires: libdb-4_5-devel +%endif Url: http://www.sendmail.org/ %define SUBDIRS libsmutil libsmdb sendmail mail.local mailstats makemap praliases rmail smrsh libmilter libsm editmap -#Copyright: 1983 Eric P. Allman License: Any permissive Group: Productivity/Networking/Email/Servers -PreReq: fileutils sed fillup /sbin/insserv -Provides: sendcf smailcfg smtp_daemon +PreReq: %fillup_prereq %insserv_prereq +PreReq: /bin/mv /bin/rm /bin/sed +PreReq: klogd sysconfig +Provides: sendcf smailcfg smtp_daemon sendmail-tls Requires: filesystem procmail netcfg m4 -Conflicts: smail postfix sendmail-tls postfix-tls +Conflicts: smail postfix postfix-tls Obsoletes: sendmail-tls AutoReqProv: on Version: 8.14.2 -Release: 19 +Release: 21 Summary: BSD Sendmail #Source0: ftp://ftp.sendmail.org/pub/sendmail/sendmail.%{version}.tar.bz2 Source0: sendmail-%{version}.tar.bz2 Source1: FAQ.sendmail-8.14.bz2 +Source2: sendmail-rpmlintrc Patch0: sendmail-%{version}.dif Patch1: sendmail-8.13.5-select.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build +%global _sysconfdir %{_sysconfdir} +%global _mailcnfdir %{_sysconfdir}/mail +%global _localstatedir %{_localstatedir} %description The "Unix System Administration Handbook" calls sendmail "The most @@ -53,7 +63,6 @@ %package -n sendmail-devel Summary: BSD Sendmail Development Kit -#Copyright: 1983 Eric P. Allman License: Any permissive Group: Development/Libraries/Other AutoReqProv: on @@ -72,9 +81,8 @@ %package -n rmail Version: 8.14.2 -Release: 19 +Release: 21 Summary: Rmail of the BSD Sendmail -#Copyright: 1983 Eric P. Allman License: Any permissive Group: Productivity/Networking/Email/Servers AutoReqProv: on @@ -96,17 +104,17 @@ set -f cat <<-EOF > file-list %%defattr(-,root,root) - %%dir %%attr(1750,root,root) /var/run/sendmail - %%dir %%attr(0750,root,root) /var/lib/sendmail - %%attr(0600,root,root) /var/lib/sendmail/statistics - %%attr(0600,root,root) /etc/mail/statistics - %%dir %%attr(0700,root,root) /var/spool/mqueue - %%dir %%attr(0700,root,root) /var/spool/mqueue/.hoststat + %%dir %%attr(1750,root,root) %{_localstatedir}/run/sendmail + %%dir %%attr(0750,root,root) %{_localstatedir}/lib/sendmail + %%attr(0600,root,root) %{_localstatedir}/lib/sendmail/statistics + %%attr(0600,root,root) %{_mailcnfdir}/statistics + %%dir %%attr(0700,root,root) %{_localstatedir}/spool/mqueue + %%dir %%attr(0700,root,root) %{_localstatedir}/spool/mqueue/.hoststat # Part of filesystem RPM - # %%dir %%attr(0770,root,mail) /var/spool/clientmqueue - %%attr(0660,root,mail) /var/spool/clientmqueue/sm-client.st - %%config %%attr(0644,root,root) /etc/permissions.d/sendmail - %%config %%attr(0644,root,root) /etc/permissions.d/sendmail.paranoid + # %%dir %%attr(0770,root,mail) %{_localstatedir}/spool/clientmqueue + %%attr(0660,root,mail) %{_localstatedir}/spool/clientmqueue/sm-client.st + %%config %%attr(0644,root,root) %{_sysconfdir}/permissions.d/sendmail + %%config %%attr(0644,root,root) %{_sysconfdir}/permissions.d/sendmail.paranoid EOF set +f @@ -123,7 +131,7 @@ ID=$(id -u) ARCH_LIB=%{_lib} export ARCH_LIB - doc=${RPM_BUILD_ROOT}%{_defaultdocdir}/sendmail + doc=%{buildroot}%{_defaultdocdir}/sendmail if test "$ID" -ne 0 ; then mkdir bin PATH=${PWD}/bin:$PATH @@ -139,34 +147,34 @@ esac done set -- \$(echo \${argv}) - exec -a install /usr/bin/install \${1+"\$@"} + exec -a install %{_bindir}/install \${1+"\$@"} EOF chmod 755 bin/install type -p install fi mkdir -p ${doc} - mkdir -p ${RPM_BUILD_ROOT}/sbin/conf.d - mkdir -p ${RPM_BUILD_ROOT}/usr/bin - mkdir -p ${RPM_BUILD_ROOT}/usr/sbin - mkdir -p ${RPM_BUILD_ROOT}/etc/mail/certs - mkdir -p ${RPM_BUILD_ROOT}/etc/mail/auth - mkdir -p ${RPM_BUILD_ROOT}/etc/init.d - mkdir -p ${RPM_BUILD_ROOT}/etc/pam.d - mkdir -p ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services - mkdir -p ${RPM_BUILD_ROOT}/usr/%{_lib} - mkdir -p ${RPM_BUILD_ROOT}/usr/lib/sendmail.d/bin - mkdir -p ${RPM_BUILD_ROOT}/usr/share/sendmail - mkdir -p ${RPM_BUILD_ROOT}/usr/include/sm - mkdir -p ${RPM_BUILD_ROOT}/usr/include/sm/os - chmod 0750 ${RPM_BUILD_ROOT}/etc/mail/certs - chmod 0750 ${RPM_BUILD_ROOT}/etc/mail/auth - mkdir -p ${RPM_BUILD_ROOT}/etc/permissions.d - mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 - mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man5 - mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 - mkdir -p ${RPM_BUILD_ROOT}/var/adm/fillup-templates + mkdir -p %{buildroot}/sbin/conf.d + mkdir -p %{buildroot}%{_bindir} + mkdir -p %{buildroot}%{_sbindir} + mkdir -p %{buildroot}%{_mailcnfdir}/certs + mkdir -p %{buildroot}%{_mailcnfdir}/auth + mkdir -p %{buildroot}%{_sysconfdir}/init.d + mkdir -p %{buildroot}%{_sysconfdir}/pam.d + mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services + mkdir -p %{buildroot}%{_libdir} + mkdir -p %{buildroot}%{_prefix}/lib/sendmail.d/bin + mkdir -p %{buildroot}%{_datadir}/sendmail + mkdir -p %{buildroot}%{_includedir}/sm + mkdir -p %{buildroot}%{_includedir}/sm/os + chmod 0750 %{buildroot}%{_mailcnfdir}/certs + chmod 0750 %{buildroot}%{_mailcnfdir}/auth + mkdir -p %{buildroot}%{_sysconfdir}/permissions.d + mkdir -p %{buildroot}%{_mandir}/man1 + mkdir -p %{buildroot}%{_mandir}/man5 + mkdir -p %{buildroot}%{_mandir}/man8 + mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates make \ - DESTDIR=${RPM_BUILD_ROOT} \ + DESTDIR=%{buildroot} \ SUBDIRS="%{SUBDIRS}" \ MANROOTMAN=%{_mandir}/man \ MANROOT=%{_mandir}/cat \ @@ -178,42 +186,43 @@ cd include/sm/os ln -s sm_os_linux.h sm_os.h cd ../../../ - cp -r include/sm ${RPM_BUILD_ROOT}/usr/include/ + cp -r include/sm %{buildroot}%{_includedir}/ test "$ID" -ne 0 || \ - chown root:root ${RPM_BUILD_ROOT}/etc/mail/submit.cf - chmod 0644 ${RPM_BUILD_ROOT}/etc/mail/submit.cf + chown root:root %{buildroot}%{_mailcnfdir}/submit.cf + chmod 0644 %{buildroot}%{_mailcnfdir}/submit.cf test "$ID" -ne 0 || \ - chown root:mail ${RPM_BUILD_ROOT}/usr/sbin/sendmail - ln -sf /usr/sbin/sendmail ${RPM_BUILD_ROOT}/usr/lib/sendmail - mv ${RPM_BUILD_ROOT}/usr/sbin/praliases \ - ${RPM_BUILD_ROOT}/usr/bin/praliases - mkdir -p ${RPM_BUILD_ROOT}/var/spool/mqueue/.hoststat + chown root:mail %{buildroot}%{_sbindir}/sendmail + ln -sf %{_sbindir}/sendmail %{buildroot}%{_prefix}/lib/sendmail + mv %{buildroot}%{_sbindir}/praliases \ + %{buildroot}%{_bindir}/praliases + mkdir -p %{buildroot}%{_localstatedir}/spool/mqueue/.hoststat test "$ID" -ne 0 || \ - chown -R root:root ${RPM_BUILD_ROOT}/var/spool/mqueue - chmod 0700 ${RPM_BUILD_ROOT}/var/spool/mqueue - chmod 0700 ${RPM_BUILD_ROOT}/var/spool/mqueue/.hoststat - mkdir -p ${RPM_BUILD_ROOT}/var/run/sendmail - chmod 1750 ${RPM_BUILD_ROOT}/var/run/sendmail - mkdir -p ${RPM_BUILD_ROOT}/var/lib/sendmail - chmod 0750 ${RPM_BUILD_ROOT}/var/lib/sendmail - touch ${RPM_BUILD_ROOT}/var/lib/sendmail/statistics + chown -R root:root %{buildroot}%{_localstatedir}/spool/mqueue + chmod 0700 %{buildroot}%{_localstatedir}/spool/mqueue + chmod 0700 %{buildroot}%{_localstatedir}/spool/mqueue/.hoststat + mkdir -p %{buildroot}%{_localstatedir}/run/sendmail + chmod 1750 %{buildroot}%{_localstatedir}/run/sendmail + mkdir -p %{buildroot}%{_localstatedir}/lib/sendmail + chmod 0750 %{buildroot}%{_localstatedir}/lib/sendmail + touch %{buildroot}%{_localstatedir}/lib/sendmail/statistics test "$ID" -ne 0 || \ - chown -R root:root ${RPM_BUILD_ROOT}/var/lib/sendmail/statistics - chmod 0600 ${RPM_BUILD_ROOT}/var/lib/sendmail/statistics - ln -sf /var/lib/sendmail/statistics ${RPM_BUILD_ROOT}/etc/mail/statistics - mkdir -p ${RPM_BUILD_ROOT}/var/spool/clientmqueue + chown -R root:root %{buildroot}%{_localstatedir}/lib/sendmail/statistics + chmod 0600 %{buildroot}%{_localstatedir}/lib/sendmail/statistics + ln -sf %{_localstatedir}/lib/sendmail/statistics %{buildroot}%{_mailcnfdir}/statistics + mkdir -p %{buildroot}%{_localstatedir}/spool/clientmqueue test "$ID" -ne 0 || \ - chown -R root:mail ${RPM_BUILD_ROOT}/var/spool/clientmqueue - chmod 0770 ${RPM_BUILD_ROOT}/var/spool/clientmqueue - touch ${RPM_BUILD_ROOT}/var/spool/clientmqueue/sm-client.st + chown -R root:mail %{buildroot}%{_localstatedir}/spool/clientmqueue + chmod 0770 %{buildroot}%{_localstatedir}/spool/clientmqueue + touch %{buildroot}%{_localstatedir}/spool/clientmqueue/sm-client.st test "$ID" -ne 0 || \ - chown -R root:mail ${RPM_BUILD_ROOT}/var/spool/clientmqueue/sm-client.st - chmod 0660 ${RPM_BUILD_ROOT}/var/spool/clientmqueue/sm-client.st - chmod 0755 ${RPM_BUILD_ROOT}/usr/lib/sendmail.d - chmod 0755 ${RPM_BUILD_ROOT}/usr/lib/sendmail.d/bin - ln -sf /usr/bin/vacation ${RPM_BUILD_ROOT}/usr/lib/sendmail.d/bin/ - ln -sf /usr/bin/mail ${RPM_BUILD_ROOT}/usr/lib/sendmail.d/bin/ - ln -sf /usr/bin/procmail ${RPM_BUILD_ROOT}/usr/lib/sendmail.d/bin/ + chown -R root:mail %{buildroot}%{_localstatedir}/spool/clientmqueue/sm-client.st + chmod 0660 %{buildroot}%{_localstatedir}/spool/clientmqueue/sm-client.st + chmod 0755 %{buildroot}%{_prefix}/lib/sendmail.d + chmod 0755 %{buildroot}%{_prefix}/lib/sendmail.d/bin + chmod 0644 %{buildroot}%{_libdir}/*.a + ln -sf %{_bindir}/vacation %{buildroot}%{_prefix}/lib/sendmail.d/bin/ + ln -sf %{_bindir}/mail %{buildroot}%{_prefix}/lib/sendmail.d/bin/ + ln -sf %{_bindir}/procmail %{buildroot}%{_prefix}/lib/sendmail.d/bin/ install -m 0644 K* README RELE* doc/op/op.ps sendmail/SECURITY \ sendmail/TRACEFLAGS suse/README.SuSE \ contrib/{e*,re-*,sm*,passwd*}.pl \ @@ -225,37 +234,38 @@ bzip2 -9f ${doc}/*.ps bzip2 -9f ${doc}/*.txt bzip2 -9f ${doc}/RELEASE_NOTES - tar cfC - cf . | tar xfC - ${RPM_BUILD_ROOT}/usr/share/sendmail/ + tar cfC - cf . | tar xfC - %{buildroot}%{_datadir}/sendmail/ test "$ID" -ne 0 || \ - chown root:root -R ${RPM_BUILD_ROOT}/usr/share/sendmail/ - rm -f ${RPM_BUILD_ROOT}/usr/share/sendmail/cf/Build - rm -f ${RPM_BUILD_ROOT}/usr/share/sendmail/cf/README - rm -f ${RPM_BUILD_ROOT}/usr/share/sendmail/cf/Makefile - rm -f ${RPM_BUILD_ROOT}/usr/share/sendmail/cf/*.cf - rm -fr ${RPM_BUILD_ROOT}/usr/share/sendmail/*/*~ ${doc}/*~ - find ${RPM_BUILD_ROOT}/usr/share/sendmail/ ${doc}/ \ + chown root:root -R %{buildroot}%{_datadir}/sendmail/ + chmod 0755 %{buildroot}%{_datadir}/sendmail/sh/makeinfo.sh + rm -f %{buildroot}%{_datadir}/sendmail/cf/Build + rm -f %{buildroot}%{_datadir}/sendmail/cf/README + rm -f %{buildroot}%{_datadir}/sendmail/cf/Makefile + rm -f %{buildroot}%{_datadir}/sendmail/cf/*.cf + rm -fr %{buildroot}%{_datadir}/sendmail/*/*~ ${doc}/*~ + find %{buildroot}%{_datadir}/sendmail/ ${doc}/ \ -name '*.ldap' -o -name '*.mime' -o \ -name '*.mrbl' -o -name '*.util' -o \ -name '*.dif' | xargs -r rm -f cd suse/ - # etc/aliases and /etc/aliases.d are in other packages - #install -m 0644 aliases ${RPM_BUILD_ROOT}/etc/ - #install -d -m 0750 ${RPM_BUILD_ROOT}/etc/aliases.d + # etc/aliases and %{_sysconfdir}/aliases.d are in other packages + #install -m 0644 aliases %{buildroot}%{_sysconfdir}/ + #install -d -m 0750 %{buildroot}%{_sysconfdir}/aliases.d install -m 0644 README Makefile mailertable genericstable userdb domaintable \ virtusertable access linux.mc linux.submit.mc \ linux.nullclient.mc service-nodns.switch \ service.switch relay-domains trusted-users \ - local-host-names ${RPM_BUILD_ROOT}/etc/mail/ - install -m 0600 auth-info ${RPM_BUILD_ROOT}/etc/mail/auth/ - install -m 0755 sendmail.nissl ${RPM_BUILD_ROOT}/usr/sbin/ - install -m 0644 permissions ${RPM_BUILD_ROOT}/etc/permissions.d/sendmail - install -m 0644 permissions.paranoid ${RPM_BUILD_ROOT}/etc/permissions.d/sendmail.paranoid - install -m 0755 rc ${RPM_BUILD_ROOT}/etc/init.d/sendmail - install -m 0644 smtp ${RPM_BUILD_ROOT}/etc/pam.d/smtp - install -m 0644 fw ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/sendmail - install SuSEconfig.sendmail ${RPM_BUILD_ROOT}/sbin/conf.d/ - install -m 0644 sysconfig.sendmail ${RPM_BUILD_ROOT}/var/adm/fillup-templates/ - install -m 0644 sysconfig.mail-sendmail ${RPM_BUILD_ROOT}/var/adm/fillup-templates/ + local-host-names %{buildroot}%{_mailcnfdir}/ + install -m 0600 auth-info %{buildroot}%{_mailcnfdir}/auth/ + 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 + install -m 0755 rc %{buildroot}%{_sysconfdir}/init.d/sendmail + install -m 0644 smtp %{buildroot}%{_sysconfdir}/pam.d/smtp + install -m 0644 fw %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/sendmail + install SuSEconfig.sendmail %{buildroot}/sbin/conf.d/ + install -m 0644 sysconfig.sendmail %{buildroot}%{_localstatedir}/adm/fillup-templates/ + install -m 0644 sysconfig.mail-sendmail %{buildroot}%{_localstatedir}/adm/fillup-templates/ > ${doc}/README.sendmail-local-only for m in messages/sendmail-local-only*; do l=${m##*.} @@ -265,35 +275,35 @@ echo >> ${doc}/README.sendmail-local-only done cd ../ - if test -n "${RPM_BUILD_ROOT}" ; then - cat ${RPM_BUILD_ROOT}/etc/mail/linux.mc | \ - sed "s@include(\`@include(\`${RPM_BUILD_ROOT}@" | \ + if test -n "%{buildroot}" ; then + cat %{buildroot}%{_mailcnfdir}/linux.mc | \ + sed "s@include(\`@include(\`%{buildroot}@" | \ m4 | \ - sed "s@${RPM_BUILD_ROOT}@@g" > ${RPM_BUILD_ROOT}/etc/sendmail.cf - cat ${RPM_BUILD_ROOT}/etc/mail/linux.submit.mc | \ - sed "s@include(\`@include(\`${RPM_BUILD_ROOT}@" | \ + sed "s@%{buildroot}@@g" > %{buildroot}%{_sysconfdir}/sendmail.cf + cat %{buildroot}%{_mailcnfdir}/linux.submit.mc | \ + sed "s@include(\`@include(\`%{buildroot}@" | \ m4 | \ - sed "s@${RPM_BUILD_ROOT}@@g" > ${RPM_BUILD_ROOT}/etc/mail/submit.cf + sed "s@%{buildroot}@@g" > %{buildroot}%{_mailcnfdir}/submit.cf else - m4 < /etc/mail/linux.mc > /etc/sendmail.cf - m4 < /etc/mail/linux.submit.mc > /etc/mail/submit.cf + m4 < %{_mailcnfdir}/linux.mc > %{_sysconfdir}/sendmail.cf + m4 < %{_mailcnfdir}/linux.submit.mc > %{_mailcnfdir}/submit.cf fi - ln -sf /etc/init.d/sendmail ${RPM_BUILD_ROOT}/usr/sbin/rcsendmail - ln -sf ../aliases ${RPM_BUILD_ROOT}/etc/mail/aliases - pushd ${RPM_BUILD_ROOT}/etc/mail/ + ln -sf %{_sysconfdir}/init.d/sendmail %{buildroot}%{_sbindir}/rcsendmail + ln -sf ../aliases %{buildroot}%{_mailcnfdir}/aliases + pushd %{buildroot}%{_mailcnfdir}/ OPATH=$PATH - PATH="${OPATH}:${RPM_BUILD_ROOT}/usr/sbin:${RPM_BUILD_ROOT}/usr/bin" - make DESTDIR=${RPM_BUILD_ROOT} short + PATH="${OPATH}:%{buildroot}%{_sbindir}:%{buildroot}%{_bindir}" + make DESTDIR=%{buildroot} short PATH=$OPATH popd # # Remove some files we don't wish to package # - rm -f ${RPM_BUILD_ROOT}/etc/aliases ${RPM_BUILD_ROOT}/etc/mail/*.db - rm -f ${RPM_BUILD_ROOT}/etc/mail/*/*.db + rm -f %{buildroot}%{_sysconfdir}/aliases %{buildroot}%{_mailcnfdir}/*.db + rm -f %{buildroot}%{_mailcnfdir}/*/*.db %clean -rm -rf ${RPM_BUILD_ROOT} +rm -rf %{buildroot} %pre # Check for rc.config: @@ -359,57 +369,57 @@ %files -f file-list %defattr(-,root,root) -%dir /etc/mail -# /etc/aliases.d is part of aaa_dir -# %dir %attr(0750,root,mail) /etc/aliases.d -%dir %attr(0750,root,root) /etc/mail/auth -%dir %attr(0750,root,root) /etc/mail/certs -%config(noreplace) /etc/sendmail.cf -# /etc/aliases is part of netcfg -# %config(noreplace) /etc/aliases -%doc /etc/mail/README -%config(noreplace) /etc/mail/Makefile +%dir %{_mailcnfdir} +# %{_sysconfdir}/aliases.d is part of aaa_dir +# %dir %attr(0750,root,mail) %{_sysconfdir}/aliases.d +%dir %attr(0750,root,root) %{_mailcnfdir}/auth +%dir %attr(0750,root,root) %{_mailcnfdir}/certs +%config(noreplace) %{_sysconfdir}/sendmail.cf +# %{_sysconfdir}/aliases is part of netcfg +# %config(noreplace) %{_sysconfdir}/aliases +%doc %{_mailcnfdir}/README +%config(noreplace) %{_mailcnfdir}/Makefile # this is a link -%config(noreplace) /etc/mail/aliases -%config(noreplace) %attr(0600,root,root) /etc/mail/auth/auth-info -%config(noreplace) /etc/mail/linux.mc -%config(noreplace) /etc/mail/linux.submit.mc -%config(noreplace) /etc/mail/linux.nullclient.mc -%config(noreplace) /etc/mail/mailertable -%config(noreplace) /etc/mail/genericstable -%config(noreplace) /etc/mail/domaintable -%config(noreplace) /etc/mail/virtusertable -%config(noreplace) /etc/mail/access -%config(noreplace) /etc/mail/userdb -%config(noreplace) /etc/mail/relay-domains -%config(noreplace) /etc/mail/service.switch -%config(noreplace) /etc/mail/service-nodns.switch -%config(noreplace) /etc/mail/trusted-users -%config(noreplace) /etc/mail/local-host-names -%config(noreplace) /etc/mail/submit.cf +%config(noreplace) %{_mailcnfdir}/aliases +%config(noreplace) %attr(0600,root,root) %{_mailcnfdir}/auth/auth-info +%config(noreplace) %{_mailcnfdir}/linux.mc +%config(noreplace) %{_mailcnfdir}/linux.submit.mc +%config(noreplace) %{_mailcnfdir}/linux.nullclient.mc +%config(noreplace) %{_mailcnfdir}/mailertable +%config(noreplace) %{_mailcnfdir}/genericstable +%config(noreplace) %{_mailcnfdir}/domaintable +%config(noreplace) %{_mailcnfdir}/virtusertable +%config(noreplace) %{_mailcnfdir}/access +%config(noreplace) %{_mailcnfdir}/userdb +%config(noreplace) %{_mailcnfdir}/relay-domains +%config(noreplace) %{_mailcnfdir}/service.switch +%config(noreplace) %{_mailcnfdir}/service-nodns.switch +%config(noreplace) %{_mailcnfdir}/trusted-users +%config(noreplace) %{_mailcnfdir}/local-host-names +%config(noreplace) %{_mailcnfdir}/submit.cf %doc %{_defaultdocdir}/sendmail -/usr/share/sendmail -/var/adm/fillup-templates/sysconfig.sendmail -/var/adm/fillup-templates/sysconfig.mail-sendmail -%config %attr(0644,root,root) /etc/pam.d/smtp -%config %attr(0644,root,root) /etc/sysconfig/SuSEfirewall2.d/services/sendmail -%config %attr(0744,root,root) /etc/init.d/sendmail +%{_datadir}/sendmail +%{_localstatedir}/adm/fillup-templates/sysconfig.sendmail +%{_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 +%config %attr(0744,root,root) %{_sysconfdir}/init.d/sendmail %config %attr(0755,root,root) /sbin/conf.d/SuSEconfig.sendmail -/usr/bin/hoststat -/usr/bin/mailq -/usr/bin/newaliases -/usr/bin/praliases -/usr/bin/purgestat -#/usr/bin/rmail -/usr/lib/sendmail -%dir %attr(0755,root,root) /usr/lib/sendmail.d/ -%dir %attr(0755,root,root) /usr/lib/sendmail.d/bin/ -/usr/lib/sendmail.d/bin/mail -%attr(0511,root,root) /usr/lib/sendmail.d/bin/mail.local -/usr/lib/sendmail.d/bin/procmail -%attr(0511,root,root) /usr/lib/sendmail.d/bin/smrsh -/usr/lib/sendmail.d/bin/vacation -/usr/lib/sendmail.d/helpfile +%{_bindir}/hoststat +%{_bindir}/mailq +%{_bindir}/newaliases +%{_bindir}/praliases +%{_bindir}/purgestat +#%{_bindir}/rmail +%{_prefix}/lib/sendmail +%dir %attr(0755,root,root) %{_prefix}/lib/sendmail.d/ +%dir %attr(0755,root,root) %{_prefix}/lib/sendmail.d/bin/ +%{_prefix}/lib/sendmail.d/bin/mail +%attr(0511,root,root) %{_prefix}/lib/sendmail.d/bin/mail.local +%{_prefix}/lib/sendmail.d/bin/procmail +%attr(0511,root,root) %{_prefix}/lib/sendmail.d/bin/smrsh +%{_prefix}/lib/sendmail.d/bin/vacation +%{_prefix}/lib/sendmail.d/helpfile %doc %{_mandir}/man1/mailq.1.gz %doc %{_mandir}/man1/newaliases.1.gz %doc %{_mandir}/man5/aliases.5.gz @@ -421,32 +431,36 @@ %doc %{_mandir}/man8/mail.local.8.gz %doc %{_mandir}/man8/mailstats.8.gz %doc %{_mandir}/man8/praliases.8.gz -/usr/sbin/editmap -/usr/sbin/mailstats -/usr/sbin/makemap +%{_sbindir}/editmap +%{_sbindir}/mailstats +%{_sbindir}/makemap # Should we do 6555?? -%attr(2555,root,mail) /usr/sbin/sendmail -/usr/sbin/sendmail.nissl -/usr/sbin/rcsendmail +%attr(2555,root,mail) %{_sbindir}/sendmail +%{_sbindir}/sendmail.nissl +%{_sbindir}/rcsendmail %files -n sendmail-devel %defattr(-,root,root) -%dir /usr/include/libmilter -/usr/include/libmilter/*.h -%dir /usr/include/sm -/usr/include/sm/*.h -%dir /usr/include/sm/os -/usr/include/sm/os/*.h -/usr/%{_lib}/libmilter.a -/usr/%{_lib}/libsmutil.a -/usr/%{_lib}/libsm.a +%dir %{_includedir}/libmilter +%{_includedir}/libmilter/*.h +%dir %{_includedir}/sm +%{_includedir}/sm/*.h +%dir %{_includedir}/sm/os +%{_includedir}/sm/os/*.h +%{_libdir}/libmilter.a +%{_libdir}/libsmutil.a +%{_libdir}/libsm.a %files -n rmail %defattr(-,root,root) -/usr/bin/rmail +%{_bindir}/rmail %doc %{_mandir}/man8/rmail.8.gz %changelog +* Wed Feb 20 2008 werner@suse.de +- Clean up spec file +- Add support for an other MTA port, be sure the client can connect + to the new port of the MTA * Mon Feb 18 2008 werner@suse.de - Don't forget port even if sendmail listen only local (bnc#362642) * Fri Dec 14 2007 werner@suse.de @@ -1105,7 +1119,7 @@ - new parameters in rc.config (/var/adm/fillup-templates/rc.config.sendmail) - per default additional database files in /etc/mail are used - /sbin/conf.d/SuSEconfig.sendmail gernerates /etc/sendmail.cf -- add support for anti-spam macros from Claus A�mann +- add support for anti-spam macros from Claus Aßmann - sample /etc/mail/linux.mc for complex email setups * Sun Apr 27 1997 bs@suse.de start sendmail in background in sbin/init.d/sendmail ++++++ uucp.spec ++++++ --- /var/tmp/diff_new_pack.G29388/_old 2008-02-22 01:49:35.000000000 +0100 +++ /var/tmp/diff_new_pack.G29388/_new 2008-02-22 01:49:35.000000000 +0100 @@ -19,7 +19,7 @@ Recommends: stunnel AutoReqProv: on Version: 1.07 -Release: 370 +Release: 372 Summary: Taylor UUCP Source0: uucp-1.07.tar.bz2 Source1: uucpcfg.tar.bz2 ++++++ sendmail-8.14.2.dif ++++++ --- /var/tmp/diff_new_pack.G29388/_old 2008-02-22 01:49:36.000000000 +0100 +++ /var/tmp/diff_new_pack.G29388/_new 2008-02-22 01:49:36.000000000 +0100 @@ -137,7 +137,7 @@ + +divert(0)dnl --- cf/feature/msp.m4 -+++ cf/feature/msp.m4 2006-08-10 11:32:28.000000000 +0200 ++++ cf/feature/msp.m4 2008-02-20 18:46:35.131059684 +0100 @@ -20,7 +20,7 @@ define(`confPRIVACY_FLAGS', `goaway,noet define(`confDONT_PROBE_INTERFACES', `True') dnl --------------------------------------------- @@ -147,6 +147,25 @@ ifdef(`confTRUSTED_USER',,`define(`confTRUSTED_USER', `ifelse(index(confRUN_AS_USER,`:'), -1, `confRUN_AS_USER', `substr(confRUN_AS_USER,0,index(confRUN_AS_USER,`:'))')')') +@@ -62,11 +62,18 @@ MODIFY_MAILER_FLAGS(`ESMTP', `+k5')dnl + MODIFY_MAILER_FLAGS(`DSMTP', `+k5')dnl + MODIFY_MAILER_FLAGS(`SMTP8', `+k5')dnl + MODIFY_MAILER_FLAGS(`RELAY', `+k')dnl ++define(`SMTP_MAILER_ARGS', `TCP $h ${MTAPort}')dnl ++define(`ESMTP_MAILER_ARGS', `TCP $h ${MTAPort}')dnl ++define(`DSMTP_MAILER_ARGS', `TCP $h ${MTAPort}')dnl ++define(`SMTP8_MAILER_ARGS', `TCP $h ${MTAPort}')dnl ++ifelse(_ARG2_, `', `define(`RELAY_MAILER_ARGS', `TCP $h ${MTAPort}')')dnl ++ifdef(`confMTAPort', `define(`_MTA_PORT_', confMTAPort)', `define(`_MTA_PORT_', smtp)')dnl + MAILER(`local')dnl + MAILER(`smtp')dnl + + LOCAL_CONFIG + D{MTAHost}_MTA_HOST_ ++D{MTAPort}_MTA_PORT_ + + LOCAL_RULESETS + SLocal_localaddr --- cf/feature/no_local_masquerading.m4 +++ cf/feature/no_local_masquerading.m4 2006-08-10 11:32:28.000000000 +0200 @@ -0,0 +1,17 @@ @@ -207,6 +226,16 @@ +define(`confBIND_OPTS', `-DNSRCH -DEFNAMES')dnl +dnl +divert(0)dnl +--- cf/m4/cfhead.m4 ++++ cf/m4/cfhead.m4 2008-02-20 19:00:45.919606546 +0100 +@@ -303,6 +303,7 @@ define(`confMILTER_MACROS_HELO', ``{tls_ + define(`confMILTER_MACROS_ENVFROM', ``i, {auth_type}, {auth_authen}, {auth_ssf}, {auth_author}, {mail_mailer}, {mail_host}, {mail_addr}'') + define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'') + define(`confMILTER_MACROS_EOM', `{msg_id}') ++undefine(`confMTAPort') + + + divert(0)dnl --- cf/m4/proto.m4 +++ cf/m4/proto.m4 2006-08-10 11:32:28.000000000 +0200 @@ -1243,6 +1243,12 @@ ifdef(`_PRESERVE_LUSER_HOST_', `dnl @@ -2289,9 +2318,9 @@ + + Your SuSE team --- suse/SuSEconfig.sendmail -+++ suse/SuSEconfig.sendmail 2006-08-10 11:32:29.000000000 +0200 -@@ -0,0 +1,463 @@ -+#! /bin/sh ++++ suse/SuSEconfig.sendmail 2008-02-20 18:58:12.564042297 +0100 +@@ -0,0 +1,472 @@ ++#!/bin/sh +# Copyright (c) 1997-2001 SuSE GmbH Nuernberg, Germany. +# Author: Florian La Roche +# Werner Fink @@ -2303,6 +2332,9 @@ + +e=0 +r=$ROOT ++typeset -i SENDMAIL_MTA_PORT=25 ++typeset -i SENDMAIL_UUCP_MAX_MSG=0 ++ +test -s $r/etc/rc.config && . $r/etc/rc.config + +# Know about FQHOSTNAME @@ -2334,8 +2366,8 @@ +esac +test -z "$FROM_HEADER" -a -n "$EXPAND" && FROM_HEADER=$EXPAND + -+VERSION=8.12.11-0.8 -+DATE=2004/04/02 ++VERSION=8.14.2-0.9 ++DATE=2008/02/20 + +gen_sendmail_m4(){ + cat <<-EOF @@ -2352,6 +2384,9 @@ + VERSIONID(\`@(#)Setup for SuSE Linux $VERSION (SuSE Linux) $DATE')dnl + OSTYPE(\`suse-linux')dnl + EOF ++ if test $SENDMAIL_MTA_PORT -ne 25 ; then ++ echo "DAEMON_OPTIONS(\`Name=MTA,Port=${SENDMAIL_MTA_PORT}')dnl" ++ fi + if test "$USE_ACCESS_DB" = "yes" ; then + echo "FEATURE(\`access_db', \`hash -T<TMPF> -o /etc/mail/access.db')dnl" + echo "FEATURE(\`greet_pause', \`2000')dnl" @@ -2421,7 +2456,7 @@ + echo "FEATURE(\`masquerade_entire_domain')dnl" + fi + echo "MASQUERADE_DOMAIN(\`$MASQUERADE_DOMAINS')dnl" -+ echo "MASQUERADE_DOMAIN_FILE(\`/etc/mail/local-host-names')dnl" ++ echo "MASQUERADE_DOMAIN_FILE(\`-o /etc/mail/local-host-names %[^\#]')dnl" + echo "FEATURE(\`limited_masquerade')dnl" + fi + fi @@ -2444,11 +2479,11 @@ + else + echo "GENERICS_DOMAIN(\`$SENDMAIL_GENERICS_DOMAIN')dnl" + fi -+ echo "GENERICS_DOMAIN_FILE(\`/etc/mail/local-host-names')dnl" ++ echo "GENERICS_DOMAIN_FILE(\`-o /etc/mail/local-host-names %[^\#]')dnl" + else + if test -n "$FROM_HEADER" ; then + echo "GENERICS_DOMAIN(\`$FROM_HEADER')dnl" -+ echo "GENERICS_DOMAIN_FILE(\`/etc/mail/local-host-names')dnl" ++ echo "GENERICS_DOMAIN_FILE(\`-o /etc/mail/local-host-names %[^\#]')dnl" + fi + fi + @@ -2523,7 +2558,7 @@ + echo "\`,GroupWritableSASLDBFile')dnl" + fi + -+ if test -n "$SENDMAIL_UUCP_MAX_MSG" -a "$SENDMAIL_UUCP_MAX_MSG" != "no" ; then ++ if test $SENDMAIL_UUCP_MAX_MSG -gt 0 ; then + echo "define(\`UUCP_MAILER_MAX', \`$SENDMAIL_UUCP_MAX_MSG')dnl" + fi + @@ -2604,13 +2639,16 @@ + else + echo "GENERICS_DOMAIN(\`$SENDMAIL_GENERICS_DOMAIN')dnl" + fi -+ echo "GENERICS_DOMAIN_FILE(\`/etc/mail/local-host-names')dnl" ++ echo "GENERICS_DOMAIN_FILE(\`-o /etc/mail/local-host-names %[^\#]')dnl" + else + if test -n "$FROM_HEADER" ; then + echo "GENERICS_DOMAIN(\`$FROM_HEADER')dnl" -+ echo "GENERICS_DOMAIN_FILE(\`/etc/mail/local-host-names')dnl" ++ echo "GENERICS_DOMAIN_FILE(\`-o /etc/mail/local-host-names %[^\#]')dnl" + fi + fi ++ if test $SENDMAIL_MTA_PORT -ne 25 ; then ++ echo "define(\`confMTAPort', \`${SENDMAIL_MTA_PORT}')dnl" ++ fi + cat <<-EOF + divert(-1) + include(\`$r/usr/share/sendmail/cf/submit.mc') @@ -3515,25 +3553,26 @@ +/usr/lib/sendmail.d/bin/mail.local root:root 0511 +/var/run/sendmail root:root 1750 --- suse/rc -+++ suse/rc 2008-02-18 12:27:58.385677991 +0100 -@@ -0,0 +1,125 @@ ++++ suse/rc 2008-02-20 16:35:11.004155203 +0100 +@@ -0,0 +1,126 @@ +#! /bin/sh +# Copyright (c) 1996-2002 SuSE Gmbh Nuernberg, Germany. -+# Copyright (c) 2006-2007 SuSE LINUX Products GmbH, Germany. ++# Copyright (c) 2006-2008 SuSE LINUX Products GmbH, Germany. +# +# Author: Florian La Roche, 1996, 1997 +# Werner Fink, 1996, 1999-2007 +# Please send feedback to http://www.suse.de/feedback/ +# +### BEGIN INIT INFO -+# Provides: sendmail smtp -+# Required-Start: $named $network $remote_fs $syslog $time ++# Provides: sendmail smtp ++# Required-Start: $named $network $remote_fs $syslog $time +# Required-Stop: -+# Should-Start: amavis cyrus ldap nscd ypbind ++# Should-Start: amavis cyrus ldap nscd ypbind +# Should-Stop: -+# Default-Start: 3 5 ++# Default-Start: 3 5 +# Default-Stop: -+# Description: Start the Sendmail MTA ++# Short-Description: Start the Sendmail MTA ++# Description: Start the Sendmail MTA +### END INIT INFO + +test -s /etc/sysconfig/mail && \ @@ -4203,8 +4242,8 @@ +# +SMTPD_LISTEN_REMOTE="no" --- suse/sysconfig.sendmail -+++ suse/sysconfig.sendmail 2008-02-18 18:08:51.961012281 +0100 -@@ -0,0 +1,279 @@ ++++ suse/sysconfig.sendmail 2008-02-20 19:02:03.641521655 +0100 +@@ -0,0 +1,288 @@ +## Path: Network/Mail/Sendmail +## Description: Configuration of sendmail +## Type: string @@ -4484,6 +4523,15 @@ +# +SENDMAIL_UUCP_MAX_MSG=2000000 + ++## Type: integer(1:50000) ++## Default: 25 ++# ++# The standard port for Simple Mail Transfer Protocol (SMTP). ++# This is the default port for any local and remote mail ++# transfer and should not be changed. ++# ++SENDMAIL_MTA_PORT=25 ++ --- suse/trusted-users +++ suse/trusted-users 2006-08-10 11:32:29.000000000 +0200 @@ -0,0 +1,19 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de