rpms
/
postfix
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:c9
Branches Tags
rpms:i10c-beta
rpms:c10-beta
rpms:i10cs
rpms:cs10
rpms:i9c-beta
rpms:c9-beta
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9
...
pull from: rpms:i10cs
Branches Tags
rpms:i10c-beta
rpms:c10-beta
rpms:i10cs
rpms:cs10
rpms:i9c-beta
rpms:c9-beta
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9

No commits in common. 'c9' and 'i10cs' have entirely different histories.
c9 ... i10cs

14 changed files with 284 additions and 1770 deletions
Show Stats

2
.gitignore vendored
Unescape View File

@ -1,2 +1,2 @@
SOURCES/pflogsumm-1.1.5.tar.gz SOURCES/pflogsumm-1.1.5.tar.gz
SOURCES/postfix-3.5.9.tar.gz SOURCES/postfix-3.8.5.tar.gz

2
.postfix.metadata
Unescape View File

@ -1,2 +1,2 @@
d18daa19d725e64c2b7e6c8da458b2d563272645 SOURCES/pflogsumm-1.1.5.tar.gz d18daa19d725e64c2b7e6c8da458b2d563272645 SOURCES/pflogsumm-1.1.5.tar.gz
f7caa483ebbb7f7b4f912dcfb879a5f1017c327e SOURCES/postfix-3.5.9.tar.gz be0d77af651b2373cecb0a6d1722efb1987316ba SOURCES/postfix-3.8.5.tar.gz

1586
SOURCES/postfix-3.5.9-SRV-resolve.patch
View File

File diff suppressed because it is too large Load Diff

17
SOURCES/postfix-3.5.9-coverity-fix.patch
Unescape View File

@ -1,17 +0,0 @@
diff --git a/src/util/dict_inline.c b/src/util/dict_inline.c
index a416d7c..72339b2 100644
--- a/src/util/dict_inline.c
+++ b/src/util/dict_inline.c
@@ -113,9 +113,9 @@ DICT *dict_inline_open(const char *name, int open_flags, int dict_flags)
dict = dict_open3(DICT_TYPE_HT, name, open_flags, dict_flags);
dict_type_override(dict, DICT_TYPE_INLINE);
while ((nameval = mystrtokq(&cp, CHARS_COMMA_SP, CHARS_BRACE)) != 0) {
- if ((nameval[0] != CHARS_BRACE[0]
- || (err = free_me = extpar(&nameval, CHARS_BRACE, EXTPAR_FLAG_STRIP)) == 0)
- && (err = split_qnameval(nameval, &vname, &value)) != 0)
+ if (nameval[0] == CHARS_BRACE[0])
+ err = free_me = extpar(&nameval, CHARS_BRACE, EXTPAR_FLAG_STRIP);
+ if (err != 0 || (err = split_qnameval(nameval, &vname, &value)) != 0)
break;
if ((dict->flags & DICT_FLAG_SRC_RHS_IS_FILE) != 0) {

12
SOURCES/postfix-3.5.9-glibc-234-build-fix.patch
Unescape View File

@ -1,12 +0,0 @@
diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h
index 99bec9b..95c78ec 100644
--- a/src/util/sys_defs.h
+++ b/src/util/sys_defs.h
@@ -802,6 +803,7 @@ extern int initgroups(const char *, int);
#define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6"
#endif
#endif
+#define HAS_CLOSEFROM
#include <linux/version.h>
#if !defined(KERNEL_VERSION)
#define KERNEL_VERSION(a,b,c) (LINUX_VERSION_CODE + 1)

32
SOURCES/postfix-3.5.9-makedefs.patch
Unescape View File

@ -1,32 +0,0 @@
commit 9c7bcf991e2dd69d517be84d9594411c47e04562
Author: Tomas Korbar <tkorbar@redhat.com>
Date: Fri May 5 12:48:21 2023 +0200
Fix build with kernel 6
diff --git a/makedefs b/makedefs
index aea15d6..ad93a5f 100644
--- a/makedefs
+++ b/makedefs
@@ -557,7 +557,7 @@ EOF
: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
: ${PLUGIN_LD="${CC-gcc} -shared"}
;;
- Linux.[345].*) SYSTYPE=LINUX$RELEASE_MAJOR
+ Linux.[3456].*) SYSTYPE=LINUX$RELEASE_MAJOR
case "$CCARGS" in
*-DNO_DB*) ;;
*-DHAS_DB*) ;;
diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h
index f3a3b26..e9d3546 100644
--- a/src/util/sys_defs.h
+++ b/src/util/sys_defs.h
@@ -749,7 +749,7 @@ extern int initgroups(const char *, int);
/*
* LINUX.
*/
-#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5)
+#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) || defined(LINUX6)
#define SUPPORTED
#define UINT32_TYPE unsigned int
#define UINT16_TYPE unsigned short

