- updated to 3.0.2

diff --git a/postfix.spec b/postfix.spec
index 282026a0ce38f53936d36692cc5e4065b69d3d1c..d446277923550a516b55ac1f3da661f105c7115b 100644 (file)
--- a/postfix.spec
+++ b/postfix.spec
@@ -7,7 +7,6 @@
 %bcond_without sasl    # without SMTP AUTH support
 %bcond_without ssl     # without SSL/TLS support
 %bcond_without cdb     # without cdb map support
-%bcond_with    tcp     # with unofficial tcp: lookup table
 %bcond_without epoll   # disable epoll for 2.4 kernels
 
 Summary:       Postfix Mail Transport Agent
@@ -18,34 +17,30 @@ 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.5
+Version:       3.0.2
 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: 8523f6d1de6f522313207524d794ee9c
+# Source0-md5: d1dc2c23011c222129db3d91aa4f312a
 Source1:       %{name}.aliases
 Source2:       %{name}.cron
 Source3:       %{name}.init
 Source4:       %{name}.sysconfig
 Source5:       %{name}.sasl
 Source6:       %{name}.pamd
-Source8:       %{name}-bounce.cf.pl
+Source7:       %{name}-bounce.cf.pl
 # http://postfix.state-of-mind.de/bounce-templates/bounce.de-DE.cf
-Source9:       %{name}-bounce.cf.de
-Source10:      %{name}.monitrc
+Source8:       %{name}-bounce.cf.de
+Source9:       %{name}.monitrc
 # -ource11-md5:        d46103195b43ec5784ea2c166b238f71
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-conf_msg.patch
-Patch2:                %{name}-dynamicmaps.patch
-Patch3:                %{name}-master.cf_cyrus.patch
-Patch6:                %{name}-lib64.patch
-Patch7:                %{name}-conf.patch
-Patch8:                %{name}-dictname.patch
-Patch9:                %{name}-make-jN.patch
-Patch10:       %{name}-link.patch
-Patch11:       %{name}-scache_clnt.patch
+Patch2:                %{name}-master.cf_cyrus.patch
+Patch3:                %{name}-conf.patch
+Patch4:                %{name}-link.patch
+Patch5:                %{name}-scache_clnt.patch
 URL:           http://www.postfix.org/
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel}
 BuildRequires: db-devel
@@ -251,36 +246,28 @@ Plik monitrc do monitorowania serwera Postfix.
 find -type f | xargs sed -i -e 's|/etc/postfix|/etc/mail|g'
 
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1
 sed -i '/scache_clnt_create/s/server/var_scache_service/' src/global/scache_clnt.c
-%if "%{_lib}" == "lib64"
-%patch6 -p1
-%endif
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-
-%if %{with tcp}
-sed -i 's/ifdef SNAPSHOT/if 1/' src/util/dict_open.c
-%endif
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %{__make} -f Makefile.init makefiles
 %{__make} tidy
 CC="%{__cc}"
 export CC
-%{__make} \
+%{__make} -j1 \
+       dynamicmaps=yes \
        DEBUG="" \
        OPT="%{rpmcflags} %{rpmcppflags} -D_FILE_OFFSET_BITS=64" \
-       %{!?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}" \
-       AUXLIBS="-ldb -lresolv %{?with_sasl:-lsasl} %{?with_ssl:-lssl -lcrypto} %{?with_cdb:-lcdb} -lpcre"
+       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_LDAP="-lldap -llber"} \
+       %{?with_mysql:AUXLIBS_MYSQL="-lmysqlclient"} \
+       %{?with_pgsql:AUXLIBS_PGSQL="-lpq"} \
+       %{?with_sqlite:AUXLIBS_SQLITE="-lsqlite3 -lpthread"} \
+       AUXLIBS="%{?with_sasl:-lsasl} %{?with_ssl:-lssl -lcrypto}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -301,11 +288,13 @@ 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
-       cp -a lib/lib${f}.a $RPM_BUILD_ROOT%{_libdir}/libpostfix-${f}.so.1
+for f in dns global master util tls; do
+       cp -a lib/libpostfix-${f}.so $RPM_BUILD_ROOT%{_libdir}/libpostfix-${f}.so.1
        ln -sf lib${f}.so.1 $RPM_BUILD_ROOT%{_libdir}/libpostfix-${f}.so
 done
-install -p lib/dict*.so $RPM_BUILD_ROOT%{_libdir}/postfix
+for f in cdb mysql ldap pcre pgsql sqlite; do
+       install -p lib/postfix-${f}.so $RPM_BUILD_ROOT%{_libdir}/postfix
+done
 cp -a include/*.h $RPM_BUILD_ROOT%{_includedir}/postfix
 
 cp -a man/man* $RPM_BUILD_ROOT%{_mandir}
@@ -316,9 +305,9 @@ 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 %{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 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/mail/bounce.cf.pl
+cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/mail/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
 
@@ -485,34 +474,33 @@ fi
 %if %{with ldap}
 %files dict-ldap
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/postfix/dict_ldap.so
+%attr(755,root,root) %{_libdir}/postfix/postfix-ldap.so
 %{_mandir}/man5/ldap_table.5*
 %endif
 
 %if %{with mysql}
 %files dict-mysql
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/postfix/dict_mysql.so
+%attr(755,root,root) %{_libdir}/postfix/postfix-mysql.so
 %{_mandir}/man5/mysql_table.5*
 %endif
 
 %files dict-pcre
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/postfix/dict_pcre.so
-#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/pcre_table
+%attr(755,root,root) %{_libdir}/postfix/postfix-pcre.so
 %{_mandir}/man5/pcre_table.5*
 
 %if %{with pgsql}
 %files dict-pgsql
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/postfix/dict_pgsql.so
+%attr(755,root,root) %{_libdir}/postfix/postfix-pgsql.so
 %{_mandir}/man5/pgsql_table.5*
 %endif
 
 %if %{with sqlite}
 %files dict-sqlite
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/postfix/dict_sqlite.so
+%attr(755,root,root) %{_libdir}/postfix/postfix-sqlite.so
 %{_mandir}/man5/sqlite_table.5*
 %endif