Author: hawk Date: Tue May 13 20:40:35 2008 GMT Module: SPECS Tag: Titanium ---- Log message: - merged update to 2.5.1 from HEAD
---- Files affected: SPECS: postfix.spec (1.302.2.2 -> 1.302.2.3) ---- Diffs: ================================================================ Index: SPECS/postfix.spec diff -u SPECS/postfix.spec:1.302.2.2 SPECS/postfix.spec:1.302.2.3 --- SPECS/postfix.spec:1.302.2.2 Wed Jan 23 16:07:32 2008 +++ SPECS/postfix.spec Tue May 13 22:40:30 2008 @@ -10,8 +10,9 @@ %bcond_with vda # without 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 2.4.5 +%define vda_ver 2.5.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 @@ -20,13 +21,13 @@ 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.4.6 -Release: 4 +Version: 2.5.1 +Release: 6 Epoch: 2 License: distributable Group: Networking/Daemons Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz -# Source0-md5: 303327f66c13ff9631734651ee184a88 +# Source0-md5: 95a559c509081fdd07d78eafd4f4c3b4 Source1: %{name}.aliases Source2: %{name}.cron Source3: %{name}.init @@ -34,7 +35,7 @@ Source5: %{name}.sasl Source6: %{name}.pamd Source7: http://vda.sourceforge.net/VDA/%{name}-%{vda_ver}-vda-ng.patch.gz -# Source7-md5: 35fa62c93091d42ab02f67d0614d7086 +# Source7-md5: bba9426f8ae9d8603861ce782f117760 Source8: %{name}-bounce.cf.pl # http://postfix.state-of-mind.de/bounce-templates/bounce.de-DE.cf Source9: %{name}-bounce.cf.de @@ -50,14 +51,15 @@ Patch7: %{name}-lib64.patch Patch8: %{name}-conf.patch Patch9: %{name}-dictname.patch +Patch10: %{name}-make-jN.patch URL: http://www.postfix.org/ %{?with_sasl:BuildRequires: cyrus-sasl-devel} BuildRequires: db-devel # getifaddrs() with IPv6 support BuildRequires: glibc-devel >= 6:2.3.4 %{?with_mysql:BuildRequires: mysql-devel} -%{?with_ldap:BuildRequires: openldap-devel >= 2.4.6} -%{?with_ssl:BuildRequires: openssl-devel >= 0.9.8b} +%{?with_ldap:BuildRequires: openldap-devel >= 2.0.12} +%{?with_ssl:BuildRequires: openssl-devel >= 0.9.7l} BuildRequires: pcre-devel %{?with_pgsql:BuildRequires: postgresql-devel} BuildRequires: rpmbuild(macros) >= 1.268 @@ -156,7 +158,7 @@ Summary(pl.UTF-8): ObsĹuga map LDAP dla Postfiksa Group: Networking/Daemons Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: openldap >= 2.4.6 +Requires: openldap >= 2.3.6 %description dict-ldap This package provides support for LDAP maps in Postfix. @@ -253,6 +255,7 @@ %endif %patch8 -p1 %patch9 -p1 +%patch10 -p1 %if %{with tcp} sed -i 's/ifdef SNAPSHOT/if 1/' src/util/dict_open.c @@ -269,7 +272,7 @@ %{!?with_ldap:LDAPSO=""} \ %{!?with_mysql:MYSQLSO=""} \ %{!?with_pgsql:PGSQLSO=""} \ - CCARGS="%{?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} -DHAVE_GETIFADDRS" \ AUXLIBS="-ldb -lresolv %{?with_sasl:-lsasl} %{?with_ssl:-lssl -lcrypto} %{?with_cdb:-lcdb} -lpcre" %install @@ -278,8 +281,8 @@ $RPM_BUILD_ROOT%{_sysconfdir}/{mail,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}/spool/postfix/{active,corrupt,deferred,maildrop,private,saved,bounce,defer,incoming,pid,public} \ + $RPM_BUILD_ROOT%{_var}/lib/postfix rm -f html/Makefile.in conf/{LICENSE,main.cf.default} install bin/* $RPM_BUILD_ROOT%{_sbindir} @@ -323,6 +326,7 @@ > $RPM_BUILD_ROOT/var/spool/postfix/.nofinger rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/mail/makedefs.out +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mail/TLS_LICENSE %clean rm -rf $RPM_BUILD_ROOT @@ -362,7 +366,7 @@ %files %defattr(644,root,root,755) -%doc html *README COMPATIBILITY HISTORY LICENSE RELEASE_NOTES TLS_* +%doc html COMPATIBILITY HISTORY LICENSE RELEASE_NOTES* TLS_* %doc README_FILES/*README %doc examples/smtpd-policy %dir %{_sysconfdir}/mail @@ -424,6 +428,7 @@ %attr(710,postfix,maildrop) %dir %{_var}/spool/postfix/public %attr(700,postfix,root) %dir %{_var}/spool/postfix/saved %attr(644,postfix,root) %{_var}/spool/postfix/.nofinger +%attr(700,postfix,root) %{_var}/lib/postfix %{_mandir}/man1/mailq.1* %{_mandir}/man1/newaliases.1* %{_mandir}/man1/post*.1* @@ -495,6 +500,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.302.2.3 2008-05-13 20:40:30 hawk +- merged update to 2.5.1 from HEAD + Revision 1.302.2.2 2008-01-23 15:07:32 hawk - merged HEAD changes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/postfix.spec?r1=1.302.2.2&r2=1.302.2.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
