X-Git-Url: https://git.tld-linux.org/?p=packages%2Fpostfix.git;a=blobdiff_plain;f=postfix.spec;h=12ae1187d781f1231b454fd67a78aba0ae371ab2;hp=46a3e21b56ce3d7202e4f709bbdecb16bfdff8a4;hb=fc611b918fe9db01760ff03d1728c251f8f8915c;hpb=5dc210e70d60223858a4ca80af9c3b37324ebf29

diff --git a/postfix.spec b/postfix.spec
index 46a3e21..12ae118 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.0.2
-Release:	4
+Version:	3.5.9
+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:	d1dc2c23011c222129db3d91aa4f312a
+# Source0-md5:	a4d1b2df03a500cf8f9759d5fca1c1f6
 Source1:	%{name}.aliases
 Source2:	%{name}.cron
 Source3:	%{name}.init
@@ -46,6 +46,7 @@ URL:		http://www.postfix.org/
 BuildRequires:	db-devel
 # getifaddrs() with IPv6 support
 BuildRequires:	glibc-devel >= 6:2.3.4
+BuildRequires:	libnsl-devel >= 1.3.0
 %{?with_mysql:BuildRequires:	mysql-devel}
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.0.12}
 %{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7l}
@@ -242,9 +243,6 @@ Plik monitrc do monitorowania serwera Postfix.
 
 %prep
 %setup -q
-
-find -type f | xargs sed -i -e 's|/etc/postfix|/etc/mail|g'
-
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -265,10 +263,10 @@ export CC
 	DEBUG="" \
 	OPT="%{rpmcflags} %{rpmcppflags} -D_FILE_OFFSET_BITS=64" \
 	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} %{?with_cdb:-DHAS_CDB} %{?with_sqlite:-DHAS_SQLITE}" \
-	%{?with_ldap:AUXLIBS_CDB="-lcdb"} \
+	%{?with_cdb:AUXLIBS_CDB="-lcdb"} \
 	%{?with_ldap:AUXLIBS_LDAP="-lldap -llber"} \
 	%{?with_mysql:AUXLIBS_MYSQL="-lmysqlclient"} \
-	%{?with_ldap:AUXLIBS_PCRE="-lpcre"} \
+	AUXLIBS_PCRE="-lpcre" \
 	%{?with_pgsql:AUXLIBS_PGSQL="-lpq"} \
 	%{?with_sqlite:AUXLIBS_SQLITE="-lsqlite3 -lpthread"} \
 	AUXLIBS="%{?with_sasl:-lsasl} %{?with_ssl:-lssl -lcrypto}"
@@ -276,21 +274,24 @@ export CC
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{cron.daily,rc.d/init.d,sysconfig,pam.d,security,monit} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/{mail,sasl} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/{postfix,sasl} \
 	$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
 
-%{__rm} html/Makefile.in conf/{LICENSE,main.cf.default}
+%{__rm} -f html/Makefile.in conf/{LICENSE,main.cf.default}
 
 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
