OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Jul-2005 14:14:59
Branch: OPENPKG_2_4_SOLID Handle: 2005072813145900
Modified files: (Branch: OPENPKG_2_4_SOLID)
openpkg-src/fetchmail fetchmail.patch fetchmail.spec
Log:
MFC: SA-2005.016-fetchmail; CAN-2005-2335
Summary:
Revision Changes Path
1.5.4.1 +35 -0 openpkg-src/fetchmail/fetchmail.patch
1.64.2.2 +1 -1 openpkg-src/fetchmail/fetchmail.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/fetchmail/fetchmail.patch
============================================================================
$ cvs diff -u -r1.5 -r1.5.4.1 fetchmail.patch
--- openpkg-src/fetchmail/fetchmail.patch 29 Jan 2005 12:39:27 -0000
1.5
+++ openpkg-src/fetchmail/fetchmail.patch 28 Jul 2005 12:14:59 -0000
1.5.4.1
@@ -24,3 +24,38 @@
fetchsizelimit = 1;
/* Time to allocate memory to store the sizes */
+
+OpenPKG-SA-2005.016-fetchmail; CAN-2005-2335
+Patch from Ludwig Nussel @SUSE
+Index: fetchmail-6.2.5/pop3.c
+===================================================================
+--- pop3.c.625
++++ 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;
+
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/fetchmail/fetchmail.spec
============================================================================
$ cvs diff -u -r1.64.2.1 -r1.64.2.2 fetchmail.spec
--- openpkg-src/fetchmail/fetchmail.spec 15 Jun 2005 18:59:11 -0000
1.64.2.1
+++ openpkg-src/fetchmail/fetchmail.spec 28 Jul 2005 12:14:59 -0000
1.64.2.2
@@ -33,7 +33,7 @@
Group: Mail
License: GPL
Version: 6.2.5
-Release: 2.4.0
+Release: 2.4.1
# list of sources
Source0: http://www.catb.org/~esr/fetchmail/fetchmail-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
