[gentoo-commits] gentoo commit in src/patchsets/ssmtp/2.64: 0010_all_maxsysuid.patch 0020_all_from-format-fix.patch 0030_all_authpass.patch 0040_all_darwin7.patch 0050_all_strndup.patch 0060_all_opessl_crypto.patch 0070_all_solaris-basename.patch 0080_all_gnutls.patch 0090_all_debian-remote-addr.patch 0100_all_ldflags.patch series

[Diego Petteno (flameeyes)]

flameeyes    11/01/19 13:39:17

  Added:                0010_all_maxsysuid.patch
                        0020_all_from-format-fix.patch
                        0030_all_authpass.patch 0040_all_darwin7.patch
                        0050_all_strndup.patch 0060_all_opessl_crypto.patch
                        0070_all_solaris-basename.patch
                        0080_all_gnutls.patch
                        0090_all_debian-remote-addr.patch
                        0100_all_ldflags.patch series
  Log:
  Import patches for new ssmtp-2.64 version.

Revision  Changes    Path
1.1                  src/patchsets/ssmtp/2.64/0010_all_maxsysuid.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0010_all_maxsysuid.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0010_all_maxsysuid.patch?rev=1.1&content-type=text/plain

Index: 0010_all_maxsysuid.patch
===================================================================
Allow to specify the last used system user id, bug #231866

Index: ssmtp-2.64/ssmtp.c
===================================================================
--- ssmtp-2.64.orig/ssmtp.c
+++ ssmtp-2.64/ssmtp.c
@@ -78,6 +78,7 @@ int log_level = 1;
 #else
 int log_level = 0;
 #endif
+int minuserid = MAXSYSUID+1;
 int port = 25;
 #ifdef INET6
 int p_family = PF_UNSPEC;		/* Protocol family used in SMTP connection */
@@ -649,7 +650,7 @@ char *rcpt_remap(char *str)
 {
 	struct passwd *pw;
 	if((root==NULL) || strlen(root)==0 || strchr(str, '@') ||
-		((pw = getpwnam(str)) == NULL) || (pw->pw_uid > MAXSYSUID)) {
+		((pw = getpwnam(str)) == NULL) || (pw->pw_uid >= minuserid)) {
 		return(append_domain(str));	/* It's not a local systems-level user */
 	}
 	else {
@@ -898,6 +899,17 @@ bool_t read_config()
 					log_event(LOG_INFO, "Set Root=\"%s\"\n", root);
 				}
 			}
