X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=postfix.spec;h=69ffae3d217c73f4a4961e8c0404497b32d91020;hb=d5588fd1267b6610635507ec53ef8b101a88a96b;hp=179a25cb67dae8c86e873ad93deda5d7a73ce08f;hpb=44e28ce933d3f0cd8c342d1214c3adb98c06f367;p=packages%2Fpostfix.git

diff --git a/postfix.spec b/postfix.spec
index 179a25c..69ffae3 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -23,7 +23,7 @@
 %bcond_without	epoll	# disable epoll for 2.4 kernels
 %endif
 
-%define		vda_ver 2.5.5
+%define		vda_ver 2.7.0
 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
@@ -32,39 +32,39 @@ 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.5.6
-Release:	2
+Version:	2.7.1
+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:	ec2cb63b53f5f36c3ca91da8f3bc9407
+# Source0-md5:	b7a5c3ccd309156a65d6f8d2683d4fa1
 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_ver}-vda-ng.patch.gz
-# Source7-md5:	1e30fdda918cf7e87e124b0a551337d3
+Source7:	http://vda.sourceforge.net/VDA/%{name}-vda-%{vda_ver}.patch
+# Source7-md5:	f73d119fc9e00f31f23599176554e763
 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:	http://vda.sourceforge.net/VDA/%{name}-%{vda_ver}-vda-ng-64bit.patch.gz
-# Source11-md5:	3b982959b6bbe7eebada34dc0c26038b
+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
 Patch2:		%{name}-dynamicmaps.patch
 Patch3:		%{name}-master.cf_cyrus.patch
 # from http://akson.sgh.waw.pl/~chopin/unix/postfix-2.1.5-header_if_reject.diff
 Patch4:		%{name}-header_if_reject.patch
-Patch5:		%{name}-log-proxy-rejects.patch
-Patch6:		%{name}-ident.patch
-Patch7:		%{name}-lib64.patch
-Patch8:		%{name}-conf.patch
-Patch9:		%{name}-dictname.patch
-Patch10:	%{name}-make-jN.patch
+Patch5:		%{name}-ident.patch
+Patch6:		%{name}-lib64.patch
+Patch7:		%{name}-conf.patch
+Patch8:		%{name}-dictname.patch
+Patch9:		%{name}-make-jN.patch
 URL:		http://www.postfix.org/
 %{?with_sasl:BuildRequires:	cyrus-sasl-devel}
 BuildRequires:	db-devel
@@ -74,6 +74,7 @@ BuildRequires:	glibc-devel >= 6:2.3.4
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.0.12}
 %{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7l}
 BuildRequires:	pcre-devel
+BuildRequires:	perl-base
 %{?with_pgsql:BuildRequires:	postgresql-devel}
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -252,10 +253,9 @@ Plik monitrc do monitorowania serwera Postfix.
 
 %prep
 %setup -q
-%{?with_vda:zcat %{SOURCE7} | %{__patch} -p1 -s}
-%ifarch alpha %{x8664} ia64 ppc64 sparc64
-# XXX not actually sure what they mean with 64bit
-%{?with_vda:zcat %{SOURCE11} | %{__patch} -p1 -s}
+%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'
@@ -266,14 +266,13 @@ find -type f | xargs sed -i -e 's|/etc/postfix|/etc/mail|g'
 %patch3 -p1
 %{?with_hir:%patch4 -p0}
 %patch5 -p1
-%patch6 -p1
 sed -i '/scache_clnt_create/s/server/var_scache_service/' src/global/scache_clnt.c
 %if "%{_lib}" == "lib64"
-%patch7 -p1
+%patch6 -p1
 %endif
+%patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
 
 %if %{with tcp}
 sed -i 's/ifdef SNAPSHOT/if 1/' src/util/dict_open.c
@@ -290,7 +289,7 @@ export CC
 	%{!?with_ldap:LDAPSO=""} \
 	%{!?with_mysql:MYSQLSO=""} \
 	%{!?with_pgsql:PGSQLSO=""} \
-	CCARGS="%{!?with_epoll:-DNO_EPOLL} %{?with_ldap:-DHAS_LDAP} -DHAS_PCRE %{?with_sasl:-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl} %{?with_mysql:-DHAS_MYSQL -I/usr/include/mysql} %{?with_pgsql:-DHAS_PGSQL} %{?with_ssl:-DUSE_TLS} -DMAX_DYNAMIC_MAPS %{?with_cdb:-DHAS_CDB} -DHAVE_GETIFADDRS" \
+	CCARGS="%{!?with_epoll:-DNO_EPOLL} %{?with_ldap:-DHAS_LDAP} -DHAS_PCRE %{?with_sasl:-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl} %{?with_mysql:-DHAS_MYSQL -I/usr/include/mysql} %{?with_pgsql:-DHAS_PGSQL} %{?with_ssl:-DUSE_TLS} -DMAX_DYNAMIC_MAPS %{?with_cdb:-DHAS_CDB}" \
 	AUXLIBS="-ldb -lresolv %{?with_sasl:-lsasl} %{?with_ssl:-lssl -lcrypto} %{?with_cdb:-lcdb} -lpcre"
 
 %install
