Hello community,
here is the log from the commit of package postfix for openSUSE:Factory
checked in at Thu May 26 10:24:06 CEST 2011.
--------
--- postfix/postfix.changes 2011-05-11 10:25:11.000000000 +0200
+++ /mounts/work_src_done/STABLE/postfix/postfix.changes 2011-05-24 12:26:19.000000000 +0200
@@ -1,0 +2,32 @@
+Tue May 24 10:24:51 UTC 2011 - varkoly@novell.com
+
+- bnc#679187 - suseconfig/postfix: missing dependency
+
+-------------------------------------------------------------------
+Tue May 17 22:31:46 UTC 2011 - chris@computersalat.de
+
+- fix master.cf
+ o fix missing
+ - amavis unix - - n - 4 smtp
+ - localhost:10025 inet n - n - - smtpd
+ o add master.cf patch
+- rework patches
+ o main.cf (add two missing sasl vars)
+ o postfix-SuSE (SuSEconfig, cleanup those vars,...)
+
+-------------------------------------------------------------------
+Sun May 15 14:16:03 UTC 2011 - chris@computersalat.de
+
+- rework TLS stuff
+ o reworked main.cf patch
+ o added postfix-SuSE patch
+ o added post-install patch
+ Editing /etc/postfix/master.cf, adding missing entry for tlsmgr service
+ add only if it really does not exist
+- removed Author from description
+- updated vda patch
+ o vda-2.7.1 > vda-v10-2.8.1
+- fix build for SLE_10
+ o no fdupes ;)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
postfix-2.7.1-main.cf.patch
postfix-vda-2.7.1.patch
New:
----
postfix-2.8.3-main.cf.patch
postfix-2.8.3-master.cf.patch
postfix-2.8.3-post-install.patch
postfix-SuSE.patch
postfix-vda-v10-2.8.1.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ postfix.spec ++++++
--- /var/tmp/diff_new_pack.wCFCMf/_old 2011-05-26 10:22:10.000000000 +0200
+++ /var/tmp/diff_new_pack.wCFCMf/_new 2011-05-26 10:22:10.000000000 +0200
@@ -21,7 +21,7 @@
Name: postfix
Summary: A fast, secure, and flexible mailer
Version: 2.8.3
-Release: 1
+Release: 7
License: IBM Public License ..
Group: Productivity/Networking/Email/Servers
Url: http://www.postfix.org/
@@ -35,25 +35,25 @@
Patch1: dynamic_maps_pie.patch
Patch2: pointer_to_literals.patch
Patch3: ipv6_disabled.patch
-Patch10: %{name}-2.7.1-main.cf.patch
-Patch11: %{name}-vda-2.7.1.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
+Patch30: %{name}-SuSE.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %insserv_prereq %fillup_prereq
PreReq: /usr/bin/getent
PreReq: /usr/sbin/useradd /usr/sbin/groupadd
PreReq: /bin/sed /bin/awk /bin/grep
PreReq: textutils sh-utils fileutils pcre netcfg
-%if 0%{?suse_version} > 1130
PreReq: sysvinit(syslog) sysvinit(network)
-%endif
+Requires: iproute2
BuildRequires: db-devel
BuildRequires: mysql-devel
BuildRequires: openldap2-devel pcre-devel postgresql-devel
# require pwdutils to make postinstall script check work
BuildRequires: pwdutils
-%if 0%{?suse_version} >= 1100
BuildRequires: fdupes
-%endif
#
Conflicts: sendmail exim
Provides: smtp_daemon
@@ -90,11 +90,6 @@
%description
Postfix aims to be an alternative to the widely-used sendmail program.
-Authors:
---------
- Wietse Venema
-
-
%package devel
Summary: Development headers for the postfix package
License: IBM Public License ..
@@ -105,11 +100,6 @@
%description devel
Postfix aims to be an alternative to the widely-used sendmail program.
-Authors:
---------
- Wietse Venema
-
-
%package doc
Summary: Documentations for the postfix package
License: IBM Public License ..
@@ -122,11 +112,6 @@
Postfix aims to be an alternative to the widely-used sendmail program.
This package contains the documentation for %{name}
-Authors:
---------
- Wietse Venema
-
-
%package mysql
Summary: Postfix plugin to support MySQL maps
License: IBM Public License ..
@@ -138,11 +123,6 @@
Postfix plugin to support MySQL maps. This library will be loaded by
starting %{name} if you'll access a postmap which is stored in mysql.
-Authors:
---------
- Wietse Venema
-
-
%package postgresql
Summary: Postfix plugin to support PostgreSQL maps
License: IBM Public License ..
@@ -155,11 +135,6 @@
by starting %{name} if you'll access a postmap which is stored in
PostgreSQL.
-Authors:
---------
- Wietse Venema
-
-
%prep
%setup -n %{name}-%{version} -a 1 -a 2
%patch -p1
@@ -168,6 +143,9 @@
%patch3 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
+%patch20 -p1
+%patch30 -p0
# ---------------------------------------------------------------------------
%build
@@ -294,9 +272,7 @@
"readme_directory = %{pf_readme_directory}" \
"html_directory = %{pf_html_directory}" \
"sample_directory = %{pf_sample_directory}" \
- "daemon_directory = %{pf_daemon_directory}" \
- "biff = no" \
- "inet_protocols = all"
+ "daemon_directory = %{pf_daemon_directory}"
#Set Permissions
install -m 644 %{name}-SuSE/%{name}-files $RPM_BUILD_ROOT/usr/lib/postfix/postfix-files
# postfix-mysql
@@ -313,8 +289,10 @@
done
cp -a examples/* $RPM_BUILD_ROOT%{pf_sample_directory}
cp -a html/* $RPM_BUILD_ROOT%{pf_html_directory}
+%if 0%{?suse_version} >= 1100
%fdupes $RPM_BUILD_ROOT%{pf_docdir}
%fdupes $RPM_BUILD_ROOT%{_mandir}
+%endif
# ---------------------------------------------------------------------------
install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/sbin/
@@ -395,6 +373,10 @@
if [ ${1:-0} -gt 1 ]; then
/usr/sbin/postfix upgrade-configuration || :
fi
+# before fillup we need to fix something
+%{__sed} -i \
+ -e "s/POSTFIX_SMTPD_SENDERNT_RESTRICTIONS/POSTFIX_SMTPD_SENDER_RESTRICTIONS/" \
+ %{_sysconfdir}/sysconfig/%{name}
%{fillup_and_insserv -y postfix}
%{fillup_only -an mail}
/sbin/ldconfig
++++++ postfix-2.7.1-main.cf.patch -> postfix-2.8.3-main.cf.patch ++++++
--- postfix/postfix-2.7.1-main.cf.patch 2011-05-11 10:33:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/postfix/postfix-2.8.3-main.cf.patch 2011-05-17 22:14:18.000000000 +0200
@@ -1,16 +1,88 @@
-diff -ruN postfix-2.7.1-orig/conf/main.cf postfix-2.7.1/conf/main.cf
---- postfix-2.7.1-orig/conf/main.cf 2007-12-18 14:50:25.000000000 +0100
-+++ postfix-2.7.1/conf/main.cf 2010-12-11 20:47:20.000000000 +0100
-@@ -649,3 +649,38 @@
+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 @@
# readme_directory: The location of the Postfix README files.
#
readme_directory =
+
++biff = no
++content_filter =
++delay_warning_time = 0h
++disable_dns_lookups = no
++disable_mime_output_conversion = no
++inet_interfaces = all
++inet_protocols = ipv4
++masquerade_classes = envelope_sender, header_sender, header_recipient
++masquerade_domains =
++masquerade_exceptions =
++mydestination = $myhostname, localhost.$mydomain
++myhostname = localhost
++mynetworks_style = subnet
++relayhost =
+
++alias_maps =
++canonical_maps =
++relocated_maps =
++sender_canonical_maps =
++transport_maps =
++mail_spool_directory = /var/mail
++message_strip_characters =
++defer_transports =
++mailbox_command =
++mailbox_transport =
++mailbox_size_limit = 0
++message_size_limit = 0
++strict_8bitmime = no
++strict_rfc821_envelopes = no
++smtpd_helo_required = no
++
++smtpd_client_restrictions =
++
++smtpd_helo_restrictions =
++
++smtpd_sender_restrictions =
++
++smtpd_recipient_restrictions =
++
++
++############################################################
++# SASL stuff
++############################################################
++smtp_sasl_auth_enable = no
++smtp_sasl_security_options =
++smtp_sasl_password_maps =
++smtpd_sasl_auth_enable = no
++############################################################
++# TLS stuff
++############################################################
++#tls_append_default_CA = no
++relay_clientcerts =
++#tls_random_source = dev:/dev/urandom
++
++smtp_use_tls = no
++#smtp_tls_loglevel = 0
++smtp_enforce_tls = no
++smtp_tls_CAfile =
++smtp_tls_CApath =
++smtp_tls_cert_file =
++smtp_tls_key_file =
++#smtp_tls_session_cache_timeout = 3600s
++smtp_tls_session_cache_database =
++
++smtpd_use_tls = no
++#smtpd_tls_loglevel = 0
++smtpd_tls_CAfile =
++smtpd_tls_CApath =
++smtpd_tls_cert_file =
++smtpd_tls_key_file =
++smtpd_tls_ask_ccert = no
++smtpd_tls_received_header = no
+############################################################
+# Start MySQL from postfixwiki.org
+############################################################
+#relay_domains = $mydestination, hash:/etc/postfix/relay
++virtual_alias_domains =
+#virtual_alias_maps = hash:/etc/postfix/virtual
+#virtual_uid_maps = static:303
+#virtual_gid_maps = static:303
@@ -39,4 +111,13 @@
+############################################################
+# End MySQL from postfixwiki.org
+############################################################
++# Rewrite reject codes
++############################################################
++#unknown_address_reject_code = 550
++#unknown_client_reject_code = 550
++#unknown_hostname_reject_code = 550
++#soft_bounce = yes
++############################################################
++#debug_peer_list = example.com
++#debug_peer_level = 3
+
++++++ postfix-2.8.3-master.cf.patch ++++++
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
@@ -9,6 +9,11 @@
# (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
#smtp inet n - n - 1 postscreen
#smtpd pass - - n - - smtpd
#dnsblog unix - - n - 0 dnsblog
@@ -50,6 +55,26 @@
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
#
# ====================================================================
@@ -84,7 +109,7 @@
# Also specify in main.cf: cyrus_destination_recipient_limit=1
#
#cyrus unix - n n - - pipe
-# user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
+# user=cyrus argv=/usr/lib/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
#
# ====================================================================
#
@@ -117,3 +142,7 @@
#mailman unix - n n - - pipe
# flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
# ${nexthop} ${user}
+#
+#procmail unix - n n - - pipe
+# flags=R user=nobody argv=/usr/bin/procmail -t -m /etc/procmailrc ${sender} ${recipient}
+#
++++++ postfix-2.8.3-post-install.patch ++++++
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 @@
# Postfix 2.2.
# Add missing tlsmgr service to master.cf.
- grep '^tlsmgr.*tlsmgr' $config_directory/master.cf >/dev/null || {
+ grep '^#*tlsmgr.*tlsmgr' $config_directory/master.cf >/dev/null || {
echo Editing $config_directory/master.cf, adding missing entry for tlsmgr service
cat >>$config_directory/master.cf <