X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=postfix.spec;h=d9d65deb5b6a76fb636e485494f998eb7697d358;hb=abfc08773f5d2ded4b5e49b2b0b62f06a4caa944;hp=4dbbc84bfe652a7354b73c1e2139aaad9c461458;hpb=6bfc6f70edeec380c113a192aa15cfb94d0a5d5b;p=packages%2Fpostfix.git

diff --git a/postfix.spec b/postfix.spec
index 4dbbc84..d9d65de 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -17,13 +17,13 @@ Summary(pl.UTF-8):	Serwer SMTP Postfix
 Summary(pt_BR.UTF-8):	Postfix - Um MTA (Mail Transport Agent) de alto desempenho
 Summary(sk.UTF-8):	Agent prenosu pošty Postfix
 Name:		postfix
-Version:	3.3.2
-Release:	2
+Version:	3.4.6
+Release:	5
 Epoch:		2
 License:	distributable
 Group:		Networking/Daemons/SMTP
 Source0:	ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
-# Source0-md5:	4e6ed7056576e0c54cfce6040a0bb0ad
+# Source0-md5:	5aa930a8ce3cc6f82247dbd9f536380c
 Source1:	%{name}.aliases
 Source2:	%{name}.cron
 Source3:	%{name}.init
@@ -41,6 +41,7 @@ Patch2:		%{name}-master.cf_cyrus.patch
 Patch3:		%{name}-conf.patch
 Patch4:		%{name}-link.patch
 Patch5:		%{name}-scache_clnt.patch
+Patch6:		glibc-2.30.patch
 URL:		http://www.postfix.org/
 %{?with_sasl:BuildRequires:	cyrus-sasl-devel}
 BuildRequires:	db-devel
@@ -249,6 +250,7 @@ sed -i '/scache_clnt_create/s/server/var_scache_service/' src/global/scache_clnt
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__make} -f Makefile.init makefiles
@@ -375,14 +377,14 @@ if [ "$1" = "0" ]; then
 	%groupremove postfix
 fi
 
-%triggerun -- %{name} < 2:3.3.2-2
+%triggerun -- %{name} < 2:3.4.6-2
 if [ $1 -le 1 ]; then
         exit 0
 fi
-set -x
+[ -d /etc/postfix ] || mkdir /etc/postfix 2>/dev/null || :
 for f in /etc/mail/{access,aliases,body_checks,bounce.cf.*,canonical,dynamicmaps.cf,generic,header_checks,main.cf,master.cf,postfix-files,relocated,transport,virtual}; do
-  f=${f##*/}
-  [ -f "/etc/mail/$f" ] && mv "/etc/mail/$f" "/etc/postfix/$f" 2>/dev/null || :
+	f=${f##*/}
+	[ -f "/etc/mail/$f" ] && mv "/etc/mail/$f" "/etc/postfix/$f" 2>/dev/null || :
 done
 find /etc/postfix -type f 2>/dev/null | xargs sed -i -e 's|/etc/mail|/etc/postfix|g' 2>/dev/null
 for f in /etc/mail/*.db; do
@@ -398,9 +400,8 @@ for f in /etc/mail/*.db; do
 	fi
 done
 [ -n "$(find /etc/mail -type d -empty 2>/dev/null)" ] && rmdir /etc/mail 2>/dev/null || :
-set +x
 
-%triggerpostun -- %{name} < 2:3.3.2-2
+%triggerpostun -- %{name} < 2:3.4.6-2
 echo
 echo "Warning! Configuration has been migrated to /etc/postfix."
 echo "It may be required to move some files manually from /etc/mail"