rpms/fetchmail/FC-3 fetchmail-6.2.5-CAN-2005-2355.patch, NONE, 1.1 fetchmail-6.2.5-krb5.patch, NONE, 1.1 fetchmail.spec, 1.21, 1.22
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jul 21 16:49:34 UTC 2005
Author: mitr
Update of /cvs/dist/rpms/fetchmail/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv3356
Modified Files:
fetchmail.spec
Added Files:
fetchmail-6.2.5-CAN-2005-2355.patch fetchmail-6.2.5-krb5.patch
Log Message:
* Thu Jul 21 2005 Miloslav Trmac <mitr at redhat.com> - 6.2.5-7.fc4.1
- Fix CAN-2005-2355 (#163819, patch by Ludwig Nussel)
* Wed Mar 16 2005 Nalin Dahyabhai <nalin at redhat.com> 6.2.5-7
- stop using one of the libkrb5 private functions
fetchmail-6.2.5-CAN-2005-2355.patch:
pop3.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
--- NEW FILE fetchmail-6.2.5-CAN-2005-2355.patch ---
From: Ludwig Nussel <ludwig.nussel at suse.de>
Not as generic but should be sufficient for the uidl overflow:
Index: fetchmail-6.2.5/pop3.c
===================================================================
--- fetchmail-6.2.5.orig/pop3.c
+++ fetchmail-6.2.5/pop3.c
@@ -613,6 +613,8 @@ static int pop3_gettopid( int sock, int
return 0;
}
+#define str(s) #s
+#define UIDLFMT(n) "%d %" str(n) "s"
static int pop3_getuidl( int sock, int num , char *id)
{
int ok;
@@ -620,7 +622,7 @@ static int pop3_getuidl( int sock, int n
gen_send(sock, "UIDL %d", num);
if ((ok = pop3_ok(sock, buf)) != 0)
return(ok);
- if (sscanf(buf, "%d %s", &num, id) != 2)
+ if (sscanf(buf, UIDLFMT(IDLEN), &num, id) != 2)
return(PS_PROTOCOL);
return(PS_SUCCESS);
}
@@ -862,7 +864,7 @@ static int pop3_getrange(int sock,
{
if (DOTLINE(buf))
break;
- else if (sscanf(buf, "%d %s", &num, id) == 2)
+ else if (sscanf(buf, UIDLFMT(IDLEN), &num, id) == 2)
{
struct idlist *old, *new;
fetchmail-6.2.5-krb5.patch:
driver.c | 1 -
1 files changed, 1 deletion(-)
--- NEW FILE fetchmail-6.2.5-krb5.patch ---
Don't use this libkrb5 private function.
--- fetchmail-6.2.5/driver.c 2005-03-16 18:46:27.755452749 -0500
+++ fetchmail-6.2.5/driver.c 2005-03-16 18:46:29.964164309 -0500
@@ -210,7 +210,6 @@
krb5_auth_context auth_context = NULL;
krb5_init_context(&context);
- krb5_init_ets(context);
krb5_auth_con_init(context, &auth_context);
if (retval = krb5_cc_default(context, &ccdef)) {
Index: fetchmail.spec
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/FC-3/fetchmail.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fetchmail.spec 30 Sep 2004 21:15:45 -0000 1.21
+++ fetchmail.spec 21 Jul 2005 16:49:31 -0000 1.22
@@ -3,9 +3,9 @@
Summary: A remote mail retrieval and forwarding utility.
Name: fetchmail
Version: 6.2.5
-Release: 6
+Release: 7.fc3.1
Requires: smtpdaemon
-Source0: http://www.catb.org/~esr/fetchmail/fetchmail-%{version}.tar.gz
+Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.gz
Source1: http://www.catb.org/~esr/fetchmail/fetchmail-%{version}.tar.gz.asc
Source2: fetchmailconf.1
Patch0: fetchmail-6.2.0-krb5-config.patch
@@ -14,7 +14,9 @@
Patch3: fetchmail-6.2.5-popcapa.patch
Patch4: fetchmail-6.2.5-addrconf.patch
Patch5: fetchmail-6.2.5-recent-after-expunge.patch
-URL: http://www.catb.org/~esr/fetchmail/
+Patch6: fetchmail-6.2.5-krb5.patch
+Patch7: fetchmail-6.2.5-CAN-2005-2355.patch
+URL: http://fetchmail.berlios.de/
License: GPL
Group: Applications/Internet
Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -58,6 +60,8 @@
%patch3 -p1 -b .popauth
%patch4 -p1 -b .addrconf
%patch5 -p1 -b .recent-after-expunge
+%patch6 -p1 -b .krb5
+%patch7 -p1 -b .can-2005-2355
autoheader
autoconf
@@ -100,6 +104,12 @@
%endif
%changelog
+* Thu Jul 21 2005 Miloslav Trmac <mitr at redhat.com> - 6.2.5-7.fc4.1
+- Fix CAN-2005-2355 (#163819, patch by Ludwig Nussel)
+
+* Wed Mar 16 2005 Nalin Dahyabhai <nalin at redhat.com> 6.2.5-7
+- stop using one of the libkrb5 private functions
+
* Thu Sep 30 2004 John Dennis <jdennis at redhat.com> 6.2.5-6
- fix bug #113492
after expunge, dovecot hangs fetchmail if new e-mail came in
More information about the fedora-cvs-commits
mailing list