OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Mar-2008 09:21:45
Branch: HEAD Handle: 2008030808214300
Modified files:
openpkg-src/ssmtp ssmtp.patch ssmtp.spec
Log:
upgrading package: ssmtp 2.61 -> 2.62
Summary:
Revision Changes Path
1.11 +82 -239 openpkg-src/ssmtp/ssmtp.patch
1.71 +3 -3 openpkg-src/ssmtp/ssmtp.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ssmtp/ssmtp.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 ssmtp.patch
--- openpkg-src/ssmtp/ssmtp.patch 20 Sep 2007 07:01:57 -0000 1.10
+++ openpkg-src/ssmtp/ssmtp.patch 8 Mar 2008 08:21:43 -0000 1.11
@@ -1,6 +1,6 @@
Index: Makefile.in
---- Makefile.in.orig 2004-07-26 07:32:18 +0200
-+++ Makefile.in 2007-09-19 13:47:03 +0200
+--- Makefile.in.orig 2008-02-29 03:50:15 +0100
++++ Makefile.in 2008-03-08 09:14:11 +0100
@@ -16,7 +16,7 @@
# Configuration files
@@ -10,32 +10,9 @@
INSTALLED_CONFIGURATION_FILE=$(CONFIGURATION_FILE)
INSTALLED_REVALIASES_FILE=$(REVALIASES_FILE)
-@@ -36,7 +36,7 @@
- -DREVALIASES_FILE=\"$(REVALIASES_FILE)\" \
-
-
--CFLAGS=-Wall @DEFS@ $(EXTRADEFS) @CFLAGS@
[EMAIL PROTECTED]@ $(EXTRADEFS) @CFLAGS@
-
- .PHONY: all
- all: ssmtp
-Index: arpadate.c
---- arpadate.c.orig 2002-12-08 18:30:11 +0100
-+++ arpadate.c 2007-09-19 13:46:41 +0200
-@@ -78,8 +78,8 @@
- #else
- time_t now;
-
-- /* RFC822 format string borrowed from GNU shellutils date.c */
-- const char *format = "%a, %_d %b %Y %H:%M:%S %z";
-+ /* RFC2822 format */
-+ const char *format = "%a, %d %b %Y %H:%M:%S %Z";
-
- now = time(NULL);
-
Index: newaliases.8
---- /dev/null 2007-09-19 13:46:47 +0200
-+++ newaliases.8 2007-09-19 13:46:41 +0200
+--- /dev/null 2008-03-08 09:20:06 +0100
++++ newaliases.8 2008-03-08 09:14:11 +0100
@@ -0,0 +1,17 @@
+.TH NEWALIASES 8 "September 2000" "Debian GNU/Linux"
+.SH NAME
@@ -54,195 +31,21 @@
+.SH AUTHOR
+This manual page was written by Christoph Lameter <[EMAIL PROTECTED]>,
+for the Debian GNU/Linux system. Minor fixes by Matt Ryan <[EMAIL
PROTECTED]>
-Index: ssmtp.8
---- ssmtp.8.orig 2002-09-27 14:48:59 +0200
-+++ ssmtp.8 2007-09-19 13:46:41 +0200
-@@ -1,4 +1,4 @@
--.TH SSMTP 8 "Last change: 5 February 2000"
-+.TH SSMTP 8 "Last change: 4 February 2005"
- .SH NAME
- ssmtp, sendmail \- send a message using smtp
- .SH SYNOPSIS
-@@ -103,7 +103,7 @@
-
- .TP
- \fB\-C\fP\fIfile\fP
--(ignored) Use alternate configuration file.
-+Use alternate configuration file.
-
- .TP
- \fB\-d\fP\fIX\fP
-@@ -273,7 +273,7 @@
- /etc/ssmtp/revaliases - reverse aliases file
-
- .SH SEE ALSO
--RFC821, RFC822.
-+RFC821, RFC822, ssmtp.conf(5).
-
- .SH AUTHORS
- Matt Ryan ([EMAIL PROTECTED])
Index: ssmtp.c
---- ssmtp.c.orig 2004-07-23 07:58:48 +0200
-+++ ssmtp.c 2007-09-19 13:46:41 +0200
-@@ -12,8 +12,10 @@
- See COPYRIGHT for the license
-
- */
--#define VERSION "2.60.4"
-+#define VERSION "2.61"
-+#define _GNU_SOURCE
-
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <sys/param.h>
-@@ -150,7 +152,7 @@
- if(isatty(fileno(stdin))) {
- if(log_level > 0) {
- log_event(LOG_ERR,
-- "stdin is a TTY - not saving to %s/dead.letter,
pw->pw_dir");
-+ "stdin is a TTY - not saving to
%s/dead.letter", pw->pw_dir);
- }
- return;
- }
-@@ -242,7 +244,7 @@
- char *p;
-
- p = str;
-- while(*p && isspace(*p)) p++;
-+ while(*p && isspace((int)(*p))) p++;
-
- return(p);
- }
-@@ -255,7 +257,7 @@
- char *p;
-
- p = (str + strlen(str));
-- while(isspace(*--p)) {
-+ while(isspace((int)(*--p))) {
- *p = (char)NULL;
- }
-
-@@ -580,7 +582,7 @@
- }
-
- if(got_addr) {
-- while(*r && isspace(*r)) r++;
-+ while(*r && isspace((int)(*r))) r++;
-
- rcpt_save(addr_parse(r));
- r = (q + 1);
-@@ -727,7 +729,7 @@
- void header_parse(FILE *stream)
- {
- size_t size = BUF_SZ, len = 0;
-- char *p = (char *)NULL, *q;
-+ char *p = (char *)NULL, *q = (char *)NULL;
- bool_t in_header = True;
- char l = (char)NULL;
- int c;
-Index: ssmtp.conf.5
---- /dev/null 2007-09-19 13:46:47 +0200
-+++ ssmtp.conf.5 2007-09-19 13:46:41 +0200
-@@ -0,0 +1,81 @@
-+.\"/* Copyright 2004 Reuben Thomas
-+.\" * All rights reserved
-+.\" *
-+.\" This man page is distributed under the GNU General Public License
-+.\" version 2, or at your option, any later version. There is no warranty.
-+.\"
-+.Dd October 7, 2004
-+.Dt SSMTP.CONF 5
-+.Os
-+.Sh NAME
-+.Nm ssmtp.conf
-+.Nd ssmtp configuration file
-+.Sh DESCRIPTION
-+.Nm ssmtp
-+reads configuration data from
-+.Pa /etc/ssmtp/ssmtp.conf
-+The file contains keyword-argument pairs, one per line.
-+Lines starting with
-+.Ql #
-+and empty lines are interpreted as comments.
-+.Pp
-+The possible keywords and their meanings are as follows (both are
case-insensitive):
-+.Bl -tag -width Ds
-+.It Cm Root
-+The user that gets all mail for userids less than 1000. If blank, address
rewriting is disabled.
-+.Pp
-+.It Cm Mailhub
-+The host to send mail to, in the form
-+.Ar host No | Ar IP_addr No Oo : Ar port Oc .
-+The default port is 25.
-+.Pp
-+.It Cm RewriteDomain
-+The domain from which mail seems to come.
-+for user authentication.
-+.Pp
-+.It Cm Hostname
-+The full qualified name of the host.
-+If not specified, the host is queried for its hostname.
-+.Pp
-+.It Cm FromLineOverride
-+Specifies whether the From header of an email, if any, may override the
default domain.
-+The default is
-+.Dq no .
-+.Pp
-+.It Cm UseTLS
-+Specifies whether ssmtp uses TLS to talk to the SMTP server.
-+The default is
-+.Dq no .
-+.Pp
-+.It Cm UseSTARTTLS
-+Specifies whether ssmtp does a EHLO/STARTTLS before starting SSL
negotiation.
-+See RFC 2487.
-+.Pp
-+.It Cm TLSCert
-+The file name of an RSA certificate to use for TLS, if required.
-+.Pp
-+.It Cm AuthUser
-+The user name to use for SMTP AUTH.
-+The default is blank, in which case SMTP AUTH is not used.
-+sent without
-+.Pp
-+.It Cm AuthPass
-+The password to use for SMTP AUTH.
-+.Pp
-+.It Cm AuthMethod
-+The authorization method to use.
-+If unset, plain text is used.
-+May also be set to
-+.Dq cram-md5 .
-+.Sh FILES
-+.Bl -tag -width Ds
-+.It Pa /etc/ssmtp/ssmtp.conf
-+Contains configuration data for
-+.Nm ssmtp .
-+.El
-+.Sh SEE ALSO
-+.Xr ssmtp 8
-+.Sh AUTHORS
-+Matt Ryan ([EMAIL PROTECTED]), Hugo Haas ([EMAIL PROTECTED]), Christoph
Lameter ([EMAIL PROTECTED])
-+and Dave Collier-Brown ([EMAIL PROTECTED]).
-+Reuben Thomas ([EMAIL PROTECTED]) wrote the man page.
-
-workaround amd64-suse10.1 error: conflicting types for 'basename'
-fix amd64-suse10.1 warnings: cast from pointer to integer of different size
-Index: ssmtp.c
---- ssmtp.c.orig 2007-09-20 08:27:18.000000000 +0200
-+++ ssmtp.c 2007-09-20 08:45:24.000000000 +0200
-@@ -40,6 +40,9 @@
- #endif
- #include "ssmtp.h"
+--- ssmtp.c.orig 2008-03-06 21:01:22 +0100
++++ ssmtp.c 2008-03-08 09:19:59 +0100
+@@ -39,6 +39,10 @@
+ #include <fcntl.h>
+ #include "xgethostname.h"
+#ifndef NUL
+#define NUL '\0'
+#endif
-
++
bool_t have_date = False;
bool_t have_from = False;
-@@ -56,20 +59,20 @@
+ #ifdef HASTO_OPTION
+@@ -55,21 +59,21 @@
#define ARPADATE_LENGTH 32 /* Current date in RFC format */
char arpadate[ARPADATE_LENGTH];
@@ -256,7 +59,7 @@
+char *auth_method = (char *)NULL; /* Mechanism for SMTP
authentication */
+char *mail_domain = (char *)NULL;
+char *from = (char *)NULL; /* Use this as the From: address */
- char hostname[MAXHOSTNAMELEN] = "localhost";
+ char *hostname;
char *mailhost = "mailhub";
-char *minus_f = (char)NULL;
-char *minus_F = (char)NULL;
@@ -268,38 +71,52 @@
char *root = NULL;
char *tls_cert = "/etc/ssl/certs/ssmtp.pem"; /* Default Certificate
*/
-char *uad = (char)NULL;
+-char *config_file = (char)NULL; /* alternate configuration file
*/
+char *uad = (char *)NULL;
++char *config_file = (char *)NULL; /* alternate configuration file
*/
headers_t headers, *ht;
-@@ -217,7 +220,7 @@
+@@ -222,11 +226,10 @@
+ exit(1);
+ }
+
+-#ifndef _GNU_SOURCE
/*
basename() -- Return last element of path
*/
-char *basename(char *str)
+char *mybasename(char *str)
{
- char buf[MAXPATHLEN +1], *p;
+ char *p;
-@@ -231,7 +234,7 @@
- die("basename() -- strncpy() failed");
- }
- }
-- buf[MAXPATHLEN] = (char)NULL;
-+ buf[MAXPATHLEN] = NUL;
+@@ -237,7 +240,6 @@
- return(strdup(buf));
+ return(strdup(p));
}
-@@ -258,7 +261,7 @@
+-#endif /* _GNU_SOURCE */
+
+ /*
+ strip_pre_ws() -- Return pointer to first non-whitespace character
+@@ -261,7 +263,7 @@
p = (str + strlen(str));
- while(isspace((int)(*--p))) {
+ while(isspace(*--p)) {
- *p = (char)NULL;
+ *p = NUL;
}
return(p);
-@@ -307,7 +310,7 @@
+@@ -287,7 +289,7 @@
+ q++;
+
+ if((p = strchr(q, '>'))) {
+- *p = (char)NULL;
++ *p = NUL;
+ }
+
+ #if 0
+@@ -310,7 +312,7 @@
q = strip_post_ws(p);
if(*q == ')') {
while((*--q != '('));
@@ -308,7 +125,7 @@
}
(void)strip_post_ws(p);
-@@ -350,7 +353,7 @@
+@@ -353,7 +355,7 @@
char *p;
if((p = strchr(str, '\n'))) {
@@ -317,7 +134,7 @@
}
/* Any line beginning with a dot has an additional dot inserted;
-@@ -383,7 +386,7 @@
+@@ -386,7 +388,7 @@
while(fgets(buf, sizeof(buf), fp)) {
/* Make comments invisible */
if((p = strchr(buf, '#'))) {
@@ -326,7 +143,7 @@
}
/* Ignore malformed lines and comments */
-@@ -513,7 +516,7 @@
+@@ -516,7 +518,7 @@
#endif
/* Ignore missing usernames */
@@ -335,7 +152,7 @@
return;
}
-@@ -570,7 +573,7 @@
+@@ -573,7 +575,7 @@
}
/* End of string? */
@@ -344,7 +161,7 @@
got_addr = True;
}
-@@ -578,7 +581,7 @@
+@@ -581,7 +583,7 @@
if((*q == ',') && (in_quotes == False)) {
got_addr = True;
@@ -353,7 +170,7 @@
}
if(got_addr) {
-@@ -670,7 +673,7 @@
+@@ -673,7 +675,7 @@
if(strncasecmp(ht->string, "From:", 5) == 0) {
#if 1
/* Hack check for NULL From: line */
@@ -362,16 +179,16 @@
return;
}
#endif
-@@ -731,7 +734,7 @@
+@@ -738,7 +740,7 @@
size_t size = BUF_SZ, len = 0;
- char *p = (char *)NULL, *q = (char *)NULL;
+ char *p = (char *)NULL, *q;
bool_t in_header = True;
- char l = (char)NULL;
+ char l = NUL;
int c;
while(in_header && ((c = fgetc(stream)) != EOF)) {
-@@ -766,9 +769,9 @@
+@@ -773,9 +775,9 @@
in_header = False;
default:
@@ -383,8 +200,35 @@
}
header_save(p);
-@@ -798,7 +801,7 @@
- while(fgets(buf, sizeof(buf), fp)) {
+@@ -806,9 +808,9 @@
+ in_header = False;
+
+ default:
+- *q = (char)NULL;
++ *q = NUL;
+ if((q = strrchr(p, '\n'))) {
+- *q = (char)NULL;
++ *q = NUL;
+ }
+ header_save(p);
+
+@@ -841,10 +843,12 @@
+ if (!rest) {
+ return NULL;
+ }
+- tok=strndup(*s,rest-(*s));
++ tok=malloc(rest-(*s));
+ if (!tok) {
+- die("firsttok() -- strndup() failed");
++ die("firsttok() -- malloc() failed");
+ }
++ strncpy(tok, *s, rest-(*s));
++ tok[rest-(*s)] = '\0';
+ *s=rest+1;
+ return tok;
+ }
+@@ -873,7 +877,7 @@
+ char *rightside;
/* Make comments invisible */
if((p = strchr(buf, '#'))) {
- *p = (char)NULL;
@@ -392,7 +236,7 @@
}
/* Ignore malformed lines and comments */
-@@ -1181,7 +1184,7 @@
+@@ -1301,7 +1305,7 @@
buf[i++] = c;
}
}
@@ -401,7 +245,7 @@
return(buf);
}
-@@ -1551,7 +1554,7 @@
+@@ -1714,7 +1718,7 @@
j = 0;
add = 1;
@@ -410,13 +254,12 @@
switch(argv[i][j]) {
#ifdef INET6
case '6':
-@@ -1867,7 +1870,7 @@
+@@ -2043,7 +2047,7 @@
(void)signal(SIGTTOU, SIG_IGN);
/* Set the globals */
- prog = basename(argv[0]);
+ prog = mybasename(argv[0]);
- if(gethostname(hostname, MAXHOSTNAMELEN) == -1) {
- die("Cannot get the name of this machine");
-
+ hostname = xgethostname();
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ssmtp/ssmtp.spec
============================================================================
$ cvs diff -u -r1.70 -r1.71 ssmtp.spec
--- openpkg-src/ssmtp/ssmtp.spec 1 Jan 2008 15:05:18 -0000 1.70
+++ openpkg-src/ssmtp/ssmtp.spec 8 Mar 2008 08:21:43 -0000 1.71
@@ -31,8 +31,8 @@
Class: BASE
Group: Mail
License: GPL
-Version: 2.61
-Release: 20080101
+Version: 2.62
+Release: 20080308
# package options
%option with_fsl yes
@@ -79,7 +79,7 @@
}
%prep
- %setup -q
+ %setup -q -n ssmtp
%patch -p0
%build
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