13
SOURCES/postfix-3.5.9-whitespace-name-fix.patch
Unescape View File

@ -1,13 +0,0 @@
diff --git a/src/cleanup/cleanup_message.c b/src/cleanup/cleanup_message.c
index 391c711..be5ce42 100644
--- a/src/cleanup/cleanup_message.c
+++ b/src/cleanup/cleanup_message.c
@@ -773,6 +773,8 @@ static void cleanup_header_done_callback(void *context)
/* Normalize whitespace. */
token = tok822_scan_limit(state->fullname, &dummy_token,
var_token_limit);
+ if (!token)
+ token = tok822_alloc(TOK822_QSTRING, state->fullname);
} else {
token = tok822_alloc(TOK822_QSTRING, state->fullname);
}

20
SOURCES/postfix-3.5.0-config.patch → SOURCES/postfix-3.8.0-config.patch
Unescape 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 7af8bde..495e346 100644 index 2ee7996..336bd7b 100644
--- a/conf/main.cf --- a/conf/main.cf
+++ b/conf/main.cf +++ b/conf/main.cf
@@ -132,6 +132,10 @@ mail_owner = postfix @@ -136,6 +136,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 7af8bde..495e346 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
@@ -176,7 +180,7 @@ mail_owner = postfix @@ -180,7 +184,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 7af8bde..495e346 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
@@ -398,7 +402,7 @@ unknown_local_recipient_reject_code = 550 @@ -407,7 +411,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 7af8bde..495e346 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
@@ -409,7 +413,7 @@ unknown_local_recipient_reject_code = 550 @@ -418,7 +422,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 7af8bde..495e346 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)
@@ -479,7 +483,27 @@ unknown_local_recipient_reject_code = 550 @@ -488,7 +492,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 7af8bde..495e346 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.
@@ -499,8 +523,7 @@ unknown_local_recipient_reject_code = 550 @@ -508,8 +532,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,7 +79,7 @@ index 7af8bde..495e346 100644
#fallback_transport = #fallback_transport =
# The luser_relay parameter specifies an optional destination address # The luser_relay parameter specifies an optional destination address
@@ -673,4 +696,41 @@ sample_directory = @@ -682,4 +705,41 @@ sample_directory =
# readme_directory: The location of the Postfix README files. # readme_directory: The location of the Postfix README files.
# #
readme_directory = readme_directory =
@ -123,10 +123,10 @@ index 7af8bde..495e346 100644
+# +#
+smtp_tls_security_level = may +smtp_tls_security_level = may
diff --git a/conf/master.cf b/conf/master.cf diff --git a/conf/master.cf b/conf/master.cf
index c0f2508..05c5d07 100644 index fd282dd..8d969c6 100644
--- a/conf/master.cf --- a/conf/master.cf
+++ b/conf/master.cf +++ b/conf/master.cf
@@ -98,14 +98,14 @@ postlog unix-dgram n - n - 1 postlogd @@ -112,14 +112,14 @@ postlog unix-dgram n - n - 1 postlogd
# Also specify in main.cf: cyrus_destination_recipient_limit=1 # Also specify in main.cf: cyrus_destination_recipient_limit=1
# #
#cyrus unix - n n - - pipe #cyrus unix - n n - - pipe

4
SOURCES/postfix-3.4.0-large-fs.patch → SOURCES/postfix-3.8.0-large-fs.patch
Unescape 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 a8d2571..ad07498 100644 index 1fb449d..bcaac27 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
@@ -769,8 +769,8 @@ extern int initgroups(const char *, int); @@ -783,8 +783,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

