Accepting request 59913 from server:mail

Accepted submit request 59913 from user WernerFink OBS-URL: https://build.opensuse.org/request/show/59913 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mailx?expand=0&rev=13
2011-02-03 20:55:37 +00:00 · 2011-02-03 20:55:37 +00:00 · fd1f755194
commit fd1f755194
parent 870d6fbdc8 096993fbc3
4 changed files with 40 additions and 69 deletions
--- a/mailx-12.2-mime.dif
+++ b/mailx-12.2-mime.dif
@ -1,7 +1,5 @@
-Index: def.h
-===================================================================
--- def.h.orig
-+++ def.h
+--- def.h
+++ def.h	2007-04-17 11:32:43.960721000 +0000
@@ -142,7 +142,8 @@ enum mimeclean {
 	MIME_LONGLINES	= 002,		/* has lines too long for RFC 2822 */
 	MIME_CTRLCHAR	= 004,		/* contains control characters */
@ -12,10 +10,8 @@ Index: def.h
 };
 
 enum tdflags {
-Index: mime.c
-===================================================================
--- mime.c.orig
-+++ mime.c
+--- mime.c
+++ mime.c	2007-04-17 13:08:06.352702764 +0000
@@ -258,7 +258,10 @@ getcharset(int isclean)
 	if (isclean & (MIME_CTRLCHAR|MIME_HASNUL))
 		charset = NULL;
@ -94,10 +90,8 @@ Index: mime.c
 	return convert;
 }
 
