|
|
@@ -1,6 +1,6 @@
|
|
|
Index: Makefile.in
|
|
|
--- Makefile.in.orig 2008-02-29 03:50:15 +0100
|
|
|
-+++ Makefile.in 2008-03-08 09:14:11 +0100
|
|
|
++++ Makefile.in 2009-07-07 22:45:14 +0200
|
|
|
@@ -16,7 +16,7 @@
|
|
|
|
|
|
# Configuration files
|
|
|
@@ -11,8 +11,8 @@ Index: Makefile.in
|
|
|
INSTALLED_CONFIGURATION_FILE=$(CONFIGURATION_FILE)
|
|
|
INSTALLED_REVALIASES_FILE=$(REVALIASES_FILE)
|
|
|
Index: newaliases.8
|
|
|
---- /dev/null 2008-03-08 09:20:06 +0100
|
|
|
-+++ newaliases.8 2008-03-08 09:14:11 +0100
|
|
|
+--- /dev/null 2009-07-07 22:45:20 +0200
|
|
|
++++ newaliases.8 2009-07-07 22:45:14 +0200
|
|
|
@@ -0,0 +1,17 @@
|
|
|
+.TH NEWALIASES 8 "September 2000" "Debian GNU/Linux"
|
|
|
+.SH NAME
|
|
|
@@ -32,8 +32,8 @@ Index: newaliases.8
|
|
|
+This manual page was written by Christoph Lameter <clameter@debian.org>,
|
|
|
+for the Debian GNU/Linux system. Minor fixes by Matt Ryan <mryan@debian.org>
|
|
|
Index: ssmtp.c
|
|
|
---- ssmtp.c.orig 2008-03-06 21:01:22 +0100
|
|
|
-+++ ssmtp.c 2008-03-08 09:19:59 +0100
|
|
|
+--- ssmtp.c.orig 2009-07-07 04:56:01 +0200
|
|
|
++++ ssmtp.c 2009-07-07 22:46:12 +0200
|
|
|
@@ -39,6 +39,10 @@
|
|
|
#include <fcntl.h>
|
|
|
#include "xgethostname.h"
|
|
|
@@ -125,16 +125,16 @@ Index: ssmtp.c
|
|
|
}
|
|
|
(void)strip_post_ws(p);
|
|
|
|
|
|
-@@ -353,7 +355,7 @@
|
|
|
- char *p;
|
|
|
+@@ -363,7 +365,7 @@
|
|
|
+ *linestart = False;
|
|
|
|
|
|
if((p = strchr(str, '\n'))) {
|
|
|
- *p = (char)NULL;
|
|
|
+ *p = NUL;
|
|
|
+ *linestart = True;
|
|
|
}
|
|
|
-
|
|
|
- /* Any line beginning with a dot has an additional dot inserted;
|
|
|
-@@ -386,7 +388,7 @@
|
|
|
+ return(leadingdot);
|
|
|
+@@ -384,7 +386,7 @@
|
|
|
while(fgets(buf, sizeof(buf), fp)) {
|
|
|
/* Make comments invisible */
|
|
|
if((p = strchr(buf, '#'))) {
|
|
|
@@ -143,7 +143,7 @@ Index: ssmtp.c
|
|
|
}
|
|
|
|
|
|
/* Ignore malformed lines and comments */
|
|
|
-@@ -516,7 +518,7 @@
|
|
|
+@@ -519,7 +521,7 @@
|
|
|
#endif
|
|
|
|
|
|
/* Ignore missing usernames */
|
|
|
@@ -152,7 +152,7 @@ Index: ssmtp.c
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
-@@ -573,7 +575,7 @@
|
|
|
+@@ -576,7 +578,7 @@
|
|
|
}
|
|
|
|
|
|
/* End of string? */
|
|
|
@@ -161,7 +161,7 @@ Index: ssmtp.c
|
|
|
got_addr = True;
|
|
|
}
|
|
|
|
|
|
-@@ -581,7 +583,7 @@
|
|
|
+@@ -584,7 +586,7 @@
|
|
|
if((*q == ',') && (in_quotes == False)) {
|
|
|
got_addr = True;
|
|
|
|
|
|
@@ -170,7 +170,7 @@ Index: ssmtp.c
|
|
|
}
|
|
|
|
|
|
if(got_addr) {
|
|
|
-@@ -673,7 +675,7 @@
|
|
|
+@@ -676,7 +678,7 @@
|
|
|
if(strncasecmp(ht->string, "From:", 5) == 0) {
|
|
|
#if 1
|
|
|
/* Hack check for NULL From: line */
|
|
|
@@ -179,7 +179,7 @@ Index: ssmtp.c
|
|
|
return;
|
|
|
}
|
|
|
#endif
|
|
|
-@@ -738,7 +740,7 @@
|
|
|
+@@ -741,7 +743,7 @@
|
|
|
size_t size = BUF_SZ, len = 0;
|
|
|
char *p = (char *)NULL, *q;
|
|
|
bool_t in_header = True;
|
|
|
@@ -188,7 +188,7 @@ Index: ssmtp.c
|
|
|
int c;
|
|
|
|
|
|
while(in_header && ((c = fgetc(stream)) != EOF)) {
|
|
|
-@@ -773,9 +775,9 @@
|
|
|
+@@ -776,9 +778,9 @@
|
|
|
in_header = False;
|
|
|
|
|
|
default:
|
|
|
@@ -200,7 +200,7 @@ Index: ssmtp.c
|
|
|
}
|
|
|
header_save(p);
|
|
|
|
|
|
-@@ -806,9 +808,9 @@
|
|
|
+@@ -809,9 +811,9 @@
|
|
|
in_header = False;
|
|
|
|
|
|
default:
|
|
|
@@ -212,7 +212,7 @@ Index: ssmtp.c
|
|
|
}
|
|
|
header_save(p);
|
|
|
|
|
|
-@@ -841,10 +843,12 @@
|
|
|
+@@ -844,10 +846,12 @@
|
|
|
if (!rest) {
|
|
|
return NULL;
|
|
|
}
|
|
|
@@ -227,7 +227,7 @@ Index: ssmtp.c
|
|
|
*s=rest+1;
|
|
|
return tok;
|
|
|
}
|
|
|
-@@ -873,7 +877,7 @@
|
|
|
+@@ -876,7 +880,7 @@
|
|
|
char *rightside;
|
|
|
/* Make comments invisible */
|
|
|
if((p = strchr(buf, '#'))) {
|
|
|
@@ -236,7 +236,7 @@ Index: ssmtp.c
|
|
|
}
|
|
|
|
|
|
/* Ignore malformed lines and comments */
|
|
|
-@@ -1301,7 +1305,7 @@
|
|
|
+@@ -1310,7 +1314,7 @@
|
|
|
buf[i++] = c;
|
|
|
}
|
|
|
}
|
|
|
@@ -245,7 +245,7 @@ Index: ssmtp.c
|
|
|
|
|
|
return(buf);
|
|
|
}
|
|
|
-@@ -1714,7 +1718,7 @@
|
|
|
+@@ -1737,7 +1741,7 @@
|
|
|
j = 0;
|
|
|
|
|
|
add = 1;
|
|
|
@@ -254,7 +254,7 @@ Index: ssmtp.c
|
|
|
switch(argv[i][j]) {
|
|
|
#ifdef INET6
|
|
|
case '6':
|
|
|
-@@ -2043,7 +2047,7 @@
|
|
|
+@@ -2066,7 +2070,7 @@
|
|
|
(void)signal(SIGTTOU, SIG_IGN);
|
|
|
|
|
|
/* Set the globals */
|