From ea779f148c0b74926b999b66888e1ea68b88314d Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Thu, 22 Jan 2009 15:53:45 +0000
Subject: [PATCH] - update to 2.5.6 (#479108) - rebuild /etc/aliases.db only
 when necessary (#327651) - convert doc files to UTF-8

---
 .cvsignore                 |  2 +-
 postfix-etc-init.d-postfix | 19 ++++++++++++++++++-
 postfix.spec               | 24 +++++++++++++++++++-----
 sources                    |  2 +-
 4 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index fa747f5..1ee0f07 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 pflogsumm-1.1.1.tar.gz
-postfix-2.5.5.tar.gz
+postfix-2.5.6.tar.gz
diff --git a/postfix-etc-init.d-postfix b/postfix-etc-init.d-postfix
index 4973f7a..5a66f47 100644
--- a/postfix-etc-init.d-postfix
+++ b/postfix-etc-init.d-postfix
@@ -34,6 +34,8 @@
 RETVAL=0
 prog="postfix"
 
+ALIASESDB_STAMP=/var/lib/misc/postfix.aliasesdb-stamp
+
 status master >/dev/null 2>&1
 running=$?
 
@@ -43,13 +45,28 @@ conf_check() {
     [ -d /var/spool/postfix ] || exit 5
 }
 
+make_aliasesdb() {
+	if [ "$(/usr/sbin/postconf -h alias_database)" == "hash:/etc/aliases" ]
+	then
+		# /etc/aliases.db may be used by other MTA, make sure nothing
+		# has touched it since our last newaliases call
+		[ /etc/aliases -nt /etc/aliases.db ] ||
+			[ "$ALIASESDB_STAMP" -nt /etc/aliases.db ] ||
+			[ "$ALIASESDB_STAMP" -ot /etc/aliases.db ] || return
+		/usr/bin/newaliases
+		touch -r /etc/aliases.db "$ALIASESDB_STAMP"
+	else
+		/usr/bin/newaliases
+	fi
+}
+
 start() {
 	# Check that networking is up.
 	[ ${NETWORKING} = "no" ] && exit 1
 	conf_check
 	# Start daemons.
 	echo -n $"Starting postfix: "
-        /usr/bin/newaliases >/dev/null 2>&1
+	make_aliasesdb >/dev/null 2>&1
 	/usr/sbin/postfix start 2>/dev/null 1>&2 && success || failure $"$prog start"
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/postfix
diff --git a/postfix.spec b/postfix.spec
index 65a2857..a300bc3 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -39,8 +39,8 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.5.5
-Release: 2%{?dist}
+Version: 2.5.6
+Release: 1%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -166,6 +166,11 @@ perl -pi -e "s/makedefs.out/makedefs.out-%{_arch}/g" conf/postfix-files Makefile
 gzip -dc %{SOURCE53} | tar xf -
 %endif
 
+for f in README_FILES/TLS_{LEGACY_,}README; do
+	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
+		touch -r ${f}{,_} && mv -f ${f}{_,}
+done
+
 %build
 CCARGS=-fPIC
 AUXLIBS=
@@ -255,8 +260,8 @@ sh postfix-install -non-interactive \
        readme_directory=%{postfix_readme_dir} || exit 1
 
 # This installs into the /etc/rc.d/init.d directory
-/bin/mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -c %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/postfix
+mkdir -p $RPM_BUILD_ROOT%{_initrddir}
+install -c %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/postfix
 
 install -c auxiliary/rmail/rmail $RPM_BUILD_ROOT%{_bindir}/rmail.postfix
 
@@ -324,6 +329,9 @@ cat >> $RPM_BUILD_ROOT%{postfix_config_dir}/main.cf <<EOF
 inet_protocols = all
 EOF
 
+mkdir -p $RPM_BUILD_ROOT%{_var}/lib/misc
+touch $RPM_BUILD_ROOT%{_var}/lib/misc/postfix.aliasesdb-stamp
+
 %post
 /sbin/chkconfig --add postfix
 
@@ -396,7 +404,7 @@ exit 0
 %config(noreplace) %{sasl_v2_lib_dir}/smtpd.conf
 %endif
 %config(noreplace) %{_sysconfdir}/pam.d/smtp.postfix
-%attr(0755, root, root) /etc/rc.d/init.d/postfix
+%attr(0755, root, root) %{_initrddir}/postfix
 
 # Misc files
 
@@ -470,6 +478,7 @@ exit 0
 %attr(0755, root, root) %{_bindir}/mailq.postfix
 %attr(0755, root, root) %{_bindir}/newaliases.postfix
 %attr(0755, root, root) %{_sbindir}/sendmail.postfix
+%ghost %attr(0644, root, root) %{_var}/lib/misc/postfix.aliasesdb-stamp
 
 %files perl-scripts
 %defattr(-, root, root)
@@ -482,6 +491,11 @@ exit 0
 %endif
 
 %changelog
+* Thu Jan 22 2009 Miroslav Lichvar <mlichvar@redhat.com> 2:2.5.6-1
+- update to 2.5.6 (#479108)
+- rebuild /etc/aliases.db only when necessary (#327651)
+- convert doc files to UTF-8
+
 * Thu Nov 20 2008 Miroslav Lichvar <mlichvar@redhat.com> 2:2.5.5-2
 - enable Large file support on 32-bit archs (#428996)
 - fix mailq(1) and newaliases(1) man pages (#429501)
diff --git a/sources b/sources
index a710966..63a5470 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 2f570477b2e205f9dfc1df13f00b5c0d  pflogsumm-1.1.1.tar.gz
-6b4b848bdd2239dddfc9d385e57e19ef  postfix-2.5.5.tar.gz
+ec2cb63b53f5f36c3ca91da8f3bc9407  postfix-2.5.6.tar.gz