-Index: sendout.c
-===================================================================
--- sendout.c.orig
-+++ sendout.c
+--- sendout.c
+++ sendout.c	2007-04-17 13:11:40.576871634 +0000
@@ -206,7 +206,7 @@ attach_file(struct attachment *ap, FILE
 	size_t bufsize, count;
 	int	lastc = EOF;
--- a/mailx.changes
+++ b/mailx.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb  1 10:39:15 UTC 2011 - gber@opensuse.org
+
+- only recommend smtp_daemon, mailx has builtin SMTP support
+
 -------------------------------------------------------------------
 Fri Jun 11 13:36:58 UTC 2010 - coolo@novell.com

--- a/mailx.spec
+++ b/mailx.spec
@ -24,7 +24,7 @@ Url:            http://heirloom.sourceforge.net/mailx.html
 License:        BSD3c(or similar)
 Group:          Productivity/Networking/Email/Utilities
 Provides:       mail
-Requires:       smtp_daemon
+Recommends:     smtp_daemon
 AutoReqProv:    on
 Version:        12.2
 Release:        145
--- a/nail-11.25-path.dif
+++ b/nail-11.25-path.dif
@ -1,7 +1,5 @@
-Index: Makefile
-===================================================================
--- Makefile.orig
-+++ Makefile
+--- Makefile
+++ Makefile	2005-10-14 13:44:09.000000000 +0000
@@ -11,13 +11,9 @@ BINDIR		= $(PREFIX)/bin
 MANDIR		= $(PREFIX)/share/man
 SYSCONFDIR	= /etc
@ -36,10 +34,8 @@ Index: Makefile
 
 OBJ = aux.o base64.o cache.o cmd1.o cmd2.o cmd3.o cmdtab.o collect.o \
 	dotlock.o edit.o fio.o getname.o getopt.o head.o hmac.o \
-Index: cmd1.c
-===================================================================
--- cmd1.c.orig
-+++ cmd1.c
+--- cmd1.c
+++ cmd1.c	2005-10-14 13:44:09.000000000 +0000
@@ -78,7 +78,7 @@ get_pager(void)
 
 	cp = value("PAGER");
@ -58,10 +54,8 @@ Index: cmd1.c
 		obuf = Popen(cmd, "w", cp, 1);
 		if (obuf == NULL) {
 			perror(cmd);
-Index: cmd3.c
-===================================================================
--- cmd3.c.orig
-+++ cmd3.c
+--- cmd3.c
+++ cmd3.c	2005-10-14 13:44:09.000000000 +0000
@@ -90,7 +90,7 @@ shell(void *v)
 	if (bangexp(&cmd, &cmdsize) < 0)
 		return 1;
@ -80,10 +74,8 @@ Index: cmd3.c
 	run_command(shell, 0, -1, -1, NULL, NULL, NULL);
 	safe_signal(SIGINT, sigint);
 	putchar('\n');
-Index: collect.c
-===================================================================
--- collect.c.orig
-+++ collect.c
+--- collect.c
+++ collect.c	2005-10-14 13:44:09.000000000 +0000
@@ -121,7 +121,7 @@ insertcommand(FILE *fp, char *cmd)
 	if (sigsetjmp(pipejmp, 1))
 		goto endpipe;
@ -102,10 +94,8 @@ Index: collect.c
 	if (run_command(shell,
 	    0, fileno(collf), fileno(nf), "-c", cmd, NULL) < 0) {
 		Fclose(nf);
-Index: def.h
-===================================================================
--- def.h.orig
-+++ def.h
+--- def.h
+++ def.h	2005-10-14 13:45:56.000000000 +0000
@@ -642,3 +642,68 @@ enum ssl_vrfy_level {
 	VRFY_STRICT
 };
@ -175,10 +165,8 @@ Index: def.h
 +#    define PATH_TMP "/tmp"
 +#  endif
 +#endif
-Index: dotlock.c
-===================================================================
--- dotlock.c.orig
-+++ dotlock.c
+--- dotlock.c
+++ dotlock.c	2005-10-14 13:44:09.000000000 +0000
@@ -82,7 +82,7 @@ maildir_access(const char *fname)
 static int
 perhaps_setgid(const char *name, gid_t gid)
@ -188,10 +176,8 @@ Index: dotlock.c
 
 	if (strncmp(name, safepath, sizeof (safepath)-1) ||
 			strchr(name + sizeof (safepath), '/'))
-Index: edit.c
-===================================================================
--- edit.c.orig
-+++ edit.c
+--- edit.c
+++ edit.c	2005-10-14 13:47:03.000000000 +0000
@@ -153,7 +153,7 @@ edit1(int *msgvec, int type)
  * Run an editor on the file at "fpp" of "size" bytes,
  * and return a new file pointer.
@ -210,10 +196,8 @@ Index: edit.c
 	sigemptyset(&set);
 	if (run_command(edit, oldint != SIG_IGN ? &set : NULL, -1, -1,
 				tempEdit, NULL, NULL) < 0) {
-Index: fio.c
-===================================================================
--- fio.c.orig
-+++ fio.c
+--- fio.c
+++ fio.c	2005-10-14 13:44:09.000000000 +0000
@@ -539,7 +539,7 @@ globname(char *name)
 	}
 	snprintf(cmdbuf, sizeof cmdbuf, "echo %s", name);
@ -223,10 +207,8 @@ Index: fio.c
 	pid = start_command(shell, 0, -1, pivec[1], "-c", cmdbuf, NULL);
 	if (pid < 0) {
 		close(pivec[0]);
-Index: main.c
-===================================================================
--- main.c.orig
-+++ main.c
+--- main.c
+++ main.c	2005-10-14 13:44:09.000000000 +0000
@@ -396,7 +396,7 @@ usage:
 	rcvmode = !to && !tflag;
 	spreserve();
@ -236,10 +218,8 @@ Index: main.c
 	/*
 	 * Expand returns a savestr, but load only uses the file name
 	 * for fopen, so it's safe to do this.
-Index: names.c
-===================================================================
--- names.c.orig
-+++ names.c
+--- names.c
+++ names.c	2005-10-14 13:44:09.000000000 +0000
@@ -343,7 +343,7 @@ outof(struct name *names, FILE *fo, stru
 			 * on one another.
 			 */
@ -249,10 +229,8 @@ Index: names.c
 			sigemptyset(&nset);
 			sigaddset(&nset, SIGHUP);
 			sigaddset(&nset, SIGINT);
-Index: send.c
-===================================================================
--- send.c.orig
-+++ send.c
+--- send.c
+++ send.c	2005-10-14 13:44:09.000000000 +0000
@@ -1049,7 +1049,7 @@ getpipefile(char *pipecmd, FILE **qbuf,
 			Ftfree(&tempPipe);
 		}
@ -262,10 +240,8 @@ Index: send.c
 		if ((rbuf = Popen(pipecmd, "W", shell, fileno(*qbuf)))
 				== NULL) {
 			perror(pipecmd);
-Index: sendout.c
-===================================================================
--- sendout.c.orig
-+++ sendout.c
+--- sendout.c
+++ sendout.c	2005-10-14 13:44:09.000000000 +0000
@@ -837,7 +837,7 @@ start_mta(struct name *to, struct name *
 			if ((cp = value("sendmail")) != NULL)
 				cp = expand(cp);
@ -275,10 +251,8 @@ Index: sendout.c
 			execv(cp, args);
 			perror(cp);
 		}
-Index: temp.c
-===================================================================
--- temp.c.orig
-+++ temp.c
+--- temp.c
+++ temp.c	2005-10-14 13:44:09.000000000 +0000
@@ -121,7 +121,7 @@ tinit(void)
 		tmpdir = smalloc(strlen(cp) + 1);
 		strcpy(tmpdir, cp);
@ -288,10 +262,8 @@ Index: temp.c
 	}
 	if (myname != NULL) {
 		if (getuserid(myname) < 0) {
-Index: v7.local.c
-===================================================================
--- v7.local.c.orig
-+++ v7.local.c
+--- v7.local.c
+++ v7.local.c	2005-10-14 13:44:09.000000000 +0000
@@ -70,7 +70,7 @@ findmail(char *user, int force, char *bu
 			which_protocol(cp) == PROTO_IMAP) {
 		snprintf(buf, size, "%s/INBOX", protbase(cp));