Accepting request 38214 from server:mail

checked in (request 38214)

OBS-URL: https://build.opensuse.org/request/show/38214
OBS-URL: https://build.opensuse.org/package/show/server:mail/fetchmail?expand=0&rev=21

fetchmail-SA-2010-02.patch

@@ -1,96 +0,0 @@
-Index: fetchmail-6.3.16/rfc822.c
-===================================================================
---- fetchmail-6.3.16.orig/rfc822.c	2010-04-06 10:59:13.000000000 +0200
-+++ fetchmail-6.3.16/rfc822.c	2010-04-19 14:32:14.000000000 +0200
-@@ -25,6 +25,7 @@ MIT license.  Compile with -DMAIN to bui
- #include  <stdlib.h>
- 
- #include "fetchmail.h"
-+#include "sdump.h"
- 
- #ifndef MAIN
- #include "i18n.h"
-@@ -74,9 +75,10 @@ char *reply_hack(
-     }
- 
- #ifndef MAIN
--    if (outlevel >= O_DEBUG)
--	report_build(stdout, GT_("About to rewrite %.*s...\n"),
--			(int)BEFORE_EOL(buf), buf);
-+    if (outlevel >= O_DEBUG) {
-+	report_build(stdout, GT_("About to rewrite %s...\n"), (cp = sdump(buf, BEFORE_EOL(buf))));
-+	xfree(cp);
-+    }
- 
-     /* make room to hack the address; buf must be malloced */
-     for (cp = buf; *cp; cp++)
-@@ -211,9 +213,12 @@ char *reply_hack(
-     }
- 
- #ifndef MAIN
--    if (outlevel >= O_DEBUG)
--	report_complete(stdout, GT_("...rewritten version is %.*s.\n"),
--			(int)BEFORE_EOL(buf), buf);
-+    if (outlevel >= O_DEBUG) {
-+	report_complete(stdout, GT_("...rewritten version is %s.\n"),
-+			(cp = sdump(buf, BEFORE_EOL(buf))));
-+	xfree(cp)
-+    }
-+
- #endif /* MAIN */
-     *length = strlen(buf);
-     return(buf);
-Index: fetchmail-6.3.16/uid.c
-===================================================================
---- fetchmail-6.3.16.orig/uid.c	2010-04-06 10:59:13.000000000 +0200
-+++ fetchmail-6.3.16/uid.c	2010-04-19 14:32:14.000000000 +0200
-@@ -20,6 +20,7 @@
- 
- #include "fetchmail.h"
- #include "i18n.h"
-+#include "sdump.h"
- 
- /*
-  * Machinery for handling UID lists live here.  This is mainly to support
-@@ -260,8 +261,11 @@ void initialize_saved_lists(struct query
- 	if (uidlcount)
- 	{
- 	    report_build(stdout, GT_("Scratch list of UIDs:"));
--	    for (idp = scratchlist; idp; idp = idp->next)
--		report_build(stdout, " %s", idp->id);
-+	    for (idp = scratchlist; idp; idp = idp->next) {
-+		char *t = sdump(idp->id, strlen(idp->id));
-+		report_build(stdout, " %s", t);
-+		free(t);
-+	    }
- 	    if (!idp)
- 		report_build(stdout, GT_(" <empty>"));
- 	    report_complete(stdout, "\n");
-@@ -517,8 +521,11 @@ void uid_swap_lists(struct query *ctl)
- 	    report_build(stdout, GT_("Merged UID list from %s:"), ctl->server.pollname);
- 	else
- 	    report_build(stdout, GT_("New UID list from %s:"), ctl->server.pollname);
--	for (idp = dofastuidl ? ctl->oldsaved : ctl->newsaved; idp; idp = idp->next)
--	    report_build(stdout, " %s = %d", idp->id, idp->val.status.mark);
-+	for (idp = dofastuidl ? ctl->oldsaved : ctl->newsaved; idp; idp = idp->next) {
-+	    char *t = sdump(idp->id, strlen(idp->id));
-+	    report_build(stdout, " %s = %d", t, idp->val.status.mark);
-+	    free(t);
-+        }
- 	if (!idp)
- 	    report_build(stdout, GT_(" <empty>"));
- 	report_complete(stdout, "\n");
-@@ -567,8 +574,11 @@ void uid_discard_new_list(struct query *
- 	/* this is now a merged list! the mails which were seen in this
- 	 * poll are marked here. */
- 	report_build(stdout, GT_("Merged UID list from %s:"), ctl->server.pollname);
--	for (idp = ctl->oldsaved; idp; idp = idp->next)
--	    report_build(stdout, " %s = %d", idp->id, idp->val.status.mark);
-+	for (idp = ctl->oldsaved; idp; idp = idp->next) {
-+	    char *t = sdump(idp->id, strlen(idp->id));
-+	    report_build(stdout, " %s = %d", t, idp->val.status.mark);
-+	    free(t);
-+	}
- 	if (!idp)
- 	    report_build(stdout, GT_(" <empty>"));
- 	report_complete(stdout, "\n");

fetchmail.changes

@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Mon Apr 19 12:36:27 UTC 2010 - puzel@novell.com
-
-- add fetchmail-SA-2010-02.patch (bnc#597673) 
-
 -------------------------------------------------------------------
 Wed Apr 14 16:00:29 UTC 2010 - puzel@novell.com
 

fetchmail.spec

@@ -36,7 +36,6 @@ Source1:        %{name}.init
 Source2:        %{name}.logrotate
 Source3:        sysconfig.%{name}
 Patch0:         fetchmail-6.3.8-smtp_errors.patch
-Patch1:         fetchmail-SA-2010-02.patch
 PreReq:         %insserv_prereq %fillup_prereq coreutils pwdutils
 Url:            http://fetchmail.berlios.de/
 Icon:	        fetchmail.xpm
@@ -89,7 +88,6 @@ Authors:
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 cp -a %{S:1} %{S:2} %{S:3} .
 
 %build