Hello community, here is the log from the commit of package vacation for openSUSE:Factory checked in at 2017-02-02 15:42:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-09-08 18:12:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vacation.new/vacation.changes 2017-02-03 20:04:19.620952782 +0100 @@ -1,0 +2,5 @@ +Wed Feb 1 09:34:04 UTC 2017 - [email protected] + +- Add some more senders and mail tags which should not be answered + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vacation.spec ++++++ --- /var/tmp/diff_new_pack.YKwsgY/_old 2017-02-03 20:04:20.216868904 +0100 +++ /var/tmp/diff_new_pack.YKwsgY/_new 2017-02-03 20:04:20.220868340 +0100 @@ -1,7 +1,7 @@ # # spec file for package vacation # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -24,7 +24,7 @@ Group: Productivity/Networking/Email/Utilities Url: http://vacation.sf.net/ Source: http://downloads.sf.net/vacation/%name-%version.tar.gz -Patch: vacation-%{version}.diff +Patch0: 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 @@ -49,9 +49,9 @@ %prep %setup -%patch -%patch1 -%patch3 +%patch0 -p1 +%patch1 -p1 +%patch3 -p1 %patch4 %patch5 ++++++ vacation-1.2.7.1-junkfilter.diff ++++++ --- /var/tmp/diff_new_pack.YKwsgY/_old 2017-02-03 20:04:20.240865525 +0100 +++ /var/tmp/diff_new_pack.YKwsgY/_new 2017-02-03 20:04:20.244864963 +0100 @@ -1,15 +1,19 @@ --- - vacation.c | 2 ++ - 1 file changed, 2 insertions(+) + vacation.c | 6 ++++++ + 1 file changed, 6 insertions(+) --- vacation.c -+++ vacation.c 2015-09-08 11:42:13.174019039 +0000 -@@ -508,6 +508,8 @@ readheaders (void) ++++ vacation.c 2017-02-01 09:26:42.073222511 +0000 +@@ -520,6 +520,12 @@ 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); ++ if (strncasecmp(buf, "X-AMAZON", 8) == 0) ++ EXITIT (0); ++ if (strncasecmp(buf, "X-LinkedIn", 10) == 0) ++ EXITIT (0); case 'C': /* "Cc:" */ if (strncasecmp (buf, "Cc:", 3)) break; ++++++ vacation-1.2.7.1.diff ++++++ --- /var/tmp/diff_new_pack.YKwsgY/_old 2017-02-03 20:04:20.252863836 +0100 +++ /var/tmp/diff_new_pack.YKwsgY/_new 2017-02-03 20:04:20.252863836 +0100 @@ -1,6 +1,13 @@ ---- Makefile.orig 2012-01-29 21:44:38.112171303 -0500 -+++ Makefile 2012-01-29 21:45:22.751613233 -0500 -@@ -13,17 +13,8 @@ +--- + vacation-1.2.7.1/Makefile | 11 -- + vacation-1.2.7.1/vacation-en.man | 38 +++++++ + vacation-1.2.7.1/vacation.c | 195 ++++++++++++++++++++++++++++++++------- + vacation-1.2.7.1/vaclook | 16 --- + 4 files changed, 199 insertions(+), 61 deletions(-) + +--- vacation-1.2.7.1/Makefile ++++ vacation-1.2.7.1/Makefile 2017-02-01 09:10:03.746060561 +0000 +@@ -13,17 +13,8 @@ CFLAGS = $(RPM_OPT_FLAGS) -g -Wall ifeq "$(ARCH)" "x86_64" # Uncomment below for backwards compatibility of gdbm files. # CFLAGS = $(CFLAGS) -m32 @@ -18,7 +25,7 @@ IFLAGS = LIBS = -lgdbm -@@ -45,7 +36,7 @@ +@@ -45,7 +36,7 @@ endif BINDIR = $(PREFIX)/bin VACATION = $(BINDIR)/vacation VACLOOK = $(BINDIR)/vaclook @@ -27,9 +34,72 @@ MANEXT1 = 1 VERSION = 1 ---- vacation.c.orig 2012-01-29 21:44:45.532078540 -0500 -+++ vacation.c 2012-01-30 20:18:31.399615458 -0500 -@@ -76,6 +76,7 @@ +--- vacation-1.2.7.1/vacation-en.man ++++ vacation-1.2.7.1/vacation-en.man 2017-02-01 09:10:03.746060561 +0000 +@@ -25,8 +25,9 @@ vacation \- reply to mail automatically + .SH SYNOPSIS + .B vacation + [ +-.B \-I | \-i +-] ++.B \-I | \-i | \-l ++] [ ++.B \-F + .br + .B vacation + [ +@@ -48,6 +49,7 @@ vacation \- reply to mail automatically + .B \-? + ] + .I username ++.br + .SH DESCRIPTION + .IX vacation "" "\fLvacation\fR \(em automatic mail replies" + .LP +@@ -162,9 +164,39 @@ Initialize the + .B \&.vacation.db + file and start + .BR vacation . ++This should only be used on the command line, not ++in the ++.B \&.forward ++file. ++.TP ++.B \-F ++Force creation of ++.B \&.vacation.db ++even if the ++.B $\s-1HOME ++directory is identified as a NFS file system. ++Please note that the used data base is not portable ++between 32bit and 64bit architectures and also not ++portable between little and big endianess architectures ++even same bit-wide is used for. Therefore the ++initial creation of the ++.B \&/.vacation.db ++should always happen on the server used for receiving ++mails for the specific user. ++.TP ++.B \-l ++List the content of the vacation database file ++including the address and the associated time of ++the last auto-response to that address. ++This should only be used on the command line, not ++in the ++.B \&.forward ++file. + .LP + If the +-.B \-I ++.BR \-I, \ \-i ++or ++.B \-l + flag is not specified, and a + .I user + argument is given, +--- vacation-1.2.7.1/vacation.c ++++ vacation-1.2.7.1/vacation.c 2017-02-01 09:16:24.158138617 +0000 +@@ -76,6 +76,7 @@ static char rcsid[] __attribute__ ((unus #include <sys/param.h> #include <sys/stat.h> @@ -37,7 +107,7 @@ #include <fcntl.h> #include <pwd.h> #include <gdbm.h> -@@ -91,6 +92,13 @@ +@@ -91,6 +92,13 @@ static char rcsid[] __attribute__ ((unus #include "tzfile.h" #include "vacation.h" @@ -51,7 +121,7 @@ /* Extern definitions for getopt(3) */ extern int optind, opterr; extern char *optarg; -@@ -110,14 +118,15 @@ +@@ -110,14 +118,15 @@ main (int argc, char **argv) struct passwd *pw; ALIAS *cur; time_t interval; @@ -69,7 +139,7 @@ interval = -1; vdomain = NULL; #ifdef _PATH_VACATION -@@ -125,16 +134,16 @@ +@@ -125,16 +134,16 @@ main (int argc, char **argv) #else vacation = argv[0]; #endif @@ -90,7 +160,7 @@ } cur->name = optarg; cur->next = names; -@@ -163,6 +172,12 @@ +@@ -163,6 +172,12 @@ main (int argc, char **argv) case 'r': /* "Reply-To:" overrides "From:" */ rflag = 1; break; @@ -103,7 +173,7 @@ case 'v': /* Output vacation version number */ printf ("Linux Vacation %s\n", VACVERS); exit (0); -@@ -175,32 +190,68 @@ +@@ -175,32 +190,68 @@ main (int argc, char **argv) argc -= optind; argv += optind; @@ -178,7 +248,7 @@ if (!db && errno == ENOENT) { db = gdbm_open ((char *) VDB, 128, GDBM_NEWDB, 0644, NULL); -@@ -210,12 +261,56 @@ +@@ -210,12 +261,56 @@ main (int argc, char **argv) } while (!db && errno == EAGAIN); @@ -239,7 +309,7 @@ if (interval != -1) setinterval (interval); -@@ -232,8 +327,11 @@ +@@ -232,8 +327,11 @@ main (int argc, char **argv) exit (0); } @@ -253,7 +323,7 @@ cur->name = pw->pw_name; cur->next = names; names = cur; -@@ -250,8 +348,9 @@ +@@ -250,8 +348,9 @@ main (int argc, char **argv) { /* add virtual domain to username */ if (!(vusername = (char *) malloc (MAXLINE))) { @@ -265,7 +335,7 @@ } (void) strlcpy (vusername, pw->pw_name, MAXLINE); strlcat (vusername, "@", MAXLINE); -@@ -266,10 +365,17 @@ +@@ -266,10 +365,17 @@ main (int argc, char **argv) } else (void) gdbm_close (db); @@ -283,7 +353,7 @@ /* * readheaders -- * read mail headers -@@ -322,7 +428,7 @@ +@@ -322,7 +428,7 @@ readheaders (void) *p = '\0'; } else @@ -292,7 +362,7 @@ if ((p = rindex (uucpfrom, '!'))) strlcat (from, p + 1, MAXLINE); else -@@ -333,7 +439,7 @@ +@@ -333,7 +439,7 @@ readheaders (void) printd (logline); #endif if (junkmail ()) @@ -301,7 +371,7 @@ break; case 'R': /* "Reply-To: " */ cont = 0; -@@ -345,7 +451,7 @@ +@@ -345,7 +451,7 @@ readheaders (void) printd (logline); #endif if (junkmail ()) @@ -310,7 +380,7 @@ } break; case 'S': /* "Subject" */ -@@ -360,7 +466,7 @@ +@@ -360,7 +466,7 @@ readheaders (void) printd (logline); #endif if (junkmail ()) @@ -319,7 +389,7 @@ } break; case 'P': /* "Precedence:" */ -@@ -375,7 +481,7 @@ +@@ -375,7 +481,7 @@ readheaders (void) break; if (!strncasecmp (p, "junk", 4) || !strncasecmp (p, "list", 4) || !strncasecmp (p, "bulk", 4)) @@ -328,7 +398,7 @@ break; case 'A': /* "Auto-Submitted:" */ cont = 0; -@@ -388,8 +494,12 @@ +@@ -388,8 +494,12 @@ readheaders (void) if (!*p) break; if (strncasecmp (p, "no", 2)) @@ -342,7 +412,7 @@ case 'C': /* "Cc:" */ if (strncasecmp (buf, "Cc:", 3)) break; -@@ -400,10 +510,6 @@ +@@ -400,10 +510,6 @@ readheaders (void) break; cont = 1; goto findme; @@ -353,7 +423,7 @@ default: if (!isspace (*buf) || !cont || tome) { -@@ -413,13 +519,15 @@ +@@ -413,13 +519,15 @@ readheaders (void) findme: for (cur = names; !tome && cur; cur = cur->next) tome += nsearch (cur->name, buf); @@ -372,7 +442,7 @@ } if (rflag && (*replyto != 0x0)) strlcpy (from, replyto, MAXLINE); -@@ -503,7 +611,11 @@ +@@ -503,7 +611,19 @@ junkmail (void) { "-programmers", 12}, { @@ -381,11 +451,19 @@ + { + "noreply", 7}, + { ++ "no-reply", 8}, ++ { ++ "info", 4}, ++ { ++ "nobody", 6}, ++ { ++ "keine.Antwort", 13}, ++ { + NULL, 0},}; register struct ignore *cur; register int len; register char *p; -@@ -609,6 +721,7 @@ +@@ -609,6 +729,7 @@ setreply (void) /* * sendmessage -- * exec sendmail to send the vacation file to sender @@ -393,7 +471,7 @@ */ void sendmessage (char *myname, char *myrealname) -@@ -628,17 +741,20 @@ +@@ -628,17 +749,20 @@ sendmessage (char *myname, char *myrealn if (mfp == NULL) { syslog (LOG_NOTICE, "vacation: no ~%s/%s file.\n", myname, VMSG); @@ -414,7 +492,7 @@ exit (1); } if (i == 0) -@@ -651,6 +767,7 @@ +@@ -651,6 +775,7 @@ sendmessage (char *myname, char *myrealn NULL); syslog (LOG_ERR, "vacation: can't exec %s: %s", _PATH_SENDMAIL, strerror (errno)); @@ -422,7 +500,7 @@ exit (1); } close (pvect[0]); -@@ -699,7 +816,7 @@ +@@ -699,7 +824,7 @@ sendmessage (char *myname, char *myrealn void usage (void) { @@ -431,71 +509,8 @@ puts ("or: vacation [ -j ] [ -a alias ] [ -h hostname ] [ -tN ] [ -r ] login"); exit (1); ---- vacation-en.man.orig 2012-01-29 21:44:57.942923384 -0500 -+++ vacation-en.man 2012-01-29 21:45:22.753613208 -0500 -@@ -25,8 +25,9 @@ - .SH SYNOPSIS - .B vacation - [ --.B \-I | \-i --] -+.B \-I | \-i | \-l -+] [ -+.B \-F - .br - .B vacation - [ -@@ -48,6 +49,7 @@ - .B \-? - ] - .I username -+.br - .SH DESCRIPTION - .IX vacation "" "\fLvacation\fR \(em automatic mail replies" - .LP -@@ -162,9 +164,39 @@ - .B \&.vacation.db - file and start - .BR vacation . -+This should only be used on the command line, not -+in the -+.B \&.forward -+file. -+.TP -+.B \-F -+Force creation of -+.B \&.vacation.db -+even if the -+.B $\s-1HOME -+directory is identified as a NFS file system. -+Please note that the used data base is not portable -+between 32bit and 64bit architectures and also not -+portable between little and big endianess architectures -+even same bit-wide is used for. Therefore the -+initial creation of the -+.B \&/.vacation.db -+should always happen on the server used for receiving -+mails for the specific user. -+.TP -+.B \-l -+List the content of the vacation database file -+including the address and the associated time of -+the last auto-response to that address. -+This should only be used on the command line, not -+in the -+.B \&.forward -+file. - .LP - If the --.B \-I -+.BR \-I, \ \-i -+or -+.B \-l - flag is not specified, and a - .I user - argument is given, ---- vaclook.orig 2012-01-29 21:45:06.887811557 -0500 -+++ vaclook 2012-01-29 21:45:22.754613195 -0500 +--- vacation-1.2.7.1/vaclook ++++ vacation-1.2.7.1/vaclook 2017-02-01 09:10:03.746060561 +0000 @@ -1,14 +1,4 @@ -#!/usr/bin/perl +#!/bin/sh ++++++ vacation-1.2.7.1.multiple-vacationmsg_files.diff ++++++ --- /var/tmp/diff_new_pack.YKwsgY/_old 2017-02-03 20:04:20.264862148 +0100 +++ /var/tmp/diff_new_pack.YKwsgY/_new 2017-02-03 20:04:20.264862148 +0100 @@ -1,6 +1,34 @@ ---- vacation.c.orig 2012-01-29 21:18:46.516568917 -0500 -+++ vacation.c 2012-01-29 21:22:55.799452451 -0500 -@@ -102,6 +102,7 @@ +--- + vacation-1.2.7.1/vacation-en.man | 7 +++++++ + vacation-1.2.7.1/vacation.c | 24 ++++++++++++++++-------- + 2 files changed, 23 insertions(+), 8 deletions(-) + +--- vacation-1.2.7.1/vacation-en.man ++++ vacation-1.2.7.1/vacation-en.man 2017-02-01 09:22:09.274931674 +0000 +@@ -40,6 +40,9 @@ vacation \- reply to mail automatically + .BI \-a " alias" + ] + [ ++.BI \-f " file" ++] ++[ + .BI \-t N + ] + [ +@@ -241,6 +244,10 @@ Otherwise, use the + .RB ` From: ' + entry. + .TP ++.BI \-f\ <file> ++use a different message file than the default, .vacation.msg. ++The path to this file is relative to the home directory of the user. ++.TP + .BI \-? + issue short usage line. + .SH USAGE +--- vacation-1.2.7.1/vacation.c ++++ vacation-1.2.7.1/vacation.c 2017-02-01 09:22:09.274931674 +0000 +@@ -102,6 +102,7 @@ static void eatmsg (void); /* Extern definitions for getopt(3) */ extern int optind, opterr; extern char *optarg; @@ -8,7 +36,7 @@ /* * VACATION -- return a message to the sender when on vacation. -@@ -136,7 +137,7 @@ +@@ -136,7 +137,7 @@ main (int argc, char **argv) #endif if (argc == 1 || (argc == 2 && (strcmp(argv[1], "-F") == 0))) nflag = 1; @@ -17,7 +45,7 @@ switch ((char) ch) { case 'a': /* alias */ -@@ -149,6 +150,13 @@ +@@ -149,6 +150,13 @@ main (int argc, char **argv) cur->next = names; names = cur; break; @@ -31,7 +59,7 @@ case 'h': /* hostname */ vdomain = optarg; break; -@@ -741,10 +749,10 @@ +@@ -745,10 +753,10 @@ sendmessage (char *myname, char *myrealn printd (logline); #endif @@ -44,7 +72,7 @@ closelog(); exit (1); } -@@ -822,7 +830,7 @@ +@@ -826,7 +834,7 @@ usage (void) { puts ("usage: vacation [ -I | -i | -l ] [ -F ]"); puts @@ -53,7 +81,7 @@ exit (1); } -@@ -882,11 +890,11 @@ +@@ -886,11 +894,11 @@ initialize (char *path, char *myname) printd (logline); #endif @@ -68,7 +96,7 @@ exit (1); } fprintf (message, "Subject: away from my mail\n\n"); -@@ -908,7 +916,7 @@ +@@ -912,7 +920,7 @@ initialize (char *path, char *myname) fclose (oldmessage); } fclose (message); @@ -77,26 +105,3 @@ #ifdef DEBUG snprintf (logline, MAXLINE, "calling editor with \"%s\"\n", ebuf); /* Flawfinder: ignore */ printd (logline); ---- vacation.man.orig 2012-01-29 21:23:21.844126847 -0500 -+++ vacation-en.man 2012-01-29 21:25:49.001287129 -0500 -@@ -40,6 +40,9 @@ - .BI \-a " alias" - ] - [ -+.BI \-f " file" -+] -+[ - .BI \-t N - ] - [ -@@ -241,6 +244,10 @@ - .RB ` From: ' - entry. - .TP -+.BI \-f\ <file> -+use a different message file than the default, .vacation.msg. -+The path to this file is relative to the home directory of the user. -+.TP - .BI \-? - issue short usage line. - .SH USAGE ++++++ vacation-1.2.7.1.strip.diff ++++++ --- /var/tmp/diff_new_pack.YKwsgY/_old 2017-02-03 20:04:20.276860459 +0100 +++ /var/tmp/diff_new_pack.YKwsgY/_new 2017-02-03 20:04:20.276860459 +0100 @@ -1,6 +1,10 @@ ---- Makefile.orig 2012-01-29 10:34:25.818894149 -0500 -+++ Makefile 2012-01-29 10:34:36.713757944 -0500 -@@ -70,7 +70,7 @@ +--- + vacation-1.2.7.1/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- vacation-1.2.7.1/Makefile ++++ vacation-1.2.7.1/Makefile 2017-02-01 09:23:09.577670561 +0000 +@@ -61,7 +61,7 @@ TGZFILE = vacation-$(VERSION).$(SUBVERS all: $(BIN) install: all
