Hello community, here is the log from the commit of package vacation for openSUSE:Factory checked in at 2015-09-08 17:46:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vacation (Old) and /work/SRC/openSUSE:Factory/.vacation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vacation" Changes: -------- --- /work/SRC/openSUSE:Factory/vacation/vacation.changes 2014-10-22 16:22:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vacation.new/vacation.changes 2015-09-08 18:12:18.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Sep 8 12:28:48 UTC 2015 - [email protected] + +- Add backport of upstream patch + 0001-Patch-to-handle-long-folded-headers-from-Zdenek-Havr.patch + to allow long From header (two lines) handled correctly (bsc#944326) +- Add patch vacation-1.2.7.1-junkfilter.diff + to handle spam found by junkfilter + +------------------------------------------------------------------- New: ---- 0001-Patch-to-handle-long-folded-headers-from-Zdenek-Havr.patch vacation-1.2.7.1-junkfilter.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vacation.spec ++++++ --- /var/tmp/diff_new_pack.zqnq1z/_old 2015-09-08 18:12:19.000000000 +0200 +++ /var/tmp/diff_new_pack.zqnq1z/_new 2015-09-08 18:12:19.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package vacation # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,10 @@ Patch: vacation-%{version}.diff Patch1: vacation-%{version}.multiple-vacationmsg_files.diff Patch3: vacation-%{version}.strip.diff +# PATCH-FIX-UPSTREAM bsc#944326 - long From: header (two lines) not handled correctly +Patch4: 0001-Patch-to-handle-long-folded-headers-from-Zdenek-Havr.patch +# PATCH-FIX-SUSE Also handle junkfilter based on procmail +Patch5: vacation-%{version}-junkfilter.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gdbm-devel @@ -48,6 +52,8 @@ %patch %patch1 %patch3 +%patch4 +%patch5 %build # %ifarch ia64 x86_64 s390x ppc64 ++++++ 0001-Patch-to-handle-long-folded-headers-from-Zdenek-Havr.patch ++++++ Basedo on 2ee6b2d137da843737fadd2fcdd7349600020f77 Mon Sep 17 00:00:00 2001 From: Chris Samuel <[email protected]> Date: Sun, 1 Dec 2013 23:28:50 +1100 Subject: [PATCH] Patch to handle long (folded) headers from Zdenek Havranek --- ChangeLog | 3 +++ vacation.c | 23 +++++++++++++++++++---- 5 files changed, 33 insertions(+), 18 deletions(-) --- ChangeLog +++ ChangeLog 2015-09-08 12:14:58.201720884 +0000 @@ -1,3 +1,6 @@ +2013/12/01 +- Patch to handle long (folded) headers from Zdenek Havranek + 2011/11/06 - Fix location for tarballs in the vacation.spec file. - Tagged and released Vacation 1.2.7.1. --- vacation.c +++ vacation.c 2015-09-08 12:20:01.137625786 +0000 @@ -394,13 +394,25 @@ readheaders (void) register ALIAS *cur; register char *p; int tome, cont; - char buf[MAXLINE]; + char buf[MAXLINE]; /* actual line */ + char buf2[MAXLINE]; /* next line */ char uucpfrom[MAXLINE]; /* char sender[MAXLINE]; */ /* char domain[MAXLINE]; */ cont = tome = 0; - while (fgets (buf, sizeof (buf), stdin) && *buf != '\n') + fgets (buf, sizeof (buf), stdin); + if (*buf != '\n') + fgets (buf2, sizeof (buf2), stdin); + while (*buf != '\n') + { + while (*buf2 != '\n' && ((buf2)[0] == ' ' || (buf2)[0] == '\t') && + strlen (buf) + strlen (buf2) < MAXLINE) /* only to buf capacity */ + { /* it's OK for "From:" and it doesn't matter for "To:" and "Cc:" */ + (buf)[strlen (buf) - 1] = '\0'; /* remove '\n' */ + strlcat (buf, buf2, MAXLINE); + fgets (buf2, sizeof (buf2), stdin); + } switch (toupper (*buf)) { case 'F': /* "From: " or "From " */ @@ -527,8 +539,11 @@ readheaders (void) findme: for (cur = names; !tome && cur; cur = cur->next) tome += nsearch (cur->name, buf); - } /* switch(toupper(*buf)) */ - + } + strlcpy (buf, buf2, MAXLINE); + if (*buf != '\n') + fgets (buf2, sizeof (buf2), stdin); + } if (!jflag && !tome) EXITIT (0); if (!*from) ++++++ vacation-1.2.7.1-junkfilter.diff ++++++ --- vacation.c | 2 ++ 1 file changed, 2 insertions(+) --- vacation.c +++ vacation.c 2015-09-08 11:42:13.174019039 +0000 @@ -508,6 +508,8 @@ readheaders (void) cont = 0; if (strncasecmp(buf, "X-Spam-Flag: YES", 16) == 0) EXITIT (0); + if (strncasecmp(buf, "X-Is-Junk: YES", 14) == 0) + EXITIT (0); case 'C': /* "Cc:" */ if (strncasecmp (buf, "Cc:", 3)) break;
