Hello community, here is the log from the commit of package postfix for openSUSE:Factory checked in at Mon May 16 09:22:29 CEST 2011.
-------- --- postfix/postfix.changes 2011-04-10 09:01:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/postfix/postfix.changes 2011-05-11 10:25:11.000000000 +0200 @@ -1,0 +2,11 @@ +Wed May 11 08:23:56 UTC 2011 - [email protected] + +- remove document paths from postfix-files to avoid error messages + when postfix-doc is not installed + +------------------------------------------------------------------- +Tue May 10 09:20:23 UTC 2011 - [email protected] + +- update to 2.8.3 - VUL-0: postfix memory corruption + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- postfix-2.8.2.tar.bz2 postfix-SuSE-ldap.patch New: ---- postfix-2.8.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.9z39RX/_old 2011-05-16 09:21:00.000000000 +0200 +++ /var/tmp/diff_new_pack.9z39RX/_new 2011-05-16 09:21:00.000000000 +0200 @@ -17,12 +17,11 @@ # norootforbuild -%define usetls 1 Name: postfix Summary: A fast, secure, and flexible mailer -Version: 2.8.2 -Release: 5 +Version: 2.8.3 +Release: 1 License: IBM Public License .. Group: Productivity/Networking/Email/Servers Url: http://www.postfix.org/ @@ -38,7 +37,6 @@ Patch3: ipv6_disabled.patch Patch10: %{name}-2.7.1-main.cf.patch Patch11: %{name}-vda-2.7.1.patch -Patch12: %{name}-SuSE-ldap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq PreReq: /usr/bin/getent @@ -63,7 +61,6 @@ # Some defines # %define pf_docdir %{_docdir}/%{name}-doc -%define postfixfiles %{name}.filelist %define pf_config_directory /etc/%{name} %define pf_daemon_directory /usr/lib/%{name} %define pf_command_directory /usr/sbin @@ -171,7 +168,6 @@ %patch3 -p1 %patch10 -p1 %patch11 -p1 -%patch12 -p0 # --------------------------------------------------------------------------- %build @@ -182,12 +178,8 @@ export CCARGS="$CCARGS -DUSE_CYRUS_SASL" export AUXLIBS="-lldap -llber -lpcre" export AUXLIBS="$AUXLIBS -lsasl2" -%if %{usetls} export AUXLIBS="$AUXLIBS -lssl -lcrypto" -%endif -%if %{usetls} export CCARGS="$CCARGS -DUSE_TLS" -%endif export CCARGS="$CCARGS $RPM_OPT_FLAGS -Wno-comments" export PIE=-pie make makefiles DEBUG="" @@ -239,6 +231,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/sbin mkdir -p $RPM_BUILD_ROOT/%{conf_backup_dir} mkdir -p $RPM_BUILD_ROOT/%{pf_sample_directory} +mkdir -p $RPM_BUILD_ROOT/%{pf_html_directory} mkdir -p $RPM_BUILD_ROOT/usr/include/%{name} mkdir -p $RPM_BUILD_ROOT/etc/pam.d install -m 644 %{name}-SuSE/smtp $RPM_BUILD_ROOT/etc/pam.d/smtp @@ -263,7 +256,6 @@ -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} -install -m 644 %{name}-SuSE/master.cf $RPM_BUILD_ROOT/etc/%{name}/master.cf 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 @@ -276,8 +268,6 @@ install -m 600 %{name}-SuSE/smtpd.conf $RPM_BUILD_ROOT/etc/sasl2/smtpd.conf install -m 644 %{name}-SuSE/openssl_%{name}.conf.in $RPM_BUILD_ROOT/etc/%{name}/openssl_%{name}.conf.in install -m 755 %{name}-SuSE/mk%{name}cert $RPM_BUILD_ROOT/usr/sbin/mk%{name}cert -rm -rf $RPM_BUILD_ROOT/%{pf_queue_directory} -install -m 644 %{name}-SuSE/master.cf $RPM_BUILD_ROOT/%{conf_backup_dir}/master.cf mkdir -p $RPM_BUILD_ROOT/%{omc_dir} install -m 644 %{name}-SuSE/%{name}.xml $RPM_BUILD_ROOT/%{omc_dir} mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/ @@ -307,46 +297,8 @@ "daemon_directory = %{pf_daemon_directory}" \ "biff = no" \ "inet_protocols = all" -install -m 644 $RPM_BUILD_ROOT/etc/%{name}/main.cf $RPM_BUILD_ROOT/%{conf_backup_dir}/main.cf -# ----------------------------------------------------------------------- -# preparing /etc/postfix/postfix-files to be able to use postfix -# own upgrade script. Unfortunately it looks in postfix-files and -# expects aliases file at /etc/postfix/aliases and it expects to have -# unzipped manpages -# also remove the both sql dictionary libs as they will not be installed -# per default -# ----------------------------------------------------------------------- -rm -f $RPM_BUILD_ROOT/etc/%{name}/aliases -rm -f $RPM_BUILD_ROOT/etc/%{name}/%{name}-files -sed 's;^$config_directory/aliases\(.*\);/etc/aliases\1;' conf/%{name}-files \ - | grep -v '^$manpage_directory' | grep -Ev 'dict_(mysql|pgsql)' > $RPM_BUILD_ROOT/etc/%{name}/%{name}-files -rm -f %{postfixfiles} -test -f conf/%{name}-files || { - echo "conf/%{name}-files does not exist!" - exit 1 -} -echo "%defattr(-,root,root)" >> %{postfixfiles} -exec <conf/%{name}-files -while IFS=: read path type owner group mode flags junk; do - owner=${owner/\$mail_owner/postfix} - group=${group/\$setgid_group/%{pf_setgid_group}} - case $path in - \$queue_directory*) - path=${path/\$queue_directory/\/var\/spool\/postfix} - group=${group/-/root} - echo "%dir %attr($mode,$owner,$group) $path/" >> %{postfixfiles} - mkdir -m $mode -p $RPM_BUILD_ROOT/$path - printf '%%-38s %%-18s %%04d\n' $path "${owner}.${group}" $mode >> $RPM_BUILD_ROOT/etc/permissions.d/%{name} - ;; - \$command_directory/*) - path=${path/\$command_directory/\/usr\/sbin} - group=${group/-/root} - echo "%attr($mode,$owner,$group) $path" >> %{postfixfiles} - printf '%%-38s %%-18s %%04d\n' $path "${owner}.${group}" $mode >> $RPM_BUILD_ROOT/etc/permissions.d/%{name} - ;; - *) continue;; - esac -done +#Set Permissions +install -m 644 %{name}-SuSE/%{name}-files $RPM_BUILD_ROOT/usr/lib/postfix/postfix-files # postfix-mysql install -m 644 %{name}-mysql/main.cf-mysql $RPM_BUILD_ROOT/etc/%{name}/main.cf-mysql install -m 640 %{name}-mysql/*_maps.cf $RPM_BUILD_ROOT/etc/%{name}/ @@ -359,17 +311,10 @@ for example in AIX42 BSDI* F* HPUX* IRIX* NETBSD1 NEXTSTEP3 OPENSTEP4 OSF1 Solaris*; do %{__rm} examples/chroot-setup/${example} done -# files-duplicate /usr/share/doc/packages/postfix-doc/html/ -# so we copy all docs to a postfix-doc to do fdupes :) -%{__install} -d $RPM_BUILD_ROOT%{pf_docdir}/html -for doc in AAAREADME COMPATIBILITY COPYRIGHT HISTORY INSTALL IPv6-ChangeLog LICENSE PORTING RELEASE_NOTES* US_PATENT_6321267 TLS_LICENSE README_FILES auxiliary examples html %{name}-SuSE/README.SuSE %{name}-SuSE/SPAMASSASSIN+POSTFIX.SuSE; do - %{__cp} -rv ${doc} $RPM_BUILD_ROOT%{pf_docdir}/ -done -%if 0%{?suse_version} >= 1100 +cp -a examples/* $RPM_BUILD_ROOT%{pf_sample_directory} +cp -a html/* $RPM_BUILD_ROOT%{pf_html_directory} %fdupes $RPM_BUILD_ROOT%{pf_docdir} -# files-duplicate /usr/share/man/man? %fdupes $RPM_BUILD_ROOT%{_mandir} -%endif # --------------------------------------------------------------------------- install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/sbin/ @@ -446,6 +391,10 @@ %post # We never have to run suseconfig for postfix after installation # We only start postfix own upgrade-configuration by update +/usr/sbin/postfix set-permissions +if [ ${1:-0} -gt 1 ]; then + /usr/sbin/postfix upgrade-configuration || : +fi %{fillup_and_insserv -y postfix} %{fillup_only -an mail} /sbin/ldconfig @@ -476,7 +425,7 @@ %clean rm -rf $RPM_BUILD_ROOT -%files -f %{postfixfiles} +%files %defattr(-,root,root) %doc LICENSE %config /etc/pam.d/* @@ -485,13 +434,13 @@ /sbin/conf.d/SuSEconfig.%{name} %config(noreplace) %{omc_dir}/%{name}.xml %dir /etc/%{name} +%config /etc/%{name}/main.cf.default %config(noreplace) /etc/%{name}/access +%config(noreplace) /etc/%{name}/aliases %config(noreplace) /etc/%{name}/generic %config(noreplace) /etc/%{name}/helo_access %config(noreplace) /etc/%{name}/canonical -#%config(noreplace) /etc/%{name}/cidr_table %config(noreplace) /etc/%{name}/main.cf -%config /etc/%{name}/main.cf.default %config(noreplace) /etc/%{name}/master.cf %config(noreplace) /etc/%{name}/openssl_%{name}.conf.in %config(noreplace) /etc/%{name}/relocated @@ -499,9 +448,6 @@ %config(noreplace) /etc/%{name}/virtual %config(noreplace) /etc/%{name}/sasl_passwd %config(noreplace) /etc/%{name}/sender_canonical -#%config(noreplace) /etc/%{name}/tcp_table -#%config(noreplace) /etc/%{name}/pcre_table -#%config(noreplace) /etc/%{name}/regexp_table %config(noreplace) /etc/%{name}/relay %config(noreplace) /etc/%{name}/relay_ccerts %config(noreplace) /etc/%{name}/header_checks @@ -512,13 +458,10 @@ %dir /etc/sasl2/ %config(noreplace) /etc/sasl2/smtpd.conf %config /etc/%{name}/LICENSE -%if %{usetls} %config /etc/%{name}/TLS_LICENSE -%endif %config /etc/permissions.d/%{name} %config /etc/permissions.d/%{name}.paranoid %attr(0644, root, root) %config /etc/%{name}/makedefs.out -%attr(0644, root, root) %config /etc/%{name}/%{name}-files /usr/lib/%{name}/%{name}-files %config %attr(0755,root,root) /etc/init.d/%{name} /usr/bin/mailq @@ -529,6 +472,7 @@ /usr/sbin/smtp-source /usr/sbin/mk%{name}cert /usr/sbin/check_mail_queue +%verify(not mode group) /usr/sbin/post* /sbin/rc%{name} %{_libdir}/lib* /usr/lib/sendmail @@ -540,6 +484,20 @@ %{conf_backup_dir} %dir %attr(0700,%{name},root) %{pf_data_directory} %{_mandir}/man?/*.gz +%dir %attr(0755,%{name},root) /%{pf_queue_directory} +%dir %attr(0700,%{name},root) /%{pf_queue_directory}/active +%dir %attr(0700,%{name},root) /%{pf_queue_directory}/bounce +%dir %attr(0700,%{name},root) /%{pf_queue_directory}/corrupt +%dir %attr(0700,%{name},root) /%{pf_queue_directory}/defer +%dir %attr(0700,%{name},root) /%{pf_queue_directory}/deferred +%dir %attr(0700,%{name},root) /%{pf_queue_directory}/flush +%dir %attr(0700,%{name},root) /%{pf_queue_directory}/hold +%dir %attr(0700,%{name},root) /%{pf_queue_directory}/incoming +%dir %attr(0700,%{name},root) /%{pf_queue_directory}/private +%dir %attr(0700,%{name},root) /%{pf_queue_directory}/saved +%dir %attr(0700,%{name},root) /%{pf_queue_directory}/trace +%dir %attr(0730,%{name},maildrop) /%{pf_queue_directory}/maildrop +%dir %attr(0710,%{name},maildrop) /%{pf_queue_directory}/public %files devel %defattr(-,root,root) @@ -547,7 +505,6 @@ %files doc %defattr(0644,root,root,0755) -%dir %{pf_docdir}/ %{pf_docdir}/ %files mysql ++++++ dynamic_maps.patch ++++++ --- /var/tmp/diff_new_pack.9z39RX/_old 2011-05-16 09:21:00.000000000 +0200 +++ /var/tmp/diff_new_pack.9z39RX/_new 2011-05-16 09:21:00.000000000 +0200 @@ -1,6 +1,6 @@ -diff -ruN postfix-2.8.2/conf/dynamicmaps.cf postfix-2.8.2-dynamic_maps//conf/dynamicmaps.cf ---- postfix-2.8.2/conf/dynamicmaps.cf 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//conf/dynamicmaps.cf 2011-03-30 16:02:04.352769373 +0200 +diff -ruN postfix-2.8.3//conf/dynamicmaps.cf postfix-2.8.3-dynamic_maps.patch//conf/dynamicmaps.cf +--- postfix-2.8.3//conf/dynamicmaps.cf 1970-01-01 01:00:00.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//conf/dynamicmaps.cf 2011-05-10 12:42:04.612116003 +0200 @@ -0,0 +1,7 @@ +# Postfix dynamic maps configuration file. +# @@ -9,9 +9,9 @@ +# +#type location of .so file open function (mkmap func) +#==== ================================ ============= ============ -diff -ruN postfix-2.8.2/conf/postfix-files postfix-2.8.2-dynamic_maps//conf/postfix-files ---- postfix-2.8.2/conf/postfix-files 2010-12-29 22:40:32.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//conf/postfix-files 2011-03-30 16:02:04.353769376 +0200 +diff -ruN postfix-2.8.3//conf/postfix-files postfix-2.8.3-dynamic_maps.patch//conf/postfix-files +--- postfix-2.8.3//conf/postfix-files 2010-12-29 22:40:32.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//conf/postfix-files 2011-05-10 12:42:04.613116003 +0200 @@ -65,6 +65,11 @@ $queue_directory/trace:d:$mail_owner:-:700:ucr $daemon_directory/anvil:f:root:-:755 @@ -44,9 +44,9 @@ $config_directory/cidr_table:f:root:-:644:o $config_directory/generic:f:root:-:644:p1 $config_directory/generics:f:root:-:644:o -diff -ruN postfix-2.8.2/src/dns/Makefile.in postfix-2.8.2-dynamic_maps//src/dns/Makefile.in ---- postfix-2.8.2/src/dns/Makefile.in 2011-01-09 23:12:00.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/dns/Makefile.in 2011-03-30 16:02:04.360769372 +0200 +diff -ruN postfix-2.8.3//src/dns/Makefile.in postfix-2.8.3-dynamic_maps.patch//src/dns/Makefile.in +--- postfix-2.8.3//src/dns/Makefile.in 2011-01-09 23:12:00.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//src/dns/Makefile.in 2011-05-10 12:42:04.620116003 +0200 @@ -14,7 +14,7 @@ LIB_DIR = ../../lib INC_DIR = ../../include @@ -70,9 +70,9 @@ update: $(LIB_DIR)/$(LIB) $(HDRS) -for i in $(HDRS); \ -diff -ruN postfix-2.8.2/src/global/mail_conf.c postfix-2.8.2-dynamic_maps//src/global/mail_conf.c ---- postfix-2.8.2/src/global/mail_conf.c 2011-01-08 02:49:33.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/global/mail_conf.c 2011-03-30 16:02:04.361769374 +0200 +diff -ruN postfix-2.8.3//src/global/mail_conf.c postfix-2.8.3-dynamic_maps.patch//src/global/mail_conf.c +--- postfix-2.8.3//src/global/mail_conf.c 2011-01-08 02:49:33.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//src/global/mail_conf.c 2011-05-10 12:42:04.621116003 +0200 @@ -190,6 +190,13 @@ path = concatenate(var_config_dir, "/", "main.cf", (char *) 0); dict_load_file(CONFIG_DICT, path); @@ -87,9 +87,9 @@ } /* mail_conf_flush - discard configuration dictionary */ -diff -ruN postfix-2.8.2/src/global/mail_dict.c postfix-2.8.2-dynamic_maps//src/global/mail_dict.c ---- postfix-2.8.2/src/global/mail_dict.c 2010-06-17 22:48:34.000000000 +0200 -+++ postfix-2.8.2-dynamic_maps//src/global/mail_dict.c 2011-03-30 16:02:04.361769374 +0200 +diff -ruN postfix-2.8.3//src/global/mail_dict.c postfix-2.8.3-dynamic_maps.patch//src/global/mail_dict.c +--- postfix-2.8.3//src/global/mail_dict.c 2010-06-17 22:48:34.000000000 +0200 ++++ postfix-2.8.3-dynamic_maps.patch//src/global/mail_dict.c 2011-05-10 12:42:04.622116003 +0200 @@ -46,6 +46,7 @@ static const DICT_OPEN_INFO dict_open_info[] = { @@ -106,9 +106,9 @@ 0, }; -diff -ruN postfix-2.8.2/src/global/mail_params.c postfix-2.8.2-dynamic_maps//src/global/mail_params.c ---- postfix-2.8.2/src/global/mail_params.c 2010-12-06 00:02:15.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/global/mail_params.c 2011-03-30 16:02:04.362769375 +0200 +diff -ruN postfix-2.8.3//src/global/mail_params.c postfix-2.8.3-dynamic_maps.patch//src/global/mail_params.c +--- postfix-2.8.3//src/global/mail_params.c 2010-12-06 00:02:15.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//src/global/mail_params.c 2011-05-10 12:42:04.623116003 +0200 @@ -79,6 +79,7 @@ /* char *var_export_environ; /* char *var_debug_peer_list; @@ -133,9 +133,9 @@ char *var_trace_service; char *var_proxymap_service; char *var_proxywrite_service; -diff -ruN postfix-2.8.2/src/global/Makefile.in postfix-2.8.2-dynamic_maps//src/global/Makefile.in ---- postfix-2.8.2/src/global/Makefile.in 2011-01-10 21:28:32.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/global/Makefile.in 2011-03-30 16:29:42.254738307 +0200 +diff -ruN postfix-2.8.3//src/global/Makefile.in postfix-2.8.3-dynamic_maps.patch//src/global/Makefile.in +--- postfix-2.8.3//src/global/Makefile.in 2011-01-10 21:28:32.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//src/global/Makefile.in 2011-05-10 12:42:04.624116003 +0200 @@ -3,7 +3,7 @@ canon_addr.c cfg_parser.c cleanup_strerror.c cleanup_strflags.c \ clnt_stream.c conv_time.c db_common.c debug_peer.c debug_process.c \ @@ -214,9 +214,9 @@ rm -rf printfck tidy: clean -diff -ruN postfix-2.8.2/src/global/mkmap_open.c postfix-2.8.2-dynamic_maps//src/global/mkmap_open.c ---- postfix-2.8.2/src/global/mkmap_open.c 2008-01-08 23:08:45.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/global/mkmap_open.c 2011-03-30 16:02:04.365769372 +0200 +diff -ruN postfix-2.8.3//src/global/mkmap_open.c postfix-2.8.3-dynamic_maps.patch//src/global/mkmap_open.c +--- postfix-2.8.3//src/global/mkmap_open.c 2008-01-08 23:08:45.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//src/global/mkmap_open.c 2011-05-10 12:42:04.625116003 +0200 @@ -81,7 +81,7 @@ * We use a different table (in dict_open.c) when querying maps. */ @@ -243,9 +243,9 @@ if (strcmp(type, mp->type) == 0) break; } -diff -ruN postfix-2.8.2/src/master/Makefile.in postfix-2.8.2-dynamic_maps//src/master/Makefile.in ---- postfix-2.8.2/src/master/Makefile.in 2011-01-09 23:12:02.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/master/Makefile.in 2011-03-30 16:02:04.365769372 +0200 +diff -ruN postfix-2.8.3//src/master/Makefile.in postfix-2.8.3-dynamic_maps.patch//src/master/Makefile.in +--- postfix-2.8.3//src/master/Makefile.in 2011-01-09 23:12:02.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//src/master/Makefile.in 2011-05-10 12:42:04.626116003 +0200 @@ -20,7 +20,7 @@ INC_DIR = ../../include BIN_DIR = ../../libexec @@ -269,9 +269,9 @@ $(BIN_DIR)/$(PROG): $(PROG) cp $(PROG) $(BIN_DIR) -diff -ruN postfix-2.8.2/src/milter/Makefile.in postfix-2.8.2-dynamic_maps//src/milter/Makefile.in ---- postfix-2.8.2/src/milter/Makefile.in 2011-01-09 23:12:02.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/milter/Makefile.in 2011-03-30 16:02:04.366769372 +0200 +diff -ruN postfix-2.8.3//src/milter/Makefile.in postfix-2.8.3-dynamic_maps.patch//src/milter/Makefile.in +--- postfix-2.8.3//src/milter/Makefile.in 2011-01-09 23:12:02.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//src/milter/Makefile.in 2011-05-10 12:42:04.626116003 +0200 @@ -14,7 +14,7 @@ INC_DIR = ../../include MAKES = @@ -295,9 +295,9 @@ update: $(LIB_DIR)/$(LIB) $(HDRS) -for i in $(HDRS); \ -diff -ruN postfix-2.8.2/src/postconf/postconf.c postfix-2.8.2-dynamic_maps//src/postconf/postconf.c ---- postfix-2.8.2/src/postconf/postconf.c 2010-09-12 01:05:00.000000000 +0200 -+++ postfix-2.8.2-dynamic_maps//src/postconf/postconf.c 2011-03-30 16:02:04.366769372 +0200 +diff -ruN postfix-2.8.3//src/postconf/postconf.c postfix-2.8.3-dynamic_maps.patch//src/postconf/postconf.c +--- postfix-2.8.3//src/postconf/postconf.c 2011-03-29 01:00:58.000000000 +0200 ++++ postfix-2.8.3-dynamic_maps.patch//src/postconf/postconf.c 2011-05-10 12:42:04.627116003 +0200 @@ -1013,6 +1013,16 @@ { ARGV *maps_argv; @@ -315,9 +315,9 @@ maps_argv = dict_mapnames(); for (i = 0; i < maps_argv->argc; i++) -diff -ruN postfix-2.8.2/src/postmap/postmap.c postfix-2.8.2-dynamic_maps//src/postmap/postmap.c ---- postfix-2.8.2/src/postmap/postmap.c 2009-04-17 22:04:00.000000000 +0200 -+++ postfix-2.8.2-dynamic_maps//src/postmap/postmap.c 2011-03-30 16:02:04.367769372 +0200 +diff -ruN postfix-2.8.3//src/postmap/postmap.c postfix-2.8.3-dynamic_maps.patch//src/postmap/postmap.c +--- postfix-2.8.3//src/postmap/postmap.c 2009-04-17 22:04:00.000000000 +0200 ++++ postfix-2.8.3-dynamic_maps.patch//src/postmap/postmap.c 2011-05-10 12:42:04.629116003 +0200 @@ -5,7 +5,7 @@ /* Postfix lookup table management /* SYNOPSIS @@ -434,9 +434,9 @@ } else { /* create/update map(s) */ if (optind + 1 > argc) usage(argv[0]); -diff -ruN postfix-2.8.2/src/tls/Makefile.in postfix-2.8.2-dynamic_maps//src/tls/Makefile.in ---- postfix-2.8.2/src/tls/Makefile.in 2011-01-16 00:09:55.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/tls/Makefile.in 2011-03-30 16:02:04.368769372 +0200 +diff -ruN postfix-2.8.3//src/tls/Makefile.in postfix-2.8.3-dynamic_maps.patch//src/tls/Makefile.in +--- postfix-2.8.3//src/tls/Makefile.in 2011-01-16 00:09:55.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//src/tls/Makefile.in 2011-05-10 12:42:04.630116003 +0200 @@ -24,7 +24,7 @@ INC_DIR = ../../include MAKES = @@ -460,9 +460,9 @@ update: $(LIB_DIR)/$(LIB) $(HDRS) -for i in $(HDRS); \ -diff -ruN postfix-2.8.2/src/tls/tls_client.c postfix-2.8.2-dynamic_maps//src/tls/tls_client.c ---- postfix-2.8.2/src/tls/tls_client.c 2010-12-31 00:02:03.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/tls/tls_client.c 2011-03-30 16:02:04.369769372 +0200 +diff -ruN postfix-2.8.3//src/tls/tls_client.c postfix-2.8.3-dynamic_maps.patch//src/tls/tls_client.c +--- postfix-2.8.3//src/tls/tls_client.c 2010-12-31 00:02:03.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//src/tls/tls_client.c 2011-05-10 12:42:04.630116003 +0200 @@ -156,6 +156,8 @@ #define STR vstring_str #define LEN VSTRING_LEN @@ -472,9 +472,9 @@ /* load_clnt_session - load session from client cache (non-callback) */ static SSL_SESSION *load_clnt_session(TLS_SESS_STATE *TLScontext) -diff -ruN postfix-2.8.2/src/tls/tls_server.c postfix-2.8.2-dynamic_maps//src/tls/tls_server.c ---- postfix-2.8.2/src/tls/tls_server.c 2011-02-07 16:38:33.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/tls/tls_server.c 2011-03-30 16:02:04.370769372 +0200 +diff -ruN postfix-2.8.3//src/tls/tls_server.c postfix-2.8.3-dynamic_maps.patch//src/tls/tls_server.c +--- postfix-2.8.3//src/tls/tls_server.c 2011-02-07 16:38:33.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//src/tls/tls_server.c 2011-05-10 12:42:04.631116003 +0200 @@ -155,6 +155,8 @@ #define STR(x) vstring_str(x) #define LEN(x) VSTRING_LEN(x) @@ -484,9 +484,9 @@ /* Application-specific. */ /* -diff -ruN postfix-2.8.2/src/util/dict_db.c postfix-2.8.2-dynamic_maps//src/util/dict_db.c ---- postfix-2.8.2/src/util/dict_db.c 2010-09-04 20:48:52.000000000 +0200 -+++ postfix-2.8.2-dynamic_maps//src/util/dict_db.c 2011-03-30 16:02:04.371769372 +0200 +diff -ruN postfix-2.8.3//src/util/dict_db.c postfix-2.8.3-dynamic_maps.patch//src/util/dict_db.c +--- postfix-2.8.3//src/util/dict_db.c 2010-09-04 20:48:52.000000000 +0200 ++++ postfix-2.8.3-dynamic_maps.patch//src/util/dict_db.c 2011-05-10 12:42:04.632116003 +0200 @@ -676,6 +676,12 @@ msg_fatal("set DB cache size %d: %m", dict_db_cache_size); if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0) @@ -500,9 +500,9 @@ #if DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0) if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0) msg_fatal("open database %s: %m", db_path); -diff -ruN postfix-2.8.2/src/util/dict_dbm.c postfix-2.8.2-dynamic_maps//src/util/dict_dbm.c ---- postfix-2.8.2/src/util/dict_dbm.c 2009-12-24 23:53:04.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/util/dict_dbm.c 2011-03-30 16:02:04.371769372 +0200 +diff -ruN postfix-2.8.3//src/util/dict_dbm.c postfix-2.8.3-dynamic_maps.patch//src/util/dict_dbm.c +--- postfix-2.8.3//src/util/dict_dbm.c 2009-12-24 23:53:04.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//src/util/dict_dbm.c 2011-05-10 12:42:04.633116003 +0200 @@ -409,6 +409,10 @@ char *dbm_path; int lock_fd; @@ -514,18 +514,18 @@ /* * Note: DICT_FLAG_LOCK is used only by programs that do fine-grained (in * the time domain) locking while accessing individual database records. -diff -ruN postfix-2.8.2/src/util/dict.h postfix-2.8.2-dynamic_maps//src/util/dict.h ---- postfix-2.8.2/src/util/dict.h 2007-12-03 20:42:26.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/util/dict.h 2011-03-30 16:02:04.372769372 +0200 +diff -ruN postfix-2.8.3//src/util/dict.h postfix-2.8.3-dynamic_maps.patch//src/util/dict.h +--- postfix-2.8.3//src/util/dict.h 2011-04-15 18:47:44.000000000 +0200 ++++ postfix-2.8.3-dynamic_maps.patch//src/util/dict.h 2011-05-10 12:42:04.634116003 +0200 @@ -66,6 +66,7 @@ #define DICT_FLAG_NO_UNAUTH (1<<13) /* disallow unauthenticated data */ #define DICT_FLAG_FOLD_FIX (1<<14) /* case-fold key with fixed-case map */ #define DICT_FLAG_FOLD_MUL (1<<15) /* case-fold key with multi-case map */ +#define DICT_FLAG_UPGRADE (1<<30) /* Upgrade the db */ #define DICT_FLAG_FOLD_ANY (DICT_FLAG_FOLD_FIX | DICT_FLAG_FOLD_MUL) + #define DICT_FLAG_OPEN_LOCK (1<<16) /* open file with exclusive lock */ - /* IMPORTANT: Update the dict_mask[] table when the above changes */ -@@ -138,6 +139,11 @@ +@@ -139,6 +140,11 @@ extern DICT *dict_open(const char *, int, int); extern DICT *dict_open3(const char *, const char *, int, int); extern void dict_open_register(const char *, DICT *(*) (const char *, int, int)); @@ -537,9 +537,9 @@ #define dict_get(dp, key) ((const char *) (dp)->lookup((dp), (key))) #define dict_put(dp, key, val) (dp)->update((dp), (key), (val)) -diff -ruN postfix-2.8.2/src/util/dict_open.c postfix-2.8.2-dynamic_maps//src/util/dict_open.c ---- postfix-2.8.2/src/util/dict_open.c 2010-09-11 23:49:58.000000000 +0200 -+++ postfix-2.8.2-dynamic_maps//src/util/dict_open.c 2011-03-30 16:02:04.373769372 +0200 +diff -ruN postfix-2.8.3//src/util/dict_open.c postfix-2.8.3-dynamic_maps.patch//src/util/dict_open.c +--- postfix-2.8.3//src/util/dict_open.c 2011-04-11 19:37:49.000000000 +0200 ++++ postfix-2.8.3-dynamic_maps.patch//src/util/dict_open.c 2011-05-10 12:42:04.635116003 +0200 @@ -44,6 +44,8 @@ /* DICT *(*open) (const char *, int, int); /* @@ -549,7 +549,7 @@ /* DESCRIPTION /* This module implements a low-level interface to multiple /* physical dictionary types. -@@ -161,6 +163,9 @@ +@@ -165,6 +167,9 @@ /* /* dict_mapnames() returns a sorted list with the names of all available /* dictionary types. @@ -559,7 +559,7 @@ /* DIAGNOSTICS /* Fatal error: open error, unsupported dictionary type, attempt to /* update non-writable dictionary. -@@ -185,6 +190,9 @@ +@@ -189,6 +194,9 @@ #include <strings.h> #endif @@ -569,9 +569,9 @@ /* Utility library. */ #include <argv.h> -@@ -211,6 +219,27 @@ - #include <split_at.h> +@@ -216,6 +224,27 @@ #include <htable.h> + #include <myflock.h> +#ifndef NO_DYNAMIC_MAPS +#include <load_lib.h> @@ -597,7 +597,7 @@ /* * lookup table for available map types. */ -@@ -226,7 +255,9 @@ +@@ -231,7 +260,9 @@ DICT_TYPE_ENVIRON, dict_env_open, DICT_TYPE_HT, dict_ht_open, DICT_TYPE_UNIX, dict_unix_open, @@ -607,7 +607,7 @@ #ifdef HAS_SDBM DICT_TYPE_SDBM, dict_sdbm_open, #endif -@@ -246,9 +277,11 @@ +@@ -251,9 +282,11 @@ #ifdef HAS_NETINFO DICT_TYPE_NETINFO, dict_ni_open, #endif @@ -619,7 +619,7 @@ #ifdef HAS_POSIX_REGEXP DICT_TYPE_REGEXP, dict_regexp_open, #endif -@@ -307,8 +340,31 @@ +@@ -312,8 +345,31 @@ dict_type, dict_name); if (dict_open_hash == 0) dict_open_init(); @@ -653,7 +653,7 @@ if ((dict = dp->open(dict_name, open_flags, dict_flags)) == 0) msg_fatal("opening %s:%s %m", dict_type, dict_name); if (msg_verbose) -@@ -316,6 +372,36 @@ +@@ -331,6 +387,36 @@ return (dict); } @@ -690,7 +690,7 @@ /* dict_open_register - register dictionary type */ void dict_open_register(const char *type, -@@ -349,6 +435,9 @@ +@@ -364,6 +450,9 @@ HTABLE_INFO **ht; DICT_OPEN_INFO *dp; ARGV *mapnames; @@ -700,7 +700,7 @@ if (dict_open_hash == 0) dict_open_init(); -@@ -357,6 +446,13 @@ +@@ -372,6 +461,13 @@ dp = (DICT_OPEN_INFO *) ht[0]->value; argv_add(mapnames, dp->type, ARGV_END); } @@ -714,7 +714,7 @@ qsort((void *) mapnames->argv, mapnames->argc, sizeof(mapnames->argv[0]), dict_sort_alpha_cpp); myfree((char *) ht_info); -@@ -364,6 +460,87 @@ +@@ -379,6 +475,87 @@ return mapnames; } @@ -802,9 +802,9 @@ #ifdef TEST /* -diff -ruN postfix-2.8.2/src/util/load_lib.c postfix-2.8.2-dynamic_maps//src/util/load_lib.c ---- postfix-2.8.2/src/util/load_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/util/load_lib.c 2011-03-30 16:02:04.374769372 +0200 +diff -ruN postfix-2.8.3//src/util/load_lib.c postfix-2.8.3-dynamic_maps.patch//src/util/load_lib.c +--- postfix-2.8.3//src/util/load_lib.c 1970-01-01 01:00:00.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//src/util/load_lib.c 2011-05-10 12:42:04.635116003 +0200 @@ -0,0 +1,135 @@ +/*++ +/* NAME @@ -941,9 +941,9 @@ +#endif + return 0; +} -diff -ruN postfix-2.8.2/src/util/load_lib.h postfix-2.8.2-dynamic_maps//src/util/load_lib.h ---- postfix-2.8.2/src/util/load_lib.h 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/util/load_lib.h 2011-03-30 16:02:04.374769372 +0200 +diff -ruN postfix-2.8.3//src/util/load_lib.h postfix-2.8.3-dynamic_maps.patch//src/util/load_lib.h +--- postfix-2.8.3//src/util/load_lib.h 1970-01-01 01:00:00.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//src/util/load_lib.h 2011-05-10 12:42:04.636116003 +0200 @@ -0,0 +1,41 @@ +#ifndef _LOAD_LIB_H_INCLUDED_ +#define _LOAD_LIB_H_INCLUDED_ @@ -986,9 +986,9 @@ +/*--*/ + +#endif -diff -ruN postfix-2.8.2/src/util/Makefile.in postfix-2.8.2-dynamic_maps//src/util/Makefile.in ---- postfix-2.8.2/src/util/Makefile.in 2011-01-10 21:14:50.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/util/Makefile.in 2011-03-30 16:28:24.508739763 +0200 +diff -ruN postfix-2.8.3//src/util/Makefile.in postfix-2.8.3-dynamic_maps.patch//src/util/Makefile.in +--- postfix-2.8.3//src/util/Makefile.in 2011-04-15 18:52:47.000000000 +0200 ++++ postfix-2.8.3-dynamic_maps.patch//src/util/Makefile.in 2011-05-10 12:42:04.637116003 +0200 @@ -33,15 +33,16 @@ allascii.c load_file.c killme_after.c vstream_tweak.c \ unix_pass_listen.c unix_pass_trigger.c edit_file.c inet_windowsize.c \ @@ -1091,9 +1091,9 @@ rm -rf printfck tidy: clean -diff -ruN postfix-2.8.2/src/util/sdbm.c postfix-2.8.2-dynamic_maps//src/util/sdbm.c ---- postfix-2.8.2/src/util/sdbm.c 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/util/sdbm.c 2011-03-30 16:02:04.377769372 +0200 +diff -ruN postfix-2.8.3//src/util/sdbm.c postfix-2.8.3-dynamic_maps.patch//src/util/sdbm.c +--- postfix-2.8.3//src/util/sdbm.c 1970-01-01 01:00:00.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//src/util/sdbm.c 2011-05-10 12:42:04.638116003 +0200 @@ -0,0 +1,972 @@ +/*++ +/* NAME @@ -2067,9 +2067,9 @@ + return db; +} + -diff -ruN postfix-2.8.2/src/util/sdbm.h postfix-2.8.2-dynamic_maps//src/util/sdbm.h ---- postfix-2.8.2/src/util/sdbm.h 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/util/sdbm.h 2011-03-30 16:02:04.378769372 +0200 +diff -ruN postfix-2.8.3//src/util/sdbm.h postfix-2.8.3-dynamic_maps.patch//src/util/sdbm.h +--- postfix-2.8.3//src/util/sdbm.h 1970-01-01 01:00:00.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//src/util/sdbm.h 2011-05-10 12:42:04.639116003 +0200 @@ -0,0 +1,97 @@ +/*++ +/* NAME @@ -2168,9 +2168,9 @@ +#define BADMESS /* generate a message for worst case: + cannot make room after SPLTMAX splits */ +#endif /* UTIL_SDBM_H */ -diff -ruN postfix-2.8.2/src/util/sys_defs.h postfix-2.8.2-dynamic_maps//src/util/sys_defs.h ---- postfix-2.8.2/src/util/sys_defs.h 2011-03-01 20:10:46.000000000 +0100 -+++ postfix-2.8.2-dynamic_maps//src/util/sys_defs.h 2011-03-30 16:02:04.379769372 +0200 +diff -ruN postfix-2.8.3//src/util/sys_defs.h postfix-2.8.3-dynamic_maps.patch//src/util/sys_defs.h +--- postfix-2.8.3//src/util/sys_defs.h 2011-03-01 20:10:46.000000000 +0100 ++++ postfix-2.8.3-dynamic_maps.patch//src/util/sys_defs.h 2011-05-10 12:42:04.640116003 +0200 @@ -720,6 +720,7 @@ #define INTERNAL_LOCK MYFLOCK_STYLE_FLOCK #define DEF_MAILBOX_LOCK "fcntl, dotlock" /* RedHat >= 4.x */ ++++++ postfix-2.7.1-main.cf.patch ++++++ --- /var/tmp/diff_new_pack.9z39RX/_old 2011-05-16 09:21:00.000000000 +0200 +++ /var/tmp/diff_new_pack.9z39RX/_new 2011-05-16 09:21:00.000000000 +0200 @@ -10,8 +10,8 @@ +############################################################ +# Start MySQL from postfixwiki.org +############################################################ -+relay_domains = $mydestination, hash:/etc/postfix/relay -+virtual_alias_maps = hash:/etc/postfix/virtual ++#relay_domains = $mydestination, hash:/etc/postfix/relay ++#virtual_alias_maps = hash:/etc/postfix/virtual +#virtual_uid_maps = static:303 +#virtual_gid_maps = static:303 +#virtual_minimum_uid = 303 ++++++ postfix-2.8.2.tar.bz2 -> postfix-2.8.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.2/HISTORY new/postfix-2.8.3/HISTORY --- old/postfix-2.8.2/HISTORY 2011-03-16 15:52:15.000000000 +0100 +++ new/postfix-2.8.3/HISTORY 2011-04-20 01:09:09.000000000 +0200 @@ -15616,7 +15616,7 @@ for the "virtual:" transport to "/etc/postfix/virtual:". Symptom reported by Christoph Anton Mitterer. -20200102 +20100102 Workaround: don't report bogus Berkeley DB close errors as fatal errors. All operations before close are already error @@ -16569,3 +16569,17 @@ expression of the form ``("text1" "text2") + constant'' so we don't try to be so clever. Fix by Victor Duchovni. File: global/mail_params.h. + +20110411 + + Cleanup: postscreen(8) and verify(8) daemons now lock their + respective cache file exclusively upon open, to avoid massive + cache corruption by unsupported sharing. Files: util/dict.h, + util/dict_open.c, verify/verify.c, postscreen/postscreen.c. + +20110414 + + Bugfix (introduced with Postfix SASL patch 20000314): don't + reuse a server SASL handle after authentication failure. + Problem reported by Thomas Jarosch of Intra2net AG. File: + smtpd/smtpd_proto.c. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.2/html/postconf.1.html new/postfix-2.8.3/html/postconf.1.html --- old/postfix-2.8.2/html/postconf.1.html 2010-09-12 01:05:04.000000000 +0200 +++ new/postfix-2.8.3/html/postconf.1.html 2011-03-29 01:01:05.000000000 +0200 @@ -88,8 +88,8 @@ With Postfix version 2.8 and later, the <b>-e</b> is no longer needed. - <b>-h</b> Show parameter values only, not the "<i>name = " label</i> - <i>that normally precedes the value.</i> + <b>-h</b> Show parameter values only, not the "<i>name =</i> " label + that normally precedes the value. <b>-l</b> List the names of all supported mailbox locking methods. Postfix supports the following methods: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.2/man/man1/postconf.1 new/postfix-2.8.3/man/man1/postconf.1 --- old/postfix-2.8.2/man/man1/postconf.1 2010-09-12 01:05:04.000000000 +0200 +++ new/postfix-2.8.3/man/man1/postconf.1 2011-03-29 01:01:05.000000000 +0200 @@ -83,7 +83,7 @@ With Postfix version 2.8 and later, the \fB-e\fR is no longer needed. .IP \fB-h\fR -Show parameter values only, not the "\fIname = " label +Show parameter values only, not the "\fIname = \fR" label that normally precedes the value. .IP \fB-l\fR List the names of all supported mailbox locking methods. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.2/src/global/mail_version.h new/postfix-2.8.3/src/global/mail_version.h --- old/postfix-2.8.2/src/global/mail_version.h 2011-03-21 21:46:27.000000000 +0100 +++ new/postfix-2.8.3/src/global/mail_version.h 2011-04-20 02:24:58.000000000 +0200 @@ -20,8 +20,8 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20110321" -#define MAIL_VERSION_NUMBER "2.8.2" +#define MAIL_RELEASE_DATE "20110509" +#define MAIL_VERSION_NUMBER "2.8.3" #ifdef SNAPSHOT # define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.2/src/postconf/postconf.c new/postfix-2.8.3/src/postconf/postconf.c --- old/postfix-2.8.2/src/postconf/postconf.c 2010-09-12 01:05:00.000000000 +0200 +++ new/postfix-2.8.3/src/postconf/postconf.c 2011-03-29 01:00:58.000000000 +0200 @@ -77,7 +77,7 @@ /* With Postfix version 2.8 and later, the \fB-e\fR is no /* longer needed. /* .IP \fB-h\fR -/* Show parameter values only, not the "\fIname = " label +/* Show parameter values only, not the "\fIname = \fR" label /* that normally precedes the value. /* .IP \fB-l\fR /* List the names of all supported mailbox locking methods. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.2/src/postscreen/postscreen.c new/postfix-2.8.3/src/postscreen/postscreen.c --- old/postfix-2.8.2/src/postscreen/postscreen.c 2011-02-22 23:21:34.000000000 +0100 +++ new/postfix-2.8.3/src/postscreen/postscreen.c 2011-04-15 18:47:44.000000000 +0200 @@ -823,7 +823,8 @@ * * Start the cache maintenance pseudo thread after dropping privileges. */ -#define PSC_DICT_OPEN_FLAGS (DICT_FLAG_DUP_REPLACE | DICT_FLAG_SYNC_UPDATE) +#define PSC_DICT_OPEN_FLAGS (DICT_FLAG_DUP_REPLACE | DICT_FLAG_SYNC_UPDATE | \ + DICT_FLAG_OPEN_LOCK) if (*var_psc_cache_map) psc_cache_map = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.2/src/smtpd/smtpd_sasl_proto.c new/postfix-2.8.3/src/smtpd/smtpd_sasl_proto.c --- old/postfix-2.8.2/src/smtpd/smtpd_sasl_proto.c 2011-01-05 21:16:53.000000000 +0100 +++ new/postfix-2.8.3/src/smtpd/smtpd_sasl_proto.c 2011-04-20 01:07:02.000000000 +0200 @@ -184,6 +184,27 @@ return (-1); } + /* Don't reuse the SASL handle after authentication failure. */ +#ifndef SMTPD_FLAG_AUTH_USED +#define SMTPD_FLAG_AUTH_USED (1<<15) +#endif +#ifndef XSASL_TYPE_CYRUS +#define XSASL_TYPE_CYRUS "cyrus" +#endif + if (state->flags & SMTPD_FLAG_AUTH_USED) { + smtpd_sasl_deactivate(state); +#ifdef USE_TLS + if (state->tls_context != 0) + smtpd_sasl_activate(state, VAR_SMTPD_SASL_TLS_OPTS, + var_smtpd_sasl_tls_opts); + else +#endif + smtpd_sasl_activate(state, VAR_SMTPD_SASL_OPTS, + var_smtpd_sasl_opts); + } else if (strcmp(var_smtpd_sasl_type, XSASL_TYPE_CYRUS) == 0) { + state->flags |= SMTPD_FLAG_AUTH_USED; + } + /* * All authentication failures shall be logged. The 5xx reply code from * the SASL authentication routine triggers tar-pit delays, which help to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.2/src/util/Makefile.in new/postfix-2.8.3/src/util/Makefile.in --- old/postfix-2.8.2/src/util/Makefile.in 2011-01-10 21:14:50.000000000 +0100 +++ new/postfix-2.8.3/src/util/Makefile.in 2011-04-15 18:52:47.000000000 +0200 @@ -948,6 +948,7 @@ dict_open.o: dict_unix.h dict_open.o: htable.h dict_open.o: msg.h +dict_open.o: myflock.h dict_open.o: mymalloc.h dict_open.o: split_at.h dict_open.o: stringops.h @@ -1309,7 +1310,6 @@ mask_addr.o: sys_defs.h match_list.o: argv.h match_list.o: dict.h -match_list.o: htable.h match_list.o: match_list.c match_list.o: match_list.h match_list.o: match_ops.h @@ -1324,8 +1324,6 @@ match_ops.o: argv.h match_ops.o: cidr_match.h match_ops.o: dict.h -match_ops.o: htable.h -match_ops.o: match_list.h match_ops.o: match_ops.c match_ops.o: match_ops.h match_ops.o: msg.h @@ -1788,6 +1786,8 @@ vstring_vstream.o: vstring.h vstring_vstream.o: vstring_vstream.c vstring_vstream.o: vstring_vstream.h +watchdog.o: events.h +watchdog.o: iostuff.h watchdog.o: killme_after.h watchdog.o: msg.h watchdog.o: mymalloc.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.2/src/util/dict.h new/postfix-2.8.3/src/util/dict.h --- old/postfix-2.8.2/src/util/dict.h 2007-12-03 20:42:26.000000000 +0100 +++ new/postfix-2.8.3/src/util/dict.h 2011-04-15 18:47:44.000000000 +0200 @@ -67,6 +67,7 @@ #define DICT_FLAG_FOLD_FIX (1<<14) /* case-fold key with fixed-case map */ #define DICT_FLAG_FOLD_MUL (1<<15) /* case-fold key with multi-case map */ #define DICT_FLAG_FOLD_ANY (DICT_FLAG_FOLD_FIX | DICT_FLAG_FOLD_MUL) +#define DICT_FLAG_OPEN_LOCK (1<<16) /* open file with exclusive lock */ /* IMPORTANT: Update the dict_mask[] table when the above changes */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.2/src/util/dict_open.c new/postfix-2.8.3/src/util/dict_open.c --- old/postfix-2.8.2/src/util/dict_open.c 2010-09-11 23:49:58.000000000 +0200 +++ new/postfix-2.8.3/src/util/dict_open.c 2011-04-11 19:37:49.000000000 +0200 @@ -80,6 +80,10 @@ /* .IP DICT_FLAG_LOCK /* With maps where this is appropriate, acquire an exclusive lock /* before writing, and acquire a shared lock before reading. +/* .IP DICT_FLAG_OPEN_LOCK +/* With maps where this is appropriate, acquire an exclusive +/* lock upon open, and report a fatal run-time error if the +/* table is already locked. /* .IP DICT_FLAG_FOLD_FIX /* With databases whose lookup fields are fixed-case strings, /* fold the search key to lower case before accessing the @@ -210,6 +214,7 @@ #include <stringops.h> #include <split_at.h> #include <htable.h> +#include <myflock.h> /* * lookup table for available map types. @@ -313,6 +318,16 @@ msg_fatal("opening %s:%s %m", dict_type, dict_name); if (msg_verbose) msg_info("%s: %s:%s", myname, dict_type, dict_name); + /* XXX the choice between wait-for-lock or no-wait is hard-coded. */ + if (dict->lock_fd >= 0 && (dict_flags & DICT_FLAG_OPEN_LOCK) != 0) { + if (dict_flags & DICT_FLAG_LOCK) + msg_panic("%s: attempt to open %s:%s with both \"open\" lock and \"access\" lock", + myname, dict_type, dict_name); + if (myflock(dict->lock_fd, INTERNAL_LOCK, + MYFLOCK_OP_EXCLUSIVE | MYFLOCK_OP_NOWAIT) < 0) + msg_fatal("%s:%s: unable to get exclusive lock: %m", + dict_type, dict_name); + } return (dict); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.2/src/verify/verify.c new/postfix-2.8.3/src/verify/verify.c --- old/postfix-2.8.2/src/verify/verify.c 2010-01-31 19:56:29.000000000 +0100 +++ new/postfix-2.8.3/src/verify/verify.c 2011-04-11 19:38:51.000000000 +0200 @@ -664,7 +664,8 @@ * * Start the cache cleanup thread after permanently dropping privileges. */ -#define VERIFY_DICT_OPEN_FLAGS (DICT_FLAG_DUP_REPLACE | DICT_FLAG_SYNC_UPDATE) +#define VERIFY_DICT_OPEN_FLAGS (DICT_FLAG_DUP_REPLACE | DICT_FLAG_SYNC_UPDATE \ + | DICT_FLAG_OPEN_LOCK) saved_mask = umask(022); verify_map = ++++++ postfix-SuSE.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/SuSEconfig.postfix new/postfix-SuSE/SuSEconfig.postfix --- old/postfix-SuSE/SuSEconfig.postfix 2010-11-25 16:15:29.000000000 +0100 +++ new/postfix-SuSE/SuSEconfig.postfix 2011-05-11 10:30:56.000000000 +0200 @@ -231,6 +231,8 @@ TMPDIR=$(mktemp -d /tmp/SuSEconfig.postfix.XXXXXX) || exit 1 PCONF="/usr/sbin/postconf -c $TMPDIR" + # needed when for WITH_LDAP + export POSTFIX_WITH_LDAP # needed when for WITH_MYSQL export POSTFIX_WITH_MYSQL MCF_DIR=$TMPDIR @@ -623,6 +625,11 @@ my $mncf = "$ENV{MCF_DIR}/main.cf"; my $line; +my $with_ldap = + defined $ENV{POSTFIX_WITH_LDAP} ? $ENV{POSTFIX_WITH_LDAP} : "no"; + +$with_ldap = lc($with_ldap); + my $with_mysql = defined $ENV{POSTFIX_WITH_MYSQL} ? $ENV{POSTFIX_WITH_MYSQL} : "no"; @@ -634,10 +641,14 @@ chomp; if( /\#?(virtual_alias_maps\s=\s).*/ ) { - if ($with_mysql ne "yes") { - $line = $1."hash:/etc/postfix/virtual"; - } else { + if ($with_mysql ne "yes" && $with_ldap ne "yes") { + $line = $1."hash:/etc/postfix/virtual"; + } elsif ($with_ldap eq "yes" && $with_mysql ne "yes") { + $line = $1."hash:/etc/postfix/virtual ldap:/etc/postfix/ldap_aliases.cf"; + } elsif ($with_mysql eq "yes" && $with_ldap ne "yes") { $line = $1."hash:/etc/postfix/virtual mysql:/etc/postfix/mysql_virtual_alias_maps.cf"; + } elsif ($with_mysql eq "yes" && $with_ldap eq "yes") { + $line = $1."hash:/etc/postfix/virtual ldap:/etc/postfix/ldap_aliases.cf mysql:/etc/postfix/mysql_virtual_alias_maps.cf"; } } elsif( /\#?(virtual_uid_maps\s=.*)/ ) { if ($with_mysql ne "yes") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/ldap_aliases.cf new/postfix-SuSE/ldap_aliases.cf --- old/postfix-SuSE/ldap_aliases.cf 1970-01-01 01:00:00.000000000 +0100 +++ new/postfix-SuSE/ldap_aliases.cf 2011-05-11 10:30:56.000000000 +0200 @@ -0,0 +1,4 @@ +server_host = 127.0.0.1 +search_base = dc=mail,dc=net +query_filter = (&(|(mail=%s)(mailAlternateAddress=%s))(objectClass=posixAccount)) +result_attribute = uid diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/master.cf new/postfix-SuSE/master.cf --- old/postfix-SuSE/master.cf 2009-05-27 12:32:45.000000000 +0200 +++ new/postfix-SuSE/master.cf 1970-01-01 01:00:00.000000000 +0100 @@ -1,99 +0,0 @@ -# -# Postfix master process configuration file. For details on the format -# of the file, see the Postfix master(5) manual page. -# -# ========================================================================== -# service type private unpriv chroot wakeup maxproc command + args -# (yes) (yes) (yes) (never) (100) -# ========================================================================== -smtp inet n - n - - smtpd -#amavis unix - - n - 4 smtp -# -o smtp_data_done_timeout=1200 -# -o smtp_send_xforward_command=yes -# -o disable_dns_lookups=yes -# -o max_use=20 -#submission inet n - n - - smtpd -# -o smtpd_etrn_restrictions=reject -# -o smtpd_client_restrictions=permit_sasl_authenticated,reject -#smtps inet n - n - - smtpd -# -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes -#submission inet n - n - - smtpd -# -o smtpd_etrn_restrictions=reject -# -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes -#628 inet n - n - - qmqpd -pickup fifo n - n 60 1 pickup -cleanup unix n - n - 0 cleanup -qmgr fifo n - n 300 1 qmgr -#qmgr fifo n - n 300 1 oqmgr -tlsmgr unix - - n 1000? 1 tlsmgr -rewrite unix - - n - - trivial-rewrite -bounce unix - - n - 0 bounce -defer unix - - n - 0 bounce -trace unix - - n - 0 bounce -verify unix - - n - 1 verify -flush unix n - n 1000? 0 flush -proxymap unix - - n - - proxymap -smtp unix - - n - - smtp -# When relaying mail as backup MX, disable fallback_relay to avoid MX loops -relay unix - - n - - smtp - -o fallback_relay= -# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 -showq unix n - n - - showq -error unix - - n - - error -discard unix - - n - - discard -local unix - n n - - local -virtual unix - n n - - virtual -lmtp unix - - n - - lmtp -anvil unix - - n - 1 anvil -#localhost:10025 inet n - n - - smtpd -# -o content_filter= -# -o smtpd_delay_reject=no -# -o smtpd_client_restrictions=permit_mynetworks,reject -# -o smtpd_helo_restrictions= -# -o smtpd_sender_restrictions= -# -o smtpd_recipient_restrictions=permit_mynetworks,reject -# -o smtpd_data_restrictions=reject_unauth_pipelining -# -o smtpd_end_of_data_restrictions= -# -o smtpd_restriction_classes= -# -o mynetworks=127.0.0.0/8 -# -o smtpd_error_sleep_time=0 -# -o smtpd_soft_error_limit=1001 -# -o smtpd_hard_error_limit=1000 -# -o smtpd_client_connection_count_limit=0 -# -o smtpd_client_connection_rate_limit=0 -# -o receive_override_options=no_header_body_checks,no_unknown_recipient_checks,no_address_mappings -# -o local_header_rewrite_clients= -# -o local_recipient_maps= -# -o relay_recipient_maps= -scache unix - - n - 1 scache -# -# ==================================================================== -# Interfaces to non-Postfix software. Be sure to examine the manual -# pages of the non-Postfix software to find out what options it wants. -# -# Many of the following services use the Postfix pipe(8) delivery -# agent. See the pipe(8) man page for information about ${recipient} -# and other message envelope options. -# ==================================================================== -# -# maildrop. See the Postfix MAILDROP_README file for details. -# Also specify in main.cf: maildrop_destination_recipient_limit=1 -# -maildrop unix - n n - - pipe - flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient} -cyrus unix - n n - - pipe - user=cyrus argv=/usr/lib/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user} -uucp unix - n n - - pipe - flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient) -ifmail unix - n n - - pipe - flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient) -bsmtp unix - n n - - pipe - flags=Fq. user=foo argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient -# do not filter locally delivered mail when USE_AMAVIS=yes -# (don't set content_filter=vscan in main.cf) -#vscan unix - n n - 10 pipe -# user=vscan argv=/usr/sbin/amavis ${sender} ${recipient} -procmail unix - n n - - pipe - flags=R user=nobody argv=/usr/bin/procmail -t -m /etc/procmailrc ${sender} ${recipient} -retry unix - - n - - error -proxywrite unix - - n - 1 proxymap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/postfix-files new/postfix-SuSE/postfix-files --- old/postfix-SuSE/postfix-files 1970-01-01 01:00:00.000000000 +0100 +++ new/postfix-SuSE/postfix-files 2011-05-11 10:23:17.000000000 +0200 @@ -0,0 +1,148 @@ +# +# Do not edit this file. +# +# This file controls the postfix-install script for installation of +# Postfix programs, configuration files and documentation, as well +# as the post-install script for setting permissions and for updating +# Postfix configuration files. See the respective manual pages within +# the script files. +# +# Do not list $command_directory in this file, or it will be blown +# away by a future Postfix uninstallation procedure. You would not +# want to lose all files in /usr/sbin. +# +# Each record in this file describes one file or directory. +# Fields are separated by ":". Specify a null field as "-". +# Missing fields or separators at the end are OK. +# +# File format: +# name:type:owner:group:permission:flags +# No group means don't change group ownership. +# +# File types: +# d=directory +# f=regular file +# h=hard link (*) +# l=symbolic link (*) +# +# (*) With hard links and symbolic links, the owner field becomes the +# source pathname, while the group and permissions are ignored. +# +# File flags: +# No flag means the flag is not active. +# p=preserve existing file, do not replace (postfix-install). +# u=update owner/group/mode (post-install upgrade-permissions). +# c=create missing directory (post-install create-missing). +# r=apply owner/group recursively (post-install set/upgrade-permissions). +# o=obsolete, no longer part of Postfix +# 1=optional for non-default instance (config_dir != built-in default). +# +# Note: the "u" flag is for upgrading the permissions of existing files +# or directories after changes in Postfix architecture. For robustness +# it is a good idea to "u" all the files that have special ownership or +# permissions, so that running "make install" fixes any glitches. +# +$config_directory:d:root:-:755:u +$data_directory:d:$mail_owner:-:700:uc +$daemon_directory:d:root:-:755:u +$queue_directory:d:root:-:755:uc +$queue_directory/active:d:$mail_owner:-:700:ucr +$queue_directory/bounce:d:$mail_owner:-:700:ucr +$queue_directory/corrupt:d:$mail_owner:-:700:ucr +$queue_directory/defer:d:$mail_owner:-:700:ucr +$queue_directory/deferred:d:$mail_owner:-:700:ucr +$queue_directory/flush:d:$mail_owner:-:700:ucr +$queue_directory/hold:d:$mail_owner:-:700:ucr +$queue_directory/incoming:d:$mail_owner:-:700:ucr +$queue_directory/private:d:$mail_owner:-:700:uc +$queue_directory/maildrop:d:$mail_owner:$setgid_group:730:uc +$queue_directory/public:d:$mail_owner:$setgid_group:710:uc +$queue_directory/pid:d:root:-:755:uc +$queue_directory/saved:d:$mail_owner:-:700:ucr +$queue_directory/trace:d:$mail_owner:-:700:ucr +$daemon_directory/anvil:f:root:-:755 +$daemon_directory/bounce:f:root:-:755 +$daemon_directory/dict_ldap.so:f:root:-:755 +$daemon_directory/dict_pcre.so:f:root:-:755 +$daemon_directory/dict_tcp.so:f:root:-:755 +$daemon_directory/cleanup:f:root:-:755 +$daemon_directory/discard:f:root:-:755 +$daemon_directory/dnsblog:f:root:-:755 +$daemon_directory/error:f:root:-:755 +$daemon_directory/flush:f:root:-:755 +#$daemon_directory/lmtp:f:root:-:755 +$daemon_directory/local:f:root:-:755 +$daemon_directory/main.cf:f:root:-:644 +$daemon_directory/master.cf:f:root:-:644 +$daemon_directory/master:f:root:-:755 +$daemon_directory/oqmgr:f:root:-:755 +$daemon_directory/pickup:f:root:-:755 +$daemon_directory/pipe:f:root:-:755 +$daemon_directory/post-install:f:root:-:755 +$daemon_directory/postfix-files:f:root:-:644 +$daemon_directory/postfix-script:f:root:-:755 +$daemon_directory/postfix-wrapper:f:root:-:755 +$daemon_directory/postmulti-script:f:root:-:755 +$daemon_directory/postscreen:f:root:-:755 +$daemon_directory/proxymap:f:root:-:755 +$daemon_directory/qmgr:f:root:-:755 +$daemon_directory/qmqpd:f:root:-:755 +$daemon_directory/scache:f:root:-:755 +$daemon_directory/showq:f:root:-:755 +$daemon_directory/smtp:f:root:-:755 +$daemon_directory/smtpd:f:root:-:755 +$daemon_directory/spawn:f:root:-:755 +$daemon_directory/tlsproxy:f:root:-:755 +$daemon_directory/tlsmgr:f:root:-:755 +$daemon_directory/trivial-rewrite:f:root:-:755 +$daemon_directory/verify:f:root:-:755 +$daemon_directory/virtual:f:root:-:755 +/usr/lib/libpostfix-dns.so.1:f:root:-:755 +/usr/lib/libpostfix-global.so.1:f:root:-:755 +/usr/lib/libpostfix-tls.so.1:f:root:-:755 +/usr/lib/libpostfix-master.so.1:f:root:-:755 +/usr/lib/libpostfix-util.so.1:f:root:-:755 +$daemon_directory/nqmgr:h:$daemon_directory/qmgr +$daemon_directory/lmtp:h:$daemon_directory/smtp +$command_directory/postalias:f:root:-:755 +$command_directory/postcat:f:root:-:755 +$command_directory/postconf:f:root:-:755 +$command_directory/postfix:f:root:-:755 +$command_directory/postkick:f:root:-:755 +$command_directory/postlock:f:root:-:755 +$command_directory/postlog:f:root:-:755 +$command_directory/postmap:f:root:-:755 +$command_directory/postmulti:f:root:-:755 +$command_directory/postsuper:f:root:-:755 +$command_directory/postdrop:f:root:$setgid_group:2755:u +$command_directory/postqueue:f:root:$setgid_group:2755:u +$sendmail_path:f:root:-:755 +$newaliases_path:l:$sendmail_path +$mailq_path:l:$sendmail_path +$config_directory/LICENSE:f:root:-:644:1 +$config_directory/TLS_LICENSE:f:root:-:644:1 +$config_directory/access:f:root:-:644:p1 +$config_directory/aliases:f:root:-:644:p1 +$config_directory/bounce.cf.default:f:root:-:644:1 +$config_directory/canonical:f:root:-:644:p1 +$config_directory/dynamicmaps.cf:f:root:-:644:p +$config_directory/cidr_table:f:root:-:644:o +$config_directory/generic:f:root:-:644:p1 +$config_directory/generics:f:root:-:644:o +$config_directory/header_checks:f:root:-:644:p1 +$config_directory/install.cf:f:root:-:644:o +$config_directory/main.cf.default:f:root:-:644:1 +$config_directory/main.cf:f:root:-:644:p +$config_directory/makedefs.out:f:root:-:644:1 +$config_directory/master.cf:f:root:-:644:p +$config_directory/pcre_table:f:root:-:644:o +$config_directory/postfix-files:f:root:-:644:o +$config_directory/regexp_table:f:root:-:644:o +$config_directory/relocated:f:root:-:644:p1 +$config_directory/tcp_table:f:root:-:644:o +$config_directory/transport:f:root:-:644:p1 +$config_directory/virtual:f:root:-:644:p1 +$config_directory/postfix-script:f:root:-:755:o +$config_directory/postfix-script-sgid:f:root:-:755:o +$config_directory/postfix-script-nosgid:f:root:-:755:o +$config_directory/post-install:f:root:-:755:o diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-SuSE/sysconfig.postfix new/postfix-SuSE/sysconfig.postfix --- old/postfix-SuSE/sysconfig.postfix 2010-07-06 16:57:01.000000000 +0200 +++ new/postfix-SuSE/sysconfig.postfix 2011-05-11 10:30:56.000000000 +0200 @@ -125,6 +125,15 @@ ## Default: no ## Config: postfix # +# Set this to yes, if SuSEconfig should activate ldap stuff in main.cf +# This extends virtual_alias_maps with "ldap:/etc/postfix/ldap_aliases.cf" +# +POSTFIX_WITH_LDAP="no" + +## Type: yesno +## Default: no +## Config: postfix +# # Set this to yes, if SuSEconfig should activate mysql stuff in main.cf # and having 'mysql.sock' inside chroot jail # Note: When POSTFIX_CHROOT="yes" then 'mysql.sock' will be available ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
