X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=postfix.spec;h=dc40c57a20e314cc8d5f63757d6fe2187bfe1619;hb=7f8e63cf015aced48f9fd0070f1dc0553b24fa91;hp=06d83b5c8ec8f707fdfb30e85c2f1dc2bea532a7;hpb=b6e947d3b030bb05b639c213e25151e3801867f6;p=packages%2Fpostfix.git

diff --git a/postfix.spec b/postfix.spec
index 06d83b5..dc40c57 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -7,12 +7,9 @@
 %bcond_without	sasl	# without SMTP AUTH support
 %bcond_without	ssl	# without SSL/TLS support
 %bcond_without	cdb	# without cdb map support
-%bcond_with	vda	# with VDA patch
-%bcond_with	hir	# with Beeth's header_if_reject patch
 %bcond_with	tcp	# with unofficial tcp: lookup table
 %bcond_without	epoll	# disable epoll for 2.4 kernels
 
-%define		vda_ver v11-2.9.1
 Summary:	Postfix Mail Transport Agent
 Summary(cs.UTF-8):	Postfix - program pro přepravu pošty (MTA)
 Summary(es.UTF-8):	Postfix - Un MTA (Mail Transport Agent) de alto desempeño
@@ -21,27 +18,23 @@ 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:	2.11.3
-Release:	2
+Version:	2.11.5
+Release:	1
 Epoch:		2
 License:	distributable
 Group:		Networking/Daemons/SMTP
 Source0:	ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
-# Source0-md5:	c3f0f51d8865559b40e9350eb3816011
+# Source0-md5:	8523f6d1de6f522313207524d794ee9c
 Source1:	%{name}.aliases
 Source2:	%{name}.cron
 Source3:	%{name}.init
 Source4:	%{name}.sysconfig
 Source5:	%{name}.sasl
 Source6:	%{name}.pamd
-Source7:	http://vda.sourceforge.net/VDA/%{name}-vda-%{vda_ver}.patch
-# Source7-md5:	a54a21428de5eeae91b4bb670976e37a
 Source8:	%{name}-bounce.cf.pl
 # http://postfix.state-of-mind.de/bounce-templates/bounce.de-DE.cf
 Source9:	%{name}-bounce.cf.de
 Source10:	%{name}.monitrc
-Source11:	%{name}-vda-bigquota.patch
-#Source11:	http://vda.sourceforge.net/VDA/%{name}-%{vda_ver}-vda-ng-bigquota.patch.gz
 # -ource11-md5:	d46103195b43ec5784ea2c166b238f71
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-conf_msg.patch
@@ -56,7 +49,6 @@ Patch8:		%{name}-dictname.patch
 Patch9:		%{name}-make-jN.patch
 Patch10:	%{name}-link.patch
 Patch11:	%{name}-scache_clnt.patch
-Patch12:	format-security.patch
 URL:		http://www.postfix.org/
 %{?with_sasl:BuildRequires:	cyrus-sasl-devel}
 BuildRequires:	db-devel
@@ -258,10 +250,6 @@ Plik monitrc do monitorowania serwera Postfix.
 
 %prep
 %setup -q
-%if %{with vda}
-cat %{SOURCE7} | %{__patch} -p1 -s
-cat %{SOURCE11} | %{__patch} -p1 -s
-%endif
 
 find -type f | xargs sed -i -e 's|/etc/postfix|/etc/mail|g'
 
@@ -269,7 +257,6 @@ find -type f | xargs sed -i -e 's|/etc/postfix|/etc/mail|g'
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
-%{?with_hir:%patch4 -p0}
 %patch5 -p1
 sed -i '/scache_clnt_create/s/server/var_scache_service/' src/global/scache_clnt.c
 %if "%{_lib}" == "lib64"
@@ -280,9 +267,6 @@ sed -i '/scache_clnt_create/s/server/var_scache_service/' src/global/scache_clnt
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%if %{with vda}
-%patch12 -p1
-%endif
 
 %if %{with tcp}
 sed -i 's/ifdef SNAPSHOT/if 1/' src/util/dict_open.c