X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=postfix.spec;h=a0dba3fe708f8cb12b84c2d9454e176ee533c691;hb=6381fab3850870a316120f0532bfab53f20f48b9;hp=c14ca6dd83047561fdc1ab8b8a8a296d7ef2a653;hpb=6645179ed6dc11a0cca0b3d0a31c3ab2856fa755;p=packages%2Fpostfix.git

diff --git a/postfix.spec b/postfix.spec
index c14ca6d..a0dba3f 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -7,22 +7,10 @@
 %bcond_without	sasl	# without SMTP AUTH support
 %bcond_without	ssl	# without SSL/TLS support
 %bcond_without	cdb	# without cdb map support
-%if "%{pld_release}" == "th"
-%bcond_without	vda	# without VDA patch
-%else
 %bcond_with	vda	# with VDA patch
-%endif
 %bcond_with	hir	# with Beeth's header_if_reject patch
 %bcond_with	tcp	# with unofficial tcp: lookup table
-%if "%{pld_release}" == "ac"
-%bcond_with		epoll	# enable epoll for 2.6 kernels
-# there didn't exist x86_64 2.4 kernel in PLD, so can safely enable epoll
-%ifarch %{x8664}
-%define		with_epoll	1
-%endif
-%else
 %bcond_without	epoll	# disable epoll for 2.4 kernels
-%endif
 
 %define		vda_ver v11-2.9.1
 Summary:	Postfix Mail Transport Agent
@@ -33,13 +21,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:	2.10.0
+Version:	2.11.4
 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:	b2a563b2d5c53462952886e6fc4e4b7b
+# Source0-md5:	7f1f67b205992f3e8acc98d597a4deef
 Source1:	%{name}.aliases
 Source2:	%{name}.cron
 Source3:	%{name}.init
@@ -55,7 +43,6 @@ 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
-Source12:	%{name}.service
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-conf_msg.patch
 Patch2:		%{name}-dynamicmaps.patch
@@ -102,7 +89,6 @@ Requires:	findutils
 Requires:	rc-scripts
 Requires:	sed
 %{?with_cdb:Requires:tinycdb}
-Requires:	systemd-units >= 38
 Suggests:	cyrus-sasl-saslauthd
 Provides:	group(postfix)
 Provides:	smtpdaemon
@@ -323,8 +309,7 @@ install -d $RPM_BUILD_ROOT/etc/{cron.daily,rc.d/init.d,sysconfig,pam.d,security,
 	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/postfix,/usr/lib}\
 	$RPM_BUILD_ROOT{%{_includedir}/postfix,%{_mandir}} \
 	$RPM_BUILD_ROOT%{_var}/spool/postfix/{active,corrupt,deferred,maildrop,private,saved,bounce,defer,incoming,pid,public} \
-	$RPM_BUILD_ROOT%{_var}/lib/postfix \
-	$RPM_BUILD_ROOT%{systemdunitdir}
+	$RPM_BUILD_ROOT%{_var}/lib/postfix
 
 %{__rm} html/Makefile.in conf/{LICENSE,main.cf.default}
 
@@ -354,7 +339,6 @@ cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/smtp
 cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/mail/bounce.cf.pl
 cp -a %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/mail/bounce.cf.de
 cp -a %{SOURCE10} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc
-cp -a %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
 install -p auxiliary/rmail/rmail $RPM_BUILD_ROOT%{_bindir}/rmail
 install -p auxiliary/qshape/qshape.pl $RPM_BUILD_ROOT%{_bindir}/qshape
 
@@ -403,14 +387,12 @@ fi
 %{_bindir}/newaliases
 /sbin/chkconfig --add postfix
 %service postfix restart "Postfix Daemon"
-#%%systemd_post
 
 %preun
 if [ "$1" = "0" ]; then
 	%service postfix stop
 	/sbin/chkconfig --del postfix
 fi
-#%%systemd_preun
 
 %postun
 /sbin/ldconfig
@@ -419,7 +401,6 @@ if [ "$1" = "0" ]; then
 	%userremove postfix
 	%groupremove postfix
 fi
-#%%systemd_postun
 
 %files
 %defattr(644,root,root,755)
@@ -458,6 +439,7 @@ fi
 %attr(755,root,root) %{_sbindir}/s*
 %attr(755,root,root) %{_sbindir}/postfix
 %attr(755,root,root) %{_sbindir}/postalias
+%attr(2755,root,maildrop) %{_sbindir}/postdrop
 %attr(755,root,root) %{_sbindir}/postkick
 %attr(755,root,root) %{_sbindir}/postl*
 %attr(755,root,root) %{_sbindir}/postc*
@@ -465,7 +447,7 @@ fi
 %attr(755,root,root) %{_sbindir}/postmulti
 %attr(2755,root,maildrop) %{_sbindir}/postqueue
 %attr(755,root,root) %{_sbindir}/postsuper
-%attr(2755,root,maildrop) %{_sbindir}/postdrop
+%attr(755,root,root) %{_sbindir}/posttls-finger
 %attr(755,root,root) %{_sbindir}/qmqp-sink
 %attr(755,root,root) %{_sbindir}/qmqp-source
 %attr(755,root,root) /usr/lib/sendmail
@@ -501,6 +483,7 @@ fi
 %{_mandir}/man5/cidr_table.5*
 %{_mandir}/man5/generic.5*
 %{_mandir}/man5/header_checks.5*
+%{_mandir}/man5/lmdb_table.5*
 %{_mandir}/man5/master.5*
 %{_mandir}/man5/memcache_table.5*
 %{_mandir}/man5/nisplus_table.5*
@@ -508,11 +491,11 @@ fi
 %{_mandir}/man5/postfix-wrapper.5*
 %{_mandir}/man5/regexp_table.5*
 %{_mandir}/man5/relocated.5*
+%{_mandir}/man5/socketmap_table.5*
 %{_mandir}/man5/tcp_table.5*
 %{_mandir}/man5/transport.5*
 %{_mandir}/man5/virtual.5*
 %{_mandir}/man8/*.8*
-%{systemdunitdir}/%{name}.service
 
 %files devel
 %defattr(644,root,root,755)