rpms/fetchmail/devel fetchmail-6.2.5-port.patch, NONE, 1.1 fetchmail.spec, 1.24, 1.25

[fedora-cvs-commits at redhat.com]

Author: mitr

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

Modified Files:
	fetchmail.spec 
Added Files:
	fetchmail-6.2.5-port.patch 
Log Message:
* Sat Jun 11 2005 Miloslav Trmac <mitr at redhat.com> - 6.2.5-9
- Fix fetchmailconf handling of unspecified server port


fetchmail-6.2.5-port.patch:
 fetchmailconf |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fetchmail-6.2.5-port.patch ---
--- fetchmail-6.2.5/fetchmailconf.port	2005-06-11 19:20:20.000000000 +0200
+++ fetchmail-6.2.5/fetchmailconf	2005-06-11 19:20:57.000000000 +0200
@@ -133,7 +133,7 @@
 	    res = res + (" via " + str(self.via) + "\n");
 	if self.protocol != ServerDefaults.protocol:
 	    res = res + " with proto " + self.protocol 
-	if self.port != defaultports[self.protocol] and self.port != 0:
+	if self.port != defaultports[self.protocol] and self.port:
 	    res = res + " port " + `self.port`
 	if self.timeout != ServerDefaults.timeout:
 	    res = res + " timeout " + `self.timeout`


Index: fetchmail.spec
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- fetchmail.spec	7 Jun 2005 15:23:44 -0000	1.24
+++ fetchmail.spec	11 Jun 2005 17:45:31 -0000	1.25
@@ -3,7 +3,7 @@
 Summary: A remote mail retrieval and forwarding utility.
 Name: fetchmail
 Version: 6.2.5
-Release: 8
+Release: 9
 Requires: smtpdaemon
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.gz
 Source1: http://www.catb.org/~esr/fetchmail/fetchmail-%{version}.tar.gz.asc
@@ -16,6 +16,7 @@
 Patch5: fetchmail-6.2.5-recent-after-expunge.patch
 Patch6: fetchmail-6.2.5-krb5.patch
 Patch7: fetchmail-6.2.5-arpop.patch
+Patch8: fetchmail-6.2.5-port.patch
 URL: http://fetchmail.berlios.de/
 License: GPL
 Group: Applications/Internet
@@ -62,6 +63,7 @@
 %patch5 -p1 -b .recent-after-expunge
 %patch6 -p1 -b .krb5
 %patch7 -p1 -b .arpop
+%patch8 -p1 -b .port
 
 autoheader
 autoconf
@@ -104,6 +106,9 @@
 %endif
 
 %changelog
+* Sat Jun 11 2005 Miloslav Trmac <mitr at redhat.com> - 6.2.5-9
+- Fix fetchmailconf handling of unspecified server port
+
 * Tue Jun  7 2005 Miloslav Trmac <mitr at redhat.com> - 6.2.5-8
 - Fix APOP and RPOP (#127315)
 - Don't link to libdl