Author: arekm Date: Sat Nov 14 09:04:48 2009 GMT Module: packages Tag: HEAD ---- Log message: - up to 4.70
---- Files affected: packages/exim: exim.spec (1.308 -> 1.309) , exim4-Makefile-Default.patch (1.3 -> 1.4) , exim-fixes.patch (1.1 -> NONE) (REMOVED), exim4-use_system_pcre.patch (1.5 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/exim/exim.spec diff -u packages/exim/exim.spec:1.308 packages/exim/exim.spec:1.309 --- packages/exim/exim.spec:1.308 Sat Sep 12 13:09:40 2009 +++ packages/exim/exim.spec Sat Nov 14 10:04:42 2009 @@ -9,21 +9,20 @@ %bcond_without ldap # without LDAP support %bcond_without spf # without spf support %bcond_without srs # without srs support -%bcond_without dkeys # without domainkeys support # Summary: University of Cambridge Mail Transfer Agent Summary(pl.UTF-8): Agent Transferu Poczty Uniwersytetu w Cambridge Summary(pt_BR.UTF-8): Servidor de correio eletrônico exim Name: exim -Version: 4.69 -Release: 10 +Version: 4.70 +Release: 1 Epoch: 2 License: GPL Group: Networking/Daemons/SMTP -Source0: ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/%{name}-%{version}.tar.bz2 -# Source0-md5: 6f29f073328c858d8554b08cc0c3c2be -Source1: ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/%{name}-texinfo-%{version}.tar.bz2 -# Source1-md5: effde5ffe1861bd9eb33d300590a06aa +Source0: ftp://ftp.exim.org/pub/exim/exim4/%{name}-%{version}.tar.bz2 +# Source0-md5: 30e77669ee25e3606da74b0ff88daf83 +Source1: ftp://ftp.exim.org/pub/exim/exim4/%{name}-texinfo-%{version}.tar.bz2 +# Source1-md5: 7956b0931e4b4035a693544782402abf Source2: %{name}.init Source3: %{name}.cron.db Source4: %{name}4.conf @@ -45,7 +44,6 @@ Patch0: %{name}4-EDITME.patch Patch1: %{name}4-monitor-EDITME.patch Patch2: %{name}4-cflags.patch -Patch3: %{name}4-use_system_pcre.patch Patch4: %{name}4-Makefile-Default.patch # http://marc.merlins.org/linux/exim/files/sa-exim-cvs/localscan_dlopen_exim_4.20_or_better.patch Patch5: localscan_dlopen_%{name}_4.20_or_better.patch @@ -53,12 +51,10 @@ # http://sourceforge.net/projects/eximdsn/ Patch7: %{name}_463_dsn_1_3.patch Patch8: %{name}-spam-timeout.patch -Patch9: %{name}-fixes.patch Patch10: %{name}-force-sigalrm.patch URL: http://www.exim.org/ %{?with_sasl:BuildRequires: cyrus-sasl-devel >= 2.1.0} BuildRequires: db-devel -%{?with_dkeys:BuildRequires: libdomainkeys-devel >= 0.68} %{?with_spf:BuildRequires: libspf2-devel >= 1.2.5-2} %{?with_srs:BuildRequires: libsrs_alt-devel >= 1.0} %{?with_mysql:BuildRequires: mysql-devel} @@ -157,13 +153,11 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 %patch10 -p1 install %{SOURCE13} doc/FAQ.txt.bz2 @@ -177,7 +171,7 @@ %{__make} -j1 \ FULLECHO='' \ CC="%{__cc}" \ - CUSTOM_CFLAGS="%{rpmcppflags} %{rpmcflags} -DSUPPORT_DSN=yes %{?with_spf:-DEXPERIMENTAL_SPF=yes} %{?with_srs:-DEXPERIMENTAL_SRS=yes} %{?with_dkeys:-DEXPERIMENTAL_DOMAINKEYS=yes}" \ + CUSTOM_CFLAGS="%{rpmcppflags} %{rpmcflags} -DSUPPORT_DSN=yes %{?with_spf:-DEXPERIMENTAL_SPF=yes} %{?with_srs:-DEXPERIMENTAL_SRS=yes}" \ LOOKUP_CDB=yes \ XLFLAGS=-L%{_prefix}/X11R6/%{_lib} \ X11_LD_LIB=%{_prefix}/X11R6/%{_lib} \ @@ -187,7 +181,7 @@ %{?with_whoson:LOOKUP_WHOSON=yes} \ %{?with_sasl:AUTH_CYRUS_SASL=yes} \ %{?with_ldap:LOOKUP_LDAP=yes LDAP_LIB_TYPE=OPENLDAP2} \ - LOOKUP_LIBS="%{?with_ldap:-lldap -llber} %{?with_mysql:-lmysqlclient} %{?with_pgsql:-lpq} %{?with_sqlite:-lsqlite3} %{?with_whoson:-lwhoson} %{?with_spf:-lspf2} %{?with_srs:-lsrs_alt} %{?with_sasl:-lsasl2} %{?with_dkeys:-ldomainkeys}" \ + LOOKUP_LIBS="%{?with_ldap:-lldap -llber} %{?with_mysql:-lmysqlclient} %{?with_pgsql:-lpq} %{?with_sqlite:-lsqlite3} %{?with_whoson:-lwhoson} %{?with_spf:-lspf2} %{?with_srs:-lsrs_alt} %{?with_sasl:-lsasl2}" \ LOOKUP_INCLUDE="%{?with_mysql:-I%{_includedir}/mysql} %{?with_pgsql:-I%{_includedir}/pgsql}" makeinfo --force -o exim_filtering.info exim-texinfo-*/doc/filter.texinfo @@ -326,6 +320,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.309 2009/11/14 09:04:42 arekm +- up to 4.70 + Revision 1.308 2009/09/12 11:09:40 radek - release 10: strict DynaLoader dep no longer required ================================================================ Index: packages/exim/exim4-Makefile-Default.patch diff -u packages/exim/exim4-Makefile-Default.patch:1.3 packages/exim/exim4-Makefile-Default.patch:1.4 --- packages/exim/exim4-Makefile-Default.patch:1.3 Thu Dec 21 16:51:08 2006 +++ packages/exim/exim4-Makefile-Default.patch Sat Nov 14 10:04:42 2009 @@ -10,17 +10,23 @@ # If you set STRIP_COMMAND to the path of the "strip" command, it will be run -@@ -40,8 +40,8 @@ +@@ -40,12 +40,12 @@ # Some of the following commands live in different places in different OS. We # include them all here for generality. -CHOWN_COMMAND=/usr/bin/chown -CHGRP_COMMAND=/usr/bin/chgrp +-CHMOD_COMMAND=/usr/bin/chmod +CHOWN_COMMAND=/bin/chown +CHGRP_COMMAND=/bin/chgrp ++CHMOD_COMMAND=/bin/chmod MV_COMMAND=/bin/mv RM_COMMAND=/bin/rm +-TOUCH_COMMAND=/usr/bin/touch ++TOUCH_COMMAND=/bin/touch + + # Some operating systems have different ways of building libraries of @@ -175,7 +175,7 @@ # parameters for include and library directories that may be needed for IPv6 on # some systems, where the support is not yet in the standard library. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/exim/exim.spec?r1=1.308&r2=1.309&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/exim/exim4-Makefile-Default.patch?r1=1.3&r2=1.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
