rpms/fetchmail/devel fetchmail-6.2.5-arpop.patch, NONE, 1.1 fetchmail.spec, 1.23, 1.24

[fedora-cvs-commits at redhat.com]

Author: mitr

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

Modified Files:
	fetchmail.spec 
Added Files:
	fetchmail-6.2.5-arpop.patch 
Log Message:
* Tue Jun  7 2005 Miloslav Trmac <mitr at redhat.com> - 6.2.5-8
- Fix APOP and RPOP (#127315)
- Don't link to libdl


fetchmail-6.2.5-arpop.patch:
 driver.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE fetchmail-6.2.5-arpop.patch ---
Set fetchsizelimit=1 to avoid fatal error in pop3 code when asked to fetch
size of more than one message at once when using APOP or RPOP.

>From fetchmail-friends, by Sunil Shetye.

diff -Naur fetchmail-6.2.5.orig/driver.c fetchmail-6.2.5/driver.c
--- fetchmail-6.2.5.orig/driver.c	2003-10-16 00:52:31.000000000 +0530
+++ fetchmail-6.2.5/driver.c	2003-10-17 11:24:27.000000000 +0530
@@ -429,8 +429,11 @@
 	/* for POP3, we can get the size of one mail only! Unfortunately, this
 	 * protocol specific test cannot be done elsewhere as the protocol
 	 * could be "auto". */
-	if (ctl->server.protocol == P_POP3)
+	switch (ctl->server.protocol)
+	{
+	    case P_POP3: case P_APOP: case P_RPOP:
 	    fetchsizelimit = 1;
+	}
 
 	/* Time to allocate memory to store the sizes */
 	xalloca(msgsizes, int *, sizeof(int) * fetchsizelimit);


Index: fetchmail.spec
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fetchmail.spec	16 Mar 2005 23:49:19 -0000	1.23
+++ fetchmail.spec	7 Jun 2005 15:23:44 -0000	1.24
@@ -3,7 +3,7 @@
 Summary: A remote mail retrieval and forwarding utility.
 Name: fetchmail
 Version: 6.2.5
-Release: 7
+Release: 8
 Requires: smtpdaemon
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.gz
 Source1: http://www.catb.org/~esr/fetchmail/fetchmail-%{version}.tar.gz.asc
@@ -15,6 +15,7 @@
 Patch4: fetchmail-6.2.5-addrconf.patch
 Patch5: fetchmail-6.2.5-recent-after-expunge.patch
 Patch6: fetchmail-6.2.5-krb5.patch
+Patch7: fetchmail-6.2.5-arpop.patch
 URL: http://fetchmail.berlios.de/
 License: GPL
 Group: Applications/Internet
@@ -60,11 +61,12 @@
 %patch4 -p1 -b .addrconf
 %patch5 -p1 -b .recent-after-expunge
 %patch6 -p1 -b .krb5
+%patch7 -p1 -b .arpop
+
 autoheader
 autoconf
 
 %build
-LIBS=-ldl; export LIBS
 %configure --enable-POP3 --enable-IMAP --with-ssl=auto \
 	%{!?nohesiod:--with-hesiod=auto} \
 	--enable-ETRN --enable-NTLM --enable-SDPS --enable-RPA \
@@ -75,7 +77,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall mandir=$RPM_BUILD_ROOT%{_mandir}/man1
+make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}/man1
 install -m644 $RPM_SOURCE_DIR/fetchmailconf.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 %if ! %{fetchmailconf}
@@ -102,6 +104,10 @@
 %endif
 
 %changelog
+* Tue Jun  7 2005 Miloslav Trmac <mitr at redhat.com> - 6.2.5-8
+- Fix APOP and RPOP (#127315)
+- Don't link to libdl
+
 * Wed Mar 16 2005 Nalin Dahyabhai <nalin at redhat.com> 6.2.5-7
 - stop using one of the libkrb5 private functions