rpms/postfix
5
0
Fork 0
Code Issues Pull Requests Releases Activity

New version

Browse Source 
Resolves: rhbz#1190797
- Defuzzified alternatives, config, large-fs patches
- Rebased files patch
This commit is contained in:
Jaroslav Škarvada 2015-03-05 18:18:50 +01:00
parent 89ea43266c
commit c26211e314
6 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
postfix-alternatives.patch → postfix-3.0.0-alternatives.patch
View File

@ -1,8 +1,8 @@
diff --git a/conf/post-install b/conf/post-install diff --git a/conf/post-install b/conf/post-install
index 7e79c92..081b015 100644 index b66b147..ba26035 100644
--- a/conf/post-install --- a/conf/post-install
+++ b/conf/post-install +++ b/conf/post-install
@@ -491,6 +491,17 @@ test -n "$create" && { @@ -526,6 +526,17 @@ test -n "$create" && {
case $path in case $path in
no|no/*) continue;; no|no/*) continue;;
esac esac

18
postfix-2.11.0-config.patch → postfix-3.0.0-config.patch
View File

@ -1,8 +1,8 @@
diff --git a/conf/main.cf b/conf/main.cf diff --git a/conf/main.cf b/conf/main.cf
index dc58a1d..e0fcc91 100644 index 1fc886b..c654dbd 100644
--- a/conf/main.cf --- a/conf/main.cf
+++ b/conf/main.cf +++ b/conf/main.cf
@@ -113,6 +113,10 @@ mail_owner = postfix @@ -132,6 +132,10 @@ mail_owner = postfix
#inet_interfaces = all #inet_interfaces = all
#inet_interfaces = $myhostname #inet_interfaces = $myhostname
#inet_interfaces = $myhostname, localhost #inet_interfaces = $myhostname, localhost
@ -13,7 +13,7 @@ index dc58a1d..e0fcc91 100644
# The proxy_interfaces parameter specifies the network interface # The proxy_interfaces parameter specifies the network interface
# addresses that this mail system receives mail on by way of a # addresses that this mail system receives mail on by way of a
@@ -157,7 +161,7 @@ mail_owner = postfix @@ -176,7 +180,7 @@ mail_owner = postfix
# #
# See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS". # See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS".
# #
@ -22,7 +22,7 @@ index dc58a1d..e0fcc91 100644
#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain, #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,
# mail.$mydomain, www.$mydomain, ftp.$mydomain # mail.$mydomain, www.$mydomain, ftp.$mydomain
@@ -379,7 +383,7 @@ unknown_local_recipient_reject_code = 550 @@ -398,7 +402,7 @@ unknown_local_recipient_reject_code = 550
# "postfix reload" to eliminate the delay. # "postfix reload" to eliminate the delay.
# #
#alias_maps = dbm:/etc/aliases #alias_maps = dbm:/etc/aliases
@ -31,7 +31,7 @@ index dc58a1d..e0fcc91 100644
#alias_maps = hash:/etc/aliases, nis:mail.aliases #alias_maps = hash:/etc/aliases, nis:mail.aliases
#alias_maps = netinfo:/aliases #alias_maps = netinfo:/aliases
@@ -390,7 +394,7 @@ unknown_local_recipient_reject_code = 550 @@ -409,7 +413,7 @@ unknown_local_recipient_reject_code = 550
# #
#alias_database = dbm:/etc/aliases #alias_database = dbm:/etc/aliases
#alias_database = dbm:/etc/mail/aliases #alias_database = dbm:/etc/mail/aliases
@ -40,7 +40,7 @@ index dc58a1d..e0fcc91 100644
#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
# ADDRESS EXTENSIONS (e.g., user+foo) # ADDRESS EXTENSIONS (e.g., user+foo)
@@ -460,7 +464,27 @@ unknown_local_recipient_reject_code = 550 @@ -479,7 +483,27 @@ unknown_local_recipient_reject_code = 550
# #
# Cyrus IMAP over LMTP. Specify ``lmtpunix cmd="lmtpd" # Cyrus IMAP over LMTP. Specify ``lmtpunix cmd="lmtpd"
# listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf. # listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf.
@ -69,7 +69,7 @@ index dc58a1d..e0fcc91 100644
# #
# Cyrus IMAP via command line. Uncomment the "cyrus...pipe" and # Cyrus IMAP via command line. Uncomment the "cyrus...pipe" and
# subsequent line in master.cf. # subsequent line in master.cf.
@@ -480,8 +504,7 @@ unknown_local_recipient_reject_code = 550 @@ -499,8 +523,7 @@ unknown_local_recipient_reject_code = 550
# the main.cf file, otherwise the SMTP server will reject mail for # the main.cf file, otherwise the SMTP server will reject mail for
# non-UNIX accounts with "User unknown in local recipient table". # non-UNIX accounts with "User unknown in local recipient table".
# #
@ -79,13 +79,13 @@ index dc58a1d..e0fcc91 100644
#fallback_transport = #fallback_transport =
# The luser_relay parameter specifies an optional destination address # The luser_relay parameter specifies an optional destination address
@@ -654,4 +677,3 @@ sample_directory = @@ -673,4 +696,3 @@ sample_directory =
# readme_directory: The location of the Postfix README files. # readme_directory: The location of the Postfix README files.
# #
readme_directory = readme_directory =
-inet_protocols = ipv4 -inet_protocols = ipv4
diff --git a/conf/master.cf b/conf/master.cf diff --git a/conf/master.cf b/conf/master.cf
index 51a3398..721b61c 100644 index 1eda7b5..10ee56e 100644
--- a/conf/master.cf --- a/conf/master.cf
+++ b/conf/master.cf +++ b/conf/master.cf
@@ -95,14 +95,14 @@ scache unix - - n - 1 scache @@ -95,14 +95,14 @@ scache unix - - n - 1 scache

20
postfix-2.10.2-files.patch → postfix-3.0.0-files.patch
View File

@ -1,8 +1,16 @@
diff --git a/conf/postfix-files b/conf/postfix-files diff --git a/conf/postfix-files b/conf/postfix-files
index 9e1804a..b4567e1 100644 index b259bca..778e13c 100644
--- a/conf/postfix-files --- a/conf/postfix-files
+++ b/conf/postfix-files +++ b/conf/postfix-files
@@ -114,20 +114,14 @@ $command_directory/postqueue:f:root:$setgid_group:2755:u @@ -83,7 +83,6 @@ $shlib_directory/${LIB_PREFIX}sqlite${LIB_SUFFIX}:f:root:-:755
$meta_directory/dynamicmaps.cf.d:d:root:-:755
$meta_directory/dynamicmaps.cf:f:root:-:644
$meta_directory/main.cf.proto:f:root:-:644
-$meta_directory/makedefs.out:f:root:-:644
$meta_directory/master.cf.proto:f:root:-:644
$meta_directory/postfix-files.d:d:root:-:755
$meta_directory/postfix-files:f:root:-:644
@@ -139,18 +138,13 @@ $command_directory/postqueue:f:root:$setgid_group:2755:u
$sendmail_path:f:root:-:755 $sendmail_path:f:root:-:755
$newaliases_path:l:$sendmail_path $newaliases_path:l:$sendmail_path
$mailq_path:l:$sendmail_path $mailq_path:l:$sendmail_path
@ -19,11 +27,9 @@ index 9e1804a..b4567e1 100644
$config_directory/install.cf:f:root:-:644:o $config_directory/install.cf:f:root:-:644:o
-$config_directory/main.cf.default:f:root:-:644:1 -$config_directory/main.cf.default:f:root:-:644:1
$config_directory/main.cf:f:root:-:644:p $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/master.cf:f:root:-:644:p
$config_directory/pcre_table:f:root:-:644:o $config_directory/pcre_table:f:root:-:644:o
$config_directory/postfix-files:f:root:-:644:o @@ -163,8 +157,8 @@ $config_directory/postfix-script:f:root:-:755:o
@@ -140,8 +134,8 @@ $config_directory/postfix-script:f:root:-:755:o
$config_directory/postfix-script-sgid:f:root:-:755:o $config_directory/postfix-script-sgid:f:root:-:755:o
$config_directory/postfix-script-nosgid:f:root:-:755:o $config_directory/postfix-script-nosgid:f:root:-:755:o
$config_directory/post-install:f:root:-:755:o $config_directory/post-install:f:root:-:755:o
@ -34,7 +40,7 @@ index 9e1804a..b4567e1 100644
$manpage_directory/man1/postalias.1:f:root:-:644 $manpage_directory/man1/postalias.1:f:root:-:644
$manpage_directory/man1/postcat.1:f:root:-:644 $manpage_directory/man1/postcat.1:f:root:-:644
$manpage_directory/man1/postconf.1:f:root:-:644 $manpage_directory/man1/postconf.1:f:root:-:644
@@ -154,9 +148,9 @@ $manpage_directory/man1/postmap.1:f:root:-:644 @@ -177,9 +171,9 @@ $manpage_directory/man1/postmap.1:f:root:-:644
$manpage_directory/man1/postmulti.1:f:root:-:644 $manpage_directory/man1/postmulti.1:f:root:-:644
$manpage_directory/man1/postqueue.1:f:root:-:644 $manpage_directory/man1/postqueue.1:f:root:-:644
$manpage_directory/man1/postsuper.1:f:root:-:644 $manpage_directory/man1/postsuper.1:f:root:-:644
@ -46,7 +52,7 @@ index 9e1804a..b4567e1 100644
$manpage_directory/man5/body_checks.5:f:root:-:644 $manpage_directory/man5/body_checks.5:f:root:-:644
$manpage_directory/man5/bounce.5:f:root:-:644 $manpage_directory/man5/bounce.5:f:root:-:644
$manpage_directory/man5/canonical.5:f:root:-:644 $manpage_directory/man5/canonical.5:f:root:-:644
@@ -203,7 +197,7 @@ $manpage_directory/man8/qmqpd.8:f:root:-:644 @@ -226,7 +220,7 @@ $manpage_directory/man8/qmqpd.8:f:root:-:644
$manpage_directory/man8/scache.8:f:root:-:644 $manpage_directory/man8/scache.8:f:root:-:644
$manpage_directory/man8/showq.8:f:root:-:644 $manpage_directory/man8/showq.8:f:root:-:644
$manpage_directory/man8/smtp.8:f:root:-:644 $manpage_directory/man8/smtp.8:f:root:-:644

6
postfix-large-fs.patch → postfix-3.0.0-large-fs.patch
View File

@ -21,10 +21,10 @@ index 50a4aa7..beef3db 100644
if (msg_verbose) if (msg_verbose)
msg_info("%s: %s: block size %lu, blocks free %lu", msg_info("%s: %s: block size %lu, blocks free %lu",
diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h
index 6edde1e..b30871e 100644 index 497c216..8be83ea 100644
--- a/src/util/sys_defs.h --- a/src/util/sys_defs.h
+++ b/src/util/sys_defs.h +++ b/src/util/sys_defs.h
@@ -776,8 +776,8 @@ extern int initgroups(const char *, int); @@ -777,8 +777,8 @@ extern int initgroups(const char *, int);
#define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0) #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
#define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin" #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
#define FIONREAD_IN_TERMIOS_H #define FIONREAD_IN_TERMIOS_H
@ -34,4 +34,4 @@ index 6edde1e..b30871e 100644
+#define STATVFS_IN_SYS_STATVFS_H +#define STATVFS_IN_SYS_STATVFS_H
#define PREPEND_PLUS_TO_OPTSTRING #define PREPEND_PLUS_TO_OPTSTRING
#define HAS_POSIX_REGEXP #define HAS_POSIX_REGEXP
#define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail" #define HAS_DLOPEN

26
postfix.spec
View File

@ -37,7 +37,7 @@
Name: postfix Name: postfix
Summary: Postfix Mail Transport Agent Summary: Postfix Mail Transport Agent
Version: 2.11.3 Version: 3.0.0
Release: 1%{?dist} Release: 1%{?dist}
Epoch: 2 Epoch: 2
Group: System Environment/Daemons Group: System Environment/Daemons
@ -77,10 +77,10 @@ Source101: postfix-pam.conf
# Patches # Patches
Patch1: postfix-2.11.0-config.patch Patch1: postfix-3.0.0-config.patch
Patch2: postfix-2.10.2-files.patch Patch2: postfix-3.0.0-files.patch
Patch3: postfix-alternatives.patch Patch3: postfix-3.0.0-alternatives.patch
Patch8: postfix-large-fs.patch Patch8: postfix-3.0.0-large-fs.patch
Patch9: pflogsumm-1.1.3-datecalc.patch Patch9: pflogsumm-1.1.3-datecalc.patch
# Optional patches - set the appropriate environment variables to include # Optional patches - set the appropriate environment variables to include
@ -262,9 +262,9 @@ done
## RPM compresses man pages automatically. ## RPM compresses man pages automatically.
## - Edit postfix-files to reflect this, so post-install won't get confused ## - Edit postfix-files to reflect this, so post-install won't get confused
## when called during package installation. ## when called during package installation.
sed -i -r "s#(/man[158]/.*.[158]):f#\1.gz:f#" $RPM_BUILD_ROOT%{postfix_daemon_dir}/postfix-files sed -i -r "s#(/man[158]/.*.[158]):f#\1.gz:f#" $RPM_BUILD_ROOT%{postfix_config_dir}/postfix-files
cat $RPM_BUILD_ROOT%{postfix_daemon_dir}/postfix-files cat $RPM_BUILD_ROOT%{postfix_config_dir}/postfix-files
%if %{with sasl} %if %{with sasl}
# Install the smtpd.conf file for SASL support. # Install the smtpd.conf file for SASL support.
mkdir -p $RPM_BUILD_ROOT%{sasl_config_dir} mkdir -p $RPM_BUILD_ROOT%{sasl_config_dir}
@ -483,18 +483,18 @@ rm -rf $RPM_BUILD_ROOT
%attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/generic %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/generic
%attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/header_checks %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/header_checks
%attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/main.cf %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/main.cf
%attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/main.cf.proto
%attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/master.cf %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/master.cf
%attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/master.cf.proto
%attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/relocated %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/relocated
%attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/transport %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/transport
%attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/virtual %attr(0644, root, root) %config(noreplace) %{postfix_config_dir}/virtual
%attr(0755, root, root) %{postfix_daemon_dir}/[^mp]* %attr(0755, root, root) %{postfix_daemon_dir}/[^mp]*
%attr(0644, root, root) %{postfix_daemon_dir}/main.cf
%attr(0644, root, root) %{postfix_daemon_dir}/master.cf
%attr(0755, root, root) %{postfix_daemon_dir}/master %attr(0755, root, root) %{postfix_daemon_dir}/master
%attr(0755, root, root) %{postfix_daemon_dir}/pickup %attr(0755, root, root) %{postfix_daemon_dir}/pickup
%attr(0755, root, root) %{postfix_daemon_dir}/pipe %attr(0755, root, root) %{postfix_daemon_dir}/pipe
%attr(0755, root, root) %{postfix_daemon_dir}/post-install %attr(0755, root, root) %{postfix_daemon_dir}/post-install
%attr(0644, root, root) %{postfix_daemon_dir}/postfix-files %attr(0644, root, root) %{postfix_config_dir}/postfix-files
%attr(0755, root, root) %{postfix_daemon_dir}/postfix-script %attr(0755, root, root) %{postfix_daemon_dir}/postfix-script
%attr(0755, root, root) %{postfix_daemon_dir}/postfix-wrapper %attr(0755, root, root) %{postfix_daemon_dir}/postfix-wrapper
%attr(0755, root, root) %{postfix_daemon_dir}/postmulti-script %attr(0755, root, root) %{postfix_daemon_dir}/postmulti-script
@ -537,6 +537,12 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Thu Mar 5 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.0.0-1
- New version
Resolves: rhbz#1190797
- Defuzzified alternatives, config, large-fs patches
- Rebased files patch
* Mon Oct 20 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2:2.11.3-1 * Mon Oct 20 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2:2.11.3-1
- New version - New version
Resolves: rhbz#1154587 Resolves: rhbz#1154587

2
sources
View File

@ -1,2 +1,2 @@
5e3fb28dfb5b7f4a8b6b9bf2abde9542 pflogsumm-1.1.3.tar.gz 5e3fb28dfb5b7f4a8b6b9bf2abde9542 pflogsumm-1.1.3.tar.gz
c3f0f51d8865559b40e9350eb3816011 postfix-2.11.3.tar.gz a4a83f8d729f31c803bf9c2277701d56 postfix-3.0.0.tar.gz