@@ -303,34 +302,34 @@ install -d $RPM_BUILD_ROOT/etc/{cron.daily,rc.d/init.d,sysconfig,pam.d,security,
 	$RPM_BUILD_ROOT%{_var}/lib/postfix
 rm -f html/Makefile.in conf/{LICENSE,main.cf.default}
 
-install bin/* $RPM_BUILD_ROOT%{_sbindir}
-install libexec/* $RPM_BUILD_ROOT%{_libdir}/postfix
+install -p bin/* $RPM_BUILD_ROOT%{_sbindir}
+install -p libexec/* $RPM_BUILD_ROOT%{_libdir}/postfix
 ln $RPM_BUILD_ROOT%{_libdir}/postfix/smtp $RPM_BUILD_ROOT%{_libdir}/postfix/lmtp
 ln $RPM_BUILD_ROOT%{_libdir}/postfix/qmgr $RPM_BUILD_ROOT%{_libdir}/postfix/nqmgr
-install conf/* $RPM_BUILD_ROOT%{_sysconfdir}/mail
+cp -a conf/* $RPM_BUILD_ROOT%{_sysconfdir}/mail
 sed -e's,^daemon_directory = .*,daemon_directory = %{_libdir}/postfix,' \
 	conf/main.cf > $RPM_BUILD_ROOT%{_sysconfdir}/mail/main.cf
 
 for f in dns global master util ; do
-	install lib/lib${f}.a $RPM_BUILD_ROOT%{_libdir}/libpostfix-${f}.so.1
+	cp -a lib/lib${f}.a $RPM_BUILD_ROOT%{_libdir}/libpostfix-${f}.so.1
 	ln -sf lib${f}.so.1 $RPM_BUILD_ROOT%{_libdir}/libpostfix-${f}.so
 done
-install lib/dict*.so $RPM_BUILD_ROOT%{_libdir}/postfix
-install include/*.h $RPM_BUILD_ROOT%{_includedir}/postfix
+install -p lib/dict*.so $RPM_BUILD_ROOT%{_libdir}/postfix
+cp -a include/*.h $RPM_BUILD_ROOT%{_includedir}/postfix
 
 cp -a man/man* $RPM_BUILD_ROOT%{_mandir}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mail/aliases
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/postfix
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mail/aliases
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/postfix
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/postfix
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/postfix
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sasl/smtpd.conf
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/smtp
-install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/mail/bounce.cf.pl
-install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/mail/bounce.cf.de
-install %{SOURCE10} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc
-install auxiliary/rmail/rmail $RPM_BUILD_ROOT%{_bindir}/rmail
-install auxiliary/qshape/qshape.pl $RPM_BUILD_ROOT%{_bindir}/qshape
+cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/postfix
+cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sasl/smtpd.conf
+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
+install -p auxiliary/rmail/rmail $RPM_BUILD_ROOT%{_bindir}/rmail
+install -p auxiliary/qshape/qshape.pl $RPM_BUILD_ROOT%{_bindir}/qshape
 
 ln -sf %{_sbindir}/sendmail $RPM_BUILD_ROOT%{_bindir}/mailq
 ln -sf %{_sbindir}/sendmail $RPM_BUILD_ROOT%{_bindir}/newaliases
@@ -346,6 +345,8 @@ touch $RPM_BUILD_ROOT/etc/security/blacklist.smtp
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/mail/makedefs.out
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mail/TLS_LICENSE
 
+rm $RPM_BUILD_ROOT%{_sysconfdir}/mail/{postfix-files,postfix-script,post-install}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -360,7 +361,14 @@ if ! grep -q "^postmaster:" %{_sysconfdir}/mail/aliases; then
 	echo "Adding Entry for postmaster in %{_sysconfdir}/mail/aliases" >&2
 	echo "postmaster: root" >>%{_sysconfdir}/mail/aliases
 fi
-if [ "$1" -gt "1" ]; then
+if [ "$1" = "1" ]; then
+	# only on installation, not upgrade; set sane defaults
+	# postfix expects gethostname() to return FQDN, which is obviously wrong
+	if ! grep -qE "^my(domain|hostname)" %{_sysconfdir}/mail/main.cf; then
+		[ `/bin/hostname -d` != 'localdomain' ] && \
+			postconf -e mydomain=`/bin/hostname -d`
+	fi
+else
 	%{_sbindir}/postfix upgrade-configuration
 fi
 
@@ -391,8 +399,8 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/access
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/aliases
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/bounce.cf.default
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/bounce.cf.de
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/bounce.cf.pl
+%lang(de) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/bounce.cf.de
+%lang(pl) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/bounce.cf.pl
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/canonical
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/generic
 #%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/regexp_table
@@ -404,9 +412,8 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/dynamicmaps.cf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/main.cf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/master.cf
-%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/postfix-script
-%attr(755,root,root) %{_sysconfdir}/mail/post-install
-%{_sysconfdir}/mail/postfix-files
+%{_sysconfdir}/mail/postfix-wrapper
+%{_sysconfdir}/mail/postmulti-script
 %attr(740,root,root) /etc/cron.daily/postfix
 %attr(754,root,root) /etc/rc.d/init.d/postfix
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/postfix
@@ -424,6 +431,7 @@ fi
 %attr(755,root,root) %{_sbindir}/postl*
 %attr(755,root,root) %{_sbindir}/postc*
 %attr(755,root,root) %{_sbindir}/postmap
+%attr(755,root,root) %{_sbindir}/postmulti
 %attr(2755,root,maildrop) %{_sbindir}/postqueue
 %attr(755,root,root) %{_sbindir}/postsuper
 %attr(2755,root,maildrop) %{_sbindir}/postdrop
@@ -464,6 +472,7 @@ fi
 %{_mandir}/man5/master.5*
 %{_mandir}/man5/nisplus_table.5*
 %{_mandir}/man5/postconf.5*
+%{_mandir}/man5/postfix-wrapper.5*
 %{_mandir}/man5/regexp_table.5*
 %{_mandir}/man5/relocated.5*
 %{_mandir}/man5/tcp_table.5*