From 9a804aa0ec03a471bf638229051a12230d9e6e2e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 31 2020 09:32:49 +0000
Subject: import postfix-2.10.1-9.el7


---

diff --git a/SOURCES/postfix-2.10.1-timestamps.patch b/SOURCES/postfix-2.10.1-timestamps.patch
new file mode 100644
index 0000000..5974d35
--- /dev/null
+++ b/SOURCES/postfix-2.10.1-timestamps.patch
@@ -0,0 +1,40 @@
+diff --git a/postfix-install b/postfix-install
+index 6b2a261..3edd2c6 100644
+--- a/postfix-install
++++ b/postfix-install
+@@ -40,6 +40,10 @@
+ #	is installed from a pre-built package or from source code.
+ #
+ #	Arguments
++# .IP -keep-build-mtime
++#      When installing files preserve new file's mtime timestamps.
++#      Otherwise, mtimes will be set to the time that postfix-install
++#      is run.
+ # .IP -non-interactive
+ #	Do not ask the user for parameter settings. Installation parameters
+ #	are specified via one of the non-interactive methods described
+@@ -179,6 +183,7 @@ BACKUP_IFS="$IFS"
+ LC_ALL=C; export LC_ALL
+ 
+ USAGE="Usage: $0 [name=value] [option]
++    -keep-build-mtime         Preserve build-time file mtime timestamps.
+     -non-interactive        Do not ask for installation parameters.
+     -package                Build a ready-to-install package.
+     name=value              Specify an installation parameter".
+@@ -193,6 +198,8 @@ do
+       *=*) IFS= eval $arg; IFS="$BACKUP_IFS";;
+ -non-int*) non_interactive=1;;
+  -package) need_install_root=install_root;;
++-keep-build-mtime)
++           keep_build_mtime=1;;
+         *) echo "$0: Error: $USAGE" 1>&2; exit 1;;
+     esac
+     shift
+@@ -245,6 +252,7 @@ compare_or_replace() {
+ 	echo Updating $dst...
+ 	rm -f $tempdir/junk || exit 1
+ 	cp $src $tempdir/junk || exit 1
++	test -z "$keep_build_mtime" || touch -r $src $tempdir/junk || exit 1
+ 	mv -f $tempdir/junk $dst || exit 1
+ 	test -z "$owner" || chown $owner $dst || exit 1
+ 	test -z "$group" || chgrp $group $dst || exit 1
diff --git a/SPECS/postfix.spec b/SPECS/postfix.spec
index 9c998e8..25f78df 100644
--- a/SPECS/postfix.spec
+++ b/SPECS/postfix.spec
@@ -41,7 +41,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 2.10.1
-Release: 7%{?dist}
+Release: 9%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -86,6 +86,7 @@ Patch9: pflogsumm-1.1.3-datecalc.patch
 Patch10: postfix-2.10.1-haproxy-tls-fix.patch
 Patch11: postfix-2.10.1-canonical-maps-doc-fix.patch
 Patch12: postfix-2.10.1-kernel-4-fix.patch
+Patch13: postfix-2.10.1-timestamps.patch
 
 # Optional patches - set the appropriate environment variables to include
 #		     them when building the package/spec file
@@ -157,6 +158,7 @@ popd
 %patch10 -p1 -b .haproxy-tls-fix
 %patch11 -p1 -b .canonical-maps-doc-fix
 %patch12 -p1 -b .kernel-4-fix
+%patch13 -p1 -b .timestamps
 
 for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@@ -172,7 +174,7 @@ CCARGS="${CCARGS} -fsigned-char"
 %endif
 
 %if %{with ldap}
-  CCARGS="${CCARGS} -DHAS_LDAP -DLDAP_DEPRECATED=1"
+  CCARGS="${CCARGS} -DHAS_LDAP -DLDAP_DEPRECATED=1 %{?with_sasl:-DUSE_LDAP_SASL}"
   AUXLIBS="${AUXLIBS} -lldap -llber"
 %endif
 %if %{with pcre}
@@ -214,7 +216,7 @@ AUXLIBS="${AUXLIBS} %{?harden:%{harden}}"
 make -f Makefile.init makefiles CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" \
   DEBUG="" OPT="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-comment"
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -243,7 +245,7 @@ sh postfix-install -non-interactive \
        setgid_group=%{maildrop_group} \
        manpage_directory=%{_mandir} \
        sample_directory=%{postfix_sample_dir} \
-       readme_directory=%{postfix_readme_dir} || exit 1
+       readme_directory=%{postfix_readme_dir} -keep-build-mtime || exit 1
 
 # This installs into the /etc/rc.d/init.d directory
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
@@ -534,6 +536,14 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Jul 29 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2:2.10.1-9
+- Compiled with USE_LDAP_SASL if both "ldap" and "sasl" options are enabled
+  Resolves: rhbz#1733938
+
+* Wed Jul 24 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2:2.10.1-8
+- Preserve timestamps of files during installation
+  Resolves: rhbz#1307081
+
 * Mon May  7 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2:2.10.1-7
 - Fixed haproxy with TLS
   Resolves: rhbz#1370455