Hello community, here is the log from the commit of package sendmail for openSUSE:Factory checked in at 2012-07-14 13:15:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sendmail (Old) and /work/SRC/openSUSE:Factory/.sendmail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sendmail", Maintainer is "wer...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/sendmail/sendmail.changes 2012-05-29 11:37:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sendmail.new/sendmail.changes 2012-07-14 13:15:30.000000000 +0200 @@ -1,0 +2,20 @@ +Fri Jul 13 16:22:57 UTC 2012 - wer...@suse.de + +- Make if build even with older distributions + +------------------------------------------------------------------- +Fri Jul 13 15:27:54 UTC 2012 - wer...@suse.de + +- Use UTF-8 messages + +------------------------------------------------------------------- +Fri Jul 13 14:52:55 UTC 2012 - wer...@suse.de + +- Do not depend on broken umask in rpm scriptlets + +------------------------------------------------------------------- +Tue Jun 19 15:05:38 UTC 2012 - wer...@suse.de + +- Make SuSEconfig.sendmail a standalone update script (fate#313548) + +------------------------------------------------------------------- @@ -43 +63 @@ -- Make /var7run a ghost entry in spec as this is a tmpfs now and +- Make /var/run a ghost entry in spec as this is a tmpfs now and ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sendmail.spec ++++++ --- /var/tmp/diff_new_pack.jGLJ6L/_old 2012-07-14 13:15:33.000000000 +0200 +++ /var/tmp/diff_new_pack.jGLJ6L/_new 2012-07-14 13:15:33.000000000 +0200 @@ -29,22 +29,29 @@ %endif Url: http://www.sendmail.org/ %define SUBDIRS libsmutil libsmdb sendmail mail.local mailstats makemap praliases rmail smrsh libmilter libsm editmap -PreReq: %fillup_prereq %insserv_prereq -PreReq: /bin/mv /bin/rm /bin/sed -PreReq: permissions -%if 0%{?suse_version} > 1130 -PreReq: sysvinit(network) sysvinit(syslog) -%endif Provides: sendcf Provides: sendmail-tls Provides: smailcfg Provides: smtp_daemon Requires: /bin/fuser +Requires: coreutils Requires: filesystem +Requires: findutils Requires: m4 Requires: make Requires: netcfg Requires: procmail +Requires(prereq): sysvinit(network) +Requires(prereq): sysvinit(syslog) +Requires(post): %fillup_prereq +Requires(post): %insserv_prereq +Requires(post): coreutils +Requires(post): permissions +Requires(postun): %insserv_prereq +Requires(posttrans): coreutils +Requires(posttrans): findutils +Requires(posttrans): m4 +Requires(verify): permissions Conflicts: smail postfix postfix-tls Obsoletes: sendmail-tls Version: 8.14.5 @@ -71,6 +78,9 @@ %{expand: %%global sysdsysunitdir %(pkg-config systemd --variable=systemdsystemunitdir)} %{expand: %%global sysdsysconfdir %(pkg-config systemd --variable=systemdsystemconfdir)} %endif +%if 0%{?suse_version} < 1120 +%global _libexecdir %{_exec_prefix}/lib +%endif %description The "Unix System Administration Handbook" calls sendmail "The most @@ -125,7 +135,7 @@ %setup %patch -P 1 -p 0 -b .select %patch -P 2 -p 0 -b .auth2 -%patch -P 0 -p 0 +%patch -P 0 -p 0 -b .p0 set -f cat <<-EOF > file-list %%defattr(-,root,root) @@ -188,7 +198,7 @@ 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}%{_libexecdir}/sendmail.d/bin mkdir -p %{buildroot}%{_datadir}/sendmail mkdir -p %{buildroot}%{_includedir}/sm mkdir -p %{buildroot}%{_includedir}/sm/os @@ -247,12 +257,12 @@ test "$ID" -ne 0 || \ 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 0755 %{buildroot}%{_libexecdir}/sendmail.d + chmod 0755 %{buildroot}%{_libexecdir}/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/ + ln -sf %{_bindir}/vacation %{buildroot}%{_libexecdir}/sendmail.d/bin/ + ln -sf %{_bindir}/mail %{buildroot}%{_libexecdir}/sendmail.d/bin/ + ln -sf %{_bindir}/procmail %{buildroot}%{_libexecdir}/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 \ @@ -276,6 +286,7 @@ find %{buildroot}%{_datadir}/sendmail/ ${doc}/ %{buildroot}%{_includedir}/ \ -name '*.ldap' -o -name '*.mime' -o \ -name '*.mrbl' -o -name '*.util' -o \ + -name '*.p0' -o -name '*.auth2' -o \ -name '*.dif' -o -name '*.orig' | xargs -r rm -f cd suse/ # etc/aliases and %{_sysconfdir}/aliases.d are in other packages @@ -293,11 +304,11 @@ 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 update.sendmail %{buildroot}%{_libexecdir}/sendmail.d/update 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 + for m in messages/sendmail-local-only.[a-z][a-z]; do l=${m##*.} n=${m##*/} n=${n%.*} @@ -314,9 +325,13 @@ sed "s@include(\`@include(\`%{buildroot}@" | \ m4 | \ sed "s@%{buildroot}@@g" > %{buildroot}%{_mailcnfdir}/submit.cf + chmod 0644 %{buildroot}%{_sysconfdir}/sendmail.cf + chmod 0644 %{buildroot}%{_mailcnfdir}/submit.cf else m4 < %{_mailcnfdir}/linux.mc > %{_sysconfdir}/sendmail.cf m4 < %{_mailcnfdir}/linux.submit.mc > %{_mailcnfdir}/submit.cf + chmod 0644 %{_sysconfdir}/sendmail.cf + chmod 0644 %{_mailcnfdir}/submit.cf fi ln -sf %{_sysconfdir}/init.d/sendmail %{buildroot}%{_sbindir}/rcsendmail ln -sf ../aliases %{buildroot}%{_mailcnfdir}/aliases @@ -354,63 +369,22 @@ %verify_permissions -e %{_sysconfdir}/init.d/sendmail %verify_permissions -e %{_mailcnfdir}/auth/ %verify_permissions -e %{_mailcnfdir}/certs/ -%verify_permissions -e %{_prefix}/lib/sendmail.d/bin/ -%verify_permissions -e %{_prefix}/lib/sendmail.d/bin/mail.local -%verify_permissions -e %{_prefix}/lib/sendmail.d/bin/smrsh +%verify_permissions -e %{_libexecdir}/sendmail.d/bin/ +%verify_permissions -e %{_libexecdir}/sendmail.d/bin/mail.local +%verify_permissions -e %{_libexecdir}/sendmail.d/bin/smrsh %verify_permissions -e %{_sbindir}/sendmail %endif -%pre -# Check for rc.config: -if test -f etc/rc.config ; then - SMTP=$(. etc/rc.config 2>/dev/null; echo $SMTP) - if test -n "$SMTP" ; then - echo SMTP=$SMTP > var/adm/run-sendmail - fi -fi - %post # Trigger rebuild of old db's -for db in etc/aliases.db etc/aliases.d/*.db etc/mail/*.db etc/mail/*/*.db ; do +for db in /etc/aliases.db /etc/aliases.d/*.db /etc/mail/*.db /etc/mail/*/*.db ; do test -e "$db" || continue test -e "${db%.db}" || continue touch "${db%.db}" done -# Put together -if test -f etc/rc.config.d/sendmail.rc.config ; then - cat etc/rc.config.d/sendmail.rc.config >> etc/rc.config - rm -f etc/rc.config.d/sendmail.rc.config -fi -# Rename these on update -if test -f etc/rc.config ; then - SENDMAIL_ARGS=$(. etc/rc.config 2>/dev/null; echo $SENDMAIL_ARGS) - case "$SENDMAIL_ARGS" in - *-L*-Am*) ;; - *-Am*-L*) ;; - *) SENDMAIL_ARGS="-L sendmail -Am $SENDMAIL_ARGS" - esac - sed -e "s@^SENDMAIL_TYPE=@MAIL_CREATE_CONFIG=@" \ - -e "s@^SENDMAIL_NODNS=@NODNS=@" \ - -e "s@^SENDMAIL_ARGS=.*@SENDMAIL_ARGS=\"$SENDMAIL_ARGS\"@" \ - -e "s@^SENDMAIL_DIALUP=@DIALUP=@" etc/rc.config > etc/rc.config.new - test -s etc/rc.config.new && mv etc/rc.config.new etc/rc.config || true -fi -# Should we listen for remote mails -if test -f var/adm/run-sendmail ; then - . var/adm/run-sendmail - if test "$SMTP" = "yes" -a -f var/adm/fillup-templates/sysconfig.mail-sendmail ; then - sed -e 's@SMTPD_LISTEN_REMOTE="no"@SMTPD_LISTEN_REMOTE="yes"@' \ - var/adm/fillup-templates/sysconfig.mail-sendmail \ - > var/adm/fillup-templates/sysconfig.mail-sendmail.new - test -s var/adm/fillup-templates/sysconfig.mail-sendmail.new && - mv var/adm/fillup-templates/sysconfig.mail-sendmail.new \ - var/adm/fillup-templates/sysconfig.mail-sendmail || true - SMTPD_LISTEN_REMOTE=yes - fi -fi # Update from newer SuSE releases or new installation -if test -f etc/sysconfig/mail ; then - . etc/sysconfig/mail +if test -f /etc/sysconfig/mail ; then + . /etc/sysconfig/mail fi %{fillup_and_insserv -nY sendmail sendmail} %{fillup_only -an mail} @@ -426,9 +400,9 @@ %set_permissions %{_sysconfdir}/init.d/sendmail %set_permissions %{_mailcnfdir}/auth/ %set_permissions %{_mailcnfdir}/certs/ -%set_permissions %{_prefix}/lib/sendmail.d/bin/ -%set_permissions %{_prefix}/lib/sendmail.d/bin/mail.local -%set_permissions %{_prefix}/lib/sendmail.d/bin/smrsh +%set_permissions %{_libexecdir}/sendmail.d/bin/ +%set_permissions %{_libexecdir}/sendmail.d/bin/mail.local +%set_permissions %{_libexecdir}/sendmail.d/bin/smrsh %set_permissions %{_sbindir}/sendmail %endif @@ -441,9 +415,18 @@ fi %postun -%{restart_on_update sendmail} +if test $1 = 0; then + %{restart_on_update sendmail} + rm -rf %{_localstatedir}/lib/sendmail + exit 0 +fi %{insserv_cleanup} +%posttrans +if test -x %{_libexecdir}/sendmail.d/update ; then + VERBOSE=false %{_libexecdir}/sendmail.d/update +fi + %files -f file-list %defattr(-,root,root) %dir %{_mailcnfdir} @@ -454,29 +437,29 @@ %if 0%{?suse_version} > 1140 %dir %attr(0750,root,root) %{_mailcnfdir}/system %endif -%config(noreplace) %{_sysconfdir}/sendmail.cf +%config(noreplace) %verify(not md5 size mtime) %{_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) %{_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) %verify(not md5 size mtime) %attr(0600,root,root) %{_mailcnfdir}/auth/auth-info +%config(noreplace) %verify(not md5 size mtime) %{_mailcnfdir}/linux.mc +%config(noreplace) %verify(not md5 size mtime) %{_mailcnfdir}/linux.submit.mc +%config(noreplace) %verify(not md5 size mtime) %{_mailcnfdir}/linux.nullclient.mc +%config(noreplace) %verify(not md5 size mtime) %{_mailcnfdir}/mailertable +%config(noreplace) %verify(not md5 size mtime) %{_mailcnfdir}/genericstable +%config(noreplace) %verify(not md5 size mtime) %{_mailcnfdir}/domaintable +%config(noreplace) %verify(not md5 size mtime) %{_mailcnfdir}/virtusertable +%config(noreplace) %verify(not md5 size mtime) %{_mailcnfdir}/access +%config(noreplace) %verify(not md5 size mtime) %{_mailcnfdir}/userdb +%config(noreplace) %verify(not md5 size mtime) %{_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 +%config(noreplace) %verify(not md5 size mtime) %{_mailcnfdir}/trusted-users +%config(noreplace) %verify(not md5 size mtime) %{_mailcnfdir}/local-host-names +%config(noreplace) %verify(not md5 size mtime) %{_mailcnfdir}/submit.cf %doc %{_defaultdocdir}/sendmail %{_datadir}/sendmail %{_localstatedir}/adm/fillup-templates/sysconfig.sendmail @@ -484,7 +467,7 @@ %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 +%attr(0755,root,root) %{_libexecdir}/sendmail.d/update %if 0%{?suse_version} > 1140 %config %attr(0644,root,root) %{sysdsysunitdir}/sendmail-client.path %config %attr(0644,root,root) %{sysdsysunitdir}/sendmail.service @@ -499,14 +482,14 @@ %{_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 +%dir %attr(0755,root,root) %{_libexecdir}/sendmail.d/ +%dir %attr(0755,root,root) %{_libexecdir}/sendmail.d/bin/ +%{_libexecdir}/sendmail.d/bin/mail +%attr(0511,root,root) %{_libexecdir}/sendmail.d/bin/mail.local +%{_libexecdir}/sendmail.d/bin/procmail +%attr(0511,root,root) %{_libexecdir}/sendmail.d/bin/smrsh +%{_libexecdir}/sendmail.d/bin/vacation +%{_libexecdir}/sendmail.d/helpfile %doc %{_mandir}/man1/mailq.1.gz %doc %{_mandir}/man1/newaliases.1.gz %doc %{_mandir}/man5/aliases.5.gz ++++++ sendmail-8.14.5-auth2.patch0 ++++++ --- /var/tmp/diff_new_pack.jGLJ6L/_old 2012-07-14 13:15:33.000000000 +0200 +++ /var/tmp/diff_new_pack.jGLJ6L/_new 2012-07-14 13:15:33.000000000 +0200 @@ -1,3 +1,21 @@ +--- libsmdb/smdb.c ++++ libsmdb/smdb.c 2011-05-31 09:54:58.539925664 +0000 +@@ -198,11 +198,15 @@ smdb_open_database(database, db_name, mo + SMDB_USER_INFO *user_info; + SMDB_DBPARAMS *params; + { ++#if defined(NDBM) && defined(NEWDB) + bool type_was_default = false; ++#endif + + if (type == SMDB_TYPE_DEFAULT) + { ++#if defined(NDBM) && defined(NEWDB) + type_was_default = true; ++#endif + #ifdef NEWDB + type = SMDB_TYPE_HASH; + #else /* NEWDB */ --- sendmail/sendmail.h +++ sendmail/sendmail.h Tue May 24 16:25:29 2011 @@ -721,9 +721,9 @@ ++++++ sendmail-8.14.5.dif ++++++ ++++ 732 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/sendmail/sendmail-8.14.5.dif ++++ and /work/SRC/openSUSE:Factory/.sendmail.new/sendmail-8.14.5.dif -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
