pool/mailx
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 23998 from server:mail

Browse Source 
Copy from server:mail/mailx based on submit request 23998 from user dirkmueller

OBS-URL: https://build.opensuse.org/request/show/23998
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mailx?expand=0&rev=6
This commit is contained in:
OBS User autobuild 2009-11-10 09:16:13 +00:00 committed by Git OBS Bridge
parent 65f7780240
commit 1fc3a507c0
4 changed files with 109 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mailx-12.2-mime.dif
View File

@ -1,5 +1,7 @@
--- def.h
+++ def.h 2007-04-17 13:32:43.960721000 +0200
Index: def.h
===================================================================
--- def.h.orig
+++ def.h
@@ -142,7 +142,8 @@ enum mimeclean {
MIME_LONGLINES = 002, /* has lines too long for RFC 2822 */
MIME_CTRLCHAR = 004, /* contains control characters */
@ -10,8 +12,10 @@
};
enum tdflags {
--- mime.c
+++ mime.c 2007-04-17 15:08:06.352702764 +0200
Index: mime.c
===================================================================
--- mime.c.orig
+++ mime.c
@@ -258,7 +258,10 @@ getcharset(int isclean)
if (isclean & (MIME_CTRLCHAR|MIME_HASNUL))
charset = NULL;
@ -22,9 +26,9 @@
+ if (charset == NULL)
+ charset = wantcharset ? wantcharset : value("charset");
if (charset == NULL) {
charset = defcharset;
}
@@ -730,6 +733,7 @@ mime_isclean(FILE *f)
char *t = value("ttycharset");
if (t == NULL || (ascncasecmp("ANSI_X3.4", t, 9) == 0))
@@ -742,6 +745,7 @@ mime_isclean(FILE *f)
lastc = c;
c = getc(f);
curlen++;
@ -32,7 +36,7 @@
if (c == '\n' || c == EOF) {
/*
* RFC 821 imposes a maximum line length of 1000
@@ -742,10 +746,38 @@ mime_isclean(FILE *f)
@@ -754,10 +758,38 @@ mime_isclean(FILE *f)
curlen = 1;
} else if (c & 0200) {
isclean |= MIME_HIGHBIT;
@ -72,7 +76,7 @@
isclean |= MIME_CTRLCHAR;
}
} while (c != EOF);
@@ -814,13 +846,16 @@ get_mime_convert(FILE *fp, char **conten
@@ -826,13 +858,16 @@ get_mime_convert(FILE *fp, char **conten
* ^I or ^L in text/plain bodies. However, some
* obscure character sets actually contain these
* characters, so the content type can be set.
@ -90,9 +94,11 @@
return convert;
}
--- sendout.c
+++ sendout.c 2007-04-17 15:11:40.576871634 +0200
@@ -206,7 +206,7 @@ attach_file(struct attachment *ap, FILE
Index: sendout.c
===================================================================
--- sendout.c.orig
+++ sendout.c
@@ -206,7 +206,7 @@ attach_file(struct attachment *ap, FILE
size_t bufsize, count;
int lastc = EOF;
#ifdef HAVE_ICONV
@ -101,7 +107,7 @@
#endif
if ((fi = Fopen(ap->a_name, "r")) == NULL) {
@@ -231,8 +231,16 @@ attach_file(struct attachment *ap, FILE
@@ -231,8 +231,16 @@ attach_file(struct attachment *ap, FILE
send_boundary, contenttype);
if (charset == NULL)
putc('\n', fo);
@ -120,7 +126,7 @@
if (ap->a_content_disposition == NULL)
ap->a_content_disposition = "attachment";
fprintf(fo, "Content-Transfer-Encoding: %s\n"
@@ -254,16 +262,15 @@ attach_file(struct attachment *ap, FILE
@@ -254,16 +262,15 @@ attach_file(struct attachment *ap, FILE
iconv_close(iconvd);
iconvd = (iconv_t)-1;
}
@ -148,7 +154,7 @@
isclean & MIME_HIGHBIT &&
charset != NULL && asccasecmp(charset, tcs)) {
if (iconvd != (iconv_t)-1)
@@ -1160,8 +1168,9 @@ puthead(struct header *hp, FILE *fo, enu
@@ -1162,8 +1170,9 @@ puthead(struct header *hp, FILE *fo, enu
return 1;
if ((addr = hp->h_organization) != NULL ||
(addr = value("ORGANIZATION")) != NULL) {
@ -159,7 +165,7 @@
action == SEND_TODISP ?
CONV_NONE:CONV_TOHDR,
action == SEND_TODISP ?
@@ -1206,9 +1215,10 @@ puthead(struct header *hp, FILE *fo, enu
@@ -1208,9 +1217,10 @@ puthead(struct header *hp, FILE *fo, enu
if (hp->h_subject != NULL && w & GSUBJECT) {
fwrite("Subject: ", sizeof (char), 9, fo);
if (ascncasecmp(hp->h_subject, "re: ", 4) == 0) {
@ -172,7 +178,7 @@
fo, action == SEND_TODISP ?
CONV_NONE:CONV_TOHDR,
action == SEND_TODISP ?
@@ -1216,8 +1226,9 @@ puthead(struct header *hp, FILE *fo, enu
@@ -1218,8 +1228,9 @@ puthead(struct header *hp, FILE *fo, enu
NULL, (size_t)0) == 0)
return 1;
} else if (*hp->h_subject) {

5
mailx.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 3 19:09:30 UTC 2009 - coolo@novell.com
- updated patches to apply with fuzz=0
-------------------------------------------------------------------
Tue Apr 17 15:25:22 CEST 2007 - werner@suse.de

103
mailx.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package mailx (Version 12.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -21,13 +21,13 @@
Name: mailx
BuildRequires: krb5-devel openssl-devel pcre postfix
Url: http://heirloom.sourceforge.net/mailx.html
License: BSD 3-Clause
License: BSD 3-clause (or similar)
Group: Productivity/Networking/Email/Utilities
Provides: mail
Requires: smtp_daemon
AutoReqProv: on
Version: 12.2
Release: 141
Release: 142
Summary: A MIME-Capable Implementation of the mailx Command
Source: mailx-%{version}.tar.bz2
Patch: mailx-%{version}.dif
@ -96,100 +96,3 @@ Authors:
%doc %{_mandir}/man1/mailx.1.gz
%changelog
* Tue Apr 17 2007 werner@suse.de
- Update to heirloom mailx 12.2
- Add UTF-8 detection (bug #262658)
- Do not convert text attachments to terminal charset but send
character set (bug #262658)
- Improve the support of text/ MIME types other than text/plain
(bug #262658)
* Wed Nov 15 2006 werner@suse.de
- Do not send the mail to a reply-to address (bug #218447)
* Wed Sep 27 2006 werner@suse.de
- Avoid to feed empty strings into mime if empty results leads
to an error like it does for an empty ORGANIZATION variable
* Thu Jul 20 2006 werner@suse.de
- Update to mailx version 12.1 the successor of nail
* Better handling of base64 encoding
* Support for SendmailX
- Add a workaround for Ctrl-H used in kernel messages (#189974)
- Do not convert 8bit encodings to ASCII but use quoted printable
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Fri Jan 20 2006 schwab@suse.de
- Don't strip binaries.
* Mon Oct 17 2005 werner@suse.de
- Update to nail 11.25
* Port all out patches to this version
* Use dummy option for the reply-to patch because the double
colon feature of the glibc's getopt does not work
* New: ssl and krb5 support
* Mon Aug 30 2004 werner@suse.de
- Update to bugfix release 11.4
* Thu Aug 19 2004 werner@suse.de
- Make it option compatible with old mail program
- Update to 11.3
* Tue Aug 17 2004 werner@suse.de
- Update to 11.2
* Fri Mar 26 2004 mmj@suse.de
- Add postfix to # neededforbuild
* Sat Jan 10 2004 adrian@suse.de
- add %%defattr
* Mon Dec 08 2003 werner@suse.de
- Update to version 10.6
* Tue Nov 11 2003 werner@suse.de
- Fix handling of multiword e-mail addresses (bug #32115)
* Wed Jul 30 2003 werner@suse.de
- Use charset of locale as default encoding if not set
* Wed Jul 02 2003 ro@suse.de
- added symlink /usr/bin/mail (again)
* Wed Jul 02 2003 werner@suse.de
- Update to nail 10.5
* Thu Feb 27 2003 werner@suse.de
- Fix replyto patch for Replay and replay case
* Mon Feb 03 2003 werner@suse.de
- Don't eat option id `+' isn't used anymore
- Accept comma seperated `to' list on command line
* Mon Jan 27 2003 sf@suse.de
- removed '+' from optarg string to be able to mix
argument order
* Thu Dec 19 2002 werner@suse.de
- Move from mail-8.1.1 to nail-10.3 due of getting RFC 2046
- Port the reply-to patch to nail-10.3 in extension to replyto
variable of nail configuration
* Thu Mar 07 2002 werner@suse.de
- Include, enhance and test the reply-to patch from poc@pocnet.net.
Useful for system notify mails behind firewalls or from header
rewrite because those mails arn't uniq without reply address.
* Sat May 12 2001 schwab@suse.de
- Fix missing declarations.
* Wed Nov 22 2000 werner@suse.de
- Allow `/' within valid mail addresses
- Strip leading + of file name on command line
* Fri Oct 06 2000 kukuk@suse.de
- change group tag
* Wed May 24 2000 uli@suse.de
- moved docs to /usr/share
* Sun Feb 27 2000 kukuk@suse.de
- Move /usr/man -> /usr/share/man
* Mon Sep 20 1999 ro@suse.de
- added requires smtp_daemon
* Mon Sep 13 1999 bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
* Tue Mar 23 1999 werner@suse.de
- Add pine format for date
* Mon Mar 22 1999 werner@suse.de
- Add a security fix
- Correct a old security fix to make it work
* Thu Jun 25 1998 werner@suse.de
- No gid mail and not sgid mail: we do not use them
* Thu Jun 25 1998 werner@suse.de
- Even if we are safe by dropping edid we want no buffer overflow
- Use IOSAFE implementation for glibc instead of fpurge
* Thu Jun 25 1998 werner@suse.de
- Move from old debian version 8.5.5 (5.5-kw) to OpenBSD 8.1 release
plus some changes from debian, redhat, and some own.
* Wed Feb 05 1997 werner@suse.de
- Using mailx-5.5-kw/8.5.5-debian for mail
- Some changes to get emacs date mark on work in mail folders
- Some clean up in code

128
nail-11.25-path.dif
View File

@ -1,6 +1,8 @@
--- Makefile
+++ Makefile 2005-10-14 15:44:09.000000000 +0200
@@ -11,13 +11,9 @@
Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -11,13 +11,9 @@ BINDIR = $(PREFIX)/bin
MANDIR = $(PREFIX)/share/man
SYSCONFDIR = /etc
@ -15,16 +17,16 @@
# Define compiler, preprocessor, and linker flags here.
# Note that some Linux/glibc versions need -D_GNU_SOURCE in CPPFLAGS, or
@@ -50,7 +46,7 @@
@@ -50,7 +46,7 @@ SHELL = /bin/sh
# If you know that the IPv6 functions work on your machine, you can enable
# them here.
-#IPv6 = -DHAVE_IPv6_FUNCS
+##IPv6 = -DHAVE_IPv6_FUNCS
###########################################################################
###########################################################################
@@ -58,8 +54,7 @@
#
# Binaries are stripped with this command after installation.
@@ -63,8 +59,7 @@ STRIP = strip
###########################################################################
###########################################################################
@ -34,9 +36,11 @@
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 \
--- cmd1.c
+++ cmd1.c 2005-10-14 15:44:09.000000000 +0200
@@ -78,7 +78,7 @@
Index: cmd1.c
===================================================================
--- cmd1.c.orig
+++ cmd1.c
@@ -78,7 +78,7 @@ get_pager(void)
cp = value("PAGER");
if (cp == NULL || *cp == '\0')
@ -45,7 +49,7 @@
return cp;
}
@@ -757,7 +757,7 @@
@@ -757,7 +757,7 @@ type1(int *msgvec, int doign, int page,
if (pipe) {
cp = value("SHELL");
if (cp == NULL)
@ -54,9 +58,11 @@
obuf = Popen(cmd, "w", cp, 1);
if (obuf == NULL) {
perror(cmd);
--- cmd3.c
+++ cmd3.c 2005-10-14 15:44:09.000000000 +0200
@@ -90,7 +90,7 @@
Index: cmd3.c
===================================================================
--- cmd3.c.orig
+++ cmd3.c
@@ -90,7 +90,7 @@ shell(void *v)
if (bangexp(&cmd, &cmdsize) < 0)
return 1;
if ((shell = value("SHELL")) == NULL)
@ -65,7 +71,7 @@
run_command(shell, 0, -1, -1, "-c", cmd, NULL);
safe_signal(SIGINT, sigint);
printf("!\n");
@@ -109,7 +109,7 @@
@@ -109,7 +109,7 @@ dosh(void *v)
char *shell;
if ((shell = value("SHELL")) == NULL)
@ -74,9 +80,11 @@
run_command(shell, 0, -1, -1, NULL, NULL, NULL);
safe_signal(SIGINT, sigint);
putchar('\n');
--- collect.c
+++ collect.c 2005-10-14 15:44:09.000000000 +0200
@@ -121,7 +121,7 @@
Index: collect.c
===================================================================
--- collect.c.orig
+++ collect.c
@@ -121,7 +121,7 @@ insertcommand(FILE *fp, char *cmd)
if (sigsetjmp(pipejmp, 1))
goto endpipe;
if (cp == NULL)
@ -85,7 +93,7 @@
if ((obuf = Popen(cmd, "r", cp, 0)) == NULL) {
perror(cmd);
return;
@@ -1049,7 +1049,7 @@
@@ -1049,7 +1049,7 @@ mespipe(char *cmd)
* stdout = new message.
*/
if ((shell = value("SHELL")) == NULL)
@ -94,9 +102,11 @@
if (run_command(shell,
0, fileno(collf), fileno(nf), "-c", cmd, NULL) < 0) {
Fclose(nf);
--- def.h
+++ def.h 2005-10-14 15:45:56.000000000 +0200
@@ -642,3 +642,68 @@
Index: def.h
===================================================================
--- def.h.orig
+++ def.h
@@ -642,3 +642,68 @@ enum ssl_vrfy_level {
VRFY_STRICT
};
#endif /* USE_SSL */
@ -165,9 +175,11 @@
+# define PATH_TMP "/tmp"
+# endif
+#endif
--- dotlock.c
+++ dotlock.c 2005-10-14 15:44:09.000000000 +0200
@@ -78,7 +78,7 @@
Index: dotlock.c
===================================================================
--- dotlock.c.orig
+++ dotlock.c
@@ -82,7 +82,7 @@ maildir_access(const char *fname)
static int
perhaps_setgid(const char *name, gid_t gid)
{
@ -176,9 +188,11 @@
if (strncmp(name, safepath, sizeof (safepath)-1) ||
strchr(name + sizeof (safepath), '/'))
--- edit.c
+++ edit.c 2005-10-14 15:47:03.000000000 +0200
@@ -153,7 +153,7 @@
Index: edit.c
===================================================================
--- edit.c.orig
+++ edit.c
@@ -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.
* Signals must be handled by the caller.
@ -187,7 +201,7 @@
*/
FILE *
run_editor(FILE *fp, off_t size, int type, int readonly,
@@ -212,7 +212,7 @@
@@ -212,7 +212,7 @@ run_editor(FILE *fp, off_t size, int typ
}
nf = NULL;
if ((edit = value(type == 'e' ? "EDITOR" : "VISUAL")) == NULL)
@ -196,9 +210,11 @@
sigemptyset(&set);
if (run_command(edit, oldint != SIG_IGN ? &set : NULL, -1, -1,
tempEdit, NULL, NULL) < 0) {
--- fio.c
+++ fio.c 2005-10-14 15:44:09.000000000 +0200
@@ -541,7 +541,7 @@
Index: fio.c
===================================================================
--- fio.c.orig
+++ fio.c
@@ -539,7 +539,7 @@ globname(char *name)
}
snprintf(cmdbuf, sizeof cmdbuf, "echo %s", name);
if ((shell = value("SHELL")) == NULL)
@ -207,9 +223,11 @@
pid = start_command(shell, 0, -1, pivec[1], "-c", cmdbuf, NULL);
if (pid < 0) {
close(pivec[0]);
--- main.c
+++ main.c 2005-10-14 15:44:09.000000000 +0200
@@ -390,7 +390,7 @@
Index: main.c
===================================================================
--- main.c.orig
+++ main.c
@@ -396,7 +396,7 @@ usage:
rcvmode = !to && !tflag;
spreserve();
if (!nosrc)
@ -218,9 +236,11 @@
/*
* Expand returns a savestr, but load only uses the file name
* for fopen, so it's safe to do this.
--- names.c
+++ names.c 2005-10-14 15:44:09.000000000 +0200
@@ -343,7 +343,7 @@
Index: names.c
===================================================================
--- names.c.orig
+++ names.c
@@ -343,7 +343,7 @@ outof(struct name *names, FILE *fo, stru
* on one another.
*/
if ((shell = value("SHELL")) == NULL)
@ -229,9 +249,11 @@
sigemptyset(&nset);
sigaddset(&nset, SIGHUP);
sigaddset(&nset, SIGINT);
--- send.c
+++ send.c 2005-10-14 15:44:09.000000000 +0200
@@ -1049,7 +1049,7 @@
Index: send.c
===================================================================
--- send.c.orig
+++ send.c
@@ -1049,7 +1049,7 @@ getpipefile(char *pipecmd, FILE **qbuf,
Ftfree(&tempPipe);
}
if ((shell = value("SHELL")) == NULL)
@ -240,9 +262,11 @@
if ((rbuf = Popen(pipecmd, "W", shell, fileno(*qbuf)))
== NULL) {
perror(pipecmd);
--- sendout.c
+++ sendout.c 2005-10-14 15:44:09.000000000 +0200
@@ -791,7 +791,7 @@
Index: sendout.c
===================================================================
--- sendout.c.orig
+++ sendout.c
@@ -837,7 +837,7 @@ start_mta(struct name *to, struct name *
if ((cp = value("sendmail")) != NULL)
cp = expand(cp);
else
@ -251,9 +275,11 @@
execv(cp, args);
perror(cp);
}
--- temp.c
+++ temp.c 2005-10-14 15:44:09.000000000 +0200
@@ -121,7 +121,7 @@
Index: temp.c
===================================================================
--- temp.c.orig
+++ temp.c
@@ -121,7 +121,7 @@ tinit(void)
tmpdir = smalloc(strlen(cp) + 1);
strcpy(tmpdir, cp);
} else {
@ -262,9 +288,11 @@
}
if (myname != NULL) {
if (getuserid(myname) < 0) {
--- v7.local.c
+++ v7.local.c 2005-10-14 15:44:09.000000000 +0200
@@ -70,7 +70,7 @@
Index: v7.local.c
===================================================================
--- v7.local.c.orig
+++ v7.local.c
@@ -70,7 +70,7 @@ findmail(char *user, int force, char *bu
which_protocol(cp) == PROTO_IMAP) {
snprintf(buf, size, "%s/INBOX", protbase(cp));
} else if (force || (mbox = value("MAIL")) == NULL) {