From 17f79dcb1e94b1498b185ebf3fa4b07bcbd4dd2a Mon Sep 17 00:00:00 2001 From: Eygene Ryabinkin Date: Thu, 27 Jan 2011 13:12:22 +0300 Subject: [PATCH] mail/exim: update to 4.74 Changelog is at http://ftp.exim.org/pub/exim/ChangeLogs/ChangeLog-4.74 Please, note that CVE-2011-0017 is not applicable to FreeBSD, because setuid() doesn't check RLIMIT_NPROC. Also fixed the periodic script for tidying the databases: now it won't produce errors if the lockfile is here, but the actual database file is gone. [2] And finally, synced the mirror list to the current one and pruned old unusable mirrors: - ftp.csx.cam.ac.uk: not synced anymore; - www.no.exim.org: no DNS record; - ftp.demon.nl: no longer mirrors Exim; - ftp.freenet.de: mirror of ftp.csx.cam.ac.uk; - ftp.esat.net: not synced anymore; - ftp.mirrorservice.org: mirror of ftp.csx.cam.ac.uk. PR: 154323 [1] Submitted-by: Geraint Edwards [2] Signed-off-by: Eygene Ryabinkin --- Mk/bsd.sites.mk | 40 +++++++++++++++++++++++++++-------- mail/exim/Makefile | 13 +++++++++-- mail/exim/distinfo | 4 +- mail/exim/files/150.exim-tidydb.sh | 5 +++- 4 files changed, 47 insertions(+), 15 deletions(-) diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index b5d7dca..d31b39d 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -212,29 +212,51 @@ MASTER_SITE_ECLIPSE+= \ .if !defined(IGNORE_MASTER_SITE_EXIM) MASTER_SITE_EXIM+= \ - ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/%SUBDIR%/ \ ftp://ftp.exim.org/pub/exim/%SUBDIR%/ \ + ftp://exim.inode.at/exim/%SUBDIR%/ \ + ftp://exim-ftp.itsoft.at/exim/exim/%SUBDIR%/ \ + http://exim-ftp.itsoft.at/exim/%SUBDIR%/ \ ftp://ftp.easynet.be/exim/exim/%SUBDIR%/ \ ftp://mirror.kn.vutbr.cz/pub/ftp.exim.org/exim/%SUBDIR%/ \ + http://exim.mirror.fr/exim/%SUBDIR%/ \ ftp://ftp.doc.cs.univ-paris8.fr/mirrors/ftp.exim.org/exim/%SUBDIR%/ \ + http://mirrors.zerg.biz/exim/exim/%SUBDIR%/ \ + http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/%SUBDIR%/ \ + ftp://exim.noris.de/exim/%SUBDIR%/ \ + ftp://ftp.bytemine.net/exim/exim/%SUBDIR%/ \ + ftp://exim.mirror.iphh.net/ftp/exim/%SUBDIR%/ \ + http://exim.mirror.iphh.net/ftp/exim/%SUBDIR%/ \ ftp://ftp.fu-berlin.de/unix/mail/exim/%SUBDIR%/ \ - ftp://ftp.tin.org/pub/mail/exim/%SUBDIR%/ \ - ftp://ftp.freenet.de/pub/ftp.csx.cam.ac.uk/pub/software/email/exim/%SUBDIR%/ \ - ftp://ftp.esat.net/pub/networking/mail/mta/exim/%SUBDIR%/ \ + http://exim-ftp.octet.hu/exim/%SUBDIR%/ \ + ftp://ftp.heanet.ie/pub/exim/%SUBDIR%/ \ + http://ftp.heanet.ie/pub/exim/%SUBDIR%/ \ http://washitake.com/mail/exim/mirror/exim/%SUBDIR%/ \ + ftp://ftp.tin.org/pub/mail/exim/%SUBDIR%/ \ http://exim.psshee.com/ftp/exim/%SUBDIR%/ \ + ftp://mirror.hostfuss.com/exim/ftp/exim/%SUBDIR%/ \ + http://mirror.hostfuss.com/exim/ftp/exim/%SUBDIR%/ \ ftp://ftp.nl.uu.net/pub/unix/mail/exim/exim/%SUBDIR%/ \ - ftp://ftp.demon.nl/pub/mirrors/exim/%SUBDIR%/ \ ftp://ftp.easynet.nl/mirror/exim/exim/%SUBDIR%/ \ ftp://sunsite.uio.no/pub/mail/exim/exim/%SUBDIR%/ \ - http://www.no.exim.org/ftp/exim/%SUBDIR%/ \ + http://piotrkosoft.net/pub/mirrors/ftp.exim.org/exim/%SUBDIR%/ \ + ftp://ftp.piotrkosoft.net/pub/mirrors/ftp.exim.org/exim/%SUBDIR%/ \ + ftp://sunsite.icm.edu.pl/pub/unix/mail/exim/exim/%SUBDIR%/ \ http://sunsite.icm.edu.pl/pub/unix/mail/exim/exim/%SUBDIR%/ \ - ftp://ftp.is.co.za/networking/mail/mta/exim/%SUBDIR%/ \ + ftp://ftp.is.co.za/networking/mail/mta/exim/ftp/exim/%SUBDIR%/ \ + ftp://mirrors.dominios.pt/pub/ftp.exim.org/exim/%SUBDIR%/ \ + http://exim.n9.ru/ftp/exim/%SUBDIR%/ \ + ftp://mirror.switch.ch/mirror/exim/exim/%SUBDIR%/ \ + http://mirror.switch.ch/ftp/mirror/exim/exim/%SUBDIR%/ \ ftp://ftp.reaper.org/pub/exim/exim/%SUBDIR%/ \ ftp://sunsite.cnlab-switch.ch/mirror/exim/exim/%SUBDIR%/ \ - ftp://ftp.mirrorservice.org/sites/ftp.csx.cam.ac.uk/pub/software/email/exim/%SUBDIR%/ \ ftp://ftp.demon.co.uk/pub/mirrors/exim/%SUBDIR%/ \ - ftp://ftp.fsckit.net/pub/exim/exim/%SUBDIR%/ + ftp://mirror.tje.me.uk/pub/mirrors/ftp.exim.org/exim/%SUBDIR%/ \ + http://mirror.tje.me.uk/pub/mirrors/ftp.exim.org/exim/%SUBDIR%/ \ + ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/%SUBDIR%/ \ + http://mirrors.24-7-solutions.net/pub/exim/ftp/exim/%SUBDIR%/ \ + ftp://ftp.fsckit.net/pub/exim/exim/%SUBDIR%/ \ + ftp://idcnetwork.org/pub/exim/exim/%SUBDIR%/ \ + http://ftp.exim.llorien.org/exim/%SUBDIR% .endif .if !defined(IGNORE_MASTER_SITE_FEDORA_LINUX) diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 3439bb3..56c7fba 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -25,6 +25,10 @@ WANT_GNOME= yes WANT_PERL= yes MAKE_JOBS_UNSAFE= yes +.if make(makesum) && !defined(FETCH_ALL) +.error "You forgot to define FETCH_ALL to create the sane distinfo" +.endif + .include .if defined(WITH_SA_EXIM) @@ -42,23 +46,26 @@ IGNORE= You cannot select both SA_KAS and SO_1024 options .endif .endif -.if defined(WITH_SA_EXIM) +.if defined(WITH_SA_EXIM) || defined(FETCH_ALL) MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \ SF/sa-exim/sa-exim/${SA_EXIM_VERSION}:sa_exim MASTER_SITE_SUBDIR+= sa-exim/:sa_exim DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim .endif -.if defined(WITH_SO_1024) +.if defined(WITH_SO_1024) || defined(FETCH_ALL) MASTER_SITES+= ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/:so_1024 DISTFILES+= spamooborona1024-src-${SO_1024_VERSION}.tar.gz:so_1024 +.endif + +.if defined(WITH_SO_1024) LDFLAGS+= -lz PLIST_SUB+= SO_1024="" .else PLIST_SUB+= SO_1024="@comment " .endif -EXIM_VERSION= 4.73 +EXIM_VERSION= 4.74 SA_EXIM_VERSION=4.2 SO_1024_VERSION=3.2 diff --git a/mail/exim/distinfo b/mail/exim/distinfo index 7c146c9..ed71b6a 100644 --- a/mail/exim/distinfo +++ b/mail/exim/distinfo @@ -1,5 +1,5 @@ -SHA256 (exim/exim-4.73.tar.bz2) = a78f4a153f36ad13acf7fb9a3a99c1bc785d38bd757553704c9590afcc00bfd6 -SIZE (exim/exim-4.73.tar.bz2) = 1592788 +SHA256 (exim/exim-4.74.tar.bz2) = e55b51c87e0be920f7f5aee830261566a4def8820f318d14a822fe2ae2ff8e40 +SIZE (exim/exim-4.74.tar.bz2) = 1588636 SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a SIZE (exim/sa-exim-4.2.tar.gz) = 66575 SHA256 (exim/spamooborona1024-src-3.2.tar.gz) = ab22a430f3860460045f6b213c68c89700a0cd10cbb6c7a808ece326c53787ee diff --git a/mail/exim/files/150.exim-tidydb.sh b/mail/exim/files/150.exim-tidydb.sh index 21a4158..9220abe 100644 --- a/mail/exim/files/150.exim-tidydb.sh +++ b/mail/exim/files/150.exim-tidydb.sh @@ -25,7 +25,10 @@ case "$exim_tidydb_enable" in for db in "$exim_dbdir"/db/*.lockfile; do [ "$db" = "$exim_dbdir/db/*.lockfile" ] && continue echo - "$exim_tidydb" "$exim_dbdir" `basename "$db" .lockfile` + db_name=`basename "$db" .lockfile` + if [ -e "${exim_dbdir}/db/${db_name}" ]; then + "$exim_tidydb" "$exim_dbdir" "$db_name" + fi done rc=1;; -- 1.7.3.4