Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.8.git;a=commitdiff;h=4154c6b3823580c0f78fce7e4e0d0105ae014dc5
commit 4154c6b3823580c0f78fce7e4e0d0105ae014dc5 Author: Janos Kovacs <[EMAIL PROTECTED]> Date: Sun Jun 22 13:39:35 2008 +0200 fetchmail-6.3.8-1kalgan1-i686 * add two secure fixes * closes FS#3170 in -stable diff --git a/source/network/fetchmail/FrugalBuild b/source/network/fetchmail/FrugalBuild index 795f3af..3ed9679 100644 --- a/source/network/fetchmail/FrugalBuild +++ b/source/network/fetchmail/FrugalBuild @@ -3,7 +3,7 @@ pkgname=fetchmail pkgver=6.3.8 -pkgrel=1 +pkgrel=1kalgan1 pkgdesc="A remote-mail retrieval and forwarding utility." _F_berlios_ext=".tar.bz2" Finclude berlios @@ -11,7 +11,10 @@ url="http://catb.org/~esr/fetchmail/"; depends=('openssl') groups=('network') archs=('i686' 'x86_64') - +source=(${source} fetchmail-SA-2008-01.diff fetchmail-SA-2008-02.diff) +sha1sums=('b8e8c51ed6cf53fc398c821fdb29d166c6713bb0' \ + 'fde180fad432cf468c385a3bf49b1f900a27e31d' \ + '2cf3dbb9e2aeaac4472a3625589f829ffa44761d') confpkg=fetchmailconf subpkgs=('fetchmailconf') subdescs=('fetchmail setup tool') @@ -29,5 +32,4 @@ build() { Fsplit $confpkg usr/{bin/$confpkg,lib,share/{applications,pixmaps},share/man/man1/$confpkg.1} } -sha1sums=('b8e8c51ed6cf53fc398c821fdb29d166c6713bb0') # optimization OK diff --git a/source/network/fetchmail/fetchmail-SA-2008-01.diff b/source/network/fetchmail/fetchmail-SA-2008-01.diff new file mode 100644 index 0000000..83383cb --- /dev/null +++ b/source/network/fetchmail/fetchmail-SA-2008-01.diff @@ -0,0 +1,32 @@ +diff --git a/report.c b/report.c +index 31d4e48..2a731ac 100644 +- --- a/report.c ++++ b/report.c +@@ -238,11 +238,17 @@ report_build (FILE *errfp, message, va_alist) + rep_ensuresize(); + + #if defined(VA_START) +- - VA_START (args, message); + for ( ; ; ) + { ++ /* ++ * args has to be initialized before every call of vsnprintf(), ++ * because vsnprintf() invokes va_arg macro and thus args is ++ * undefined after the call. ++ */ ++ VA_START(args, message); + n = vsnprintf (partial_message + partial_message_size_used, partial_message_size - partial_message_size_used, + message, args); ++ va_end (args); + + if (n >= 0 + && (unsigned)n < partial_message_size - partial_message_size_used) +@@ -254,7 +260,6 @@ report_build (FILE *errfp, message, va_alist) + partial_message_size += 2048; + partial_message = REALLOC (partial_message, partial_message_size); + } +- - va_end (args); + #else + for ( ; ; ) + { + diff --git a/source/network/fetchmail/fetchmail-SA-2008-02.diff b/source/network/fetchmail/fetchmail-SA-2008-02.diff new file mode 100644 index 0000000..66c16db --- /dev/null +++ b/source/network/fetchmail/fetchmail-SA-2008-02.diff @@ -0,0 +1,14 @@ +Index: sink.c +=================================================================== +- --- sink.c (revision 5118) ++++ sink.c (revision 5119) +@@ -262,7 +262,7 @@ + const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@"; + + /* don't bounce in reply to undeliverable bounces */ +- - if (!msg->return_path[0] || ++ if (!msg || !msg->return_path[0] || + strcmp(msg->return_path, "<>") == 0 || + strcasecmp(msg->return_path, md1) == 0 || + strncasecmp(msg->return_path, md2, strlen(md2)) == 0) + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
