forked from pool/postfix
Accepting request 75002 from home:computersalat:devel:mail
some master.cf fixes OBS-URL: https://build.opensuse.org/request/show/75002 OBS-URL: https://build.opensuse.org/package/show/server:mail/postfix?expand=0&rev=82
This commit is contained in:
Christian Wittmer
Git OBS Bridge
parent
7c6e0902d2
commit
066d28c93b
@ -1,6 +1,6 @@
|
||||
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-05-17 23:56:45.000000000 +0200
|
||||
+++ postfix-2.8.3/conf/master.cf 2011-07-01 14:30:23.000000000 +0200
|
||||
@@ -9,6 +9,11 @@
|
||||
# (yes) (yes) (yes) (never) (100)
|
||||
# ==========================================================================
|
||||
@ -33,7 +33,7 @@ diff -ruN postfix-2.8.3-orig/conf/master.cf postfix-2.8.3/conf/master.cf
|
||||
+# -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 receive_override_options=no_unknown_recipient_checks,no_header_body_checks,no_address_mappings
|
||||
+# -o local_header_rewrite_clients=
|
||||
+# -o local_recipient_maps=
|
||||
+# -o relay_recipient_maps=
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -ruN postfix-SuSE-orig/SuSEconfig.postfix postfix-SuSE/SuSEconfig.postfix
|
||||
--- postfix-SuSE-orig/SuSEconfig.postfix 2011-05-11 10:30:56.000000000 +0200
|
||||
+++ postfix-SuSE/SuSEconfig.postfix 2011-05-18 00:29:48.000000000 +0200
|
||||
diff -ruN postfix-SuSE-orig//SuSEconfig.postfix postfix-SuSE/SuSEconfig.postfix
|
||||
--- postfix-SuSE-orig//SuSEconfig.postfix 2011-05-11 10:30:56.000000000 +0200
|
||||
+++ postfix-SuSE/SuSEconfig.postfix 2011-07-01 14:34:26.000000000 +0200
|
||||
@@ -143,7 +143,6 @@
|
||||
if [ "$CAPATH" ]
|
||||
then
|
||||
@ -126,10 +126,19 @@ diff -ruN postfix-SuSE-orig/SuSEconfig.postfix postfix-SuSE/SuSEconfig.postfix
|
||||
}
|
||||
} elsif ( /\#?\s\s(-o\s+smtpd_helo_restrictions=.*)/) {
|
||||
if ( $use_amavis ne "yes" ) {
|
||||
diff -ruN postfix-SuSE-orig/sysconfig.postfix postfix-SuSE/sysconfig.postfix
|
||||
--- postfix-SuSE-orig/sysconfig.postfix 2011-05-11 10:30:56.000000000 +0200
|
||||
+++ postfix-SuSE/sysconfig.postfix 2011-05-18 00:28:16.000000000 +0200
|
||||
@@ -198,9 +198,8 @@
|
||||
@@ -991,7 +1010,7 @@
|
||||
$line = " ".$1;
|
||||
if( $line !~ /receive_override_options=no_unknown_recipient_checks,no_header_body_checks/ )
|
||||
{
|
||||
- $line .= " -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks,no_address_mappings";
|
||||
+ $line = " -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks,no_address_mappings";
|
||||
}
|
||||
}
|
||||
} elsif ( /\#?\s\s(-o\s+local_header_rewrite_clients=.*)/) {
|
||||
diff -ruN postfix-SuSE-orig//sysconfig.postfix postfix-SuSE/sysconfig.postfix
|
||||
--- postfix-SuSE-orig//sysconfig.postfix 2011-05-11 10:30:56.000000000 +0200
|
||||
+++ postfix-SuSE/sysconfig.postfix 2011-07-01 14:33:33.000000000 +0200
|
||||
@@ -198,22 +198,10 @@
|
||||
# Note: This only has effect, if POSTFIX_BASIC_SPAM_PREVENTION is set
|
||||
# to either "medium" or "hard" or "custom". If left empty, no RBL checks will take place.
|
||||
#
|
||||
@ -139,8 +148,21 @@ diff -ruN postfix-SuSE-orig/sysconfig.postfix postfix-SuSE/sysconfig.postfix
|
||||
-#POSTFIX_RBL_HOSTS="zen.spamhaus.org, cbl.abuseat.org, dnsbl.sorbs.net, dnsbl.ahbl.org"
|
||||
POSTFIX_RBL_HOSTS=""
|
||||
|
||||
## Type: yesno
|
||||
@@ -287,7 +286,7 @@
|
||||
-## Type: yesno
|
||||
-## Default: no
|
||||
-## Config: postfix
|
||||
-#
|
||||
-# Set this to yes, if SuSEconfig should setup 'pop-before-smtp' checks
|
||||
-#
|
||||
-# Note: You should set this to yes if you have Dyn-IP Clients who want to
|
||||
-# relay their mail, POP3 or IMAP user
|
||||
-#
|
||||
-#POSTFIX_WITH_POP_BEFORE_SMTP="no"
|
||||
-
|
||||
## Type: string(off,medium,hard)
|
||||
## Default: off
|
||||
## Config: postfix
|
||||
@@ -287,7 +275,7 @@
|
||||
# Note: "if set to "medium" default is "hash:/etc/postfix/access, reject_unknown_sender_domain"
|
||||
#
|
||||
# Example:
|
||||
@ -149,7 +171,7 @@ diff -ruN postfix-SuSE-orig/sysconfig.postfix postfix-SuSE/sysconfig.postfix
|
||||
# check_client_access hash:/etc/postfix/pop-before-smtp,
|
||||
# check_client_access hash:/etc/postfix/relay,
|
||||
# check_client_access hash:/etc/postfix/access,
|
||||
@@ -414,7 +413,12 @@
|
||||
@@ -414,7 +402,12 @@
|
||||
## Default: "cacert.pem"
|
||||
## Config: postfix
|
||||
#
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -uNr postfix-2.8.1.orig/README_FILES/VDA_README postfix-2.8.1/README_FILES/VDA_README
|
||||
--- postfix-2.8.1.orig/README_FILES/VDA_README 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ postfix-2.8.1/README_FILES/VDA_README 2011-03-03 08:26:48.000000000 +0100
|
||||
diff -uNr postfix-2.8.3.orig/README_FILES/VDA_README postfix-2.8.3/README_FILES/VDA_README
|
||||
--- postfix-2.8.3.orig/README_FILES/VDA_README 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ postfix-2.8.3/README_FILES/VDA_README 2011-03-03 08:26:48.000000000 +0100
|
||||
@@ -0,0 +1,10 @@
|
||||
+Postfix VDA patch for maildir++ quota support by
|
||||
+ Anderson Nadal <andernadal@gmail.com>
|
||||
@ -12,9 +12,9 @@ diff -uNr postfix-2.8.1.orig/README_FILES/VDA_README postfix-2.8.1/README_FILES/
|
||||
+provided by this patch.
|
||||
+
|
||||
+
|
||||
diff -uNr postfix-2.8.1.orig/src/global/mail_params.h postfix-2.8.1/src/global/mail_params.h
|
||||
--- postfix-2.8.1.orig/src/global/mail_params.h 2011-01-17 15:56:39.000000000 +0100
|
||||
+++ postfix-2.8.1/src/global/mail_params.h 2011-03-03 07:40:55.000000000 +0100
|
||||
diff -uNr postfix-2.8.3.orig/src/global/mail_params.h postfix-2.8.3/src/global/mail_params.h
|
||||
--- postfix-2.8.3.orig/src/global/mail_params.h 2011-01-17 15:56:39.000000000 +0100
|
||||
+++ postfix-2.8.3/src/global/mail_params.h 2011-03-03 07:40:55.000000000 +0100
|
||||
@@ -2333,6 +2333,54 @@
|
||||
#define DEF_VIRT_GID_MAPS ""
|
||||
extern char *var_virt_gid_maps;
|
||||
@ -70,9 +70,9 @@ diff -uNr postfix-2.8.1.orig/src/global/mail_params.h postfix-2.8.1/src/global/m
|
||||
#define VAR_VIRT_MINUID "virtual_minimum_uid"
|
||||
#define DEF_VIRT_MINUID 100
|
||||
extern int var_virt_minimum_uid;
|
||||
diff -uNr postfix-2.8.1.orig/src/util/file_limit.c postfix-2.8.1/src/util/file_limit.c
|
||||
--- postfix-2.8.1.orig/src/util/file_limit.c 2003-10-22 20:48:36.000000000 +0200
|
||||
+++ postfix-2.8.1/src/util/file_limit.c 2011-03-03 07:40:55.000000000 +0100
|
||||
diff -uNr postfix-2.8.3.orig/src/util/file_limit.c postfix-2.8.3/src/util/file_limit.c
|
||||
--- postfix-2.8.3.orig/src/util/file_limit.c 2003-10-22 20:48:36.000000000 +0200
|
||||
+++ postfix-2.8.3/src/util/file_limit.c 2011-03-03 07:40:55.000000000 +0100
|
||||
@@ -85,7 +85,11 @@
|
||||
#else
|
||||
struct rlimit rlim;
|
||||
@ -86,9 +86,9 @@ diff -uNr postfix-2.8.1.orig/src/util/file_limit.c postfix-2.8.1/src/util/file_l
|
||||
if (setrlimit(RLIMIT_FSIZE, &rlim) < 0)
|
||||
msg_fatal("setrlimit: %m");
|
||||
#ifdef SIGXFSZ
|
||||
diff -uNr postfix-2.8.1.orig/src/virtual/mailbox.c postfix-2.8.1/src/virtual/mailbox.c
|
||||
--- postfix-2.8.1.orig/src/virtual/mailbox.c 2008-07-26 03:22:37.000000000 +0200
|
||||
+++ postfix-2.8.1/src/virtual/mailbox.c 2011-03-03 07:40:55.000000000 +0100
|
||||
diff -uNr postfix-2.8.3.orig/src/virtual/mailbox.c postfix-2.8.3/src/virtual/mailbox.c
|
||||
--- postfix-2.8.3.orig/src/virtual/mailbox.c 2008-07-26 03:22:37.000000000 +0200
|
||||
+++ postfix-2.8.3/src/virtual/mailbox.c 2011-03-03 07:40:55.000000000 +0100
|
||||
@@ -70,6 +70,70 @@
|
||||
#define YES 1
|
||||
#define NO 0
|
||||
@ -268,9 +268,9 @@ diff -uNr postfix-2.8.1.orig/src/virtual/mailbox.c postfix-2.8.1/src/virtual/mai
|
||||
|
||||
/*
|
||||
* Cleanup.
|
||||
diff -uNr postfix-2.8.1.orig/src/virtual/maildir.c postfix-2.8.1/src/virtual/maildir.c
|
||||
--- postfix-2.8.1.orig/src/virtual/maildir.c 2006-06-26 14:59:19.000000000 +0200
|
||||
+++ postfix-2.8.1/src/virtual/maildir.c 2011-03-03 08:15:42.000000000 +0100
|
||||
diff -uNr postfix-2.8.3.orig/src/virtual/maildir.c postfix-2.8.3/src/virtual/maildir.c
|
||||
--- postfix-2.8.3.orig/src/virtual/maildir.c 2006-06-26 14:59:19.000000000 +0200
|
||||
+++ postfix-2.8.3/src/virtual/maildir.c 2011-03-03 08:15:42.000000000 +0100
|
||||
@@ -63,28 +63,420 @@
|
||||
#include <mbox_open.h>
|
||||
#include <dsn_util.h>
|
||||
@ -1256,9 +1256,9 @@ diff -uNr postfix-2.8.1.orig/src/virtual/maildir.c postfix-2.8.1/src/virtual/mai
|
||||
+
|
||||
return (deliver_status);
|
||||
}
|
||||
diff -uNr postfix-2.8.1.orig/src/virtual/virtual.c postfix-2.8.1/src/virtual/virtual.c
|
||||
--- postfix-2.8.1.orig/src/virtual/virtual.c 2010-01-02 02:57:04.000000000 +0100
|
||||
+++ postfix-2.8.1/src/virtual/virtual.c 2011-03-03 07:40:55.000000000 +0100
|
||||
diff -uNr postfix-2.8.3.orig/src/virtual/virtual.c postfix-2.8.3/src/virtual/virtual.c
|
||||
--- postfix-2.8.3.orig/src/virtual/virtual.c 2010-01-02 02:57:04.000000000 +0100
|
||||
+++ postfix-2.8.3/src/virtual/virtual.c 2011-03-03 07:40:55.000000000 +0100
|
||||
@@ -335,12 +335,30 @@
|
||||
char *var_mail_spool_dir; /* XXX dependency fix */
|
||||
bool var_strict_mbox_owner;
|
||||
@ -1388,9 +1388,9 @@ diff -uNr postfix-2.8.1.orig/src/virtual/virtual.c postfix-2.8.1/src/virtual/vir
|
||||
MAIL_SERVER_PRIVILEGED,
|
||||
0);
|
||||
}
|
||||
diff -uNr postfix-2.8.1.orig/src/virtual/virtual.h postfix-2.8.1/src/virtual/virtual.h
|
||||
--- postfix-2.8.1.orig/src/virtual/virtual.h 2006-01-08 00:59:47.000000000 +0100
|
||||
+++ postfix-2.8.1/src/virtual/virtual.h 2011-03-03 07:40:55.000000000 +0100
|
||||
diff -uNr postfix-2.8.3.orig/src/virtual/virtual.h postfix-2.8.3/src/virtual/virtual.h
|
||||
--- postfix-2.8.3.orig/src/virtual/virtual.h 2006-01-08 00:59:47.000000000 +0100
|
||||
+++ postfix-2.8.3/src/virtual/virtual.h 2011-03-03 07:40:55.000000000 +0100
|
||||
@@ -34,6 +34,9 @@
|
||||
extern MAPS *virtual_mailbox_maps;
|
||||
extern MAPS *virtual_uid_maps;
|
||||
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 1 12:35:59 UTC 2011 - chris@computersalat.de
|
||||
|
||||
- rework master.cf patch
|
||||
o fix receive_override_options line
|
||||
- rework SuSE patch
|
||||
o sysconfig: remove POSTFIX_WITH_POP_BEFORE_SMTP
|
||||
o SuSEconfig: fix receive_override_options line
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 30 20:15:40 UTC 2011 - chris@computersalat.de
|
||||
|
||||
- replace vda patch
|
||||
o 2.8.1 -> 2.8.3
|
||||
- fix files doc
|
||||
o remove 'doc auxiliary'
|
||||
instead cp to pf_docdir
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat May 28 04:22:22 UTC 2011 - varkoly@novell.com
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@ 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.1.patch
|
||||
Patch20: %{name}-vda-v10-2.8.3.patch
|
||||
Patch30: %{name}-SuSE.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
PreReq: %insserv_prereq %fillup_prereq
|
||||
@ -293,6 +293,7 @@ for example in AIX42 BSDI* F* HPUX* IRIX* NETBSD1 NEXTSTEP3 OPENSTEP4 OSF1 Solar
|
||||
done
|
||||
cp -a examples/* $RPM_BUILD_ROOT%{pf_sample_directory}
|
||||
cp -a html/* $RPM_BUILD_ROOT%{pf_html_directory}
|
||||
cp -a auxiliary/ $RPM_BUILD_ROOT%{pf_docdir}/
|
||||
%if 0%{?suse_version} >= 1100
|
||||
%fdupes $RPM_BUILD_ROOT%{pf_docdir}
|
||||
%fdupes $RPM_BUILD_ROOT%{_mandir}
|
||||
@ -491,7 +492,6 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files doc
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc auxiliary
|
||||
%{pf_docdir}/
|
||||
|
||||
%files mysql
|
||||
|
||||
Loading…
Reference in New Issue
Block a user