New version
- Re-enabled IPv6 in the config Resolves: rhbz#863140
This commit is contained in:
Jaroslav Škarvada
parent
e44fdbfc3f
commit
61b46d4809
|
|
@ -1,6 +1,7 @@
|
|||
diff -up postfix-2.7.0/conf/main.cf.config postfix-2.7.0/conf/main.cf
|
||||
--- postfix-2.7.0/conf/main.cf.config 2007-12-18 14:50:25.000000000 +0100
|
||||
+++ postfix-2.7.0/conf/main.cf 2010-02-26 12:28:14.000000000 +0100
|
||||
diff --git a/conf/main.cf b/conf/main.cf
|
||||
index 8d301aa..57e865f 100644
|
||||
--- a/conf/main.cf
|
||||
+++ b/conf/main.cf
|
||||
@@ -113,6 +113,10 @@ mail_owner = postfix
|
||||
#inet_interfaces = all
|
||||
#inet_interfaces = $myhostname
|
||||
|
|
@ -21,7 +22,7 @@ diff -up postfix-2.7.0/conf/main.cf.config postfix-2.7.0/conf/main.cf
|
|||
#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
|
||||
#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,
|
||||
# mail.$mydomain, www.$mydomain, ftp.$mydomain
|
||||
@@ -379,7 +383,7 @@ unknown_local_recipient_reject_code = 55
|
||||
@@ -379,7 +383,7 @@ unknown_local_recipient_reject_code = 550
|
||||
# "postfix reload" to eliminate the delay.
|
||||
#
|
||||
#alias_maps = dbm:/etc/aliases
|
||||
|
|
@ -30,7 +31,7 @@ diff -up postfix-2.7.0/conf/main.cf.config postfix-2.7.0/conf/main.cf
|
|||
#alias_maps = hash:/etc/aliases, nis:mail.aliases
|
||||
#alias_maps = netinfo:/aliases
|
||||
|
||||
@@ -390,7 +394,7 @@ unknown_local_recipient_reject_code = 55
|
||||
@@ -390,7 +394,7 @@ unknown_local_recipient_reject_code = 550
|
||||
#
|
||||
#alias_database = dbm:/etc/aliases
|
||||
#alias_database = dbm:/etc/mail/aliases
|
||||
|
|
@ -39,7 +40,7 @@ diff -up postfix-2.7.0/conf/main.cf.config postfix-2.7.0/conf/main.cf
|
|||
#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
|
||||
|
||||
# ADDRESS EXTENSIONS (e.g., user+foo)
|
||||
@@ -458,7 +462,27 @@ unknown_local_recipient_reject_code = 55
|
||||
@@ -460,7 +464,27 @@ unknown_local_recipient_reject_code = 550
|
||||
#
|
||||
# Cyrus IMAP over LMTP. Specify ``lmtpunix cmd="lmtpd"
|
||||
# listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf.
|
||||
|
|
@ -68,7 +69,7 @@ diff -up postfix-2.7.0/conf/main.cf.config postfix-2.7.0/conf/main.cf
|
|||
#
|
||||
# Cyrus IMAP via command line. Uncomment the "cyrus...pipe" and
|
||||
# subsequent line in master.cf.
|
||||
@@ -475,8 +501,7 @@ unknown_local_recipient_reject_code = 55
|
||||
@@ -480,8 +504,7 @@ unknown_local_recipient_reject_code = 550
|
||||
# the main.cf file, otherwise the SMTP server will reject mail for
|
||||
# non-UNIX accounts with "User unknown in local recipient table".
|
||||
#
|
||||
|
|
@ -78,10 +79,16 @@ diff -up postfix-2.7.0/conf/main.cf.config postfix-2.7.0/conf/main.cf
|
|||
#fallback_transport =
|
||||
|
||||
# The luser_relay parameter specifies an optional destination address
|
||||
diff -up postfix-2.7.0/conf/master.cf.config postfix-2.7.0/conf/master.cf
|
||||
--- postfix-2.7.0/conf/master.cf.config 2010-02-03 22:01:27.000000000 +0100
|
||||
+++ postfix-2.7.0/conf/master.cf 2010-02-26 12:31:55.000000000 +0100
|
||||
@@ -80,14 +80,14 @@ scache unix - - n
|
||||
@@ -654,4 +677,3 @@ sample_directory =
|
||||
# readme_directory: The location of the Postfix README files.
|
||||
#
|
||||
readme_directory =
|
||||
-inet_protocols = ipv4
|
||||
diff --git a/conf/master.cf b/conf/master.cf
|
||||
index acc67d7..bc15d38 100644
|
||||
--- a/conf/master.cf
|
||||
+++ b/conf/master.cf
|
||||
@@ -92,14 +92,14 @@ scache unix - - n - 1 scache
|
||||
# Also specify in main.cf: cyrus_destination_recipient_limit=1
|
||||
#
|
||||
#cyrus unix - n n - - pipe
|
||||
15
postfix.spec
15
postfix.spec
|
|
@ -9,8 +9,6 @@
|
|||
|
||||
%global sysv2systemdnvr 2.8.12-2
|
||||
|
||||
%global prerelease -RC1
|
||||
|
||||
# hardened build if not overrided
|
||||
%{!?_hardened_build:%global _hardened_build 1}
|
||||
|
||||
|
|
@ -40,7 +38,7 @@
|
|||
Name: postfix
|
||||
Summary: Postfix Mail Transport Agent
|
||||
Version: 2.10.0
|
||||
Release: 0.3.rc1%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Epoch: 2
|
||||
Group: System Environment/Daemons
|
||||
URL: http://www.postfix.org
|
||||
|
|
@ -54,7 +52,7 @@ Requires(preun): systemd
|
|||
Requires(postun): systemd
|
||||
Provides: MTA smtpd smtpdaemon server(smtp)
|
||||
|
||||
Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}%{?prerelease}.tar.gz
|
||||
Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
|
||||
Source1: postfix-etc-init.d-postfix
|
||||
Source2: postfix.service
|
||||
Source3: README-Postfix-SASL-RedHat.txt
|
||||
|
|
@ -77,7 +75,7 @@ Source101: postfix-pam.conf
|
|||
|
||||
# Patches
|
||||
|
||||
Patch1: postfix-2.7.0-config.patch
|
||||
Patch1: postfix-2.10.0-config.patch
|
||||
Patch2: postfix-2.6.1-files.patch
|
||||
Patch3: postfix-alternatives.patch
|
||||
Patch8: postfix-large-fs.patch
|
||||
|
|
@ -136,7 +134,7 @@ warnings, errors and panics.
|
|||
qshape prints Postfix queue domain and age distribution.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}%{?prerelease}
|
||||
%setup -q
|
||||
# Apply obligatory patches
|
||||
%patch1 -p1 -b .config
|
||||
%patch2 -p1 -b .files
|
||||
|
|
@ -526,6 +524,11 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Mar 21 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 2:2.10.0-1
|
||||
- New version
|
||||
- Re-enabled IPv6 in the config
|
||||
Resolves: rhbz#863140
|
||||
|
||||
* Tue Feb 26 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 2:2.10.0-0.3.rc1
|
||||
- Added systemd-sysv to requires
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue