Hello community, here is the log from the commit of package postfix for openSUSE:Factory checked in at 2012-09-17 14:03:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postfix (Old) and /work/SRC/openSUSE:Factory/.postfix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "postfix", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/postfix/postfix.changes 2012-07-19 17:59:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix.changes 2012-09-17 14:03:25.000000000 +0200 @@ -1,0 +2,24 @@ +Fri Aug 10 18:56:59 UTC 2012 - [email protected] + +- update to 2.8.12 + * 20120730 + Bugfix (introduced: 20000314): AUTH is not allowed after + MAIL. Timo Sirainen. File: smtpd/smtpd_sasl_proto.c. + * 20120702 + Bugfix (introduced: 19990127): the BIFF client leaked an + unprivileged UDP socket. Fix by Jaroslav Skarvada. File: + local/biff_notify.c. + * 20120621 + Bugfix (introduced: Postfix 2.8): the unused "pass" trigger + client could close the wrong file descriptors. File: + util/unix_pass_trigger.c. +- fix for bnc#771303 + * add 'version = 3' to ldap_aliases.cf +- rebase patches + * main, master, post-install: 2.8.3 -> 2.8.12 + * ssl-release-buffers: 2.8.5 -> 2.8.12 + * vda-v10: 2.8.9 -> 2.8.12 + * dynamic_maps, dynamic_maps_pie, ipv6_disabled, pointer_to_literals +- fix changes file + +------------------------------------------------------------------- @@ -8,0 +33,2 @@ +- update to 2.8.11 + * 20120520 @@ -14 +39,0 @@ - @@ -23 +47,0 @@ - Old: ---- postfix-2.8.11.tar.bz2 postfix-2.8.3-main.cf.patch postfix-2.8.3-master.cf.patch postfix-2.8.3-post-install.patch postfix-2.8.5-ssl-release-buffers.patch postfix-vda-v10-2.8.9.patch New: ---- postfix-2.8.12-main.cf.patch postfix-2.8.12-master.cf.patch postfix-2.8.12-post-install.patch postfix-2.8.12-ssl-release-buffers.patch postfix-2.8.12.tar.bz2 postfix-vda-v10-2.8.12.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.ofZsH9/_old 2012-09-17 14:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.ofZsH9/_new 2012-09-17 14:03:27.000000000 +0200 @@ -20,7 +20,7 @@ Summary: A fast, secure, and flexible mailer License: IPL-1.0 Group: Productivity/Networking/Email/Servers -Version: 2.8.11 +Version: 2.8.12 Release: 0 Url: http://www.postfix.org/ Source: %{name}-%{version}.tar.bz2 @@ -32,11 +32,11 @@ Patch1: dynamic_maps_pie.patch Patch2: pointer_to_literals.patch Patch3: ipv6_disabled.patch -Patch10: %{name}-2.8.3-main.cf.patch -Patch11: %{name}-2.8.3-master.cf.patch -Patch12: %{name}-2.8.3-post-install.patch -Patch20: %{name}-vda-v10-2.8.9.patch -Patch21: postfix-2.8.5-ssl-release-buffers.patch +Patch10: %{name}-2.8.12-main.cf.patch +Patch11: %{name}-2.8.12-master.cf.patch +Patch12: %{name}-2.8.12-post-install.patch +Patch20: %{name}-vda-v10-2.8.12.patch +Patch21: postfix-2.8.12-ssl-release-buffers.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq PreReq: /usr/bin/getent @@ -139,14 +139,14 @@ %prep %setup -n %{name}-%{version} -a 1 -a 2 -%patch -p1 +%patch %patch1 -%patch2 -p1 -%patch3 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch20 -p1 +%patch2 +%patch3 +%patch10 +%patch11 +%patch12 +%patch20 %patch21 # --------------------------------------------------------------------------- ++++++ dynamic_maps.patch ++++++ ++++ 947 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/postfix/dynamic_maps.patch ++++ and /work/SRC/openSUSE:Factory/.postfix.new/dynamic_maps.patch ++++++ dynamic_maps_pie.patch ++++++ --- /var/tmp/diff_new_pack.ofZsH9/_old 2012-09-17 14:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.ofZsH9/_new 2012-09-17 14:03:27.000000000 +0200 @@ -1,8 +1,8 @@ Index: makedefs =================================================================== ---- makedefs.orig 2007-03-24 14:30:18.000000000 +0100 -+++ makedefs 2007-08-06 00:05:32.627270181 +0200 -@@ -475,4 +475,5 @@ AWK = $AWK +--- makedefs.orig ++++ makedefs +@@ -669,4 +669,5 @@ AWK = $AWK STRCASE = $STRCASE EXPORT = AUXLIBS='$AUXLIBS' CCARGS='$CCARGS' OPT='$OPT' DEBUG='$DEBUG' WARN = $WARN @@ -10,9 +10,9 @@ EOF Index: src/anvil/Makefile.in =================================================================== ---- src/anvil/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100 -+++ src/anvil/Makefile.in 2007-08-06 00:05:32.639270914 +0200 -@@ -9,11 +9,14 @@ TESTPROG= +--- src/anvil/Makefile.in.orig ++++ src/anvil/Makefile.in +@@ -9,11 +9,14 @@ TESTPROG= PROG = anvil INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -30,8 +30,8 @@ Index: src/cleanup/Makefile.in =================================================================== ---- src/cleanup/Makefile.in.orig 2007-03-17 18:51:40.000000000 +0100 -+++ src/cleanup/Makefile.in 2007-08-06 00:05:32.663272382 +0200 +--- src/cleanup/Makefile.in.orig ++++ src/cleanup/Makefile.in @@ -20,11 +20,14 @@ PROG = cleanup INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libmilter.a ../../lib/libglobal.a \ @@ -50,8 +50,8 @@ Index: src/discard/Makefile.in =================================================================== ---- src/discard/Makefile.in.orig 2007-03-17 18:51:47.000000000 +0100 -+++ src/discard/Makefile.in 2007-08-06 00:05:32.767278742 +0200 +--- src/discard/Makefile.in.orig ++++ src/discard/Makefile.in @@ -9,11 +9,14 @@ TESTPROG= PROG = discard INC_DIR = ../../include @@ -70,8 +70,8 @@ Index: src/error/Makefile.in =================================================================== ---- src/error/Makefile.in.orig 2007-03-17 18:51:39.000000000 +0100 -+++ src/error/Makefile.in 2007-08-06 00:05:32.791280210 +0200 +--- src/error/Makefile.in.orig ++++ src/error/Makefile.in @@ -9,11 +9,14 @@ TESTPROG= PROG = error INC_DIR = ../../include @@ -90,9 +90,9 @@ Index: src/flush/Makefile.in =================================================================== ---- src/flush/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100 -+++ src/flush/Makefile.in 2007-08-06 00:05:32.815281678 +0200 -@@ -9,11 +9,14 @@ TESTPROG= +--- src/flush/Makefile.in.orig ++++ src/flush/Makefile.in +@@ -9,11 +9,14 @@ TESTPROG= PROG = flush INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -110,9 +110,9 @@ Index: src/fsstone/Makefile.in =================================================================== ---- src/fsstone/Makefile.in.orig 2006-12-04 01:29:52.000000000 +0100 -+++ src/fsstone/Makefile.in 2007-08-06 00:05:32.855284124 +0200 -@@ -9,6 +9,9 @@ TESTPROG= +--- src/fsstone/Makefile.in.orig ++++ src/fsstone/Makefile.in +@@ -9,6 +9,9 @@ TESTPROG= PROG = fsstone INC_DIR = ../../include LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -133,8 +133,8 @@ Index: src/local/Makefile.in =================================================================== ---- src/local/Makefile.in.orig 2007-03-17 18:51:42.000000000 +0100 -+++ src/local/Makefile.in 2007-08-06 00:05:32.875285347 +0200 +--- src/local/Makefile.in.orig ++++ src/local/Makefile.in @@ -15,11 +15,14 @@ PROG = local TESTPROG= INC_DIR = ../../include @@ -153,8 +153,8 @@ Index: src/master/Makefile.in =================================================================== ---- src/master/Makefile.in.orig 2007-08-06 00:05:31.915226638 +0200 -+++ src/master/Makefile.in 2007-08-06 00:05:32.899286815 +0200 +--- src/master/Makefile.in.orig ++++ src/master/Makefile.in @@ -20,7 +20,7 @@ LIB_DIR = ../../lib INC_DIR = ../../include BIN_DIR = ../../libexec @@ -175,9 +175,9 @@ Index: src/oqmgr/Makefile.in =================================================================== ---- src/oqmgr/Makefile.in.orig 2007-03-17 18:51:43.000000000 +0100 -+++ src/oqmgr/Makefile.in 2007-08-06 00:05:32.923288283 +0200 -@@ -13,11 +13,14 @@ TESTPROG= +--- src/oqmgr/Makefile.in.orig ++++ src/oqmgr/Makefile.in +@@ -15,11 +15,14 @@ TESTPROG= PROG = qmgr INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -195,9 +195,9 @@ Index: src/pickup/Makefile.in =================================================================== ---- src/pickup/Makefile.in.orig 2007-03-17 18:51:39.000000000 +0100 -+++ src/pickup/Makefile.in 2007-08-06 00:05:32.959290484 +0200 -@@ -9,11 +9,14 @@ TESTPROG= +--- src/pickup/Makefile.in.orig ++++ src/pickup/Makefile.in +@@ -9,11 +9,14 @@ TESTPROG= PROG = pickup INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -215,8 +215,8 @@ Index: src/pipe/Makefile.in =================================================================== ---- src/pipe/Makefile.in.orig 2007-03-17 18:51:45.000000000 +0100 -+++ src/pipe/Makefile.in 2007-08-06 00:05:32.983291952 +0200 +--- src/pipe/Makefile.in.orig ++++ src/pipe/Makefile.in @@ -9,11 +9,14 @@ TESTPROG= PROG = pipe INC_DIR = ../../include @@ -235,9 +235,9 @@ Index: src/postalias/Makefile.in =================================================================== ---- src/postalias/Makefile.in.orig 2007-03-17 18:51:45.000000000 +0100 -+++ src/postalias/Makefile.in 2007-08-06 00:05:33.007293420 +0200 -@@ -9,11 +9,14 @@ TESTPROG= +--- src/postalias/Makefile.in.orig ++++ src/postalias/Makefile.in +@@ -9,11 +9,14 @@ TESTPROG= PROG = postalias INC_DIR = ../../include LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -255,9 +255,9 @@ Index: src/postcat/Makefile.in =================================================================== ---- src/postcat/Makefile.in.orig 2007-03-17 18:51:45.000000000 +0100 -+++ src/postcat/Makefile.in 2007-08-06 00:05:33.043295621 +0200 -@@ -9,11 +9,14 @@ TESTPROG= +--- src/postcat/Makefile.in.orig ++++ src/postcat/Makefile.in +@@ -9,11 +9,14 @@ TESTPROG= PROG = postcat INC_DIR = ../../include LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -275,8 +275,8 @@ Index: src/postdrop/Makefile.in =================================================================== ---- src/postdrop/Makefile.in.orig 2007-03-17 18:51:45.000000000 +0100 -+++ src/postdrop/Makefile.in 2007-08-06 00:05:33.147301981 +0200 +--- src/postdrop/Makefile.in.orig ++++ src/postdrop/Makefile.in @@ -9,11 +9,14 @@ TESTPROG= PROG = postdrop INC_DIR = ../../include @@ -295,8 +295,8 @@ Index: src/postfix/Makefile.in =================================================================== ---- src/postfix/Makefile.in.orig 2007-03-17 18:51:39.000000000 +0100 -+++ src/postfix/Makefile.in 2007-08-06 00:05:33.175303694 +0200 +--- src/postfix/Makefile.in.orig ++++ src/postfix/Makefile.in @@ -10,11 +10,14 @@ INC_DIR = ../../include TESTPROG= PROG = postfix @@ -315,8 +315,8 @@ Index: src/postkick/Makefile.in =================================================================== ---- src/postkick/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100 -+++ src/postkick/Makefile.in 2007-08-06 00:05:33.203305406 +0200 +--- src/postkick/Makefile.in.orig ++++ src/postkick/Makefile.in @@ -9,11 +9,14 @@ TESTPROG= PROG = postkick INC_DIR = ../../include @@ -335,8 +335,8 @@ Index: src/postlock/Makefile.in =================================================================== ---- src/postlock/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100 -+++ src/postlock/Makefile.in 2007-08-06 00:05:33.227306874 +0200 +--- src/postlock/Makefile.in.orig ++++ src/postlock/Makefile.in @@ -9,11 +9,14 @@ TESTPROG= PROG = postlock INC_DIR = ../../include @@ -355,8 +355,8 @@ Index: src/postlog/Makefile.in =================================================================== ---- src/postlog/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100 -+++ src/postlog/Makefile.in 2007-08-06 00:05:33.251308342 +0200 +--- src/postlog/Makefile.in.orig ++++ src/postlog/Makefile.in @@ -10,11 +10,14 @@ INC_DIR = ../../include TESTPROG= PROG = postlog @@ -375,9 +375,9 @@ Index: src/postmap/Makefile.in =================================================================== ---- src/postmap/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100 -+++ src/postmap/Makefile.in 2007-08-06 00:05:33.287310543 +0200 -@@ -9,11 +9,14 @@ TESTPROG= +--- src/postmap/Makefile.in.orig ++++ src/postmap/Makefile.in +@@ -9,11 +9,14 @@ TESTPROG= PROG = postmap INC_DIR = ../../include LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -395,8 +395,8 @@ Index: src/postqueue/Makefile.in =================================================================== ---- src/postqueue/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100 -+++ src/postqueue/Makefile.in 2007-08-06 00:05:33.311312011 +0200 +--- src/postqueue/Makefile.in.orig ++++ src/postqueue/Makefile.in @@ -9,11 +9,14 @@ TESTPROG= PROG = postqueue INC_DIR = ../../include @@ -415,9 +415,9 @@ Index: src/postsuper/Makefile.in =================================================================== ---- src/postsuper/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100 -+++ src/postsuper/Makefile.in 2007-08-06 00:05:33.335313479 +0200 -@@ -9,11 +9,14 @@ TESTPROG= +--- src/postsuper/Makefile.in.orig ++++ src/postsuper/Makefile.in +@@ -9,11 +9,14 @@ TESTPROG= PROG = postsuper INC_DIR = ../../include LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -435,9 +435,9 @@ Index: src/proxymap/Makefile.in =================================================================== ---- src/proxymap/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100 -+++ src/proxymap/Makefile.in 2007-08-06 00:05:33.363315191 +0200 -@@ -9,11 +9,14 @@ TESTPROG= +--- src/proxymap/Makefile.in.orig ++++ src/proxymap/Makefile.in +@@ -9,11 +9,14 @@ TESTPROG= PROG = proxymap INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -455,9 +455,9 @@ Index: src/qmgr/Makefile.in =================================================================== ---- src/qmgr/Makefile.in.orig 2007-03-17 18:51:43.000000000 +0100 -+++ src/qmgr/Makefile.in 2007-08-06 00:05:33.467321551 +0200 -@@ -15,11 +15,14 @@ TESTPROG= +--- src/qmgr/Makefile.in.orig ++++ src/qmgr/Makefile.in +@@ -17,11 +17,14 @@ TESTPROG= PROG = qmgr INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -475,8 +475,8 @@ Index: src/qmqpd/Makefile.in =================================================================== ---- src/qmqpd/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100 -+++ src/qmqpd/Makefile.in 2007-08-06 00:05:33.491323019 +0200 +--- src/qmqpd/Makefile.in.orig ++++ src/qmqpd/Makefile.in @@ -9,11 +9,14 @@ TESTPROG= PROG = qmqpd INC_DIR = ../../include @@ -495,9 +495,9 @@ Index: src/scache/Makefile.in =================================================================== ---- src/scache/Makefile.in.orig 2007-03-17 18:51:47.000000000 +0100 -+++ src/scache/Makefile.in 2007-08-06 00:05:33.527325220 +0200 -@@ -9,11 +9,14 @@ TESTPROG= +--- src/scache/Makefile.in.orig ++++ src/scache/Makefile.in +@@ -9,11 +9,14 @@ TESTPROG= PROG = scache INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -515,8 +515,8 @@ Index: src/sendmail/Makefile.in =================================================================== ---- src/sendmail/Makefile.in.orig 2007-03-17 18:51:39.000000000 +0100 -+++ src/sendmail/Makefile.in 2007-08-06 00:05:33.559327177 +0200 +--- src/sendmail/Makefile.in.orig ++++ src/sendmail/Makefile.in @@ -9,11 +9,14 @@ TESTPROG= PROG = sendmail INC_DIR = ../../include @@ -535,9 +535,9 @@ Index: src/showq/Makefile.in =================================================================== ---- src/showq/Makefile.in.orig 2007-03-17 18:51:45.000000000 +0100 -+++ src/showq/Makefile.in 2007-08-06 00:05:33.587328890 +0200 -@@ -9,11 +9,14 @@ TESTPROG= +--- src/showq/Makefile.in.orig ++++ src/showq/Makefile.in +@@ -9,11 +9,14 @@ TESTPROG= PROG = showq INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -555,9 +555,9 @@ Index: src/smtpstone/Makefile.in =================================================================== ---- src/smtpstone/Makefile.in.orig 2007-03-17 18:51:39.000000000 +0100 -+++ src/smtpstone/Makefile.in 2007-08-06 00:05:33.603329868 +0200 -@@ -9,6 +9,9 @@ TESTPROG= +--- src/smtpstone/Makefile.in.orig ++++ src/smtpstone/Makefile.in +@@ -9,6 +9,9 @@ TESTPROG= INC_DIR = ../../include PROG = smtp-source smtp-sink qmqp-source qmqp-sink LIBS = ../../lib/libglobal.a ../../lib/libutil.a @@ -590,9 +590,9 @@ Index: src/spawn/Makefile.in =================================================================== ---- src/spawn/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100 -+++ src/spawn/Makefile.in 2007-08-06 00:05:33.635331825 +0200 -@@ -9,11 +9,14 @@ TESTPROG= +--- src/spawn/Makefile.in.orig ++++ src/spawn/Makefile.in +@@ -9,11 +9,14 @@ TESTPROG= PROG = spawn INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -610,8 +610,8 @@ Index: src/tlsmgr/Makefile.in =================================================================== ---- src/tlsmgr/Makefile.in.orig 2007-03-17 18:51:47.000000000 +0100 -+++ src/tlsmgr/Makefile.in 2007-08-06 00:05:33.739338185 +0200 +--- src/tlsmgr/Makefile.in.orig ++++ src/tlsmgr/Makefile.in @@ -10,11 +10,14 @@ PROG = tlsmgr INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libglobal.a \ @@ -630,8 +630,8 @@ Index: src/trivial-rewrite/Makefile.in =================================================================== ---- src/trivial-rewrite/Makefile.in.orig 2007-03-17 18:51:42.000000000 +0100 -+++ src/trivial-rewrite/Makefile.in 2007-08-06 00:05:33.787341121 +0200 +--- src/trivial-rewrite/Makefile.in.orig ++++ src/trivial-rewrite/Makefile.in @@ -12,13 +12,16 @@ LIBS = ../../lib/libmaster.a ../../lib/l LIB_DIR = ../../lib INC_DIR = ../../include @@ -652,9 +652,9 @@ Index: src/verify/Makefile.in =================================================================== ---- src/verify/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100 -+++ src/verify/Makefile.in 2007-08-06 00:05:33.803342099 +0200 -@@ -9,11 +9,14 @@ TESTPROG= +--- src/verify/Makefile.in.orig ++++ src/verify/Makefile.in +@@ -9,11 +9,14 @@ TESTPROG= PROG = verify INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a @@ -672,8 +672,8 @@ Index: src/virtual/Makefile.in =================================================================== ---- src/virtual/Makefile.in.orig 2007-03-17 18:51:46.000000000 +0100 -+++ src/virtual/Makefile.in 2007-08-06 00:05:33.823343322 +0200 +--- src/virtual/Makefile.in.orig ++++ src/virtual/Makefile.in @@ -9,11 +9,14 @@ PROG = virtual TESTPROG= INC_DIR = ../../include @@ -692,8 +692,8 @@ Index: src/bounce/Makefile.in =================================================================== ---- src/bounce/Makefile.in.orig 2007-03-17 18:51:45.000000000 +0100 -+++ src/bounce/Makefile.in 2007-08-06 00:05:33.839344301 +0200 +--- src/bounce/Makefile.in.orig ++++ src/bounce/Makefile.in @@ -16,13 +16,16 @@ PROG = bounce SAMPLES = ../../conf/bounce.cf.default INC_DIR = ../../include @@ -714,9 +714,9 @@ ../../conf/bounce.cf.default: template_test.ref annotate.pl Index: src/postconf/Makefile.in =================================================================== ---- src/postconf/Makefile.in.orig 2007-03-17 18:51:45.000000000 +0100 -+++ src/postconf/Makefile.in 2007-08-06 00:05:33.903348215 +0200 -@@ -12,11 +12,14 @@ PROG = postconf +--- src/postconf/Makefile.in.orig ++++ src/postconf/Makefile.in +@@ -15,11 +15,14 @@ PROG = postconf SAMPLES = ../../conf/main.cf.default INC_DIR = ../../include LIBS = ../../lib/libxsasl.a ../../lib/libglobal.a ../../lib/libutil.a @@ -734,9 +734,9 @@ rm -f $@ Index: src/smtp/Makefile.in =================================================================== ---- src/smtp/Makefile.in.orig 2007-03-17 18:51:45.000000000 +0100 -+++ src/smtp/Makefile.in 2007-08-06 00:05:33.915348949 +0200 -@@ -14,11 +14,14 @@ PROG = smtp +--- src/smtp/Makefile.in.orig ++++ src/smtp/Makefile.in +@@ -16,11 +16,14 @@ PROG = smtp INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libdns.a \ ../../lib/libxsasl.a ../../lib/libglobal.a ../../lib/libutil.a @@ -754,9 +754,9 @@ Index: src/smtpd/Makefile.in =================================================================== ---- src/smtpd/Makefile.in.orig 2007-03-17 18:51:41.000000000 +0100 -+++ src/smtpd/Makefile.in 2007-08-06 00:05:33.931349927 +0200 -@@ -16,11 +16,14 @@ INC_DIR = ../../include +--- src/smtpd/Makefile.in.orig ++++ src/smtpd/Makefile.in +@@ -19,11 +19,14 @@ INC_DIR = ../../include LIBS = ../../lib/libmaster.a ../../lib/libtls.a ../../lib/libdns.a \ ../../lib/libxsasl.a ../../lib/libmilter.a ../../lib/libglobal.a \ ../../lib/libutil.a @@ -774,8 +774,8 @@ Index: src/xsasl/Makefile.in =================================================================== ---- src/xsasl/Makefile.in.orig 2007-03-17 18:51:38.000000000 +0100 -+++ src/xsasl/Makefile.in 2007-08-06 00:05:33.947350906 +0200 +--- src/xsasl/Makefile.in.orig ++++ src/xsasl/Makefile.in @@ -18,7 +18,7 @@ LIB_DIR = ../../lib INC_DIR = ../../include MAKES = ++++++ ipv6_disabled.patch ++++++ --- /var/tmp/diff_new_pack.ofZsH9/_old 2012-09-17 14:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.ofZsH9/_new 2012-09-17 14:03:27.000000000 +0200 @@ -1,6 +1,8 @@ ---- postfix-2.2.9/src/util/inet_proto.c 2005-01-19 02:22:19.000000000 +0100 -+++ postfix-2.2.9/src/util/inet_proto.c 2007-01-25 13:22:25.000000000 +0100 -@@ -220,9 +220,11 @@ +Index: src/util/inet_proto.c +=================================================================== +--- src/util/inet_proto.c.orig ++++ src/util/inet_proto.c +@@ -220,9 +220,11 @@ INET_PROTO_INFO *inet_proto_init(const c pf->sa_family_list = make_uchar_vector(3, AF_INET, AF_INET6, 0); break; } else if (errno == EAFNOSUPPORT) { @@ -10,7 +12,7 @@ + /* remove waste warnings 2007-01-25 Peter Varkoly <[email protected]> + * msg_warn("%s: IPv6 support is disabled: %m", context); + * msg_warn("%s: configuring for IPv4 support only", context); -+ * FALLTHROUGH ++ * FALLTHROUGH + */ } else { msg_fatal("socket: %m"); ++++++ pointer_to_literals.patch ++++++ --- /var/tmp/diff_new_pack.ofZsH9/_old 2012-09-17 14:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.ofZsH9/_new 2012-09-17 14:03:27.000000000 +0200 @@ -1,7 +1,8 @@ -diff -ur postfix-2.8.2-dynamic_maps_pie/src/cleanup/cleanup_message.c postfix-2.8.2-pointer_to_literals/src/cleanup/cleanup_message.c ---- postfix-2.8.2-dynamic_maps_pie/src/cleanup/cleanup_message.c 2010-07-27 22:34:20.000000000 +0200 -+++ postfix-2.8.2-pointer_to_literals/src/cleanup/cleanup_message.c 2011-03-30 23:10:42.774254791 +0200 -@@ -290,7 +290,7 @@ +Index: src/cleanup/cleanup_message.c +=================================================================== +--- src/cleanup/cleanup_message.c.orig ++++ src/cleanup/cleanup_message.c +@@ -290,7 +290,7 @@ static const char *cleanup_act(CLEANUP_S while (*optional_text && ISSPACE(*optional_text)) optional_text++; @@ -10,11 +11,11 @@ #define CLEANUP_ACT_DROP 0 /* -Nur in postfix-2.8.2-pointer_to_literals/src/cleanup: cleanup_message.c.orig. -diff -ur postfix-2.8.2-dynamic_maps_pie/src/local/local_expand.c postfix-2.8.2-pointer_to_literals/src/local/local_expand.c ---- postfix-2.8.2-dynamic_maps_pie/src/local/local_expand.c 2005-05-31 15:44:14.000000000 +0200 -+++ postfix-2.8.2-pointer_to_literals/src/local/local_expand.c 2011-03-30 23:10:42.775254802 +0200 -@@ -114,7 +114,7 @@ +Index: src/local/local_expand.c +=================================================================== +--- src/local/local_expand.c.orig ++++ src/local/local_expand.c +@@ -114,7 +114,7 @@ static const char *local_expand_lookup(c { LOCAL_EXP *local = (LOCAL_EXP *) ptr; @@ -23,10 +24,11 @@ if (STREQ(name, "user")) { return (local->state->msg_attr.user); -diff -ur postfix-2.8.2-dynamic_maps_pie/src/smtpd/smtpd_check.c postfix-2.8.2-pointer_to_literals/src/smtpd/smtpd_check.c ---- postfix-2.8.2-dynamic_maps_pie/src/smtpd/smtpd_check.c 2011-01-04 20:03:50.000000000 +0100 -+++ postfix-2.8.2-pointer_to_literals/src/smtpd/smtpd_check.c 2011-03-30 23:12:46.513254818 +0200 -@@ -359,6 +359,10 @@ +Index: src/smtpd/smtpd_check.c +=================================================================== +--- src/smtpd/smtpd_check.c.orig ++++ src/smtpd/smtpd_check.c +@@ -359,6 +359,10 @@ static int unv_from_tf_act; #define CONST_STR(x) ((const char *) vstring_str(x)) #define UPDATE_STRING(ptr,val) { if (ptr) myfree(ptr); ptr = mystrdup(val); } @@ -37,7 +39,7 @@ /* * If some decision can't be made due to a temporary error, then change * other decisions into deferrals. -@@ -1950,8 +1954,6 @@ +@@ -1950,8 +1954,6 @@ static int check_table_result(SMTPD_STAT if (msg_verbose) msg_info("%s: %s %s %s", myname, table, value, datum); @@ -46,7 +48,7 @@ /* * DUNNO means skip this table. Silently ignore optional text. */ -@@ -2934,8 +2936,6 @@ +@@ -2934,8 +2936,6 @@ static const char *rbl_expand_lookup(con SMTPD_RBL_EXPAND_CONTEXT *rbl_exp = (SMTPD_RBL_EXPAND_CONTEXT *) context; SMTPD_STATE *state = rbl_exp->state; @@ -55,10 +57,11 @@ if (state->expand_buf == 0) state->expand_buf = vstring_alloc(10); -diff -ur postfix-2.8.2-dynamic_maps_pie/src/util/dict_open.c postfix-2.8.2-pointer_to_literals/src/util/dict_open.c ---- postfix-2.8.2-dynamic_maps_pie/src/util/dict_open.c 2011-03-30 16:02:04.373769372 +0200 -+++ postfix-2.8.2-pointer_to_literals/src/util/dict_open.c 2011-03-30 23:10:42.787254814 +0200 -@@ -461,7 +461,7 @@ +Index: src/util/dict_open.c +=================================================================== +--- src/util/dict_open.c.orig ++++ src/util/dict_open.c +@@ -476,7 +476,7 @@ ARGV *dict_mapnames() } #ifndef NO_DYNAMIC_MAPS @@ -67,4 +70,3 @@ void dict_open_dlinfo(const char *path) { -Nur in postfix-2.8.2-pointer_to_literals/src/util: dict_open.c.orig. ++++++ postfix-2.8.3-main.cf.patch -> postfix-2.8.12-main.cf.patch ++++++ --- /work/SRC/openSUSE:Factory/postfix/postfix-2.8.3-main.cf.patch 2011-09-23 12:41:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix-2.8.12-main.cf.patch 2012-09-17 14:03:25.000000000 +0200 @@ -1,7 +1,8 @@ -diff -ruN postfix-2.8.3-orig/conf/main.cf postfix-2.8.3/conf/main.cf ---- postfix-2.8.3-orig/conf/main.cf 2007-12-18 14:50:25.000000000 +0100 -+++ postfix-2.8.3/conf/main.cf 2011-05-17 22:05:14.000000000 +0200 -@@ -649,3 +649,119 @@ +Index: conf/main.cf +=================================================================== +--- conf/main.cf.orig ++++ conf/main.cf +@@ -649,3 +649,119 @@ sample_directory = # readme_directory: The location of the Postfix README files. # readme_directory = ++++++ postfix-2.8.3-master.cf.patch -> postfix-2.8.12-master.cf.patch ++++++ --- /work/SRC/openSUSE:Factory/postfix/postfix-2.8.3-master.cf.patch 2011-09-23 12:41:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix-2.8.12-master.cf.patch 2012-09-17 14:03:25.000000000 +0200 @@ -1,6 +1,7 @@ -diff -ruN postfix-2.8.3-orig/conf/master.cf postfix-2.8.3/conf/master.cf ---- postfix-2.8.3-orig/conf/master.cf 2010-12-31 15:14:51.000000000 +0100 -+++ postfix-2.8.3/conf/master.cf 2011-07-01 14:30:23.000000000 +0200 +Index: conf/master.cf +=================================================================== +--- conf/master.cf.orig ++++ conf/master.cf @@ -9,6 +9,11 @@ # (yes) (yes) (yes) (never) (100) # ========================================================================== @@ -13,7 +14,7 @@ #smtp inet n - n - 1 postscreen #smtpd pass - - n - - smtpd #dnsblog unix - - n - 0 dnsblog -@@ -50,6 +55,26 @@ +@@ -50,6 +55,26 @@ local unix - n n virtual unix - n n - - virtual lmtp unix - - n - - lmtp anvil unix - - n - 1 anvil @@ -40,7 +41,7 @@ scache unix - - n - 1 scache # # ==================================================================== -@@ -84,7 +109,7 @@ +@@ -84,7 +109,7 @@ scache unix - - n # Also specify in main.cf: cyrus_destination_recipient_limit=1 # #cyrus unix - n n - - pipe @@ -49,7 +50,7 @@ # # ==================================================================== # -@@ -117,3 +142,7 @@ +@@ -117,3 +142,7 @@ scache unix - - n #mailman unix - n n - - pipe # flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py # ${nexthop} ${user} ++++++ postfix-2.8.3-post-install.patch -> postfix-2.8.12-post-install.patch ++++++ --- /work/SRC/openSUSE:Factory/postfix/postfix-2.8.3-post-install.patch 2011-09-23 12:41:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix-2.8.12-post-install.patch 2012-09-17 14:03:25.000000000 +0200 @@ -1,7 +1,8 @@ -diff -ruN postfix-2.8.3-orig/conf/post-install postfix-2.8.3/conf/post-install ---- postfix-2.8.3-orig/conf/post-install 2011-01-09 15:24:00.000000000 +0100 -+++ postfix-2.8.3/conf/post-install 2011-05-15 16:11:52.000000000 +0200 -@@ -696,7 +696,7 @@ +Index: conf/post-install +=================================================================== +--- conf/post-install.orig ++++ conf/post-install +@@ -696,7 +696,7 @@ EOF # Postfix 2.2. # Add missing tlsmgr service to master.cf. ++++++ postfix-2.8.5-ssl-release-buffers.patch -> postfix-2.8.12-ssl-release-buffers.patch ++++++ --- /work/SRC/openSUSE:Factory/postfix/postfix-2.8.5-ssl-release-buffers.patch 2011-10-11 17:16:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix-2.8.12-ssl-release-buffers.patch 2012-09-17 14:03:25.000000000 +0200 @@ -1,3 +1,5 @@ +Index: src/tls/tls_client.c +=================================================================== --- src/tls/tls_client.c.orig +++ src/tls/tls_client.c @@ -372,6 +372,12 @@ TLS_APPL_STATE *tls_client_init(const TL @@ -13,9 +15,11 @@ /* * See the verify callback in tls_verify.c */ +Index: src/tls/tls_server.c +=================================================================== --- src/tls/tls_server.c.orig +++ src/tls/tls_server.c -@@ -381,6 +381,11 @@ TLS_APPL_STATE *tls_server_init(const TL +@@ -382,6 +382,11 @@ TLS_APPL_STATE *tls_server_init(const TL tls_print_errors(); return (0); } ++++++ postfix-2.8.11.tar.bz2 -> postfix-2.8.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.11/HISTORY new/postfix-2.8.12/HISTORY --- old/postfix-2.8.11/HISTORY 2012-05-21 00:06:35.000000000 +0200 +++ new/postfix-2.8.12/HISTORY 2012-08-01 23:31:53.000000000 +0200 @@ -16829,3 +16829,20 @@ command must wait until its requests have reached the pickup and qmgr servers before closing the UNIX-domain request sockets. Files: postqueue/postqueue.c, postqueue/Makefile.in. + +20120621 + + Bugfix (introduced: Postfix 2.8): the unused "pass" trigger + client could close the wrong file descriptors. File: + util/unix_pass_trigger.c. + +20120702 + + Bugfix (introduced: 19990127): the BIFF client leaked an + unprivileged UDP socket. Fix by Jaroslav Skarvada. File: + local/biff_notify.c. + +20120730 + + Bugfix (introduced: 20000314): AUTH is not allowed after + MAIL. Timo Sirainen. File: smtpd/smtpd_sasl_proto.c. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.11/src/global/mail_version.h new/postfix-2.8.12/src/global/mail_version.h --- old/postfix-2.8.11/src/global/mail_version.h 2012-05-21 00:20:59.000000000 +0200 +++ new/postfix-2.8.12/src/global/mail_version.h 2012-08-01 23:46:34.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 "20120520" -#define MAIL_VERSION_NUMBER "2.8.11" +#define MAIL_RELEASE_DATE "20120801" +#define MAIL_VERSION_NUMBER "2.8.12" #ifdef SNAPSHOT # define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.11/src/local/biff_notify.c new/postfix-2.8.12/src/local/biff_notify.c --- old/postfix-2.8.11/src/local/biff_notify.c 2005-07-13 22:46:18.000000000 +0200 +++ new/postfix-2.8.12/src/local/biff_notify.c 2012-07-05 18:56:30.000000000 +0200 @@ -43,6 +43,7 @@ /* Utility library. */ #include <msg.h> +#include <iostuff.h> /* Application-specific. */ @@ -81,9 +82,12 @@ /* * Open a socket, or re-use an existing one. */ - if (sock < 0 && (sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - msg_warn("socket: %m"); - return; + if (sock < 0) { + if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { + msg_warn("socket: %m"); + return; + } + close_on_exec(sock, CLOSE_ON_EXEC); } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.11/src/smtpd/smtpd_sasl_proto.c new/postfix-2.8.12/src/smtpd/smtpd_sasl_proto.c --- old/postfix-2.8.11/src/smtpd/smtpd_sasl_proto.c 2011-04-20 01:07:02.000000000 +0200 +++ new/postfix-2.8.12/src/smtpd/smtpd_sasl_proto.c 2012-08-01 23:25:47.000000000 +0200 @@ -152,6 +152,12 @@ smtpd_chat_reply(state, "503 5.5.1 Error: authentication not enabled"); return (-1); } +#define IN_MAIL_TRANSACTION(state) ((state)->sender != 0) + if (IN_MAIL_TRANSACTION(state)) { + state->error_mask |= MAIL_ERROR_PROTOCOL; + smtpd_chat_reply(state, "503 5.5.1 Error: MAIL transaction in progress"); + return (-1); + } if (smtpd_milters != 0 && (err = milter_other_event(smtpd_milters)) != 0) { if (err[0] == '5') { state->error_mask |= MAIL_ERROR_POLICY; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.11/src/util/unix_pass_trigger.c new/postfix-2.8.12/src/util/unix_pass_trigger.c --- old/postfix-2.8.11/src/util/unix_pass_trigger.c 2011-01-10 01:43:52.000000000 +0100 +++ new/postfix-2.8.12/src/util/unix_pass_trigger.c 2012-06-21 15:41:58.000000000 +0200 @@ -63,7 +63,7 @@ struct unix_pass_trigger { int fd; char *service; - int *pair; + int pair[2]; }; /* unix_pass_trigger_event - disconnect from peer */ @@ -129,7 +129,8 @@ up = (struct unix_pass_trigger *) mymalloc(sizeof(*up)); up->fd = fd; up->service = mystrdup(service); - up->pair = pair; + up->pair[0] = pair[0]; + up->pair[1] = pair[1]; /* * Write the request... ++++++ postfix-SuSE.tar.gz ++++++ 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 2011-05-11 10:30:56.000000000 +0200 +++ new/postfix-SuSE/ldap_aliases.cf 2012-08-10 20:31:41.000000000 +0200 @@ -2,3 +2,4 @@ search_base = dc=mail,dc=net query_filter = (&(|(mail=%s)(mailAlternateAddress=%s))(objectClass=posixAccount)) result_attribute = uid +version = 3 ++++++ postfix-vda-v10-2.8.9.patch -> postfix-vda-v10-2.8.12.patch ++++++ --- /work/SRC/openSUSE:Factory/postfix/postfix-vda-v10-2.8.9.patch 2012-05-08 12:28:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix-vda-v10-2.8.12.patch 2012-09-17 14:03:25.000000000 +0200 @@ -1,21 +1,22 @@ -diff -uNr postfix-2.8.9.orig/README_FILES/VDA_README postfix-2.8.9/README_FILES/VDA_README ---- postfix-2.8.9.orig/README_FILES/VDA_README 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.8.9/README_FILES/VDA_README 2011-03-03 08:26:48.000000000 +0100 -@@ -0,0 +1,10 @@ -+Postfix VDA patch for maildir++ quota support by +Index: README_FILES/VDA_README +=================================================================== +--- /dev/null ++++ README_FILES/VDA_README +@@ -0,0 +1,9 @@ ++Postfix VDA patch for maildir++ quota support by + Anderson Nadal <[email protected]> + Tomas Macek <[email protected]> + Lucca Longinotti + +See VDA patch official website http://vda.sf.net for instructions -+howto patch the Postfix's sourcetree and configure the options ++howto patch the Postfix's sourcetree and configure the options +provided by this patch. + -+ -diff -uNr postfix-2.8.9.orig/src/global/mail_params.h postfix-2.8.9/src/global/mail_params.h ---- postfix-2.8.9.orig/src/global/mail_params.h 2011-01-17 15:56:39.000000000 +0100 -+++ postfix-2.8.9/src/global/mail_params.h 2011-03-03 07:40:55.000000000 +0100 -@@ -2333,6 +2333,54 @@ +Index: src/global/mail_params.h +=================================================================== +--- src/global/mail_params.h.orig ++++ src/global/mail_params.h +@@ -2333,6 +2333,54 @@ extern char *var_virt_uid_maps; #define DEF_VIRT_GID_MAPS "" extern char *var_virt_gid_maps; @@ -70,10 +71,11 @@ #define VAR_VIRT_MINUID "virtual_minimum_uid" #define DEF_VIRT_MINUID 100 extern int var_virt_minimum_uid; -diff -uNr postfix-2.8.9.orig/src/util/file_limit.c postfix-2.8.9/src/util/file_limit.c ---- postfix-2.8.9.orig/src/util/file_limit.c 2003-10-22 20:48:36.000000000 +0200 -+++ postfix-2.8.9/src/util/file_limit.c 2011-03-03 07:40:55.000000000 +0100 -@@ -85,7 +85,11 @@ +Index: src/util/file_limit.c +=================================================================== +--- src/util/file_limit.c.orig ++++ src/util/file_limit.c +@@ -85,7 +85,11 @@ void set_file_limit(off_t limit) #else struct rlimit rlim; @@ -86,9 +88,10 @@ if (setrlimit(RLIMIT_FSIZE, &rlim) < 0) msg_fatal("setrlimit: %m"); #ifdef SIGXFSZ -diff -uNr postfix-2.8.9.orig/src/virtual/mailbox.c postfix-2.8.9/src/virtual/mailbox.c ---- postfix-2.8.9.orig/src/virtual/mailbox.c 2008-07-26 03:22:37.000000000 +0200 -+++ postfix-2.8.9/src/virtual/mailbox.c 2011-03-03 07:40:55.000000000 +0100 +Index: src/virtual/mailbox.c +=================================================================== +--- src/virtual/mailbox.c.orig ++++ src/virtual/mailbox.c @@ -70,6 +70,70 @@ #define YES 1 #define NO 0 @@ -160,7 +163,7 @@ /* deliver_mailbox_file - deliver to recipient mailbox */ static int deliver_mailbox_file(LOCAL_STATE state, USER_ATTR usr_attr) -@@ -213,62 +277,72 @@ +@@ -213,62 +277,72 @@ int deliver_mailbox(LOCAL_STATE stat * Look up the mailbox owner rights. Defer in case of trouble. */ uid_res = mail_addr_find(virtual_uid_maps, state.msg_attr.user, @@ -268,9 +271,10 @@ /* * Cleanup. -diff -uNr postfix-2.8.9.orig/src/virtual/maildir.c postfix-2.8.9/src/virtual/maildir.c ---- postfix-2.8.9.orig/src/virtual/maildir.c 2006-06-26 14:59:19.000000000 +0200 -+++ postfix-2.8.9/src/virtual/maildir.c 2011-03-03 08:15:42.000000000 +0100 +Index: src/virtual/maildir.c +=================================================================== +--- src/virtual/maildir.c.orig ++++ src/virtual/maildir.c @@ -63,28 +63,420 @@ #include <mbox_open.h> #include <dsn_util.h> @@ -320,27 +324,27 @@ + int len, first; + long sum = 0, count = 0, ret_value = -1; + -+ if (msg_verbose) ++ if (msg_verbose) + msg_info("%s: we will use sizefile = '%s'", myname, filename); -+ ++ + sizefile = vstream_fopen(filename, O_RDONLY, 0); + if (!sizefile) { + if (msg_verbose) + msg_info("%s: cannot open %s: %m (maybe file does not exist)", myname, filename); -+ ++ + return -1; + } else if (stat(filename, &statbuf) < 0 || statbuf.st_size > SIZEFILE_MAX) { + if (sizefile) { + vstream_fclose(sizefile); + unlink(filename); + } -+ -+ if (msg_verbose) ++ ++ if (msg_verbose) + msg_info("%s: stat() returned < 0 or filesize > SIZEFILE_MAX (filename = %s, filesize = %ld)", myname, filename, statbuf.st_size); -+ ++ + return -1; + } -+ ++ + VSTRING *sizebuf = vstring_alloc(SIZEFILE_MAX); + len = vstream_fread(sizefile, STR(sizebuf), SIZEFILE_MAX); + @@ -382,24 +386,25 @@ + + *countptr = count; + *sumptr = sum; -+ ++ + if (sum < 0 || count < 0 || (sum == 0 && count != 0) || (sum != 0 && count == 0)) { + if (msg_verbose) { + msg_info("%s: we will return -1 and unlink %s, because file count or sum is <= 0 (sum = %ld, count = %ld)", myname, filename, sum, count); + } -+ ++ + unlink(filename); + ret_value = -1; + } else { -+ if (msg_verbose) ++ if (msg_verbose) + msg_info("%s: we will return Maildir size = %ld, count = %ld", myname, *sumptr, *countptr); + -+ ret_value = sum; ++ ret_value = sum; + } -+ + +-int deliver_maildir(LOCAL_STATE state, USER_ATTR usr_attr) + vstream_fclose(sizefile); + vstring_free(sizebuf); -+ ++ + return ret_value; +} + @@ -549,8 +554,7 @@ + } + } + closedir(dir); - --int deliver_maildir(LOCAL_STATE state, USER_ATTR usr_attr) ++ + if (msg_verbose) + msg_info("%s: full scan done: dir=%s sum=%ld count=%ld", myname, dirname, sum, *countptr); + @@ -704,7 +708,7 @@ GETTIMEOFDAY(&starttime); -@@ -93,15 +485,14 @@ +@@ -93,15 +485,14 @@ int deliver_maildir(LOCAL_STATE stat */ state.level++; if (msg_verbose) @@ -723,7 +727,7 @@ } /* -@@ -109,18 +500,116 @@ +@@ -109,17 +500,115 @@ int deliver_maildir(LOCAL_STATE stat * attribute to reflect the final recipient. */ if (vstream_fseek(state.msg_attr.fp, state.msg_attr.offset, SEEK_SET) < 0) @@ -756,7 +760,7 @@ + tmpdir = concatenate(tmpdir, "tmp/", (char *) 0); + curdir = concatenate(curdir, "cur/", (char *) 0); + } - ++ + /* get the sizefilename, no matter if we use var_virt_maildir_extended */ + if (*var_virt_maildir_suffix == 0) { + sizefilename = concatenate(usr_attr.mailbox, "maildirsize", (char *) 0); @@ -764,7 +768,7 @@ + sizefilename = concatenate(usr_attr.mailbox, var_virt_maildir_suffix, (char *) 0); + sizefilename = concatenate(sizefilename, "maildirsize", (char *) 0); + } -+ ++ + /* + * Look up the virtual maildir limit size for this user. + * Fall back to virtual_mailbox_limit in case lookup failed. @@ -797,7 +801,7 @@ + } + else { + if (msg_verbose) -+ msg_info("%s: quota is negative (%ld), using default virtual_mailbox_limit (%d)", ++ msg_info("%s: quota is negative (%ld), using default virtual_mailbox_limit (%d)", + myname, n, var_virt_mailbox_limit); + /* Invalid limit size (negative). Use default virtual_mailbox_limit. */ + n = var_virt_mailbox_limit; @@ -805,7 +809,7 @@ + } + else { + if (msg_verbose) -+ msg_info("%s: no limit found in the maps, using default virtual_mailbox_limit (%d)", ++ msg_info("%s: no limit found in the maps, using default virtual_mailbox_limit (%d)", + myname, var_virt_mailbox_limit); + /* There is no limit in the maps. Use default virtual_mailbox_limit. */ + n = var_virt_mailbox_limit; @@ -821,14 +825,14 @@ + if (msg_verbose) + msg_info("%s: maildirsize used=%s sum=%ld count=%ld", myname, sizefilename, saved_size, saved_count); + } else { -+ if (msg_verbose) -+ msg_info("%s: We will recount the quota (var_virt_mailbox_limit = %d, var_virt_maildir_extended = %d, read_maildirsize = %d)", ++ if (msg_verbose) ++ msg_info("%s: We will recount the quota (var_virt_mailbox_limit = %d, var_virt_maildir_extended = %d, read_maildirsize = %d)", + myname, var_virt_mailbox_limit, var_virt_maildir_extended, read_mds); + + /* sanity */ -+ saved_size = 0; ++ saved_size = 0; + saved_count = 0; -+ ++ + if (var_virt_mailbox_limit_inbox) { + /* Check Inbox only (new, cur and tmp dirs). */ + saved_size = check_dir_size(newdir, &saved_count); @@ -840,13 +844,12 @@ + } + + set_eugid(var_owner_uid, var_owner_gid); -+ } ++ } + } -+ + /* * Create and write the file as the recipient, so that file quota work. - * Create any missing directories on the fly. The file name is chosen -@@ -174,46 +663,288 @@ +@@ -174,46 +663,288 @@ int deliver_maildir(LOCAL_STATE stat * [...] */ set_eugid(usr_attr.uid, usr_attr.gid); @@ -1172,7 +1175,7 @@ } set_eugid(var_owner_uid, var_owner_gid); -@@ -223,31 +954,64 @@ +@@ -223,31 +954,64 @@ int deliver_maildir(LOCAL_STATE stat * location possibly under user control. */ if (mail_copy_status & MAIL_COPY_STAT_CORRUPT) { @@ -1230,11 +1233,11 @@ + deliver_status = + (STR(why->status)[0] == '4' ? defer_append : bounce_append) + (BOUNCE_FLAGS(state.request), BOUNCE_ATTR(state.msg_attr)); - } ++ } + else { + dsb_simple(why, "2.0.0", "delivered to maildir"); + deliver_status = sent(BOUNCE_FLAGS(state.request), SENT_ATTR(state.msg_attr)); -+ } + } + vstring_free(buf); + @@ -1256,10 +1259,11 @@ + return (deliver_status); } -diff -uNr postfix-2.8.9.orig/src/virtual/virtual.c postfix-2.8.9/src/virtual/virtual.c ---- postfix-2.8.9.orig/src/virtual/virtual.c 2010-01-02 02:57:04.000000000 +0100 -+++ postfix-2.8.9/src/virtual/virtual.c 2011-03-03 07:40:55.000000000 +0100 -@@ -335,12 +335,30 @@ +Index: src/virtual/virtual.c +=================================================================== +--- src/virtual/virtual.c.orig ++++ src/virtual/virtual.c +@@ -335,12 +335,30 @@ int var_virt_mailbox_limit; char *var_mail_spool_dir; /* XXX dependency fix */ bool var_strict_mbox_owner; @@ -1290,7 +1294,7 @@ /* * Bit masks. -@@ -450,15 +468,28 @@ +@@ -450,15 +468,28 @@ static void post_init(char *unused_name, */ virtual_mailbox_maps = maps_create(VAR_VIRT_MAILBOX_MAPS, var_virt_mailbox_maps, @@ -1322,7 +1326,7 @@ virtual_mbox_lock_mask = mbox_lock_mask(var_virt_mailbox_lock); } -@@ -495,24 +526,39 @@ +@@ -495,24 +526,39 @@ MAIL_VERSION_STAMP_DECLARE; int main(int argc, char **argv) { @@ -1380,7 +1384,7 @@ /* * Fingerprint executables and core dumps. -@@ -526,6 +572,7 @@ +@@ -526,6 +572,7 @@ int main(int argc, char **argv) MAIL_SERVER_PRE_INIT, pre_init, MAIL_SERVER_POST_INIT, post_init, MAIL_SERVER_PRE_ACCEPT, pre_accept, @@ -1388,9 +1392,10 @@ MAIL_SERVER_PRIVILEGED, 0); } -diff -uNr postfix-2.8.9.orig/src/virtual/virtual.h postfix-2.8.9/src/virtual/virtual.h ---- postfix-2.8.9.orig/src/virtual/virtual.h 2006-01-08 00:59:47.000000000 +0100 -+++ postfix-2.8.9/src/virtual/virtual.h 2011-03-03 07:40:55.000000000 +0100 +Index: src/virtual/virtual.h +=================================================================== +--- src/virtual/virtual.h.orig ++++ src/virtual/virtual.h @@ -34,6 +34,9 @@ extern MAPS *virtual_mailbox_maps; extern MAPS *virtual_uid_maps; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
