rpms/fetchmail/FC-5 fetchmail-6.3.6-kpop.patch, NONE, 1.1 fetchmail.spec, 1.42, 1.43

[fedora-cvs-commits at redhat.com]

Author: mitr

Update of /cvs/dist/rpms/fetchmail/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv28514

Modified Files:
	fetchmail.spec 
Added Files:
	fetchmail-6.3.6-kpop.patch 
Log Message:
* Mon Jan 22 2007 Miloslav Trmac <mitr at redhat.com> - 6.3.6-2
- Let KPOP use PASS again
  Resolves: #223661


fetchmail-6.3.6-kpop.patch:
 pop3.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE fetchmail-6.3.6-kpop.patch ---
--- fetchmail-6.3.6/pop3.c.kpop	2007-01-22 23:42:14.000000000 +0100
+++ fetchmail-6.3.6/pop3.c	2007-01-22 23:44:28.000000000 +0100
@@ -612,7 +612,11 @@
 
 	/* check if we are actually allowed to send the password */
 	if (ctl->server.authenticate == A_ANY
-		|| ctl->server.authenticate == A_PASSWORD) {
+	    || ctl->server.authenticate == A_PASSWORD
+	    || ((ctl->server.authenticate == A_KERBEROS_V4
+		 || ctl->server.authenticate == A_KERBEROS_V5)
+		&& ctl->server.service
+		&& strcmp(ctl->server.service, KPOP_PORT) == 0)) {
 	    strlcpy(shroud, ctl->password, sizeof(shroud));
 	    ok = gen_transact(sock, "PASS %s", ctl->password);
 	} else {


Index: fetchmail.spec
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/FC-5/fetchmail.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- fetchmail.spec	10 Jan 2007 06:11:39 -0000	1.42
+++ fetchmail.spec	22 Jan 2007 23:08:47 -0000	1.43
@@ -4,11 +4,12 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
 Version: 6.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Requires: smtpdaemon
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
 Patch0: fetchmail-6.2.5-addrconf.patch
+Patch1: fetchmail-6.3.6-kpop.patch
 URL: http://fetchmail.berlios.de/
 License: GPL
 Group: Applications/Internet
@@ -46,6 +47,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .addrconf
+%patch1 -p1 -b .kpop
 
 %build
 %configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \
@@ -83,6 +85,10 @@
 %endif
 
 %changelog
+* Mon Jan 22 2007 Miloslav Trmac <mitr at redhat.com> - 6.3.6-2
+- Let KPOP use PASS again
+  Resolves: #223661
+
 * Sat Jan  6 2007 Miloslav Trmac <mitr at redhat.com> - 6.3.6-1
 - Update to fetchmail-6.3.6 (CVE-2006-5867, CVE-2006-5974)