-cp -a conf/* $RPM_BUILD_ROOT%{_sysconfdir}/mail
+cp -a conf/* $RPM_BUILD_ROOT%{_sysconfdir}/postfix
 sed -e's,^daemon_directory = .*,daemon_directory = %{_libdir}/postfix,' \
-	conf/main.cf > $RPM_BUILD_ROOT%{_sysconfdir}/mail/main.cf
+	conf/main.cf > $RPM_BUILD_ROOT%{_sysconfdir}/postfix/main.cf
+
+sed -e 's,${LIB_PREFIX},%{_libdir}/postfix/postfix-,g;s,${LIB_SUFFIX},.so,g' \
+	conf/dynamicmaps.cf > $RPM_BUILD_ROOT%{_sysconfdir}/postfix/dynamicmaps.cf
 
 for f in dns global master util tls; do
 	cp -a lib/libpostfix-${f}.so $RPM_BUILD_ROOT%{_libdir}/libpostfix-${f}.so.1
@@ -303,14 +304,14 @@ cp -a include/*.h $RPM_BUILD_ROOT%{_includedir}/postfix
 
 cp -a man/man* $RPM_BUILD_ROOT%{_mandir}
 
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mail/aliases
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/postfix/aliases
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/postfix
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/postfix
 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 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/mail/bounce.cf.pl
-cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/mail/bounce.cf.de
+cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/postfix/bounce.cf.pl
+cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/postfix/bounce.cf.de
 cp -a %{SOURCE9} $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
@@ -319,17 +320,17 @@ ln -sf %{_sbindir}/sendmail $RPM_BUILD_ROOT%{_bindir}/mailq
 ln -sf %{_sbindir}/sendmail $RPM_BUILD_ROOT%{_bindir}/newaliases
 ln -sf %{_sbindir}/sendmail $RPM_BUILD_ROOT/usr/lib/sendmail
 
-touch $RPM_BUILD_ROOT%{_sysconfdir}/mail/\
+touch $RPM_BUILD_ROOT%{_sysconfdir}/postfix/\
 	{aliases,access,canonical,relocated,transport,virtual}{,.db}
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.smtp
 
 > $RPM_BUILD_ROOT/var/spool/postfix/.nofinger
 
-%{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/mail/makedefs.out
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/mail/TLS_LICENSE
+%{__rm} -rf $RPM_BUILD_ROOT%{_sysconfdir}/postfix/makedefs.out
+%{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/postfix/TLS_LICENSE
 
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/mail/{postfix-script,post-install}
+%{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/postfix/{postfix-script,postfix-tls-script,postfix-wrapper,post-install,postmulti-script}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -341,14 +342,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-if ! grep -q "^postmaster:" %{_sysconfdir}/mail/aliases; then
-	echo "Adding Entry for postmaster in %{_sysconfdir}/mail/aliases" >&2
-	echo "postmaster: root" >>%{_sysconfdir}/mail/aliases
+if ! grep -q "^postmaster:" %{_sysconfdir}/postfix/aliases; then
+	echo "Adding Entry for postmaster in %{_sysconfdir}/postfix/aliases" >&2
+	echo "postmaster: root" >>%{_sysconfdir}/postfix/aliases
 fi
 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
+	if ! grep -qE "^my(domain|hostname)" %{_sysconfdir}/postfix/main.cf; then
 		domain=$(/bin/hostname -d 2>/dev/null)
 		[ -n "$domain" -a "$domain" != 'localdomain' ] && \
 			postconf -e mydomain="$domain"
@@ -375,31 +376,60 @@ if [ "$1" = "0" ]; then
 	%groupremove postfix
 fi
 
+%triggerun -- %{name} < 2:3.4.6-2
+if [ $1 -le 1 ]; then
+        exit 0
+fi
+[ -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 || :
+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
+	f=${f##*/}
+	[ "$f" = "*.db" ] && break
+	[ -f "/etc/mail/$f" ] && rm "/etc/mail/$f" 2>/dev/null || :
+	f=${f%%.db}
+	[ -f "/etc/mail/$f" ] && mv "/etc/mail/$f" /etc/postfix 2>/dev/null || :
+	if [ "$f" = "aliases" ]; then
+		/usr/sbin/postalias "/etc/postfix/aliases" 2>/dev/null || :
+	else
+		/usr/sbin/postmap "/etc/postfix/$f" 2>/dev/null || :
+	fi
+done
+[ -n "$(find /etc/mail -type d -empty 2>/dev/null)" ] && rmdir /etc/mail 2>/dev/null || :
+
+%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"
+echo "to /etc/postfix and/or run postmap on some files in /etc/postfix."
+echo
+
 %files
 %defattr(644,root,root,755)
 %doc html COMPATIBILITY HISTORY LICENSE RELEASE_NOTES* TLS_*
 %doc README_FILES/*README
 %doc examples/smtpd-policy
-%dir %{_sysconfdir}/mail
-%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
-%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
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/relocated
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/transport
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/virtual
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/header_checks
-#%ghost %{_sysconfdir}/mail/*.db
-%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
-%{_sysconfdir}/mail/postfix-files
-%{_sysconfdir}/mail/postfix-wrapper
-%{_sysconfdir}/mail/postmulti-script
+%dir %{_sysconfdir}/postfix
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/access
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/aliases
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/bounce.cf.default
+%lang(de) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/bounce.cf.de
+%lang(pl) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/bounce.cf.pl
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/canonical
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/generic
+#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/regexp_table
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/relocated
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/transport
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/virtual
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/header_checks
+#%ghost %{_sysconfdir}/postfix/*.db
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/dynamicmaps.cf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/main.cf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/postfix/master.cf
+%{_sysconfdir}/postfix/postfix-files
 %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
@@ -427,6 +457,11 @@ fi
 %attr(755,root,root) /usr/lib/sendmail
 %dir %{_libdir}/postfix
 %attr(755,root,root) %{_libdir}/postfix/[!d]*
+%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-ldap.so
+%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-mysql.so
+%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-pcre.so
+%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-pgsql.so
+%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-sqlite.so
 %attr(755,root,root) %{_libdir}/postfix/discard
 %attr(755,root,root) %{_libdir}/postfix/dnsblog
 %attr(755,root,root) %dir %{_var}/spool/postfix
@@ -437,7 +472,7 @@ fi
 %attr(700,postfix,root) %dir %{_var}/spool/postfix/deferred
 %attr(700,postfix,root) %dir %{_var}/spool/postfix/incoming
 %attr(1730,postfix,maildrop) %dir %{_var}/spool/postfix/maildrop
-%attr(755,postfix,root) %dir %{_var}/spool/postfix/pid
+%attr(755,root,root) %dir %{_var}/spool/postfix/pid
 %attr(700,postfix,root) %dir %{_var}/spool/postfix/private
 %attr(710,postfix,maildrop) %dir %{_var}/spool/postfix/public
 %attr(700,postfix,root) %dir %{_var}/spool/postfix/saved