+			else if(strcasecmp(p, "MinUserId") == 0) {
+				if((r = strdup(q)) == (char *)NULL) {
+					die("parse_config() -- strdup() failed");
+				}
+
+				minuserid = atoi(r);
+
+				if(log_level > 0) {
+					log_event(LOG_INFO, "Set MinUserId=\"%d\"\n", minuserid);
+				}
+			}
 			else if(strcasecmp(p, "MailHub") == 0) {
 				if((r = strchr(q, ':')) != NULL) {
 					*r++ = '\0';
Index: ssmtp-2.64/ssmtp.conf
===================================================================
--- ssmtp-2.64.orig/ssmtp.conf
+++ ssmtp-2.64/ssmtp.conf
@@ -2,10 +2,13 @@
 # /etc/ssmtp.conf -- a config file for sSMTP sendmail.
 #
 
-# The person who gets all mail for userids < 1000
+# The person who gets all mail for userids < MinUserId
 # Make this empty to disable rewriting.
 root=postmaster
 
+# All mail delivered to userid >= MinUserId goes to user, not root.
+#MinUserId=1000
+
 # The place where the mail goes. The actual machine name is required
 # no MX records are consulted. Commonly mailhosts are named mail.domain.com
 # The example will fit if you are in domain.com and your mailhub is so named.



1.1                  src/patchsets/ssmtp/2.64/0020_all_from-format-fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0020_all_from-format-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0020_all_from-format-fix.patch?rev=1.1&content-type=text/plain

Index: 0020_all_from-format-fix.patch
===================================================================
Index: ssmtp-2.64/ssmtp.c
===================================================================
--- ssmtp-2.64.orig/ssmtp.c
+++ ssmtp-2.64/ssmtp.c
@@ -454,7 +454,7 @@ from_format() -- Generate standard From:
 */
 char *from_format(char *str, bool_t override_from)
 {
-	char buf[(BUF_SZ + 1)];
+	char buf[(BUF_SZ + 1)] = "";
 
 	if(override_from) {
 		if(minus_f) {



1.1                  src/patchsets/ssmtp/2.64/0030_all_authpass.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0030_all_authpass.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0030_all_authpass.patch?rev=1.1&content-type=text/plain

Index: 0030_all_authpass.patch
===================================================================
Index: ssmtp-2.64/ssmtp.c
===================================================================
--- ssmtp-2.64.orig/ssmtp.c
+++ ssmtp-2.64/ssmtp.c
@@ -1057,7 +1057,8 @@ bool_t read_config()
 				}
 			}
 			else if(strcasecmp(p, "AuthPass") == 0 && !auth_pass) {
-				if((auth_pass = strdup(q)) == (char *)NULL) {
+				auth_pass = firsttok(&rightside, " \n\t");
+				if(auth_pass  == (char *)NULL) {
 					die("parse_config() -- strdup() failed");
 				}
 



1.1                  src/patchsets/ssmtp/2.64/0040_all_darwin7.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0040_all_darwin7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0040_all_darwin7.patch?rev=1.1&content-type=text/plain

Index: 0040_all_darwin7.patch
===================================================================
Index: ssmtp-2.64/ssmtp.c
===================================================================
--- ssmtp-2.64.orig/ssmtp.c
+++ ssmtp-2.64/ssmtp.c
@@ -13,6 +13,7 @@
 #define VERSION "2.64"
 #define _GNU_SOURCE
 
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/param.h>



1.1                  src/patchsets/ssmtp/2.64/0050_all_strndup.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0050_all_strndup.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0050_all_strndup.patch?rev=1.1&content-type=text/plain

Index: 0050_all_strndup.patch
===================================================================
Compensate for platforms that don't have strndup, like Solaris

Index: ssmtp-2.64/configure.in
===================================================================
--- ssmtp-2.64.orig/configure.in
+++ ssmtp-2.64/configure.in
@@ -30,7 +30,7 @@ AC_SEARCH_LIBS(socket, socket)
 dnl Checks for library functions.
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(gethostname socket strdup strstr)
+AC_CHECK_FUNCS(gethostname socket strdup strndup strstr)
 
 dnl Check for optional features
 AC_ARG_ENABLE(logfile, 
Index: ssmtp-2.64/ssmtp.c
===================================================================
--- ssmtp-2.64.orig/ssmtp.c
+++ ssmtp-2.64/ssmtp.c
@@ -846,7 +846,16 @@ char *firsttok(char **s, const char *del
 	if (!rest) {
 		return NULL;
 	}
+#ifdef HAVE_STRNDUP
 	tok=strndup(*s,rest-(*s));
+#else
+	{
+		size_t len = rest - (*s);
+		tok = malloc(sizeof(char) * (len + 1));
+		memcpy(tok, *s, len);
+		tok[len] = '\0';
+	}
+#endif
 	if (!tok) {
 		die("firsttok() -- strndup() failed");
 	}



1.1                  src/patchsets/ssmtp/2.64/0060_all_opessl_crypto.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0060_all_opessl_crypto.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0060_all_opessl_crypto.patch?rev=1.1&content-type=text/plain

Index: 0060_all_opessl_crypto.patch
===================================================================
Fix linking error:

Undefined symbols:
  "_X509_free", referenced from:
      _smtp_open in ssmtp.o
ld: symbol(s) not found


Index: ssmtp-2.64/configure.in
===================================================================
--- ssmtp-2.64.orig/configure.in
+++ ssmtp-2.64/configure.in
@@ -52,7 +52,7 @@ AC_ARG_ENABLE(ssl,
 [  --enable-ssl           support for secure connection to mail server])
 if test x$enableval = xyes ; then
 	AC_DEFINE(HAVE_SSL)
-	LIBS="$LIBS -lssl"
+	LIBS="$LIBS -lssl -lcrypto"
 fi
 enableval=""
 



1.1                  src/patchsets/ssmtp/2.64/0070_all_solaris-basename.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0070_all_solaris-basename.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0070_all_solaris-basename.patch?rev=1.1&content-type=text/plain

Index: 0070_all_solaris-basename.patch
===================================================================
This function overshadows the one from libc on Solaris, and guess what,
is hence never called.  Since the original one has an entirely different
contract, it results in unconditional segfaults lateron, so always use
the internal copy as it's small enough not to care.

Index: ssmtp-2.64/ssmtp.c
===================================================================
--- ssmtp-2.64.orig/ssmtp.c
+++ ssmtp-2.64/ssmtp.c
@@ -224,11 +224,10 @@ void die(char *format, ...)
 	exit(1);
 }
 
-#ifndef _GNU_SOURCE
 /*
-basename() -- Return last element of path
+xbasename() -- Return last element of path
 */
-char *basename(char *str)
+char *xbasename(char *str)
 {
 	char *p;
 
@@ -239,7 +238,6 @@ char *basename(char *str)
 
 	return(strdup(p));
 }
-#endif /* _GNU_SOURCE */
 
 /*
 strip_pre_ws() -- Return pointer to first non-whitespace character
@@ -2089,7 +2087,7 @@ int main(int argc, char **argv)
 	(void)signal(SIGTTOU, SIG_IGN);
 
 	/* Set the globals */
-	prog = basename(argv[0]);
+	prog = xbasename(argv[0]);
 
 	hostname = xgethostname();
 



1.1                  src/patchsets/ssmtp/2.64/0080_all_gnutls.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0080_all_gnutls.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0080_all_gnutls.patch?rev=1.1&content-type=text/plain

Index: 0080_all_gnutls.patch
===================================================================
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=374327

GPL code linked against OpenSSL without exception

[ Alejandro Rios ]
* Initial port from openssl to gnutls
 
[ Anibal Monsalve Salazar ]
* configure: replaced -lssl with /usr/lib/libgnutls-openssl.so.
* ssmtp.c: replaced SSL_CTX_use_certificate_chain_file with
  SSL_CTX_use_certificate_file and marked SSL_CTX_check_private_key
  as not used.

Alejandro Rios <alerios@××××××.org>
Anibal Monsalve Salazar <anibal@××××××.org>

Index: ssmtp-2.64/ssmtp.c
===================================================================
--- ssmtp-2.64.orig/ssmtp.c
+++ ssmtp-2.64/ssmtp.c
@@ -27,12 +27,16 @@
 #include <ctype.h>
 #include <netdb.h>
 #ifdef HAVE_SSL
+#ifdef HAVE_GNUTLS
+#include <gnutls/openssl.h>
+#else
 #include <openssl/crypto.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #endif
+#endif
 #ifdef MD5AUTH
 #include "md5auth/hmac_md5.h"
 #endif
@@ -1154,7 +1158,11 @@ int smtp_open(char *host, int port)
 	}
 
 	if(use_cert == True) { 
+#ifdef HAVE_GNUTLS
+		if(SSL_CTX_use_certificate_file(ctx, tls_cert, SSL_FILETYPE_PEM) <= 0) {
+#else
 		if(SSL_CTX_use_certificate_chain_file(ctx, tls_cert) <= 0) {
+#endif
 			perror("Use certfile");
 			return(-1);
 		}
@@ -1164,10 +1172,12 @@ int smtp_open(char *host, int port)
 			return(-1);
 		}
 
+#ifndef HAVE_GNUTLS
 		if(!SSL_CTX_check_private_key(ctx)) {
 			log_event(LOG_ERR, "Private key does not match the certificate public key\n");
 			return(-1);
 		}
+#endif
 	}
 #endif
 
Index: ssmtp-2.64/configure.in
===================================================================
--- ssmtp-2.64.orig/configure.in
+++ ssmtp-2.64/configure.in
@@ -50,11 +50,17 @@ enableval=""
 
 AC_ARG_ENABLE(ssl,
 [  --enable-ssl           support for secure connection to mail server])
-if test x$enableval = xyes ; then
-	AC_DEFINE(HAVE_SSL)
-	LIBS="$LIBS -lssl -lcrypto"
+AC_ARG_WITH([gnutls],
+  AS_HELP_STRING([--with-gnutls], [Use GnuTLS for SSL support]))
+if test x$enable_ssl = "xyes" ; then
+       	AC_DEFINE(HAVE_SSL)
+        if test "x$with_gnutls" != "xyes"; then
+        	LIBS="$LIBS -lssl -lcrypto"
+        else
+                AC_DEFINE([HAVE_GNUTLS])
+                LIBS="-lgnutls-openssl"
+        fi
 fi
-enableval=""
 
 AC_ARG_ENABLE(inet6,
 [  --enable-inet6         support for IPv6 transport])



1.1                  src/patchsets/ssmtp/2.64/0090_all_debian-remote-addr.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0090_all_debian-remote-addr.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0090_all_debian-remote-addr.patch?rev=1.1&content-type=text/plain

Index: 0090_all_debian-remote-addr.patch
===================================================================
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=557741

Patch by Victor Sudakov <sudakov@×××××××××××××.ru>
Modified by Anibal Monsalve Salazar <anibal@××××××.org>

Index: ssmtp-2.64/ssmtp.c
===================================================================
--- ssmtp-2.64.orig/ssmtp.c
+++ ssmtp-2.64/ssmtp.c
@@ -1440,6 +1440,7 @@ ssmtp() -- send the message (exactly one
 int ssmtp(char *argv[])
 {
 	char b[(BUF_SZ + 2)], *buf = b+1, *p, *q;
+	char *remote_addr;
 #ifdef MD5AUTH
 	char challenge[(BUF_SZ + 1)];
 #endif
@@ -1643,6 +1644,10 @@ int ssmtp(char *argv[])
 		outbytes += smtp_write(sock, "From: %s", from);
 	}
 
+	if(remote_addr=getenv("REMOTE_ADDR")) {
+		outbytes += smtp_write(sock, "X-Originating-IP: %s", remote_addr);
+	}
+
 	if(have_date == False) {
 		outbytes += smtp_write(sock, "Date: %s", arpadate);
 	}



1.1                  src/patchsets/ssmtp/2.64/0100_all_ldflags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0100_all_ldflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/0100_all_ldflags.patch?rev=1.1&content-type=text/plain

Index: 0100_all_ldflags.patch
===================================================================
Index: ssmtp-2.64/Makefile.in
===================================================================
--- ssmtp-2.64.orig/Makefile.in
+++ ssmtp-2.64/Makefile.in
@@ -9,6 +9,8 @@ mandir=$(prefix)/man/man8
 
 LN_S=@LN_S@
 CC=@CC@
+LDFLAGS=@LDFLAGS@
+LIBS=@LIBS@
 
 etcdir=@sysconfdir@
 SSMTPCONFDIR=$(etcdir)/ssmtp
@@ -79,7 +81,7 @@ uninstall-sendmail: uninstall
 
 # Binaries:
 ssmtp: $(OBJS)
-	$(CC) -o ssmtp $(OBJS) @LIBS@ $(CFLAGS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o ssmtp $(OBJS) $(LIBS)
 
 .PHONY: clean
 clean:



1.1                  src/patchsets/ssmtp/2.64/series

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/series?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/ssmtp/2.64/series?rev=1.1&content-type=text/plain

Index: series
===================================================================
0010_all_maxsysuid.patch
0020_all_from-format-fix.patch
0030_all_authpass.patch
0040_all_darwin7.patch
0050_all_strndup.patch
0060_all_opessl_crypto.patch
0070_all_solaris-basename.patch
0080_all_gnutls.patch
0090_all_debian-remote-addr.patch
0100_all_ldflags.patch