12
SOURCES/postfix-3.8.5-openssl-no-engine.patch
Unescape View File

@ -0,0 +1,12 @@
diff --git a/src/posttls-finger/posttls-finger.c b/src/posttls-finger/posttls-finger.c
index b9a4699..29e6ec1 100644
--- a/src/posttls-finger/posttls-finger.c
+++ b/src/posttls-finger/posttls-finger.c
@@ -405,7 +405,6 @@
#ifdef USE_TLS
#include <tls_proxy.h>
-#include <openssl/engine.h>
#endif
/*

17
SOURCES/postfix-etc-init.d-postfix
Unescape View File

@ -51,15 +51,20 @@ conf_check() {
} }
make_aliasesdb() { make_aliasesdb() {
if [ "$(/usr/sbin/postconf -h alias_database)" == "hash:/etc/aliases" ] local MAP=""
local ALIASESDB="$(/usr/sbin/postconf -h alias_database)"
[ "$ALIASESDB" = "hash:/etc/aliases" ] && MAP="db"
[ "$ALIASESDB" = "lmdb:/etc/aliases" ] && MAP="lmdb"
if [ "$MAP" = "db" -o "$MAP" = "lmdb" ]
then then
# /etc/aliases.db may be used by other MTA, make sure nothing # /etc/aliases.db|lmdb may be used by other MTA, make sure nothing
# has touched it since our last newaliases call # has touched it since our last newaliases call
[ /etc/aliases -nt /etc/aliases.db ] || [ /etc/aliases -nt /etc/aliases.$MAP ] ||
[ "$ALIASESDB_STAMP" -nt /etc/aliases.db ] || [ "$ALIASESDB_STAMP" -nt /etc/aliases.$MAP ] ||
[ "$ALIASESDB_STAMP" -ot /etc/aliases.db ] || return [ "$ALIASESDB_STAMP" -ot /etc/aliases.$MAP ] || return
/usr/bin/newaliases /usr/bin/newaliases
touch -r /etc/aliases.db "$ALIASESDB_STAMP" touch -r /etc/aliases.$MAP "$ALIASESDB_STAMP"
else else
/usr/bin/newaliases /usr/bin/newaliases
fi fi

17
SOURCES/postfix.aliasesdb
Unescape View File

@ -3,15 +3,20 @@
ALIASESDB_STAMP=/var/lib/misc/postfix.aliasesdb-stamp ALIASESDB_STAMP=/var/lib/misc/postfix.aliasesdb-stamp
make_aliasesdb() { make_aliasesdb() {
if [ "$(/usr/sbin/postconf -h alias_database)" == "hash:/etc/aliases" ] local MAP=""
local ALIASESDB="$(/usr/sbin/postconf -h alias_database)"
[ "$ALIASESDB" = "hash:/etc/aliases" ] && MAP="db"
[ "$ALIASESDB" = "lmdb:/etc/aliases" ] && MAP="lmdb"
if [ "$MAP" = "db" -o "$MAP" = "lmdb" ]
then then
# /etc/aliases.db may be used by other MTA, make sure nothing # /etc/aliases.db|lmdb may be used by other MTA, make sure nothing
# has touched it since our last newaliases call # has touched it since our last newaliases call
[ /etc/aliases -nt /etc/aliases.db ] || [ /etc/aliases -nt /etc/aliases.$MAP ] ||
[ "$ALIASESDB_STAMP" -nt /etc/aliases.db ] || [ "$ALIASESDB_STAMP" -nt /etc/aliases.$MAP ] ||
[ "$ALIASESDB_STAMP" -ot /etc/aliases.db ] || return 0 [ "$ALIASESDB_STAMP" -ot /etc/aliases.$MAP ] || return 0
/usr/bin/newaliases /usr/bin/newaliases
touch -r /etc/aliases.db "$ALIASESDB_STAMP" touch -r /etc/aliases.$MAP "$ALIASESDB_STAMP"
else else
/usr/bin/newaliases /usr/bin/newaliases
fi fi

1
SOURCES/postfix.sysusers
Unescape View File

@ -1,4 +1,3 @@
u postfix 89 - /var/spool/postfix /sbin/nologin u postfix 89 - /var/spool/postfix /sbin/nologin
g postdrop 90 g postdrop 90
g mail 12
m postfix mail m postfix mail

319
SPECS/postfix.spec
Unescape View File

@ -1,6 +1,11 @@
# plugins have unresolvable symbols in compile time # plugins have unresolvable symbols in compile time
%undefine _strict_symbol_defs_build %undefine _strict_symbol_defs_build
%if 0%{?rhel} < 10
%bcond_without db
%else
%bcond_with db
%endif
%bcond_without mysql %bcond_without mysql
%bcond_without pgsql %bcond_without pgsql
%bcond_without sqlite %bcond_without sqlite
@ -13,6 +18,12 @@
%bcond_without ipv6 %bcond_without ipv6
%bcond_without pflogsumm %bcond_without pflogsumm
%if %{without db} && %{with lmdb}
%global defmap_lmdb 1
%else
%global defmap_lmdb 0
%endif
%global sysv2systemdnvr 2.8.12-2 %global sysv2systemdnvr 2.8.12-2
# hardened build if not overrided # hardened build if not overrided
@ -45,11 +56,11 @@
Name: postfix Name: postfix
Summary: Postfix Mail Transport Agent Summary: Postfix Mail Transport Agent
Version: 3.5.9 Version: 3.8.5
Release: 24%{?dist} Release: 8%{?dist}
Epoch: 2 Epoch: 2
URL: http://www.postfix.org URL: http://www.postfix.org
License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+) License: (IPL-1.0 OR EPL-2.0) AND GPL-2.0-or-later AND BSD-4-Clause-UC
Requires(post): systemd systemd-sysv hostname Requires(post): systemd systemd-sysv hostname
Requires(post): %{_sbindir}/alternatives Requires(post): %{_sbindir}/alternatives
Requires(post): %{_bindir}/openssl Requires(post): %{_bindir}/openssl
@ -85,27 +96,18 @@ Source101: postfix-pam.conf
# Patches # Patches
Patch1: postfix-3.5.0-config.patch Patch1: postfix-3.8.0-config.patch
Patch2: postfix-3.4.0-files.patch Patch2: postfix-3.4.0-files.patch
Patch3: postfix-3.3.3-alternatives.patch Patch3: postfix-3.3.3-alternatives.patch
Patch4: postfix-3.4.0-large-fs.patch # probably rhbz#428996
Patch4: postfix-3.8.0-large-fs.patch
Patch9: pflogsumm-1.1.5-datecalc.patch Patch9: pflogsumm-1.1.5-datecalc.patch
# rhbz#1384871, sent upstream # rhbz#1384871, sent upstream
Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch Patch10: pflogsumm-1.1.5-ipv6-warnings-fix.patch
Patch11: postfix-3.4.4-chroot-example-fix.patch Patch11: postfix-3.4.4-chroot-example-fix.patch
# unconditional glibc-2.34 API assumption, because it seems # rhbz#1931403, sent upstream
# in RHEL-9 this feature was also backported to 2.33, Patch13: pflogsumm-1.1.5-syslog-name-underscore-fix.patch
# upstream uses conditional check for 2.34 API Patch14: postfix-3.8.5-openssl-no-engine.patch
Patch12: postfix-3.5.9-glibc-234-build-fix.patch
# rhbz#1978901, sent upstream
Patch13: postfix-3.5.9-whitespace-name-fix.patch
Patch14: pflogsumm-1.1.5-syslog-name-underscore-fix.patch
# rhbz#1938847, backported from upstream
Patch15: postfix-3.5.9-coverity-fix.patch
# rhbz#2134789, backported feature from upstream
Patch16: postfix-3.5.9-SRV-resolve.patch
# rhbz#2193363 ZUUL CI uses kernel 6 and we have to add this to postfix
Patch17: postfix-3.5.9-makedefs.patch
# Optional patches - set the appropriate environment variables to include # Optional patches - set the appropriate environment variables to include
# them when building the package/spec file # them when building the package/spec file
@ -113,24 +115,35 @@ Patch17: postfix-3.5.9-makedefs.patch
# Determine the different packages required for building postfix # Determine the different packages required for building postfix
BuildRequires: make BuildRequires: make
BuildRequires: libdb-devel, perl-generators, pkgconfig, zlib-devel BuildRequires: perl-generators
BuildRequires: systemd-units, libicu-devel BuildRequires: pkgconfig
BuildRequires: gcc, m4, findutils BuildRequires: zlib-devel
BuildRequires: systemd-units
BuildRequires: libicu-devel
BuildRequires: gcc
BuildRequires: m4
BuildRequires: findutils
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: sed
%if 0%{?rhel} < 9 %if 0%{?rhel} < 9
BuildRequires: libnsl2-devel BuildRequires: libnsl2-devel
%endif %endif
%{?with_db:BuildRequires: libdb-devel}
%{?with_ldap:BuildRequires: openldap-devel} %{?with_ldap:BuildRequires: openldap-devel}
%{?with_lmdb:BuildRequires: lmdb-devel} %{?with_lmdb:BuildRequires: lmdb-devel}
%{?with_sasl:BuildRequires: cyrus-sasl-devel} %{?with_sasl:BuildRequires: cyrus-sasl-devel}
%{?with_pcre:BuildRequires: pcre-devel} %{?with_pcre:BuildRequires: pcre2-devel}
%{?with_mysql:BuildRequires: mariadb-connector-c-devel} %{?with_mysql:BuildRequires: mariadb-connector-c-devel}
%{?with_pgsql:BuildRequires: libpq-devel} %{?with_pgsql:BuildRequires: libpq-devel}
%{?with_sqlite:BuildRequires: sqlite-devel} %{?with_sqlite:BuildRequires: sqlite-devel}
%{?with_cdb:BuildRequires: tinycdb-devel} %{?with_cdb:BuildRequires: tinycdb-devel}
%{?with_tls:BuildRequires: openssl-devel} %{?with_tls:BuildRequires: openssl-devel}
%if 0%{?defmap_lmdb}
Requires: %{name}-lmdb%{?_isa} = %{epoch}:%{version}-%{release}
%endif
%description %description
Postfix is a Mail Transport Agent (MTA). Postfix is a Mail Transport Agent (MTA).
@ -257,19 +270,28 @@ pushd pflogsumm-%{pflogsumm_ver}
popd popd
%endif %endif
%patch11 -p1 -b .chroot-example-fix %patch11 -p1 -b .chroot-example-fix
%patch12 -p1 -b .glibc-234-build-fix %patch13 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix
%patch13 -p1 -b .whitespace-name-fix %patch14 -p1 -b .openssl-no-engine
%patch14 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix
%patch15 -p1 -b .coverity-fix # Backport 3.8-20221006 fix for uname -r detection
%patch16 -p1 -b .SRV-resolution sed -i makedefs -e '\@Linux\.@s|345|3456|'
%patch17 -p1 -b .makedefs sed -i src/util/sys_defs.h -e 's@defined(LINUX5)@defined(LINUX5) || defined(LINUX6)@'
for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do
iconv -f iso8859-1 -t utf8 -o ${f}{_,} && iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
touch -r ${f}{,_} && mv -f ${f}{_,} touch -r ${f}{,_} && mv -f ${f}{_,}
done done
# fix default maps
%if 0%{?defmap_lmdb}
sed -i '/^\s*alias_maps\s*=\s*hash:\/etc\/aliases/ s|hash:|lmdb:|g' conf/main.cf
sed -i '/^\s*alias_database\s*=\s*hash:\/etc\/aliases/ s|hash:|lmdb:|g' conf/main.cf
echo >> conf/main.cf
echo "default_database_type = lmdb" >> conf/main.cf
%endif
%build %build
%set_build_flags
unset AUXLIBS AUXLIBS_LDAP AUXLIBS_LMDB AUXLIBS_PCRE AUXLIBS_MYSQL AUXLIBS_PGSQL AUXLIBS_SQLITE AUXLIBS_CDB unset AUXLIBS AUXLIBS_LDAP AUXLIBS_LMDB AUXLIBS_PCRE AUXLIBS_MYSQL AUXLIBS_PGSQL AUXLIBS_SQLITE AUXLIBS_CDB
CCARGS="-fPIC -fcommon" CCARGS="-fPIC -fcommon"
%if 0%{?rhel} >= 9 %if 0%{?rhel} >= 9
@ -278,6 +300,10 @@ AUXLIBS=""
AUXLIBS="-lnsl" AUXLIBS="-lnsl"
%endif %endif
%if %{without db}
CCARGS="${CCARGS} -DNO_DB"
%endif
%ifarch s390 s390x ppc %ifarch s390 s390x ppc
CCARGS="${CCARGS} -fsigned-char" CCARGS="${CCARGS} -fsigned-char"
%endif %endif
@ -291,9 +317,8 @@ CCARGS="${CCARGS} -fsigned-char"
AUXLIBS_LMDB="-llmdb" AUXLIBS_LMDB="-llmdb"
%endif %endif
%if %{with pcre} %if %{with pcre}
# -I option required for pcre 3.4 (and later?) CCARGS="${CCARGS} -DHAS_PCRE=2 `pcre2-config --cflags`"
CCARGS="${CCARGS} -DHAS_PCRE -I%{_includedir}/pcre" AUXLIBS_PCRE=`pcre2-config --libs8`
AUXLIBS_PCRE="-lpcre"
%endif %endif
%if %{with mysql} %if %{with mysql}
CCARGS="${CCARGS} -DHAS_MYSQL -I%{_includedir}/mysql" CCARGS="${CCARGS} -DHAS_MYSQL -I%{_includedir}/mysql"
@ -334,7 +359,7 @@ CCARGS="${CCARGS} $(getconf LFS_CFLAGS)"
%if 0%{?rhel} >= 9 %if 0%{?rhel} >= 9
CCARGS="${CCARGS} -DNO_NIS" CCARGS="${CCARGS} -DNO_NIS"
%endif %endif
LDFLAGS="%{?__global_ldflags} %{?_hardened_build:-Wl,-z,relro,-z,now}" LDFLAGS="$LDFLAGS %{?_hardened_build:-Wl,-z,relro,-z,now}"
# SHLIB_RPATH is needed to find private libraries # SHLIB_RPATH is needed to find private libraries
# LDFLAGS are added to SHLIB_RPATH because the postfix build system # LDFLAGS are added to SHLIB_RPATH because the postfix build system
@ -347,7 +372,7 @@ make -f Makefile.init makefiles shared=yes dynamicmaps=yes \
AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" AUXLIBS_SQLITE="${AUXLIBS_SQLITE}" \ AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" AUXLIBS_SQLITE="${AUXLIBS_SQLITE}" \
AUXLIBS_CDB="${AUXLIBS_CDB}" \ AUXLIBS_CDB="${AUXLIBS_CDB}" \
DEBUG="" SHLIB_RPATH="-Wl,-rpath,%{postfix_shlib_dir} $LDFLAGS" \ DEBUG="" SHLIB_RPATH="-Wl,-rpath,%{postfix_shlib_dir} $LDFLAGS" \
OPT="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-comment" \ OPT="$CFLAGS -fno-strict-aliasing -Wno-comment" \
POSTFIX_INSTALL_OPTS=-keep-build-mtime POSTFIX_INSTALL_OPTS=-keep-build-mtime
%make_build %make_build
@ -380,6 +405,12 @@ make non-interactive-package \
sample_directory=%{postfix_sample_dir} \ sample_directory=%{postfix_sample_dir} \
readme_directory=%{postfix_readme_dir} || exit 1 readme_directory=%{postfix_readme_dir} || exit 1
%if 0%{?fedora} < 23 && 0%{?rhel} < 9
# This installs into the /etc/rc.d/init.d directory
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
install -c %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/postfix
%endif
# Systemd # Systemd
mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}
install -m 644 %{SOURCE2} %{buildroot}%{_unitdir} install -m 644 %{SOURCE2} %{buildroot}%{_unitdir}
@ -675,7 +706,7 @@ fi
%attr(0755, root, root) %{postfix_command_dir}/postfix %attr(0755, root, root) %{postfix_command_dir}/postfix
%attr(0755, root, root) %{postfix_command_dir}/postkick %attr(0755, root, root) %{postfix_command_dir}/postkick
%attr(0755, root, root) %{postfix_command_dir}/postlock %attr(0755, root, root) %{postfix_command_dir}/postlock
%attr(0755, root, root) %{postfix_command_dir}/postlog %attr(2755, root, %{maildrop_group}) %{postfix_command_dir}/postlog
%attr(0755, root, root) %{postfix_command_dir}/postmap %attr(0755, root, root) %{postfix_command_dir}/postmap
%attr(0755, root, root) %{postfix_command_dir}/postmulti %attr(0755, root, root) %{postfix_command_dir}/postmulti
%attr(2755, root, %{maildrop_group}) %{postfix_command_dir}/postqueue %attr(2755, root, %{maildrop_group}) %{postfix_command_dir}/postqueue
@ -809,78 +840,200 @@ fi
%endif %endif
%changelog %changelog
* Mon Aug 14 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-24 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2:3.8.5-8
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2:3.8.5-7
- Rebuilt for MSVSphere 10
* Sun Aug 25 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.5-7
- Dropped mail group configuration / creation, it is provided by setup
Resolves: RHEL-27174
* Thu Jul 25 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.5-6
- Fixed postlog RPM verification
Resolves: RHEL-50584
* Thu Jul 25 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.5-5
- Explicitly set default_database_type if lmdb map is used
Resolves: RHEL-50557
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2:3.8.5-4
- Bump release for June 2024 mass rebuild
* Thu Feb 01 2024 Pete Walter <pwalter@fedoraproject.org> - 2:3.8.5-3
- Rebuild for ICU 74
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.8.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.5-1
- New version
Resolves: rhbz#2259469
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.8.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Jan 2 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.4-1
- New version
Resolves: rhbz#2255641
- Fixed SMTP smuggling vulnerability
Resolves: CVE-2023-51764
* Tue Dec 12 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.3-2
- Converted license tag to SPDX
* Thu Nov 2 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.3-1
- New version
Resolves: rhbz#2247553
* Mon Oct 9 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.2-2
- Drop libdb for RHEL>9
Related: rhbz#1788480
* Tue Sep 5 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.2-1
- New version
Resolves: rhbz#2236828
* Mon Aug 14 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.1-5
- Use systemd-sysusers, original patch by
Jonathan Wright <jonathan@almalinux.org>
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.8.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 11 2023 František Zatloukal <fzatlouk@redhat.com> - 2:3.8.1-3
- Rebuilt for ICU 73.2
* Tue Jul 11 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.1-2
- Fixed possible warning when postfix is restarted - Fixed possible warning when postfix is restarted
Resolves: rhbz#2075571 Resolves: rhbz#2218058
* Mon Aug 14 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-23 * Tue Jun 6 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.1-1
- Spec cleanup - New version
Related: rhbz#2095454 Resolves: rhbz#2212596
* Thu May 25 2023 Tomas Korbar <tkorbar@redhat.com> - 2:3.8.0-3
- Fix freed memory access
* Wed Apr 26 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.0-2
- Dropped whitespace-name-fix patch, not needed
* Wed Apr 26 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.8.0-1
- New version
Resolves: rhbz#2187121
* Wed Jan 25 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.7.4-1
- New version
Resolves: rhbz#2162932
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.7.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Dec 31 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2:3.7.3-3
- Backport upstream fix for uname -r detection with kernel 6.x
* Wed Jul 05 2023 Jonathan Wright <jonathan@almalinux.org> - 2:3.5.9-22 * Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 2:3.7.3-2
- Use systemd-sysusers - Rebuild for ICU 72
Resolves: rhbz#2095454
* Wed May 17 2023 Tomas Korbar <tkorbar@redhat.com> - 2:3.5.9-21 * Mon Oct 10 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.7.3-1
- Fix patch for SRV record resolution feature - New version
Related: rhbz#2134789 Resolves: rhbz#2133120
* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 2:3.7.2-4
- Rebuilt for ICU 71.1
* Sat Jul 23 2022 Stewart Smith <trawets@amazon.com> - 2:3.7.2-3
- Build with pcre2 instead of the deprecated pcre library
* Thu May 04 2023 Tomas Korbar <tkorbar@redhat.com> - 2:3.5.9-20 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.7.2-2
- Backport dns SRV record resolution feature (RFC6186) - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Resolves: rhbz#2134789
- Fix building in ZUUL CI * Thu Apr 28 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.7.2-1
Resolves: rhbz#2193363 - New version
Resolves: rhbz#2079634
* Tue Apr 19 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.7.1-1
- New version
Resolves: rhbz#2076317
* Tue Feb 22 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.7.0-1
- New version
Resolves: rhbz#2051046
* Fri Aug 19 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-19 * Thu Jan 20 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.4-1
- New version
Resolves: rhbz#2040977
- Suppressed openssl output during SSL certificates generation - Suppressed openssl output during SSL certificates generation
Resolves: rhbz#2041589 Resolves: rhbz#2041589
* Tue Feb 22 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-18 * Mon Jan 17 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.3-5
- Fixed pflogsumm to allow underscores in the syslog_name
Resolves: rhbz#1931403
* Tue Dec 14 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.3-4
- Added SELinux workound for systemd service to work after 'postfix start' - Added SELinux workound for systemd service to work after 'postfix start'
Resolves: rhbz#2055915
* Tue Feb 15 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-17 * Wed Dec 08 2021 Timm Bäder <tbaeder@redhat.com> - 2:3.6.3-3
- Fixed problem in the dict_inline found by coverity - Use %%set_build_flags to set all build flags
Resolves: rhbz#1938847
* Fri Jan 28 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-16 * Fri Nov 12 2021 Björn Esser <besser82@fedoraproject.org> - 2:3.6.3-2
- Fixed pflogsumm to allow underscores in the syslog_name - Rebuild(libnsl2)
Resolves: rhbz#2043059
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2:3.5.9-15 * Wed Nov 10 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.3-1
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - New version
Related: rhbz#1991688 Resolves: rhbz#2020984
* Thu Aug 5 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-14 * Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2:3.6.2-6
- Fixed cleanup crash when processing messages with whitespace only fullname - Rebuilt with OpenSSL 3.0.0
Resolves: rhbz#1978901
* Thu Aug 5 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-13 * Thu Aug 5 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.2-5
- Used upstream patch for fixing FTBFS with glibc-2.34 - Fixed cleanup crash when processing messages with whitespace only fullname
Related: rhbz#1984045 - Fixed whitespaces in the glibc-234-build-fix patch
* Tue Aug 3 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-12 * Thu Aug 5 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.2-4
- Fixed openssl req command parameter - Updated patch fixing FTBFS with the glibc-2.34
Related: rhbz#1985918
* Tue Aug 3 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-11 * Tue Aug 3 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.2-3
- Fixed FTBFS with glibc-2.34 - Fixed openssl req parameters
Resolves: rhbz#1984045
* Mon Aug 2 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-10 * Mon Aug 2 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.2-2
- Fixed scriptlets to work with openssl-3.0 - Fixed scriptlets to work with openssl-3.0
Resolves: rhbz#1985918
* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 2:3.5.9-9 * Thu Jul 29 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.2-1
- Rebuilt for RHEL 9 BETA for openssl 3.0 - New version
Related: rhbz#1971065 Resolves: rhbz#1985778
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.6.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Apr 22 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-8 * Fri Jul 2 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.1-2
- Fixed build on rhel < 9
* Mon Jun 14 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.1-1
- New version
Resolves: rhbz#1971363
* Thu May 20 2021 Pete Walter <pwalter@fedoraproject.org> - 2:3.6.0-3
- Rebuild for ICU 69
* Wed May 19 2021 Pete Walter <pwalter@fedoraproject.org> - 2:3.6.0-2
- Rebuild for ICU 69
* Fri Apr 30 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.6.0-1
- New version
Resolves: rhbz#1955369
* Thu Apr 22 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.10-2
- Fixed NIS build requirements - Fixed NIS build requirements
Resolves: rhbz#1942369
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2:3.5.9-7 * Mon Apr 12 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.10-1
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - New version
Resolves: rhbz#1948306
* Thu Mar 25 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-7
- Simplified macros related to NIS
* Wed Mar 24 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-6 * Wed Mar 24 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-6
- Disable NIS support for RHEL9+ (patch from fjanus@redhat.com) - Disable NIS support for RHEL9+ (patch from fjanus@redhat.com)

Write Preview
Loading…
Cancel
Save